phpwiki-checkins Mailing List for PhpWiki

Revision: 8733
 http://sourceforge.net/p/phpwiki/code/8733
Author: vargenau
Date: 2013年02月15日 16:26:30 +0000 (2013年2月15日)
Log Message:
-----------
Remove &
Modified Paths:
--------------
 trunk/lib/PageList.php
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2013年02月15日 16:04:19 UTC (rev 8732)
+++ trunk/lib/PageList.php	2013年02月15日 16:26:30 UTC (rev 8733)
@@ -105,7 +105,7 @@
 
 // new grid-style sortable heading
 // TODO: via activeui.js ? (fast dhtml sorting)
- function button_heading(&$pagelist, $colNum)
+ function button_heading($pagelist, $colNum)
 {
 global $WikiTheme, $request;
 // allow sorting?
@@ -933,7 +933,7 @@
 $this->_options['count'] = $i;
 }
 
- function addPageList(&$list)
+ function addPageList($list)
 {
 if (empty($list)) return; // Protect reset from a null arg
 if (isset($this->_options['limit'])) { // extract from,count from limit
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8732
 http://sourceforge.net/p/phpwiki/code/8732
Author: vargenau
Date: 2013年02月15日 16:04:19 +0000 (2013年2月15日)
Log Message:
-----------
Use forge_get_config
Modified Paths:
--------------
 trunk/wikilist.php
Modified: trunk/wikilist.php
===================================================================
--- trunk/wikilist.php	2013年02月15日 16:03:24 UTC (rev 8731)
+++ trunk/wikilist.php	2013年02月15日 16:04:19 UTC (rev 8732)
@@ -44,7 +44,7 @@
 _('Unix name'),
 _('Public?')
 );
-if (isset($sys_intranet) & $sys_intranet) {
+if (forge_get_config('allow_external')) {
 $headers[] = _("External?");
 }
 $headers[] = _('Members');
@@ -55,7 +55,7 @@
 '/wiki/wikilist.php?sortorder=register_time',
 '/wiki/wikilist.php?sortorder=unix_group_name',
 '/wiki/wikilist.php?sortorder=is_public');
-if (isset($sys_intranet) & $sys_intranet) {
+if (forge_get_config('allow_external')) {
 $headerLinks[] = '?sortorder=is_external';
 }
 $headerLinks[] = '/wiki/wikilist.php?sortorder=members';
@@ -77,7 +77,7 @@
 echo '<td>' . $time_display . '</td>';
 echo '<td>' . $grp['unix_group_name'] . '</td>';
 echo '<td>' . $grp['is_public'] . '</td>';
- if (isset($sys_intranet) & $sys_intranet) {
+ if (forge_get_config('allow_external')) {
 echo '<td>' . $grp['is_external'] . '</td>';
 }
 echo '<td>' . $grp['members'] . '</td>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8731
 http://sourceforge.net/p/phpwiki/code/8731
Author: vargenau
Date: 2013年02月15日 16:03:24 +0000 (2013年2月15日)
Log Message:
-----------
Fix path
Modified Paths:
--------------
 trunk/wikiadmin.php
Modified: trunk/wikiadmin.php
===================================================================
--- trunk/wikiadmin.php	2013年02月15日 15:59:57 UTC (rev 8730)
+++ trunk/wikiadmin.php	2013年02月15日 16:03:24 UTC (rev 8731)
@@ -44,8 +44,8 @@
 
 require_once dirname(__FILE__) . "/../../env.inc.php";
 require_once $gfcommon . 'include/pre.php';
-require_once forge_get_config('plugins_path') . 'wiki/common/WikiPlugin.class.php';
-require_once forge_get_config('plugins_path') . 'wiki/common/wikiconfig.class.php';
+require_once forge_get_config('plugins_path') . '/wiki/common/WikiPlugin.class.php';
+require_once forge_get_config('plugins_path') . '/wiki/common/wikiconfig.class.php';
 
 $user = session_get_user(); // get the session user
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8730
 http://sourceforge.net/p/phpwiki/code/8730
Author: vargenau
Date: 2013年02月15日 15:59:57 +0000 (2013年2月15日)
Log Message:
-----------
Remove &
Modified Paths:
--------------
 trunk/lib/PageList.php
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2013年02月15日 15:17:49 UTC (rev 8729)
+++ trunk/lib/PageList.php	2013年02月15日 15:59:57 UTC (rev 8730)
@@ -230,7 +230,7 @@
 
 class _PageList_Column_size extends _PageList_Column
 {
- function format(&$pagelist, $page_handle, &$revision_handle)
+ function format($pagelist, $page_handle, &$revision_handle)
 {
 return HTML::td($this->_tdattr,
 HTML::raw(' '),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8729
 http://sourceforge.net/p/phpwiki/code/8729
Author: vargenau
Date: 2013年02月15日 15:17:49 +0000 (2013年2月15日)
Log Message:
-----------
Fix FormNavigate
Modified Paths:
--------------
 trunk/themes/fusionforge/templates/editpage.tmpl
Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2013年02月15日 15:14:50 UTC (rev 8728)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2013年02月15日 15:17:49 UTC (rev 8729)
@@ -27,10 +27,10 @@
 $(document).ready(function() {
 $("#editpage").FormNavigate('<?php echo _('Warning: leaving the page will lose all your modifications!') ?>');
 jQuery(this).find(":submit").unbind('click');
- jQuery(this).on('click', "submit[name='edit[save]']", function () {
+ jQuery(this).on('click', "input[name='edit[save]']", function () {
 global_formNavigate = true;
 });
- jQuery(this).on('click', "input[type='image'], submit[name='edit[preview]'], submit[name='edit[diff]']", function () {
+ jQuery(this).on('click', "input[type='image'], input[name='edit[preview]'], input[name='edit[diff]']", function () {
 if (supports_local_storage()) {
 if (global_formNavigate == false) {
 window.sessionStorage.setItem('wiki_modified', 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8728
 http://sourceforge.net/p/phpwiki/code/8728
Author: vargenau
Date: 2013年02月15日 15:14:50 +0000 (2013年2月15日)
Log Message:
-----------
Add class warning_msg; remove brackets
Modified Paths:
--------------
 trunk/lib/editpage.php
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2013年02月06日 10:04:48 UTC (rev 8727)
+++ trunk/lib/editpage.php	2013年02月15日 15:14:50 UTC (rev 8728)
@@ -523,8 +523,8 @@
 $diff = new Diff($this->current->getContent(), explode("\n", $this->getContent()));
 if ($diff->isEmpty()) {
 $html->pushContent(HTML::hr(),
- HTML::p('[', _("Versions are identical"),
- ']'));
+ HTML::p(array('class' => 'warning_msg'),
+ _("Versions are identical")));
 } else {
 // New CSS formatted unified diffs
 $fmt = new HtmlUnifiedDiffFormatter;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8727
 http://sourceforge.net/p/phpwiki/code/8727
Author: vargenau
Date: 2013年02月06日 10:04:48 +0000 (2013年2月06日)
Log Message:
-----------
Update lib/nusoap/nusoap.php to version 0.9.5
Modified Paths:
--------------
 trunk/lib/nusoap/nusoap.php
Modified: trunk/lib/nusoap/nusoap.php
===================================================================
--- trunk/lib/nusoap/nusoap.php	2013年02月06日 09:56:05 UTC (rev 8726)
+++ trunk/lib/nusoap/nusoap.php	2013年02月06日 10:04:48 UTC (rev 8727)
@@ -1,11 +1,10 @@
 <?php
-/**
- * NuSOAP - Web Services Toolkit for PHP
- *
- * @author: Dietrich Ayala
- */
 
 /*
+$Id: nusoap.php,v 1.123 2010年04月26日 20:15:08 snichol Exp $
+
+NuSOAP - Web Services Toolkit for PHP
+
 Copyright (c) 2002 NuSphere Corporation
 
 This library is free software; you can redistribute it and/or
@@ -19,9 +18,14 @@
 Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
+The NuSOAP project home is:
+http://sourceforge.net/projects/nusoap/
+
+The primary support for NuSOAP is the Help forum on the project home page.
+
 If you have any questions or comments, please email:
 
 Dietrich Ayala
@@ -33,411 +37,856 @@
 
 */
 
+/*
+ *	Some of the standards implmented in whole or part by NuSOAP:
+ *
+ *	SOAP 1.1 (http://www.w3.org/TR/2000/NOTE-SOAP-20000508/)
+ *	WSDL 1.1 (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
+ *	SOAP Messages With Attachments (http://www.w3.org/TR/SOAP-attachments)
+ *	XML 1.0 (http://www.w3.org/TR/2006/REC-xml-20060816/)
+ *	Namespaces in XML 1.0 (http://www.w3.org/TR/2006/REC-xml-names-20060816/)
+ *	XML Schema 1.0 (http://www.w3.org/TR/xmlschema-0/)
+ *	RFC 2045 Multipurpose Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies
+ *	RFC 2068 Hypertext Transfer Protocol -- HTTP/1.1
+ *	RFC 2617 HTTP Authentication: Basic and Digest Access Authentication
+ */
+
 /* load classes
 
 // necessary classes
-require_once 'class.soapclient.php';
-require_once 'class.soap_val.php';
-require_once 'class.soap_parser.php';
-require_once 'class.soap_fault.php';
+require_once('class.soapclient.php');
+require_once('class.soap_val.php');
+require_once('class.soap_parser.php');
+require_once('class.soap_fault.php');
 
 // transport classes
-require_once 'class.soap_transport_http.php';
+require_once('class.soap_transport_http.php');
 
 // optional add-on classes
-require_once 'class.xmlschema.php';
-require_once 'class.wsdl.php';
+require_once('class.xmlschema.php');
+require_once('class.wsdl.php');
 
 // server class
-require_once 'class.soap_server.php';*/
+require_once('class.soap_server.php');*/
 
+// class variable emulation
+// cf. http://www.webkreator.com/php/techniques/php-static-class-variables.html
+$GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = 9;
+
 /**
- *
- * nusoap_base
- *
- * @author Dietrich Ayala <die...@ga...>
- * @version v 0.6.3
- * @access public
- */
-class nusoap_base
-{
-
- var $title = 'NuSOAP';
- var $version = '0.6.3';
- var $error_str = false;
+*
+* nusoap_base
+*
+* @author Dietrich Ayala <die...@ga...>
+* @author Scott Nichol <sn...@us...>
+* @version $Id: nusoap.php,v 1.123 2010年04月26日 20:15:08 snichol Exp $
+* @access public
+*/
+class nusoap_base {
+	/**
+	 * Identification for HTTP headers.
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $title = 'NuSOAP';
+	/**
+	 * Version for HTTP headers.
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $version = '0.9.5';
+	/**
+	 * CVS revision for HTTP headers.
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $revision = '$Revision: 1.123 $';
+ /**
+ * Current error string (manipulated by getError/setError)
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $error_str = '';
+ /**
+ * Current debug string (manipulated by debug/appendDebug/clearDebug/getDebug/getDebugAsXMLComment)
+	 *
+	 * @var string
+	 * @access private
+	 */
 var $debug_str = '';
- // toggles automatic encoding of special characters
- var $charencoding = true;
-
 /**
- * set schema version
- *
- * @var XMLSchemaVersion
- * @access public
- */
- var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';
+	 * toggles automatic encoding of special characters as entities
+	 * (should always be true, I think)
+	 *
+	 * @var boolean
+	 * @access private
+	 */
+	var $charencoding = true;
+	/**
+	 * the debug level for this instance
+	 *
+	 * @var	integer
+	 * @access private
+	 */
+	var $debugLevel;
 
 /**
- * set default encoding
- *
- * @var soap_defencoding
- * @access public
- */
- //var $soap_defencoding = 'UTF-8';
+	* set schema version
+	*
+	* @var string
+	* @access public
+	*/
+	var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';
+	
+ /**
+	* charset encoding for outgoing messages
+	*
+	* @var string
+	* @access public
+	*/
 var $soap_defencoding = 'ISO-8859-1';
+	//var $soap_defencoding = 'UTF-8';
 
- /**
- * load namespace uris into an array of uri => prefix
- *
- * @var namespaces
- * @access public
- */
- var $namespaces = array(
- 'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',
- 'xsd' => 'http://www.w3.org/2001/XMLSchema',
- 'xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
- 'SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/',
- 'si' => 'http://soapinterop.org/xsd');
- /**
- * load types into typemap array
- * is this legacy yet?
- * no, this is used by the xmlschema class to verify type => namespace mappings.
- * @var typemap
- * @access public
- */
- var $typemap =
- array(
- 'http://www.w3.org/2001/XMLSchema' =>
- array(
- 'string' => 'string', 'boolean' => 'boolean', 'float' => 'double', 'double' => 'double', 'decimal' => 'double',
- 'duration' => '', 'dateTime' => 'string', 'time' => 'string', 'date' => 'string', 'gYearMonth' => '',
- 'gYear' => '', 'gMonthDay' => '', 'gDay' => '', 'gMonth' => '', 'hexBinary' => 'string', 'base64Binary' => 'string',
- // derived datatypes
- 'normalizedString' => 'string', 'token' => 'string', 'language' => '', 'NMTOKEN' => '', 'NMTOKENS' => '', 'Name' => '', 'NCName' => '', 'ID' => '',
- 'IDREF' => '', 'IDREFS' => '', 'ENTITY' => '', 'ENTITIES' => '', 'integer' => 'integer', 'nonPositiveInteger' => 'integer',
- 'negativeInteger' => 'integer', 'long' => 'integer', 'int' => 'integer', 'short' => 'integer', 'byte' => 'integer', 'nonNegativeInteger' => 'integer',
- 'unsignedLong' => '', 'unsignedInt' => '', 'unsignedShort' => '', 'unsignedByte' => '', 'positiveInteger' => ''),
- 'http://www.w3.org/1999/XMLSchema' =>
- array(
- 'i4' => '', 'int' => 'integer', 'boolean' => 'boolean', 'string' => 'string', 'double' => 'double',
- 'float' => 'double', 'dateTime' => 'string',
- 'timeInstant' => 'string', 'base64Binary' => 'string', 'base64' => 'string', 'ur-type' => 'array'),
- 'http://soapinterop.org/xsd' => array('SOAPStruct' => 'struct'),
- 'http://schemas.xmlsoap.org/soap/encoding/' => array('base64' => 'string', 'array' => 'array', 'Array' => 'array'),
- 'http://xml.apache.org/xml-soap' => array('Map')
- );
+	/**
+	* namespaces in an array of prefix => uri
+	*
+	* this is "seeded" by a set of constants, but it may be altered by code
+	*
+	* @var array
+	* @access public
+	*/
+	var $namespaces = array(
+		'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',
+		'xsd' => 'http://www.w3.org/2001/XMLSchema',
+		'xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+		'SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/'
+		);
 
- /**
- * entities to convert
- *
- * @var xmlEntities
- * @access public
- */
- var $xmlEntities = array('quot' => '"', 'amp' => '&',
- 'lt' => '<', 'gt' => '>', 'apos' => "'");
+	/**
+	* namespaces used in the current context, e.g. during serialization
+	*
+	* @var array
+	* @access private
+	*/
+	var $usedNamespaces = array();
 
- /**
- * adds debug data to the class level debug string
- *
- * @param string $string debug data
- * @access private
- */
- function debug($string)
- {
- $this->debug_str .= get_class($this) . ": $string\n";
- }
+	/**
+	* XML Schema types in an array of uri => (array of xml type => php type)
+	* is this legacy yet?
+	* no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.
+	* @var array
+	* @access public
+	*/
+	var $typemap = array(
+	'http://www.w3.org/2001/XMLSchema' => array(
+		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',
+		'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',
+		'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',
+		// abstract "any" types
+		'anyType'=>'string','anySimpleType'=>'string',
+		// derived datatypes
+		'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',
+		'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',
+		'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',
+		'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),
+	'http://www.w3.org/2000/10/XMLSchema' => array(
+		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',
+		'float'=>'double','dateTime'=>'string',
+		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
+	'http://www.w3.org/1999/XMLSchema' => array(
+		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',
+		'float'=>'double','dateTime'=>'string',
+		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
+	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),
+	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),
+ 'http://xml.apache.org/xml-soap' => array('Map')
+	);
 
- /**
- * returns error string if present
- *
- * @return boolean $string error string
- * @access public
- */
- function getError()
- {
- if ($this->error_str != '') {
- return $this->error_str;
- }
- return false;
- }
+	/**
+	* XML entities to convert
+	*
+	* @var array
+	* @access public
+	* @deprecated
+	* @see	expandEntities
+	*/
+	var $xmlEntities = array('quot' => '"','amp' => '&',
+		'lt' => '<','gt' => '>','apos' => "'");
 
- /**
- * sets error string
- *
- * @return boolean $string error string
- * @access private
- */
- function setError($str)
- {
- $this->error_str = $str;
- }
+	/**
+	* constructor
+	*
+	* @access	public
+	*/
+	function nusoap_base() {
+		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
+	}
 
- /**
- * serializes PHP values in accordance w/ section 5. Type information is
- * not serialized if $use == 'literal'.
- *
- * @return string
- * @access public
- */
- function serialize_val($val, $name = false, $type = false, $name_ns = false,
- $type_ns = false, $attributes = false, $use = 'encoded')
- {
- if (is_object($val) && strtolower(get_class($val)) == 'soapval') {
- return $val->serialize($use);
+	/**
+	* gets the global debug level, which applies to future instances
+	*
+	* @return	integer	Debug level 0-9, where 0 turns off
+	* @access	public
+	*/
+	function getGlobalDebugLevel() {
+		return $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
+	}
+
+	/**
+	* sets the global debug level, which applies to future instances
+	*
+	* @param	int	$level	Debug level 0-9, where 0 turns off
+	* @access	public
+	*/
+	function setGlobalDebugLevel($level) {
+		$GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = $level;
+	}
+
+	/**
+	* gets the debug level for this instance
+	*
+	* @return	int	Debug level 0-9, where 0 turns off
+	* @access	public
+	*/
+	function getDebugLevel() {
+		return $this->debugLevel;
+	}
+
+	/**
+	* sets the debug level for this instance
+	*
+	* @param	int	$level	Debug level 0-9, where 0 turns off
+	* @access	public
+	*/
+	function setDebugLevel($level) {
+		$this->debugLevel = $level;
+	}
+
+	/**
+	* adds debug data to the instance debug string with formatting
+	*
+	* @param string $string debug data
+	* @access private
+	*/
+	function debug($string){
+		if ($this->debugLevel > 0) {
+			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");
+		}
+	}
+
+	/**
+	* adds debug data to the instance debug string without formatting
+	*
+	* @param string $string debug data
+	* @access public
+	*/
+	function appendDebug($string){
+		if ($this->debugLevel > 0) {
+			// it would be nice to use a memory stream here to use
+			// memory more efficiently
+			$this->debug_str .= $string;
+		}
+	}
+
+	/**
+	* clears the current debug data for this instance
+	*
+	* @access public
+	*/
+	function clearDebug() {
+		// it would be nice to use a memory stream here to use
+		// memory more efficiently
+		$this->debug_str = '';
+	}
+
+	/**
+	* gets the current debug data for this instance
+	*
+	* @return debug data
+	* @access public
+	*/
+	function &getDebug() {
+		// it would be nice to use a memory stream here to use
+		// memory more efficiently
+		return $this->debug_str;
+	}
+
+	/**
+	* gets the current debug data for this instance as an XML comment
+	* this may change the contents of the debug data
+	*
+	* @return debug data as an XML comment
+	* @access public
+	*/
+	function &getDebugAsXMLComment() {
+		// it would be nice to use a memory stream here to use
+		// memory more efficiently
+		while (strpos($this->debug_str, '--')) {
+			$this->debug_str = str_replace('--', '- -', $this->debug_str);
+		}
+		$ret = "<!--\n" . $this->debug_str . "\n-->";
+ 	return $ret;
+	}
+
+	/**
+	* expands entities, e.g. changes '<' to '&lt;'.
+	*
+	* @param	string	$val	The string in which to expand entities.
+	* @access	private
+	*/
+	function expandEntities($val) {
+		if ($this->charencoding) {
+	 	$val = str_replace('&', '&amp;', $val);
+	 	$val = str_replace("'", '&apos;', $val);
+	 	$val = str_replace('"', '&quot;', $val);
+	 	$val = str_replace('<', '&lt;', $val);
+	 	$val = str_replace('>', '&gt;', $val);
+	 }
+	 return $val;
+	}
+
+	/**
+	* returns error string if present
+	*
+	* @return mixed error string or false
+	* @access public
+	*/
+	function getError(){
+		if($this->error_str != ''){
+			return $this->error_str;
+		}
+		return false;
+	}
+
+	/**
+	* sets error string
+	*
+	* @return boolean $string error string
+	* @access private
+	*/
+	function setError($str){
+		$this->error_str = $str;
+	}
+
+	/**
+	* detect if array is a simple array or a struct (associative array)
+	*
+	* @param	mixed	$val	The PHP array
+	* @return	string	(arraySimple|arrayStruct)
+	* @access	private
+	*/
+	function isArraySimpleOrStruct($val) {
+ $keyList = array_keys($val);
+		foreach ($keyList as $keyListValue) {
+			if (!is_int($keyListValue)) {
+				return 'arrayStruct';
+			}
+		}
+		return 'arraySimple';
+	}
+
+	/**
+	* serializes PHP values in accordance w/ section 5. Type information is
+	* not serialized if $use == 'literal'.
+	*
+	* @param	mixed	$val	The value to serialize
+	* @param	string	$name	The name (local part) of the XML element
+	* @param	string	$type	The XML schema type (local part) for the element
+	* @param	string	$name_ns	The namespace for the name of the XML element
+	* @param	string	$type_ns	The namespace for the type of the element
+	* @param	array	$attributes	The attributes to serialize as name=>value pairs
+	* @param	string	$use	The WSDL "use" (encoded|literal)
+	* @param	boolean	$soapval	Whether this is called from soapval.
+	* @return	string	The serialized element, possibly with child elements
+ * @access	public
+	*/
+	function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {
+		$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");
+		$this->appendDebug('value=' . $this->varDump($val));
+		$this->appendDebug('attributes=' . $this->varDump($attributes));
+		
+ 	if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {
+ 		$this->debug("serialize_val: serialize soapval");
+ 	$xml = $val->serialize($use);
+			$this->appendDebug($val->getDebug());
+			$val->clearDebug();
+			$this->debug("serialize_val of soapval returning $xml");
+			return $xml;
 }
- $this->debug("in serialize_val: $val, $name, $type, $name_ns, $type_ns, $attributes, $use");
- // if no name, use item
- $name = (!$name || is_numeric($name)) ? 'soapVal' : $name;
- // if name has ns, add ns prefix to name
- $xmlns = '';
- if ($name_ns) {
- $prefix = 'nu' . rand(1000, 9999);
- $name = $prefix . ':' . $name;
- $xmlns .= " xmlns:$prefix=\"$name_ns\"";
- }
- // if type is prefixed, create type prefix
- if ($type_ns != '' && $type_ns == $this->namespaces['xsd']) {
- // need to fix this. shouldn't default to xsd if no ns specified
- // w/o checking against typemap
- $type_prefix = 'xsd';
- } elseif ($type_ns) {
- $type_prefix = 'ns' . rand(1000, 9999);
- $xmlns .= " xmlns:$type_prefix=\"$type_ns\"";
- }
- // serialize attributes if present
- if ($attributes) {
- foreach ($attributes as $k => $v) {
- $atts .= " $k=\"$v\"";
- }
- }
+		// force valid name if necessary
+		if (is_numeric($name)) {
+			$name = '__numeric_' . $name;
+		} elseif (! $name) {
+			$name = 'noname';
+		}
+		// if name has ns, add ns prefix to name
+		$xmlns = '';
+ if($name_ns){
+			$prefix = 'nu'.rand(1000,9999);
+			$name = $prefix.':'.$name;
+			$xmlns .= " xmlns:$prefix=\"$name_ns\"";
+		}
+		// if type is prefixed, create type prefix
+		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){
+			// need to fix this. shouldn't default to xsd if no ns specified
+		 // w/o checking against typemap
+			$type_prefix = 'xsd';
+		} elseif($type_ns){
+			$type_prefix = 'ns'.rand(1000,9999);
+			$xmlns .= " xmlns:$type_prefix=\"$type_ns\"";
+		}
+		// serialize attributes if present
+		$atts = '';
+		if($attributes){
+			foreach($attributes as $k => $v){
+				$atts .= " $k=\"".$this->expandEntities($v).'"';
+			}
+		}
+		// serialize null value
+		if (is_null($val)) {
+ 		$this->debug("serialize_val: serialize null");
+			if ($use == 'literal') {
+				// TODO: depends on minOccurs
+				$xml = "<$name$xmlns$atts/>";
+				$this->debug("serialize_val returning $xml");
+	 	return $xml;
+ 	} else {
+				if (isset($type) && isset($type_prefix)) {
+					$type_str = " xsi:type=\"$type_prefix:$type\"";
+				} else {
+					$type_str = '';
+				}
+				$xml = "<$name$xmlns$type_str$atts xsi:nil=\"true\"/>";
+				$this->debug("serialize_val returning $xml");
+	 	return $xml;
+ 	}
+		}
 // serialize if an xsd built-in primitive type
- if ($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])) {
- if ($use == 'literal') {
- return "<$name$xmlns>$val</$name>";
- } else {
- return "<$name$xmlns xsi:type=\"xsd:$type\">$val</$name>";
- }
+ if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){
+ 		$this->debug("serialize_val: serialize xsd built-in primitive type");
+ 	if (is_bool($val)) {
+ 		if ($type == 'boolean') {
+	 		$val = $val ? 'true' : 'false';
+	 	} elseif (! $val) {
+	 		$val = 0;
+	 	}
+			} else if (is_string($val)) {
+				$val = $this->expandEntities($val);
+			}
+			if ($use == 'literal') {
+				$xml = "<$name$xmlns$atts>$val</$name>";
+				$this->debug("serialize_val returning $xml");
+	 	return $xml;
+ 	} else {
+				$xml = "<$name$xmlns xsi:type=\"xsd:$type\"$atts>$val</$name>";
+				$this->debug("serialize_val returning $xml");
+	 	return $xml;
+ 	}
 }
- // detect type and serialize
- $xml = '';
- $atts = '';
- switch (true) {
- case ($type == '' && is_null($val)):
- if ($use == 'literal') {
- // TODO: depends on nillable
- $xml .= "<$name$xmlns/>";
- } else {
- $xml .= "<$name$xmlns xsi:type=\"xsd:nil\"/>";
- }
- break;
- case (is_bool($val) || $type == 'boolean'):
- if (!$val) {
- $val = 0;
- }
- if ($use == 'literal') {
- $xml .= "<$name$xmlns $atts>$val</$name>";
- } else {
- $xml .= "<$name$xmlns xsi:type=\"xsd:boolean\"$atts>$val</$name>";
- }
- break;
- case (is_int($val) || is_long($val) || $type == 'int'):
- if ($use == 'literal') {
- $xml .= "<$name$xmlns $atts>$val</$name>";
- } else {
- $xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";
- }
- break;
- case (is_float($val) || is_double($val) || $type == 'float'):
- if ($use == 'literal') {
- $xml .= "<$name$xmlns $atts>$val</$name>";
- } else {
- $xml .= "<$name$xmlns xsi:type=\"xsd:float\"$atts>$val</$name>";
- }
- break;
- case (is_string($val) || $type == 'string'):
- if ($this->charencoding) {
- $val = htmlspecialchars($val, ENT_QUOTES);
- }
- if ($use == 'literal') {
- $xml .= "<$name$xmlns $atts>$val</$name>";
- } else {
- $xml .= "<$name$xmlns xsi:type=\"xsd:string\"$atts>$val</$name>";
- }
- break;
- case is_object($val):
- $name = strtolower(get_class($val));
- foreach (get_object_vars($val) as $k => $v) {
- $pXml = isset($pXml) ? $pXml . $this->serialize_val($v, $k, false, false, false, false, $use) : $this->serialize_val($v, $k, false, false, false, false, $use);
- }
- $xml .= '<' . $name . '>' . $pXml . '</' . $name . '>';
- break;
- break;
- case (is_array($val) || $type):
- // detect if struct or array
- $keyList = array_keys($val);
- $valueType = 'arraySimple';
- foreach ($keyList as $keyListValue) {
- if (!is_int($keyListValue)) {
- $valueType = 'arrayStruct';
- break;
- }
- }
- if ($valueType == 'arraySimple' || ereg('^ArrayOf', $type)) {
- $i = 0;
- if (is_array($val) && count($val) > 0) {
- foreach ($val as $v) {
- if (is_object($v) && strtolower(get_class($v)) == 'soapval') {
- $tt = $v->type;
- } else {
- $tt = gettype($v);
- }
- $array_types[$tt] = 1;
- $xml .= $this->serialize_val($v, 'item', false, false, false, false, $use);
- if (is_array($v) && is_numeric(key($v))) {
- $i += sizeof($v);
- } else {
- ++$i;
- }
- }
- if (count($array_types) > 1) {
- $array_typename = 'xsd:ur-type';
- } elseif (isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {
- $array_typename = 'xsd:' . $tt;
- } elseif ($tt == 'array' || $tt == 'Array') {
- $array_typename = 'SOAP-ENC:Array';
- } else {
- $array_typename = $tt;
- }
- if (isset($array_types['array'])) {
- $array_type = $i . "," . $i;
- } else {
- $array_type = $i;
- }
- if ($use == 'literal') {
- $xml = "<$name $atts>" . $xml . "</$name>";
- } else {
- $xml = "<$name xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"" . $array_typename . "[$array_type]\"$atts>" . $xml . "</$name>";
- }
- // empty array
- } else {
- if ($use == 'literal') {
- $xml = "<$name $atts>" . $xml . "</$name>";
- ;
- } else {
- $xml = "<$name xsi:type=\"SOAP-ENC:Array\" $atts>" . $xml . "</$name>";
- ;
- }
- }
- } else {
- // got a struct
- if (isset($type) && isset($type_prefix)) {
- $type_str = " xsi:type=\"$type_prefix:$type\"";
- } else {
- $type_str = '';
- }
- if ($use == 'literal') {
- $xml .= "<$name$xmlns $atts>";
- } else {
- $xml .= "<$name$xmlns$type_str$atts>";
- }
- foreach ($val as $k => $v) {
- $xml .= $this->serialize_val($v, $k, false, false, false, false, $use);
- }
- $xml .= "</$name>";
- }
- break;
- default:
- $xml .= 'not detected, got ' . gettype($val) . ' for ' . $val;
- break;
- }
- return $xml;
- }
+		// detect type and serialize
+		$xml = '';
+		switch(true) {
+			case (is_bool($val) || $type == 'boolean'):
+		 		$this->debug("serialize_val: serialize boolean");
+ 		if ($type == 'boolean') {
+	 		$val = $val ? 'true' : 'false';
+	 	} elseif (! $val) {
+	 		$val = 0;
+	 	}
+				if ($use == 'literal') {
+					$xml .= "<$name$xmlns$atts>$val</$name>";
+				} else {
+					$xml .= "<$name$xmlns xsi:type=\"xsd:boolean\"$atts>$val</$name>";
+				}
+				break;
+			case (is_int($val) || is_long($val) || $type == 'int'):
+		 		$this->debug("serialize_val: serialize int");
+				if ($use == 'literal') {
+					$xml .= "<$name$xmlns$atts>$val</$name>";
+				} else {
+					$xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";
+				}
+				break;
+			case (is_float($val)|| is_double($val) || $type == 'float'):
+		 		$this->debug("serialize_val: serialize float");
+				if ($use == 'literal') {
+					$xml .= "<$name$xmlns$atts>$val</$name>";
+				} else {
+					$xml .= "<$name$xmlns xsi:type=\"xsd:float\"$atts>$val</$name>";
+				}
+				break;
+			case (is_string($val) || $type == 'string'):
+		 		$this->debug("serialize_val: serialize string");
+				$val = $this->expandEntities($val);
+				if ($use == 'literal') {
+					$xml .= "<$name$xmlns$atts>$val</$name>";
+				} else {
+					$xml .= "<$name$xmlns xsi:type=\"xsd:string\"$atts>$val</$name>";
+				}
+				break;
+			case is_object($val):
+		 		$this->debug("serialize_val: serialize object");
+		 	if (get_class($val) == 'soapval') {
+		 		$this->debug("serialize_val: serialize soapval object");
+		 	$pXml = $val->serialize($use);
+					$this->appendDebug($val->getDebug());
+					$val->clearDebug();
+		 } else {
+					if (! $name) {
+						$name = get_class($val);
+						$this->debug("In serialize_val, used class name $name as element name");
+					} else {
+						$this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));
+					}
+					foreach(get_object_vars($val) as $k => $v){
+						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);
+					}
+				}
+				if(isset($type) && isset($type_prefix)){
+					$type_str = " xsi:type=\"$type_prefix:$type\"";
+				} else {
+					$type_str = '';
+				}
+				if ($use == 'literal') {
+					$xml .= "<$name$xmlns$atts>$pXml</$name>";
+				} else {
+					$xml .= "<$name$xmlns$type_str$atts>$pXml</$name>";
+				}
+				break;
+			break;
+			case (is_array($val) || $type):
+				// detect if struct or array
+				$valueType = $this->isArraySimpleOrStruct($val);
+ if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){
+			 		$this->debug("serialize_val: serialize array");
+					$i = 0;
+					if(is_array($val) && count($val)> 0){
+						foreach($val as $v){
+	 	if(is_object($v) && get_class($v) == 'soapval'){
+								$tt_ns = $v->type_ns;
+								$tt = $v->type;
+							} elseif (is_array($v)) {
+								$tt = $this->isArraySimpleOrStruct($v);
+							} else {
+								$tt = gettype($v);
+	 }
+							$array_types[$tt] = 1;
+							// TODO: for literal, the name should be $name
+							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);
+							++$i;
+						}
+						if(count($array_types) > 1){
+							$array_typename = 'xsd:anyType';
+						} elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {
+							if ($tt == 'integer') {
+								$tt = 'int';
+							}
+							$array_typename = 'xsd:'.$tt;
+						} elseif(isset($tt) && $tt == 'arraySimple'){
+							$array_typename = 'SOAP-ENC:Array';
+						} elseif(isset($tt) && $tt == 'arrayStruct'){
+							$array_typename = 'unnamed_struct_use_soapval';
+						} else {
+							// if type is prefixed, create type prefix
+							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){
+								 $array_typename = 'xsd:' . $tt;
+							} elseif ($tt_ns) {
+								$tt_prefix = 'ns' . rand(1000, 9999);
+								$array_typename = "$tt_prefix:$tt";
+								$xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";
+							} else {
+								$array_typename = $tt;
+							}
+						}
+						$array_type = $i;
+						if ($use == 'literal') {
+							$type_str = '';
+						} else if (isset($type) && isset($type_prefix)) {
+							$type_str = " xsi:type=\"$type_prefix:$type\"";
+						} else {
+							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"".$array_typename."[$array_type]\"";
+						}
+					// empty array
+					} else {
+						if ($use == 'literal') {
+							$type_str = '';
+						} else if (isset($type) && isset($type_prefix)) {
+							$type_str = " xsi:type=\"$type_prefix:$type\"";
+						} else {
+							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"xsd:anyType[0]\"";
+						}
+					}
+					// TODO: for array in literal, there is no wrapper here
+					$xml = "<$name$xmlns$type_str$atts>".$xml."</$name>";
+				} else {
+					// got a struct
+			 		$this->debug("serialize_val: serialize struct");
+					if(isset($type) && isset($type_prefix)){
+						$type_str = " xsi:type=\"$type_prefix:$type\"";
+					} else {
+						$type_str = '';
+					}
+					if ($use == 'literal') {
+						$xml .= "<$name$xmlns$atts>";
+					} else {
+						$xml .= "<$name$xmlns$type_str$atts>";
+					}
+					foreach($val as $k => $v){
+						// Apache Map
+						if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {
+							$xml .= '<item>';
+							$xml .= $this->serialize_val($k,'key',false,false,false,false,$use);
+							$xml .= $this->serialize_val($v,'value',false,false,false,false,$use);
+							$xml .= '</item>';
+						} else {
+							$xml .= $this->serialize_val($v,$k,false,false,false,false,$use);
+						}
+					}
+					$xml .= "</$name>";
+				}
+				break;
+			default:
+		 		$this->debug("serialize_val: serialize unknown");
+				$xml .= 'not detected, got '.gettype($val).' for '.$val;
+				break;
+		}
+		$this->debug("serialize_val returning $xml");
+		return $xml;
+	}
 
 /**
- * serialize message
- *
- * @param string body
- * @param string headers
- * @param array namespaces
- * @param string style
- * @return string message
- * @access public
- */
- function serializeEnvelope($body, $headers = false, $namespaces = array(), $style = 'rpc')
- {
- // serialize namespaces
- $ns_string = '';
- foreach (array_merge($this->namespaces, $namespaces) as $k => $v) {
- $ns_string .= " xmlns:$k=\"$v\"";
- }
- if ($style == 'rpc') {
- $ns_string = ' SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"' . $ns_string;
- }
+ * serializes a message
+ *
+ * @param string $body the XML of the SOAP body
+ * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array
+ * @param array $namespaces optional the namespaces used in generating the body and headers
+ * @param string $style optional (rpc|document)
+ * @param string $use optional (encoded|literal)
+ * @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
+ * @return string the message
+ * @access public
+ */
+ function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){
+ // TODO: add an option to automatically run utf8_encode on $body and $headers
+ // if $this->soap_defencoding is UTF-8. Not doing this automatically allows
+ // one to send arbitrary UTF-8 characters, not just characters that map to ISO-8859-1
 
- // serialize headers
- if ($headers) {
- $headers = "<SOAP-ENV:Header>" . $headers . "</SOAP-ENV:Header>";
- }
- // serialize envelope
- return
- '<?xml version="1.0" encoding="' . $this->soap_defencoding . '"?' . ">" .
- '<SOAP-ENV:Envelope' . $ns_string . ">" .
- $headers .
- "<SOAP-ENV:Body>" .
- $body .
- "</SOAP-ENV:Body>" .
- "</SOAP-ENV:Envelope>";
- }
+	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");
+	$this->debug("headers:");
+	$this->appendDebug($this->varDump($headers));
+	$this->debug("namespaces:");
+	$this->appendDebug($this->varDump($namespaces));
 
- function formatDump($str)
- {
- $str = htmlspecialchars($str);
- return nl2br($str);
+	// serialize namespaces
+ $ns_string = '';
+	foreach(array_merge($this->namespaces,$namespaces) as $k => $v){
+		$ns_string .= " xmlns:$k=\"$v\"";
+	}
+	if($encodingStyle) {
+		$ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";
+	}
+
+	// serialize headers
+	if($headers){
+		if (is_array($headers)) {
+			$xml = '';
+			foreach ($headers as $k => $v) {
+				if (is_object($v) && get_class($v) == 'soapval') {
+					$xml .= $this->serialize_val($v, false, false, false, false, false, $use);
+				} else {
+					$xml .= $this->serialize_val($v, $k, false, false, false, false, $use);
+				}
+			}
+			$headers = $xml;
+			$this->debug("In serializeEnvelope, serialized array of headers to $headers");
+		}
+		$headers = "<SOAP-ENV:Header>".$headers."</SOAP-ENV:Header>";
+	}
+	// serialize envelope
+	return
+	'<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".
+	'<SOAP-ENV:Envelope'.$ns_string.">".
+	$headers.
+	"<SOAP-ENV:Body>".
+		$body.
+	"</SOAP-ENV:Body>".
+	"</SOAP-ENV:Envelope>";
 }
 
- /**
- * returns the local part of a prefixed string
- * returns the original string, if not prefixed
- *
- * @param string
- * @return string
- * @access public
- */
- function getLocalPart($str)
- {
- if ($sstr = strrchr($str, ':')) {
- // get unqualified name
- return substr($sstr, 1);
- } else {
- return $str;
- }
+	/**
+	 * formats a string to be inserted into an HTML stream
+	 *
+	 * @param string $str The string to format
+	 * @return string The formatted string
+	 * @access public
+	 * @deprecated
+	 */
+ function formatDump($str){
+		$str = htmlspecialchars($str);
+		return nl2br($str);
 }
 
+	/**
+	* contracts (changes namespace to prefix) a qualified name
+	*
+	* @param string $qname qname
+	* @return	string contracted qname
+	* @access private
+	*/
+	function contractQname($qname){
+		// get element namespace
+		//$this->xdebug("Contract $qname");
+		if (strrpos($qname, ':')) {
+			// get unqualified name
+			$name = substr($qname, strrpos($qname, ':') + 1);
+			// get ns
+			$ns = substr($qname, 0, strrpos($qname, ':'));
+			$p = $this->getPrefixFromNamespace($ns);
+			if ($p) {
+				return $p . ':' . $name;
+			}
+			return $qname;
+		} else {
+			return $qname;
+		}
+	}
+
+	/**
+	* expands (changes prefix to namespace) a qualified name
+	*
+	* @param string $qname qname
+	* @return	string expanded qname
+	* @access private
+	*/
+	function expandQname($qname){
+		// get element prefix
+		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){
+			// get unqualified name
+			$name = substr(strstr($qname,':'),1);
+			// get ns prefix
+			$prefix = substr($qname,0,strpos($qname,':'));
+			if(isset($this->namespaces[$prefix])){
+				return $this->namespaces[$prefix].':'.$name;
+			} else {
+				return $qname;
+			}
+		} else {
+			return $qname;
+		}
+	}
+
 /**
- * returns the prefix part of a prefixed string
- * returns false, if not prefixed
- *
- * @param string
- * @return mixed
- * @access public
- */
- function getPrefix($str)
- {
- if ($pos = strrpos($str, ':')) {
- // get prefix
- return substr($str, 0, $pos);
- }
- return false;
- }
+ * returns the local part of a prefixed string
+ * returns the original string, if not prefixed
+ *
+ * @param string $str The prefixed string
+ * @return string The local part
+ * @access public
+ */
+	function getLocalPart($str){
+		if($sstr = strrchr($str,':')){
+			// get unqualified name
+			return substr( $sstr, 1 );
+		} else {
+			return $str;
+		}
+	}
 
- function varDump($data)
- {
- ob_start();
- var_dump($data);
- $ret_val = ob_get_contents();
- ob_end_clean();
- return $ret_val;
- }
+	/**
+ * returns the prefix part of a prefixed string
+ * returns false, if not prefixed
+ *
+ * @param string $str The prefixed string
+ * @return mixed The prefix or false if there is no prefix
+ * @access public
+ */
+	function getPrefix($str){
+		if($pos = strrpos($str,':')){
+			// get prefix
+			return substr($str,0,$pos);
+		}
+		return false;
+	}
+
+	/**
+ * pass it a prefix, it returns a namespace
+ *
+ * @param string $prefix The prefix
+ * @return mixed The namespace, false if no namespace has the specified prefix
+ * @access public
+ */
+	function getNamespaceFromPrefix($prefix){
+		if (isset($this->namespaces[$prefix])) {
+			return $this->namespaces[$prefix];
+		}
+		//$this->setError("No namespace registered for prefix '$prefix'");
+		return false;
+	}
+
+	/**
+ * returns the prefix for a given namespace (or prefix)
+ * or false if no prefixes registered for the given namespace
+ *
+ * @param string $ns The namespace
+ * @return mixed The prefix, false if the namespace has no prefixes
+ * @access public
+ */
+	function getPrefixFromNamespace($ns) {
+		foreach ($this->namespaces as $p => $n) {
+			if ($ns == $n || $ns == $p) {
+			 $this->usedNamespaces[$p] = $n;
+				return $p;
+			}
+		}
+		return false;
+	}
+
+	/**
+ * returns the time in ODBC canonical form with microseconds
+ *
+ * @return string The time in ODBC canonical form with microseconds
+ * @access public
+ */
+	function getmicrotime() {
+		if (function_exists('gettimeofday')) {
+			$tod = gettimeofday();
+			$sec = $tod['sec'];
+			$usec = $tod['usec'];
+		} else {
+			$sec = time();
+			$usec = 0;
+		}
+		return strftime('%Y-%m-%d %H:%M:%S', $sec) . '.' . sprintf('%06d', $usec);
+	}
+
+	/**
+	 * Returns a string with the output of var_dump
+	 *
+	 * @param mixed $data The variable to var_dump
+	 * @return string The output of var_dump
+	 * @access public
+	 */
+ function varDump($data) {
+		ob_start();
+		var_dump($data);
+		$ret_val = ob_get_contents();
+		ob_end_clean();
+		return $ret_val;
+	}
+
+	/**
+	* represents the object as a string
+	*
+	* @return	string
+	* @access public
+	*/
+	function __toString() {
+		return $this->varDump($this);
+	}
 }
 
 // XML Schema Datatype Helper Functions
@@ -445,1914 +894,3712 @@
 //xsd:dateTime helpers
 
 /**
- * convert unix timestamp to ISO 8601 compliant date string
- *
- * @param string $timestamp Unix time stamp
- * @access public
- */
-function timestamp_to_iso8601($timestamp, $utc = true)
-{
- $datestr = date('Y-m-d\TH:i:sO', $timestamp);
- if ($utc) {
- $eregStr =
- '([0-9]{4})-' . // centuries & years CCYY-
- '([0-9]{2})-' . // months MM-
- '([0-9]{2})' . // days DD
- 'T' . // separator T
- '([0-9]{2}):' . // hours hh:
- '([0-9]{2}):' . // minutes mm:
- '([0-9]{2})(\.[0-9]*)?' . // seconds ss.ss...
- '(Z|[+\-][0-9]{2}:?[0-9]{2})?'; // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
+* convert unix timestamp to ISO 8601 compliant date string
+*
+* @param int $timestamp Unix time stamp
+* @param	boolean $utc Whether the time stamp is UTC or local
+* @return	mixed ISO 8601 date string or false
+* @access public
+*/
+function timestamp_to_iso8601($timestamp,$utc=true){
+	$datestr = date('Y-m-d\TH:i:sO',$timestamp);
+	$pos = strrpos($datestr, "+");
+	if ($pos === FALSE) {
+		$pos = strrpos($datestr, "-");
+	}
+	if ($pos !== FALSE) {
+		if (strlen($datestr) == $pos + 5) {
+			$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);
+		}
+	}
+	if($utc){
+		$pattern = '/'.
+		'([0-9]{4})-'.	// centuries & years CCYY-
+		'([0-9]{2})-'.	// months MM-
+		'([0-9]{2})'.	// days DD
+		'T'.			// separator T
+		'([0-9]{2}):'.	// hours hh:
+		'([0-9]{2}):'.	// minutes mm:
+		'([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...
+		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
+		'/';
 
- if (ereg($eregStr, $datestr, $regs)) {
- return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ', $regs[1], $regs[2], $regs[3], $regs[4], $regs[5], $regs[6]);
- }
- return false;
- } else {
- return $datestr;
- }
+		if(preg_match($pattern,$datestr,$regs)){
+			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);
+		}
+		return false;
+	} else {
+		return $datestr;
+	}
 }
 
 /**
- * convert ISO 8601 compliant date string to unix timestamp
- *
- * @param string $datestr ISO 8601 compliant date string
- * @access public
- */
-function iso8601_to_timestamp($datestr)
-{
- $eregStr =
- '([0-9]{4})-' . // centuries & years CCYY-
- '([0-9]{2})-' . // months MM-
- '([0-9]{2})' . // days DD
- 'T' . // separator T
- '([0-9]{2}):' . // hours hh:
- '([0-9]{2}):' . // minutes mm:
- '([0-9]{2})(\.[0-9]+)?' . // seconds ss.ss...
- '(Z|[+\-][0-9]{2}:?[0-9]{2})?'; // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
- if (ereg($eregStr, $datestr, $regs)) {
- // not utc
- if ($regs[8] != 'Z') {
- $op = substr($regs[8], 0, 1);
- $h = substr($regs[8], 1, 2);
- $m = substr($regs[8], strlen($regs[8]) - 2, 2);
- if ($op == '-') {
- $regs[4] = $regs[4] + $h;
- $regs[5] = $regs[5] + $m;
- } elseif ($op == '+') {
- $regs[4] = $regs[4] - $h;
- $regs[5] = $regs[5] - $m;
- }
- }
- return strtotime("$regs[1]-$regs[2]-$regs[3] $regs[4]:$regs[5]:$regs[6]Z");
- } else {
- return false;
- }
+* convert ISO 8601 compliant date string to unix timestamp
+*
+* @param string $datestr ISO 8601 compliant date string
+* @return	mixed Unix timestamp (int) or false
+* @access public
+*/
+function iso8601_to_timestamp($datestr){
+	$pattern = '/'.
+	'([0-9]{4})-'.	// centuries & years CCYY-
+	'([0-9]{2})-'.	// months MM-
+	'([0-9]{2})'.	// days DD
+	'T'.			// separator T
+	'([0-9]{2}):'.	// hours hh:
+	'([0-9]{2}):'.	// minutes mm:
+	'([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...
+	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
+	'/';
+	if(preg_match($pattern,$datestr,$regs)){
+		// not utc
+		if($regs[8] != 'Z'){
+			$op = substr($regs[8],0,1);
+			$h = substr($regs[8],1,2);
+			$m = substr($regs[8],strlen($regs[8])-2,2);
+			if($op == '-'){
+				$regs[4] = $regs[4] + $h;
+				$regs[5] = $regs[5] + $m;
+			} elseif($op == '+'){
+				$regs[4] = $regs[4] - $h;
+				$regs[5] = $regs[5] - $m;
+			}
+		}
+		return gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
+//		return strtotime("$regs[1]-$regs[2]-$regs[3] $regs[4]:$regs[5]:$regs[6]Z");
+	} else {
+		return false;
+	}
 }
 
 /**
- * soap_fault class, allows for creation of faults
- * mainly used for returning faults from deployed functions
- * in a server instance.
- * @author Dietrich Ayala <die...@ga...>
- * @version v 0.6.3
- * @access public
- */
-class soap_fault extends nusoap_base
+* sleeps some number of microseconds
+*
+* @param string $usec the number of microseconds to sleep
+* @access public
+* @deprecated
+*/
+function usleepWindows($usec)
 {
+	$start = gettimeofday();
+	
+	do
+	{
+		$stop = gettimeofday();
+		$timePassed = 1000000 * ($stop['sec'] - $start['sec'])
+		+ $stop['usec'] - $start['usec'];
+	}
+	while ($timePassed < $usec);
+}
 
- var $faultcode;
- var $faultactor;
- var $faultstring;
- var $faultdetail;
+?><?php
 
- /**
- * constructor
- *
- * @param string $faultcode (client | server)
- * @param string $faultactor only used when msg routed between multiple actors
- * @param string $faultstring human readable error message
- * @param string $faultdetail
- */
- function soap_fault($faultcode, $faultactor = '', $faultstring = '', $faultdetail = '')
- {
- $this->faultcode = $faultcode;
- $this->faultactor = $faultactor;
- $this->faultstring = $faultstring;
- $this->faultdetail = $faultdetail;
- }
 
- /**
- * serialize a fault
- *
- * @access public
- */
- function serialize()
- {
- $ns_string = '';
- foreach ($this->namespaces as $k => $v) {
- $ns_string .= "\n xmlns:$k=\"$v\"";
- }
- $return_msg =
- '<?xml version="1.0"?' . ">\n" .
- '<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"' . $ns_string . ">\n" .
- '<SOAP-ENV:Body>' .
- '<SOAP-ENV:Fault>' .
- '<faultcode>' . $this->faultcode . '</faultcode>' .
- '<faultactor>' . $this->faultactor . '</faultactor>' .
- '<faultstring>' . $this->faultstring . '</faultstring>' .
- '<detail>' . $this->serialize_val($this->faultdetail) . '</detail>' .
- '</SOAP-ENV:Fault>' .
- '</SOAP-ENV:Body>' .
- '</SOAP-ENV:Envelope>';
- return $return_msg;
- }
+
+/**
+* Contains information for a SOAP fault.
+* Mainly used for returning faults from deployed functions
+* in a server instance.
+* @author Dietrich Ayala <die...@ga...>
+* @version $Id: nusoap.php,v 1.123 2010年04月26日 20:15:08 snichol Exp $
+* @access public
+*/
+class nusoap_fault extends nusoap_base {
+	/**
+	 * The fault code (client|server)
+	 * @var string
+	 * @access private
+	 */
+	var $faultcode;
+	/**
+	 * The fault actor
+	 * @var string
+	 * @access private
+	 */
+	var $faultactor;
+	/**
+	 * The fault string, a description of the fault
+	 * @var string
+	 * @access private
+	 */
+	var $faultstring;
+	/**
+	 * The fault detail, typically a string or array of string
+	 * @var mixed
+	 * @access private
+	 */
+	var $faultdetail;
+
+	/**
+	* constructor
+ *
+ * @param string $faultcode (SOAP-ENV:Client | SOAP-ENV:Server)
+ * @param string $faultactor only used when msg routed between multiple actors
+ * @param string $faultstring human readable error message
+ * @param mixed $faultdetail detail, typically a string or array of string
+	*/
+	function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
+		parent::nusoap_base();
+		$this->faultcode = $faultcode;
+		$this->faultactor = $faultactor;
+		$this->faultstring = $faultstring;
+		$this->faultdetail = $faultdetail;
+	}
+
+	/**
+	* serialize a fault
+	*
+	* @return	string	The serialization of the fault instance.
+	* @access public
+	*/
+	function serialize(){
+		$ns_string = '';
+		foreach($this->namespaces as $k => $v){
+			$ns_string .= "\n xmlns:$k=\"$v\"";
+		}
+		$return_msg =
+			'<?xml version="1.0" encoding="'.$this->soap_defencoding.'"?>'.
+			'<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"'.$ns_string.">\n".
+				'<SOAP-ENV:Body>'.
+				'<SOAP-ENV:Fault>'.
+					$this->serialize_val($this->faultcode, 'faultcode').
+					$this->serialize_val($this->faultactor, 'faultactor').
+					$this->serialize_val($this->faultstring, 'faultstring').
+					$this->serialize_val($this->faultdetail, 'detail').
+				'</SOAP-ENV:Fault>'.
+				'</SOAP-ENV:Body>'.
+			'</SOAP-ENV:Envelope>';
+		return $return_msg;
+	}
 }
 
 /**
- * parses an XML Schema, allows access to it's data, other utility methods
- * no validation... yet.
- * very experimental and limited. As is discussed on XML-DEV, I'm one of the people
- * that just doesn't have time to read the spec(s) thoroughly, and just have a couple of trusty
- * tutorials I refer to :)
- *
- * @author Dietrich Ayala <die...@ga...>
- * @version v 0.6.3
- * @access public
+ * Backward compatibility
 */
-class XMLSchema extends nusoap_base
-{
+class soap_fault extends nusoap_fault {
+}
 
- // files
- var $schema = '';
- var $xml = '';
- // define internal arrays of bindings, ports, operations, messages, etc.
- var $complexTypes = array();
- // target namespace
- var $schemaTargetNamespace = '';
- // parser vars
- var $parser;
- var $position;
- var $depth = 0;
- var $depth_array = array();
+?><?php
 
- /**
- * constructor
- *
- * @param string $schema schema document URI
- * @param string $xml xml document URI
- * @access public
- */
- function XMLSchema($schema = '', $xml = '')
- {
 
- $this->debug('xmlschema class instantiated, inside constructor');
- // files
- $this->schema = $schema;
- $this->xml = $xml;
 
- // parse schema file
- if ($schema != '') {
- $this->debug('initial schema file: ' . $schema);
- $this->parseFile($schema);
- }
+/**
+* parses an XML Schema, allows access to it's data, other utility methods.
+* imperfect, no validation... yet, but quite functional.
+*
+* @author Dietrich Ayala <die...@ga...>
+* @author Scott Nichol <sn...@us...>
+* @version $Id: nusoap.php,v 1.123 2010年04月26日 20:15:08 snichol Exp $
+* @access public
+*/
+class nusoap_xmlschema extends nusoap_base {
+	
+	// files
+	var $schema = '';
+	var $xml = '';
+	// namespaces
+	var $enclosingNamespaces;
+	// schema info
+	var $schemaInfo = array();
+	var $schemaTargetNamespace = '';
+	// types, elements, attributes defined by the schema
+	var $attributes = array();
+	var $complexTypes = array();
+	var $complexTypeStack = array();
+	var $currentComplexType = null;
+	var $elements = array();
+	var $elementStack = array();
+	var $currentElement = null;
+	var $simpleTypes = array();
+	var $simpleTypeStack = array();
+	var $currentSimpleType = null;
+	// imports
+	var $imports = array();
+	// parser vars
+	var $parser;
+	var $position = 0;
+	var $depth = 0;
+	var $depth_array = array();
+	var $message = array();
+	var $defaultNamespace = array();
+ 
+	/**
+	* constructor
+	*
+	* @param string $schema schema document URI
+	* @param string $xml xml document URI
+	* @param	string $namespaces namespaces defined in enclosing XML
+	* @access public
+	*/
+	function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){
+		parent::nusoap_base();
+		$this->debug('nusoap_xmlschema class instantiated, inside constructor');
+		// files
+		$this->schema = $schema;
+		$this->xml = $xml;
 
- // parse xml file
- if ($xml != '') {
- $this->debug('initial xml file: ' . $xml);
- $this->parseFile($xml);
- }
+		// namespaces
+		$this->enclosingNamespaces = $namespaces;
+		$this->namespaces = array_merge($this->namespaces, $namespaces);
 
- }
+		// parse schema file
+		if($schema != ''){
+			$this->debug('initial schema file: '.$schema);
+			$this->parseFile($schema, 'schema');
+		}
 
- /**
- * parse an XML file
- *
- * @param string $xml, path/URL to XML file
- * @param string $type, (schema | xml)
- * @return boolean
- * @access public
- */
- function parseFile($xml, $type)
- {
- // parse xml file
- if ($xml != "") {
- $this->debug('parsing $xml');
- $xmlStr = @join("", @file($xml));
- if ($xmlStr == "") {
- $this->setError('No file at the specified URL: ' . $xml);
- return false;
- } else {
- $this->parseString($xmlStr, $type);
- return true;
- }
- }
- return false;
- }
+		// parse xml file
+		if($xml != ''){
+			$this->debug('initial xml file: '.$xml);
+			$this->parseFile($xml, 'xml');
+		}
 
+	}
+
 /**
- * parse an XML string
- *
- * @param string $xml path or URL
- * @param string $type, (schema|xml)
- * @access private
- */
- function parseString($xml, $type)
- {
- // parse xml string
- if ($xml != "") {
+ * parse an XML file
+ *
+ * @param string $xml path/URL to XML file
+ * @param string $type (schema | xml)
+	* @return boolean
+ * @access public
+ */
+	function parseFile($xml,$type){
+		// parse xml file
+		if($xml != ""){
+			$xmlStr = @join("",@file($xml));
+			if($xmlStr == ""){
+				$msg = 'Error reading XML from '.$xml;
+				$this->setError($msg);
+				$this->debug($msg);
+			return false;
+			} else {
+				$this->debug("parsing $xml");
+				$this->parseString($xmlStr,$type);
+				$this->debug("done parsing $xml");
+			return true;
+			}
+		}
+		return false;
+	}
 
- // Create an XML parser.
- $this->parser = xml_parser_create();
- // Set the options for parsing the XML data.
- xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
+	/**
+	* parse an XML string
+	*
+	* @param string $xml path or URL
+ * @param	string $type (schema|xml)
+	* @access private
+	*/
+	function parseString($xml,$type){
+		// parse xml string
+		if($xml != ""){
 
- // Set the object for the parser.
- xml_set_object($this->parser, $this);
+	 	// Create an XML parser.
+	 	$this->parser = xml_parser_create();
+	 	// Set the options for parsing the XML data.
+	 	xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
 
- // Set the element handlers for the parser.
- if ($type == "schema") {
- xml_set_element_handler($this->parser, 'schemaStartElement', 'schemaEndElement');
- xml_set_character_data_handler($this->parser, 'schemaCharacterData');
- } elseif ($type == "xml") {
- xml_set_element_handler($this->parser, 'xmlStartElement', 'xmlEndElement');
- xml_set_character_data_handler($this->parser, 'xmlCharacterData');
- }
+	 	// Set the object for the parser.
+	 	xml_set_object($this->parser, $this);
 
- // Parse the XML file.
- if (!xml_parse($this->parser, $xml, true)) {
- // Display an error message.
- $errstr = sprintf('XML error on line %d: %s',
- xml_get_current_line_number($this->parser),
- xml_error_string(xml_get_error_code($this->parser))
- );
- $this->debug('XML parse error: ' . $errstr);
- $this->setError('Parser error: ' . $errstr);
- }
+	 	// Set the element handlers for the parser.
+			if($type == "schema"){
+		 	xml_set_element_handler($this->parser, 'schemaStartElement','schemaEndElement');
+		 	xml_set_character_data_handler($this->parser,'schemaCharacterData');
+			} elseif($type == "xml"){
+				xml_set_element_handler($this->parser, 'xmlStartElement','xmlEndElement');
+		 	xml_set_character_data_handler($this->parser,'xmlCharacterData');
+			}
 
- xml_parser_free($this->parser);
- } else {
- $this->debug('no xml passed to parseString()!!');
- $this->setError('no xml passed to parseString()!!');
- }
- }
+		 // Parse the XML file.
+		 if(!xml_parse($this->parser,$xml,true)){
+			// Display an error message.
+				$errstr = sprintf('XML error parsing XML schema on line %d: %s',
+				xml_get_current_line_number($this->parser),
+				xml_error_string(xml_get_error_code($this->parser))
+				);
+				$this->debug($errstr);
+				$this->debug("XML payload:\n" . $xml);
+				$this->setError($errstr);
+	 	}
+ 
+			xml_parser_free($this->parser);
+		} else{
+			$this->debug('no xml passed to parseString()!!');
+			$this->setError('no xml passed to parseString()!!');
+		}
+	}
 
- /**
- * start-element handler
- *
- * @param string $parser XML parser object
- * @param string $name element name
- * @param string $attrs associative array of attributes
- * @access private
- */
- function schemaStartElement($parser, $name, $attrs)
- {
+	/**
+	 * gets a type name for an unnamed type
+	 *
+	 * @param	string	Element name
+	 * @return	string	A type name for an unnamed type
+	 * @access	private
+	 */
+	function CreateTypeName($ename) {
+		$scope = '';
+		for ($i = 0; $i < count($this->complexTypeStack); $i++) {
+			$scope .= $this->complexTypeStack[$i] . '_';
+		}
+		return $scope . $ename . '_ContainedType';
+	}
+	
+	/**
+	* start-element handler
+	*
+	* @param string $parser XML parser object
+	* @param string $name element name
+	* @param string $attrs associative array of attributes
+	* @access private
+	*/
+	function schemaStartEl...
 
[truncated message content]

Revision: 8726
 http://sourceforge.net/p/phpwiki/code/8726
Author: vargenau
Date: 2013年02月06日 09:56:05 +0000 (2013年2月06日)
Log Message:
-----------
Fix rss_icon, rss2_icon and pageLink arguments
Modified Paths:
--------------
 trunk/lib/plugin/RecentChanges.php
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2013年02月06日 09:55:23 UTC (rev 8725)
+++ trunk/lib/plugin/RecentChanges.php	2013年02月06日 09:56:05 UTC (rev 8726)
@@ -642,12 +642,12 @@
 class _RecentChanges_SideBarFormatter
 extends _RecentChanges_HtmlFormatter
 {
- function rss_icon()
+ function rss_icon($args = array())
 {
 //omit rssicon
 }
 
- function rss2_icon()
+ function rss2_icon($args = array())
 {
 }
 
@@ -703,7 +703,7 @@
 return $linkurl;
 }
 
- function pageLink($rev)
+ function pageLink($rev, $link_text = false)
 {
 $linkurl = parent::pageLink($rev);
 $linkurl->setAttr('target', '_content');
@@ -766,11 +766,11 @@
 class _RecentChanges_BoxFormatter
 extends _RecentChanges_HtmlFormatter
 {
- function rss_icon()
+ function rss_icon($args = array())
 {
 }
 
- function rss2_icon()
+ function rss2_icon($args = array())
 {
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8725
 http://sourceforge.net/p/phpwiki/code/8725
Author: vargenau
Date: 2013年02月06日 09:55:23 +0000 (2013年2月06日)
Log Message:
-----------
Fix pageLink arguments
Modified Paths:
--------------
 trunk/lib/plugin/PageHistory.php
Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php	2013年02月06日 09:52:26 UTC (rev 8724)
+++ trunk/lib/plugin/PageHistory.php	2013年02月06日 09:55:23 UTC (rev 8725)
@@ -175,7 +175,7 @@
 'value' => $rev->getVersion()));
 }
 
- function pageLink($rev)
+ function pageLink($rev, $link_text = false)
 {
 $text = fmt("Version %d", $rev->getVersion());
 return _RecentChanges_HtmlFormatter::pageLink($rev, $text);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8724
 http://sourceforge.net/p/phpwiki/code/8724
Author: vargenau
Date: 2013年02月06日 09:52:26 +0000 (2013年2月06日)
Log Message:
-----------
Fix typo: HTLM; update Phpdoc; rename _getValue to _getValuePageList when 3 params
Modified Paths:
--------------
 trunk/lib/PageList.php
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2013年02月06日 09:49:04 UTC (rev 8723)
+++ trunk/lib/PageList.php	2013年02月06日 09:52:26 UTC (rev 8724)
@@ -157,10 +157,10 @@
 * An undefined value is defined to be < than the smallest defined value.
 * This base class _compare only works if the value is simple (e.g., a number).
 *
- * @param $colvala $this->_getValue() of column a
- * @param $colvalb $this->_getValue() of column b
+ * @param mixed $colvala $this->_getValue() of column a
+ * @param mixed $colvalb $this->_getValue() of column b
 *
- * @return -1 if $a < $b, 1 if $a > $b, 0 otherwise.
+ * @return int -1 if $a < $b, 1 if $a > $b, 0 otherwise.
 */
 function _compare($colvala, $colvalb)
 {
@@ -234,11 +234,11 @@
 {
 return HTML::td($this->_tdattr,
 HTML::raw('&nbsp;'),
- $this->_getValue($pagelist, $page_handle, $revision_handle),
+ $this->_getValuePageList($pagelist, $page_handle, $revision_handle),
 HTML::raw('&nbsp;'));
 }
 
- function _getValue(&$pagelist, $page_handle, &$revision_handle)
+ function _getValuePageList($pagelist, $page_handle, &$revision_handle)
 {
 if (!$revision_handle or (!$revision_handle->_data['%content']
 or $revision_handle->_data['%content'] === true)
@@ -299,7 +299,7 @@
 $this->_PageList_Column($field, $heading, 'center');
 }
 
- function _getValue($pagelist, $page_handle, &$revision_handle)
+ function _getValuePageList($pagelist, $page_handle, &$revision_handle)
 {
 $pagename = $page_handle->getName();
 $selected = !empty($pagelist->_selected[$pagename]);
@@ -322,7 +322,7 @@
 {
 return HTML::td($this->_tdattr,
 HTML::raw('&nbsp;'),
- $this->_getValue($pagelist, $page_handle, $revision_handle),
+ $this->_getValuePageList($pagelist, $page_handle, $revision_handle),
 HTML::raw('&nbsp;'));
 }
 
@@ -785,7 +785,7 @@
 }
 
 /**
- * @param caption string or HTML
+ * @param mixed $caption string or HTML
 */
 function setCaption($caption)
 {
@@ -793,7 +793,7 @@
 }
 
 /**
- * @param caption string or HTML
+ * @param mixed $caption string or HTML
 */
 function addCaption($caption)
 {
@@ -1342,8 +1342,8 @@
 * column will only be added the first time, and ignored the succeeding times.
 * If you wish to add multiple columns of the same type, use addColumnObject().
 *
- * @param column name
- * @return true if column is added, false otherwise
+ * @param string column name
+ * @return bool true if column is added, false otherwise
 */
 function _addColumn($column)
 {
@@ -1822,7 +1822,7 @@
 function _generateCommaList($style = false)
 {
 if (defined($this->_options['commasep']))
- $seperator = HTLM::Raw($this->_options['commasep']);
+ $seperator = HTML::Raw($this->_options['commasep']);
 else
 $seperator = ', ';
 $html = HTML();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8723
 http://sourceforge.net/p/phpwiki/code/8723
Author: vargenau
Date: 2013年02月06日 09:49:04 +0000 (2013年2月06日)
Log Message:
-----------
Move comments to pgsrc; highlight.bg no longer exists in PHP 5.4; translate error message
Modified Paths:
--------------
 trunk/lib/plugin/PhpHighlight.php
 trunk/pgsrc/Help%2FPhpHighlightPlugin
Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php	2013年02月04日 10:15:01 UTC (rev 8722)
+++ trunk/lib/plugin/PhpHighlight.php	2013年02月06日 09:49:04 UTC (rev 8723)
@@ -22,40 +22,13 @@
 */
 
 /**
- * A plugin that runs the highlight_string() function in PHP on it's
+ * A plugin that runs the highlight_string() function in PHP on its
 * arguments to pretty-print PHP code.
- *
- * Usage:
- * <<PhpHighlight default='#FF0000' comment='#0000CC'
- * code that should be highlighted
- * >>
- *
- * You do not have to add '<?php' and '?>' to the code - the plugin
- * does this automatically if you do not set wrap to 0.
- *
- * If you do set wrap to 0, then you'll have to start and stop PHP
- * mode in the source yourself, or you wont see any highlighting. But
- * you cannot use '<?php' and '?>' in the source, because this
- * interferes with PhpWiki, you'll have use '< ?php' and '? >'
- * instead.
- *
- * Author: Martin Geisler <gim...@gi...>.
- *
- * Added ability to override colors defined in php.ini --Carsten Klapp
- *
- * Known Problems:
- * <<PhpHighlight
- * testing[somearray];
- * testing~[badworkaround~];
- * >>
- * will swallow "[somearray]"
 */
 
 class WikiPlugin_PhpHighlight
 extends WikiPlugin
 {
- // Four required functions in a WikiPlugin.
-
 function getName()
 {
 return _("PhpHighlight");
@@ -75,7 +48,7 @@
 'string' => ini_get("highlight.string"), //'#00CC00',
 'comment' => ini_get("highlight.comment"), //'#FF9900',
 'keyword' => ini_get("highlight.keyword"), //'#006600',
- 'bg' => ini_get("highlight.bg"), //'#FFFFFF',
+ 'bg' => (version_compare(PHP_VERSION, '5.4', '<')) ? ini_get("highlight.bg") : '#FFFFFF',
 'default' => ini_get("highlight.default"), //'#0000CC',
 'html' => ini_get("highlight.html") //'#000000'
 );
@@ -88,7 +61,7 @@
 $source =& $this->source;
 if (empty($source)) {
 return HTML::div(array('class' => "error"),
- "Please provide source code to PhpHighlight plugin");
+ _("Please provide source code to PhpHighlight plugin"));
 }
 
 $this->sanify_colors($string, $comment, $keyword, $bg, $default, $html);
@@ -162,7 +135,9 @@
 $this->oldstring = ini_set('highlight.string', $string);
 $this->oldcomment = ini_set('highlight.comment', $comment);
 $this->oldkeyword = ini_set('highlight.keyword', $keyword);
- $this->oldbg = ini_set('highlight.bg', $bg);
+ if (version_compare(PHP_VERSION, '5.4', '<')) {
+ $this->oldbg = ini_set('highlight.bg', $bg);
+ }
 $this->olddefault = ini_set('highlight.default', $default);
 $this->oldhtml = ini_set('highlight.html', $html);
 }
@@ -173,7 +148,9 @@
 ini_set('highlight.string', $this->oldstring);
 ini_set('highlight.comment', $this->oldcomment);
 ini_set('highlight.keyword', $this->oldkeyword);
- ini_set('highlight.bg', $this->oldbg);
+ if (version_compare(PHP_VERSION, '5.4', '<')) {
+ ini_set('highlight.bg', $this->oldbg);
+ }
 ini_set('highlight.default', $this->olddefault);
 ini_set('highlight.html', $this->oldhtml);
 }
Modified: trunk/pgsrc/Help%2FPhpHighlightPlugin
===================================================================
--- trunk/pgsrc/Help%2FPhpHighlightPlugin	2013年02月04日 10:15:01 UTC (rev 8722)
+++ trunk/pgsrc/Help%2FPhpHighlightPlugin	2013年02月06日 09:49:04 UTC (rev 8723)
@@ -1,4 +1,4 @@
-Date: 2012年11月23日 19:30:39 +0000
+Date: Tue, 5 Feb 2013 15:49:31 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FPhpHighlightPlugin;
@@ -99,9 +99,18 @@
 }
 >>
 
+== Known Problems ==
+{{{
+<<PhpHighlight
+ testing[somearray];
+ testing~[badworkaround~];
+>>
+}}}
+will swallow "~[somearray~]"
+
 == Authors ==
 * [[mailto:gim...@gi...|Martin Geisler]]
-* [[mailto:car...@us...|Carsten Klapp]]
+* [[mailto:car...@us...|Carsten Klapp]] (added ability to override colors defined in ##php.ini##)
 
 == See Also ==
 * [[Help:SyntaxHighlighterPlugin|SyntaxHighlighter]] plugin for highlighting other languages.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8722
 http://sourceforge.net/p/phpwiki/code/8722
Author: vargenau
Date: 2013年02月04日 10:15:01 +0000 (2013年2月04日)
Log Message:
-----------
Remove comments from .pot
Modified Paths:
--------------
 trunk/locale/Makefile
 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/Makefile
===================================================================
--- trunk/locale/Makefile	2013年02月04日 10:05:14 UTC (rev 8721)
+++ trunk/locale/Makefile	2013年02月04日 10:15:01 UTC (rev 8722)
@@ -17,7 +17,8 @@
 	cp -f $@ $@~
 	xgettext -L PHP --from-code=utf-8 -k_ -k__printf -k__sprintf -k__vsprintf -kfmt -o $@.extracted $^
 	sed -e's,; charset=CHARSET,; charset=utf-8,' $@.extracted
-	msgmerge -o $@ $@~ $@.extracted && rm -f $@.extracted 
+	msgmerge -o $@.new $@~ $@.extracted && grep -v ^\#: $@.new > $@
+	rm -f $@.extracted 
 
 # merge in place to keep unchanged timestamps
 po/%.po : ${POT_FILE}
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年02月04日 10:05:14 UTC (rev 8721)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013年02月04日 10:15:01 UTC (rev 8722)
@@ -981,6 +981,7 @@
 $locale["Sign Out"] = "Se déconnecter";
 $locale["Sign in as:"] = "S'identifier en tant que :";
 $locale["Signed Users"] = "Utilisateurs inscrits";
+$locale["Simple Sample Plugin."] = "Exemple simple de greffon.";
 $locale["Since you started the deletion process, someone has saved a new version of %s. Please check to make sure you still want to permanently remove the page from the database."] = "Depuis que vous avez entamé le processus d'effacement, quelqu'un a enregistré une nouvelle version de %s. Veuillez vérifier que vous désirez toujours retirer de façon permanente cette page de la base de données.";
 $locale["Since you started the purge process, someone has saved a new version of %s. Please check to make sure you still want to permanently purge the page from the database."] = "Depuis que vous avez entamé le processus d'effacement, quelqu'un a enregistré une nouvelle version de %s. Veuillez vérifier que vous désirez toujours retirer de façon permanente cette page de la base de données.";
 $locale["SiteMap"] = "CarteDuSite";
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年02月04日 10:05:14 UTC (rev 8721)
+++ trunk/locale/po/de.po	2013年02月04日 10:15:01 UTC (rev 8722)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:34+0100\n"
+"POT-Creation-Date: 2013年02月04日 11:12+0100\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."
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013年02月04日 10:05:14 UTC (rev 8721)
+++ trunk/locale/po/es.po	2013年02月04日 10:15:01 UTC (rev 8722)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:34+0100\n"
+"POT-Creation-Date: 2013年02月04日 11:12+0100\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年02月04日 10:05:14 UTC (rev 8721)
+++ trunk/locale/po/fr.po	2013年02月04日 10:15:01 UTC (rev 8722)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:34+0100\n"
+"POT-Creation-Date: 2013年02月04日 11:12+0100\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."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013年02月04日 10:05:14 UTC (rev 8721)
+++ trunk/locale/po/it.po	2013年02月04日 10:15:01 UTC (rev 8722)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:34+0100\n"
+"POT-Creation-Date: 2013年02月04日 11:12+0100\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"
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013年02月04日 10:05:14 UTC (rev 8721)
+++ trunk/locale/po/ja.po	2013年02月04日 10:15:01 UTC (rev 8722)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:34+0100\n"
+"POT-Creation-Date: 2013年02月04日 11:12+0100\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年02月04日 10:05:14 UTC (rev 8721)
+++ trunk/locale/po/nl.po	2013年02月04日 10:15:01 UTC (rev 8722)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:34+0100\n"
+"POT-Creation-Date: 2013年02月04日 11:12+0100\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013年02月04日 10:05:14 UTC (rev 8721)
+++ trunk/locale/po/phpwiki.pot	2013年02月04日 10:15:01 UTC (rev 8722)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:34+0100\n"
+"POT-Creation-Date: 2013年02月04日 11:12+0100\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年02月04日 10:05:14 UTC (rev 8721)
+++ trunk/locale/po/sv.po	2013年02月04日 10:15:01 UTC (rev 8722)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:34+0100\n"
+"POT-Creation-Date: 2013年02月04日 11:12+0100\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年02月04日 10:05:14 UTC (rev 8721)
+++ trunk/locale/po/zh.po	2013年02月04日 10:15:01 UTC (rev 8722)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:34+0100\n"
+"POT-Creation-Date: 2013年02月04日 11:12+0100\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
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年02月04日 10:05:14 UTC (rev 8721)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php	2013年02月04日 10:15:01 UTC (rev 8722)
@@ -57,6 +57,7 @@
 $locale["... not found"] = "... 沒找到";
 $locale["1 day"] = "1 天";
 $locale["1 word"] = "1 個單字";
+$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.

Revision: 8721
 http://sourceforge.net/p/phpwiki/code/8721
Author: vargenau
Date: 2013年02月04日 10:05:14 +0000 (2013年2月04日)
Log Message:
-----------
Remove comments
Modified Paths:
--------------
 trunk/locale/po/phpwiki.pot
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013年02月04日 09:50:32 UTC (rev 8720)
+++ trunk/locale/po/phpwiki.pot	2013年02月04日 10:05:14 UTC (rev 8721)
@@ -15,371 +15,238 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/CachedMarkup.php:573
 msgid "BAD semantic relation link"
 msgstr ""
 
-#: ../lib/CachedMarkup.php:605
 #, php-format
 msgid "Attribute %s, base value: %s"
 msgstr ""
 
-#: ../lib/CachedMarkup.php:606
 #, php-format
 msgid "Attribute %s, value: %s"
 msgstr ""
 
-#: ../lib/CachedMarkup.php:613
 #, php-format
 msgid "Relation %s to page %s"
 msgstr ""
 
-#: ../lib/CachedMarkup.php:673
 msgid "Found by "
 msgstr ""
 
-#: ../lib/Captcha.php:34
 msgid "Typed in verification word mismatch ... are you a bot?"
 msgstr ""
 
-#: ../lib/Captcha.php:75
 msgid "Type word above:"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:21
 #, php-format
 msgid "The DBA handler %s is unsupported!"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:22
 #, php-format
 msgid "Supported handlers are: %s"
 msgstr ""
 
-#: ../lib/DbSession.php:42
 #, php-format
 msgid "Your WikiDB DB backend "%s" cannot be used for DbSession."
 msgstr ""
 
-#: ../lib/DbSession.php:43
 #, php-format
 msgid "Set USE_DB_SESSION to false."
 msgstr ""
 
-#: ../lib/diff.php:221 ../lib/plugin/Diff.php:71
 #, php-format
 msgid "version %s"
 msgstr ""
 
-#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:543
-#: ../lib/WikiTheme.php:545
 #, php-format
 msgid "by %s"
 msgstr ""
 
-#: ../lib/diff.php:228 ../lib/plugin/Diff.php:76
-#: ../lib/plugin/WantedPagesOld.php:96 ../lib/wikilens/PageListColumns.php:369
-#: ../themes/default/templates/online.tmpl:36
 msgid "None"
 msgstr ""
 
-#: ../lib/diff.php:251 ../lib/plugin/CreateToc.php:413
-#: ../lib/plugin/Diff.php:100 ../lib/plugin/IncludePage.php:103
-#: ../lib/plugin/PageDump.php:87 ../lib/plugin/PageHistory.php:347
-#: ../lib/plugin/PageInfo.php:58 ../lib/plugin/Template.php:136
 #, php-format
 msgid "Page "%s" does not exist."
 msgstr ""
 
-#: ../lib/diff.php:253 ../lib/diff.php:360
 #, php-format
 msgid "Diff: %s"
 msgstr ""
 
-#: ../lib/diff.php:260 ../lib/diff.php:269 ../lib/plugin/Diff.php:108
-#: ../lib/plugin/Diff.php:117
 #, php-format
 msgid "version %d"
 msgstr ""
 
-#: ../lib/diff.php:263 ../lib/plugin/Diff.php:111
 msgid "current version"
 msgstr ""
 
-#: ../lib/diff.php:279 ../lib/plugin/Diff.php:127
 msgid "revision by previous author"
 msgstr ""
 
-#: ../lib/diff.php:285 ../lib/plugin/Diff.php:133
 msgid "previous revision"
 msgstr ""
 
-#: ../lib/diff.php:295 ../lib/plugin/Diff.php:143
 msgid "predecessor to the previous major change"
 msgstr ""
 
-#: ../lib/diff.php:306 ../lib/plugin/Diff.php:153
 #, php-format
 msgid "Differences between %s and %s of %s."
 msgstr ""
 
-#: ../lib/diff.php:309 ../lib/plugin/Diff.php:156
 msgid "Other diffs:"
 msgstr ""
 
-#: ../lib/diff.php:310 ../lib/plugin/Diff.php:157
 msgid "Previous Major Revision"
 msgstr ""
 
-#: ../lib/diff.php:311 ../lib/plugin/Diff.php:158
 msgid "Previous Revision"
 msgstr ""
 
-#: ../lib/diff.php:312 ../lib/plugin/Diff.php:159
 msgid "Previous Author"
 msgstr ""
 
-#: ../lib/diff.php:328 ../lib/plugin/Diff.php:175
 msgid "Newer page:"
 msgstr ""
 
-#: ../lib/diff.php:330 ../lib/plugin/Diff.php:177
 msgid "Older page:"
 msgstr ""
 
-#: ../lib/diff.php:338
 #, php-format
 msgid "Content of versions %1$s and %2$s is identical."
 msgstr ""
 
-#: ../lib/diff.php:345
 #, php-format
 msgid "Version %1$s was created because: %2$s"
 msgstr ""
 
-# This entry is important for French punctuation rules which stipulate
-# a space before each colon.
-#: ../lib/display.php:77 ../lib/display.php:347
-#: ../lib/plugin/HelloWorld.php:69 ../lib/plugin/PageGroup.php:160
-#: ../lib/plugin/PageGroup.php:171 ../lib/plugin/PageGroup.php:187
-#: ../lib/plugin/PageGroup.php:194 ../lib/plugin/PageHistory.php:246
-#: ../lib/plugin/UnfoldSubpages.php:159 ../themes/Crao/templates/head.tmpl:37
-#: ../themes/default/templates/head.tmpl:43
-#: ../themes/default/templates/top.tmpl:9
-#: ../themes/MonoBook/templates/logo.tmpl:2
-#: ../themes/Portland/templates/body.tmpl:6
-#: ../themes/shamino_com/templates/top.tmpl:5
-#: ../themes/wikilens/templates/head.tmpl:35
-#: ../themes/wikilens/templates/top.tmpl:10
-#: ../themes/Wordpress/templates/body.tmpl:11
 #, php-format
 msgid "%s: %s"
 msgstr ""
 
-#: ../lib/display.php:108 ../lib/display.php:208 ../lib/display.php:451
-#: ../lib/plugin/LinkDatabase.php:43
 msgid "LinkDatabase"
 msgstr ""
 
-#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1573
-#: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:229
-#: ../lib/plugin/RecentChanges.php:236 ../lib/plugin/RecentChanges.php:439
-#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1277
-#: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:10
-#: ../themes/Crao/templates/head.tmpl:53
-#: ../themes/Crao/templates/navbar.tmpl:11
-#: ../themes/default/templates/head.tmpl:59
-#: ../themes/default/templates/head.tmpl:61
-#: ../themes/default/templates/navbar.tmpl:13
-#: ../themes/MonoBook/templates/navbar.tmpl:13
-#: ../themes/Portland/templates/navbar.tmpl:22
-#: ../themes/shamino_com/templates/top.tmpl:17
-#: ../themes/Sidebar/templates/navbar.tmpl:42
-#: ../themes/smaller/templates/navbar.tmpl:5
-#: ../themes/wikilens/templates/head.tmpl:50
-#: ../themes/wikilens/templates/navbar.tmpl:16
-#: ../themes/Wordpress/templates/actionbar.tmpl:20
 msgid "RecentChanges"
 msgstr ""
 
-#: ../lib/display.php:209 ../lib/display.php:452
-#: ../lib/plugin/FileInfo.php:156 ../lib/TextSearchQuery.php:115
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr ""
 
-#: ../lib/display.php:282 ../lib/display.php:289
 #, php-format
 msgid "BackLinks for %s"
 msgstr ""
 
-#: ../lib/display.php:297
 #, php-format
 msgid "(Redirected from %s)"
 msgstr ""
 
-#: ../lib/display.php:370 ../themes/Crao/templates/head.tmpl:60
-#: ../themes/Crao/templates/head.tmpl:61
-#: ../themes/default/templates/head.tmpl:68
-#: ../themes/default/templates/head.tmpl:69
-#: ../themes/wikilens/templates/head.tmpl:58
-#: ../themes/wikilens/templates/head.tmpl:59
 msgid "SandBox"
 msgstr ""
 
-#: ../lib/editpage.php:154 ../lib/editpage.php:590
 msgid "Your version"
 msgstr ""
 
-#: ../lib/editpage.php:154 ../lib/editpage.php:591
 msgid "Other version"
 msgstr ""
 
-#: ../lib/editpage.php:165
 msgid "Some internal editing error"
 msgstr ""
 
-#: ../lib/editpage.php:166
 msgid ""
 "Your are probably trying to edit/create an invalid version of this page."
 msgstr ""
 
-#: ../lib/editpage.php:167
 msgid "&version=-1 might help."
 msgstr ""
 
-#: ../lib/editpage.php:186
 #, php-format
 msgid "Edit: %s"
 msgstr ""
 
-#: ../lib/editpage.php:224
 #, php-format
 msgid "View Source: %s"
 msgstr ""
 
-#: ../lib/editpage.php:243
 msgid "Page now locked."
 msgstr ""
 
-#: ../lib/editpage.php:244
 msgid "Page now unlocked."
 msgstr ""
 
-#: ../lib/editpage.php:251
 msgid "Page now public."
 msgstr ""
 
-#: ../lib/editpage.php:252
 msgid "Page now not-public."
 msgstr ""
 
-#: ../lib/editpage.php:261
 msgid "Page now external."
 msgstr ""
 
-#: ../lib/editpage.php:262
 msgid "Page now not-external."
 msgstr ""
 
-#: ../lib/editpage.php:369
 #, php-format
 msgid "Saved: %s"
 msgstr ""
 
-#: ../lib/editpage.php:427
 msgid "Too many external links."
 msgstr ""
 
-#: ../lib/editpage.php:441
 msgid "SpamAssassin reports: "
 msgstr ""
 
-#: ../lib/editpage.php:468
 msgid "External links contain blocked domains:"
 msgstr ""
 
-#: ../lib/editpage.php:469
 #, php-format
 msgid "%s is listed at %s with %s"
 msgstr ""
 
-#: ../lib/editpage.php:495
 msgid "Spam Prevention"
 msgstr ""
 
-#: ../lib/editpage.php:496
 msgid "This page edit seems to contain spam and was therefore not saved."
 msgstr ""
 
-#: ../lib/editpage.php:498 ../lib/editpage.php:561
 msgid "Sorry for the inconvenience."
 msgstr ""
 
-#: ../lib/editpage.php:526
 msgid "Versions are identical"
 msgstr ""
 
-#: ../lib/editpage.php:558 ../themes/MacOSX/themeinfo.php:140
 msgid "Page Locked"
 msgstr ""
 
-#: ../lib/editpage.php:559
 msgid ""
 "This page has been locked by the administrator so your changes can not be "
 "saved."
 msgstr ""
 
-#: ../lib/editpage.php:560
 msgid ""
 "(Copy your changes to the clipboard. You can try editing a different page or "
 "save your text in a text editor.)"
 msgstr ""
 
-#: ../lib/editpage.php:572 ../lib/editpage.php:573 ../lib/main.php:834
-#: ../lib/main.php:1224 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
-#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
-#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
-#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
 msgid "ModeratedPage"
 msgstr ""
 
-#: ../lib/editpage.php:573
 #, php-format
 msgid ""
 "You can edit away, but your changes will have to be approved by the defined "
 "moderators at the definition in %s"
 msgstr ""
 
-#: ../lib/editpage.php:575 ../lib/plugin/PasswordReset.php:163
-#: ../lib/plugin/UserPreferences.php:40 ../lib/plugin/WatchPage.php:129
-#: ../lib/plugin/WatchPage.php:151 ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:76 ../themes/Crao/templates/head.tmpl:77
-#: ../themes/Crao/templates/navbar.tmpl:21
-#: ../themes/default/templates/head.tmpl:84
-#: ../themes/default/templates/head.tmpl:85
-#: ../themes/default/templates/homepage.tmpl:10
-#: ../themes/default/templates/navbar.tmpl:24
-#: ../themes/MonoBook/templates/signin.tmpl:9
-#: ../themes/shamino_com/templates/top.tmpl:25
-#: ../themes/Sidebar/templates/navbar.tmpl:49
-#: ../themes/smaller/templates/navbar.tmpl:20
-#: ../themes/wikilens/templates/head.tmpl:75
-#: ../themes/wikilens/templates/head.tmpl:76
-#: ../themes/wikilens/templates/navbar.tmpl:22
 msgid "UserPreferences"
 msgstr ""
 
-#: ../lib/editpage.php:574
 #, php-format
 msgid ""
 "The approval has a grace period of 5 days. If you have your e-mail defined "
 "in your %s, you will get a notification of approval or rejection."
 msgstr ""
 
-#: ../lib/editpage.php:589 ../lib/editpage.php:953
 #, php-format
 msgid ""
 "Some of the changes could not automatically be combined. Please look for "
@@ -387,709 +254,477 @@
 "those sections by hand before you click Save."
 msgstr ""
 
-#: ../lib/editpage.php:593 ../lib/editpage.php:956
 msgid "Please check it through before saving."
 msgstr ""
 
-#: ../lib/editpage.php:602
 msgid "Conflicting Edits!"
 msgstr ""
 
-#: ../lib/editpage.php:603
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
 msgstr ""
 
-#: ../lib/editpage.php:604
 msgid ""
 "Your changes can not be saved as they are, since doing so would overwrite "
 "the other author's changes. So, your changes and those of the other author "
 "have been combined. The result is shown below."
 msgstr ""
 
-#: ../lib/editpage.php:674 ../lib/plugin/HtmlConverter.php:70
 msgid "Convert"
 msgstr ""
 
-#: ../lib/editpage.php:703 ../lib/EditToolbar.php:214
-#: ../lib/EditToolbar.php:216 ../lib/WysiwygEdit/Wikiwyg.php:82
 msgid "Preview"
 msgstr ""
 
-#: ../lib/editpage.php:710 ../lib/EditToolbar.php:207
-#: ../lib/EditToolbar.php:209 ../lib/WysiwygEdit/Wikiwyg.php:83
 msgid "Save"
 msgstr ""
 
-#: ../lib/editpage.php:714
 msgid "Changes"
 msgstr ""
 
-#: ../lib/editpage.php:718 ../lib/plugin/UpLoad.php:165
-#: ../lib/plugin/UpLoad.php:170 ../lib/plugin/WikiForm.php:98
 msgid "Upload"
 msgstr ""
 
-#: ../lib/editpage.php:721
 msgid "Spell Check"
 msgstr ""
 
-#: ../lib/editpage.php:744 ../themes/Portland/templates/editpage.tmpl:36
-#: ../themes/Wordpress/templates/editpage.tmpl:52
 #, php-format
 msgid "Author will be logged as %s."
 msgstr ""
 
-#: ../lib/editpage.php:907
 msgid "Keep old"
 msgstr ""
 
-#: ../lib/editpage.php:910
 msgid "Overwrite with new"
 msgstr ""
 
-#: ../lib/editpage.php:920
 #, php-format
 msgid "Merge and Edit: %s"
 msgstr ""
 
-#: ../lib/EditToolbar.php:50
 msgid "Undo"
 msgstr ""
 
-#: ../lib/EditToolbar.php:52
 msgid "Undo disabled"
 msgstr ""
 
-#: ../lib/EditToolbar.php:53
 msgid "Operation undone"
 msgstr ""
 
-#: ../lib/EditToolbar.php:54
 msgid "Substring \"\1円\" found \2円 times. Replace with \"\3円\"?"
 msgstr ""
 
-#: ../lib/EditToolbar.php:55
 #, php-format
 msgid "String \"%s\" not found."
 msgstr ""
 
-#: ../lib/EditToolbar.php:56 ../lib/EditToolbar.php:259
-#: ../lib/EditToolbar.php:260 ../lib/plugin/WikiAdminSearchReplace.php:202
 msgid "Search & Replace"
 msgstr ""
 
-#: ../lib/EditToolbar.php:57
 msgid "Search for"
 msgstr ""
 
-#: ../lib/EditToolbar.php:58
 msgid "Replace with"
 msgstr ""
 
-#: ../lib/EditToolbar.php:59 ../lib/plugin/SyncWiki.php:308
-#: ../lib/plugin/SyncWiki.php:335 ../lib/plugin/SyncWiki.php:359
-#: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:1992
-#: ../lib/upgrade.php:195 ../lib/upgrade.php:401 ../lib/upgrade.php:415
-#: ../lib/upgrade.php:435 ../lib/upgrade.php:444 ../lib/upgrade.php:468
-#: ../lib/upgrade.php:496 ../lib/upgrade.php:545 ../lib/upgrade.php:548
-#: ../lib/upgrade.php:580 ../lib/upgrade.php:582 ../lib/upgrade.php:609
-#: ../lib/upgrade.php:669 ../lib/upgrade.php:694 ../lib/upgrade.php:842
-#: ../lib/upgrade.php:845 ../lib/upgrade.php:915
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:60 ../lib/EditToolbar.php:327
-#: ../lib/EditToolbar.php:378 ../lib/EditToolbar.php:409
-#: ../lib/EditToolbar.php:448 ../lib/EditToolbar.php:484
 msgid "Close"
 msgstr ""
 
-#: ../lib/EditToolbar.php:129
 msgid "Bold text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:130
 msgid "Bold text [alt-b]"
 msgstr ""
 
-#: ../lib/EditToolbar.php:134
 msgid "Italic text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:135
 msgid "Italic text [alt-i]"
 msgstr ""
 
-#: ../lib/EditToolbar.php:139
 msgid "Strike-through text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:140
 msgid "Strike"
 msgstr ""
 
-#: ../lib/EditToolbar.php:144
 msgid "Color text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:145
 msgid "Color"
 msgstr ""
 
-#: ../lib/EditToolbar.php:149
 msgid "PageName|optional label"
 msgstr ""
 
-#: ../lib/EditToolbar.php:150
 msgid "Link to page"
 msgstr ""
 
-#: ../lib/EditToolbar.php:154
 msgid "http://www.example.com|optional label"
 msgstr ""
 
-#: ../lib/EditToolbar.php:155
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:159
 msgid "Headline text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:160
 msgid "Level 1 headline"
 msgstr ""
 
-#: ../lib/EditToolbar.php:164
 msgid "Insert non-formatted text here"
 msgstr ""
 
-#: ../lib/EditToolbar.php:165
 msgid "Ignore wiki formatting"
 msgstr ""
 
-#: ../lib/EditToolbar.php:170
 msgid "Your signature"
 msgstr ""
 
-#: ../lib/EditToolbar.php:175
 msgid "Horizontal line"
 msgstr ""
 
-#: ../lib/EditToolbar.php:180
 msgid "Sample table"
 msgstr ""
 
-#: ../lib/EditToolbar.php:185
 msgid "Enumeration"
 msgstr ""
 
-#: ../lib/EditToolbar.php:190
 msgid "List"
 msgstr ""
 
-#: ../lib/EditToolbar.php:195 ../lib/plugin/CreateToc.php:498
-#: ../lib/plugin/CreateToc.php:513 ../lib/WysiwygEdit/Wikiwyg.php:78
 msgid "Table of Contents"
 msgstr ""
 
-#: ../lib/EditToolbar.php:199 ../lib/PageList.php:539
-#: ../lib/plugin/AuthorHistory.php:154 ../lib/plugin/WantedPagesOld.php:147
 msgid "Page Name"
 msgstr ""
 
-#: ../lib/EditToolbar.php:200 ../themes/default/templates/redirect.tmpl:16
-#: ../themes/default/templates/redirect.tmpl:39
 msgid "Redirect"
 msgstr ""
 
-#: ../lib/EditToolbar.php:204
 msgid "Template Name"
 msgstr ""
 
-#: ../lib/EditToolbar.php:205 ../lib/plugin/PopularTags.php:68
-#: ../lib/plugin/Template.php:62
 msgid "Template"
 msgstr ""
 
-#: ../lib/EditToolbar.php:237
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:251 ../lib/EditToolbar.php:252
 msgid "Undo Search & Replace"
 msgstr ""
 
-#: ../lib/EditToolbar.php:321 ../lib/EditToolbar.php:324
 msgid "Insert Categories"
 msgstr ""
 
-#: ../lib/EditToolbar.php:326 ../lib/EditToolbar.php:377
-#: ../lib/EditToolbar.php:408 ../lib/EditToolbar.php:447
-#: ../lib/EditToolbar.php:483
 msgid "Insert"
 msgstr ""
 
-#: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:373
-#: ../lib/EditToolbar.php:375
 msgid "Insert Plugin"
 msgstr ""
 
-#: ../lib/EditToolbar.php:403 ../lib/EditToolbar.php:404
-#: ../lib/EditToolbar.php:406
 msgid "Insert PageLink"
 msgstr ""
 
-#: ../lib/EditToolbar.php:442 ../lib/EditToolbar.php:443
-#: ../lib/EditToolbar.php:445
 msgid "Insert Image or Video"
 msgstr ""
 
-#: ../lib/EditToolbar.php:478 ../lib/EditToolbar.php:479
-#: ../lib/EditToolbar.php:481
 msgid "Insert Template"
 msgstr ""
 
-#: ../lib/ErrorManager.php:231
 #, php-format
 msgid "%s: error while handling error:"
 msgstr ""
 
-#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1155
 #, php-format
 msgid "%s: file not found"
 msgstr ""
 
-#: ../lib/IniConfig.php:1009
 msgid "CategoryGroup"
 msgstr ""
 
-#: ../lib/IniConfig.php:1011
 msgid "An unnamed PhpWiki"
 msgstr ""
 
-#: ../lib/InlineParser.php:358
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
-#: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:463
-#: ../lib/plugin/SystemInfo.php:476 ../lib/plugin/WikiAdminRename.php:277
-#: ../lib/plugin/WikiAdminRename.php:283
-#: ../lib/plugin/WikiAdminSearchReplace.php:242
-#: ../lib/plugin/WikiAdminSearchReplace.php:246
-#: ../lib/plugin/WikiAdminSetAcl.php:253 ../lib/plugin/WikiAdminSetAcl.php:254
-#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:98
-#: ../lib/upgrade.php:103 ../lib/upgrade.php:107 ../lib/upgrade.php:1121
-#: ../lib/upgrade.php:1131 ../themes/blog/templates/blogform.tmpl:7
-#: ../themes/default/templates/blogform.tmpl:7
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
-#: ../themes/fusionforge/templates/blogform.tmpl:7
-#: ../themes/fusionforge/themeinfo.php:52
 msgid ": "
 msgstr ""
 
-#: ../lib/InlineParser.php:409 ../lib/main.php:796 ../lib/stdlib.php:988
 msgid "Page name too long"
 msgstr ""
 
-#: ../lib/InlineParser.php:415 ../lib/main.php:803
 #, php-format
 msgid "Illegal character "%s" in page name."
 msgstr ""
 
-#: ../lib/InlineParser.php:978
 #, php-format
 msgid "unknown color %s ignored"
 msgstr ""
 
-#: ../lib/loadsave.php:73
 msgid "ZIP files of database"
 msgstr ""
 
-#: ../lib/loadsave.php:76
 msgid "Dump to directory"
 msgstr ""
 
-#: ../lib/loadsave.php:79 ../themes/fusionforge/templates/navbar.tmpl:18
-#: ../themes/MonoBook/templates/navbar.tmpl:58
-#: ../themes/Sidebar/templates/navbar.tmpl:48
 msgid "Upload File"
 msgstr ""
 
-#: ../lib/loadsave.php:82 ../lib/plugin/WikiForm.php:71
 msgid "Load File"
 msgstr ""
 
-#: ../lib/loadsave.php:85
 msgid "Upgrade"
 msgstr ""
 
-#: ../lib/loadsave.php:89 ../lib/plugin/WikiForm.php:87
 msgid "Dump Pages as XHTML"
 msgstr ""
 
-#: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1038
-#: ../lib/loadsave.php:1044 ../lib/loadsave.php:1052 ../lib/main.php:1244
-#: ../lib/main.php:1257 ../lib/PagePerm.php:190 ../lib/PagePerm.php:191
-#: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminSelect.php:221
-#: ../themes/blog/templates/navbar.tmpl:11
-#: ../themes/Crao/templates/head.tmpl:70 ../themes/Crao/templates/head.tmpl:71
-#: ../themes/Crao/templates/navbar.tmpl:35
-#: ../themes/default/templates/head.tmpl:78
-#: ../themes/default/templates/head.tmpl:79
-#: ../themes/default/templates/navbar.tmpl:39
-#: ../themes/MonoBook/templates/navbar.tmpl:55
-#: ../themes/Portland/templates/navbar.tmpl:24
-#: ../themes/shamino_com/templates/actionbar.tmpl:17
-#: ../themes/Sidebar/templates/navbar.tmpl:63
-#: ../themes/smaller/templates/navbar.tmpl:17
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
-#: ../themes/wikilens/templates/navbar.tmpl:31
-#: ../themes/Wordpress/templates/actionbar.tmpl:24
 msgid "PhpWikiAdministration"
 msgstr ""
 
-#: ../lib/loadsave.php:107 ../lib/MailNotify.php:296
 #, php-format
 msgid "Edited by: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:109 ../lib/loadsave.php:110
 msgid "LoadDump"
 msgstr ""
 
-#: ../lib/loadsave.php:114
 #, php-format
 msgid "PageChange Notification of %s sent to %s"
 msgstr ""
 
-#: ../lib/loadsave.php:117
 #, php-format
 msgid "PageChange Notification Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/loadsave.php:125
 msgid "Complete."
 msgstr ""
 
-#: ../lib/loadsave.php:126
 #, php-format
 msgid "Return to %s"
 msgstr ""
 
-#: ../lib/loadsave.php:251
 msgid "FullDump"
 msgstr ""
 
-#: ../lib/loadsave.php:254
 msgid "LatestSnapshot"
 msgstr ""
 
-#: ../lib/loadsave.php:324 ../lib/loadsave.php:457
 msgid "You must specify a directory to dump to"
 msgstr ""
 
-#: ../lib/loadsave.php:329 ../lib/loadsave.php:462
 #, php-format
 msgid "Cannot create directory "%s""
 msgstr ""
 
-#: ../lib/loadsave.php:331 ../lib/loadsave.php:464
 #, php-format
 msgid "Created directory "%s" for the page dump..."
 msgstr ""
 
-#: ../lib/loadsave.php:334 ../lib/loadsave.php:467
 #, php-format
 msgid "Using directory "%s""
 msgstr ""
 
-#: ../lib/loadsave.php:337 ../lib/loadsave.php:469
 msgid "Dumping Pages"
 msgstr ""
 
-#: ../lib/loadsave.php:373 ../lib/loadsave.php:640 ../lib/stdlib.php:1046
-#: ../lib/upgrade.php:73 ../lib/upgrade.php:104 ../lib/upgrade.php:107
-#: ../lib/upgrade.php:200 ../lib/upgrade.php:1140
 msgid "Skipped."
 msgstr ""
 
-#: ../lib/loadsave.php:381
 #, php-format
 msgid "saved as %s"
 msgstr ""
 
-#: ../lib/loadsave.php:391 ../lib/loadsave.php:710
-#: ../lib/plugin/text2png.php:226
 #, php-format
 msgid "couldn't open file "%s" for writing"
 msgstr ""
 
-#: ../lib/loadsave.php:397 ../lib/loadsave.php:720
 #, php-format
 msgid "%s bytes written"
 msgstr ""
 
-#: ../lib/loadsave.php:694 ../lib/loadsave.php:771 ../lib/loadsave.php:806
-#: ../lib/loadsave.php:836
 #, php-format
 msgid "... copied to %s"
 msgstr ""
 
-#: ../lib/loadsave.php:697 ../lib/loadsave.php:773 ../lib/loadsave.php:808
-#: ../lib/loadsave.php:838
 #, php-format
 msgid "... not copied to %s"
 msgstr ""
 
-#: ../lib/loadsave.php:718
 msgid "saved as "
 msgstr ""
 
-#: ../lib/loadsave.php:781 ../lib/loadsave.php:816 ../lib/loadsave.php:847
 msgid "... not found"
 msgstr ""
 
-#: ../lib/loadsave.php:905
 msgid "Empty pagename!"
 msgstr ""
 
-#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:699
 #, php-format
 msgid ""%s": Bad page name"
 msgstr ""
 
-#: ../lib/loadsave.php:971 ../lib/plugin/WikiAdminSetAcl.php:102
 #, php-format
 msgid "from "%s""
 msgstr ""
 
-#: ../lib/loadsave.php:980 ../lib/MailNotify.php:303
-#: ../lib/plugin/RecentChanges.php:149
 msgid "New page"
 msgstr ""
 
-#: ../lib/loadsave.php:988
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:996
 msgid "keep old"
 msgstr ""
 
-#: ../lib/loadsave.php:998
 msgid "has edit conflicts - skipped"
 msgstr ""
 
-#: ../lib/loadsave.php:1006
 #, php-format
 msgid "content is identical to current version %d - no new revision created"
 msgstr ""
 
-#: ../lib/loadsave.php:1021
 #, php-format
 msgid "- saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1297
 #, php-format
 msgid "MIME file %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1308
 #, php-format
 msgid "Serialized file %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1030 ../lib/loadsave.php:1329
 #, php-format
 msgid "plain file %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1037 ../lib/plugin/SyncWiki.php:276
 msgid "Merge Edit"
 msgstr ""
 
-#: ../lib/loadsave.php:1043
 msgid "Restore Anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:1051
 msgid "Overwrite All"
 msgstr ""
 
-#: ../lib/loadsave.php:1058
 msgid " Sorry, cannot merge."
 msgstr ""
 
-#: ../lib/loadsave.php:1081
 msgid "Revert: missing required version argument"
 msgstr ""
 
-#: ../lib/loadsave.php:1088
 msgid "No revert: no page content"
 msgstr ""
 
-#: ../lib/loadsave.php:1093
 msgid "No revert: same version page"
 msgstr ""
 
-#: ../lib/loadsave.php:1098
 msgid "Revert cancelled"
 msgstr ""
 
-#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:108
-#: ../lib/plugin/PasswordReset.php:154 ../lib/plugin/UserPreferences.php:120
-#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:148
-#: ../lib/plugin/WikiAdminChown.php:177 ../lib/plugin/WikiAdminMarkup.php:168
-#: ../lib/plugin/WikiAdminPurge.php:151 ../lib/plugin/WikiAdminRemove.php:204
-#: ../lib/plugin/WikiAdminRename.php:215
-#: ../lib/plugin/WikiAdminSearchReplace.php:196
-#: ../lib/plugin/WikiAdminSetAcl.php:204
-#: ../themes/default/templates/info.tmpl:128
 msgid "Yes"
 msgstr ""
 
-#: ../lib/loadsave.php:1109 ../lib/plugin/PasswordReset.php:111
-#: ../lib/plugin/PasswordReset.php:157 ../lib/plugin/TranslateText.php:117
-#: ../lib/plugin/UserPreferences.php:122 ../lib/plugin/WatchPage.php:92
-#: ../lib/plugin/WatchPage.php:97 ../lib/plugin/WikiAdminChmod.php:160
-#: ../lib/plugin/WikiAdminChown.php:190 ../lib/plugin/WikiAdminMarkup.php:181
-#: ../lib/plugin/WikiAdminPurge.php:161 ../lib/plugin/WikiAdminRemove.php:226
-#: ../lib/plugin/WikiAdminRename.php:238
-#: ../lib/plugin/WikiAdminSearchReplace.php:208
-#: ../lib/plugin/WikiAdminSelect.php:152 ../lib/plugin/WikiAdminSetAcl.php:216
-#: ../lib/plugin/WikiAdminSetExternal.php:137
-#: ../lib/plugin/WikiAdminUtils.php:308 ../lib/plugin/WikiFormRich.php:313
-#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:394
-#: ../lib/upgrade.php:797 ../themes/default/templates/login.tmpl:85
-#: ../themes/default/templates/userprefs.tmpl:290
-#: ../themes/fusionforge/templates/userprefs.tmpl:390
 msgid "Cancel"
 msgstr ""
 
-#: ../lib/loadsave.php:1123
 #, php-format
 msgid "revert to version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:1130
 #, php-format
 msgid "Revert: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1131
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:1150 ../lib/WikiGroup.php:882
 #, php-format
 msgid "%s: not defined"
 msgstr ""
 
-#: ../lib/loadsave.php:1160
 msgid "Default InterWiki map file not loaded."
 msgstr ""
 
-#: ../lib/loadsave.php:1167 ../lib/PageType.php:329
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr ""
 
-#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1360
 msgid "Skipping"
 msgstr ""
 
-#: ../lib/loadsave.php:1461
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1465
 #, php-format
 msgid "Bad file type: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1479
 #, php-format
 msgid "Loading "%s""
 msgstr ""
 
-#: ../lib/loadsave.php:1511
 msgid "Loading up virgin wiki"
 msgstr ""
 
-#: ../lib/loadsave.php:1566
 msgid "No uploaded file to upload?"
 msgstr ""
 
-#: ../lib/loadsave.php:1569
 #, php-format
 msgid "Uploading %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:200
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:241
 #, php-format
 msgid "sent to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:247
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:276
 msgid "Page change"
 msgstr ""
 
-#: ../lib/MailNotify.php:299
 msgid "Page creation"
 msgstr ""
 
-#: ../lib/MailNotify.php:306
 #, php-format
 msgid "Created by: %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:308
 #, php-format
 msgid "Summary: %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:319
 #, php-format
 msgid "Renamed by: %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:320
 #, php-format
 msgid "Page rename %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:356
 #, php-format
 msgid "User %s removed page %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:391 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1801
 msgid "E-mail address confirmation"
 msgstr ""
 
-#: ../lib/MailNotify.php:394
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1104,1860 +739,1290 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:111 ../lib/WikiDB.php:1067
 msgid "Optimizing database"
 msgstr ""
 
-#: ../lib/main.php:492
 msgid "FORBIDDEN"
 msgstr ""
 
-#: ../lib/main.php:493 ../lib/main.php:503
 msgid "ANON"
 msgstr ""
 
-#: ../lib/main.php:494
 msgid "BOGO"
 msgstr ""
 
-#: ../lib/main.php:495
 msgid "USER"
 msgstr ""
 
-#: ../lib/main.php:496
 msgid "ADMIN"
 msgstr ""
 
-#: ../lib/main.php:497
 msgid "UNOBTAINABLE"
 msgstr ""
 
-#: ../lib/main.php:527 ../lib/main.php:547
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr ""
 
-#: ../lib/main.php:536
 msgid "authenticated"
 msgstr ""
 
-#: ../lib/main.php:536
 msgid "not authenticated"
 msgstr ""
 
-#: ../lib/main.php:538
 msgid "Missing PagePermission:"
 msgstr ""
 
-#: ../lib/main.php:537
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user "%s" (level: %s)."
 msgstr ""
 
-#: ../lib/main.php:554
 #, php-format
 msgid "You must sign in to %s."
 msgstr ""
 
-#: ../lib/main.php:563
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr ""
 
-#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:59
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr ""
 
-#: ../lib/main.php:579
 msgid "view this page"
 msgstr ""
 
-#: ../lib/main.php:580
 msgid "diff this page"
 msgstr ""
 
-#: ../lib/main.php:581
 msgid "dump html pages"
 msgstr ""
 
-#: ../lib/main.php:582
 msgid "dump serial pages"
 msgstr ""
 
-#: ../lib/main.php:583
 msgid "edit this page"
 msgstr ""
 
-#: ../lib/main.php:584
 msgid "rename this page"
 msgstr ""
 
-#: ../lib/main.php:585
 msgid "revert to a previous version of this page"
 msgstr ""
 
-#: ../lib/main.php:586
 msgid "create this page"
 msgstr ""
 
-#: ../lib/main.php:587
 msgid "load files into this wiki"
 msgstr ""
 
-#: ../lib/main.php:588
 msgid "lock this page"
 msgstr ""
 
-#: ../lib/main.php:589
 msgid "purge this page"
 msgstr ""
 
-#: ../lib/main.php:590
 msgid "remove this page"
 msgstr ""
 
-#: ../lib/main.php:591
 msgid "unlock this page"
 msgstr ""
 
-#: ../lib/main.php:592
 msgid "upload a zip dump"
 msgstr ""
 
-#: ../lib/main.php:593
 msgid "verify the current action"
 msgstr ""
 
-#: ../lib/main.php:594
 msgid "view the source of this page"
 msgstr ""
 
-#: ../lib/main.php:595
 msgid "access this wiki via XML-RPC"
 msgstr ""
 
-#: ../lib/main.php:596
 msgid "access this wiki via SOAP"
 msgstr ""
 
-#: ../lib/main.php:597
 msgid "download a zip dump from this wiki"
 msgstr ""
 
-#: ../lib/main.php:598
 msgid "download a html zip dump from this wiki"
 msgstr ""
 
-#: ../lib/main.php:604
 msgid "use"
 msgstr ""
 
-#: ../lib/main.php:623
 msgid "Browsing pages"
 msgstr ""
 
-#: ../lib/main.php:624
 msgid "Diffing pages"
 msgstr ""
 
-#: ../lib/main.php:625
 msgid "Dumping html pages"
 msgstr ""
 
-#: ../lib/main.php:626
 msgid "Dumping serial pages"
 msgstr ""
 
-#: ../lib/main.php:627
 msgid "Editing pages"
 msgstr ""
 
-#: ../lib/main.php:628
 msgid "Reverting to a previous version of pages"
 msgstr ""
 
-#: ../lib/main.php:629
 msgid "Creating pages"
 msgstr ""
 
-#: ../lib/main.php:630
 msgid "Loading files"
 msgstr ""
 
-#: ../lib/main.php:631
 msgid "Locking pages"
 msgstr ""
 
-#: ../lib/main.php:632
 msgid "Purging pages"
 msgstr ""
 
-#: ../lib/main.php:633
 msgid "Removing pages"
 msgstr ""
 
-#: ../lib/main.php:634
 msgid "Unlocking pages"
 msgstr ""
 
-#: ../lib/main.php:635
 msgid "Uploading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:636
 msgid "Verify the current action"
 msgstr ""
 
-#: ../lib/main.php:637
 msgid "Viewing the source of pages"
 msgstr ""
 
-#: ../lib/main.php:638
 msgid "XML-RPC access"
 msgstr ""
 
-#: ../lib/main.php:639
 msgid "SOAP access"
 msgstr ""
 
-#: ../lib/main.php:640
 msgid "Downloading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:641
 msgid "Downloading html zip dumps"
 msgstr ""
 
-#: ../lib/main.php:822
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:825
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:830
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:848 ../lib/plugin/ModeratedPage.php:316
 #, php-format
 msgid "%s: Bad action"
 msgstr ""
 
-#: ../lib/main.php:866
 msgid "Fatal PhpWiki Error"
 msgstr ""
 
-#: ../lib/main.php:1154 ../lib/main.php:1159 ../lib/plugin/PageDump.php:57
-#: ../themes/Crao/templates/actionbar.tmpl:31
-#: ../themes/default/templates/actionbar.tmpl:36
-#: ../themes/MonoBook/templates/actionbar.tmpl:77
-#: ../themes/shamino_com/templates/actionbar.tmpl:21
-#: ../themes/Sidebar/templates/actionbar.tmpl:60
-#: ../themes/smaller/templates/actionbar.tmpl:39
-#: ../themes/smaller/templates/info.tmpl:10
-#: ../themes/Wordpress/templates/actionbar.tmpl:74
 msgid "PageDump"
 msgstr ""
 
-#: ../lib/main.php:1179 ../lib/plugin/FullTextSearch.php:47
-#: ../lib/plugin/WantedPagesOld.php:130
 msgid "FullTextSearch"
 msgstr ""
 
-#: ../lib/main.php:1185 ../lib/plugin/RecentChanges.php:897
-#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1520
-#: ../themes/Crao/templates/navbar.tmpl:2
-#: ../themes/Crao/templates/navbar.tmpl:6
-#: ../themes/Crao/templates/navbar.tmpl:49
-#: ../themes/default/templates/search.tmpl:3
-#: ../themes/default/templates/search.tmpl:9
-#: ../themes/default/templates/search.tmpl:33
-#: ../themes/MonoBook/templates/navbar.tmpl:31
-#: ../themes/shamino_com/templates/top.tmpl:15
-#: ../themes/Sidebar/templates/search.tmpl:9
-#: ../themes/smaller/templates/navbar.tmpl:2
 msgid "TitleSearch"
 msgstr ""
 
-#: ../lib/main.php:1381 ../lib/main.php:1394 ../lib/Request.php:877
 #, php-format
 msgid "%s is not writable."
 msgstr ""
 
-#: ../lib/main.php:1382
 msgid "The session.save_path directory"
 msgstr ""
 
-#: ../lib/main.php:1384 ../lib/Request.php:879
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 
-#: ../lib/main.php:1385
 #, php-format
 msgid "the session.save_path directory "%s""
 msgstr ""
 
-#: ../lib/main.php:1389
 #, php-format
 msgid "Attempting to use the directory "%s" instead."
 msgstr ""
 
-#: ../lib/main.php:1396
 msgid "Users will not be able to sign in."
 msgstr ""
 
-#: ../lib/main.php:1406
 msgid "Your PHP version is too old. You must have at least PHP 5.2."
 msgstr ""
 
-#: ../lib/PageList.php:98
 #, php-format
 msgid "Sort by %s"
 msgstr ""
 
-#: ../lib/PageList.php:126
 msgid "reverse"
 msgstr ""
 
-#: ../lib/PageList.php:137
 msgid "Click to reverse sort order"
 msgstr ""
 
-#: ../lib/PageList.php:144
 #, php-format
 msgid "Click to sort by %s"
 msgstr ""
 
-#: ../lib/PageList.php:294
 msgid "Click to de-/select all pages"
 msgstr ""
 
-#: ../lib/PageList.php:382 ../lib/plugin/IncludePage.php:207
 #, php-format
 msgid " ... first %d bytes"
 msgstr ""
 
-#: ../lib/PageList.php:389
 #, php-format
 msgid " ... around %s"
 msgstr ""
 
-#: ../lib/PageList.php:446 ../lib/plugin/AppendText.php:59
 #, php-format
 msgid "%s not found"
 msgstr ""
 
-#: ../lib/PageList.php:585 ../lib/plugin/WikiAdminSetAcl.php:249
-#: ../themes/default/templates/info.tmpl:69
-#: ../themes/MonoBook/templates/info.tmpl:83
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
 
-#: ../lib/PageList.php:587 ../lib/plugin/WikiAdminSetAcl.php:251
-#: ../themes/default/templates/info.tmpl:71
-#: ../themes/MonoBook/templates/info.tmpl:85
 msgid "individual page permission"
 msgstr ""
 
-#: ../lib/PageList.php:589 ../lib/plugin/WikiAdminSetAcl.php:252
-#: ../themes/default/templates/info.tmpl:73
-#: ../themes/MonoBook/templates/info.tmpl:87
 msgid "default page permission"
 msgstr ""
 
-#: ../lib/PageList.php:715 ../lib/plugin/FullTextSearch.php:119
 msgid "<no matches>"
 msgstr ""
 
-#: ../lib/PageList.php:1249 ../lib/plugin/FullTextSearch.php:90
-#: ../lib/plugin/WikiAdminSearchReplace.php:187
 msgid "Content"
 msgstr ""
 
-#: ../lib/PageList.php:1261 ../lib/plugin/WikiAdminChmod.php:142
-#: ../lib/plugin/WikiAdminSetAcl.php:198
 msgid "Permission"
 msgstr ""
 
-#: ../lib/PageList.php:1263 ../lib/plugin/WikiAdminDeleteAcl.php:124
-#: ../lib/plugin/WikiAdminSetAcl.php:200 ../lib/plugin/WikiAdminSetAcl.php:254
-#: ../themes/default/templates/info.tmpl:136
-#: ../themes/MonoBook/templates/info.tmpl:143
 msgid "ACL"
 msgstr ""
 
-#: ../lib/PageList.php:1265
 msgid "All"
 msgstr ""
 
-#: ../lib/PageList.php:1269 ../themes/default/templates/info.tmpl:54
-#: ../themes/MonoBook/templates/info.tmpl:68
 msgid "Last Modified"
 msgstr ""
 
-#: ../lib/PageList.php:1271 ../themes/default/templates/info.tmpl:112
-#: ../themes/MonoBook/templates/info.tmpl:125
 msgid "Hits"
 msgstr ""
 
-#: ../lib/PageList.php:1273 ../themes/Crao/templates/editpage.tmpl:35
-#: ../themes/default/templates/editpage.tmpl:37
-#: ../themes/default/templates/info.tmpl:107
-#: ../themes/fusionforge/templates/editpage.tmpl:70
-#: ../themes/MonoBook/templates/info.tmpl:120
-#: ../themes/Wordpress/templates/editpage.tmpl:38
 msgid "Size"
 msgstr ""
 
-#: ../lib/PageList.php:1276 ../themes/default/templates/info.tmpl:56
-#: ../themes/MonoBook/templates/info.tmpl:70
 msgid "Last Summary"
 msgstr ""
 
-#: ../lib/PageList.php:1278 ../lib/plugin/AuthorHistory.php:114
-#: ../lib/plugin/AuthorHistory.php:156
 msgid "Version"
 msgstr ""
 
-#: ../lib/PageList.php:1281 ../themes/default/templates/info.tmpl:55
-#: ../themes/MonoBook/templates/info.tmpl:69
 msgid "Last Author"
 msgstr ""
 
-#: ../lib/PageList.php:1283 ../lib/WikiGroup.php:37
 msgid "Owner"
 msgstr ""
 
-#: ../lib/PageList.php:1285 ../lib/WikiGroup.php:38
 msgid "Creator"
 msgstr ""
 
-#: ../lib/PageList.php:1291 ../themes/Crao/templates/editpage.tmpl:59
-#: ../themes/default/templates/editpage.tmpl:78
-#: ../themes/default/templates/info.tmpl:123
-#: ../themes/fusionforge/templates/editpage.tmpl:96
-#: ../themes/MonoBook/templates/info.tmpl:136
-#: ../themes/Wordpress/templates/editpage.tmpl:61
 msgid "Locked"
 msgstr ""
 
-#: ../lib/PageList.php:1292
 msgid "locked"
 msgstr ""
 
-#: ../lib/PageList.php:1294 ../themes/fusionforge/templates/editpage.tmpl:101
 msgid "External"
 msgstr ""
 
-#: ../lib/PageList.php:1295
 msgid "external"
 msgstr ""
 
-#: ../lib/PageList.php:1298
 msgid "Minor Edit"
 msgstr ""
 
-#: ../lib/PageList.php:1298
 msgid "minor"
 msgstr ""
 
-#: ../lib/PageList.php:1300 ../themes/default/templates/info.tmpl:103
-#: ../themes/MonoBook/templates/info.tmpl:116
 msgid "Markup"
 msgstr ""
 
-#: ../lib/PageList.php:1473 ../lib/PageList.php:1480 ../lib/PageList.php:1485
-#: ../lib/WikiDB/backend.php:574 ../lib/WikiDB/backend.php:579
 msgid "Illegal 'limit' argument: must be numeric"
 msgstr ""
 
-#: ../lib/PageList.php:1600 ../lib/plugin/WantedPagesOld.php:175
 #, php-format
 msgid "Columns: %s."
 msgstr ""
 
-#: ../lib/PagePerm.php:190 ../lib/plugin/WikiAdminRename.php:147
-#: ../lib/plugin/WikiAdminRename.php:277
-#: ../themes/fusionforge/templates/actionbar.tmpl:102
 msgid "Rename"
 msgstr ""
 
-#: ../lib/PagePerm.php:191
 msgid "SearchReplace"
 msgstr ""
 
-#: ../lib/PagePerm.php:328
 msgid "List this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:329
 msgid "View this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:330
 msgid "Edit this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:331
 msgid "Create a new (sub)page"
 msgstr ""
 
-#: ../lib/PagePerm.php:332
 msgid "Download page contents"
 msgstr ""
 
-#: ../lib/PagePerm.php:333
 msgid "Change page attributes"
 msgstr ""
 
-#: ../lib/PagePerm.php:334
 msgid "Remove this page"
 msgstr ""
 
-#: ../lib/PagePerm.php:335
 msgid "Purge this page"
 msgstr ""
 
-#: ../lib/PagePerm.php:367
 #, php-format
 msgid "Unsupported ACL access type %s ignored."
 msgstr ""
 
-#: ../lib/PagePerm.php:602
 msgid "Access"
 msgstr ""
 
-#: ../lib/PagePerm.php:604
 msgid "Group/User"
 msgstr ""
 
-#: ../lib/PagePerm.php:605
 msgid "Grant"
 msgstr ""
 
-#: ../lib/PagePerm.php:606
 msgid "Del/+"
 msgstr ""
 
-#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:74
-#: ../lib/plugin/WikiAdminSetAcl.php:256
 msgid "Description"
 msgstr ""
 
-#: ../lib/PagePerm.php:628
 msgid "Add this ACL"
 msgstr ""
 
-#: ../lib/PagePerm.php:652
 msgid "Allow / Deny"
 msgstr ""
 
-#: ../lib/PagePerm.php:664
 msgid "Delete this ACL"
 msgstr ""
 
-#: ../lib/PagePerm.php:690
 msgid "add "
 msgstr ""
 
-#: ../lib/PagePerm.php:694
 msgid "Check to add this ACL"
 msgstr ""
 
-#: ../lib/PageType.php:169
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
 
-#: ../lib/PageType.php:288 ../lib/PageType.php:291 ../lib/stdlib.php:854
-#: ../themes/default/templates/navbar.tmpl:5
-#: ../themes/default/templates/navbar.tmpl:7
-#: ../themes/fusionforge/templates/actionbar.tmpl:13
-#: ../themes/fusionforge/templates/actionbar.tmpl:21
-#: ../themes/fusionforge/templates/actionbar.tmpl:27
-#: ../themes/fusionforge/templates/actionbar.tmpl:37
-#: ../themes/MonoBook/templates/actionbar.tmpl:12
-#: ../themes/MonoBook/templates/actionbar.tmpl:19
-#: ../themes/MonoBook/templates/actionbar.tmpl:23
-#: ../themes/MonoBook/templates/actionbar.tmpl:29
-#: ../themes/wikilens/templates/navbar.tmpl:8
-#: ../themes/wikilens/templates/navbar.tmpl:10
 msgid "Discussion"
 msgstr ""
 
-#: ../lib/PageType.php:437
 msgid "Moniker"
 msgstr ""
 
-#: ../lib/PageType.php:438
 msgid "InterWiki Address"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:40
 msgid "AddComment"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:45
 #, php-format
 msgid "Show and add comments for %s."
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:77 ../lib/plugin/Chart.php:83
-#: ../lib/plugin/CreateBib.php:113 ../lib/plugin/CreateToc.php:399
-#: ../lib/plugin/FileInfo.php:65 ../lib/plugin/FileInfo.php:68
-#: ../lib/plugin/GoogleMaps.php:93 ../lib/plugin/GoogleMaps.php:96
-#: ../lib/plugin/IncludePage.php:90 ../lib/plugin/ModeratedPage.php:69
-#: ../lib/plugin/PageGroup.php:101 ../lib/plugin/SyncWiki.php:74
-#: ../lib/plugin/SyntaxHighlighter.php:116 ../lib/plugin/Template.php:115
-#: ../lib/plugin/WikiFormRich.php:179 ../lib/plugin/WikiFormRich.php:196
-#: ../lib/plugin/WikiForum.php:75 ../lib/plugin/WikiPoll.php:149
 #, php-format
 msgid "A required argument "%s" is missing."
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:99
 msgid "Click to hide the comments"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:102
 msgid "Click to display all comments"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:107 ../lib/plugin/CreateToc.php:511
 msgid "Click to display"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:109
 msgid "Comments"
 msgstr ""
 
-#: ../lib/plugin/AllPages.php:35 ../themes/MonoBook/templates/navbar.tmpl:70
-#: ../themes/Sidebar/templates/navbar.tmpl:61
 msgid "AllPages"
 msgstr ""
 
-#: ../lib/plugin/AllPages.php:40
 msgid "List all pages in this wiki."
 msgstr ""
 
-#: ../lib/plugin/AllPages.php:72
 #, php-format
 msgid "All pages in this wiki (%d total):"
 msgstr ""
 
-#: ../lib/plugin/AllPages.php:78
 #, php-format
 msgid "List of user-created pages (%d total):"
 msgstr ""
 
-#: ../lib/plugin/AllPages.php:87 ../lib/plugin/LinkDatabase.php:91
 #, php-format
 msgid "List of pages owned by [%s] (%d total):"
 msgstr ""
 
-#: ../lib/plugin/AllPages.php:99 ../lib/plugin/LinkDatabase.php:98
 #, php-format
 msgid "List of pages last edited by [%s] (%d total):"
 msgstr ""
 
-#: ../lib/plugin/AllPages.php:111 ../lib/plugin/LinkDatabase.php:105
 #, php-format
 msgid "List of pages created by [%s] (%d total):"
 msgstr ""
 
-#: ../lib/plugin/AllPages.php:140 ../lib/plugin/AllUsers.php:107
 #, php-format
 msgid "Elapsed time: %s s"
 msgstr ""
 
-#: ../lib/plugin/AllUsers.php:38
 msgid "AllUsers"
 msgstr ""
 
-#: ../lib/plugin/AllUsers.php:43
 msgid "List all once authenticated users."
 msgstr ""
 
-#: ../lib/plugin/AllUsers.php:85
 #, php-format
 msgid "Authenticated users on this wiki (%d total):"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:168
-#: ../lib/plugin/AnalyseAccessLogSql.php:205
 msgid "0 - last minute"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:169
-#: ../lib/plugin/AnalyseAccessLogSql.php:206
 msgid "1 - 1 minute to 1 hour"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:170
-#: ../lib/plugin/AnalyseAccessLogSql.php:207
 msgid "2 - 1 hour to 1 day"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:171
-#: ../lib/plugin/AnalyseAccessLogSql.php:208
 msgid "3 - 1 day to 1 week"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:172
-#: ../lib/plugin/AnalyseAccessLogSql.php:209
 msgid "4 - 1 week to 1 month"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:173
-#: ../lib/plugin/AnalyseAccessLogSql.php:210
 msgid "5 - 1 month to 1 year"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:174
-#: ../lib/plugin/AnalyseAccessLogSql.php:211
 msgid "6 - more than 1 year"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:231
 msgid "referring_urls"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:232
 msgid "external_referers"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:233
 msgid "referring_domains"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:234
 msgid "remote_hosts"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:235
 msgid "users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:236
 msgid "host_users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:237
 msgid "search_bots"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:238
 msgid "search_bots_hits"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:240
 msgid "minutes"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:241
 msgid "hours"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:242 ../lib/plugin/VisualWiki.php:512
 msgid "days"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:243
 msgid "weeks"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:263
 msgid "AnalyseAccessLogSql"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:268
 msgid "Show summary information from the access log table."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:277
 msgid "The requested information is available only to Administrators."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:280
 msgid "The SQL_ACCESS_LOG is not enabled."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:291
 #, php-format
 msgid "Unrecognised parameter 'mode=%s'"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:311
-#: ../lib/plugin/_BackendInfo.php:122 ../lib/plugin/SemanticSearch.php:420
-#: ../lib/plugin/WatchPage.php:62
 msgid "<empty>"
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:38 ../lib/plugin/AppendText.php:85
 msgid "AppendText"
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:43
 msgid "Append text to any page in this wiki."
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:60
 msgid "Appending at the end."
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:95
 #, php-format
 msgid "Page could not be updated. %s doesn't exist!"
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:129
 #, php-format
 msgid "AppendText to %s"
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:132
 msgid "Page successfully updated."
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:149
 #, php-format
 msgid "Go to %s."
 msgstr ""
 
-#: ../lib/plugin/AsciiMath.php:46
 msgid "AsciiMath"
 msgstr ""
 
-#: ../lib/plugin/AsciiMath.php:51
 msgid "Render ASCII Math as MathML."
 msgstr ""
 
-#: ../lib/plugin/AsciiSVG.php:33
 msgid "AsciiSVG"
 msgstr ""
 
-#: ../lib/plugin/AsciiSVG.php:38
 msgid "Render inline ASCII SVG."
 msgstr ""
 
-#: ../lib/plugin/AtomFeed.php:33
 msgid "AtomFeed"
 msgstr ""
 
-#: ../lib/plugin/AtomFeed.php:38
 msgid "Atom Aggregator Plugin."
 msgstr ""
 
-#: ../lib/plugin/_AuthInfo.php:36
 msgid "AuthInfo"
 msgstr ""
 
-#: ../lib/plugin/_AuthInfo.php:41
 msgid "Display general and user specific auth information."
 msgstr ""
 
-#: ../lib/plugin/_AuthInfo.php:64
 msgid "General Auth Settings"
 msgstr ""
 
-#: ../lib/plugin/_AuthInfo.php:99
 #, php-format
 msgid "Personal Auth Settings for "%s""
 msgstr ""
 
-#: ../lib/plugin/_AuthInfo.php:101
 msgid "No userid"
 msgstr ""
 
-#: ../lib/plugin/AuthorHistory.php:64 ../themes/blog/templates/info.tmpl:3
-#: ../themes/MonoBook/templates/actionbar.tmpl:75
-#: ../themes/MonoBook/templates/info.tmpl:180
-#: ../themes/Sidebar/templates/actionbar.tmpl:56
-#: ../themes/smaller/templates/info.tmpl:6
 msgid "AuthorHistory"
 msgstr ""
 
-#: ../lib/plugin/AuthorHistory.php:69
 #, php-format
 msgid ""
 "List all page revisions edited by one user with diff links, or show a "
 "PageHistory-like list of a single page for only one user."
 msgstr ""
 
-#: ../lib/plugin/AuthorHistory.php:115 ../lib/plugin/AuthorHistory.php:157
 msgid "Minor"
 msgstr ""
 
-#: ../lib/plugin/AuthorHistory.php:116
-#: ../themes/default/templates/info.tmpl:60
-#: ../themes/default/templates/wikiforum.tmpl:21
-#: ../themes/MonoBook/templates/info.tmpl:74
 msgid "Author"
 msgstr ""
 
-#: ../lib/plugin/AuthorHistory.php:117 ../lib/plugin/AuthorHistory.php:158
-#: ../themes/Crao/templates/editpage.tmpl:46
-#: ../themes/default/templates/editpage.tmpl:48
-#: ../themes/default/templates/info.tmpl:61
-#: ../themes/fusionforge/templates/editpage.tmpl:77
-#: ../themes/MonoBook/templates/info.tmpl:75
-#: ../themes/Portland/templates/editpage.tmpl:34
-#: ../themes/Wordpress/templates/editpage.tmpl:46
 msgid "Summary"
 msgstr ""
 
-#: ../lib/plugin/AuthorHistory.php:118 ../lib/plugin/AuthorHistory.php:159
 msgid "Modified"
 msgstr ""
 
-#: ../lib/plugin/AuthorHistory.php:147
 #, php-format
 msgid "History of all major and minor edits by %s to page %s."
 msgstr ""
 
-#: ../lib/plugin/AuthorHistory.php:193
 #, php-format
 msgid "History of all major and minor modifications for any page edited by %s."
 msgstr ""
 
-#: ../lib/plugin/_BackendInfo.php:31 ../lib/plugin/_WikiTranslation.php:53
-#: ../themes/Crao/templates/actionbar.tmpl:30
-#: ../themes/default/templates/actionbar.tmpl:35
-#: ../themes/MonoBook/templates/info.tmpl:186
-#: ../themes/Portland/templates/actionbar.tmpl:15
-#: ../themes/smaller/templates/info.tmpl:13
-#: ../themes/Wordpress/templates/actionbar.tmpl:73
 msgid "DebugInfo"
 msgstr ""
 
-#: ../lib/plugin/_BackendInfo.php:36
 #, php-format
 msgid "Get debugging information for %s."
 msgstr ""
 
-#: ../lib/plugin/_BackendInfo.php:57
 #, php-format
 msgid "Querying backend directly for "%s""
 msgstr ""
 
-#: ../lib/plugin/_BackendInfo.php:66
 #, php-format
 msgid "No pagedata for %s"
 msgstr ""
 
-#: ../lib/plugin/_BackendInfo.php:122
 msgid "<not displayed>"
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:30 ../lib/plugin/_WikiTranslation.php:50
-#: ../themes/blog/templates/navbar.tmpl:8
-#: ../themes/Crao/templates/navbar.tmpl:15
-#: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/MonoBook/templates/navbar.tmpl:49
-#: ../themes/Sidebar/templates/navbar.tmpl:45
-#: ../themes/smaller/templates/navbar.tmpl:14
-#: ../themes/wikilens/templates/navbar.tmpl:21
 msgid "BackLinks"
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:35
 #, php-format
 msgid "List all pages which link to %s."
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:71 ../lib/plugin/ListPages.php:122
-#: ../lib/plugin/ListPages.php:125 ../lib/plugin/ListSubpages.php:89
 msgid "#"
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:124
 #, php-format
 msgid "No other page links to %s yet."
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:127
 #, php-format
 msgid "One page would link to %s:"
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:136
 #, php-format
 msgid "%s pages would link to %s:"
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:144 ../lib/plugin/SemanticSearch.php:133
-#: ../lib/plugin/SemanticSearch.php:212
 msgid "AND"
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:150
 #, php-format
 msgid "No page links to %s."
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:155
 #, php-format
 msgid "One page links to %s:"
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:165
 msgid "Those"
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:164
 #, php-format
 msgid "%s pages link to %s:"
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:173
 msgid "More..."
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:40 ../lib/plugin/BlogArchives.php:149
-#: ../themes/blog/templates/actionbar.tmpl:7
 msgid "Archives"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:45
 msgid "List blog months links for the current or ADMIN user."
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:102 ../lib/plugin/BlogJournal.php:104
 #, php-format
 msgid "Blog Entries for %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:110
-#: ../themes/blog/templates/actionbar.tmpl:7
 msgid "BlogArchives"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:136
 msgid "Blog Archives:"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:39
 msgid "BlogJournal"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:44
 msgid "Include latest blog entries for the current or ADMIN user."
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:100
 msgid "New entry"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:102
 msgid "No Blog Entries"
 msgstr ""
 
-#: ../lib/plugin/BoxRight.php:36
 msgid "A simple plugin for <div class=boxright> with wikimarkup."
 msgstr ""
 
-#: ../lib/plugin/CalendarList.php:54 ../lib/plugin/CalendarList.php:59
 msgid "CalendarList"
 msgstr ""
 
-#: ../lib/plugin/CalendarList.php:143 ../lib/plugin/Calendar.php:169
 #, php-format
 msgid "Edit %s"
 msgstr ""
 
-#: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1557 ../lib/WikiUser.php:501
-#: ../themes/blog/templates/sidebar.tmpl:15
-#: ../themes/Crao/templates/head.tmpl:80
-#: ../themes/Crao/templates/navbar.tmpl:26
-#: ../themes/default/templates/head.tmpl:88
-#: ../themes/default/templates/homepage.tmpl:14
-#: ../themes/default/templates/navbar.tmpl:29
-#: ../themes/wikilens/templates/head.tmpl:79
-#: ../themes/wikilens/templates/navbar.tmpl:24
-#: ../themes/Wordpress/templates/actionbar.tmpl:30
 msgid "Calendar"
 msgstr ""
 
-#: ../lib/plugin/Calendar.php:93
 msgid "Previous Month"
 msgstr ""
 
-#: ../lib/plugin/Calendar.php:97
 msgid "Next Month"
 msgstr ""
 
-#: ../lib/plugin/Calendar.php:129
 msgid "Wk"
 msgstr ""
 
-#: ../lib/plugin/CategoryPage.php:45
 msgid "CategoryPage"
 msgstr ""
 
-#: ../lib/plugin/CategoryPage.php:50
 msgid "Create a Wiki Category Page."
 msgstr ""
 
-#: ../lib/plugin/Chart.php:51
 msgid "Chart"
 msgstr ""
 
-#: ../lib/plugin/Chart.php:56
 msgid "Render SVG charts."
 msgstr ""
 
-#: ../lib/plugin/Comment.php:43
 msgid "Comment"
 msgstr ""
 
-#: ../lib/plugin/Comment.php:48
 msgid "Embed hidden comments in WikiPages."
 msgstr ""
 
-#: ../lib/plugin/CreateBib.php:38
 msgid "CreateBib"
 msgstr ""
 
-#: ../lib/plugin/CreateBib.php:43
 msgid "Automatically create a Bibtex file from linked pages."
 msgstr ""
 
-#: ../lib/plugin/CreatePage.php:43
 msgid "CreatePage"
 msgstr ""
 
-#: ../lib/plugin/CreatePage.php:48
 msgid "Create a wiki page by the provided name."
 msgstr ""
 
-#: ../lib/plugin/CreatePage.php:70
 msgid "Cannot create page with empty name!"
 msgstr ""
 
-#: ../lib/plugin/CreatePage.php:74
 msgid "CreatePage failed"
 msgstr ""
 
-#: ../lib/plugin/CreatePage.php:76 ../lib/plugin/CreatePage.php:78
 #, php-format
 msgid "Do you really want to create the page "%s"?"
 msgstr ""
 
-#: ../lib/plugin/CreatePage.php:83 ../lib/plugin/CreatePage.php:87
 msgid "The new page you want to create will be a subpage."
 msgstr ""
 
-#: ../lib/plugin/CreatePage.php:84
 msgid "Subpages cannot be created unless the parent page exists."
 msgstr ""
 
-#: ../lib/plugin/CreatePage.php:91
 msgid ""
 "Subpages with ending space are not allowed as directory name on Windows."
 msgstr ""
 
-#: ../lib/plugin/CreatePage.php:121
 #, php-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../lib/plugin/CreatePage.php:137
 msgid "Created by CreatePage"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:46
 msgid "CreateToc"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:51
 msgid "Create a Table of Contents and automatically link to headers."
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:408
 msgid "Error: firstlevelstyle must be 'number', 'letter' or 'roman'"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:418 ../lib/plugin/Diff.php:92
-#: ../lib/plugin/PageDump.php:92
 #, php-format
 msgid "Illegal access to page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:426
 msgid "Error: version must be a positive integer."
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:430 ../lib/plugin/IncludePage.php:119
-#: ../lib/plugin/PageGroup.php:126 ../lib/plugin/Template.php:152
 #, php-format
 msgid "%s: no such revision %d."
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:441
 msgid "CreateToc disabled for old markup."
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:504
 msgid "Click to display to TOC"
 msgstr ""
 
-#: ../lib/plugin/CurrentTime.php:58
 msgid "CurrentTime"
 msgstr ""
 
-#: ../lib/plugin/CurrentTime.php:63
 msgid "Display current time and date."
 msgstr ""
 
-#: ../lib/plugin/DeadEndPages.php:32
 msgid "DeadEndPages"
 msgstr ""
 
-#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1054
-#: ../themes/blog/themeinfo.php:71
 msgid "Diff"
 msgstr ""
 
-#: ../lib/plugin/Diff.php:43
 msgid "Display differences between revisions."
 msgstr ""
 
-#: ../lib/plugin/Diff.php:185
 msgid "Content of versions "
 msgstr ""
 
-#: ../lib/plugin/Diff.php:186
 msgid " and "
 msgstr ""
 
-#: ../lib/plugin/Diff.php:186
 msgid " is identical."
 msgstr ""
 
-#: ../lib/plugin/Diff.php:191
 msgid "Version "
 msgstr ""
 
-#: ../lib/plugin/Diff.php:192
 msgid " was created because: "
 msgstr ""
 
-#: ../lib/plugin/DynamicIncludePage.php:36
 msgid "DynamicIncludePage"
 msgstr ""
 
-#: ../lib/plugin/DynamicIncludePage.php:41
 msgid "Dynamically include the content from another wiki page."
 msgstr ""
 
-#: ../lib/plugin/DynamicIncludePage.php:63
-#: ../lib/plugin/DynamicIncludePage.php:86
 #, php-format
 msgid " %s :"
 msgstr ""
 
-#: ../lib/plugin/DynamicIncludePage.php:81
-#: ../lib/plugin/DynamicIncludePage.php:82
-#: ../lib/plugin/NewPagesPerUser.php:119 ../lib/plugin/NewPagesPerUser.php:120
-#: ../lib/plugin/RecentChanges.php:1486 ../lib/plugin/RecentChanges.php:1487
-#: ../themes/Sidebar/themeinfo.php:59 ../themes/Sidebar/themeinfo.php:60
 msgid "Click to hide/show"
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:49 ../lib/plugin/_WikiTranslation.php:54
 msgid "EditMetaData"
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:54
 #, php-format
 msgid "Edit metadata for %s."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:130
 #, php-format
 msgid "No metadata for %s"
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:143
 msgid ""
 "Add or change a page-level metadata 'key=>value' pair. Note that you can "
 "remove a key by leaving the value-box empty."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:146 ../lib/upgrade.php:795
 msgid "Submit"
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:161
 msgid "Requires WikiAdmin privileges to edit."
 msgstr ""
 
-#: ../lib/plugin/ExternalSearch.php:41
 msgid "ExternalSearch"
 msgstr ""
 
-#: ../lib/plugin/ExternalSearch.php:46
 msgid "Redirect to an external web site based on form input."
 msgstr ""
 
-#: ../lib/plugin/ExternalSearch.php:140 ../lib/plugin/PhotoAlbum.php:482
 #, php-format
 msgid "Invalid argument: %s=%s"
 msgstr ""
 
-#: ../lib/plugin/FacebookLike.php:36
 msgid "Display a Facebook Like button."
 msgstr ""
 
-#: ../lib/plugin/FileInfo.php:41
 msgid "FileInfo"
 msgstr ""
 
-#: ../lib/plugin/FileInfo.php:46
 msgid "Display file information like version, size, date... of uploaded files."
 msgstr ""
 
-#: ../lib/plugin/FileInfo.php:82 ../lib/upgrade.php:967
 #, php-format
 msgid "File "%s" not found."
 msgstr ""
 
-#: ../lib/plugin/FileInfo.php:96
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
 msgstr ""
 
-#: ../lib/plugin/FileInfo.php:97
 msgid "page not locked"
 msgstr ""
 
-#: ../lib/plugin/FoafViewer.php:71
 msgid "FoafViewer"
 msgstr ""
 
-#: ../lib/plugin/FoafViewer.php:76
 msgid "Parse an RDF FOAF file and extract information to render as H...
 
[truncated message content]

Revision: 8720
 http://sourceforge.net/p/phpwiki/code/8720
Author: vargenau
Date: 2013年02月04日 09:50:32 +0000 (2013年2月04日)
Log Message:
-----------
Wikicreole syntax
Modified Paths:
--------------
 trunk/locale/de/pgsrc/PhpWikiSystemverwalten
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2013年02月04日 09:13:58 UTC (rev 8719)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2013年02月04日 09:50:32 UTC (rev 8720)
@@ -1,4 +1,4 @@
-Date: Fri, 4 Feb 2011 16:36:18 +0000
+Date: Mon, 4 Feb 2013 10:43:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
 pagename=PhpWikiSystemverwalten;
@@ -7,13 +7,13 @@
 charset=utf-8
 Content-Transfer-Encoding: binary
 
-_*Beachte:*_ _Du mußt den Systemverwalter-Zugang zuerst mit einem
+**//Beachte://** //Du mußt den Systemverwalter-Zugang zuerst mit einem
 Passwort schützen, sonst werden die meisten Links auf dieser Seite
-nicht funktionieren._
+nicht funktionieren.//
 
 <<CreateToc jshide||=1 with_toclink||=1 >>
 ----
-== Seiten Explorer
+== Seiten Explorer ==
 
 Entweder wähle zuerst die Seiten und führe dann die Aktion aus:
 
@@ -23,7 +23,7 @@
 
 | [[/Löschen]] | [[/Umbenennen]] | [[/SuchenErsetzen]] | [[/AclSetzen]] | [[/Chown]] | [[/Chmod]]
 
-== Benutzerverwaltung
+== Benutzerverwaltung ==
 
 Setze ein Benutzer Passwort zurück:
 
@@ -53,7 +53,7 @@
 >>
 
 ----------
-== Aufräumen
+== Aufräumen ==
 
 Räume die Wiki SandKiste auf. Hiermit kann man die Seite mit der
 Version von locale/de/pgsrc/SandKiste erneut initialisieren: 
@@ -61,7 +61,7 @@
 [ SandKiste löschen | phpwiki:?action=loadfile&overwrite=1&source=locale/de/pgsrc/SandKiste ].
 
 ----------
-== Speichern und Archivieren
+== Speichern und Archivieren ==
 
 ==== Backup der PhpWiki Datenbank als ZIP Dateien
 
@@ -92,7 +92,7 @@
 
 -----------
 
-== Wiederherstellen
+== Wiederherstellen ==
 
 Wenn du ein PhpWiki Backup besitzt, kannst du dieses hier wieder
 restaurieren. Beachte das alle Seiten in der Datenbank damit
@@ -129,7 +129,7 @@
 
 -----------
 
-== Daten-Format
+== Daten-Format ==
 
 Momentan werden alle Seiten dateiweise als MIME (RFC:2045) E-Mail's
 (RFC:822) gespeichert. Der Content-type _application/x-phpwiki_ wird
@@ -161,7 +161,7 @@
 
 ----
 
-== Seiten als XHTML Dateien speichern
+== Seiten als XHTML Dateien speichern ==
 
 <<WikiForm action=dumphtml>>
 
@@ -173,7 +173,7 @@
 
 ----
 
-== PhpWiki Internals
+== PhpWiki Internals ==
 
 These are here mostly for debugging purposes (at least, that's the
 hope.)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8719
 http://sourceforge.net/p/phpwiki/code/8719
Author: vargenau
Date: 2013年02月04日 09:13:58 +0000 (2013年2月04日)
Log Message:
-----------
Remove comments
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/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
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/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年01月31日 19:24:40 UTC (rev 8718)
+++ trunk/locale/po/de.po	2013年02月04日 09:13:58 UTC (rev 8719)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:01+0100\n"
+"POT-Creation-Date: 2013年01月31日 16:34+0100\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."
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013年01月31日 19:24:40 UTC (rev 8718)
+++ trunk/locale/po/es.po	2013年02月04日 09:13:58 UTC (rev 8719)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:01+0100\n"
+"POT-Creation-Date: 2013年01月31日 16:34+0100\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年01月31日 19:24:40 UTC (rev 8718)
+++ trunk/locale/po/fr.po	2013年02月04日 09:13:58 UTC (rev 8719)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:01+0100\n"
+"POT-Creation-Date: 2013年01月31日 16:34+0100\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."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013年01月31日 19:24:40 UTC (rev 8718)
+++ trunk/locale/po/it.po	2013年02月04日 09:13:58 UTC (rev 8719)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:01+0100\n"
+"POT-Creation-Date: 2013年01月31日 16:34+0100\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"
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013年01月31日 19:24:40 UTC (rev 8718)
+++ trunk/locale/po/ja.po	2013年02月04日 09:13:58 UTC (rev 8719)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:01+0100\n"
+"POT-Creation-Date: 2013年01月31日 16:34+0100\n"
 "PO-Revision-Date: 2003年06月07日 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2631,10 +2631,9 @@
 msgid "RecentEdits"
 msgstr ""
 
-# 削除しました。
 #, fuzzy
 msgid "Deleted"
-msgstr "削除しました。"
+msgstr "削除しました"
 
 msgid "diff"
 msgstr "差分"
@@ -3753,10 +3752,9 @@
 msgid "Change owner to: "
 msgstr "国名変更"
 
-# 削除しました。
 #, fuzzy
 msgid "WikiDeleteAcl"
-msgstr "削除しました。"
+msgstr "削除しました"
 
 msgid "Delete page permissions."
 msgstr ""
@@ -3768,10 +3766,9 @@
 msgid "PhpWikiAdministration/AdminAclDelete"
 msgstr ""
 
-# 削除しました。
 #, fuzzy
 msgid "Delete ACL"
-msgstr "削除しました。"
+msgstr "削除しました"
 
 #, fuzzy
 msgid "Select the pages where to delete access rights"
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2013年01月31日 19:24:40 UTC (rev 8718)
+++ trunk/locale/po/nl.po	2013年02月04日 09:13:58 UTC (rev 8719)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:01+0100\n"
+"POT-Creation-Date: 2013年01月31日 16:34+0100\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013年01月31日 19:24:40 UTC (rev 8718)
+++ trunk/locale/po/phpwiki.pot	2013年02月04日 09:13:58 UTC (rev 8719)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:01+0100\n"
+"POT-Creation-Date: 2013年01月31日 16:34+0100\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年01月31日 19:24:40 UTC (rev 8718)
+++ trunk/locale/po/sv.po	2013年02月04日 09:13:58 UTC (rev 8719)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:01+0100\n"
+"POT-Creation-Date: 2013年01月31日 16:34+0100\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -1732,7 +1732,6 @@
 msgid "(%d Links)"
 msgstr ""
 
-# FuzzySearch
 msgid "FuzzyPages"
 msgstr ""
 
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2013年01月31日 19:24:40 UTC (rev 8718)
+++ trunk/locale/po/zh.po	2013年02月04日 09:13:58 UTC (rev 8719)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013年01月31日 16:01+0100\n"
+"POT-Creation-Date: 2013年01月31日 16:34+0100\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -122,8 +122,6 @@
 msgid "Version %1$s was created because: %2$s"
 msgstr "版本 %s, 存於 %s."
 
-# This entry is important for French punctuation rules which stipulate
-# a space before each colon.
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -487,8 +485,6 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-# This entry is important for French punctuation rules which stipulate
-# a space before each colon.
 #, fuzzy
 msgid ": "
 msgstr "%s: %s"
@@ -5626,8 +5622,6 @@
 msgid "%s by %s"
 msgstr "%s 被 %s"
 
-# This entry is important for French punctuation rules which stipulate
-# a space before each colon.
 #, fuzzy, php-format
 msgid ", Memory: %s"
 msgstr "User: %s"
@@ -5681,11 +5675,8 @@
 msgid "Original (1.2 or 1.0)"
 msgstr "原始 (1.2 或 1.0)"
 
-# This entry is important for French punctuation rules which stipulate
-# a space before each colon.
-#, fuzzy
 msgid ":"
-msgstr "%s: %s"
+msgstr ":"
 
 #, fuzzy
 msgid "Saved on"
@@ -6028,8 +6019,6 @@
 msgid "New Topic"
 msgstr ""
 
-# This entry is important for French punctuation rules which stipulate
-# a space before each colon.
 #, fuzzy, php-format
 msgid "Posted: %s"
 msgstr "User: %s"
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.