phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] SF.net SVN: phpwiki:[8789] trunk/lib

[<var...@us...>]

Revision: 8789
          http://sourceforge.net/p/phpwiki/code/8789
Author:   vargenau
Date:     2013-05-29 07:32:07 +0000 (Wed, 29 May 2013)
Log Message:
-----------
var --> public

Modified Paths:
--------------
    trunk/lib/AtomParser.php
    trunk/lib/BlockParser.php
    trunk/lib/DbSession/ADODB.php
    trunk/lib/DbSession/PDO.php
    trunk/lib/DbSession/SQL.php
    trunk/lib/DbSession/dba.php
    trunk/lib/ErrorManager.php
    trunk/lib/ExternalReferrer.php
    trunk/lib/FileFinder.php
    trunk/lib/Google.php
    trunk/lib/HtmlParser.php
    trunk/lib/HttpClient.php
    trunk/lib/InlineParser.php
    trunk/lib/PageList.php
    trunk/lib/PagePerm.php
    trunk/lib/PageType.php
    trunk/lib/Request.php
    trunk/lib/RssParser.php
    trunk/lib/SemanticWeb.php
    trunk/lib/TextSearchQuery.php
    trunk/lib/WikiDB/backend/ADODB_oci8po.php
    trunk/lib/WikiDB/backend/PearDB.php
    trunk/lib/WikiDB/backend/cvs.php
    trunk/lib/WikiDB/backend/file.php
    trunk/lib/WikiDB/cvs.php
    trunk/lib/WikiDB.php
    trunk/lib/WikiGroup.php
    trunk/lib/WikiPlugin.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUser/AdoDb.php
    trunk/lib/WikiUser/BogoLogin.php
    trunk/lib/WikiUser/Db.php
    trunk/lib/WikiUser/File.php
    trunk/lib/WikiUser/FusionForge.php
    trunk/lib/WikiUser/PdoDb.php
    trunk/lib/WikiUser/PearDb.php
    trunk/lib/WikiUser/PersonalPage.php
    trunk/lib/WikiUser.php
    trunk/lib/WikiUserNew.php
    trunk/lib/WysiwygEdit.php
    trunk/lib/XmlParser.php
    trunk/lib/diff3.php
    trunk/lib/difflib.php
    trunk/lib/main.php
    trunk/lib/plugin/PageDump.php
    trunk/lib/plugin/PageTrail.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/SiteMap.php
    trunk/lib/plugin/SqlResult.php
    trunk/lib/plugin/TeX2png.php
    trunk/lib/plugin/UpLoad.php
    trunk/lib/plugin/UserPreferences.php
    trunk/lib/plugin/WikiPoll.php
    trunk/lib/stdlib.php
    trunk/lib/upgrade.php
    trunk/lib/wikilens/CustomPrefs.php
    trunk/lib/wikilens/PageListColumns.php
    trunk/lib/wikilens/RatingsUser.php

Modified: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/AtomParser.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -31,41 +31,41 @@
     extends XmlParser
 {
     // Feed
-    var $feed = array();
-    var $feed_title = '';
-    var $feed_links = array();
-    var $feed_subtitle = '';
-    var $feed_id = '';
-    var $feed_updated = '';
-    var $feed_authors = array();
-    var $feed_contributors = array();
-    var $generator = '';
-    var $icon = '';
-    var $rights = '';
-    var $logo = '';
+    public $feed = array();
+    public $feed_title = '';
+    public $feed_links = array();
+    public $feed_subtitle = '';
+    public $feed_id = '';
+    public $feed_updated = '';
+    public $feed_authors = array();
+    public $feed_contributors = array();
+    public $generator = '';
+    public $icon = '';
+    public $rights = '';
+    public $logo = '';
 
-    var $categories = array();
+    public $categories = array();
 
-    var $authors = array();
-    var $contributors = array();
+    public $authors = array();
+    public $contributors = array();
 
     // Author, Contributor
-    var $name = '';
-    var $email = '';
-    var $uri = '';
+    public $name = '';
+    public $email = '';
+    public $uri = '';
 
     // Entries
-    var $entries = array();
-    var $inside_entry = false;
-    var $title = '';
-    var $updated = '';
-    var $published = '';
-    var $id = '';
-    var $links = array();
-    var $summary = '';
+    public $entries = array();
+    public $inside_entry = false;
+    public $title = '';
+    public $updated = '';
+    public $published = '';
+    public $id = '';
+    public $links = array();
+    public $summary = '';
 
-    var $inside_content = false;
-    var $content = '';
+    public $inside_content = false;
+    public $content = '';
 
     function tag_open($parser, $name, $attrs = '')
     {

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/BlockParser.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -54,17 +54,17 @@
     /**
      * The matched text.
      */
-    var $match;
+    public $match;
 
     /**
      * The text following the matched text.
      */
-    var $postmatch;
+    public $postmatch;
 
     /**
      * Index of the regular expression which matched.
      */
-    var $regexp_ind;
+    public $regexp_ind;
 }
 
 /**
@@ -504,7 +504,7 @@
 
 class BlockMarkup
 {
-    var $_re;
+    public $_re;
 
     function _match(&$input, $match)
     {
@@ -528,8 +528,8 @@
 
 class Block_blockquote extends BlockMarkup
 {
-    var $_depth;
-    var $_re = '\ +(?=\S)';
+    public $_depth;
+    public $_re = '\ +(?=\S)';
 
     function _match(&$input, $m)
     {
@@ -555,15 +555,15 @@
 
 class Block_list extends BlockMarkup
 {
-    //var $_tag = 'ol' or 'ul';
-    var $_re = '\ {0,4}
+    //public $_tag = 'ol' or 'ul';
+    public $_re = '\ {0,4}
                 (?: \+
                   | \\#\ (?!\[.*\])
                   | -(?!-)
                   | [o](?=\ )
                   | [*]\ (?!(?=\S)[^*]*(?<=\S)[*](?:\\s|[-)}>"\'\\/:.,;!?_*=]) )
                 )\ *(?=\S)';
-    var $_content = array();
+    public $_content = array();
 
     function _match(&$input, $m)
     {
@@ -610,7 +610,7 @@
 
 class Block_dl extends Block_list
 {
-    var $_tag = 'dl';
+    public $_tag = 'dl';
 
     function Block_dl()
     {
@@ -663,8 +663,8 @@
 
 class Block_table_dl_defn extends XmlContent
 {
-    var $nrows;
-    var $ncols;
+    public $nrows;
+    public $ncols;
 
     function Block_table_dl_defn($term, $defn)
     {
@@ -816,7 +816,7 @@
 
 class Block_table_dl extends Block_dl
 {
-    var $_tag = 'dl-table'; // phony.
+    public $_tag = 'dl-table'; // phony.
 
     function Block_table_dl()
     {
@@ -860,8 +860,8 @@
 
 class Block_oldlists extends Block_list
 {
-    //var $_tag = 'ol', 'ul', or 'dl';
-    var $_re = '(?: [*]\ (?!(?=\S)[^*]*(?<=\S)[*](?:\\s|[-)}>"\'\\/:.,;!?_*=]))
+    //public $_tag = 'ol', 'ul', or 'dl';
+    public $_re = '(?: [*]\ (?!(?=\S)[^*]*(?<=\S)[*](?:\\s|[-)}>"\'\\/:.,;!?_*=]))
                   | [#]\ (?! \[ .*? \] )
                   | ; .*? :
                 ) .*? (?=\S)';
@@ -915,7 +915,7 @@
 
 class Block_pre extends BlockMarkup
 {
-    var $_re = '<(?:pre|verbatim|nowiki|noinclude)>';
+    public $_re = '<(?:pre|verbatim|nowiki|noinclude)>';
 
     function _match(&$input, $m)
     {
@@ -960,7 +960,7 @@
 // <<<placeholder>>>
 class Block_placeholder extends BlockMarkup
 {
-    var $_re = '<<<';
+    public $_re = '<<<';
 
     function _match(&$input, $m)
     {
@@ -987,7 +987,7 @@
 
 class Block_nowiki_wikicreole extends BlockMarkup
 {
-    var $_re = '{{{';
+    public $_re = '{{{';
 
     function _match(&$input, $m)
     {
@@ -1013,7 +1013,7 @@
 
 class Block_plugin extends Block_pre
 {
-    var $_re = '<\?plugin(?:-form)?(?!\S)';
+    public $_re = '<\?plugin(?:-form)?(?!\S)';
 
     // FIXME:
     /* <?plugin Backlinks
@@ -1043,8 +1043,8 @@
 
 class Block_plugin_wikicreole extends Block_pre
 {
-    // var $_re = '<<(?!\S)';
-    var $_re = '<<';
+    // public $_re = '<<(?!\S)';
+    public $_re = '<<';
 
     function _match(&$input, $m)
     {
@@ -1072,7 +1072,7 @@
 
 class Block_table_wikicreole extends Block_pre
 {
-    var $_re = '\s*\|';
+    public $_re = '\s*\|';
 
     function _match(&$input, $m)
     {
@@ -1113,7 +1113,7 @@
  */
 class Block_table_mediawiki extends Block_pre
 {
-    var $_re = '{\|';
+    public $_re = '{\|';
 
     function _match(&$input, $m)
     {
@@ -1148,7 +1148,7 @@
  */
 class Block_template_plugin extends Block_pre
 {
-    var $_re = '{{';
+    public $_re = '{{';
 
     function _match(&$input, $m)
     {
@@ -1226,8 +1226,8 @@
 
 class Block_email_blockquote extends BlockMarkup
 {
-    var $_attr = array('class' => 'mail-style-quote');
-    var $_re = '>\ ?';
+    public $_attr = array('class' => 'mail-style-quote');
+    public $_re = '>\ ?';
 
     function _match(&$input, $m)
     {
@@ -1241,8 +1241,8 @@
 
 class Block_wikicreole_indented extends BlockMarkup
 {
-    var $_attr = array('style' => 'margin-left:2em');
-    var $_re = ':\ ?';
+    public $_attr = array('style' => 'margin-left:2em');
+    public $_re = ':\ ?';
 
     function _match(&$input, $m)
     {
@@ -1255,7 +1255,7 @@
 
 class Block_hr extends BlockMarkup
 {
-    var $_re = '-{4,}\s*$';
+    public $_re = '-{4,}\s*$';
 
     function _match(&$input, $m)
     {
@@ -1267,7 +1267,7 @@
 
 class Block_heading extends BlockMarkup
 {
-    var $_re = '!{1,3}';
+    public $_re = '!{1,3}';
 
     function _match(&$input, $m)
     {
@@ -1283,7 +1283,7 @@
 
 class Block_heading_wikicreole extends BlockMarkup
 {
-    var $_re = '={2,6}';
+    public $_re = '={2,6}';
 
     function _match(&$input, $m)
     {
@@ -1303,9 +1303,9 @@
 
 class Block_p extends BlockMarkup
 {
-    var $_tag = 'p';
-    var $_re = '\S.*';
-    var $_text = '';
+    public $_tag = 'p';
+    public $_re = '\S.*';
+    public $_text = '';
 
     function _match(&$input, $m)
     {
@@ -1342,7 +1342,7 @@
 
 class Block_divspan extends BlockMarkup
 {
-    var $_re = '<(?im)(?: div|span)(?:[^>]*)?>';
+    public $_re = '<(?im)(?: div|span)(?:[^>]*)?>';
 
     function _match(&$input, $m)
     {

Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/DbSession/ADODB.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -27,7 +27,7 @@
 class DbSession_ADODB
     extends DbSession
 {
-    var $_backend_type = "ADODB";
+    public $_backend_type = "ADODB";
 
     function DbSession_ADODB($dbh, $table)
     {

Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/DbSession/PDO.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -8,7 +8,7 @@
 class DbSession_PDO
     extends DbSession
 {
-    var $_backend_type = "PDO";
+    public $_backend_type = "PDO";
 
     function DbSession_PDO($dbh, $table)
     {

Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/DbSession/SQL.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -13,7 +13,7 @@
 class DbSession_SQL
     extends DbSession
 {
-    var $_backend_type = "SQL";
+    public $_backend_type = "SQL";
 
     function DbSession_SQL(&$dbh, $table)
     {

Modified: trunk/lib/DbSession/dba.php
===================================================================
--- trunk/lib/DbSession/dba.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/DbSession/dba.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -13,7 +13,7 @@
 class DbSession_dba
     extends DbSession
 {
-    var $_backend_type = "dba";
+    public $_backend_type = "dba";
 
     function DbSession_dba(&$dbh, $table)
     {

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/ErrorManager.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -412,22 +412,22 @@
     /**
      * The PHP errno
      */
-    //var $errno;
+    public $errno;
 
     /**
      * The PHP error message.
      */
-    //var $errstr;
+    public $errstr;
 
     /**
      * The source file where the error occurred.
      */
-    //var $errfile;
+    public $errfile;
 
     /**
      * The line number (in $this->errfile) where the error occured.
      */
-    //var $errline;
+    public $errline;
 
     /**
      * Construct a new PhpError.

Modified: trunk/lib/ExternalReferrer.php
===================================================================
--- trunk/lib/ExternalReferrer.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/ExternalReferrer.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -24,7 +24,7 @@
 class SearchEngines
 {
 
-    var $searchEngines =
+    public $searchEngines =
         array(
             "search.sli.sympatico.ca/" => array("engine" => "Sympatico", "query1" => "query=", "query2" => "", "url" => "http://www1.sympatico.ca/"),
             "www.search123.com/cgi-bin/" => array("engine" => "Search123", "query1" => "query=", "query2" => "", "url" => "http://www.search123.com/"),

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/FileFinder.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -13,7 +13,7 @@
  */
 class FileFinder
 {
-    //var $_pathsep, $_path;
+    public $_pathsep, $_path;
 
     /**
      * Constructor.

Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/Google.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -86,8 +86,8 @@
 
 class GoogleSearchResults
 {
-    var $_fields = "documentFiltering,searchComments,estimatedTotalResultsCount,estimateIsExact,searchQuery,startIndex,endIndex,searchTips,directoryCategories,searchTime,resultElements";
-    var $resultElements, $results;
+    public $_fields = "documentFiltering,searchComments,estimatedTotalResultsCount,estimateIsExact,searchQuery,startIndex,endIndex,searchTips,directoryCategories,searchTime,resultElements";
+    public $resultElements, $results;
 
     function GoogleSearchResults($result)
     {
@@ -145,7 +145,7 @@
  */
 class GoogleSearchResult
 {
-    var $_fields = "summary,URL,snippet,title,cachedSize,relatedInformationPresent,hostName,directoryCategory,directoryTitle";
+    public $_fields = "summary,URL,snippet,title,cachedSize,relatedInformationPresent,hostName,directoryCategory,directoryTitle";
 
     function GoogleSearchResult($result)
     {

Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/HtmlParser.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -43,7 +43,7 @@
 class HtmlParser
     extends XmlParser
 {
-    var $dialect, $_handlers, $root;
+    public $dialect, $_handlers, $root;
 
     /**
      *  dialect: "PhpWiki2", "PhpWiki"

Modified: trunk/lib/HttpClient.php
===================================================================
--- trunk/lib/HttpClient.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/HttpClient.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -14,40 +14,40 @@
 class HttpClient
 {
     // Request vars
-    var $host;
-    var $port;
-    var $path;
-    var $method;
-    var $postdata = '';
-    var $cookies = array();
-    var $referer;
-    var $accept = 'text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,image/jpeg,image/gif,*/*';
-    var $accept_encoding = 'gzip';
-    var $accept_language = 'en-us';
-    var $user_agent = 'Incutio HttpClient v1.0';
-    var $boundary = "xYzZY"; // FIXME: check if this string doesn't occur in the data
+    public $host;
+    public $port;
+    public $path;
+    public $method;
+    public $postdata = '';
+    public $cookies = array();
+    public $referer;
+    public $accept = 'text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,image/jpeg,image/gif,*/*';
+    public $accept_encoding = 'gzip';
+    public $accept_language = 'en-us';
+    public $user_agent = 'Incutio HttpClient v1.0';
+    public $boundary = "xYzZY"; // FIXME: check if this string doesn't occur in the data
     // Options
-    var $timeout = 10;
-    var $use_gzip = true;
-    var $persist_cookies = true; // If true, received cookies are placed in the $this->cookies array ready for the next request
+    public $timeout = 10;
+    public $use_gzip = true;
+    public $persist_cookies = true; // If true, received cookies are placed in the $this->cookies array ready for the next request
     // Note: This currently ignores the cookie path (and time) completely. Time is not important,
     //       but path could possibly lead to security problems.
-    var $persist_referers = true; // For each request, sends path of last request as referer
-    var $debug = false;
-    var $handle_redirects = true; // Auaomtically redirect if Location or URI header is found
-    var $max_redirects = 5;
-    var $headers_only = false; // If true, stops receiving once headers have been read.
+    public $persist_referers = true; // For each request, sends path of last request as referer
+    public $debug = false;
+    public $handle_redirects = true; // Auaomtically redirect if Location or URI header is found
+    public $max_redirects = 5;
+    public $headers_only = false; // If true, stops receiving once headers have been read.
     // Basic authorization variables
-    var $username;
-    var $password;
+    public $username;
+    public $password;
     // Response vars
-    var $status;
-    var $headers = array();
-    var $content = '';
-    var $errormsg;
+    public $status;
+    public $headers = array();
+    public $content = '';
+    public $errormsg;
     // Tracker variables
-    var $redirect_count = 0;
-    var $cookie_host = '';
+    public $redirect_count = 0;
+    public $cookie_host = '';
 
     function HttpClient($host = 'localhost', $port = 80)
     {

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/InlineParser.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -57,19 +57,19 @@
     /**
      * The text leading up the the next match.
      */
-    var $prematch;
+    public $prematch;
     /**
      * The matched text.
      */
-    var $match;
+    public $match;
     /**
      * The text following the matched text.
      */
-    var $postmatch;
+    public $postmatch;
     /**
      * Index of the regular expression which matched.
      */
-    var $regexp_ind;
+    public $regexp_ind;
 }
 
 /**
@@ -237,7 +237,7 @@
  */
 class SimpleMarkup
 {
-    var $_match_regexp;
+    public $_match_regexp;
 
     /** Get regexp.
      *
@@ -268,7 +268,7 @@
  */
 class BalancedMarkup
 {
-    var $_start_regexp;
+    public $_start_regexp;
 
     /** Get the starting regexp for this rule.
      *
@@ -521,7 +521,7 @@
 
 class Markup_wikicreolebracketlink extends SimpleMarkup
 {
-    var $_match_regexp = "\\#? \\[\\[ .*? [^]\\s] .*? \\]\\]";
+    public $_match_regexp = "\\#? \\[\\[ .*? [^]\\s] .*? \\]\\]";
 
     function markup($match)
     {
@@ -533,7 +533,7 @@
 
 class Markup_bracketlink extends SimpleMarkup
 {
-    var $_match_regexp = "\\#? \\[ .*? [^]\\s] .*? \\]";
+    public $_match_regexp = "\\#? \\[ .*? [^]\\s] .*? \\]";
 
     function markup($match)
     {
@@ -621,7 +621,7 @@
     // For :: (relations) only words, no comma,
     // but for := (attributes) comma and dots are allowed. Units with groupsep.
     // Ending dots or comma are not part of the link.
-    var $_match_regexp = "(?: \w+:=\S+(?<![\.,]))|(?: \w+::[\w\.]+(?<!\.))";
+    public $_match_regexp = "(?: \w+:=\S+(?<![\.,]))|(?: \w+::[\w\.]+(?<!\.))";
 
     function markup($match)
     {
@@ -670,7 +670,7 @@
 
 class Markup_linebreak extends SimpleMarkup
 {
-    var $_match_regexp = "(?: (?<! %) %%% (?! %) | \\\\\\\\ | <\s*(?:br|BR)\s*> | <\s*(?:br|BR)\s*\/\s*> )";
+    public $_match_regexp = "(?: (?<! %) %%% (?! %) | \\\\\\\\ | <\s*(?:br|BR)\s*> | <\s*(?:br|BR)\s*\/\s*> )";
 
     function markup($match)
     {
@@ -680,7 +680,7 @@
 
 class Markup_wikicreole_italics extends BalancedMarkup
 {
-    var $_start_regexp = "\\/\\/";
+    public $_start_regexp = "\\/\\/";
 
     function getEndRegexp($match)
     {
@@ -696,7 +696,7 @@
 
 class Markup_wikicreole_bold extends BalancedMarkup
 {
-    var $_start_regexp = "\\*\\*";
+    public $_start_regexp = "\\*\\*";
 
     function getEndRegexp($match)
     {
@@ -712,7 +712,7 @@
 
 class Markup_wikicreole_monospace extends BalancedMarkup
 {
-    var $_start_regexp = "\\#\\#";
+    public $_start_regexp = "\\#\\#";
 
     function getEndRegexp($match)
     {
@@ -727,7 +727,7 @@
 
 class Markup_wikicreole_underline extends BalancedMarkup
 {
-    var $_start_regexp = "\\_\\_";
+    public $_start_regexp = "\\_\\_";
 
     function getEndRegexp($match)
     {
@@ -743,7 +743,7 @@
 
 class Markup_wikicreole_superscript extends BalancedMarkup
 {
-    var $_start_regexp = "\\^\\^";
+    public $_start_regexp = "\\^\\^";
 
     function getEndRegexp($match)
     {
@@ -759,7 +759,7 @@
 
 class Markup_wikicreole_subscript extends BalancedMarkup
 {
-    var $_start_regexp = ",,";
+    public $_start_regexp = ",,";
 
     function getEndRegexp($match)
     {
@@ -775,7 +775,7 @@
 
 class Markup_old_emphasis extends BalancedMarkup
 {
-    var $_start_regexp = "''";
+    public $_start_regexp = "''";
 
     function getEndRegexp($match)
     {
@@ -850,7 +850,7 @@
 
 class Markup_html_emphasis extends BalancedMarkup
 {
-    var $_start_regexp =
+    public $_start_regexp =
         "<(?: b|big|i|small|tt|em|strong|cite|code|dfn|kbd|samp|s|strike|del|var|sup|sub )>";
 
     function getEndRegexp($match)
@@ -867,7 +867,7 @@
 
 class Markup_html_divspan extends BalancedMarkup
 {
-    var $_start_regexp =
+    public $_start_regexp =
         "<(?: div|span )(?: \s[^>]*)?>";
 
     function getEndRegexp($match)
@@ -899,7 +899,7 @@
 {
     //rurban: abbr|acronym need an optional title tag.
     //sf.net bug #728595
-    var $_start_regexp = "<(?: abbr|acronym )(?: [^>]*)?>";
+    public $_start_regexp = "<(?: abbr|acronym )(?: [^>]*)?>";
 
     function getEndRegexp($match)
     {
@@ -936,8 +936,8 @@
 class Markup_color extends BalancedMarkup
 {
     // %color=blue% blue text %% and back to normal
-    var $_start_regexp = "%color=(?: [^%]*)%";
-    var $_end_regexp = "%%";
+    public $_start_regexp = "%color=(?: [^%]*)%";
+    public $_end_regexp = "%%";
 
     function markup($match, $body)
     {
@@ -984,7 +984,7 @@
 // <<<placeholder>>>
 class Markup_placeholder extends SimpleMarkup
 {
-    var $_match_regexp = '<<<.*?>>>';
+    public $_match_regexp = '<<<.*?>>>';
 
     function markup($match)
     {
@@ -996,7 +996,7 @@
 // <!-- This is a comment -->
 class Markup_html_comment extends SimpleMarkup
 {
-    var $_match_regexp = '<!--.*?-->';
+    public $_match_regexp = '<!--.*?-->';
 
     function markup($match)
     {
@@ -1008,7 +1008,7 @@
 //  like: '<small>< ?plugin PopularNearby ? ></small>'
 class Markup_plugin extends SimpleMarkup
 {
-    var $_match_regexp = '<\?plugin(?:-form)?\s[^\n]+?\?>';
+    public $_match_regexp = '<\?plugin(?:-form)?\s[^\n]+?\?>';
 
     function markup($match)
     {
@@ -1019,7 +1019,7 @@
 // Special version for single-line Wikicreole plugins formatting.
 class Markup_plugin_wikicreole extends SimpleMarkup
 {
-    var $_match_regexp = '<<[^\n]+?>>';
+    public $_match_regexp = '<<[^\n]+?>>';
 
     function markup($match)
     {
@@ -1034,7 +1034,7 @@
 // PLUGIN_MARKUP_MAP = "html:RawHtml dot:GraphViz toc:CreateToc amath:AsciiMath richtable:RichTable include:IncludePage tex:TexToPng"
 class Markup_xml_plugin extends BalancedMarkup
 {
-    //var $_start_regexp = "<(?: ".join('|',PLUGIN_MARKUP_MAP)." )(?: \s[^>]*)>";
+    //public $_start_regexp = "<(?: ".join('|',PLUGIN_MARKUP_MAP)." )(?: \s[^>]*)>";
 
     function getStartRegexp()
     {
@@ -1076,7 +1076,7 @@
  */
 class Markup_nowiki extends SimpleMarkup
 {
-    var $_match_regexp = '<nowiki>.*?<\/nowiki>';
+    public $_match_regexp = '<nowiki>.*?<\/nowiki>';
 
     function markup($match)
     {
@@ -1092,7 +1092,7 @@
  */
 class Markup_wikicreole_preformatted extends SimpleMarkup
 {
-    var $_match_regexp = '\{\{\{.*?\}\}\}';
+    public $_match_regexp = '\{\{\{.*?\}\}\}';
 
     function markup($match)
     {
@@ -1116,7 +1116,7 @@
 class Markup_template_plugin extends SimpleMarkup
 {
     // patch #1732793: allow \n, mult. {{ }} in one line, and single letters
-    var $_match_regexp = '\{\{.*?\}\}';
+    public $_match_regexp = '\{\{.*?\}\}';
 
     function markup($match)
     {
@@ -1213,7 +1213,7 @@
 
 class Markup_html_entities extends SimpleMarkup
 {
-    //var $_match_regexp = '(: \.\.\.|\-\-|\-\-\-|\(C\) )';
+    //public $_match_regexp = '(: \.\.\.|\-\-|\-\-\-|\(C\) )';
 
     function Markup_html_entities()
     {
@@ -1238,7 +1238,7 @@
 
 class Markup_isonumchars extends SimpleMarkup
 {
-    var $_match_regexp = '\&\#\d{2,5};';
+    public $_match_regexp = '\&\#\d{2,5};';
 
     function markup($match)
     {
@@ -1249,7 +1249,7 @@
 class Markup_isohexchars extends SimpleMarkup
 {
     // hexnums, like &#x00A4; <=> &curren;
-    var $_match_regexp = '\&\#x[0-9a-fA-F]{2,4};';
+    public $_match_regexp = '\&\#x[0-9a-fA-F]{2,4};';
 
     function markup($match)
     {
@@ -1261,8 +1261,8 @@
 
 class InlineTransformer
 {
-    var $_regexps = array();
-    var $_markup = array();
+    public $_regexps = array();
+    public $_markup = array();
 
     function InlineTransformer($markup_types = false)
     {

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/PageList.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -50,7 +50,7 @@
  */
 class _PageList_Column_base
 {
-    var $_tdattr = array();
+    public $_tdattr = array();
 
     function _PageList_Column_base($default_heading, $align = false)
     {
@@ -532,7 +532,7 @@
 
 class _PageList_Column_pagename extends _PageList_Column_base
 {
-    var $_field = 'pagename';
+    public $_field = 'pagename';
 
     function _PageList_Column_pagename()
     {
@@ -598,18 +598,18 @@
 
 class PageList
 {
-    var $_group_rows = 3;
-    var $_columns = array();
-    var $_columnsMap = array(); // Maps column name to column number.
-    var $_excluded_pages = array();
-    var $_pages = array();
-    var $_caption = "";
-    var $_pagename_seen = false;
-    var $_types = array();
-    var $_options = array();
-    var $_selected = array();
-    var $_sortby = array();
-    var $_maxlen = 0;
+    public $_group_rows = 3;
+    public $_columns = array();
+    public $_columnsMap = array(); // Maps column name to column number.
+    public $_excluded_pages = array();
+    public $_pages = array();
+    public $_caption = "";
+    public $_pagename_seen = false;
+    public $_types = array();
+    public $_options = array();
+    public $_selected = array();
+    public $_sortby = array();
+    public $_maxlen = 0;
 
     function PageList($columns = false, $exclude = false, $options = false)
     {

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/PagePerm.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -353,7 +353,7 @@
  */
 class PagePermission
 {
-    var $perm;
+    public $perm;
 
     function PagePermission($hash = array())
     {

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/PageType.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -465,7 +465,7 @@
 // abstract base class
 class PageFormatter_attach extends PageFormatter
 {
-    var $type, $prefix;
+    public $type, $prefix;
 
     // Display templated contents for wikiblog, comment and wikiforum
     function format($text)
@@ -491,17 +491,17 @@
 
 class PageFormatter_wikiblog extends PageFormatter_attach
 {
-    var $type = 'wikiblog', $prefix = "BLOG";
+    public $type = 'wikiblog', $prefix = "BLOG";
 }
 
 class PageFormatter_comment extends PageFormatter_attach
 {
-    var $type = 'comment', $prefix = "COMMENT";
+    public $type = 'comment', $prefix = "COMMENT";
 }
 
 class PageFormatter_wikiforum extends PageFormatter_attach
 {
-    var $type = 'wikiforum', $prefix = "FORUM";
+    public $type = 'wikiforum', $prefix = "FORUM";
 }
 
 /** wikiabuse for htmlarea editing. not yet used.

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/Request.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -22,7 +22,7 @@
 
 class Request
 {
-	var $args = array();
+	public $args = array();
 
     function Request()
     {

Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/RssParser.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -45,18 +45,18 @@
     extends XmlParser
 {
 
-    var $title = "";
-    var $author = "";
-    var $pubDate = "";
-    var $link = "";
-    var $description = "";
-    var $inside_item = false;
-    var $list_items = false;
-    var $item = array();
-    var $items;
-    var $channel;
-    var $divers = "";
-    var $date = "";
+    public $title = "";
+    public $author = "";
+    public $pubDate = "";
+    public $link = "";
+    public $description = "";
+    public $inside_item = false;
+    public $list_items = false;
+    public $item = array();
+    public $items;
+    public $channel;
+    public $divers = "";
+    public $date = "";
 
     function tag_open($parser, $name, $attrs = '')
     {

Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/SemanticWeb.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -286,7 +286,7 @@
     extends NumericSearchQuery
 {
     /*
-    var $base_units = array('m'   => explode(',','km,miles,cm,dm,mm,ft,inch,inches,meter'),
+    public $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'),
                 );

Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/TextSearchQuery.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -670,8 +670,8 @@
  */
 class TextSearchQuery_node
 {
-    var $op = 'VOID';
-    var $_op = 0;
+    public $op = 'VOID';
+    public $_op = 0;
 
     /**
      * Optimize this node.
@@ -718,8 +718,8 @@
 class TextSearchQuery_node_word
     extends TextSearchQuery_node
 {
-    var $op = "WORD";
-    var $_op = TSQ_TOK_WORD;
+    public $op = "WORD";
+    public $_op = TSQ_TOK_WORD;
 
     function TextSearchQuery_node_word($word)
     {
@@ -745,8 +745,8 @@
 class TextSearchQuery_node_all
     extends TextSearchQuery_node
 {
-    var $op = "ALL";
-    var $_op = TSQ_TOK_ALL;
+    public $op = "ALL";
+    public $_op = TSQ_TOK_ALL;
 
     function regexp()
     {
@@ -762,8 +762,8 @@
 class TextSearchQuery_node_starts_with
     extends TextSearchQuery_node_word
 {
-    var $op = "STARTS_WITH";
-    var $_op = TSQ_TOK_STARTS_WITH;
+    public $op = "STARTS_WITH";
+    public $_op = TSQ_TOK_STARTS_WITH;
 
     function regexp()
     {
@@ -789,8 +789,8 @@
 class TextSearchQuery_node_ends_with
     extends TextSearchQuery_node_word
 {
-    var $op = "ENDS_WITH";
-    var $_op = TSQ_TOK_ENDS_WITH;
+    public $op = "ENDS_WITH";
+    public $_op = TSQ_TOK_ENDS_WITH;
 
     function regexp()
     {
@@ -816,8 +816,8 @@
 class TextSearchQuery_node_exact
     extends TextSearchQuery_node_word
 {
-    var $op = "EXACT";
-    var $_op = TSQ_TOK_EXACT;
+    public $op = "EXACT";
+    public $_op = TSQ_TOK_EXACT;
 
     function regexp()
     {
@@ -833,8 +833,8 @@
 class TextSearchQuery_node_regex // posix regex. FIXME!
     extends TextSearchQuery_node_word
 {
-    var $op = "REGEX"; // using REGEXP or ~ extension
-    var $_op = TSQ_TOK_REGEX;
+    public $op = "REGEX"; // using REGEXP or ~ extension
+    public $_op = TSQ_TOK_REGEX;
 
     function regexp()
     {
@@ -850,8 +850,8 @@
 class TextSearchQuery_node_regex_glob
     extends TextSearchQuery_node_regex
 {
-    var $op = "REGEX_GLOB";
-    var $_op = TSQ_TOK_REGEX_GLOB;
+    public $op = "REGEX_GLOB";
+    public $_op = TSQ_TOK_REGEX_GLOB;
 
     function regexp()
     {
@@ -862,8 +862,8 @@
 class TextSearchQuery_node_regex_pcre // how to handle pcre modifiers? /i
     extends TextSearchQuery_node_regex
 {
-    var $op = "REGEX_PCRE";
-    var $_op = TSQ_TOK_REGEX_PCRE;
+    public $op = "REGEX_PCRE";
+    public $_op = TSQ_TOK_REGEX_PCRE;
 
     function regexp()
     {
@@ -874,8 +874,8 @@
 class TextSearchQuery_node_regex_sql
     extends TextSearchQuery_node_regex
 {
-    var $op = "REGEX_SQL"; // using LIKE
-    var $_op = TSQ_TOK_REGEX_SQL;
+    public $op = "REGEX_SQL"; // using LIKE
+    public $_op = TSQ_TOK_REGEX_SQL;
 
     function regexp()
     {
@@ -894,8 +894,8 @@
 class TextSearchQuery_node_not
     extends TextSearchQuery_node
 {
-    var $op = "NOT";
-    var $_op = TSQ_TOK_NOT;
+    public $op = "NOT";
+    public $_op = TSQ_TOK_NOT;
 
     function TextSearchQuery_node_not($leaf)
     {
@@ -929,7 +929,7 @@
 class TextSearchQuery_node_binop
     extends TextSearchQuery_node
 {
-    var $_op = TSQ_TOK_BINOP;
+    public $_op = TSQ_TOK_BINOP;
 
     function TextSearchQuery_node_binop($leaves)
     {
@@ -976,7 +976,7 @@
 class TextSearchQuery_node_and
     extends TextSearchQuery_node_binop
 {
-    var $op = "AND";
+    public $op = "AND";
 
     function optimize()
     {
@@ -1028,7 +1028,7 @@
 class TextSearchQuery_node_or
     extends TextSearchQuery_node_binop
 {
-    var $op = "OR";
+    public $op = "OR";
 
     function regexp()
     {

Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_oci8po.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiDB/backend/ADODB_oci8po.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -10,7 +10,7 @@
 class WikiDB_backend_ADODB_oci8po
     extends WikiDB_backend_ADODB
 {
-    var $_prefix;
+    public $_prefix;
 
     /**
      * Constructor.

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiDB/backend/PearDB.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -5,7 +5,7 @@
 class WikiDB_backend_PearDB
     extends WikiDB_backend
 {
-    var $_dbh;
+    public $_dbh;
 
     function WikiDB_backend_PearDB($dbparams)
     {

Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiDB/backend/cvs.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -39,10 +39,10 @@
 class WikiDB_backend_cvs
     extends WikiDB_backend
 {
-    var $_docDir;
-    var $_repository;
-    var $_module_name;
-    var $_debug_file;
+    public $_docDir;
+    public $_repository;
+    public $_module_name;
+    public $_debug_file;
 
     /**
      * In the following parameters should be defined in dbparam:
@@ -924,7 +924,7 @@
 class Cvs_Backend_Array_Iterator
     extends WikiDB_backend_iterator
 {
-    var $_array;
+    public $_array;
 
     function Cvs_Backend_Iterator($arrayValue = Array())
     {
@@ -953,8 +953,8 @@
 class Cvs_Backend_Full_Search_Iterator
     extends Cvs_Backend_Array_Iterator
 {
-    var $_searchString = '';
-    var $_docDir = "";
+    public $_searchString = '';
+    public $_docDir = "";
 
     function Cvs_Backend_Title_Search_Iterator($arrayValue = Array(),
                                                $searchString = "",
@@ -1000,7 +1000,7 @@
 class Cvs_Backend_Title_Search_Iterator
     extends Cvs_Backend_Array_Iterator
 {
-    var $_searchString = '';
+    public $_searchString = '';
 
     function Cvs_Backend_Title_Search_Iterator($arrayValue = Array(),
                                                $searchString = "")

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiDB/backend/file.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -46,12 +46,12 @@
 class WikiDB_backend_file
     extends WikiDB_backend
 {
-    var $data_dir;
-    var $_dir_names;
+    public $data_dir;
+    public $_dir_names;
 
-    var $_page_data; // temporarily stores the pagedata (via _loadPageData)
-    var $_page_version_data; // temporarily stores the versiondata (via _loadVersionData)
-    var $_latest_versions; // temporarily stores the latest version-numbers (for every pagename)
+    public $_page_data; // temporarily stores the pagedata (via _loadPageData)
+    public $_page_version_data; // temporarily stores the versiondata (via _loadVersionData)
+    public $_latest_versions; // temporarily stores the latest version-numbers (for every pagename)
 
     function WikiDB_backend_file($dbparam)
     {

Modified: trunk/lib/WikiDB/cvs.php
===================================================================
--- trunk/lib/WikiDB/cvs.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiDB/cvs.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -15,7 +15,7 @@
 class WikiDB_cvs
     extends WikiDB
 {
-    var $_backend;
+    public $_backend;
 
     /**
      * Constructor requires the DB parameters.

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiDB.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -1548,7 +1548,7 @@
  */
 class WikiDB_PageRevision
 {
-    //var $_transformedContent = false; // set by WikiDB_Page::save()
+    public $_transformedContent = false; // set by WikiDB_Page::save()
 
     function WikiDB_PageRevision(&$wikidb, $pagename, $version,
                                  $versiondata = false)

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiGroup.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -59,15 +59,15 @@
 class WikiGroup
 {
     /** User name */
-    var $username = '';
+    public $username = '';
     /** User object if different from current user */
-    var $user;
+    public $user;
     /** The global WikiRequest object */
-    //var $request;
+    //public $request;
     /** Array of groups $username is confirmed to belong to */
-    var $membership;
+    public $membership;
     /** boolean if not the current user */
-    var $not_current = false;
+    public $not_current = false;
 
     /**
      * Initializes a WikiGroup object which should never happen.  Use:
@@ -629,7 +629,7 @@
 class GroupDb extends WikiGroup
 {
 
-    var $_is_member, $_group_members, $_user_groups;
+    public $_is_member, $_group_members, $_user_groups;
 
     /**
      * Constructor

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiPlugin.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -433,7 +433,7 @@
 
 class WikiPluginLoader
 {
-    var $_errors;
+    public $_errors;
 
     function expandPI($pi, &$request, &$markup, $basepage = false)
     {

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiPluginCached.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -58,7 +58,7 @@
  */
 class WikiPluginCached extends WikiPlugin
 {
-    var $_static;
+    public $_static;
 
     /**
      * Produces URL and id number from plugin arguments which later on,

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiTheme.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -179,8 +179,8 @@
 
 class WikiTheme
 {
-    var $HTML_DUMP_SUFFIX = '';
-    var $DUMP_MODE = false, $dumped_images, $dumped_css;
+    public $HTML_DUMP_SUFFIX = '';
+    public $DUMP_MODE = false, $dumped_images, $dumped_css;
 
     /**
      * noinit: Do not initialize unnecessary items in default_theme fallback twice.
@@ -316,10 +316,10 @@
     // 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";
+    public $_dateFormat = "%B %d, %Y";
+    public $_timeFormat = "%I:%M %p";
 
-    var $_showModTime = true;
+    public $_showModTime = true;
 
     /**
      * Set format string used for dates.
@@ -566,7 +566,7 @@
     //
     ////////////////////////////////////////////////////////////////
 
-    var $_autosplitWikiWords = false;
+    public $_autosplitWikiWords = false;
 
     function setAutosplitWikiWords($autosplit = true)
     {
@@ -581,7 +581,7 @@
             return $wikiword;
     }
 
-    var $_anonEditUnknownLinks = true;
+    public $_anonEditUnknownLinks = true;
 
     function setAnonEditUnknownLinks($anonedit = true)
     {
@@ -707,7 +707,7 @@
     // Images and Icons
     //
     ////////////////////////////////////////////////////////////////
-    var $_imageAliases = array();
+    public $_imageAliases = array();
 
     /**
      *
@@ -772,7 +772,7 @@
         return false;
     }
 
-    var $_linkIcon = 'front'; // or 'after' or 'no'.
+    public $_linkIcon = 'front'; // or 'after' or 'no'.
     // maybe also 'spanall': there is a scheme currently in effect with front, which
     // spans the icon only to the first, to let the next words wrap on line breaks
     // see stdlib.php:PossiblyGlueIconToText()
@@ -1076,7 +1076,7 @@
     }
 
     //----------------------------------------------------------------
-    var $_buttonSeparator = "\n | ";
+    public $_buttonSeparator = "\n | ";
 
     function setButtonSeparator($separator)
     {
@@ -1834,7 +1834,7 @@
 class PluginSidebarBox extends SidebarBox
 {
 
-    var $_plugin, $_args = false, $_basepage = false;
+    public $_plugin, $_args = false, $_basepage = false;
 
     function PluginSidebarBox($name, $args = false, $basepage = false)
     {

Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/AdoDb.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -36,7 +36,7 @@
      * @tables: user
      */
 {
-    var $_authmethod = 'AdoDb';
+    public $_authmethod = 'AdoDb';
 
     function _AdoDbPassUser($UserName = '', $prefs = false)
     {

Modified: trunk/lib/WikiUser/BogoLogin.php
===================================================================
--- trunk/lib/WikiUser/BogoLogin.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/BogoLogin.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -26,7 +26,7 @@
 class _BogoLoginPassUser extends _PassUser
 {
 
-    var $_authmethod = 'BogoLogin';
+    public $_authmethod = 'BogoLogin';
 
     function userExists()
     {

Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/Db.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -45,7 +45,7 @@
 class _DbPassUser
     extends _PassUser
 {
-    var $_authselect, $_authupdate, $_authcreate;
+    public $_authselect, $_authupdate, $_authcreate;
 
     // This can only be called from _PassUser, because the parent class
     // sets the auth_dbi and pref methods, before this class is initialized.

Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/File.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -29,7 +29,7 @@
      * Preferences are handled in _PassUser
      */
 {
-    var $_file, $_may_change;
+    public $_file, $_may_change;
 
     // This can only be called from _PassUser, because the parent class
     // sets the pref methods, before this class is initialized.

Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/FusionForge.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -26,7 +26,7 @@
 class _FusionForgePassUser extends _PassUser
 {
 
-    var $_is_external = 0;
+    public $_is_external = 0;
 
     function _FusionForgePassUser($UserName = '', $prefs = false)
     {

Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/PdoDb.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -33,7 +33,7 @@
      * @tables: pref
      */
 {
-    var $_authmethod = 'PDODb';
+    public $_authmethod = 'PDODb';
 
     function _PdoDbPassUser($UserName = '', $prefs = false)
     {

Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/PearDb.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -31,7 +31,7 @@
      * @tables: pref
      */
 {
-    var $_authmethod = 'PearDb';
+    public $_authmethod = 'PearDb';
 
     function _PearDbPassUser($UserName = '', $prefs = false)
     {

Modified: trunk/lib/WikiUser/PersonalPage.php
===================================================================
--- trunk/lib/WikiUser/PersonalPage.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/PersonalPage.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -27,7 +27,7 @@
 class _PersonalPagePassUser
     extends _PassUser
 {
-    var $_authmethod = 'PersonalPage';
+    public $_authmethod = 'PersonalPage';
 
     /* Very loose checking, since we properly quote the PageName.
        Just trim spaces, ... See lib/stdlib.php

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -66,10 +66,10 @@
  */
 class WikiUser
 {
-    var $_userid = false;
-    var $_level = false;
-    var $_request, $_dbi, $_authdbi, $_homepage;
-    var $_authmethod = '', $_authhow = '';
+    public $_userid = false;
+    public $_level = false;
+    public $_request, $_dbi, $_authdbi, $_homepage;
+    public $_authmethod = '', $_authhow = '';
 
     /**
      * Constructor.

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUserNew.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -367,10 +367,10 @@
  */
 class _WikiUser
 {
-    var $_userid = '';
-    var $_level = WIKIAUTH_ANON;
-    var $_prefs = false;
-    var $_HomePagehandle = false;
+    public $_userid = '';
+    public $_level = WIKIAUTH_ANON;
+    public $_prefs = false;
+    public $_HomePagehandle = false;
 
     // constructor
     function _WikiUser($UserName = '', $prefs = false)
@@ -721,7 +721,7 @@
 class _AnonUser
     extends _WikiUser
 {
-    var $_level = WIKIAUTH_ANON; // var in php-5.0.0RC1 deprecated
+    public $_level = WIKIAUTH_ANON;
 
     /** Anon only gets to load and save prefs in a cookie, that's it.
      */
@@ -870,7 +870,7 @@
 class _ForbiddenUser
     extends _AnonUser
 {
-    var $_level = WIKIAUTH_FORBIDDEN;
+    public $_level = WIKIAUTH_FORBIDDEN;
 
     function checkPass($submitted_password)
     {
@@ -931,8 +931,8 @@
      * @tables: pref
      */
 {
-    var $_auth_dbi, $_prefs;
-    var $_current_method, $_current_index;
+    public $_auth_dbi, $_prefs;
+    public $_current_method, $_current_index;
 
     // check and prepare the auth and pref methods only once
     function _PassUser($UserName = '', $prefs = false)
@@ -1483,7 +1483,7 @@
 
 class _UserPreference
 {
-    var $default_value;
+    public $default_value;
 
     function _UserPreference($default_value)
     {
@@ -1928,7 +1928,7 @@
  */
 class UserPreferences
 {
-    var $notifyPagesAll;
+    public $notifyPagesAll;
 
     function UserPreferences($saved_prefs = false)
     {

Modified: trunk/lib/WysiwygEdit.php
===================================================================
--- trunk/lib/WysiwygEdit.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WysiwygEdit.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -102,7 +102,7 @@
 
 class Markup_html_p extends BalancedMarkup
 {
-    var $_start_regexp = "<(?:p|P)( class=\".*\")?>";
+    public $_start_regexp = "<(?:p|P)( class=\".*\")?>";
 
     function getEndRegexp($match)
     {
@@ -118,7 +118,7 @@
 //'<SPAN style="FONT-WEIGHT: bold">text</SPAN>' => '*text*'
 class Markup_html_spanbold extends BalancedMarkup
 {
-    var $_start_regexp = "<(?:span|SPAN) style=\"FONT-WEIGHT: bold\">";
+    public $_start_regexp = "<(?:span|SPAN) style=\"FONT-WEIGHT: bold\">";
 
     function getEndRegexp($match)
     {

Modified: trunk/lib/XmlParser.php
===================================================================
--- trunk/lib/XmlParser.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/XmlParser.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -50,7 +50,7 @@
 class XmlParser
 {
 
-    var $_parser, $root, $current, $previous, $parent;
+    public $_parser, $root, $current, $previous, $parent;
 
     function XmlParser($encoding = '')
     { //  "ISO-8859-1"

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/diff3.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -12,7 +12,7 @@
 
 class _Diff3_Block
 {
-    var $type = 'diff3';
+    public $type = 'diff3';
 
     function _Diff3_Block($orig = false, $final1 = false, $final2 = false)
     {
@@ -42,7 +42,7 @@
 
 class _Diff3_CopyBlock extends _Diff3_Block
 {
-    var $type = 'copy';
+    public $type = 'copy';
 
     function _Diff3_CopyBlock($lines = false)
     {

Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/difflib.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -10,9 +10,9 @@
 
 class _DiffOp
 {
-    var $type;
-    var $orig;
-    var $final;
+    public $type;
+    public $orig;
+    public $final;
 
     function reverse()
     {
@@ -32,7 +32,7 @@
 
 class _DiffOp_Copy extends _DiffOp
 {
-    var $type = 'copy';
+    public $type = 'copy';
 
     function _DiffOp_Copy($orig, $final = false)
     {
@@ -50,7 +50,7 @@
 
 class _DiffOp_Delete extends _DiffOp
 {
-    var $type = 'delete';
+    public $type = 'delete';
 
     function _DiffOp_Delete($lines)
     {
@@ -66,7 +66,7 @@
 
 class _DiffOp_Add extends _DiffOp
 {
-    var $type = 'add';
+    public $type = 'add';
 
     function _DiffOp_Add($lines)
     {
@@ -82,7 +82,7 @@
 
 class _DiffOp_Change extends _DiffOp
 {
-    var $type = 'change';
+    public $type = 'change';
 
     function _DiffOp_Change($orig, $final)
     {
@@ -505,7 +505,7 @@
  */
 class Diff
 {
-    var $edits;
+    public $edits;
 
     /**
      * Constructor.
@@ -713,7 +713,7 @@
      * This should be left at zero for this class, but subclasses
      * may want to set this to other values.
      */
-    var $leading_context_lines = 0;
+    public $leading_context_lines = 0;
 
     /**
      * Number of trailing context "lines" to preserve.
@@ -721,7 +721,7 @@
      * This should be left at zero for this class, but subclasses
      * may want to set this to other values.
      */
-    var $trailing_context_lines = 0;
+    public $trailing_context_lines = 0;
 
     /**
      * Format a diff.

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/main.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -50,7 +50,7 @@
 
 class WikiRequest extends Request
 {
-    var $_dbi;
+    public $_dbi;
 
     function WikiRequest()
     {

Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/PageDump.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -50,7 +50,7 @@
 class WikiPlugin_PageDump
     extends WikiPlugin
 {
-    var $MessageId;
+    public $MessageId;
 
     function getName()
     {

Modified: trunk/lib/plugin/PageTrail.php
===================================================================
--- trunk/lib/plugin/PageTrail.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/PageTrail.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -38,7 +38,7 @@
 class WikiPlugin_PageTrail
     extends WikiPlugin
 {
-    var $def_numberlinks = 5;
+    public $def_numberlinks = 5;
 
     function getName()
     {

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/RateIt.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -85,7 +85,7 @@
     extends WikiPlugin
 {
     static $toBeUniq = 1;
-    var $idTop = '';
+    public $idTop = '';
 
     function getName()
     {

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/RecentChanges.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -25,8 +25,8 @@
 
 class _RecentChanges_Formatter
 {
-    var $_absurls = false;
-    var $action = "RecentChanges";
+    public $_absurls = false;
+    public $action = "RecentChanges";
 
     function _RecentChanges_Formatter($rc_args)
     {
@@ -817,7 +817,7 @@
 class _RecentChanges_RssFormatter
     extends _RecentChanges_Formatter
 {
-    var $_absurls = true;
+    public $_absurls = true;
 
     function time($rev)
     {

Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/SiteMap.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -45,7 +45,7 @@
 class WikiPlugin_SiteMap
     extends WikiPlugin
 {
-    var $_pagename;
+    public $_pagename;
 
     function getName()
     {

Modified: trunk/lib/plugin/SqlResult.php
===================================================================
--- trunk/lib/plugin/SqlResult.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/SqlResult.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -61,7 +61,7 @@
 class WikiPlugin_SqlResult
     extends WikiPlugin
 {
-    var $_args;
+    public $_args;
 
     function getName()
     {

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/TeX2png.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -36,10 +36,10 @@
 class WikiPlugin_TeX2png
     extends WikiPlugin
 {
-    var $imagepath = 'images/tex';
-    var $latexbin = '/usr/bin/latex';
-    var $dvipsbin = '/usr/bin/dvips';
-    var $pstoimgbin = '/usr/bin/pstoimg';
+    public $imagepath = 'images/tex';
+    public $latexbin = '/usr/bin/latex';
+    public $dvipsbin = '/usr/bin/dvips';
+    public $pstoimgbin = '/usr/bin/pstoimg';
 
     function getName()
     {

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/UpLoad.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -36,9 +36,9 @@
 class WikiPlugin_UpLoad
     extends WikiPlugin
 {
-    var $disallowed_extensions;
+    public $disallowed_extensions;
     // TODO: use PagePerms instead
-    var $only_authenticated = true; // allow only authenticated users may upload.
+    public $only_authenticated = true; // allow only authenticated users may upload.
 
     function getName()
     {

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/UserPreferences.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -33,7 +33,7 @@
 class WikiPlugin_UserPreferences
     extends WikiPlugin
 {
-    var $bool_args;
+    public $bool_args;
 
     function getName()
     {

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/WikiPoll.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -54,7 +54,7 @@
 class WikiPlugin_WikiPoll
     extends WikiPlugin
 {
-    var $_args;
+    public $_args;
 
     function getName()
     {

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/stdlib.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -682,8 +682,6 @@
 
 class Stack
 {
-
-    // var in php5 deprecated
     function Stack()
     {
         $this->items = array();
@@ -808,19 +806,19 @@
      * This is the value of $name passed to the constructor.
      * (For use, e.g. as a default label for links to the page.)
      */
-    //var $shortName;
+    public $shortName;
 
     /** The full page name.
      *
      * This is the full name of the page (without anchor).
      */
-    //var $name;
+    public $name;
 
     /** The anchor.
      *
      * This is the referenced anchor within the page, or the empty string.
      */
-    //var $anchor;
+    public $anchor;
 
     /** Constructor
      *
@@ -1667,7 +1665,7 @@
 // expands a list containing regex's to its matching entries
 class ListRegexExpand
 {
-    //var $match, $list, $index, $case_sensitive;
+    public $match, $list, $index, $case_sensitive;
     function ListRegexExpand(&$list, $match, $case_sensitive = true)
     {
         $this->match = $match;

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/upgrade.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -1200,7 +1200,7 @@
     /**
      * check all pages for a plugin match
      */
-    var $silent_skip = 1;
+    public $silent_skip = 1;
 
     function default_method(&$args)
     {

Modified: trunk/lib/wikilens/CustomPrefs.php
===================================================================
--- trunk/lib/wikilens/CustomPrefs.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/wikilens/CustomPrefs.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -13,8 +13,8 @@
 class _UserPreference_recengine // recommendation engine method
     extends _UserPreference
 {
-    var $valid_values = array('php', 'mysuggest', 'mymovielens', 'mycluto');
-    var $default_value = 'php';
+    public $valid_values = array('php', 'mysuggest', 'mymovielens', 'mycluto');
+    public $default_value = 'php';
 
     function sanify($value)
     {
@@ -26,14 +26,14 @@
 class _UserPreference_recalgo // recommendation engine algorithm
     extends _UserPreference
 {
-    var $valid_values = array
+    public $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.
         // This algorithms tends to outperform the rest.
         'userCos', // User-based Top-N recommendation algorithm with cosine-based similarity function.
         'bayes'); // Naïve Bayesian Classifier
-    var $default_value = 'itemProb';
+    public $default_value = 'itemProb';
 
     function sanify($value)
     {

Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
---...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8788] trunk/locale

[<var...@us...>]

Revision: 8788
          http://sourceforge.net/p/phpwiki/code/8788
Author:   vargenau
Date:     2013-05-29 07:28:23 +0000 (Wed, 29 May 2013)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/de/LC_MESSAGES/phpwiki.php
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.php
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.php

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php	2013-05-29 07:16:44 UTC (rev 8787)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2013-05-29 07:28:23 UTC (rev 8788)
@@ -77,7 +77,7 @@
 $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["(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)";

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-05-29 07:16:44 UTC (rev 8787)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-05-29 07:28:23 UTC (rev 8788)
@@ -80,7 +80,7 @@
 $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["(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)";

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2013-05-29 07:16:44 UTC (rev 8787)
+++ trunk/locale/po/de.po	2013-05-29 07:28:23 UTC (rev 8788)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-29 09:07+0200\n"
+"POT-Creation-Date: 2013-05-29 09:27+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -5547,9 +5547,9 @@
 msgid "You can personalize various settings in %s."
 msgstr "Sie können einige Einstellungen in %s individuell gestalten."
 
-msgid "(Your preferences are stored as hidden data within this page)."
+msgid "(Your preferences are stored as hidden data within this page.)"
 msgstr ""
-"(Ihre Einstellungen sind als versteckte Daten in dieser Seite hintergelegt)."
+"(Ihre Einstellungen sind als versteckte Daten in dieser Seite hintergelegt.)"
 
 #, php-format
 msgid "The %s subpage enables simple weblogging."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013-05-29 07:16:44 UTC (rev 8787)
+++ trunk/locale/po/es.po	2013-05-29 07:28:23 UTC (rev 8788)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-29 09:07+0200\n"
+"POT-Creation-Date: 2013-05-29 09:27+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -5387,7 +5387,7 @@
 msgid "You can personalize various settings in %s."
 msgstr ""
 
-msgid "(Your preferences are stored as hidden data within this page)."
+msgid "(Your preferences are stored as hidden data within this page.)"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-05-29 07:16:44 UTC (rev 8787)
+++ trunk/locale/po/fr.po	2013-05-29 07:28:23 UTC (rev 8788)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-29 09:07+0200\n"
+"POT-Creation-Date: 2013-05-29 09:27+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -5436,7 +5436,7 @@
 msgid "You can personalize various settings in %s."
 msgstr "Vous pouvez personnaliser quelques préférences dans %s."
 
-msgid "(Your preferences are stored as hidden data within this page)."
+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.)"
 
 #, php-format

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013-05-29 07:16:44 UTC (rev 8787)
+++ trunk/locale/po/it.po	2013-05-29 07:28:23 UTC (rev 8788)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-29 09:07+0200\n"
+"POT-Creation-Date: 2013-05-29 09:27+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"
@@ -5331,7 +5331,7 @@
 msgid "You can personalize various settings in %s."
 msgstr ""
 
-msgid "(Your preferences are stored as hidden data within this page)."
+msgid "(Your preferences are stored as hidden data within this page.)"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013-05-29 07:16:44 UTC (rev 8787)
+++ trunk/locale/po/ja.po	2013-05-29 07:28:23 UTC (rev 8788)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-29 09:07+0200\n"
+"POT-Creation-Date: 2013-05-29 09:27+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5489,7 +5489,7 @@
 msgid "You can personalize various settings in %s."
 msgstr ""
 
-msgid "(Your preferences are stored as hidden data within this page)."
+msgid "(Your preferences are stored as hidden data within this page.)"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2013-05-29 07:16:44 UTC (rev 8787)
+++ trunk/locale/po/nl.po	2013-05-29 07:28:23 UTC (rev 8788)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-29 09:07+0200\n"
+"POT-Creation-Date: 2013-05-29 09:27+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -5316,7 +5316,7 @@
 msgid "You can personalize various settings in %s."
 msgstr ""
 
-msgid "(Your preferences are stored as hidden data within this page)."
+msgid "(Your preferences are stored as hidden data within this page.)"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013-05-29 07:16:44 UTC (rev 8787)
+++ trunk/locale/po/phpwiki.pot	2013-05-29 07:28:23 UTC (rev 8788)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-29 09:07+0200\n"
+"POT-Creation-Date: 2013-05-29 09:27+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5303,7 +5303,7 @@
 msgid "You can personalize various settings in %s."
 msgstr ""
 
-msgid "(Your preferences are stored as hidden data within this page)."
+msgid "(Your preferences are stored as hidden data within this page.)"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2013-05-29 07:16:44 UTC (rev 8787)
+++ trunk/locale/po/sv.po	2013-05-29 07:28:23 UTC (rev 8788)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-29 09:07+0200\n"
+"POT-Creation-Date: 2013-05-29 09:27+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -5307,7 +5307,7 @@
 msgid "You can personalize various settings in %s."
 msgstr ""
 
-msgid "(Your preferences are stored as hidden data within this page)."
+msgid "(Your preferences are stored as hidden data within this page.)"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2013-05-29 07:16:44 UTC (rev 8787)
+++ trunk/locale/po/zh.po	2013-05-29 07:28:23 UTC (rev 8788)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-29 09:07+0200\n"
+"POT-Creation-Date: 2013-05-29 09:27+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5605,8 +5605,8 @@
 msgid "You can personalize various settings in %s."
 msgstr "你可以在 %s 自訂多種個人化設定."
 
-msgid "(Your preferences are stored as hidden data within this page)."
-msgstr "(你的偏好設定已經存放並隱藏在此頁面中)."
+msgid "(Your preferences are stored as hidden data within this page.)"
+msgstr "(你的偏好設定已經存放並隱藏在此頁面中.)"
 
 #, php-format
 msgid "The %s subpage enables simple weblogging."

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/zh/LC_MESSAGES/phpwiki.php	2013-05-29 07:16:44 UTC (rev 8787)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php	2013-05-29 07:28:23 UTC (rev 8788)
@@ -46,7 +46,7 @@
 $locale["%s: not defined"] = "%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["(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)";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8787] trunk/themes/default/templates/homepage.tmpl

[<var...@us...>]

Revision: 8787
          http://sourceforge.net/p/phpwiki/code/8787
Author:   vargenau
Date:     2013-05-29 07:16:44 +0000 (Wed, 29 May 2013)
Log Message:
-----------
Typo

Modified Paths:
--------------
    trunk/themes/default/templates/homepage.tmpl

Modified: trunk/themes/default/templates/homepage.tmpl
===================================================================
--- trunk/themes/default/templates/homepage.tmpl	2013-05-29 07:08:32 UTC (rev 8786)
+++ trunk/themes/default/templates/homepage.tmpl	2013-05-29 07:16:44 UTC (rev 8787)
@@ -9,7 +9,7 @@
     sprintf(_("You can personalize various settings in %s."),
             _("UserPreferences"));
 $UserPreferencesMessage[1] =
-    _("(Your preferences are stored as hidden data within this page).");
+    _("(Your preferences are stored as hidden data within this page.)");
 
 $CalendarSubpage = sprintf('[%s]', SUBPAGE_SEPARATOR . _("Calendar"));
 $calendarMessage = sprintf(_("The %s subpage enables simple weblogging."),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8786] trunk/locale

[<var...@us...>]

Revision: 8786
          http://sourceforge.net/p/phpwiki/code/8786
Author:   vargenau
Date:     2013-05-29 07:08:32 +0000 (Wed, 29 May 2013)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.php
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.php

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-05-28 17:13:01 UTC (rev 8785)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-05-29 07:08:32 UTC (rev 8786)
@@ -173,6 +173,7 @@
 $locale["Are you sure you want to replace text in the selected files?"] = "Êtes-vous sur de vouloir rechercher et remplacer dans les fichiers sélectionnés ?";
 $locale["Argument “%s” not declared by plugin."] = "argument “%s” non déclaré par le plugin.";
 $locale["Arguments"] = "Arguments";
+$locale["Atom Aggregator Plugin."] = "Greffon Atom.";
 $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";
@@ -342,6 +343,7 @@
 $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 PageTrail."] = "Afficher le fil d'Ariane.";
 $locale["Display a list of randomly chosen pages or redirects to a random page."] = "Affiche une liste de pages prises au hasard sur ce wiki.";
 $locale["Display 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["Display a url in a separate frame inside our body. Only one frame allowed."] = "Affiche une URL dans une cadre interne à la page. Un seul cadre autorisé.";

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2013-05-28 17:13:01 UTC (rev 8785)
+++ trunk/locale/po/de.po	2013-05-29 07:08:32 UTC (rev 8786)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 19:11+0200\n"
+"POT-Creation-Date: 2013-05-29 09:07+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1378,9 +1378,8 @@
 msgid "AtomFeed"
 msgstr ""
 
-#, fuzzy
 msgid "Atom Aggregator Plugin."
-msgstr "Einfaches RSS Feed Plugin"
+msgstr ""
 
 msgid "AuthInfo"
 msgstr "AuthentifizierungsInfo"
@@ -1972,9 +1971,8 @@
 msgid "JabberPresence"
 msgstr "JabberAnwesend"
 
-#, fuzzy
 msgid "Display Jabber presence."
-msgstr "JabberAnwesend"
+msgstr ""
 
 msgid "LdapSearch"
 msgstr "LdapSuche"
@@ -2356,9 +2354,8 @@
 msgid "PageTrail"
 msgstr ""
 
-#, fuzzy
 msgid "Display PageTrail."
-msgstr "Spur"
+msgstr ""
 
 msgid "PasswordReset"
 msgstr "PasswortZurücksetzen"
@@ -2487,9 +2484,8 @@
 msgid "Ploticus"
 msgstr "Ploticus"
 
-#, fuzzy
 msgid "Ploticus image creation."
-msgstr "Seiten Version"
+msgstr ""
 
 msgid "shell commands not allowed in Ploticus"
 msgstr ""

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013-05-28 17:13:01 UTC (rev 8785)
+++ trunk/locale/po/es.po	2013-05-29 07:08:32 UTC (rev 8786)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 19:11+0200\n"
+"POT-Creation-Date: 2013-05-29 09:07+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -485,7 +485,7 @@
 
 #, fuzzy, php-format
 msgid "Illegal character “%s” in page name."
-msgstr "Los carbones ilegales %s quitaron"
+msgstr "Los carbones ilegales “%s” quitaron."
 
 #, php-format
 msgid "unknown color %s ignored"
@@ -2057,7 +2057,7 @@
 
 #, fuzzy
 msgid "Support moderated pages."
-msgstr "Los tratantes apoyados son: %s"
+msgstr "Los tratantes apoyados son."
 
 msgid "No e-mails for the moderators defined"
 msgstr ""
@@ -2412,9 +2412,8 @@
 msgid "Ploticus"
 msgstr ""
 
-#, fuzzy
 msgid "Ploticus image creation."
-msgstr "Versión de la página"
+msgstr ""
 
 msgid "shell commands not allowed in Ploticus"
 msgstr ""
@@ -3867,7 +3866,7 @@
 
 #, fuzzy
 msgid "Cannot rename. New page name too long."
-msgstr "La nombre de página demasiado de largo"
+msgstr "La nombre de página demasiado de largo."
 
 #, php-format
 msgid "Page “%s” already exists. Ignored."

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-05-28 17:13:01 UTC (rev 8785)
+++ trunk/locale/po/fr.po	2013-05-29 07:08:32 UTC (rev 8786)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 19:11+0200\n"
+"POT-Creation-Date: 2013-05-29 09:07+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1350,9 +1350,8 @@
 msgid "AtomFeed"
 msgstr ""
 
-#, fuzzy
 msgid "Atom Aggregator Plugin."
-msgstr "Importer des ressources RSS"
+msgstr "Greffon Atom."
 
 msgid "AuthInfo"
 msgstr ""
@@ -2061,9 +2060,8 @@
 msgid "Layout tables using a Mediawiki-like markup style."
 msgstr ""
 
-#, fuzzy
 msgid "Support moderated pages."
-msgstr "Langages supportés"
+msgstr ""
 
 msgid "No e-mails for the moderators defined"
 msgstr ""
@@ -2300,9 +2298,8 @@
 msgid "PageTrail"
 msgstr "TracePage"
 
-#, fuzzy
 msgid "Display PageTrail."
-msgstr "TracePage"
+msgstr "Afficher le fil d'Ariane."
 
 msgid "PasswordReset"
 msgstr ""

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013-05-28 17:13:01 UTC (rev 8785)
+++ trunk/locale/po/it.po	2013-05-29 07:08:32 UTC (rev 8786)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 19:11+0200\n"
+"POT-Creation-Date: 2013-05-29 09:07+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"
@@ -1917,9 +1917,8 @@
 msgid "JabberPresence"
 msgstr "JabberPresenca"
 
-#, fuzzy
 msgid "Display Jabber presence."
-msgstr "JabberPresenca"
+msgstr ""
 
 msgid "LdapSearch"
 msgstr "LdapRicerca"
@@ -2251,9 +2250,9 @@
 msgid "History of changes."
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "List PageHistory for %s."
-msgstr "StoricoPagina"
+msgstr ""
 
 msgid "PageInfo"
 msgstr "InfoPagina"
@@ -2390,9 +2389,8 @@
 msgid "Ploticus"
 msgstr ""
 
-#, fuzzy
 msgid "Ploticus image creation."
-msgstr "Versione della Pagina"
+msgstr ""
 
 msgid "shell commands not allowed in Ploticus"
 msgstr ""
@@ -3823,7 +3821,7 @@
 
 #, fuzzy
 msgid "Rename selected pages."
-msgstr "rinominare questa pagina"
+msgstr "Rinominare questa pagina."
 
 msgid "Rename to"
 msgstr ""

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013-05-28 17:13:01 UTC (rev 8785)
+++ trunk/locale/po/ja.po	2013-05-29 07:08:32 UTC (rev 8786)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 19:11+0200\n"
+"POT-Creation-Date: 2013-05-29 09:07+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2013-05-28 17:13:01 UTC (rev 8785)
+++ trunk/locale/po/nl.po	2013-05-29 07:08:32 UTC (rev 8786)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 19:11+0200\n"
+"POT-Creation-Date: 2013-05-29 09:07+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -2242,9 +2242,9 @@
 msgid "History of changes."
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "List PageHistory for %s."
-msgstr "PaginaGeschiedenis"
+msgstr ""
 
 msgid "PageInfo"
 msgstr ""
@@ -2381,9 +2381,8 @@
 msgid "Ploticus"
 msgstr ""
 
-#, fuzzy
 msgid "Ploticus image creation."
-msgstr "Pagina Versie"
+msgstr ""
 
 msgid "shell commands not allowed in Ploticus"
 msgstr ""

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013-05-28 17:13:01 UTC (rev 8785)
+++ trunk/locale/po/phpwiki.pot	2013-05-29 07:08:32 UTC (rev 8786)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 19:11+0200\n"
+"POT-Creation-Date: 2013-05-29 09:07+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2013-05-28 17:13:01 UTC (rev 8785)
+++ trunk/locale/po/sv.po	2013-05-29 07:08:32 UTC (rev 8786)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 19:11+0200\n"
+"POT-Creation-Date: 2013-05-29 09:07+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2013-05-28 17:13:01 UTC (rev 8785)
+++ trunk/locale/po/zh.po	2013-05-29 07:08:32 UTC (rev 8786)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 19:11+0200\n"
+"POT-Creation-Date: 2013-05-29 09:07+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -470,7 +470,7 @@
 
 #, php-format
 msgid "%s: file not found"
-msgstr "%s: 找不到檔案."
+msgstr "%s: 找不到檔案"
 
 msgid "CategoryGroup"
 msgstr ""
@@ -481,9 +481,8 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#, fuzzy
 msgid ": "
-msgstr "%s: %s"
+msgstr ": "
 
 #, fuzzy
 msgid "Page name too long"
@@ -610,7 +609,7 @@
 
 #, fuzzy
 msgid "New page"
-msgstr "新頁面."
+msgstr "新頁面"
 
 msgid "has edit conflicts - overwriting anyway"
 msgstr "編輯衝突 - 無論如何都覆寫"

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/zh/LC_MESSAGES/phpwiki.php	2013-05-28 17:13:01 UTC (rev 8785)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php	2013-05-29 07:08:32 UTC (rev 8786)
@@ -41,7 +41,7 @@
 $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: file not found"] = "%s: 找不到檔案";
 $locale["%s: no such class"] = "%s: 無此類別";
 $locale["%s: not defined"] = "%s: 未被定義";
 $locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] = "(複製你的更動到剪貼簿中. 你可以試著編輯另一個不同的頁面或存到文字編輯器中.)";
@@ -58,6 +58,7 @@
 $locale["1 day"] = "1 天";
 $locale["1 word"] = "1 個單字";
 $locale[":"] = ":";
+$locale[": "] = ": ";
 $locale["<%s: no such section>"] = "<%s: 沒有此部份>";
 $locale["<empty>"] = "<空白>";
 $locale["<no matches>"] = "<沒有相符>";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8785] trunk

[<var...@us...>]

Revision: 8785
          http://sourceforge.net/p/phpwiki/code/8785
Author:   vargenau
Date:     2013-05-28 17:13:01 +0000 (Tue, 28 May 2013)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/lib/plugin/SemanticSearchAdvanced.php
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/de/LC_MESSAGES/phpwiki.php
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.php
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.php
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.php
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/sv/LC_MESSAGES/phpwiki.php
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.php

Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php	2013-05-28 16:45:33 UTC (rev 8784)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php	2013-05-28 17:13:01 UTC (rev 8785)
@@ -119,7 +119,7 @@
             $hiddenfield, HiddenInputs(array('attribute' => '')),
             $instructions, HTML::br(),
             HTML::table(array('border' => '0', 'width' => '100%'),
-                HTML::tr(HTML::td(_("Pagename(s): "), $pagefilter),
+                HTML::tr(HTML::td(_("Page Name")._(': '), $pagefilter),
                     HTML::td(array('align' => 'right'),
                         $help)),
                 HTML::tr(HTML::td(array('colspan' => 2),

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php	2013-05-28 16:45:33 UTC (rev 8784)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2013-05-28 17:13:01 UTC (rev 8785)
@@ -26,10 +26,10 @@
 $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 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)";
@@ -68,7 +68,7 @@
 $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: 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.";
@@ -108,7 +108,7 @@
 $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 deleted for page “%s”"] = "ACL für Seite »%s« gelöscht.";
+$locale["ACL deleted for page “%s”"] = "ACL für Seite »%s« gelöscht";
 $locale["ACL not changed for page “%s”."] = "ACL für Seite »%s« nicht geändert.";
 $locale["ADDING"] = "HINZU";
 $locale["ADMIN"] = "ADMIN";
@@ -217,7 +217,7 @@
 $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["Cannot rename. New page name too long."] = "Kein Ausgewählte. Seite Name zu lang";
+$locale["Cannot rename. New page name too long."] = "Kein Ausgewählte. Seite Name zu lang.";
 $locale["Case exact?"] = "Groß-/Kleinschreibung beachten";
 $locale["Case insensitive?"] = "Groß-/Kleinschreibung beachten?";
 $locale["Category"] = "Kategorie";
@@ -229,12 +229,12 @@
 $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 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 ausgewählte Seiten ändern.";
-$locale["Change owner to: "] = "Besitzer ändern zu:";
+$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["Change your rating from "] = "Ändern Sie Ihre Bewertung ab ";
@@ -250,7 +250,7 @@
 $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 menu items to display."] = "Klicken um anzuzeigen";
+$locale["Check menu items to display."] = "Klicken um anzuzeigen.";
 $locale["Check to add this ACL"] = "Anklicken um diese ACL hinzuzufügen";
 $locale["Check you are logged in."] = "Sie sollten jetzt angemeldet sein.";
 $locale["Chmod"] = "Chmod";
@@ -402,7 +402,7 @@
 $locale["Failed to connect to LDAP host"] = "LDAP Server nicht gefunden";
 $locale["Fatal PhpWiki Error"] = "Fataler PhpWiki-Fehler";
 $locale["File successfully uploaded."] = "Datei erfolgreich hochgeladen.";
-$locale["File “%s” not found."] = "Datei »%s« nicht gefunden";
+$locale["File “%s” not found."] = "Datei »%s« nicht gefunden.";
 $locale["FileInfo"] = "DateiInfo";
 $locale["Files with extension %s are not allowed."] = "Dateien mit der Endung %s sind nicht erlaubt.";
 $locale["Find page"] = "Seite finden";
@@ -676,14 +676,14 @@
 $locale["OldStyleTable"] = "TraditionellerTabellenStil";
 $locale["Older page:"] = "Ältere Seite:";
 $locale["One UserPreferences field successfully updated."] = "Eined BenutzerEinstellung erfolgreich auf neuesten Stand gebracht.";
-$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 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 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["Only files with the extension %s are allowed."] = "Nur Dateien mit der Endung %s sind erlaubt";
+$locale["Only files with the extension %s are allowed."] = "Nur Dateien mit der Endung %s 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";
@@ -720,19 +720,19 @@
 $locale["Page statistics"] = "Seiten Statistiken";
 $locale["Page successfully updated."] = "Datei erfolgreich geändert.";
 $locale["Page “%s” already exists. Ignored."] = "Seite %s existiert bereits. Ignoriert.";
-$locale["Page “%s” does not exist."] = "Seite »%s« existiert nicht";
+$locale["Page “%s” does not exist."] = "Seite »%s« existiert nicht.";
 $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["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["Pagedata size: %d KiB"] = "Größe der Seitendaten: %d KiB";
-$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["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.";
@@ -776,7 +776,7 @@
 $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["Plugin “%s” does not exist."] = "Zusatzprogramm »%s« existiert nicht.";
 $locale["PluginManager"] = "ZusatzprogrammManager";
 $locale["PopularNearby"] = "MeistBesuchtNahe";
 $locale["Post new"] = "Neuer Eintrag";
@@ -901,7 +901,7 @@
 $locale["Search the titles of all pages in this wiki."] = "Die Titeln aller Seiten dieses Wikis durchsuchen.";
 $locale["Search:"] = "Suche:";
 $locale["SearchHighlight"] = "SucheHervorheben";
-$locale["SearchReplace"] = "Suchen & Ersetzen";
+$locale["SearchReplace"] = "Suchen und Ersetzen";
 $locale["See %s"] = "Siehe %s";
 $locale["See %s tips for editing."] = "Siehe %s Tips fürs Edieren.";
 $locale["See: %s"] = "Siehe: %s";
@@ -909,7 +909,7 @@
 $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 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:";
@@ -985,7 +985,7 @@
 $locale["Synopsis"] = "Übersicht";
 $locale["SyntaxHighlighter"] = "SyntaxHervorhebung";
 $locale["Table of Contents"] = "Inhaltsverzeichnis";
-$locale["TeX imagepath not writable."] = "Keine Schreibrechte für das TeX Bildpath";
+$locale["TeX imagepath not writable."] = "Keine Schreibrechte für das TeX Bildpath.";
 $locale["Template"] = "Vorlage";
 $locale["Template Name"] = "Vorlagenname";
 $locale["TermsOfUse"] = "BenutzungsBedingungen";
@@ -1119,7 +1119,7 @@
 $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";

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-05-28 16:45:33 UTC (rev 8784)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-05-28 17:13:01 UTC (rev 8785)
@@ -253,7 +253,7 @@
 $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["Check you are logged in."] = "Vous devez vous identifier.";
 $locale["Chmod"] = "Chmod";
 $locale["Chmod to permission:"] = "Changer le mode de permission à :";
 $locale["Click a button to get an example text"] = "Cliquer sur un bouton pour obtenir une exemple de texte";
@@ -521,7 +521,7 @@
 $locale["Illegal character “%s” in page name."] = "Caractère « %s » interdit dans le nom de la page.";
 $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 inclusion of page %s: no read access."] = "Insertion récursive de la page %s ignoré.";
 $locale["Illegal operator: %s"] = "Opérateur interdit : %s";
 $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";
@@ -558,7 +558,7 @@
 $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 size"] = "Taille d'image invalide";
-$locale["Invalid password or userid."] = "Mot de passe ou utilisateur non valide :";
+$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.";
@@ -774,7 +774,7 @@
 $locale["Pagedata size: %d KiB"] = "Taille des données de la page : %d Kio";
 $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 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.";
@@ -818,7 +818,6 @@
 $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["Prediction: %.1f"] = "Prédiction : %.1f";
 $locale["Prediction: %s"] = "Prédiction : %s";
 $locale["Preferences"] = "Préférences";
@@ -829,6 +828,7 @@
 $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 only! Changes not saved. Please continue editing. (You'll find your edit area at the bottom of the page.)"] = "Vous êtes en prévisualisation ! Veuillez continuer votre édition. (Vous trouverez votre zone d'édition en bas de page).";
 $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";
@@ -851,7 +851,7 @@
 $locale["Purge cancelled"] = "Purge de la page annulée";
 $locale["Purge this page"] = "Purger cette page";
 $locale["PurgeHtmlCache"] = "PurgerLeCache";
-$locale["Purged page “%s” successfully."] = "Page « %s » purgée avec succès";
+$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";
@@ -903,7 +903,7 @@
 $locale["Remove cancelled"] = "Suppression de la page annulée";
 $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["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";
@@ -1080,7 +1080,7 @@
 $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 project is shared with third-party users"] = "The projet est partagé avec des utilisateurs extérieurs";
-$locale["This revision of the page does not exist."] = "Cette version de la page n'existe 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";
@@ -1176,7 +1176,7 @@
 $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 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";
@@ -1193,6 +1193,7 @@
 $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["Warning: You are editing an old revision. Saving this page will overwrite the current version."] = "Attention : vous modifiez une ancienne version de cette page. Enregistrer cette page écrasera la version actuelle.";
 $locale["Watch"] = "Surveiller";
 $locale["Watch Page"] = "Surveiller";
 $locale["WatchPage"] = "Suivre";

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/it/LC_MESSAGES/phpwiki.php	2013-05-28 16:45:33 UTC (rev 8784)
+++ trunk/locale/it/LC_MESSAGES/phpwiki.php	2013-05-28 17:13:01 UTC (rev 8785)
@@ -189,7 +189,7 @@
 $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["Renamed page from “%s” to “%s”."] = "Cambia titolo %s a %s";
+$locale["Renamed page from “%s” to “%s”."] = "Cambia titolo %s a %s.";
 $locale["Reset Preferences"] = "Ripristina Preferenze";
 $locale["Restore Anyway"] = "Restore Comunque";
 $locale["Revert"] = "Ritorni";

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/nl/LC_MESSAGES/phpwiki.php	2013-05-28 16:45:33 UTC (rev 8784)
+++ trunk/locale/nl/LC_MESSAGES/phpwiki.php	2013-05-28 17:13:01 UTC (rev 8785)
@@ -1,6 +1,6 @@
 <?php
 
-$locale[" is identical."] = " zijn identiek";
+$locale[" is identical."] = " zijn identiek.";
 $locale[" to "] = " naar ";
 $locale["%4d  %s\n"] = "%4d  %s\n";
 $locale["%s: %s"] = "%s: %s";

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2013-05-28 16:45:33 UTC (rev 8784)
+++ trunk/locale/po/de.po	2013-05-28 17:13:01 UTC (rev 8785)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 18:44+0200\n"
+"POT-Creation-Date: 2013-05-28 19:11+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -70,7 +70,7 @@
 
 #, php-format
 msgid "Page “%s” does not exist."
-msgstr "Seite »%s« existiert nicht"
+msgstr "Seite »%s« existiert nicht."
 
 #, php-format
 msgid "Diff: %s"
@@ -1123,7 +1123,7 @@
 msgstr "Umbenennen"
 
 msgid "SearchReplace"
-msgstr "Suchen & Ersetzen"
+msgstr "Suchen und Ersetzen"
 
 msgid "List this page and all subpages"
 msgstr "Auflistung aller Seiten und Unterseiten"
@@ -1619,7 +1619,7 @@
 
 #, php-format
 msgid "%s: no such revision %d."
-msgstr "%s(%d): keine solche Version"
+msgstr "%s(%d): keine solche Version."
 
 msgid "CreateToc disabled for old markup."
 msgstr "InhaltsVerzeichnis deaktiviert für altes Markup."
@@ -1715,7 +1715,7 @@
 
 #, php-format
 msgid "File “%s” not found."
-msgstr "Datei »%s« nicht gefunden"
+msgstr "Datei »%s« nicht gefunden."
 
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
@@ -2291,7 +2291,7 @@
 
 #, php-format
 msgid "PageGroup for %s."
-msgstr "SeitenGruppe für »%s«"
+msgstr "SeitenGruppe für »%s«."
 
 msgid "Contents"
 msgstr "Inhalt"
@@ -3332,7 +3332,7 @@
 msgstr ""
 
 msgid "TeX imagepath not writable."
-msgstr "Keine Schreibrechte für das TeX Bildpath"
+msgstr "Keine Schreibrechte für das TeX Bildpath."
 
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
@@ -3489,7 +3489,7 @@
 
 #, php-format
 msgid "Only files with the extension %s are allowed."
-msgstr "Nur Dateien mit der Endung %s sind erlaubt"
+msgstr "Nur Dateien mit der Endung %s sind erlaubt."
 
 msgid ""
 "Invalid filename. File names may only contain alphanumeric characters and "
@@ -3784,11 +3784,11 @@
 msgstr "Konnte den Besitzer der Seite »%s« nicht in »%s« ändern."
 
 msgid "One page has been changed:"
-msgstr "Eine Seite wird geändert."
+msgstr "Eine Seite wird geändert:"
 
 #, php-format
 msgid "%d pages have been changed:"
-msgstr "%d Seiten wurden geändert."
+msgstr "%d Seiten wurden geändert:"
 
 msgid "PhpWikiAdministration/Chown"
 msgstr "PhpWikiSystemverwalten/Chown"
@@ -3801,21 +3801,21 @@
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
 
 msgid "Select the pages to change the owner"
-msgstr "Wählen Sie die Seiten zum Ändern:"
+msgstr "Wählen Sie die Seiten zum Ändern"
 
 msgid "Change owner to: "
-msgstr "Besitzer ändern zu:"
+msgstr "Besitzer ändern zu: "
 
 msgid "WikiDeleteAcl"
 msgstr ""
 
 #, fuzzy
 msgid "Delete page permissions."
-msgstr "Vorgabe Zugriffsrecht"
+msgstr "Vorgabe Zugriffsrecht."
 
 #, php-format
 msgid "ACL deleted for page “%s”"
-msgstr "ACL für Seite »%s« gelöscht."
+msgstr "ACL für Seite »%s« gelöscht"
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
@@ -3828,7 +3828,7 @@
 
 #, fuzzy
 msgid "Select the pages where to delete access rights"
-msgstr "Wählen Sie die Seiten zum Ändern:"
+msgstr "Wählen Sie die Seiten zum Ändern"
 
 msgid "Selected Pages: "
 msgstr "Ausgewählte Seiten: "
@@ -3870,7 +3870,7 @@
 msgstr "Wählen Sie die Seiten zum Ändern:"
 
 msgid "Change markup to: "
-msgstr "Ändere Formatierung zu:"
+msgstr "Ändere Formatierung zu: "
 
 msgid "WikiAdminPurge"
 msgstr ""
@@ -3887,11 +3887,11 @@
 msgstr "Seite »%s« wurde nicht gelöscht. Zugriff verweigert."
 
 msgid "One page has been permanently purged:"
-msgstr "Eine Seite wird unwiderruflich gelöscht."
+msgstr "Eine Seite wird unwiderruflich gelöscht:"
 
 #, php-format
 msgid "%d pages have been permanently purged:"
-msgstr "%d Seiten wurden unwiderruflich gelöscht."
+msgstr "%d Seiten wurden unwiderruflich gelöscht:"
 
 msgid "No pages purged."
 msgstr "Keine Änderungen."
@@ -3933,7 +3933,7 @@
 
 #, php-format
 msgid "%d pages have been removed:"
-msgstr "%d Seiten wurden geändert."
+msgstr "%d Seiten wurden geändert:"
 
 msgid "No pages removed."
 msgstr "Keine Seiten gelöscht."
@@ -3966,14 +3966,14 @@
 #, 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."
 
 msgid "WikiAdminRename"
 msgstr "WikiAdminUmbenennen"
 
 #, fuzzy
 msgid "Rename selected pages."
-msgstr "Ausgewählte Seiten umbenennen"
+msgstr "Ausgewählte Seiten umbenennen."
 
 msgid "Rename to"
 msgstr "Umbennen zu"
@@ -3992,7 +3992,7 @@
 msgstr "Wähle Seiten zum Umbenennen aus:"
 
 msgid "Cannot rename. New page name too long."
-msgstr "Kein Ausgewählte. Seite Name zu lang"
+msgstr "Kein Ausgewählte. Seite Name zu lang."
 
 #, php-format
 msgid "Page “%s” already exists. Ignored."
@@ -4015,11 +4015,11 @@
 msgstr "Konnte Seite »%s« nicht in »%s« umbenennen."
 
 msgid "One page has been renamed:"
-msgstr "Eine Seite wird geändert."
+msgstr "Eine Seite wird geändert:"
 
 #, php-format
 msgid "%d pages have been renamed:"
-msgstr "%d Seiten wurden geändert."
+msgstr "%d Seiten wurden geändert:"
 
 msgid "No pages renamed."
 msgstr "Keine Seiten umbenannt."
@@ -5020,7 +5020,7 @@
 
 #, php-format
 msgid "Plugin “%s” does not exist."
-msgstr "Zusatzprogramm »%s« existiert nicht"
+msgstr "Zusatzprogramm »%s« existiert nicht."
 
 #, php-format
 msgid "%s: no such class"
@@ -5382,7 +5382,7 @@
 msgstr "Sie sehen eine alte Version dieser Seite."
 
 msgid "View the current version."
-msgstr "Die aktuelle Version ansehen"
+msgstr "Die aktuelle Version ansehen."
 
 #, php-format
 msgid "Page Execution took %s seconds"
@@ -6035,7 +6035,7 @@
 msgstr ""
 
 msgid "Check menu items to display."
-msgstr "Klicken um anzuzeigen"
+msgstr "Klicken um anzuzeigen."
 
 msgid "Left Menu"
 msgstr ""

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013-05-28 16:45:33 UTC (rev 8784)
+++ trunk/locale/po/es.po	2013-05-28 17:13:01 UTC (rev 8785)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 18:44+0200\n"
+"POT-Creation-Date: 2013-05-28 19:11+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-05-28 16:45:33 UTC (rev 8784)
+++ trunk/locale/po/fr.po	2013-05-28 17:13:01 UTC (rev 8785)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 18:44+0200\n"
+"POT-Creation-Date: 2013-05-28 19:11+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1888,7 +1888,7 @@
 
 #, php-format
 msgid "Illegal inclusion of page %s: no read access."
-msgstr "insertion récursive de la page %s ignoré"
+msgstr "Insertion récursive de la page %s ignoré."
 
 msgid "Error: rev must be a positive integer."
 msgstr ""
@@ -3060,7 +3060,7 @@
 
 #, php-format
 msgid "Postponed %s for %s."
-msgstr "Pas de listes trouvées pour %1$s"
+msgstr ""
 
 msgid "skipped"
 msgstr "ignoré"
@@ -3397,7 +3397,7 @@
 msgstr ""
 
 msgid "Check you are logged in."
-msgstr "Vous devez vous identifier"
+msgstr "Vous devez vous identifier."
 
 msgid "Check you are in the right project."
 msgstr "Vérifiez que vous êtes dans le bon projet."
@@ -3480,7 +3480,7 @@
 msgstr "Erreur de mot de passe. Veuillez recommencer."
 
 msgid "Password updated."
-msgstr "Mot de passe mis à jour"
+msgstr "Mot de passe mis à jour."
 
 msgid "Password was not changed."
 msgstr "Le mot de passe n'a pas été mis à jour."
@@ -3803,7 +3803,7 @@
 
 #, php-format
 msgid "Purged page “%s” successfully."
-msgstr "Page « %s » purgée avec succès"
+msgstr "Page « %s » purgée avec succès."
 
 #, php-format
 msgid "Didn't purge page “%s”. Access denied."
@@ -3842,7 +3842,7 @@
 
 #, php-format
 msgid "Removed page “%s” successfully."
-msgstr "Page « %s » supprimée avec succès"
+msgstr "Page « %s » supprimée avec succès."
 
 #, php-format
 msgid "Didn't remove page “%s”. Access denied."
@@ -5063,7 +5063,7 @@
 msgstr "Mot de passe invalide."
 
 msgid "Invalid password or userid."
-msgstr "Mot de passe ou utilisateur non valide :"
+msgstr "Mot de passe ou utilisateur non valide."
 
 msgid "Insufficient permissions."
 msgstr "Permissions insuffisantes."
@@ -5272,7 +5272,7 @@
 msgstr "Vous lisez une ancienne version de cette page."
 
 msgid "View the current version."
-msgstr "Visualiser la version actuelle"
+msgstr "Visualiser la version actuelle."
 
 #, php-format
 msgid "Page Execution took %s seconds"
@@ -5847,20 +5847,21 @@
 msgstr "Erreur :"
 
 msgid "This revision of the page does not exist."
-msgstr "Cette version de la page n'existe pas"
+msgstr "Cette version de la page n'existe pas."
 
-#, fuzzy
 msgid ""
 "Preview only! Changes not saved. Please continue editing. (You'll find your "
 "edit area at the bottom of the page.)"
 msgstr ""
-"Veuillez continuer votre édition. (Vous trouverez votre %s en bas de page)."
+"Vous êtes en prévisualisation ! Veuillez continuer votre édition. (Vous "
+"trouverez votre zone d'édition en bas de page)."
 
-#, fuzzy
 msgid ""
 "Warning: You are editing an old revision. Saving this page will overwrite "
 "the current version."
-msgstr "Enregistrer cette page écrasera la version actuelle."
+msgstr ""
+"Attention : vous modifiez une ancienne version de cette page. Enregistrer "
+"cette page écrasera la version actuelle."
 
 msgid "Warning: leaving the page will lose all your modifications!"
 msgstr ""
@@ -6075,108 +6076,3 @@
 
 msgid "Edit this page"
 msgstr "Modifier cette page"
-
-#~ msgid "Pagename(s): "
-#~ msgstr "Nom de la page : "
-
-#~ msgid "Sorry. Access Restrictions not yet implemented"
-#~ msgstr "Désolé. Restriction d'accès pas encore disponible"
-
-#~ msgid "SteveWainstead"
-#~ msgstr "SteveWainstead"
-
-#~ msgid "Plugins"
-#~ msgstr "Greffons"
-
-#~ msgid "PageTrail Plugin"
-#~ msgstr "Pour suivre les pages à la trace"
-
-#~ msgid " replace "
-#~ msgstr " remplace "
-
-#~ msgid "I'm sorry, there is no such page as %s."
-#~ msgstr "Désolé, %s ne correspond à aucune page."
-
-#~ msgid "from %s"
-#~ msgstr "du %s"
-
-#~ msgid "%s is empty"
-#~ msgstr "%s est vide"
-
-#~ msgid "Included from %s:"
-#~ msgstr "Inséré de %s :"
-
-#~ msgid "argument “%s” not declared by plugin"
-#~ msgstr "argument « %s » non déclaré par le plugin"
-
-#~ msgid "file %s not found"
-#~ msgstr "fichier %s non trouvé"
-
-#~ msgid "Who Is Online"
-#~ msgstr "Qui est en ligne"
-
-#~ msgid "View the current version"
-#~ msgstr "Voir la version actuelle"
-
-#~ msgid "Dump pages as XHTML"
-#~ msgstr "Exporter les pages en XHTML"
-
-#~ msgid "Change owner of selected pages"
-#~ msgstr "Changer le propriétaire des pages sélectionnées"
-
-#~ msgid "CANCEL"
-#~ msgstr "ANNULE"
-
-#~ msgid "Page “%s” does not exist"
-#~ msgstr "La page « %s » n'existe pas"
-
-#~ msgid "Page %s not found."
-#~ msgstr "Page %s non trouvée."
-
-#~ msgid "<none>"
-#~ msgstr "<aucun>"
-
-#~ msgid " Skipped"
-#~ msgstr "Ignoré"
-
-#~ msgid "Current language: “%s”"
-#~ msgstr "Langage actuel : %s"
-
-#~ msgid "Current theme: “%s”"
-#~ msgstr "Thème actuel : “%s”"
-
-#~ msgid "ACL deleted for page “%s”."
-#~ msgstr "ACL supprimée pour la page %s."
-
-#~ msgid "Chown"
-#~ msgstr "Chown"
-
-#~ msgid "SetAcl"
-#~ msgstr "DéfinirAcl"
-
-#~ msgid "SetAclSimple"
-#~ msgstr "DéfinirAclSimple"
-
-#~ msgid "SpecialPages"
-#~ msgstr "Pages spéciales"
-
-#~ msgid "No pagename specified"
-#~ msgstr "Pas de nom de page spécifié"
-
-#~ msgid "No mandatory “%s” argument provided."
-#~ msgstr "L'argument obligatoire « %s » manque."
-
-#~ msgid "No page specified."
-#~ msgstr "Aucune page indiquée"
-
-#~ msgid "Syntax language not specified."
-#~ msgstr "Syntaxe du langage non spécifié."
-
-#~ msgid "Invalid pagename!"
-#~ msgstr "Nom de page invalide !"
-
-#~ msgid "Illegal character '"
-#~ msgstr "Caractère interdit '"
-
-#~ msgid "' in page name."
-#~ msgstr "' dans le nom de la page."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013-05-28 16:45:33 UTC (rev 8784)
+++ trunk/locale/po/it.po	2013-05-28 17:13:01 UTC (rev 8785)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 18:44+0200\n"
+"POT-Creation-Date: 2013-05-28 19:11+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"
@@ -3853,7 +3853,7 @@
 
 #, php-format
 msgid "Renamed page from “%s” to “%s”."
-msgstr "Cambia titolo %s a %s"
+msgstr "Cambia titolo %s a %s."
 
 #, php-format
 msgid "Renaming created redirect page from “%s” to “%s”"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013-05-28 16:45:33 UTC (rev 8784)
+++ trunk/locale/po/ja.po	2013-05-28 17:13:01 UTC (rev 8785)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 18:44+0200\n"
+"POT-Creation-Date: 2013-05-28 19:11+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2013-05-28 16:45:33 UTC (rev 8784)
+++ trunk/locale/po/nl.po	2013-05-28 17:13:01 UTC (rev 8785)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 18:44+0200\n"
+"POT-Creation-Date: 2013-05-28 19:11+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -1593,7 +1593,7 @@
 msgstr ""
 
 msgid " is identical."
-msgstr " zijn identiek"
+msgstr " zijn identiek."
 
 msgid "Version "
 msgstr "Versie "

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013-05-28 16:45:33 UTC (rev 8784)
+++ trunk/locale/po/phpwiki.pot	2013-05-28 17:13:01 UTC (rev 8785)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 18:44+0200\n"
+"POT-Creation-Date: 2013-05-28 19:11+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2013-05-28 16:45:33 UTC (rev 8784)
+++ trunk/locale/po/sv.po	2013-05-28 17:13:01 UTC (rev 8785)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 18:44+0200\n"
+"POT-Creation-Date: 2013-05-28 19:11+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -1587,7 +1587,7 @@
 msgstr ""
 
 msgid " is identical."
-msgstr " är identiska"
+msgstr " är identiska."
 
 msgid "Version "
 msgstr ""

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2013-05-28 16:45:33 UTC (rev 8784)
+++ trunk/locale/po/zh.po	2013-05-28 17:13:01 UTC (rev 8785)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 18:44+0200\n"
+"POT-Creation-Date: 2013-05-28 19:11+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -131,7 +131,7 @@
 msgstr "資料庫"
 
 msgid "RecentChanges"
-msgstr "RecentChanges"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "Unsupported argument: %s=%s"
@@ -146,7 +146,7 @@
 msgstr "(已從 %s 重導向)"
 
 msgid "SandBox"
-msgstr "SandBox"
+msgstr ""
 
 msgid "Your version"
 msgstr "你的版本"
@@ -249,7 +249,7 @@
 msgstr ""
 
 msgid "UserPreferences"
-msgstr "UserPreferences"
+msgstr ""
 
 #, php-format
 msgid ""
@@ -295,9 +295,8 @@
 msgid "Save"
 msgstr "儲存"
 
-#, fuzzy
 msgid "Changes"
-msgstr "RecentChanges"
+msgstr ""
 
 msgid "Upload"
 msgstr "上傳"
@@ -445,9 +444,8 @@
 msgid "Undo Search & Replace"
 msgstr "搜尋與取代"
 
-#, fuzzy
 msgid "Insert Categories"
-msgstr "CategoryPage"
+msgstr ""
 
 msgid "Insert"
 msgstr ""
@@ -456,13 +454,11 @@
 msgid "Insert Plugin"
 msgstr "使用此 plugin"
 
-#, fuzzy
 msgid "Insert PageLink"
-msgstr "AddingPages"
+msgstr ""
 
-#, fuzzy
 msgid "Insert Image or Video"
-msgstr "AddingPages"
+msgstr ""
 
 #, fuzzy
 msgid "Insert Template"
@@ -477,7 +473,7 @@
 msgstr "%s: 找不到檔案."
 
 msgid "CategoryGroup"
-msgstr "CategoryGroup"
+msgstr ""
 
 msgid "An unnamed PhpWiki"
 msgstr "未被命名的 PhpWiki"
@@ -523,15 +519,14 @@
 msgstr "傾印頁面為 XHTML"
 
 msgid "PhpWikiAdministration"
-msgstr "PhpWikiAdministration"
+msgstr ""
 
 #, php-format
 msgid "Edited by: %s"
 msgstr "由 %s 編輯"
 
-#, fuzzy
 msgid "LoadDump"
-msgstr "PageDump"
+msgstr ""
 
 #, php-format
 msgid "PageChange Notification of %s sent to %s"
@@ -904,9 +899,8 @@
 msgid "download a html zip dump from this wiki"
 msgstr "從此 wiki 下載 html zip dump"
 
-#, fuzzy
 msgid "use"
-msgstr "AllUsers"
+msgstr ""
 
 msgid "Browsing pages"
 msgstr "瀏覽頁面"
@@ -985,10 +979,10 @@
 msgstr "致命的 PhpWiki 錯誤"
 
 msgid "PageDump"
-msgstr "PageDump"
+msgstr ""
 
 msgid "FullTextSearch"
-msgstr "FullTextSearch"
+msgstr ""
 
 msgid "TitleSearch"
 msgstr "標題搜索"
@@ -1069,7 +1063,7 @@
 msgstr "權限"
 
 msgid "ACL"
-msgstr "ACL"
+msgstr ""
 
 msgid "All"
 msgstr ""
@@ -1234,7 +1228,7 @@
 msgstr "意見"
 
 msgid "AllPages"
-msgstr "AllPages"
+msgstr ""
 
 msgid "List all pages in this wiki."
 msgstr "在此 wiki 列出所有頁面."
@@ -1264,7 +1258,7 @@
 msgstr "經過時間: %s s"
 
 msgid "AllUsers"
-msgstr "AllUsers"
+msgstr ""
 
 #, fuzzy
 msgid "List all once authenticated users."
@@ -1307,9 +1301,8 @@
 msgid "remote_hosts"
 msgstr ""
 
-#, fuzzy
 msgid "users"
-msgstr "AllUsers"
+msgstr ""
 
 msgid "host_users"
 msgstr ""
@@ -1353,9 +1346,8 @@
 msgid "<empty>"
 msgstr "<空白>"
 
-#, fuzzy
 msgid "AppendText"
-msgstr "Appearance"
+msgstr ""
 
 #, fuzzy
 msgid "Append text to any page in this wiki."
@@ -1448,7 +1440,7 @@
 msgstr "被 %s 修改的所有頁面的主要與次要變更歷程."
 
 msgid "DebugInfo"
-msgstr "DebugInfo"
+msgstr ""
 
 #, php-format
 msgid "Get debugging information for %s."
@@ -1466,7 +1458,7 @@
 msgstr "<未能顯示>"
 
 msgid "BackLinks"
-msgstr "BackLinks"
+msgstr ""
 
 #, php-format
 msgid "List all pages which link to %s."
@@ -1562,7 +1554,7 @@
 msgstr "寬"
 
 msgid "CategoryPage"
-msgstr "CategoryPage"
+msgstr ""
 
 msgid "Create a Wiki Category Page."
 msgstr "建立 Wiki Category 頁面"
@@ -1586,7 +1578,7 @@
 msgstr ""
 
 msgid "CreatePage"
-msgstr "CreatePage"
+msgstr ""
 
 msgid "Create a wiki page by the provided name."
 msgstr "以提供的名稱建立 Wiki 頁面."
@@ -1652,9 +1644,8 @@
 msgid "Display current time and date."
 msgstr ""
 
-#, fuzzy
 msgid "DeadEndPages"
-msgstr "WantedPages"
+msgstr ""
 
 msgid "Diff"
 msgstr "差異"
@@ -1736,9 +1727,8 @@
 msgid "Display a Facebook Like button."
 msgstr ""
 
-#, fuzzy
 msgid "FileInfo"
-msgstr "Info"
+msgstr ""
 
 msgid "Display file information like version, size, date... of uploaded files."
 msgstr ""
@@ -1784,7 +1774,7 @@
 msgstr "標題搜索"
 
 msgid "FrameInclude"
-msgstr "FrameInclude"
+msgstr ""
 
 msgid ""
 "Display a url in a separate frame inside our body. Only one frame allowed."
@@ -1824,12 +1814,12 @@
 msgid "Ignored stoplist words “%s”"
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "(%d Links)"
-msgstr "BackLinks"
+msgstr ""
 
 msgid "FuzzyPages"
-msgstr "FuzzyPages"
+msgstr ""
 
 #, php-format
 msgid "Search for page titles similar to %s."
@@ -1870,7 +1860,7 @@
 msgstr ""
 
 msgid "GooglePlugin"
-msgstr "GooglePlugin"
+msgstr ""
 
 msgid "Make use of the Google API."
 msgstr ""
@@ -1880,13 +1870,13 @@
 msgstr "沒發現任何變更"
 
 msgid "GoTo"
-msgstr "GoTo"
+msgstr ""
 
 msgid "Go to or create page."
 msgstr "前往或建立頁面."
 
 msgid "Go"
-msgstr "Go"
+msgstr ""
 
 msgid "GraphViz"
 msgstr ""
@@ -1909,16 +1899,15 @@
 msgid "%s error: outputfile “%s” not created"
 msgstr ""
 
-#, fuzzy
 msgid "DebugGroupInfo"
-msgstr "DebugInfo"
+msgstr ""
 
 #, php-format
 msgid "Show Group Information."
 msgstr ""
 
 msgid "HelloWorld"
-msgstr "HelloWorld"
+msgstr ""
 
 #, fuzzy
 msgid "Simple Sample Plugin."
@@ -1977,7 +1966,7 @@
 msgstr ""
 
 msgid "IncludeSiteMap"
-msgstr "IncludeSiteMap"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "Include recursively all linked pages starting at %s."
@@ -2003,11 +1992,10 @@
 msgstr "搜尋"
 
 msgid "JabberPresence"
-msgstr "JabberPresence"
+msgstr ""
 
-#, fuzzy
 msgid "Display Jabber presence."
-msgstr "JabberPresence"
+msgstr ""
 
 #, fuzzy
 msgid "LdapSearch"
@@ -2028,7 +2016,7 @@
 msgstr ""
 
 msgid "LikePages"
-msgstr "LikePages"
+msgstr ""
 
 #, php-format
 msgid "List page names which share an initial or final title word with “%s”."
@@ -2055,9 +2043,8 @@
 msgid "All pages with all links in this wiki (%d total):"
 msgstr "在此 wiki 中的頁面 (共 %d):"
 
-#, fuzzy
 msgid "Links"
-msgstr "BackLinks"
+msgstr ""
 
 #, php-format
 msgid "Unsupported format argument %s"
@@ -2086,17 +2073,15 @@
 msgid "Search in pages for links with the matching name."
 msgstr ""
 
-#, fuzzy
 msgid "Link"
-msgstr "BackLinks"
+msgstr ""
 
 #, php-format
 msgid "LinkSearch result for \"%s\" in pages \"%s\", direction %s"
 msgstr ""
 
-#, fuzzy
 msgid "ListPages"
-msgstr "LikePages"
+msgstr ""
 
 msgid "List pages that are explicitly given as the pages argument."
 msgstr ""
@@ -2116,7 +2101,7 @@
 msgstr "變更頁面屬性"
 
 msgid "ListSubpages"
-msgstr "ListSubpages"
+msgstr ""
 
 msgid "Lists the names of all SubPages of the current page."
 msgstr "列出目前頁面的所有子頁面名稱."
@@ -2194,7 +2179,7 @@
 msgstr "%s 無法寫入."
 
 msgid "MostPopular"
-msgstr "MostPopular"
+msgstr ""
 
 msgid "List the most popular pages."
 msgstr "列出最受歡迎的頁面."
@@ -2222,13 +2207,13 @@
 msgstr "已認證的使用者"
 
 msgid "NoCache"
-msgstr "NoCache"
+msgstr ""
 
 msgid "Don't cache this page."
 msgstr "不要快取此頁面."
 
 msgid "OldStyleTable"
-msgstr "OldStyleTable"
+msgstr ""
 
 msgid "Layout tables using the old markup style."
 msgstr "使用舊標記風格佈局的表格."
@@ -2238,7 +2223,7 @@
 msgstr "線沒有以 '|' 為首."
 
 msgid "OrphanedPages"
-msgstr "OrphanedPages"
+msgstr ""
 
 msgid "List pages which are not linked to by any other page."
 msgstr "列出未被其他頁面連結到的頁面."
@@ -2309,7 +2294,7 @@
 msgstr "警告:"
 
 msgid "PageGroup"
-msgstr "PageGroup"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "PageGroup for %s."
@@ -2352,7 +2337,7 @@
 msgstr "任找兩個空格打勾然後 %s."
 
 msgid "PageHistory"
-msgstr "PageHistory"
+msgstr ""
 
 #, php-format
 msgid "Version %d"
@@ -2369,18 +2354,17 @@
 msgstr "列出 PageHistory (頁面歷程) - %s"
 
 msgid "PageInfo"
-msgstr "PageInfo"
+msgstr ""
 
 #, php-format
 msgid "Show extra page Info and statistics for %s."
 msgstr "顯示額外的頁面資訊與統計 - %s."
 
 msgid "PageTrail"
-msgstr "PageTrail"
+msgstr ""
 
-#, fuzzy
 msgid "Display PageTrail."
-msgstr "PageTrail"
+msgstr ""
 
 #, fuzzy
 msgid "PasswordReset"
@@ -2445,7 +2429,7 @@
 msgstr ""
 
 msgid "PhotoAlbum"
-msgstr "PhotoAlbum"
+msgstr ""
 
 #, fuzzy
 msgid ""
@@ -2467,7 +2451,7 @@
 msgstr "無法讀取 %s"
 
 msgid "PhpHighlight"
-msgstr "PhpHighlight"
+msgstr ""
 
 msgid "PHP syntax highlighting."
 msgstr "PHP 語法效果"
@@ -2480,7 +2464,7 @@
 msgstr "錯誤的顏色值: %s"
 
 msgid "PhpWeather"
-msgstr "PhpWeather"
+msgstr ""
 
 msgid "Provide weather reports from the Internet."
 msgstr "PhpWeather plugin 由網路取得資訊並提供天氣報告"
@@ -2520,7 +2504,7 @@
 msgstr "查看源碼"
 
 msgid "PluginManager"
-msgstr "PluginManager"
+msgstr ""
 
 #, fuzzy
 msgid "List of plugins on this wiki."
@@ -2530,7 +2514,7 @@
 msgstr "使用此 plugin"
 
 msgid "Plugin"
-msgstr "Plugin"
+msgstr ""
 
 msgid "Arguments"
 msgstr "引數"
@@ -2569,11 +2553,10 @@
 msgstr "列出最受歡迎的頁面."
 
 msgid "CategoryCategory"
-msgstr "CategoryCategory"
+msgstr ""
 
-#, fuzzy
 msgid "Category"
-msgstr "CategoryPage"
+msgstr ""
 
 msgid "Topic"
 msgstr ""
@@ -2607,14 +2590,14 @@
 msgstr ""
 
 msgid "PreferencesInfo"
-msgstr "PreferencesInfo"
+msgstr ""
 
 #, php-format
 msgid "Get preferences information for current user %s."
 msgstr "為目前使用者 %s 取得偏好設定資訊."
 
 msgid "PrevNext"
-msgstr "PrevNext"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "Easy navigation buttons for %s."
@@ -2634,13 +2617,13 @@
 msgstr ""
 
 msgid "RandomPage"
-msgstr "RandomPage"
+msgstr ""
 
 msgid "Display a list of randomly chosen pages or redirects to a random page."
 msgstr "顯示隨機選出的頁面列表或重導向到隨機選取的頁面."
 
 msgid "RateIt"
-msgstr "RateIt"
+msgstr ""
 
 msgid "Rating system. Store user ratings per page."
 msgstr "評比系統. 儲存每頁的使用者評比."
@@ -2704,7 +2687,7 @@
 msgstr "Raw HTML 已經被關閉."
 
 msgid "Raw HTML"
-msgstr "Raw HTML"
+msgstr ""
 
 #, php-format
 msgid "%s is only allowed in locked pages."
@@ -2714,12 +2697,11 @@
 msgid "UserContribs"
 msgstr "使用者統計"
 
-#, fuzzy
 msgid "RecentNewPages"
-msgstr "RecentChanges"
+msgstr ""
 
 msgid "RecentEdits"
-msgstr "RecentEdits"
+msgstr ""
 
 #, fuzzy
 msgid "Deleted"
@@ -2843,16 +2825,14 @@
 msgid "%s days"
 msgstr "%s 天"
 
-#, fuzzy
 msgid "All users"
-msgstr "AllUsers"
+msgstr ""
 
 msgid "My modifications only"
 msgstr ""
 
-#, fuzzy
 msgid "All pages"
-msgstr "AllPages"
+msgstr ""
 
 msgid "My pages only"
 msgstr ""
@@ -2868,9 +2848,8 @@
 msgid "Page once only"
 msgstr "內容"
 
-#, fuzzy
 msgid "Full changes"
-msgstr "FullRecentChanges"
+msgstr ""
 
 #, fuzzy
 msgid "Old and new pages"
@@ -2895,9 +2874,8 @@
 msgid "List all recent edits in this wiki."
 msgstr "在此 wiki 列出所有頁面."
 
-#, fuzzy
 msgid "Recent Edits"
-msgstr "RecentEdits"
+msgstr ""
 
 msgid "RecentReferrers"
 msgstr ""
@@ -2906,7 +2884,7 @@
 msgstr ""
 
 msgid "RedirectTo"
-msgstr "RedirectTo"
+msgstr ""
 
 #, fuzzy
 msgid "Redirect to another URL or page."
@@ -2945,9 +2923,8 @@
 msgid "Related Changes"
 msgstr "最近變更"
 
-#, fuzzy
 msgid "RelatedChanges"
-msgstr "RecentChanges"
+msgstr ""
 
 msgid "Retransform CachedMarkup"
 msgstr ""
@@ -2961,13 +2938,13 @@
 msgstr "為 page “%s” 設定 acl."
 
 msgid "RichTable"
-msgstr "RichTable"
+msgstr ""
 
 msgid "Layout tables using a very rich markup style."
 msgstr "使用豐富標記風格進行佈局的表格."
 
 msgid "RssFeed"
-msgstr "RssFeed"
+msgstr ""
 
 #, fuzzy
 msgid "Simple RSS Feed aggregator."
@@ -2994,9 +2971,8 @@
 msgid "Display the list of relations and attributes on this page."
 msgstr "變更頁面屬性"
 
-#, fuzzy
 msgid "SemanticSearch"
-msgstr "InterWikiSearch"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "Semantic relations for %s"
@@ -3012,9 +2988,8 @@
 msgid "Find out how to add relations and attributes to pages."
 msgstr ""
 
-#, fuzzy
 msgid "SemanticSearchAdvanced"
-msgstr "InterWikiSearch"
+msgstr ""
 
 msgid "Parse and execute a full query expression."
 msgstr ""
@@ -3099,7 +3074,7 @@
 msgstr ""
 
 msgid "SiteMap"
-msgstr "SiteMap"
+msgstr ""
 
 msgid "Recursively get BackLinks or links."
 msgstr "遞迴地取得 BackLinks 或連結"
@@ -3125,7 +3100,7 @@
 msgstr ""
 
 msgid "SqlResult"
-msgstr "SqlResult"
+msgstr ""
 
 msgid "Display arbitrary SQL result tables."
 msgstr "顯示不受限制的 SQL 結果表格"
@@ -3210,7 +3185,7 @@
 msgstr ""
 
 msgid "SystemInfo"
-msgstr "SystemInfo"
+msgstr ""
 
 msgid "Provide access to PhpWiki's lower level system information."
 msgstr "提供存取 PhpWiki 下層系統資訊."
@@ -3354,7 +3329,7 @@
 msgstr "過期參數"
 
 msgid "Wikiname regexp"
-msgstr "Wikiname regexp"
+msgstr ""
 
 msgid "Allowed protocols"
 msgstr "允許的協定"
@@ -3426,7 +3401,7 @@
 msgstr "以 “%s” 進行標題搜尋的結果"
 
 msgid "Transclude"
-msgstr "Transclude"
+msgstr ""
 
 msgid "Include an external web page within the body of a wiki page."
 msgstr "含括外部網頁到 wiki 頁面的內容中."
@@ -3447,7 +3422,7 @@
 msgstr "Transcluded 從 %s"
 
 msgid "TranslateText"
-msgstr "TranslateText"
+msgstr ""
 
 msgid "Define a translation for a specified text."
 msgstr "為特定文字定義轉換."
@@ -3467,7 +3442,7 @@
 msgstr "你的轉換文字是空白或等於未轉換的文字. 請再試一次."
 
 msgid "ContributedTranslations"
-msgstr "ContributedTranslations"
+msgstr ""
 
 #, php-format
 msgid "Translate “%s” to “%s” in *%s*"
@@ -3498,7 +3473,7 @@
 msgstr "轉換"
 
 msgid "UnfoldSubpages"
-msgstr "UnfoldSubpages"
+msgstr ""
 
 msgid "Include the content of all SubPages of the current page."
 msgstr "含括目前頁面所有子頁面的內容."
@@ -3650,7 +3625,7 @@
 msgstr ""
 
 msgid "Rate"
-msgstr "Rate"
+msgstr ""
 
 msgid "Video"
 msgstr ""
@@ -3677,13 +3652,13 @@
 msgstr "圖例"
 
 msgid "WantedPages"
-msgstr "WantedPages"
+msgstr ""
 
 msgid "List referenced page names which do not exist yet."
 msgstr "列出還未存在的頁面名稱."
 
 msgid "PgsrcTranslation"
-msgstr "PgsrcTranslation"
+msgstr ""
 
 #, php-format
 msgid "Wanted Pages for %s (%d total):"
@@ -3756,7 +3731,7 @@
 msgstr ""
 
 msgid "WhoIsOnline"
-msgstr "WhoIsOnline"
+msgstr ""
 
 msgid "Show summary information of the current user sessions."
 msgstr "顯示目前使用者 session 的摘要資訊."
@@ -3777,7 +3752,7 @@
 msgstr "%d 分鐘"
 
 msgid "WikiAdminChmod"
-msgstr "WikiAdminChmod"
+msgstr ""
 
 msgid "Set individual page permissions."
 msgstr "設定個別頁面的權限."
@@ -3804,7 +3779,7 @@
 msgstr "你確定你想要永久變更選定的檔案?"
 
 msgid "Chmod"
-msgstr "Chmod"
+msgstr ""
 
 msgid "Select the pages to change:"
 msgstr "選擇頁面以進行更名:"
@@ -3824,9 +3799,8 @@
 msgid "(disable individual page permissions, enable inheritance)?"
 msgstr "(禁制個別網頁的權限,使用繼承)?"
 
-#, fuzzy
 msgid "WikiAdminChown"
-msgstr "WikiAdminChmod"
+msgstr ""
 
 #, fuzzy
 msgid "Change owner of selected pages."
@@ -3852,9 +3826,8 @@
 msgid "%d pages have been changed:"
 msgstr "%s 頁面已經變更."
 
-#, fuzzy
 msgid "PhpWikiAdministration/Chown"
-msgstr "PhpWikiAdministration/Chmod"
+msgstr ""
 
 msgid "Confirm ownership change"
 msgstr ""
@@ -3883,9 +3856,8 @@
 msgid "ACL deleted for page “%s”"
 msgstr "為 page “%s” 設定 acl."
 
-#, fuzzy
 msgid "PhpWikiAdministration/AdminAclDelete"
-msgstr "PhpWikiAdministration"
+msgstr ""
 
 #, fuzzy
 msgid "Delete ACL"
@@ -3899,9 +3871,8 @@
 msgid "Selected Pages: "
 msgstr "選擇頁面"
 
-#, fuzzy
 msgid "WikiAdminMarkup"
-msgstr "WikiAdminRename"
+msgstr ""
 
 #, fuzzy
 msgid "Change the markup type of selected pages."
@@ -3919,9 +3890,8 @@
 msgid "Couldn't change page “%s” to markup type “%s”."
 msgstr "無法為頁面 “%s” 變更權限為 “%s”."
 
-#, fuzzy
 msgid "PhpWikiAdministration/Markup"
-msgstr "PhpWikiAdministration"
+msgstr ""
 
 msgid "Confirm markup change"
 msgstr ""
@@ -3942,9 +3912,8 @@
 msgid "Change markup to: "
 msgstr "改變密碼"
 
-#, fuzzy
 msgid "WikiAdminPurge"
-msgstr "WikiAdminRename"
+msgstr ""
 
 #, fuzzy
 msgid "Permanently purge all selected pages."
@@ -3970,9 +3939,8 @@
 msgid "No pages purged."
 msgstr "沒有頁面被變更."
 
-#, fuzzy
 msgid "PhpWikiAdministration/Purge"
-msgstr "PhpWikiAdministration"
+msgstr ""
 
 msgid "Confirm purge"
 msgstr ""
@@ -3990,7 +3958,7 @@
 msgstr "選擇頁面以進行更名:"
 
 msgid "WikiAdminRemove"
-msgstr "WikiAdminRemove"
+msgstr ""
 
 msgid "Permanently remove all selected pages."
 msgstr "永久移除選定的頁面."
@@ -4016,7 +3984,7 @@
 msgstr "沒有頁面被更名"
 
 msgid "PhpWikiAdministration/Remove"
-msgstr "PhpWikiAdministration/Remove"
+msgstr ""
 
 msgid "Remove"
 msgstr "移除"
@@ -4044,7 +4012,7 @@
 msgstr "(列出過去 %s 天內已被刪除且檢查過的頁面.)"
 
 msgid "WikiAdminRename"
-msgstr "WikiAdminRename"
+msgstr ""
 
 #, fuzzy
 msgid "Rename selected pages."
@@ -4122,7 +4090,7 @@
 msgstr ""
 
 msgid "WikiAdminSearchReplace"
-msgstr "WikiAdminSearchReplace"
+msgstr ""
 
 msgid "Search and replace text in selected wiki pages."
 msgstr "在選定的頁面中搜尋並更換文字."
@@ -4163,7 +4131,7 @@
 msgstr ""
 
 msgid "WikiAdminSelect"
-msgstr "WikiAdminSelect"
+msgstr ""
 
 msgid ""
 "Allows selection of multiple pages which get passed to other WikiAdmin "
@@ -4181,7 +4149,7 @@
 msgstr "已選擇的頁面 “%s” 傳遞到 “%s”."
 
 msgid "WikiAdminSetAcl"
-msgstr "WikiAdminSetAcl"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "ACL not changed for page “%s”."
@@ -4203,9 +4171,8 @@
 msgid "Invalid ACL"
 msgstr "錯誤的 acl"
 
-#, fuzzy
 msgid "PhpWikiAdministration/SetAcl"
-msgstr "PhpWikiAdministration"
+msgstr ""
 
 #, fuzzy
 msgid ""
@@ -4238,9 +4205,8 @@
 msgid "(Currently not working)"
 msgstr "現在不建議使用!"
 
-#, fuzzy
 msgid "WikiAdminSetExternal"
-msgstr "WikiAdminSetAcl"
+msgstr ""
 
 #, fuzzy
 msgid "Mark selected pages as external."
@@ -4250,9 +4216,8 @@
 msgid "change page “%s” to external."
 msgstr "改變頁面 “%s” 權限為 “%s”."
 
-#, fuzzy
 msgid "PhpWikiAdministration/SetExternal"
-msgstr "PhpWikiAdministration"
+msgstr ""
 
 #, fuzzy
 msgid "Set pages to external"
@@ -4263,7 +4228,7 @@
 msgstr "選擇頁面以進行搜尋:"
 
 msgid "WikiAdminUtils"
-msgstr "WikiAdminUtils"
+msgstr ""
 
 #, fuzzy
 msgid "Miscellaneous utility functions for the Administrator."
@@ -4280,9 +4245,8 @@
 msgid "WikiAdminUtils %s returned:"
 msgstr "WikiAdminUtils 說:"
 
-#, fuzzy
 msgid "Back"
-msgstr "BackLinks"
+msgstr ""
 
 msgid "Purge Markup Cache"
 msgstr "清除標記快取"
@@ -4342,7 +4306,7 @@
 msgstr "檔案已經成功地上傳."
 
 msgid "E-mail"
-msgstr "E-mail"
+msgstr ""
 
 msgid "Verification Status"
 msgstr "確認狀態"
@@ -4355,7 +4319,7 @@
 msgstr "改變確認狀態"
 
 msgid "WikiBlog"
-msgstr "WikiBlog"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "Show and add blogs for %s."
@@ -4368,16 +4332,15 @@
 msgid "%s on %s:"
 msgstr "%s 在 %s"
 
-#, fuzzy
 msgid "WikicreoleTable"
-msgstr "WikiPoll"
+msgstr ""
 
 #, fuzzy
 msgid "Layout tables using the Wikicreole syntax."
 msgstr "使用舊標記風格佈局的表格."
 
 msgid "WikiForm"
-msgstr "WikiForm"
+msgstr ""
 
 msgid "Provide generic WikiForm input buttons."
 msgstr ""
@@ -4396,7 +4359,7 @@
 msgstr ""
 
 msgid "WikiPoll"
-msgstr "WikiPoll"
+msgstr ""
 
 #, fuzzy
 msgid "Enable configurable polls."
@@ -4435,18 +4398,17 @@
 msgid "AllPagesLastEditedByMe"
 msgstr ""
 
-#, fuzzy
 msgid "AllPagesOwnedByMe"
-msgstr "AllPages"
+msgstr ""
 
 msgid "CategoryHomePages"
-msgstr "CategoryHomePages"
+msgstr ""
 
 msgid "FindPage"
-msgstr "FindPage"
+msgstr ""
 
 msgid "FullRecentChanges"
-msgstr "FullRecentChanges"
+msgstr ""
 
 msgid "Help/AddingPages"
 msgstr ""
@@ -4548,34 +4510,34 @@
 msgstr ""
 
 msgid "HomePageAlias"
-msgstr "HomePageAlias"
+msgstr ""
 
 msgid "InterWiki"
-msgstr "InterWiki"
+msgstr ""
 
 msgid "PhpWikiAdministration/Chmod"
-msgstr "PhpWikiAdministration/Chmod"
+msgstr ""
 
 msgid "PhpWikiAdministration/Rename"
-msgstr "PhpWikiAdministration/Rename"
+msgstr ""
 
 msgid "PhpWikiAdministration/Replace"
-msgstr "PhpWikiAdministration/Replace"
+msgstr ""
 
 msgid "PhpWikiDocumentation"
-msgstr "PhpWikiDocumentation"
+msgstr ""
 
 msgid "PhpWikiPoll"
-msgstr "PhpWikiPoll"
+msgstr ""
 
 msgid "RecentVisitors"
-msgstr "RecentVisitors"
+msgstr ""
 
 msgid "ReleaseNotes"
-msgstr "ReleaseNotes"
+msgstr ""
 
 msgid "UpLoad"
-msgstr "UpLoad"
+msgstr ""
 
 msgid "_WikiTranslation"
 msgstr "_WikiTranslation"
@@ -5071,9 +5033,8 @@
 msgid "Rating"
 msgstr "使用者統計"
 
-#, fuzzy
 msgid "Go?"
-msgstr "Go"
+msgstr ""
 
 #, fuzzy
 msgid "MinMisery"
@@ -5182,7 +5143,7 @@
 msgstr "Top & bottom 工具列"
 
 msgid "Modern"
-msgstr "Modern"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "Plugin %s: undefined"
@@ -5441,7 +5402,7 @@
 msgstr ""
 
 msgid "Info"
-msgstr "Info"
+msgstr ""
 
 msgid "View Source"
 msgstr "查看源碼"
@@ -5491,13 +5452,11 @@
 msgid "Admin"
 msgstr "管理者"
 
-#, fuzzy
 msgid "Blog"
-msgstr "WikiBlog"
+msgstr ""
 
-#, fuzzy
 msgid "Page Trail"
-msgstr "PageTrail"
+msgstr ""
 
 #, fuzzy
 msgid "This page has been locked and cannot be edited."
@@ -5530,7 +5489,7 @@
 msgstr "編輯舊的修訂"
 
 msgid "PurgeHtmlCache"
-msgstr "PurgeHtmlCache"
+msgstr ""
 
 msgid ""
 "Purge HTML cache for this page. Regenerate from WikiMarkup when next "
@@ -5577,10 +5536,10 @@
 msgstr ""
 
 msgid "HowToUseWiki"
-msgstr "HowToUseWiki"
+msgstr ""
 
 msgid "WikiWikiWeb"
-msgstr "WikiWikiWeb"
+msgstr ""
 
 msgid "Today"
 msgstr "今天"
@@ -5710,7 +5669,7 @@
 msgstr "Blog 頁面"
 
 msgid "InterWikiMap"
-msgstr "InterWikiMap"
+msgstr ""
 
 msgid "Subpage"
 msgstr "子頁面"
@@ -5780,19 +5739,19 @@
 "In total there are %d user sessions online :: Unique %d Registered and %d "
 "Guests"
 
-#, fuzzy, php-format
+#, php-format
 msgid "Most users ever online was %d at %s."
-msgstr "Most users ever online was %d at %s"
+msgstr ""
 
 msgid "Registered Users Online: "
-msgstr "已註冊的使用者在線上:"
+msgstr "已註冊的使用者在線上: "
 
 msgid "Admin is also online."
 msgstr "Admin 也在線上."
 
-#, fuzzy, php-format
+#, php-format
 msgid "This data is based on users active over the past %s."
-msgstr "This data is based on users active over the past %s"
+msgstr ""
 
 msgid "Sorry, no dynamic DB Session support."
 msgstr "抱歉,無動態 DB Session 支援."
@@ -5922,7 +5881,7 @@
 msgstr ""
 
 msgid "Appearance"
-msgstr "Appearance"
+msgstr ""
 
 msgid "Here you can override site-specific default values."
 msgstr "你可以在這裡覆寫掉站台預設的值."
@@ -6001,9 +5960,8 @@
 msgid "Update Preferences"
 msgstr "更新偏好設定"
 
-#, fuzzy
 msgid "Reset Preferences"
-msgstr "UserPreferences"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "Entry on %s by %s."
@@ -6012,9 +5970,9 @@
 msgid "New Topic"
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "Posted: %s"
-msgstr "User: %s"
+msgstr ""
 
 #, fuzzy
 msgid "Page"
@@ -6024,25 +5982,21 @@
 msgid "Template/Talk"
 msgstr "佈景主題"
 
-#, fuzzy
 msgid "Create Page"
-msgstr "CreatePage"
+msgstr ""
 
-#, fuzzy
 msgid "History"
-msgstr "PageHistory"
+msgstr ""
 
 #, fuzzy
 msgid "Last Difference"
 msgstr "更新偏好設定"
 
-#, fuzzy
 msgid "Page Info"
-msgstr "PageInfo"
+msgstr ""
 
-#, fuzzy
 msgid "Back Links"
-msgstr "BackLinks"
+msgstr ""
 
 #, fuzzy
 msgid "Change Owner"
@@ -6051,9 +6005,8 @@
 msgid "Access Rights"
 msgstr ""
 
-#, fuzzy
 msgid "Purge"
-msgstr "PrevNext"
+msgstr ""
 
 msgid "Error:"
 msgstr ""
@@ -6085,35 +6038,30 @@
 msgstr "選擇頁面以進行更名:"
 
 msgid "TextFormattingRules"
-msgstr "TextFormattingRules"
+msgstr ""
 
-#, fuzzy
 msgid "Recent Changes"
-msgstr "RecentChanges"
+msgstr ""
 
 #, fuzzy...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8784] trunk/locale

[<var...@us...>]

Revision: 8784
          http://sourceforge.net/p/phpwiki/code/8784
Author:   vargenau
Date:     2013-05-28 16:45:33 +0000 (Tue, 28 May 2013)
Log Message:
-----------
Less strings

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/de/LC_MESSAGES/phpwiki.php
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.php
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.php
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.php
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php	2013-05-28 16:42:32 UTC (rev 8783)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2013-05-28 16:45:33 UTC (rev 8784)
@@ -732,7 +732,6 @@
 $locale["PageInfo"] = "SeitenInfo";
 $locale["PageName|optional label"] = "SeitenName|optionaler Name";
 $locale["Pagedata size: %d KiB"] = "Größe der Seitendaten: %d KiB";
-$locale["Pagename(s): "] = "Seitenname(n): ";
 $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.";

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/es/LC_MESSAGES/phpwiki.php	2013-05-28 16:42:32 UTC (rev 8783)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php	2013-05-28 16:45:33 UTC (rev 8784)
@@ -310,7 +310,7 @@
 $locale["Password updated."] = "Contraseña actualizado.";
 $locale["Password was not changed."] = "Contraseña non actualizado.";
 $locale["Password:"] = "Contraseña:";
-$locale["Past versions of this page."] = "Versión anterior de esta página";
+$locale["Past versions of this page."] = "Versión anterior de esta página.";
 $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.";

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-05-28 16:42:32 UTC (rev 8783)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-05-28 16:45:33 UTC (rev 8784)
@@ -74,7 +74,7 @@
 $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 : classe inexistante";
-$locale["%s: no such revision %d."] = "%s(%d) : version inexistante";
+$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["(%d Links)"] = "(%d liens)";
@@ -444,7 +444,7 @@
 $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 %s."] = "Aller à %s.";
 $locale["Go to or create page."] = "Aller à la page ou la créer.";
 $locale["Go?"] = "Continuer?";
 $locale["GoTo"] = "AllerVers";
@@ -759,7 +759,7 @@
 $locale["Page statistics"] = "Statistiques de page";
 $locale["Page successfully updated."] = "Page mise à jour avec succès.";
 $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["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";
@@ -772,7 +772,6 @@
 $locale["PageName|optional label"] = "Page|label optionnel";
 $locale["PageTrail"] = "TracePage";
 $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";
@@ -948,7 +947,7 @@
 $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["SearchReplace"] = "Rechercher et 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";
@@ -1075,7 +1074,7 @@
 $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 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.";

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/it/LC_MESSAGES/phpwiki.php	2013-05-28 16:42:32 UTC (rev 8783)
+++ trunk/locale/it/LC_MESSAGES/phpwiki.php	2013-05-28 16:45:33 UTC (rev 8784)
@@ -156,7 +156,6 @@
 $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["Pagename(s): "] = "Nome della Pagina(s)";
 $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.";

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2013-05-28 16:42:32 UTC (rev 8783)
+++ trunk/locale/po/de.po	2013-05-28 16:45:33 UTC (rev 8784)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-16 17:32+0200\n"
+"POT-Creation-Date: 2013-05-28 18:44+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -2977,9 +2977,6 @@
 msgid "Search in all specified pages for the expression."
 msgstr ""
 
-msgid "Pagename(s): "
-msgstr "Seitenname(n): "
-
 msgid "Help/SemanticSearchAdvancedPlugin"
 msgstr ""
 
@@ -3978,6 +3975,22 @@
 msgid "Rename selected pages."
 msgstr "Ausgewählte Seiten umbenennen"
 
+msgid "Rename to"
+msgstr "Umbennen zu"
+
+msgid "Are you sure you want to rename the selected pages?"
+msgstr ""
+"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen wollen?"
+
+msgid "Rename Page"
+msgstr "Seite Umbenennen"
+
+msgid "Rename selected pages"
+msgstr "Ausgewählte Seiten umbenennen"
+
+msgid "Select the pages to rename:"
+msgstr "Wähle Seiten zum Umbenennen aus:"
+
 msgid "Cannot rename. New page name too long."
 msgstr "Kein Ausgewählte. Seite Name zu lang"
 
@@ -4011,22 +4024,6 @@
 msgid "No pages renamed."
 msgstr "Keine Seiten umbenannt."
 
-msgid "Rename to"
-msgstr "Umbennen zu"
-
-msgid "Are you sure you want to rename the selected pages?"
-msgstr ""
-"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen wollen?"
-
-msgid "Rename Page"
-msgstr "Seite Umbenennen"
-
-msgid "Rename selected pages"
-msgstr "Ausgewählte Seiten umbenennen"
-
-msgid "Select the pages to rename:"
-msgstr "Wähle Seiten zum Umbenennen aus:"
-
 msgid "from"
 msgstr "von"
 
@@ -6213,6 +6210,9 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+#~ msgid "Pagename(s): "
+#~ msgstr "Seitenname(n): "
+
 #~ msgid "Plugins"
 #~ msgstr "Zusatzprogramme"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013-05-28 16:42:32 UTC (rev 8783)
+++ trunk/locale/po/es.po	2013-05-28 16:45:33 UTC (rev 8784)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-16 17:32+0200\n"
+"POT-Creation-Date: 2013-05-28 18:44+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -2886,9 +2886,6 @@
 msgid "Search in all specified pages for the expression."
 msgstr ""
 
-msgid "Pagename(s): "
-msgstr ""
-
 msgid "Help/SemanticSearchAdvancedPlugin"
 msgstr ""
 
@@ -3853,6 +3850,21 @@
 msgid "Rename selected pages."
 msgstr ""
 
+msgid "Rename to"
+msgstr ""
+
+msgid "Are you sure you want to rename the selected pages?"
+msgstr ""
+
+msgid "Rename Page"
+msgstr ""
+
+msgid "Rename selected pages"
+msgstr ""
+
+msgid "Select the pages to rename:"
+msgstr ""
+
 #, fuzzy
 msgid "Cannot rename. New page name too long."
 msgstr "La nombre de página demasiado de largo"
@@ -3887,21 +3899,6 @@
 msgid "No pages renamed."
 msgstr ""
 
-msgid "Rename to"
-msgstr ""
-
-msgid "Are you sure you want to rename the selected pages?"
-msgstr ""
-
-msgid "Rename Page"
-msgstr ""
-
-msgid "Rename selected pages"
-msgstr ""
-
-msgid "Select the pages to rename:"
-msgstr ""
-
 msgid "from"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-05-28 16:42:32 UTC (rev 8783)
+++ trunk/locale/po/fr.po	2013-05-28 16:45:33 UTC (rev 8784)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-16 17:32+0200\n"
+"POT-Creation-Date: 2013-05-28 18:44+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -2907,9 +2907,6 @@
 msgid "Search in all specified pages for the expression."
 msgstr ""
 
-msgid "Pagename(s): "
-msgstr "Nom de la page : "
-
 msgid "Help/SemanticSearchAdvancedPlugin"
 msgstr ""
 
@@ -3894,6 +3891,21 @@
 msgid "Rename selected pages."
 msgstr "Renommer les pages sélectionnées."
 
+msgid "Rename to"
+msgstr "Renommer en"
+
+msgid "Are you sure you want to rename the selected pages?"
+msgstr "Êtes-vous sûr de vouloir renommer les pages sélectionnées ?"
+
+msgid "Rename Page"
+msgstr "Renommer la page"
+
+msgid "Rename selected pages"
+msgstr "Renommer les pages sélectionnées"
+
+msgid "Select the pages to rename:"
+msgstr "Sélectionnez les pages à renommer :"
+
 msgid "Cannot rename. New page name too long."
 msgstr "Impossible de renommer. Le nom de la page est trop long."
 
@@ -3927,21 +3939,6 @@
 msgid "No pages renamed."
 msgstr "Aucune page n'a été renommée."
 
-msgid "Rename to"
-msgstr "Renommer en"
-
-msgid "Are you sure you want to rename the selected pages?"
-msgstr "Êtes-vous sûr de vouloir renommer les pages sélectionnées ?"
-
-msgid "Rename Page"
-msgstr "Renommer la page"
-
-msgid "Rename selected pages"
-msgstr "Renommer les pages sélectionnées"
-
-msgid "Select the pages to rename:"
-msgstr "Sélectionnez les pages à renommer :"
-
 msgid "from"
 msgstr "de"
 
@@ -6079,6 +6076,9 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "Pagename(s): "
+#~ msgstr "Nom de la page : "
+
 #~ msgid "Sorry. Access Restrictions not yet implemented"
 #~ msgstr "Désolé. Restriction d'accès pas encore disponible"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013-05-28 16:42:32 UTC (rev 8783)
+++ trunk/locale/po/it.po	2013-05-28 16:45:33 UTC (rev 8784)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-16 17:32+0200\n"
+"POT-Creation-Date: 2013-05-28 18:44+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"
@@ -2859,9 +2859,6 @@
 msgid "Search in all specified pages for the expression."
 msgstr ""
 
-msgid "Pagename(s): "
-msgstr "Nome della Pagina(s)"
-
 msgid "Help/SemanticSearchAdvancedPlugin"
 msgstr ""
 
@@ -3828,6 +3825,21 @@
 msgid "Rename selected pages."
 msgstr "rinominare questa pagina"
 
+msgid "Rename to"
+msgstr ""
+
+msgid "Are you sure you want to rename the selected pages?"
+msgstr ""
+
+msgid "Rename Page"
+msgstr ""
+
+msgid "Rename selected pages"
+msgstr ""
+
+msgid "Select the pages to rename:"
+msgstr ""
+
 msgid "Cannot rename. New page name too long."
 msgstr ""
 
@@ -3861,21 +3873,6 @@
 msgid "No pages renamed."
 msgstr ""
 
-msgid "Rename to"
-msgstr ""
-
-msgid "Are you sure you want to rename the selected pages?"
-msgstr ""
-
-msgid "Rename Page"
-msgstr ""
-
-msgid "Rename selected pages"
-msgstr ""
-
-msgid "Select the pages to rename:"
-msgstr ""
-
 msgid "from"
 msgstr ""
 
@@ -5944,6 +5941,9 @@
 msgid "Edit this page"
 msgstr ""
 
+#~ msgid "Pagename(s): "
+#~ msgstr "Nome della Pagina(s)"
+
 #~ msgid "from %s"
 #~ msgstr "dalla %s"
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013-05-28 16:42:32 UTC (rev 8783)
+++ trunk/locale/po/ja.po	2013-05-28 16:45:33 UTC (rev 8784)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-16 17:32+0200\n"
+"POT-Creation-Date: 2013-05-28 18:44+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2922,10 +2922,6 @@
 msgid "Search in all specified pages for the expression."
 msgstr ""
 
-#, fuzzy
-msgid "Pagename(s): "
-msgstr "ページ名"
-
 msgid "Help/SemanticSearchAdvancedPlugin"
 msgstr ""
 
@@ -3925,7 +3921,24 @@
 msgid "Rename selected pages."
 msgstr "選択ページを全て削除"
 
+msgid "Rename to"
+msgstr ""
+
+msgid "Are you sure you want to rename the selected pages?"
+msgstr ""
+
 #, fuzzy
+msgid "Rename Page"
+msgstr "ページ削除"
+
+#, fuzzy
+msgid "Rename selected pages"
+msgstr "選択ページを全て削除"
+
+msgid "Select the pages to rename:"
+msgstr ""
+
+#, fuzzy
 msgid "Cannot rename. New page name too long."
 msgstr "%s から読込まれました。"
 
@@ -3961,24 +3974,7 @@
 msgid "No pages renamed."
 msgstr "変更点が見つかりませんでした。"
 
-msgid "Rename to"
-msgstr ""
-
-msgid "Are you sure you want to rename the selected pages?"
-msgstr ""
-
 #, fuzzy
-msgid "Rename Page"
-msgstr "ページ削除"
-
-#, fuzzy
-msgid "Rename selected pages"
-msgstr "選択ページを全て削除"
-
-msgid "Select the pages to rename:"
-msgstr ""
-
-#, fuzzy
 msgid "from"
 msgstr "%s から"
 
@@ -6144,6 +6140,10 @@
 msgid "Edit this page"
 msgstr "ページを編集しています。"
 
+#, fuzzy
+#~ msgid "Pagename(s): "
+#~ msgstr "ページ名"
+
 #~ msgid "Plugins"
 #~ msgstr "プラグイン一覧"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2013-05-28 16:42:32 UTC (rev 8783)
+++ trunk/locale/po/nl.po	2013-05-28 16:45:33 UTC (rev 8784)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-16 17:32+0200\n"
+"POT-Creation-Date: 2013-05-28 18:44+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -2850,9 +2850,6 @@
 msgid "Search in all specified pages for the expression."
 msgstr ""
 
-msgid "Pagename(s): "
-msgstr ""
-
 msgid "Help/SemanticSearchAdvancedPlugin"
 msgstr ""
 
@@ -3813,6 +3810,21 @@
 msgid "Rename selected pages."
 msgstr ""
 
+msgid "Rename to"
+msgstr ""
+
+msgid "Are you sure you want to rename the selected pages?"
+msgstr ""
+
+msgid "Rename Page"
+msgstr ""
+
+msgid "Rename selected pages"
+msgstr ""
+
+msgid "Select the pages to rename:"
+msgstr ""
+
 msgid "Cannot rename. New page name too long."
 msgstr ""
 
@@ -3846,21 +3858,6 @@
 msgid "No pages renamed."
 msgstr ""
 
-msgid "Rename to"
-msgstr ""
-
-msgid "Are you sure you want to rename the selected pages?"
-msgstr ""
-
-msgid "Rename Page"
-msgstr ""
-
-msgid "Rename selected pages"
-msgstr ""
-
-msgid "Select the pages to rename:"
-msgstr ""
-
 msgid "from"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013-05-28 16:42:32 UTC (rev 8783)
+++ trunk/locale/po/phpwiki.pot	2013-05-28 16:45:33 UTC (rev 8784)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-16 17:32+0200\n"
+"POT-Creation-Date: 2013-05-28 18:44+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2840,9 +2840,6 @@
 msgid "Search in all specified pages for the expression."
 msgstr ""
 
-msgid "Pagename(s): "
-msgstr ""
-
 msgid "Help/SemanticSearchAdvancedPlugin"
 msgstr ""
 
@@ -3802,6 +3799,21 @@
 msgid "Rename selected pages."
 msgstr ""
 
+msgid "Rename to"
+msgstr ""
+
+msgid "Are you sure you want to rename the selected pages?"
+msgstr ""
+
+msgid "Rename Page"
+msgstr ""
+
+msgid "Rename selected pages"
+msgstr ""
+
+msgid "Select the pages to rename:"
+msgstr ""
+
 msgid "Cannot rename. New page name too long."
 msgstr ""
 
@@ -3835,21 +3847,6 @@
 msgid "No pages renamed."
 msgstr ""
 
-msgid "Rename to"
-msgstr ""
-
-msgid "Are you sure you want to rename the selected pages?"
-msgstr ""
-
-msgid "Rename Page"
-msgstr ""
-
-msgid "Rename selected pages"
-msgstr ""
-
-msgid "Select the pages to rename:"
-msgstr ""
-
 msgid "from"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2013-05-28 16:42:32 UTC (rev 8783)
+++ trunk/locale/po/sv.po	2013-05-28 16:45:33 UTC (rev 8784)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-16 17:32+0200\n"
+"POT-Creation-Date: 2013-05-28 18:44+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -2843,9 +2843,6 @@
 msgid "Search in all specified pages for the expression."
 msgstr ""
 
-msgid "Pagename(s): "
-msgstr ""
-
 msgid "Help/SemanticSearchAdvancedPlugin"
 msgstr ""
 
@@ -3805,6 +3802,21 @@
 msgid "Rename selected pages."
 msgstr ""
 
+msgid "Rename to"
+msgstr ""
+
+msgid "Are you sure you want to rename the selected pages?"
+msgstr ""
+
+msgid "Rename Page"
+msgstr ""
+
+msgid "Rename selected pages"
+msgstr ""
+
+msgid "Select the pages to rename:"
+msgstr ""
+
 msgid "Cannot rename. New page name too long."
 msgstr ""
 
@@ -3838,21 +3850,6 @@
 msgid "No pages renamed."
 msgstr ""
 
-msgid "Rename to"
-msgstr ""
-
-msgid "Are you sure you want to rename the selected pages?"
-msgstr ""
-
-msgid "Rename Page"
-msgstr ""
-
-msgid "Rename selected pages"
-msgstr ""
-
-msgid "Select the pages to rename:"
-msgstr ""
-
 msgid "from"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2013-05-28 16:42:32 UTC (rev 8783)
+++ trunk/locale/po/zh.po	2013-05-28 16:45:33 UTC (rev 8784)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-16 17:32+0200\n"
+"POT-Creation-Date: 2013-05-28 18:44+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -3025,10 +3025,6 @@
 msgid "Search in all specified pages for the expression."
 msgstr ""
 
-#, fuzzy
-msgid "Pagename(s): "
-msgstr "頁面名稱"
-
 msgid "Help/SemanticSearchAdvancedPlugin"
 msgstr ""
 
@@ -4054,7 +4050,24 @@
 msgid "Rename selected pages."
 msgstr "更名已選定的頁面"
 
+msgid "Rename to"
+msgstr "更名為"
+
 #, fuzzy
+msgid "Are you sure you want to rename the selected pages?"
+msgstr "你確定你想要永久更名選定的檔案?"
+
+#, fuzzy
+msgid "Rename Page"
+msgstr "移除頁面"
+
+msgid "Rename selected pages"
+msgstr "更名已選定的頁面"
+
+msgid "Select the pages to rename:"
+msgstr "選擇頁面以進行更名:"
+
+#, fuzzy
 msgid "Cannot rename. New page name too long."
 msgstr "頁面名稱以 “%s” 開頭的"
 
@@ -4090,23 +4103,6 @@
 msgid "No pages renamed."
 msgstr "沒有頁面被更名"
 
-msgid "Rename to"
-msgstr "更名為"
-
-#, fuzzy
-msgid "Are you sure you want to rename the selected pages?"
-msgstr "你確定你想要永久更名選定的檔案?"
-
-#, fuzzy
-msgid "Rename Page"
-msgstr "移除頁面"
-
-msgid "Rename selected pages"
-msgstr "更名已選定的頁面"
-
-msgid "Select the pages to rename:"
-msgstr "選擇頁面以進行更名:"
-
 msgid "from"
 msgstr "從"
 
@@ -6328,6 +6324,10 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
+#, fuzzy
+#~ msgid "Pagename(s): "
+#~ msgstr "頁面名稱"
+
 #~ msgid "Sorry. Access Restrictions not yet implemented"
 #~ msgstr "抱歉. 存取限制尚未被實作."
 

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8783] trunk/locale/po

[<var...@us...>]

Revision: 8783
          http://sourceforge.net/p/phpwiki/code/8783
Author:   vargenau
Date:     2013-05-28 16:42:32 +0000 (Tue, 28 May 2013)
Log Message:
-----------
Update translation

Modified Paths:
--------------
    trunk/locale/po/es.po
    trunk/locale/po/fr.po

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013-05-17 12:54:24 UTC (rev 8782)
+++ trunk/locale/po/es.po	2013-05-28 16:42:32 UTC (rev 8783)
@@ -5980,7 +5980,7 @@
 msgstr ""
 
 msgid "Past versions of this page."
-msgstr "Versión anterior de esta página"
+msgstr "Versión anterior de esta página."
 
 msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
 msgstr ""

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-05-17 12:54:24 UTC (rev 8782)
+++ trunk/locale/po/fr.po	2013-05-28 16:42:32 UTC (rev 8783)
@@ -73,7 +73,7 @@
 
 #, php-format
 msgid "Page “%s” does not exist."
-msgstr "La page « %s » n'existe pas"
+msgstr "La page « %s » n'existe pas."
 
 #, php-format
 msgid "Diff: %s"
@@ -217,7 +217,7 @@
 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"
+"enregistrée."
 
 msgid "Sorry for the inconvenience."
 msgstr "Désolé pour la gêne occasionnée."
@@ -1100,7 +1100,7 @@
 msgstr "Renommer"
 
 msgid "SearchReplace"
-msgstr "Rechercher & Remplacer"
+msgstr "Rechercher et Remplacer"
 
 msgid "List this page and all subpages"
 msgstr "Lister cette page et ses sous-pages"
@@ -1333,7 +1333,7 @@
 
 #, php-format
 msgid "Go to %s."
-msgstr "Aller à %s"
+msgstr "Aller à %s."
 
 msgid "AsciiMath"
 msgstr ""
@@ -1590,7 +1590,7 @@
 
 #, php-format
 msgid "%s: no such revision %d."
-msgstr "%s(%d) : version inexistante"
+msgstr "%s(%d) : version inexistante."
 
 msgid "CreateToc disabled for old markup."
 msgstr ""
@@ -2908,7 +2908,7 @@
 msgstr ""
 
 msgid "Pagename(s): "
-msgstr "Nom de la page"
+msgstr "Nom de la page : "
 
 msgid "Help/SemanticSearchAdvancedPlugin"
 msgstr ""

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8782] trunk/lib/plugin/WikiAdminRename.php

[<var...@us...>]

Revision: 8782
          http://sourceforge.net/p/phpwiki/code/8782
Author:   vargenau
Date:     2013-05-17 12:54:24 +0000 (Fri, 17 May 2013)
Log Message:
-----------
Put private function after public ones

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminRename.php

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2013-05-16 08:53:59 UTC (rev 8781)
+++ trunk/lib/plugin/WikiAdminRename.php	2013-05-17 12:54:24 UTC (rev 8782)
@@ -66,80 +66,6 @@
         }
     }
 
-    private function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks = false,
-                         $createredirect = false)
-    {
-        $result = HTML::div();
-        $ul = HTML::ul();
-        $count = 0;
-        $post_args = $request->getArg('admin_rename');
-        $options =
-            array('regex' => isset($post_args['regex']) ? $post_args['regex'] : null,
-                'icase' => isset($post_args['icase']) ? $post_args['icase'] : null);
-        foreach ($pages as $name) {
-            if (($newname = $this->renameHelper($name, $from, $to, $options))
-                and $newname != $name
-            ) {
-                if (strlen($newname) > MAX_PAGENAME_LENGTH)
-                    $ul->pushContent(HTML::li(_("Cannot rename. New page name too long.")));
-                elseif ($dbi->isWikiPage($newname))
-                    $ul->pushContent(HTML::li(fmt("Page “%s” already exists. Ignored.",
-                        WikiLink($newname)))); elseif (!mayAccessPage('edit', $name))
-                    $ul->pushContent(HTML::li(fmt("Access denied to rename page “%s”.",
-                        WikiLink($name)))); elseif ($dbi->renamePage($name, $newname, $updatelinks)) {
-                    /* not yet implemented for all backends */
-                    $page = $dbi->getPage($newname);
-                    $current = $page->getCurrentRevision();
-                    $version = $current->getVersion();
-                    $meta = $current->_data;
-                    $text = $current->getPackedContent();
-                    $meta['summary'] = sprintf(_("Renamed page from “%s” to “%s”."), $name, $newname);
-                    $meta['is_minor_edit'] = 1;
-                    $meta['author'] = $request->_user->UserName();
-                    unset($meta['mtime']); // force new date
-                    $page->save($text, $version + 1, $meta);
-                    if ($createredirect) {
-                        $page = $dbi->getPage($name);
-                        $text = "<<RedirectTo page=\"" . $newname . "\">>";
-                        $meta['summary'] =
-                            sprintf(_("Renaming created redirect page from “%s” to “%s”"),
-                                $name, $newname);
-                        $meta['is_minor_edit'] = 0;
-                        $meta['author'] = $request->_user->UserName();
-                        $page->save($text, 1, $meta);
-                    }
-                    $ul->pushContent(HTML::li(fmt("Renamed page from “%s” to “%s”.",
-                        $name, WikiLink($newname))));
-                    $count++;
-                } else {
-                    $ul->pushContent(HTML::li(fmt("Couldn't rename page “%s” to “%s”.",
-                        $name, $newname)));
-                }
-            } else {
-                $ul->pushContent(HTML::li(fmt("Couldn't rename page “%s” to “%s”.",
-                    $name, $newname)));
-            }
-        }
-        if ($count) {
-            $dbi->touch();
-            $result->setAttr('class', 'feedback');
-            if ($count == 1) {
-                $result->pushContent(HTML::p(
-                    _("One page has been renamed:")));
-            } else {
-                $result->pushContent(HTML::p(
-                    fmt("%d pages have been renamed:", $count)));
-            }
-            $result->pushContent($ul);
-            return $result;
-        } else {
-            $result->setAttr('class', 'error');
-            $result->pushContent(HTML::p(fmt("No pages renamed.")));
-            $result->pushContent($ul);
-            return $result;
-        }
-    }
-
     function run($dbi, $argstr, &$request, $basepage)
     {
         $action = $request->getArg('action');
@@ -271,6 +197,80 @@
         return HTML::div($checkbox, ' ', HTML::label(array('for' => $id), $msg));
     }
 
+    private function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks = false,
+                                 $createredirect = false)
+    {
+        $result = HTML::div();
+        $ul = HTML::ul();
+        $count = 0;
+        $post_args = $request->getArg('admin_rename');
+        $options =
+            array('regex' => isset($post_args['regex']) ? $post_args['regex'] : null,
+                'icase' => isset($post_args['icase']) ? $post_args['icase'] : null);
+        foreach ($pages as $name) {
+            if (($newname = $this->renameHelper($name, $from, $to, $options))
+                and $newname != $name
+            ) {
+                if (strlen($newname) > MAX_PAGENAME_LENGTH)
+                    $ul->pushContent(HTML::li(_("Cannot rename. New page name too long.")));
+                elseif ($dbi->isWikiPage($newname))
+                    $ul->pushContent(HTML::li(fmt("Page “%s” already exists. Ignored.",
+                        WikiLink($newname)))); elseif (!mayAccessPage('edit', $name))
+                    $ul->pushContent(HTML::li(fmt("Access denied to rename page “%s”.",
+                        WikiLink($name)))); elseif ($dbi->renamePage($name, $newname, $updatelinks)) {
+                    /* not yet implemented for all backends */
+                    $page = $dbi->getPage($newname);
+                    $current = $page->getCurrentRevision();
+                    $version = $current->getVersion();
+                    $meta = $current->_data;
+                    $text = $current->getPackedContent();
+                    $meta['summary'] = sprintf(_("Renamed page from “%s” to “%s”."), $name, $newname);
+                    $meta['is_minor_edit'] = 1;
+                    $meta['author'] = $request->_user->UserName();
+                    unset($meta['mtime']); // force new date
+                    $page->save($text, $version + 1, $meta);
+                    if ($createredirect) {
+                        $page = $dbi->getPage($name);
+                        $text = "<<RedirectTo page=\"" . $newname . "\">>";
+                        $meta['summary'] =
+                            sprintf(_("Renaming created redirect page from “%s” to “%s”"),
+                                $name, $newname);
+                        $meta['is_minor_edit'] = 0;
+                        $meta['author'] = $request->_user->UserName();
+                        $page->save($text, 1, $meta);
+                    }
+                    $ul->pushContent(HTML::li(fmt("Renamed page from “%s” to “%s”.",
+                        $name, WikiLink($newname))));
+                    $count++;
+                } else {
+                    $ul->pushContent(HTML::li(fmt("Couldn't rename page “%s” to “%s”.",
+                        $name, $newname)));
+                }
+            } else {
+                $ul->pushContent(HTML::li(fmt("Couldn't rename page “%s” to “%s”.",
+                    $name, $newname)));
+            }
+        }
+        if ($count) {
+            $dbi->touch();
+            $result->setAttr('class', 'feedback');
+            if ($count == 1) {
+                $result->pushContent(HTML::p(
+                    _("One page has been renamed:")));
+            } else {
+                $result->pushContent(HTML::p(
+                    fmt("%d pages have been renamed:", $count)));
+            }
+            $result->pushContent($ul);
+            return $result;
+        } else {
+            $result->setAttr('class', 'error');
+            $result->pushContent(HTML::p(fmt("No pages renamed.")));
+            $result->pushContent($ul);
+            return $result;
+        }
+    }
+
     private function renameForm(&$header, $post_args, $singlepage)
     {
         $table = HTML::table();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8781] trunk/lib/plugin

[<var...@us...>]

Revision: 8781
          http://sourceforge.net/p/phpwiki/code/8781
Author:   vargenau
Date:     2013-05-16 08:53:59 +0000 (Thu, 16 May 2013)
Log Message:
-----------
These must be public

Modified Paths:
--------------
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/WikiAdminRename.php

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2013-05-16 08:49:22 UTC (rev 8780)
+++ trunk/lib/plugin/RecentChanges.php	2013-05-16 08:53:59 UTC (rev 8781)
@@ -28,7 +28,7 @@
     var $_absurls = false;
     var $action = "RecentChanges";
 
-    private function _RecentChanges_Formatter($rc_args)
+    function _RecentChanges_Formatter($rc_args)
     {
         $this->_args = $rc_args;
         $this->_diffargs = array('action' => 'diff');

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2013-05-16 08:49:22 UTC (rev 8780)
+++ trunk/lib/plugin/WikiAdminRename.php	2013-05-16 08:53:59 UTC (rev 8781)
@@ -55,7 +55,7 @@
             ));
     }
 
-    private function renameHelper($name, $from, $to, $options = false)
+    public function renameHelper($name, $from, $to, $options = false)
     {
         if (isset($options['regex'])) {
             return preg_replace('/' . $from . '/' . (isset($options['icase']) ? 'i' : ''), $to, $name);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8780] trunk/lib/pear/Cache/HTTP_Request.php

[<var...@us...>]

Revision: 8780
          http://sourceforge.net/p/phpwiki/code/8780
Author:   vargenau
Date:     2013-05-16 08:49:22 +0000 (Thu, 16 May 2013)
Log Message:
-----------
No &new

Modified Paths:
--------------
    trunk/lib/pear/Cache/HTTP_Request.php

Modified: trunk/lib/pear/Cache/HTTP_Request.php
===================================================================
--- trunk/lib/pear/Cache/HTTP_Request.php	2013-05-16 08:47:28 UTC (rev 8779)
+++ trunk/lib/pear/Cache/HTTP_Request.php	2013-05-16 08:49:22 UTC (rev 8780)
@@ -143,7 +143,7 @@
             );
         }
         $this->Cache($container, $containerOptions);
-        $this->_request = &new HTTP_Request($url, $params);
+        $this->_request = new HTTP_Request($url, $params);
         $this->_id = md5($url.serialize($params));
         $this->_id2 = md5($this->_id); // we need two keys
         $this->_mode = $mode;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8779] trunk/lib/WikiDB/adodb

[<var...@us...>]

Revision: 8779
          http://sourceforge.net/p/phpwiki/code/8779
Author:   vargenau
Date:     2013-05-16 08:47:28 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Upgrade adodb

Modified Paths:
--------------
    trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
    trunk/lib/WikiDB/adodb/adodb-error.inc.php
    trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
    trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
    trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
    trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
    trunk/lib/WikiDB/adodb/adodb-lib.inc.php
    trunk/lib/WikiDB/adodb/adodb-pear.inc.php
    trunk/lib/WikiDB/adodb/adodb-php4.inc.php
    trunk/lib/WikiDB/adodb/adodb-time.inc.php
    trunk/lib/WikiDB/adodb/adodb.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
    trunk/lib/WikiDB/adodb/license.txt
    trunk/lib/WikiDB/adodb/readme.txt

Added Paths:
-----------
    trunk/lib/WikiDB/adodb/adodb-active-record.inc.php
    trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php
    trunk/lib/WikiDB/adodb/adodb-datadict.inc.php
    trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php
    trunk/lib/WikiDB/adodb/adodb-pager.inc.php
    trunk/lib/WikiDB/adodb/adodb-perf.inc.php
    trunk/lib/WikiDB/adodb/adodb-xmlschema.inc.php
    trunk/lib/WikiDB/adodb/adodb-xmlschema03.inc.php
    trunk/lib/WikiDB/adodb/contrib/
    trunk/lib/WikiDB/adodb/contrib/toxmlrpc.inc.php
    trunk/lib/WikiDB/adodb/cute_icons_for_site/
    trunk/lib/WikiDB/adodb/cute_icons_for_site/adodb.gif
    trunk/lib/WikiDB/adodb/cute_icons_for_site/adodb2.gif
    trunk/lib/WikiDB/adodb/datadict/
    trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php
    trunk/lib/WikiDB/adodb/docs/
    trunk/lib/WikiDB/adodb/docs/docs-active-record.htm
    trunk/lib/WikiDB/adodb/docs/docs-adodb.htm
    trunk/lib/WikiDB/adodb/docs/docs-datadict.htm
    trunk/lib/WikiDB/adodb/docs/docs-oracle.htm
    trunk/lib/WikiDB/adodb/docs/docs-perf.htm
    trunk/lib/WikiDB/adodb/docs/docs-session.htm
    trunk/lib/WikiDB/adodb/docs/docs-session.old.htm
    trunk/lib/WikiDB/adodb/docs/old-changelog.htm
    trunk/lib/WikiDB/adodb/docs/readme.htm
    trunk/lib/WikiDB/adodb/docs/tips_portable_sql.htm
    trunk/lib/WikiDB/adodb/docs/tute.htm
    trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ads.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssql_n.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc_db2.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_mysql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_oci.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_pgsql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_sqlite.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres8.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres9.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlite3.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlitepo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sybase_ase.inc.php
    trunk/lib/WikiDB/adodb/lang/
    trunk/lib/WikiDB/adodb/lang/adodb-da.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-de.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-en.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-es.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-esperanto.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-fa.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-fr.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-it.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-nl.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-ro.inc.php
    trunk/lib/WikiDB/adodb/pear/
    trunk/lib/WikiDB/adodb/pear/Auth/
    trunk/lib/WikiDB/adodb/pear/Auth/Container/
    trunk/lib/WikiDB/adodb/pear/Auth/Container/ADOdb.php
    trunk/lib/WikiDB/adodb/pear/readme.Auth.txt
    trunk/lib/WikiDB/adodb/perf/
    trunk/lib/WikiDB/adodb/perf/perf-db2.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-informix.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-mssql.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-mssqlnative.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-mysql.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-oci8.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-postgres.inc.php
    trunk/lib/WikiDB/adodb/pivottable.inc.php
    trunk/lib/WikiDB/adodb/rsfilter.inc.php
    trunk/lib/WikiDB/adodb/server.php
    trunk/lib/WikiDB/adodb/session/
    trunk/lib/WikiDB/adodb/session/adodb-compress-bzip2.php
    trunk/lib/WikiDB/adodb/session/adodb-compress-gzip.php
    trunk/lib/WikiDB/adodb/session/adodb-cryptsession.php
    trunk/lib/WikiDB/adodb/session/adodb-cryptsession2.php
    trunk/lib/WikiDB/adodb/session/adodb-encrypt-mcrypt.php
    trunk/lib/WikiDB/adodb/session/adodb-encrypt-md5.php
    trunk/lib/WikiDB/adodb/session/adodb-encrypt-secret.php
    trunk/lib/WikiDB/adodb/session/adodb-encrypt-sha1.php
    trunk/lib/WikiDB/adodb/session/adodb-sess.txt
    trunk/lib/WikiDB/adodb/session/adodb-session-clob.php
    trunk/lib/WikiDB/adodb/session/adodb-session-clob2.php
    trunk/lib/WikiDB/adodb/session/adodb-session.php
    trunk/lib/WikiDB/adodb/session/adodb-session2.php
    trunk/lib/WikiDB/adodb/session/adodb-sessions.mysql.sql
    trunk/lib/WikiDB/adodb/session/adodb-sessions.oracle.clob.sql
    trunk/lib/WikiDB/adodb/session/adodb-sessions.oracle.sql
    trunk/lib/WikiDB/adodb/session/crypt.inc.php
    trunk/lib/WikiDB/adodb/session/old/
    trunk/lib/WikiDB/adodb/session/old/adodb-cryptsession.php
    trunk/lib/WikiDB/adodb/session/old/adodb-session-clob.php
    trunk/lib/WikiDB/adodb/session/old/adodb-session.php
    trunk/lib/WikiDB/adodb/session/old/crypt.inc.php
    trunk/lib/WikiDB/adodb/session/session_schema.xml
    trunk/lib/WikiDB/adodb/session/session_schema2.xml
    trunk/lib/WikiDB/adodb/tests/
    trunk/lib/WikiDB/adodb/tests/benchmark.php
    trunk/lib/WikiDB/adodb/tests/client.php
    trunk/lib/WikiDB/adodb/tests/pdo.php
    trunk/lib/WikiDB/adodb/tests/test-active-record.php
    trunk/lib/WikiDB/adodb/tests/test-active-recs2.php
    trunk/lib/WikiDB/adodb/tests/test-active-relations.php
    trunk/lib/WikiDB/adodb/tests/test-active-relationsx.php
    trunk/lib/WikiDB/adodb/tests/test-datadict.php
    trunk/lib/WikiDB/adodb/tests/test-perf.php
    trunk/lib/WikiDB/adodb/tests/test-pgblob.php
    trunk/lib/WikiDB/adodb/tests/test-php5.php
    trunk/lib/WikiDB/adodb/tests/test-xmlschema.php
    trunk/lib/WikiDB/adodb/tests/test.php
    trunk/lib/WikiDB/adodb/tests/test2.php
    trunk/lib/WikiDB/adodb/tests/test3.php
    trunk/lib/WikiDB/adodb/tests/test4.php
    trunk/lib/WikiDB/adodb/tests/test5.php
    trunk/lib/WikiDB/adodb/tests/test_rs_array.php
    trunk/lib/WikiDB/adodb/tests/testcache.php
    trunk/lib/WikiDB/adodb/tests/testdatabases.inc.php
    trunk/lib/WikiDB/adodb/tests/testgenid.php
    trunk/lib/WikiDB/adodb/tests/testmssql.php
    trunk/lib/WikiDB/adodb/tests/testoci8.php
    trunk/lib/WikiDB/adodb/tests/testoci8cursor.php
    trunk/lib/WikiDB/adodb/tests/testpaging.php
    trunk/lib/WikiDB/adodb/tests/testpear.php
    trunk/lib/WikiDB/adodb/tests/testsessions.php
    trunk/lib/WikiDB/adodb/tests/time.php
    trunk/lib/WikiDB/adodb/tests/tmssql.php
    trunk/lib/WikiDB/adodb/tests/xmlschema-mssql.xml
    trunk/lib/WikiDB/adodb/tests/xmlschema.xml
    trunk/lib/WikiDB/adodb/toexport.inc.php
    trunk/lib/WikiDB/adodb/tohtml.inc.php
    trunk/lib/WikiDB/adodb/xmlschema.dtd
    trunk/lib/WikiDB/adodb/xmlschema03.dtd
    trunk/lib/WikiDB/adodb/xsl/
    trunk/lib/WikiDB/adodb/xsl/convert-0.1-0.2.xsl
    trunk/lib/WikiDB/adodb/xsl/convert-0.1-0.3.xsl
    trunk/lib/WikiDB/adodb/xsl/convert-0.2-0.1.xsl
    trunk/lib/WikiDB/adodb/xsl/convert-0.2-0.3.xsl
    trunk/lib/WikiDB/adodb/xsl/remove-0.2.xsl
    trunk/lib/WikiDB/adodb/xsl/remove-0.3.xsl

Removed Paths:
-------------
    trunk/lib/WikiDB/adodb/readme.htm

Added: trunk/lib/WikiDB/adodb/adodb-active-record.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-active-record.inc.php	                        (rev 0)
+++ trunk/lib/WikiDB/adodb/adodb-active-record.inc.php	2013-05-16 08:47:28 UTC (rev 8779)
@@ -0,0 +1,1002 @@
+<?php
+/*
+
+@version V5.18 3 Sep 2012   (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
+  Latest version is available at http://adodb.sourceforge.net
+ 
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  
+  Active Record implementation. Superset of Zend Framework's.
+  
+  Version 0.92
+  
+  See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord 
+  	for info on Ruby on Rails Active Record implementation
+*/
+
+
+global $_ADODB_ACTIVE_DBS;
+global $ADODB_ACTIVE_CACHESECS; // set to true to enable caching of metadata such as field info
+global $ACTIVE_RECORD_SAFETY; // set to false to disable safety checks
+global $ADODB_ACTIVE_DEFVALS; // use default values of table definition when creating new active record.
+
+// array of ADODB_Active_DB's, indexed by ADODB_Active_Record->_dbat
+$_ADODB_ACTIVE_DBS = array();
+$ACTIVE_RECORD_SAFETY = true;
+$ADODB_ACTIVE_DEFVALS = false;
+$ADODB_ACTIVE_CACHESECS = 0;
+
+class ADODB_Active_DB {
+	var $db; // ADOConnection
+	var $tables; // assoc array of ADODB_Active_Table objects, indexed by tablename
+}
+
+class ADODB_Active_Table {
+	var $name; // table name
+	var $flds; // assoc array of adofieldobjs, indexed by fieldname
+	var $keys; // assoc array of primary keys, indexed by fieldname
+	var $_created; // only used when stored as a cached file
+	var $_belongsTo = array();
+	var $_hasMany = array();
+}
+
+// $db = database connection
+// $index = name of index - can be associative, for an example see
+//    http://phplens.com/lens/lensforum/msgs.php?id=17790 
+// returns index into $_ADODB_ACTIVE_DBS
+function ADODB_SetDatabaseAdapter(&$db, $index=false)
+{
+	global $_ADODB_ACTIVE_DBS;
+	
+		foreach($_ADODB_ACTIVE_DBS as $k => $d) {
+			if (PHP_VERSION >= 5) {
+				if ($d->db === $db) return $k;
+			} else {
+				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) 
+					return $k;
+			}
+		}
+		
+		$obj = new ADODB_Active_DB();
+		$obj->db = $db;
+		$obj->tables = array();
+		
+		if ($index == false) $index = sizeof($_ADODB_ACTIVE_DBS);
+
+		
+		$_ADODB_ACTIVE_DBS[$index] = $obj;
+		
+		return sizeof($_ADODB_ACTIVE_DBS)-1;
+}
+
+
+class ADODB_Active_Record {
+	static $_changeNames = true; // dynamically pluralize table names
+	static $_quoteNames = false;
+	
+	static $_foreignSuffix = '_id'; // 
+	var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat]
+	var $_table; // tablename, if set in class definition then use it as table name
+	var $_tableat; // associative index pointing to ADODB_Active_Table, eg $ADODB_Active_DBS[_dbat]->tables[$this->_tableat]
+	var $_where; // where clause set in Load()
+	var $_saved = false; // indicates whether data is already inserted.
+	var $_lasterr = false; // last error message
+	var $_original = false; // the original values loaded or inserted, refreshed on update
+
+	var $foreignName; // CFR: class name when in a relationship
+
+	var $lockMode = ' for update '; // you might want to change to 
+	
+	static function UseDefaultValues($bool=null)
+	{
+	global $ADODB_ACTIVE_DEFVALS;
+		if (isset($bool)) $ADODB_ACTIVE_DEFVALS = $bool;
+		return $ADODB_ACTIVE_DEFVALS;
+	}
+
+	// should be static
+	static function SetDatabaseAdapter(&$db, $index=false) 
+	{
+		return ADODB_SetDatabaseAdapter($db, $index);
+	}
+	
+	
+	public function __set($name, $value)
+	{
+		$name = str_replace(' ', '_', $name);
+		$this->$name = $value;
+	}
+	
+	// php5 constructor
+	function __construct($table = false, $pkeyarr=false, $db=false)
+	{
+	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS;
+	
+		if ($db == false && is_object($pkeyarr)) {
+			$db = $pkeyarr;
+			$pkeyarr = false;
+		}
+		
+		if (!$table) { 
+			if (!empty($this->_table)) $table = $this->_table;
+			else $table = $this->_pluralize(get_class($this));
+		}
+		$this->foreignName = strtolower(get_class($this)); // CFR: default foreign name
+		if ($db) {
+			$this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db);
+		} else if (!isset($this->_dbat)) {
+			if (sizeof($_ADODB_ACTIVE_DBS) == 0) $this->Error("No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)",'ADODB_Active_Record::__constructor');
+			end($_ADODB_ACTIVE_DBS);
+			$this->_dbat = key($_ADODB_ACTIVE_DBS);
+		}
+
+		$this->_table = $table;
+		$this->_tableat = $table; # reserved for setting the assoc value to a non-table name, eg. the sql string in future
+
+		$this->UpdateActiveTable($pkeyarr);
+	}
+	
+	function __wakeup()
+	{
+  		$class = get_class($this);
+  		new $class;
+	}
+	
+	function _pluralize($table)
+	{
+		if (!ADODB_Active_Record::$_changeNames) return $table;
+
+		$ut = strtoupper($table);
+		$len = strlen($table);
+		$lastc = $ut[$len-1];
+		$lastc2 = substr($ut,$len-2);
+		switch ($lastc) {
+		case 'S':
+			return $table.'es';	
+		case 'Y':
+			return substr($table,0,$len-1).'ies';
+		case 'X':	
+			return $table.'es';
+		case 'H': 
+			if ($lastc2 == 'CH' || $lastc2 == 'SH')
+				return $table.'es';
+		default:
+			return $table.'s';
+		}
+	}
+	
+	// CFR Lamest singular inflector ever - @todo Make it real!
+	// Note: There is an assumption here...and it is that the argument's length >= 4
+	function _singularize($tables)
+	{
+	
+		if (!ADODB_Active_Record::$_changeNames) return $table;
+	
+		$ut = strtoupper($tables);
+		$len = strlen($tables);
+		if($ut[$len-1] != 'S')
+			return $tables; // I know...forget oxen
+		if($ut[$len-2] != 'E')
+			return substr($tables, 0, $len-1);
+		switch($ut[$len-3])
+		{
+			case 'S':
+			case 'X':
+				return substr($tables, 0, $len-2);
+			case 'I':
+				return substr($tables, 0, $len-3) . 'y';
+			case 'H';
+				if($ut[$len-4] == 'C' || $ut[$len-4] == 'S')
+					return substr($tables, 0, $len-2);
+			default:
+				return substr($tables, 0, $len-1); // ?
+		}
+	}
+
+	function hasMany($foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record')
+	{
+		$ar = new $foreignClass($foreignRef);
+		$ar->foreignName = $foreignRef;
+		$ar->UpdateActiveTable();
+		$ar->foreignKey = ($foreignKey) ? $foreignKey : $foreignRef.ADODB_Active_Record::$_foreignSuffix;
+		$table =& $this->TableInfo();
+		$table->_hasMany[$foreignRef] = $ar;
+	#	$this->$foreignRef = $this->_hasMany[$foreignRef]; // WATCHME Removed assignment by ref. to please __get()
+	}
+	
+	// use when you don't want ADOdb to auto-pluralize tablename
+	static function TableHasMany($table, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record')
+	{
+		$ar = new ADODB_Active_Record($table);
+		$ar->hasMany($foreignRef, $foreignKey, $foreignClass);
+	}
+	
+	// use when you don't want ADOdb to auto-pluralize tablename
+	static function TableKeyHasMany($table, $tablePKey, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record')
+	{
+		if (!is_array($tablePKey)) $tablePKey = array($tablePKey);
+		$ar = new ADODB_Active_Record($table,$tablePKey);
+		$ar->hasMany($foreignRef, $foreignKey, $foreignClass);
+	}
+	
+	
+	// use when you want ADOdb to auto-pluralize tablename for you. Note that the class must already be defined.
+	// e.g. class Person will generate relationship for table Persons
+	static function ClassHasMany($parentclass, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record')
+	{
+		$ar = new $parentclass();
+		$ar->hasMany($foreignRef, $foreignKey, $foreignClass);
+	}
+	
+
+	function belongsTo($foreignRef,$foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record')
+	{
+		global $inflector;
+
+		$ar = new $parentClass($this->_pluralize($foreignRef));
+		$ar->foreignName = $foreignRef;
+		$ar->parentKey = $parentKey;
+		$ar->UpdateActiveTable();
+		$ar->foreignKey = ($foreignKey) ? $foreignKey : $foreignRef.ADODB_Active_Record::$_foreignSuffix;
+		
+		$table =& $this->TableInfo();
+		$table->_belongsTo[$foreignRef] = $ar;
+	#	$this->$foreignRef = $this->_belongsTo[$foreignRef];
+	}
+	
+	static function ClassBelongsTo($class, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record')
+	{
+		$ar = new $class();
+		$ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass);
+	}
+	
+	static function TableBelongsTo($table, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record')
+	{
+		$ar = new ADOdb_Active_Record($table);
+		$ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass);
+	}
+	
+	static function TableKeyBelongsTo($table, $tablePKey, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record')
+	{
+		if (!is_array($tablePKey)) $tablePKey = array($tablePKey);
+		$ar = new ADOdb_Active_Record($table, $tablePKey);
+		$ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass);
+	}
+
+
+	/**
+	 * __get Access properties - used for lazy loading
+	 * 
+	 * @param mixed $name 
+	 * @access protected
+	 * @return mixed
+	 */
+	 function __get($name)
+	{
+		return $this->LoadRelations($name, '', -1, -1);
+	}
+	
+	/**
+	 * @param string $name 
+	 * @param string $whereOrderBy : eg. ' AND field1 = value ORDER BY field2'
+	 * @param offset
+	 * @param limit
+	 * @return mixed
+	 */
+	function LoadRelations($name, $whereOrderBy='', $offset=-1,$limit=-1)
+	{
+		$extras = array();
+		$table = $this->TableInfo();
+		if ($limit >= 0) $extras['limit'] = $limit;
+		if ($offset >= 0) $extras['offset'] = $offset;
+		
+		if (strlen($whereOrderBy)) 
+			if (!preg_match('/^[ \n\r]*AND/i',$whereOrderBy))
+				if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i',$whereOrderBy))
+					$whereOrderBy = 'AND '.$whereOrderBy;
+				
+		if(!empty($table->_belongsTo[$name]))
+		{
+			$obj = $table->_belongsTo[$name];
+			$columnName = $obj->foreignKey;
+			if(empty($this->$columnName))
+				$this->$name = null;
+			else
+			{
+				if ($obj->parentKey) $key = $obj->parentKey;
+				else $key = reset($table->keys);
+				
+				$arrayOfOne = $obj->Find($key.'='.$this->$columnName.' '.$whereOrderBy,false,false,$extras);
+				if ($arrayOfOne) {
+					$this->$name = $arrayOfOne[0];
+					return $arrayOfOne[0];
+				}
+			}
+		}
+		if(!empty($table->_hasMany[$name]))
+		{	
+			$obj = $table->_hasMany[$name];
+			$key = reset($table->keys);
+			$id = @$this->$key;
+			if (!is_numeric($id)) {
+				$db = $this->DB();
+				$id = $db->qstr($id);
+			}
+			$objs = $obj->Find($obj->foreignKey.'='.$id. ' '.$whereOrderBy,false,false,$extras);
+			if (!$objs) $objs = array();
+			$this->$name = $objs;
+			return $objs;
+		}
+		
+		return array();
+	}
+	//////////////////////////////////
+	
+	// update metadata
+	function UpdateActiveTable($pkeys=false,$forceUpdate=false)
+	{
+	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS;
+	global $ADODB_ACTIVE_DEFVALS,$ADODB_FETCH_MODE;
+
+		$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
+
+		$table = $this->_table;
+		$tables = $activedb->tables;
+		$tableat = $this->_tableat;
+		if (!$forceUpdate && !empty($tables[$tableat])) {
+
+			$acttab = $tables[$tableat];
+			foreach($acttab->flds as $name => $fld) {
+			if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) 
+				$this->$name = $fld->default_value;
+			else
+				$this->$name = null;
+			}
+			return;
+		}
+		$db = $activedb->db;
+		$fname = $ADODB_CACHE_DIR . '/adodb_' . $db->databaseType . '_active_'. $table . '.cache';
+		if (!$forceUpdate && $ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR && file_exists($fname)) {
+			$fp = fopen($fname,'r');
+			@flock($fp, LOCK_SH);
+			$acttab = unserialize(fread($fp,100000));
+			fclose($fp);
+			if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { 
+				// abs(rand()) randomizes deletion, reducing contention to delete/refresh file
+				// ideally, you should cache at least 32 secs
+				
+				foreach($acttab->flds as $name => $fld) {
+					if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) 
+						$this->$name = $fld->default_value;
+					else
+						$this->$name = null;
+				}
+	
+				$activedb->tables[$table] = $acttab;
+				
+				//if ($db->debug) ADOConnection::outp("Reading cached active record file: $fname");
+			  	return;
+			} else if ($db->debug) {
+				ADOConnection::outp("Refreshing cached active record file: $fname");
+			}
+		}
+		$activetab = new ADODB_Active_Table();
+		$activetab->name = $table;
+		
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+		if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false);
+		
+		$cols = $db->MetaColumns($table);
+		
+		if (isset($savem)) $db->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		
+		if (!$cols) {
+			$this->Error("Invalid table name: $table",'UpdateActiveTable'); 
+			return false;
+		}
+		$fld = reset($cols);
+		if (!$pkeys) {
+			if (isset($fld->primary_key)) {
+				$pkeys = array();
+				foreach($cols as $name => $fld) {
+					if (!empty($fld->primary_key)) $pkeys[] = $name;
+				}
+			} else	
+				$pkeys = $this->GetPrimaryKeys($db, $table);
+		}
+		if (empty($pkeys)) {
+			$this->Error("No primary key found for table $table",'UpdateActiveTable');
+			return false;
+		}
+		
+		$attr = array();
+		$keys = array();
+		
+		switch($ADODB_ASSOC_CASE) {
+		case 0:
+			foreach($cols as $name => $fldobj) {
+				$name = strtolower($name);
+                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
+                    $this->$name = $fldobj->default_value;
+                else
+					$this->$name = null;
+				$attr[$name] = $fldobj;
+			}
+			foreach($pkeys as $k => $name) {
+				$keys[strtolower($name)] = strtolower($name);
+			}
+			break;
+			
+		case 1: 
+			foreach($cols as $name => $fldobj) {
+				$name = strtoupper($name);
+               
+                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
+                    $this->$name = $fldobj->default_value;
+                else
+					$this->$name = null;
+				$attr[$name] = $fldobj;
+			}
+			
+			foreach($pkeys as $k => $name) {
+				$keys[strtoupper($name)] = strtoupper($name);
+			}
+			break;
+		default:
+			foreach($cols as $name => $fldobj) {
+				$name = ($fldobj->name);
+                
+                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
+                    $this->$name = $fldobj->default_value;
+                else
+					$this->$name = null;
+				$attr[$name] = $fldobj;
+			}
+			foreach($pkeys as $k => $name) {
+				$keys[$name] = $cols[$name]->name;
+			}
+			break;
+		}
+		
+		$activetab->keys = $keys;
+		$activetab->flds = $attr;
+
+		if ($ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR) {
+			$activetab->_created = time();
+			$s = serialize($activetab);
+			if (!function_exists('adodb_write_file')) include(ADODB_DIR.'/adodb-csvlib.inc.php');
+			adodb_write_file($fname,$s);
+		}
+		if (isset($activedb->tables[$table])) {
+			$oldtab = $activedb->tables[$table];
+		
+			if ($oldtab) $activetab->_belongsTo = $oldtab->_belongsTo;
+			if ($oldtab) $activetab->_hasMany = $oldtab->_hasMany;
+		}
+		$activedb->tables[$table] = $activetab;
+	}
+	
+	function GetPrimaryKeys(&$db, $table)
+	{
+		return $db->MetaPrimaryKeys($table);
+	}
+	
+	// error handler for both PHP4+5. 
+	function Error($err,$fn)
+	{
+	global $_ADODB_ACTIVE_DBS;
+	
+		$fn = get_class($this).'::'.$fn;
+		$this->_lasterr = $fn.': '.$err;
+		
+		if ($this->_dbat < 0) $db = false;
+		else {
+			$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
+			$db = $activedb->db;
+		}
+		
+		if (function_exists('adodb_throw')) {	
+			if (!$db) adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false);
+			else adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db);
+		} else
+			if (!$db || $db->debug) ADOConnection::outp($this->_lasterr);
+		
+	}
+	
+	// return last error message
+	function ErrorMsg()
+	{
+		if (!function_exists('adodb_throw')) {
+			if ($this->_dbat < 0) $db = false;
+			else $db = $this->DB();
+		
+			// last error could be database error too
+			if ($db && $db->ErrorMsg()) return $db->ErrorMsg();
+		}
+		return $this->_lasterr;
+	}
+	
+	function ErrorNo() 
+	{
+		if ($this->_dbat < 0) return -9999; // no database connection...
+		$db = $this->DB();
+		
+		return (int) $db->ErrorNo();
+	}
+
+
+	// retrieve ADOConnection from _ADODB_Active_DBs
+	function DB()
+	{
+	global $_ADODB_ACTIVE_DBS;
+	
+		if ($this->_dbat < 0) {
+			$false = false;
+			$this->Error("No database connection set: use ADOdb_Active_Record::SetDatabaseAdaptor(\$db)", "DB");
+			return $false;
+		}
+		$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
+		$db = $activedb->db;
+		return $db;
+	}
+	
+	// retrieve ADODB_Active_Table
+	function &TableInfo()
+	{
+	global $_ADODB_ACTIVE_DBS;
+		$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
+		$table = $activedb->tables[$this->_tableat];
+		return $table;
+	}
+	
+	
+	// I have an ON INSERT trigger on a table that sets other columns in the table.
+	// So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook
+	function Reload()
+	{
+		$db =& $this->DB(); if (!$db) return false;
+		$table =& $this->TableInfo();
+		$where = $this->GenWhere($db, $table);
+		return($this->Load($where));
+	}
+
+	
+	// set a numeric array (using natural table field ordering) as object properties
+	function Set(&$row)
+	{
+	global $ACTIVE_RECORD_SAFETY;
+	
+		$db = $this->DB();
+		
+		if (!$row) {
+			$this->_saved = false;		
+			return false;
+		}
+		
+		$this->_saved = true;
+		
+		$table = $this->TableInfo();
+		if ($ACTIVE_RECORD_SAFETY && sizeof($table->flds) != sizeof($row)) {
+            # <AP>
+            $bad_size = TRUE;
+            if (sizeof($row) == 2 * sizeof($table->flds)) {
+                // Only keep string keys
+                $keys = array_filter(array_keys($row), 'is_string');
+                if (sizeof($keys) == sizeof($table->flds))
+                    $bad_size = FALSE;
+            }
+            if ($bad_size) {
+			$this->Error("Table structure of $this->_table has changed","Load");
+			return false;
+		}
+            # </AP>
+		}
+        else
+			$keys = array_keys($row);
+			
+        # <AP>
+        reset($keys);
+        $this->_original = array();
+		foreach($table->flds as $name=>$fld) {
+            $value = $row[current($keys)];
+			$this->$name = $value;
+            $this->_original[] = $value;
+            next($keys);
+		}
+
+        # </AP>
+		return true;
+	}
+	
+	// get last inserted id for INSERT
+	function LastInsertID(&$db,$fieldname)
+	{
+		if ($db->hasInsertID)
+			$val = $db->Insert_ID($this->_table,$fieldname);
+		else
+			$val = false;
+			
+		if (is_null($val) || $val === false) {
+			// this might not work reliably in multi-user environment
+			return $db->GetOne("select max(".$fieldname.") from ".$this->_table);
+		}
+		return $val;
+	}
+	
+	// quote data in where clause
+	function doquote(&$db, $val,$t)
+	{
+		switch($t) {
+		case 'L':
+			if (strpos($db->databaseType,'postgres') !== false) return $db->qstr($val);
+		case 'D':	
+		case 'T':
+			if (empty($val)) return 'null';
+		
+		case 'B':	
+		case 'N':
+		case 'C':
+		case 'X':
+			if (is_null($val)) return 'null';
+			
+			if (strlen($val)>0 && 
+				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) { 
+				return $db->qstr($val);
+				break;
+			}
+		default:
+			return $val;
+			break;
+		}
+	}
+	
+	// generate where clause for an UPDATE/SELECT
+	function GenWhere(&$db, &$table)
+	{
+		$keys = $table->keys;
+		$parr = array();
+		
+		foreach($keys as $k) {
+			$f = $table->flds[$k];
+			if ($f) {
+				$parr[] = $k.' = '.$this->doquote($db,$this->$k,$db->MetaType($f->type));
+			}
+		}
+		return implode(' and ', $parr);
+	}
+	
+	
+	function _QName($n,$db=false)
+	{
+		if (!ADODB_Active_Record::$_quoteNames) return $n;
+		if (!$db) $db = $this->DB(); if (!$db) return false;
+		return $db->nameQuote.$n.$db->nameQuote;
+	}
+	
+	//------------------------------------------------------------ Public functions below
+	
+	function Load($where=null,$bindarr=false, $lock = false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$db = $this->DB(); if (!$db) return false;
+		$this->_where = $where;
+		
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false);
+		
+		$qry = "select * from ".$this->_table;
+		
+		if($where) {
+			$qry .= ' WHERE '.$where;
+		}
+		if ($lock) $qry .= $this->lockMode;
+		
+		$row = $db->GetRow($qry,$bindarr);
+		
+		if (isset($savem)) $db->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		
+		return $this->Set($row);
+	}
+	
+	function LoadLocked($where=null, $bindarr=false)
+	{
+		$this->Load($where,$bindarr,true);
+	}
+	
+	# useful for multiple record inserts
+	# see http://phplens.com/lens/lensforum/msgs.php?id=17795
+	function Reset()
+	{
+        $this->_where=null;
+        $this->_saved = false; 
+        $this->_lasterr = false; 
+        $this->_original = false;
+        $vars=get_object_vars($this);
+        foreach($vars as $k=>$v){
+        	if(substr($k,0,1)!=='_'){
+        		$this->{$k}=null;
+        	}
+        }
+        $this->foreignName=strtolower(get_class($this));
+        return true;
+    }
+	
+	// false on error
+	function Save()
+	{
+		if ($this->_saved) $ok = $this->Update();
+		else $ok = $this->Insert();
+		
+		return $ok;
+	}
+	
+	
+	// false on error
+	function Insert()
+	{
+		$db = $this->DB(); if (!$db) return false;
+		$cnt = 0;
+		$table = $this->TableInfo();
+		
+		$valarr = array();
+		$names = array();
+		$valstr = array();
+
+		foreach($table->flds as $name=>$fld) {
+			$val = $this->$name;
+			if(!is_array($val) || !is_null($val) || !array_key_exists($name, $table->keys)) {
+				$valarr[] = $val;
+				$names[] = $this->_QName($name,$db);
+				$valstr[] = $db->Param($cnt);
+				$cnt += 1;
+			}
+		}
+		
+		if (empty($names)){
+			foreach($table->flds as $name=>$fld) {
+				$valarr[] = null;
+				$names[] = $name;
+				$valstr[] = $db->Param($cnt);
+				$cnt += 1;
+			}
+		}
+		$sql = 'INSERT INTO '.$this->_table."(".implode(',',$names).') VALUES ('.implode(',',$valstr).')';
+		$ok = $db->Execute($sql,$valarr);
+		
+		if ($ok) {
+			$this->_saved = true;
+			$autoinc = false;
+			foreach($table->keys as $k) {
+				if (is_null($this->$k)) {
+					$autoinc = true;
+					break;
+				}
+			}
+			if ($autoinc && sizeof($table->keys) == 1) {
+				$k = reset($table->keys);
+				$this->$k = $this->LastInsertID($db,$k);
+			}
+		}
+		
+		$this->_original = $valarr;
+		return !empty($ok);
+	}
+	
+	function Delete()
+	{
+		$db = $this->DB(); if (!$db) return false;
+		$table = $this->TableInfo();
+		
+		$where = $this->GenWhere($db,$table);
+		$sql = 'DELETE FROM '.$this->_table.' WHERE '.$where;
+		$ok = $db->Execute($sql);
+		
+		return $ok ? true : false;
+	}
+	
+	// returns an array of active record objects
+	function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array())
+	{
+		$db = $this->DB(); if (!$db || empty($this->_table)) return false;
+		$arr = $db->GetActiveRecordsClass(get_class($this),$this->_table, $whereOrderBy,$bindarr,$pkeysArr,$extra);
+		return $arr;
+	}
+	
+	// returns 0 on error, 1 on update, 2 on insert
+	function Replace()
+	{
+	global $ADODB_ASSOC_CASE;
+		
+		$db = $this->DB(); if (!$db) return false;
+		$table = $this->TableInfo();
+		
+		$pkey = $table->keys;
+		
+		foreach($table->flds as $name=>$fld) {
+			$val = $this->$name;
+			/*
+			if (is_null($val)) {
+				if (isset($fld->not_null) && $fld->not_null) {
+					if (isset($fld->default_value) && strlen($fld->default_value)) continue;
+					else {
+						$this->Error("Cannot update null into $name","Replace");
+						return false;
+					}
+				}
+			}*/
+			if (is_null($val) && !empty($fld->auto_increment)) {
+            	continue;
+            }
+			
+			if (is_array($val)) continue;
+			
+			$t = $db->MetaType($fld->type);
+			$arr[$name] = $this->doquote($db,$val,$t);
+			$valarr[] = $val;
+		}
+		
+		if (!is_array($pkey)) $pkey = array($pkey);
+		
+		
+		if ($ADODB_ASSOC_CASE == 0) 
+			foreach($pkey as $k => $v)
+				$pkey[$k] = strtolower($v);
+		elseif ($ADODB_ASSOC_CASE == 1) 
+			foreach($pkey as $k => $v)
+				$pkey[$k] = strtoupper($v);
+				
+		$ok = $db->Replace($this->_table,$arr,$pkey);
+		if ($ok) {
+			$this->_saved = true; // 1= update 2=insert
+			if ($ok == 2) {
+				$autoinc = false;
+				foreach($table->keys as $k) {
+					if (is_null($this->$k)) {
+						$autoinc = true;
+						break;
+					}
+				}
+				if ($autoinc && sizeof($table->keys) == 1) {
+					$k = reset($table->keys);
+					$this->$k = $this->LastInsertID($db,$k);
+				}
+			}
+			
+			$this->_original = $valarr;
+		} 
+		return $ok;
+	}
+
+	// returns 0 on error, 1 on update, -1 if no change in data (no update)
+	function Update()
+	{
+		$db = $this->DB(); if (!$db) return false;
+		$table = $this->TableInfo();
+		
+		$where = $this->GenWhere($db, $table);
+		
+		if (!$where) {
+			$this->error("Where missing for table $table", "Update");
+			return false;
+		}
+		$valarr = array(); 
+		$neworig = array();
+		$pairs = array();
+		$i = -1;
+		$cnt = 0;
+		foreach($table->flds as $name=>$fld) {
+			$i += 1;
+			$val = $this->$name;
+			$neworig[] = $val;
+			
+			if (isset($table->keys[$name]) || is_array($val)) 
+				continue;
+			
+			if (is_null($val)) {
+				if (isset($fld->not_null) && $fld->not_null) {
+					if (isset($fld->default_value) && strlen($fld->default_value)) continue;
+					else {
+						$this->Error("Cannot set field $name to NULL","Update");
+						return false;
+					}
+				}
+			}
+
+			if (isset($this->_original[$i]) && strcmp($val,$this->_original[$i]) == 0) continue;
+			
+			if (is_null($this->_original[$i]) && is_null($val)) continue;
+			
+			$valarr[] = $val;
+			$pairs[] = $this->_QName($name,$db).'='.$db->Param($cnt);
+			$cnt += 1;
+		}
+		
+		
+		if (!$cnt) return -1;
+		$sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$where;
+		$ok = $db->Execute($sql,$valarr);
+		if ($ok) {
+			$this->_original = $neworig;
+			return 1;
+		}
+		return 0;
+	}
+	
+	function GetAttributeNames()
+	{
+		$table = $this->TableInfo();
+		if (!$table) return false;
+		return array_keys($table->flds);
+	}
+	
+};
+
+function adodb_GetActiveRecordsClass(&$db, $class, $table,$whereOrderBy,$bindarr, $primkeyArr,
+			$extra)
+{
+global $_ADODB_ACTIVE_DBS;
+
+	
+	$save = $db->SetFetchMode(ADODB_FETCH_NUM);
+	$qry = "select * from ".$table;
+	
+	if (!empty($whereOrderBy))
+		$qry .= ' WHERE '.$whereOrderBy;
+	if(isset($extra['limit']))
+	{
+		$rows = false;
+		if(isset($extra['offset'])) {
+			$rs = $db->SelectLimit($qry, $extra['limit'], $extra['offset'],$bindarr);
+		} else {
+			$rs = $db->SelectLimit($qry, $extra['limit'],-1,$bindarr);
+		}
+		if ($rs) {
+			while (!$rs->EOF) {
+				$rows[] = $rs->fields;
+				$rs->MoveNext();
+			}
+		}
+	} else
+		$rows = $db->GetAll($qry,$bindarr);
+
+	$db->SetFetchMode($save);
+	
+	$false = false;
+	
+	if ($rows === false) {	
+		return $false;
+	}
+	
+
+	if (!class_exists($class)) {
+		$db->outp_throw("Unknown class $class in GetActiveRecordsClass()",'GetActiveRecordsClass');
+		return $false;
+	}
+	$arr = array();
+	// arrRef will be the structure that knows about our objects.
+	// It is an associative array.
+	// We will, however, return arr, preserving regular 0.. order so that
+	// obj[0] can be used by app developpers.
+	$arrRef = array();
+	$bTos = array(); // Will store belongTo's indices if any
+	foreach($rows as $row) {
+	
+		$obj = new $class($table,$primkeyArr,$db);
+		if ($obj->ErrorNo()){
+			$db->_errorMsg = $obj->ErrorMsg();
+			return $false;
+		}
+		$obj->Set($row);
+		$arr[] = $obj;
+	} // foreach($rows as $row) 
+
+	return $arr;
+}
+?>
\ No newline at end of file

Added: trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php	                        (rev 0)
+++ trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php	2013-05-16 08:47:28 UTC (rev 8779)
@@ -0,0 +1,1421 @@
+<?php
+/*
+
+@version V5.06 29 Sept 2008   (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
+  Latest version is available at http://adodb.sourceforge.net
+ 
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  
+  Active Record implementation. Superset of Zend Framework's.
+  
+  This is "Active Record eXtended" to support JOIN, WORK and LAZY mode by Chris Ravenscroft  chris#voilaweb.com 
+  
+  Version 0.9
+  
+  See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord 
+  	for info on Ruby on Rails Active Record implementation
+*/
+
+
+	// CFR: Active Records Definitions
+define('ADODB_JOIN_AR', 0x01);
+define('ADODB_WORK_AR', 0x02);
+define('ADODB_LAZY_AR', 0x03);
+
+
+global $_ADODB_ACTIVE_DBS;
+global $ADODB_ACTIVE_CACHESECS; // set to true to enable caching of metadata such as field info
+global $ACTIVE_RECORD_SAFETY; // set to false to disable safety checks
+global $ADODB_ACTIVE_DEFVALS; // use default values of table definition when creating new active record.
+
+// array of ADODB_Active_DB's, indexed by ADODB_Active_Record->_dbat
+$_ADODB_ACTIVE_DBS = array();
+$ACTIVE_RECORD_SAFETY = true; // CFR: disabled while playing with relations
+$ADODB_ACTIVE_DEFVALS = false;
+
+class ADODB_Active_DB {
+	var $db; // ADOConnection
+	var $tables; // assoc array of ADODB_Active_Table objects, indexed by tablename
+}
+
+class ADODB_Active_Table {
+	var $name; // table name
+	var $flds; // assoc array of adofieldobjs, indexed by fieldname
+	var $keys; // assoc array of primary keys, indexed by fieldname
+	var $_created; // only used when stored as a cached file
+	var $_belongsTo = array();
+	var $_hasMany = array();
+	var $_colsCount; // total columns count, including relations
+
+	function updateColsCount()
+	{
+		$this->_colsCount = sizeof($this->flds);
+		foreach($this->_belongsTo as $foreignTable)
+			$this->_colsCount += sizeof($foreignTable->TableInfo()->flds);
+		foreach($this->_hasMany as $foreignTable)
+			$this->_colsCount += sizeof($foreignTable->TableInfo()->flds);
+	}
+}
+
+// returns index into $_ADODB_ACTIVE_DBS
+function ADODB_SetDatabaseAdapter(&$db)
+{
+	global $_ADODB_ACTIVE_DBS;
+	
+		foreach($_ADODB_ACTIVE_DBS as $k => $d) {
+			if (PHP_VERSION >= 5) {
+				if ($d->db === $db) return $k;
+			} else {
+				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) 
+					return $k;
+			}
+		}
+		
+		$obj = new ADODB_Active_DB();
+		$obj->db = $db;
+		$obj->tables = array();
+		
+		$_ADODB_ACTIVE_DBS[] = $obj;
+		
+		return sizeof($_ADODB_ACTIVE_DBS)-1;
+}
+
+
+class ADODB_Active_Record {
+	static $_changeNames = true; // dynamically pluralize table names
+	static $_foreignSuffix = '_id'; // 
+	var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat]
+	var $_table; // tablename, if set in class definition then use it as table name
+	var $_sTable; // singularized table name
+	var $_pTable; // pluralized table name
+	var $_tableat; // associative index pointing to ADODB_Active_Table, eg $ADODB_Active_DBS[_dbat]->tables[$this->_tableat]
+	var $_where; // where clause set in Load()
+	var $_saved = false; // indicates whether data is already inserted.
+	var $_lasterr = false; // last error message
+	var $_original = false; // the original values loaded or inserted, refreshed on update
+
+	var $foreignName; // CFR: class name when in a relationship
+
+	static function UseDefaultValues($bool=null)
+	{
+	global $ADODB_ACTIVE_DEFVALS;
+		if (isset($bool)) $ADODB_ACTIVE_DEFVALS = $bool;
+		return $ADODB_ACTIVE_DEFVALS;
+	}
+
+	// should be static
+	static function SetDatabaseAdapter(&$db) 
+	{
+		return ADODB_SetDatabaseAdapter($db);
+	}
+	
+	
+	public function __set($name, $value)
+	{
+		$name = str_replace(' ', '_', $name);
+		$this->$name = $value;
+	}
+	
+	// php5 constructor
+	// Note: if $table is defined, then we will use it as our table name
+	// Otherwise we will use our classname...
+	// In our database, table names are pluralized (because there can be
+	// more than one row!)
+	// Similarly, if $table is defined here, it has to be plural form.
+	//
+	// $options is an array that allows us to tweak the constructor's behaviour
+	// if $options['refresh'] is true, we re-scan our metadata information
+	// if $options['new'] is true, we forget all relations
+	function __construct($table = false, $pkeyarr=false, $db=false, $options=array())
+	{
+	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS;
+	
+		if ($db == false && is_object($pkeyarr)) {
+			$db = $pkeyarr;
+			$pkeyarr = false;
+		}
+		
+		if($table)
+		{
+			// table argument exists. It is expected to be
+			// already plural form.
+			$this->_pTable = $table;
+			$this->_sTable = $this->_singularize($this->_pTable);
+		}
+		else
+		{
+			// We will use current classname as table name.
+			// We need to pluralize it for the real table name.
+			$this->_sTable = strtolower(get_class($this));
+			$this->_pTable = $this->_pluralize($this->_sTable);
+		}
+		$this->_table = &$this->_pTable;
+
+		$this->foreignName = $this->_sTable; // CFR: default foreign name (singular)
+
+		if ($db) {
+			$this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db);
+		} else
+			$this->_dbat = sizeof($_ADODB_ACTIVE_DBS)-1;
+		
+		
+		if ($this->_dbat < 0) $this->Error("No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)",'ADODB_Active_Record::__constructor');
+		
+		$this->_tableat = $this->_table; # reserved for setting the assoc value to a non-table name, eg. the sql string in future
+
+		// CFR: Just added this option because UpdateActiveTable() can refresh its information
+		// but there was no way to ask it to do that.
+		$forceUpdate = (isset($options['refresh']) && true === $options['refresh']);
+		$this->UpdateActiveTable($pkeyarr, $forceUpdate);
+		if(isset($options['new']) && true === $options['new'])
+		{
+			$table =& $this->TableInfo();
+			unset($table->_hasMany);
+			unset($table->_belongsTo);
+			$table->_hasMany = array();
+			$table->_belongsTo = array();
+		}
+	}
+	
+	function __wakeup()
+	{
+  		$class = get_class($this);
+  		new $class;
+	}
+	
+	// CFR: Constants found in Rails
+	static $IrregularP = array(
+		'PERSON'    => 'people',
+		'MAN'       => 'men',
+		'WOMAN'     => 'women',
+		'CHILD'     => 'children',
+		'COW'       => 'kine',
+	);
+
+	static $IrregularS = array(
+		'PEOPLE'    => 'PERSON',
+		'MEN'       => 'man',
+		'WOMEN'     => 'woman',
+		'CHILDREN'  => 'child',
+		'KINE'      => 'cow',
+	);
+
+	static $WeIsI = array(
+		'EQUIPMENT' => true,
+		'INFORMATION'   => true,
+		'RICE'      => true,
+		'MONEY'     => true,
+		'SPECIES'   => true,
+		'SERIES'    => true,
+		'FISH'      => true,
+		'SHEEP'     => true,
+	);
+
+	function _pluralize($table)
+	{
+		if (!ADODB_Active_Record::$_changeNames) return $table;
+
+		$ut = strtoupper($table);
+		if(isset(self::$WeIsI[$ut]))
+		{
+			return $table;
+		}
+		if(isset(self::$IrregularP[$ut]))
+		{
+			return self::$IrregularP[$ut];
+		}
+		$len = strlen($table);
+		$lastc = $ut[$len-1];
+		$lastc2 = substr($ut,$len-2);
+		switch ($lastc) {
+		case 'S':
+			return $table.'es';	
+		case 'Y':
+			return substr($table,0,$len-1).'ies';
+		case 'X':	
+			return $table.'es';
+		case 'H': 
+			if ($lastc2 == 'CH' || $lastc2 == 'SH')
+				return $table.'es';
+		default:
+			return $table.'s';
+		}
+	}
+	
+	// CFR Lamest singular inflector ever - @todo Make it real!
+	// Note: There is an assumption here...and it is that the argument's length >= 4
+	function _singularize($table)
+	{
+	
+		if (!ADODB_Active_Record::$_changeNames) return $table;
+	
+		$ut = strtoupper($table);
+		if(isset(self::$WeIsI[$ut]))
+		{
+			return $table;
+		}
+		if(isset(self::$IrregularS[$ut]))
+		{
+			return self::$IrregularS[$ut];
+		}
+		$len = strlen($table);
+		if($ut[$len-1] != 'S')
+			return $table; // I know...forget oxen
+		if($ut[$len-2] != 'E')
+			return substr($table, 0, $len-1);
+		switch($ut[$len-3])
+		{
+			case 'S':
+			case 'X':
+				return substr($table, 0, $len-2);
+			case 'I':
+				return substr($table, 0, $len-3) . 'y';
+			case 'H';
+				if($ut[$len-4] == 'C' || $ut[$len-4] == 'S')
+					return substr($table, 0, $len-2);
+			default:
+				return substr($table, 0, $len-1); // ?
+		}
+	}
+
+	/*
+	 * ar->foreignName will contain the name of the tables associated with this table because
+	 * these other tables' rows may also be referenced by this table using theirname_id or the provided
+	 * foreign keys (this index name is stored in ar->foreignKey)
+	 *
+	 * this-table.id = other-table-#1.this-table_id
+	 *               = other-table-#2.this-table_id
+	 */
+	function hasMany($foreignRef,$foreignKey=false)
+	{
+		$ar = new ADODB_Active_Record($foreignRef);
+		$ar->foreignName = $foreignRef;
+		$ar->UpdateActiveTable();
+		$ar->foreignKey = ($foreignKey) ? $foreignKey : strtolower(get_class($this)) . self::$_foreignSuffix;
+
+		$table =& $this->TableInfo();
+		if(!isset($table->_hasMany[$foreignRef]))
+		{
+			$table->_hasMany[$foreignRef] = $ar;
+			$table->updateColsCount();
+		}
+# @todo Can I make this guy be lazy?
+		$this->$foreignRef = $table->_hasMany[$foreignRef]; // WATCHME Removed assignment by ref. to please __get()
+	}
+
+	/**
+	 * ar->foreignName will contain the name of the tables associated with this table because
+	 * this table's rows may also be referenced by those tables using thistable_id or the provided
+	 * foreign keys (this index name is stored in ar->foreignKey)
+	 *
+	 * this-table.other-table_id = other-table.id
+	 */
+	function belongsTo($foreignRef,$foreignKey=false)
+	{
+		global $inflector;
+
+		$ar = new ADODB_Active_Record($this->_pluralize($foreignRef));
+		$ar->foreignName = $foreignRef;
+		$ar->UpdateActiveTable();
+		$ar->foreignKey = ($foreignKey) ? $foreignKey : $ar->foreignName . self::$_foreignSuffix;
+		
+		$table =& $this->TableInfo();
+		if(!isset($table->_belongsTo[$foreignRef]))
+		{
+			$table->_belongsTo[$foreignRef] = $ar;
+			$table->updateColsCount();
+		}
+		$this->$foreignRef = $table->_belongsTo[$foreignRef];
+	}
+
+	/**
+	 * __get Access properties - used for lazy loading
+	 * 
+	 * @param mixed $name 
+	 * @access protected
+	 * @return void
+	 */
+	function __get($name)
+	{
+		return $this->LoadRelations($name, '', -1. -1);
+	}
+
+	function LoadRelations($name, $whereOrderBy, $offset=-1, $limit=-1)
+	{
+		$extras = array();
+		if($offset >= 0) $extras['offset'] = $offset;
+		if($limit >= 0) $extras['limit'] = $limit;
+		$table =& $this->TableInfo();
+		
+		if (strlen($whereOrderBy)) 
+			if (!preg_match('/^[ \n\r]*AND/i',$whereOrderBy))
+				if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i',$whereOrderBy))
+					$whereOrderBy = 'AND '.$whereOrderBy;
+					
+		if(!empty($table->_belongsTo[$name]))
+		{
+			$obj = $table->_belongsTo[$name];
+			$columnName = $obj->foreignKey;
+			if(empty($this->$columnName))
+				$this->$name = null;
+			else
+			{
+				if(($k = reset($obj->TableInfo()->keys)))
+					$belongsToId = $k;
+				else
+					$belongsToId = 'id';
+				
+				$arrayOfOne =
+					$obj->Find(
+						$belongsToId.'='.$this->$columnName.' '.$whereOrderBy, false, false, $extras);
+				$this->$name = $arrayOfOne[0];
+			}
+			return $this->$name;
+		}
+		if(!empty($table->_hasMany[$name]))
+		{
+			$obj = $table->_hasMany[$name];
+			if(($k = reset($table->keys)))
+				$hasManyId   = $k;
+			else
+				$hasManyId   = 'id';			
+
+			$this->$name =
+				$obj->Find(
+					$obj->foreignKey.'='.$this->$hasManyId.' '.$whereOrderBy, false, false, $extras);
+			return $this->$name;
+		}
+	}
+	//////////////////////////////////
+	
+	// update metadata
+	function UpdateActiveTable($pkeys=false,$forceUpdate=false)
+	{
+	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS;
+	global $ADODB_ACTIVE_DEFVALS, $ADODB_FETCH_MODE;
+
+		$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
+
+		$table = $this->_table;
+		$tables = $activedb->tables;
+		$tableat = $this->_tableat;
+		if (!$forceUpdate && !empty($tables[$tableat])) {
+
+			$tobj = $tables[$tableat];
+			foreach($tobj->flds as $name => $fld) {
+			if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) 
+				$this->$name = $fld->default_value;
+			else
+				$this->$name = null;
+			}
+			return;
+		}
+		
+		$db = $activedb->db;
+		$fname = $ADODB_CACHE_DIR . '/adodb_' . $db->databaseType . '_active_'. $table . '.cache';
+		if (!$forceUpdate && $ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR && file_exists($fname)) {
+			$fp = fopen($fname,'r');
+			@flock($fp, LOCK_SH);
+			$acttab = unserialize(fread($fp,100000));
+			fclose($fp);
+			if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { 
+				// abs(rand()) randomizes deletion, reducing contention to delete/refresh file
+				// ideally, you should cache at least 32 secs
+				$activedb->tables[$table] = $acttab;
+				
+				//if ($db->debug) ADOConnection::outp("Reading cached active record file: $fname");
+			  	return;
+			} else if ($db->debug) {
+				ADOConnection::outp("Refreshing cached active record file: $fname");
+			}
+		}
+		$activetab = new ADODB_Active_Table();
+		$activetab->name = $table;
+		
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+		if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false);
+		
+		$cols = $db->MetaColumns($table);
+		
+		if (isset($savem)) $db->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		
+		if (!$cols) {
+			$this->Error("Invalid table name: $table",'UpdateActiveTable'); 
+			return false;
+		}
+		$fld = reset($cols);
+		if (!$pkeys) {
+			if (isset($fld->primary_key)) {
+				$pkeys = array();
+				foreach($cols as $name => $fld) {
+					if (!empty($fld->primary_key)) $pkeys[] = $name;
+				}
+			} else	
+				$pkeys = $this->GetPrimaryKeys($db, $table);
+		}
+		if (empty($pkeys)) {
+			$this->Error("No primary key found for table $table",'UpdateActiveTable');
+			return false;
+		}
+		
+		$attr = array();
+		$keys = array();
+		
+		switch($ADODB_ASSOC_CASE) {
+		case 0:
+			foreach($cols as $name => $fldobj) {
+				$name = strtolower($name);
+                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
+                    $this->$name = $fldobj->default_value;
+                else
+					$this->$name = null;
+				$attr[$name] = $fldobj;
+			}
+			foreach($pkeys as $k => $name) {
+				$keys[strtolower($name)] = strtolower($name);
+			}
+			break;
+			
+		case 1: 
+			foreach($cols as $name => $fldobj) {
+				$name = strtoupper($name);
+               
+                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
+                    $this->$name = $fldobj->default_value;
+                else
+					$this->$name = null;
+				$attr[$name] = $fldobj;
+			}
+			
+			foreach($pkeys as $k => $name) {
+				$keys[strtoupper($name)] = strtoupper($name);
+			}
+			break;
+		default:
+			foreach($cols as $name => $fldobj) {
+				$name = ($fldobj->name);
+                
+                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
+                    $this->$name = $fldobj->default_value;
+                else
+					$this->$name = null;
+				$attr[$name] = $fldobj;
+			}
+			foreach($pkeys as $k => $name) {
+				$keys[$name] = $cols[$name]->name;
+			}
+			break;
+		}
+		
+		$activetab->keys = $keys;
+		$activetab->flds = $attr;
+		$activetab->updateColsCount();
+
+		if ($ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR) {
+			$activetab->_created = time();
+			$s = serialize($activetab);
+			if (!function_exists('adodb_write_file')) include(ADODB_DIR.'/adodb-csvlib.inc.php');
+			adodb_write_file($fname,$s);
+		}
+		if (isset($activedb->tables[$table])) {
+			$oldtab = $activedb->tables[$table];
+		
+			if ($oldtab) $activetab->_belongsTo = $oldtab->_belongsTo;
+			if ($oldtab) $activetab->_hasMany = $oldtab->_hasMany;
+		}
+		$activedb->tables[$table] = $activetab;
+	}
+	
+	function GetPrimaryKeys(&$db, $table)
+	{
+		return $db->MetaPrimaryKeys($table);
+	}
+	
+	// error handler for both PHP4+5. 
+	function Error($err,$fn)
+	{
+	global $_ADODB_ACTIVE_DBS;
+	
+		$fn = get_class($this).'::'.$fn;
+		$this->_lasterr = $fn.': '.$err;
+		
+		if ($this->_dbat < 0) $db = false;
+		else {
+			$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
+			$db = $activedb->db;
+		}
+		
+		if (function_exists('adodb_throw')) {	
+			if (!$db) adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false);
+			else adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db);
+		} else
+			if (!$db || $db->debug) ADOConnection::outp($this->_lasterr);
+		
+	}
+	
+	// return last error message
+	function ErrorMsg()
+	{
+		if (!function_exists('adodb_throw')) {
+			if ($this->_dbat < 0) $db = false;
+			else $db = $this->DB();
+		
+			// last error could be database error too
+			if ($db && $db->ErrorMsg()) return $db->ErrorMsg();
+		}
+		return $this->_lasterr;
+	}
+	
+	function ErrorNo() 
+	{
+		if ($this->_dbat < 0) return -9999; // no database connection...
+		$db = $this->DB();
+		
+		return (int) $db->ErrorNo();
+	}
+
+
+	// retrieve ADOConnection from _ADODB_Active_DBs
+	function DB()
+	{
+	global $_ADODB_ACTIVE_DBS;
+	
+		if ($this->_dbat < 0) {
+			$false = false;
+			$this->Error("No database connection set: use ADOdb_Active_Record::SetDatabaseAdaptor(\$db)", "DB");
+			return $false;
+		}
+		$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
+		$db = $activedb->db;
+		return $db;
+	}
+	
+	// retrieve ADODB_Active_Table
+	function &TableInfo()
+	{
+	global $_ADODB_ACTIVE_DBS;
+	
+		$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
+		$table = $activedb->tables[$this->_tableat];
+		return $table;
+	}
+	
+	
+	// I have an ON INSERT trigger on a table that sets other columns in the table.
+	// So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook
+	function Reload()
+	{
+		$db =& $this->DB(); if (!$db) return false;
+		$table =& $this->TableInfo();
+		$where = $this->GenWhere($db, $table);
+		return($this->Load($where));
+	}
+
+	
+	// set a numeric array (using natural table field ordering) as object properties
+	function Set(&$row)
+	{
+	global $ACTIVE_RECORD_SAFETY;
+	
+		$db = $this->DB();
+		
+		if (!$row) {
+			$this->_saved = false;		
+			return false;
+		}
+		
+		$this->_saved = true;
+		
+		$table = $this->TableInfo();
+		$sizeofFlds = sizeof($table->flds);
+		$sizeofRow  = sizeof($row);
+		if ($ACTIVE_RECORD_SAFETY && $table->_colsCount != $sizeofRow && $sizeofFlds != $sizeofRow) {
+            # <AP>
+            $bad_size = TRUE;
+	if($sizeofRow == 2 * $table->_colsCount || $sizeofRow == 2 * $sizeofFlds) {
+                // Only keep string keys
+                $keys = array_filter(array_keys($row), 'is_string');
+                if (sizeof($keys) == sizeof($table->flds))
+                    $bad_size = FALSE;
+            }
+            if ($bad_size) {
+			$this->Error("Table structure of $this->_table has changed","Load");
+			return false;
+		}
+            # </AP>
+		}
+        else
+		$keys = array_keys($row);
+        # <AP>
+        reset($keys);
+        $this->_original = array();
+		foreach($table->flds as $name=>$fld)
+		{
+            $value = $row[current($keys)];
+			$this->$name = $value;
+            $this->_original[] = $value;
+            if(!next($keys)) break;
+		}
+		$table =& $this->TableInfo();
+		foreach($table->_belongsTo as $foreignTable)
+		{
+			$ft = $foreignTable->TableInfo();
+			$propertyName = $ft->name;
+			foreach($ft->flds as $name=>$fld)
+			{
+				$value = $row[current($keys)];
+				$foreignTable->$name = $value;
+				$foreignTable->_original[] = $value;
+				if(!next($keys)) break;
+			}
+		}
+		foreach($table->_hasMany as $foreignTable)
+		{
+			$ft = $foreignTable->TableInfo();
+			foreach($ft->flds as $name=>$fld)
+			{
+				$value = $row[current($keys)];
+				$foreignTable->$name = $value;
+				$foreignTable->_original[] = $value;
+				if(!next($keys)) break;
+			}
+		}
+        # </AP>
+		return true;
+	}
+	
+	// get last inserted id for INSERT
+	function LastInsertID(&$db,$fieldname)
+	{
+		if ($db->hasInsertID)
+			$val = $db->Insert_ID($this->_table,$fieldname);
+		else
+			$val = false;
+			
+		if (is_null($val) || $val === false) {
+			// this might not work reliably in multi-user environment
+			return $db->GetOne("select max(".$fieldname.") from ".$this->_table);
+		}
+		return $val;
+	}
+	
+	// quote data in where clause
+	function doquote(&$db, $val,$t)
+	{
+		switch($t) {
+		case 'D':
+		case 'T':
+			if (empty($val)) return 'null';
+			
+		case 'C':
+		case 'X':
+			if (is_null($val)) return 'null';
+			
+			if (strlen($val)>0 && 
+				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) { 
+				return $db->qstr($val);
+				break;
+			}
+		default:
+			return $val;
+			break;
+		}
+	}
+	
+	// generate where clause for an UPDATE/SELECT
+	function GenWhere(&$db, &$table)
+	{
+		$keys = $table->keys;
+		$parr = array();
+		
+		foreach($keys as $k) {
+			$f = $table->flds[$k];
+			if ($f) {
+				$parr[] = $k.' = '.$this->doquote($db,$this->$k,$db->MetaType($f->type));
+			}
+		}
+		return implode(' and ', $parr);
+	}
+	
+	
+	//-----------------------------------------------...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8778] trunk/lib/WikiPlugin.php

[<var...@us...>]

Revision: 8778
          http://sourceforge.net/p/phpwiki/code/8778
Author:   vargenau
Date:     2013-04-26 14:41:24 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
public $_pi;

Modified Paths:
--------------
    trunk/lib/WikiPlugin.php

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2013-04-26 14:16:50 UTC (rev 8777)
+++ trunk/lib/WikiPlugin.php	2013-04-26 14:41:24 UTC (rev 8778)
@@ -2,7 +2,7 @@
 
 class WikiPlugin
 {
-    protected $_pi;
+    public $_pi;
 
     function getDefaultArguments()
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8777] trunk/lib/plugin/WikiAdminSearchReplace.php

[<var...@us...>]

Revision: 8777
          http://sourceforge.net/p/phpwiki/code/8777
Author:   vargenau
Date:     2013-04-26 14:16:50 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Remove stri_replace

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminSearchReplace.php

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2013-04-26 14:10:54 UTC (rev 8776)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2013-04-26 14:16:50 UTC (rev 8777)
@@ -66,12 +66,7 @@
                 if ($case_exact) {
                     $newtext = str_replace($from, $to, $text);
                 } else {
-                    //not all PHP have this enabled. use a workaround
-                    if (function_exists('str_ireplace'))
-                        $newtext = str_ireplace($from, $to, $text);
-                    else { // see eof
-                        $newtext = stri_replace($from, $to, $text);
-                    }
+                    $newtext = str_ireplace($from, $to, $text);
                 }
             }
             if ($text != $newtext) {
@@ -254,34 +249,6 @@
     }
 }
 
-function stri_replace($find, $replace, $string)
-{
-    if (!is_array($find)) $find = array($find);
-    if (!is_array($replace)) {
-        if (!is_array($find))
-            $replace = array($replace);
-        else {
-            // this will duplicate the string into an array the size of $find
-            $c = count($find);
-            $rString = $replace;
-            unset($replace);
-            for ($i = 0; $i < $c; $i++) {
-                $replace[$i] = $rString;
-            }
-        }
-    }
-    foreach ($find as $fKey => $fItem) {
-        $between = explode(strtolower($fItem), strtolower($string));
-        $pos = 0;
-        foreach ($between as $bKey => $bItem) {
-            $between[$bKey] = substr($string, $pos, strlen($bItem));
-            $pos += strlen($bItem) + strlen($fItem);
-        }
-        $string = implode($replace[$fKey], $between);
-    }
-    return $string;
-}
-
 // Local Variables:
 // mode: php
 // tab-width: 8

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8776] trunk/lib/plugin

[<var...@us...>]

Revision: 8776
          http://sourceforge.net/p/phpwiki/code/8776
Author:   vargenau
Date:     2013-04-26 14:10:54 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
private

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSearchReplace.php
    trunk/lib/plugin/WikiPoll.php
    trunk/lib/plugin/YouTube.php

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2013-04-26 13:53:49 UTC (rev 8775)
+++ trunk/lib/plugin/WikiAdminRename.php	2013-04-26 14:10:54 UTC (rev 8776)
@@ -55,7 +55,7 @@
             ));
     }
 
-    function renameHelper($name, $from, $to, $options = false)
+    private function renameHelper($name, $from, $to, $options = false)
     {
         if (isset($options['regex'])) {
             return preg_replace('/' . $from . '/' . (isset($options['icase']) ? 'i' : ''), $to, $name);
@@ -66,7 +66,7 @@
         }
     }
 
-    function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks = false,
+    private function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks = false,
                          $createredirect = false)
     {
         $result = HTML::div();
@@ -259,7 +259,7 @@
                 => WIKIAUTH_ADMIN))));
     }
 
-    function checkBox(&$post_args, $name, $msg)
+    private function checkBox(&$post_args, $name, $msg)
     {
         $id = 'admin_rename-' . $name;
         $checkbox = HTML::input(array('type' => 'checkbox',
@@ -271,7 +271,7 @@
         return HTML::div($checkbox, ' ', HTML::label(array('for' => $id), $msg));
     }
 
-    function renameForm(&$header, $post_args, $singlepage)
+    private function renameForm(&$header, $post_args, $singlepage)
     {
         $table = HTML::table();
         $this->tablePush($table, _("Rename") . " " . _("from") . _(": "),

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2013-04-26 13:53:49 UTC (rev 8775)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2013-04-26 14:10:54 UTC (rev 8776)
@@ -53,7 +53,7 @@
             ));
     }
 
-    function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false)
+    private function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false)
     {
         $page = $dbi->getPage($pagename);
         if ($page->exists()) { // don't replace default contents
@@ -86,7 +86,7 @@
         return false;
     }
 
-    function searchReplacePages(&$dbi, &$request, $pages, $from, $to)
+    private function searchReplacePages(&$dbi, &$request, $pages, $from, $to)
     {
         if (empty($from)) return HTML::p(HTML::strong(fmt("Error: Empty search string.")));
         $result = HTML::div();
@@ -221,7 +221,7 @@
                 : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)));
     }
 
-    function checkBox(&$post_args, $name, $msg)
+    private function checkBox(&$post_args, $name, $msg)
     {
         $id = 'admin_replace-' . $name;
         $checkbox = HTML::input(array('type' => 'checkbox',
@@ -233,7 +233,7 @@
         return HTML::div($checkbox, ' ', HTML::label(array('for' => $id), $msg));
     }
 
-    function replaceForm(&$header, $post_args)
+    private function replaceForm(&$header, $post_args)
     {
         $header->pushContent(HTML::div(array('class' => 'hint'),
                 _("Replace all occurences of the given string in the content of all pages.")),

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2013-04-26 13:53:49 UTC (rev 8775)
+++ trunk/lib/plugin/WikiPoll.php	2013-04-26 14:10:54 UTC (rev 8776)
@@ -124,7 +124,7 @@
         return;
     }
 
-    function str2array($var, $obarray = false)
+    private function str2array($var, $obarray = false)
     {
         if (!$obarray) $obarray = $GLOBALS;
         $i = 0;
@@ -235,7 +235,7 @@
         return $html;
     }
 
-    function bar($percent)
+    private function bar($percent)
     {
         global $WikiTheme;
         return HTML(HTML::img(array('src' => $WikiTheme->getImageUrl('leftbar'),
@@ -248,7 +248,7 @@
                 'alt' => '>')));
     }
 
-    function doPoll($page, $request, $answers, $readonly = false)
+    private function doPoll($page, $request, $answers, $readonly = false)
     {
         $question = $this->_args['question'];
         $answer = $this->_args['answer'];
@@ -312,7 +312,7 @@
 
     }
 
-    function getResult($page, $i, $j)
+    private function getResult($page, $i, $j)
     {
         $poll = $page->get("poll");
         @$count = $poll['data']['count'][$i][$j];
@@ -321,7 +321,7 @@
         return array($percent, $count, $all);
     }
 
-    function storeResult($page, $i, $j)
+    private function storeResult($page, $i, $j)
     {
         $poll = $page->get("poll");
         if (!$poll) {

Modified: trunk/lib/plugin/YouTube.php
===================================================================
--- trunk/lib/plugin/YouTube.php	2013-04-26 13:53:49 UTC (rev 8775)
+++ trunk/lib/plugin/YouTube.php	2013-04-26 14:10:54 UTC (rev 8776)
@@ -190,7 +190,7 @@
         return $object;
     }
 
-    function Daily_pick()
+    private function Daily_pick()
     {
         if ($xml = url_get_contents("http://www.youtube.com/categories")) {
             if (preg_match('/<div class="heading"><b>Pick of The Day<\/b><\/div>.*?<a href="\/watch\?v=(\w+)">/s', $xml, $m))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8775] trunk

[<var...@us...>]

Revision: 8775
          http://sourceforge.net/p/phpwiki/code/8775
Author:   vargenau
Date:     2013-04-26 13:53:49 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Add () for new WikiPluginLoader

Modified Paths:
--------------
    trunk/SOAP.php
    trunk/lib/CachedMarkup.php
    trunk/lib/EditToolbar.php
    trunk/lib/Template.php
    trunk/lib/WikiDB.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/XmlRpcServer.php
    trunk/lib/display.php
    trunk/lib/plugin/InterWikiSearch.php
    trunk/lib/plugin/PluginManager.php
    trunk/lib/plugin/RecentChangesCached.php
    trunk/lib/plugin/SystemInfo.php
    trunk/lib/plugin/WikiFormRich.php

Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php	2013-04-26 13:41:37 UTC (rev 8774)
+++ trunk/SOAP.php	2013-04-26 13:53:49 UTC (rev 8775)
@@ -275,7 +275,7 @@
     $RetArray = array();
     if (!empty($plugins)) {
         require_once 'lib/WikiPlugin.php';
-        $w = new WikiPluginLoader;
+        $w = new WikiPluginLoader();
         foreach ($plugins as $plugin) {
             $pluginName = str_replace(".php", "", $plugin);
             $p = $w->getPlugin($pluginName, false); // second arg?
@@ -293,7 +293,7 @@
     global $server;
     checkCredentials($server, $credentials, 'change', "Help/" . $pluginname . "Plugin");
     require_once 'lib/WikiPlugin.php';
-    $w = new WikiPluginLoader;
+    $w = new WikiPluginLoader();
     $synopsis = '';
     $p = $w->getPlugin($pluginName, false); // second arg?
     // trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only
@@ -319,7 +319,7 @@
     $basepage = '';
     ;
     require_once 'lib/WikiPlugin.php';
-    $w = new WikiPluginLoader;
+    $w = new WikiPluginLoader();
     $p = $w->getPlugin($pluginName, false); // second arg?
     $pagelist = $p->run($dbi, $pluginargs, $request, $basepage);
     $pages = array();

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2013-04-26 13:41:37 UTC (rev 8774)
+++ trunk/lib/CachedMarkup.php	2013-04-26 13:53:49 UTC (rev 8775)
@@ -863,7 +863,7 @@
 
         if (!$loader) {
             include_once 'lib/WikiPlugin.php';
-            $loader = new WikiPluginLoader;
+            $loader = new WikiPluginLoader();
         }
         return $loader;
     }

Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2013-04-26 13:41:37 UTC (rev 8774)
+++ trunk/lib/EditToolbar.php	2013-04-26 13:53:49 UTC (rev 8775)
@@ -346,7 +346,7 @@
         if (!empty($plugins)) {
             $plugin_js = '';
             require_once 'lib/WikiPlugin.php';
-            $w = new WikiPluginLoader;
+            $w = new WikiPluginLoader();
             foreach ($plugins as $plugin) {
                 $pluginName = str_replace(".php", "", $plugin);
                 if (in_array($pluginName, $AllAllowedPlugins)) {

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2013-04-26 13:41:37 UTC (rev 8774)
+++ trunk/lib/Template.php	2013-04-26 13:53:49 UTC (rev 8775)
@@ -84,7 +84,7 @@
         static $loader;
 
         if (empty($loader))
-            $loader = new WikiPluginLoader;
+            $loader = new WikiPluginLoader();
 
         $this->_print($loader->expandPI($pi, $this->_request, $this, $this->_basepage));
     }

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2013-04-26 13:41:37 UTC (rev 8774)
+++ trunk/lib/WikiDB.php	2013-04-26 13:53:49 UTC (rev 8775)
@@ -1089,7 +1089,7 @@
                     array('loadfile', 'upgrade'))
         ) {
             require_once 'lib/WikiPlugin.php';
-            $w = new WikiPluginLoader;
+            $w = new WikiPluginLoader();
             $p = $w->getPlugin("RecentChangesCached", false);
             $p->box_update(false, $GLOBALS['request'], $this->_pagename);
         }

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2013-04-26 13:41:37 UTC (rev 8774)
+++ trunk/lib/WikiPluginCached.php	2013-04-26 13:53:49 UTC (rev 8775)
@@ -861,7 +861,7 @@
         $pluginname = $plugincall['pluginname'];
         $argarray = $plugincall['arguments'];
 
-        $loader = new WikiPluginLoader;
+        $loader = new WikiPluginLoader();
         $plugin = $loader->getPlugin($pluginname);
 
         // cache empty, but image maps have to be created _inline_

Modified: trunk/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php	2013-04-26 13:41:37 UTC (rev 8774)
+++ trunk/lib/XmlRpcServer.php	2013-04-26 13:53:49 UTC (rev 8775)
@@ -709,7 +709,7 @@
     $RetArray = array();
     if (!empty($plugins)) {
         require_once 'lib/WikiPlugin.php';
-        $w = new WikiPluginLoader;
+        $w = new WikiPluginLoader();
         foreach ($plugins as $plugin) {
             $pluginName = str_replace(".php", "", $plugin);
             $p = $w->getPlugin($pluginName, false); // second arg?
@@ -741,7 +741,7 @@
     $pluginName = short_string_decode($ParamPlugin->scalarval());
 
     require_once 'lib/WikiPlugin.php';
-    $w = new WikiPluginLoader;
+    $w = new WikiPluginLoader();
     $synopsis = '';
     $p = $w->getPlugin($pluginName, false); // second arg?
     // trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only
@@ -784,7 +784,7 @@
 
     $basepage = ''; //$pluginName;
     require_once 'lib/WikiPlugin.php';
-    $w = new WikiPluginLoader;
+    $w = new WikiPluginLoader();
     $p = $w->getPlugin($pluginName, false); // second arg?
     $pagelist = $p->run($dbi, $plugin_args, $request, $basepage);
     $list = array();

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2013-04-26 13:41:37 UTC (rev 8774)
+++ trunk/lib/display.php	2013-04-26 13:53:49 UTC (rev 8775)
@@ -129,7 +129,7 @@
         // Need the pagelist from the first plugin
         foreach ($transformedContent->_content as $cached_element) {
             if (is_a($cached_element, "Cached_PluginInvocation")) {
-                $loader = new WikiPluginLoader;
+                $loader = new WikiPluginLoader();
                 $markup = null;
                 // return the first found pagelist
                 $pagelist = $loader->expandPI($cached_element->_pi, $request,

Modified: trunk/lib/plugin/InterWikiSearch.php
===================================================================
--- trunk/lib/plugin/InterWikiSearch.php	2013-04-26 13:41:37 UTC (rev 8774)
+++ trunk/lib/plugin/InterWikiSearch.php	2013-04-26 13:53:49 UTC (rev 8775)
@@ -106,7 +106,7 @@
                             ? WikiLink($moniker)
                             : $moniker);
 
-                    $w = new WikiPluginLoader;
+                    $w = new WikiPluginLoader();
                     $p = $w->getPlugin('ExternalSearch');
                     $argstr = sprintf('url="%s"', addslashes($interurl));
                     $searchtd = HTML::td($p->run($dbi, $argstr, $request, $basepage));

Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php	2013-04-26 13:41:37 UTC (rev 8774)
+++ trunk/lib/plugin/PluginManager.php	2013-04-26 13:53:49 UTC (rev 8775)
@@ -97,7 +97,7 @@
         $tbody = HTML::tbody();
         $row_no = 0;
 
-        $w = new WikiPluginLoader;
+        $w = new WikiPluginLoader();
         foreach ($plugins as $pluginName) {
 
             $pluginName = str_replace(".php", "", $pluginName);

Modified: trunk/lib/plugin/RecentChangesCached.php
===================================================================
--- trunk/lib/plugin/RecentChangesCached.php	2013-04-26 13:41:37 UTC (rev 8774)
+++ trunk/lib/plugin/RecentChangesCached.php	2013-04-26 13:53:49 UTC (rev 8775)
@@ -67,7 +67,7 @@
         $changes = $plugin->getChanges($dbi, $args);
         return $plugin->format($changes, $args);
         /*
-        $loader = new WikiPluginLoader;
+        $loader = new WikiPluginLoader();
         return $loader->expandPI('<?plugin RecentChanges '
             . WikiPluginCached::glueArgs($argarray)
                                  . ' ?>', $request, $this, $basepage);

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2013-04-26 13:41:37 UTC (rev 8774)
+++ trunk/lib/plugin/SystemInfo.php	2013-04-26 13:53:49 UTC (rev 8775)
@@ -78,7 +78,7 @@
 
     function getHtml($dbi, $argarray, $request, $basepage)
     {
-        $loader = new WikiPluginLoader;
+        $loader = new WikiPluginLoader();
         return $loader->expandPI('<<SystemInfo '
             . WikiPluginCached::glueArgs($argarray) // all
             . ' ?>', $request, $this, $basepage);

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2013-04-26 13:41:37 UTC (rev 8774)
+++ trunk/lib/plugin/WikiFormRich.php	2013-04-26 13:53:49 UTC (rev 8775)
@@ -358,7 +358,7 @@
                     $pluginName = substr($input['method'], 7);
                     $basepage = '';
                     require_once 'lib/WikiPlugin.php';
-                    $w = new WikiPluginLoader;
+                    $w = new WikiPluginLoader();
                     $p = $w->getPlugin($pluginName, false); // second arg?
                     if (!is_object($p))
                         trigger_error("invalid input['method'] " . $input['method'], E_USER_WARNING);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8774] trunk/lib/WikiPlugin.php

[<var...@us...>]

Revision: 8774
          http://sourceforge.net/p/phpwiki/code/8774
Author:   vargenau
Date:     2013-04-26 13:41:37 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Initialize variables

Modified Paths:
--------------
    trunk/lib/WikiPlugin.php

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2013-04-26 13:32:26 UTC (rev 8773)
+++ trunk/lib/WikiPlugin.php	2013-04-26 13:41:37 UTC (rev 8774)
@@ -2,6 +2,8 @@
 
 class WikiPlugin
 {
+    protected $_pi;
+
     function getDefaultArguments()
     {
         return array('description' => $this->getDescription());
@@ -186,7 +188,12 @@
             }
         }
         while (preg_match("/^$opt_ws $argspec_p $opt_ws/x", $argstr, $m)) {
-            //@ list(,$arg,$op,$qq_val,$q_val,$gt_val,$word_val) = $m;
+            $qq_val = '';
+            $q_val = '';
+            $gt_val = '';
+            $word_val = '';
+            $op = '';
+            $arg = '';
             $count = count($m);
             if ($count >= 7) {
                 list(, $arg, $op, $qq_val, $q_val, $gt_val, $word_val) = $m;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8773] trunk/lib/WikiPlugin.php

[<var...@us...>]

Revision: 8773
          http://sourceforge.net/p/phpwiki/code/8773
Author:   vargenau
Date:     2013-04-26 13:32:26 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Fix warnings

Modified Paths:
--------------
    trunk/lib/WikiPlugin.php

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2013-04-26 13:12:45 UTC (rev 8772)
+++ trunk/lib/WikiPlugin.php	2013-04-26 13:32:26 UTC (rev 8773)
@@ -33,8 +33,8 @@
     // FIXME: args?
     function run($dbi, $argstr, &$request, $basepage)
     {
-        trigger_error("WikiPlugin::run: pure virtual function",
-            E_USER_ERROR);
+        trigger_error("WikiPlugin::run: pure virtual function", E_USER_ERROR);
+        return false;
     }
 
     /** Get wiki-pages linked to by plugin invocation.
@@ -88,9 +88,9 @@
         return $this->getName();
     }
 
-    function getArgs($argstr, $request = false, $defaults = false)
+    function getArgs($argstr, $request = false, $defaults = array())
     {
-        if ($defaults === false) {
+        if (empty($defaults)) {
             $defaults = $this->getDefaultArguments();
         }
         //Fixme: on POST argstr is empty

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8772] trunk/lib/plugin

[<var...@us...>]

Revision: 8772
          http://sourceforge.net/p/phpwiki/code/8772
Author:   vargenau
Date:     2013-04-26 13:12:45 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Add missing return

Modified Paths:
--------------
    trunk/lib/plugin/FileInfo.php
    trunk/lib/plugin/WikiAdminUtils.php

Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php	2013-04-26 13:06:20 UTC (rev 8771)
+++ trunk/lib/plugin/FileInfo.php	2013-04-26 13:12:45 UTC (rev 8772)
@@ -295,6 +295,7 @@
                     $pValue->dwFileVersionLS & 0xFFFF);
             }
         }
+        return '';
     }
 
     // Read "RT_VERSION/VERSIONINFO" exe/dll resource info for MSWin32 binaries

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2013-04-26 13:06:20 UTC (rev 8771)
+++ trunk/lib/plugin/WikiAdminUtils.php	2013-04-26 13:12:45 UTC (rev 8772)
@@ -300,6 +300,7 @@
                     Button('cancel', _("Cancel")))
             );
         }
+    return HTML::raw();
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8771] trunk/lib/plugin

[<var...@us...>]

Revision: 8771
          http://sourceforge.net/p/phpwiki/code/8771
Author:   vargenau
Date:     2013-04-26 13:06:20 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Add missing return

Modified Paths:
--------------
    trunk/lib/plugin/FileInfo.php
    trunk/lib/plugin/FoafViewer.php
    trunk/lib/plugin/FrameInclude.php
    trunk/lib/plugin/LinkDatabase.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/WatchPage.php
    trunk/lib/plugin/WikiAdminSelect.php
    trunk/lib/plugin/WikiAdminUtils.php

Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php	2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/FileInfo.php	2013-04-26 13:06:20 UTC (rev 8771)
@@ -204,6 +204,7 @@
             $n -= floor($factor * $b);
             return number_format($b, $n ? 3 : 0) . $suffix;
         }
+        return '';
     }
 
     function phonysize($a)

Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php	2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/FoafViewer.php	2013-04-26 13:06:20 UTC (rev 8771)
@@ -187,6 +187,7 @@
                 return $html;
             }
         }
+        return '';
     }
 
     /**

Modified: trunk/lib/plugin/FrameInclude.php
===================================================================
--- trunk/lib/plugin/FrameInclude.php	2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/FrameInclude.php	2013-04-26 13:06:20 UTC (rev 8771)
@@ -145,6 +145,7 @@
         $request->discardOutput();
         displayPage($request, new Template('frameset', $request, $tokens));
         $request->finish(); //noreturn
+        return '';
     }
 }
 

Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php	2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/LinkDatabase.php	2013-04-26 13:06:20 UTC (rev 8771)
@@ -183,6 +183,7 @@
         } else {
             return $this->error(fmt("Unsupported format argument %s", $args['format']));
         }
+        return '';
     }
 }
 

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/ModeratedPage.php	2013-04-26 13:06:20 UTC (rev 8771)
@@ -323,6 +323,7 @@
         } else {
             return $this->approval_form($request, $args, $moderation, 'approve');
         }
+        return '';
     }
 
     /**
@@ -337,6 +338,7 @@
         } else {
             return $this->approval_form($request, $args, $moderation, 'reject');
         }
+        return '';
     }
 
     function cleanup_and_notify(&$request, $args, &$moderation)

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/PhotoAlbum.php	2013-04-26 13:06:20 UTC (rev 8771)
@@ -549,6 +549,7 @@
         }
         $photos[] = array("name" => $src, //album_location."/$src".album_default_extension,
             "desc" => "");
+        return '';
     }
 
     /**
@@ -668,6 +669,7 @@
                     "name_tile" => dirname($src) . "/" . trim($data[0]));
             }
         }
+        return '';
     }
 }
 

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/RateIt.php	2013-04-26 13:06:20 UTC (rev 8771)
@@ -288,6 +288,7 @@
             }
             return $html;
         }
+        return HTML::raw();
     }
 
     // box is used to display a fixed-width, narrow version with common header

Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php	2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/WatchPage.php	2013-04-26 13:06:20 UTC (rev 8771)
@@ -169,6 +169,7 @@
                 }
             }
         }
+        return '';
     }
 }
 

Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/WikiAdminSelect.php	2013-04-26 13:06:20 UTC (rev 8771)
@@ -232,6 +232,7 @@
         } else {
             ; //return $action_result;
         }
+        return '';
     }
 
     protected function tablePush(&$table, $first, $second)

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/WikiAdminUtils.php	2013-04-26 13:06:20 UTC (rev 8771)
@@ -108,6 +108,7 @@
             $message,
             array(_("Back") => $args['return_url']));
         $alert->show(); // noreturn
+        return '';
     }
 
     private function _getLabel($action)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8770] trunk/lib/plugin

[<var...@us...>]

Revision: 8770
          http://sourceforge.net/p/phpwiki/code/8770
Author:   vargenau
Date:     2013-04-26 12:48:14 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Add return argument

Modified Paths:
--------------
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/WatchPage.php

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2013-04-18 09:36:18 UTC (rev 8769)
+++ trunk/lib/plugin/PhotoAlbum.php	2013-04-26 12:48:14 UTC (rev 8770)
@@ -185,7 +185,9 @@
         if ($align != 'left' && $align != 'center' && $align != 'right') {
             $align = 'center';
         }
-        if (count($photos) == 0) return;
+        if (count($photos) == 0) {
+            return HTML::raw();
+        }
 
         if (in_array("sort", $attributes))
             sort($photos);
@@ -605,7 +607,7 @@
                     "src" => $src . "/$file",
                     "desc" => "");
             }
-            return;
+            return '';
         }
         // check if $src is an image
         foreach (array('jpeg', 'jpg', 'png', 'gif') as $ext) {
@@ -618,7 +620,7 @@
                         "name_tile" => $src,
                         "src" => $src,
                         "desc" => "");
-                    return;
+                    return '';
                 }
                 if (!file_exists($src))
                     return $this->error(fmt("Unable to find src=“%s”", $src));
@@ -627,7 +629,7 @@
                     "name_tile" => $src,
                     "src" => $src,
                     "desc" => "");
-                return;
+                return '';
             }
         }
         if ($web_location == 0) {

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2013-04-18 09:36:18 UTC (rev 8769)
+++ trunk/lib/plugin/RateIt.php	2013-04-26 12:48:14 UTC (rev 8770)
@@ -294,7 +294,9 @@
     function box($args = false, $request = false, $basepage = false)
     {
         if (!$request) $request =& $GLOBALS['request'];
-        if (!$request->_user->isSignedIn()) return;
+        if (!$request->_user->isSignedIn()) {
+            return HTML::raw();
+        }
         if (!isset($args)) $args = array();
         $args['small'] = 1;
         $argstr = '';

Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php	2013-04-18 09:36:18 UTC (rev 8769)
+++ trunk/lib/plugin/WatchPage.php	2013-04-26 12:48:14 UTC (rev 8770)
@@ -145,12 +145,12 @@
                         array('warningmsg' => _('WatchPage cancelled')),
                         'absolute_url'));
                     // noreturn
-                    return;
+                    return '';
                 }
                 if ($request->getArg('edit')) {
                     $request->redirect(WikiURL(_("UserPreferences"),
                         false, 'absolute_url')); // noreturn
-                    return;
+                    return '';
                 }
                 $add = $request->getArg('add');
                 if ($add and !$request->getArg('verify')) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8769] trunk/lib/plugin

[<var...@us...>]

Revision: 8769
          http://sourceforge.net/p/phpwiki/code/8769
Author:   vargenau
Date:     2013-04-18 09:36:18 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
tablePush is protected

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSearchReplace.php
    trunk/lib/plugin/WikiAdminSelect.php

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2013-04-18 09:34:48 UTC (rev 8768)
+++ trunk/lib/plugin/WikiAdminRename.php	2013-04-18 09:36:18 UTC (rev 8769)
@@ -274,28 +274,28 @@
     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' => MAX_PAGENAME_LENGTH,
                 'maxlength' => MAX_PAGENAME_LENGTH,
                 'readonly' => 'readonly',
                 'value' => $post_args['from'])));
-        $this->_tablePush($table, _("to") . _(": "),
+        $this->tablePush($table, _("to") . _(": "),
             HTML::input(array('name' => 'admin_rename[to]',
                 'size' => MAX_PAGENAME_LENGTH,
                 'maxlength' => MAX_PAGENAME_LENGTH,
                 'value' => $post_args['to'])));
         if ($singlepage === false) {
-            $this->_tablePush($table, '',
+            $this->tablePush($table, '',
                 $this->checkBox($post_args, 'regex', _("Regex?")));
-            $this->_tablePush($table, '',
+            $this->tablePush($table, '',
                 $this->checkBox($post_args, 'icase', _("Case insensitive?")));
         }
         if (defined('EXPERIMENTAL') and EXPERIMENTAL) // not yet stable
-            $this->_tablePush($table, '',
+            $this->tablePush($table, '',
                 $this->checkBox($post_args, 'updatelinks',
                     _("Change pagename in all linked pages also?")));
-        $this->_tablePush($table, '',
+        $this->tablePush($table, '',
             $this->checkBox($post_args, 'createredirect',
                 _("Create redirect from old to new name?")));
         $header->pushContent($table);

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2013-04-18 09:34:48 UTC (rev 8768)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2013-04-18 09:36:18 UTC (rev 8769)
@@ -239,16 +239,16 @@
                 _("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'])));
-        $this->_tablePush($table, '', $this->checkBox($post_args, 'case_exact', _("Case exact?")));
-        $this->_tablePush($table, '', $this->checkBox($post_args, 'regex', _("Regex?")));
+        $this->tablePush($table, '', $this->checkBox($post_args, 'case_exact', _("Case exact?")));
+        $this->tablePush($table, '', $this->checkBox($post_args, 'regex', _("Regex?")));
         $header->pushContent($table);
         return $header;
     }

Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2013-04-18 09:34:48 UTC (rev 8768)
+++ trunk/lib/plugin/WikiAdminSelect.php	2013-04-18 09:36:18 UTC (rev 8769)
@@ -234,7 +234,7 @@
         }
     }
 
-    private function _tablePush(&$table, $first, $second)
+    protected function tablePush(&$table, $first, $second)
     {
         $table->pushContent(
             HTML::tr(

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8768] trunk/lib/plugin/PageHistory.php

[<var...@us...>]

Revision: 8768
          http://sourceforge.net/p/phpwiki/code/8768
Author:   vargenau
Date:     2013-04-18 09:34:48 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
_PageHistory_PageRevisionIter is not private

Modified Paths:
--------------
    trunk/lib/plugin/PageHistory.php

Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php	2013-04-18 09:24:36 UTC (rev 8767)
+++ trunk/lib/plugin/PageHistory.php	2013-04-18 09:34:48 UTC (rev 8768)
@@ -25,7 +25,7 @@
 class _PageHistory_PageRevisionIter
     extends WikiDB_PageRevisionIterator
 {
-    private function _PageHistory_PageRevisionIter($rev_iter, $params)
+    function _PageHistory_PageRevisionIter($rev_iter, $params)
     {
 
         $this->_iter = $rev_iter;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8767] trunk/lib/main.php

[<var...@us...>]

Revision: 8767
          http://sourceforge.net/p/phpwiki/code/8767
Author:   vargenau
Date:     2013-04-18 09:24:36 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
var $_dbi

Modified Paths:
--------------
    trunk/lib/main.php

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2013-04-17 13:15:30 UTC (rev 8766)
+++ trunk/lib/main.php	2013-04-18 09:24:36 UTC (rev 8767)
@@ -50,7 +50,7 @@
 
 class WikiRequest extends Request
 {
-    // var $_dbi;
+    var $_dbi;
 
     function WikiRequest()
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8766] trunk/lib/plugin/IncludePage.php

[<var...@us...>]

Revision: 8766
          http://sourceforge.net/p/phpwiki/code/8766
Author:   vargenau
Date:     2013-04-17 13:15:30 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
protected function extractParts

Modified Paths:
--------------
    trunk/lib/plugin/IncludePage.php

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2013-04-17 10:36:49 UTC (rev 8765)
+++ trunk/lib/plugin/IncludePage.php	2013-04-17 13:15:30 UTC (rev 8766)
@@ -179,7 +179,7 @@
      * handles the arguments: section, sectionhead, lines, words, bytes,
      * for UnfoldSubpages, IncludePage, ...
      */
-    function extractParts($c, $pagename, $args)
+    protected function extractParts($c, $pagename, $args)
     {
         extract($args);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8765] trunk/lib/plugin

[<var...@us...>]

Revision: 8765
          http://sourceforge.net/p/phpwiki/code/8765
Author:   vargenau
Date:     2013-04-17 10:36:49 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
HTML::Raw --> HTML::raw

Modified Paths:
--------------
    trunk/lib/plugin/AppendText.php
    trunk/lib/plugin/PasswordReset.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/UserPreferences.php
    trunk/lib/plugin/WatchPage.php
    trunk/lib/plugin/WhoIsOnline.php
    trunk/lib/plugin/WikiFormRich.php

Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php	2013-04-17 10:34:01 UTC (rev 8764)
+++ trunk/lib/plugin/AppendText.php	2013-04-17 10:36:49 UTC (rev 8765)
@@ -146,7 +146,7 @@
 
         } else {
             $link = HTML::em(WikiLink($pagename));
-            $message->pushContent(HTML::Raw(sprintf(_("Go to %s."), $link->asXml())));
+            $message->pushContent(HTML::raw(sprintf(_("Go to %s."), $link->asXml())));
         }
 
         return $message;

Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php	2013-04-17 10:34:01 UTC (rev 8764)
+++ trunk/lib/plugin/PasswordReset.php	2013-04-17 10:36:49 UTC (rev 8765)
@@ -96,7 +96,7 @@
     {
         if (!$header) {
             $header = HTML::p(_("Reset password of user: "),
-                HTML::Raw(' '),
+                HTML::raw(' '),
                 HTML::input(array('type' => 'text',
                     'name' => "user",
                     'value' => $userid))
@@ -107,7 +107,7 @@
             $footer = HTML::p(Button('submit:admin_reset[reset]',
                     $isadmin ? _("Yes") : _("Send e-mail"),
                     $isadmin ? 'wikiadmin' : 'button'),
-                HTML::Raw(' '),
+                HTML::raw(' '),
                 Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
         }
         return HTML::form(array('action' => $request->getPostURL(),
@@ -153,7 +153,7 @@
                 $buttons = HTML::p(Button('submit:admin_reset[reset]',
                         $isadmin ? _("Yes") : _("Send e-mail"),
                         $isadmin ? 'wikiadmin' : 'button'),
-                    HTML::Raw(' '),
+                    HTML::raw(' '),
                     Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
                 $header = HTML::strong("Verify");
                 if (!$user->isAdmin()) {

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2013-04-17 10:34:01 UTC (rev 8764)
+++ trunk/lib/plugin/RateIt.php	2013-04-17 10:36:49 UTC (rev 8765)
@@ -392,7 +392,7 @@
             //This adds a space between the rating smilies:
             //if (($i%2) == 0) $html->pushContent("\n");
         }
-        $html->pushContent(HTML::Raw(" "));
+        $html->pushContent(HTML::raw(" "));
 
         $a0 = HTML::a(array('href' => "javascript:clickRating('$reImgPrefix','$rePagename','$version',"
             . "'$reImgId','$dimension','X')"));

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2013-04-17 10:34:01 UTC (rev 8764)
+++ trunk/lib/plugin/UserPreferences.php	2013-04-17 10:36:49 UTC (rev 8765)
@@ -117,7 +117,7 @@
                             HiddenInputs($request->getArgs()),
                             HTML::p(_("Do you really want to reset all your UserPreferences?")),
                             HTML::p(Button('submit:delete', _("Yes"), 'delete'),
-                                HTML::Raw(' '),
+                                HTML::raw(' '),
                                 Button('cancel', _("Cancel")))
                         ));
                 } elseif ($rp = $request->getArg('pref')) {

Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php	2013-04-17 10:34:01 UTC (rev 8764)
+++ trunk/lib/plugin/WatchPage.php	2013-04-17 10:36:49 UTC (rev 8765)
@@ -88,12 +88,12 @@
                 HTML::p(sprintf(_("Do you %s want to add this page \"%s\" to your WatchList?"),
                     ($verified ? _("really") : ""), $page)),
                 HTML::p(Button('submit:add', _("Yes")),
-                    HTML::Raw(' '),
+                    HTML::raw(' '),
                     Button('submit:cancel', _("Cancel"))));
         } else {
             $form->pushContent(HTML::p(fmt("The page %s is already watched!", $page)),
                 HTML::p(Button('submit:edit', _("Edit")),
-                    HTML::Raw(' '),
+                    HTML::raw(' '),
                     Button('submit:cancel', _("Cancel"))));
         }
         $fieldset = HTML::fieldset(HTML::legend(_("Watch Page")), $form);

Modified: trunk/lib/plugin/WhoIsOnline.php
===================================================================
--- trunk/lib/plugin/WhoIsOnline.php	2013-04-17 10:34:01 UTC (rev 8764)
+++ trunk/lib/plugin/WhoIsOnline.php	2013-04-17 10:36:49 UTC (rev 8765)
@@ -78,7 +78,7 @@
         if (!$request) $request =& $GLOBALS['request'];
         $stats = $this->getStats($request->_dbi, $request, 'summary');
         return $this->makeBox(_("Who is Online"),
-            HTML(HTML::Raw('· '),
+            HTML(HTML::raw('· '),
                 WikiLink(_("WhoIsOnline"), 'auto',
                     fmt("%d online users", $stats['NUM_USERS']))));
     }

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2013-04-17 10:34:01 UTC (rev 8764)
+++ trunk/lib/plugin/WikiFormRich.php	2013-04-17 10:36:49 UTC (rev 8765)
@@ -183,7 +183,7 @@
                 'class' => 'wikiformrich',
                 'accept-charset' => 'UTF-8'),
             HiddenInputs(array('action' => $action)));
-        $nbsp = HTML::Raw(' ');
+        $nbsp = HTML::raw(' ');
         $already_submit = 0;
         foreach ($this->inputbox as $inputbox) {
             foreach ($inputbox as $inputtype => $input) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.