phpwiki-checkins Mailing List for PhpWiki (Page 531)

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv12644/templates
Modified Files:
	editpage.html 
Log Message:
Added "Minor edit, do not archive" checkbox on the edit form.
(Sourceforge task #25913)
Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** editpage.html	2000年11月08日 15:50:57	1.6
--- editpage.html	2001年02月07日 22:14:35	1.7
***************
*** 15,19 ****
 <textarea name="content" ROWS="22" COLS="80" wrap="virtual">###CONTENT###</textarea>
 <br>
! 
 <input type="checkbox" name="convert" value="tabs" >
 I can't type tabs.
--- 15,23 ----
 <textarea name="content" ROWS="22" COLS="80" wrap="virtual">###CONTENT###</textarea>
 <br>
! <input type="checkbox" name="minor_edit" value="yes" 
! ###IF MINOR_EDIT### checked
! >
! This is a minor change, don't archive old version.
! <br>
 <input type="checkbox" name="convert" value="tabs" >
 I can't type tabs.

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv12644/lib
Modified Files:
	config.php editpage.php savepage.php stdlib.php 
Log Message:
Added "Minor edit, do not archive" checkbox on the edit form.
(Sourceforge task #25913)
Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** config.php	2001年01月31日 07:38:10	1.24
--- config.php	2001年02月07日 22:14:35	1.25
***************
*** 161,164 ****
--- 161,171 ----
 $InlineImages = "png|jpg|gif";
 
+ 
+ // If the last edit is older than MINOR_EDIT_TIMEOUT seconds, the default
+ // state for the "minor edit" checkbox on the edit page form will be off
+ // (even if the page author hasn't changed.)
+ define("MINOR_EDIT_TIMEOUT", 7 * 24 * 3600);
+ 
+ 
 // Perl regexp for WikiNames
 // (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well
Index: editpage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** editpage.php	2001年01月01日 23:13:32	1.8
--- editpage.php	2001年02月07日 22:14:35	1.9
***************
*** 43,49 ****
 $pagehash["version"] = $currentpage["version"];
 }
! elseif ($pagehash["version"] > 1) {
! 	 if(IsInArchive($dbi, $pagename))
! $pagehash["copy"] = 1;
 }
 } else {
--- 43,51 ----
 $pagehash["version"] = $currentpage["version"];
 }
! else {
! 	 if ($pagehash["version"] > 1 && IsInArchive($dbi, $pagename)) {
! 	 $pagehash["copy"] = 1;
! 	 }
! 	 $currentpage = $pagehash;
 }
 } else {
***************
*** 54,57 ****
--- 56,67 ----
 $pagehash["lastmodified"] = time();
 $pagehash["author"] = '';
+ $currentpage = $pagehash;
+ }
+ 
+ if ($currentpage['author'] == $remoteuser) {
+ $page_age = time() - $currentpage['lastmodified'];
+ if ($page_age < MINOR_EDIT_TIMEOUT) {
+ 	 $pagehash['minor_edit'] = 1;
+ }
 }
 
Index: savepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** savepage.php	2001年01月04日 18:30:32	1.7
--- savepage.php	2001年02月07日 22:14:35	1.8
***************
*** 130,134 ****
 
 // archive it if it's a new author
! if ($pagehash['author'] != $remoteuser) {
 SaveCopyToArchive($dbi, $pagename, $pagehash);
 }
--- 130,134 ----
 
 // archive it if it's a new author
! if (empty($minor_edit)) {
 SaveCopyToArchive($dbi, $pagename, $pagehash);
 }
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** stdlib.php	2001年02月07日 17:21:33	1.23
--- stdlib.php	2001年02月07日 22:14:35	1.24
***************
*** 316,319 ****
--- 316,320 ----
 			($hash['flags'] & FLAG_PAGE_LOCKED)), $page);
 _iftoken('ADMIN', defined('WIKI_ADMIN'), $page);
+ _iftoken('MINOR_EDIT', isset($hash['minor_edit']), $page);	
 
 _dotoken('SCRIPTURL', $ScriptUrl, $page);

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv4467/lib
Modified Files:
	display.php 
Log Message:
Minor security bug fix.
The URL 'index.php?zip=all' should not get you to the wiki page
named 'zip=all'.
Index: display.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/display.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** display.php	2000年12月30日 21:09:13	1.5
--- display.php	2001年02月07日 21:11:46	1.6
***************
*** 7,12 ****
 // if it wasn't this file would not have been included
 
! if (!empty($argv[0])) {
! $pagename = rawurldecode($argv[0]);
 } else { 
 $pagename = gettext("FrontPage");
--- 7,15 ----
 // if it wasn't this file would not have been included
 
! if (empty($QUERY_STRING) && isset($argv[0]))
! $QUERY_STRING = $argv[0];
! 
! if (isset($QUERY_STRING) && preg_match('/^[-+%\w]+$/', $QUERY_STRING)) {
! $pagename = urldecode($QUERY_STRING);
 } else { 
 $pagename = gettext("FrontPage");

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv16614/lib
Modified Files:
	diff.php 
Log Message:
Fix bug #131372: diff hangs.
The problem had to do with subtleties introduced by the code
cleanups to remove the PHP4 warnings.
I've now added several assert()'s (only active under PHP4)
to perform further sanity checks.
Index: diff.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/diff.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** diff.php	2000年11月01日 11:31:41	1.4
--- diff.php	2001年02月07日 18:35:09	1.5
***************
*** 9,12 ****
--- 9,18 ----
 //
 
+ // FIXME: possibly remove assert()'s for production version?
+ 
+ // PHP3 does not have assert()
+ define('USE_ASSERTS', function_exists('assert'));
+ 
+ 
 /**
 * Class used internally by WikiDiff to actually compute the diffs.
***************
*** 35,38 ****
--- 41,45 ----
 	$n_from = sizeof($from_lines);
 	$n_to = sizeof($to_lines);
+ 	$endskip = 0;
 
 	// Ignore trailing and leading matching lines.
***************
*** 72,82 ****
 	 $xlines[] = $line;
 	 if ( ($this->xchanged[$x] = empty($yhash[$line])) )
! 		continue;	// fixme? what happens to yhash/xhash when
! 				// there are two identical lines??
 	 $this->xv[] = $line;
 	 $this->xind[] = $x;
 	 }
 
- 
 	// Find the LCS.
 	$this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
--- 79,87 ----
 	 $xlines[] = $line;
 	 if ( ($this->xchanged[$x] = empty($yhash[$line])) )
! 		continue;
 	 $this->xv[] = $line;
 	 $this->xind[] = $x;
 	 }
 
 	// Find the LCS.
 	$this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
***************
*** 95,107 ****
 	while ($x < $n_from || $y < $n_to)
 	 {
! 	 /*
! 	 if ( ($y == $n_to && !$this->xchanged[$x])
! 		 || ($x == $n_from && !$this->ychanged[$y]) )
! 		die("assertion error");
! 	 */
 
 	 // Skip matching "snake".
 	 $x0 = $x;
 	 $ncopy = 0;
 	 while ( $x < $n_from && $y < $n_to
 	 && !$this->xchanged[$x] && !$this->ychanged[$y])
--- 100,110 ----
 	while ($x < $n_from || $y < $n_to)
 	 {
! 	 USE_ASSERTS && assert($y < $n_to || $this->xchanged[$x]);
! 	 USE_ASSERTS && assert($x < $n_from || $this->ychanged[$y]);
 
 	 // Skip matching "snake".
 	 $x0 = $x;
 	 $ncopy = 0;
+ 
 	 while ( $x < $n_from && $y < $n_to
 	 && !$this->xchanged[$x] && !$this->ychanged[$y])
***************
*** 134,138 ****
 	 }
 	 }
! 	if (!empty($endskip))
 	 $this->edits[] = $endskip;
 }
--- 137,141 ----
 	 }
 	 }
! 	if ($endskip != 0)
 	 $this->edits[] = $endskip;
 }
***************
*** 196,200 ****
 		 {
 			$k = $this->_lcs_pos($y);
! 			//if (!$k) die('assertion "!$k" failed');
 			$ymids[$k] = $ymids[$k-1];
 			break;
--- 199,203 ----
 		 {
 			$k = $this->_lcs_pos($y);
! 			USE_ASSERTS && assert($k > 0);
 			$ymids[$k] = $ymids[$k-1];
 			break;
***************
*** 204,208 ****
 		 if ($y > $this->seq[$k-1])
 		 {
! 			//if ($y >= $this->seq[$k]) die('assertion failed');
 			// Optimization: this is a common case:
 			// next match is just replacing previous match.
--- 207,211 ----
 		 if ($y > $this->seq[$k-1])
 		 {
! 			USE_ASSERTS && assert($y < $this->seq[$k]);
 			// Optimization: this is a common case:
 			// next match is just replacing previous match.
***************
*** 214,218 ****
 		 {
 			$k = $this->_lcs_pos($y);
! 			//if (!$k) die('assertion "!$k" failed');
 			$ymids[$k] = $ymids[$k-1];
 		 }
--- 217,221 ----
 		 {
 			$k = $this->_lcs_pos($y);
! 			USE_ASSERTS && assert($k > 0);
 			$ymids[$k] = $ymids[$k-1];
 		 }
***************
*** 254,258 ****
 	 }
 
! 	//if ($ypos == $this->seq[$end]) die("assertion failure");
 
 	$this->in_seq[$this->seq[$end]] = false;
--- 257,261 ----
 	 }
 
! 	USE_ASSERTS && assert($ypos != $this->seq[$end]);
 
 	$this->in_seq[$this->seq[$end]] = false;
***************
*** 329,333 ****
 *
 * We do something when a run of changed lines include a
! * line at one end and have an excluded, identical line at the other.
 * We are free to choose which identical line is included.
 * `compareseq' usually chooses the one at the beginning,
--- 332,336 ----
 *
 * We do something when a run of changed lines include a
! * line at one end and has an excluded, identical line at the other.
 * We are free to choose which identical line is included.
 * `compareseq' usually chooses the one at the beginning,
***************
*** 341,345 ****
--- 344,352 ----
 	$i = 0;
 	$j = 0;
+ 
+ 	USE_ASSERTS && assert('sizeof($lines) == sizeof($changed)');
 	$len = sizeof($lines);
+ 	$other_len = sizeof($other_changed);
+ 
 	while (1)
 	 {
***************
*** 347,356 ****
 	 * Scan forwards to find beginning of another run of changes.
 	 * Also keep track of the corresponding point in the other file.
 	 */
! 	 while ($i < $len && $changed[$i] == 0)
 	 {
! 		while ($other_changed[$j++])
! 		 continue;
! 		$i++;
 	 }
 
--- 354,374 ----
 	 * Scan forwards to find beginning of another run of changes.
 	 * Also keep track of the corresponding point in the other file.
+ 	 *
+ 	 * Throughout this code, $i and $j are adjusted together so that
+ 	 * the first $i elements of $changed and the first $j elements
+ 	 * of $other_changed both contain the same number of zeros
+ 	 * (unchanged lines).
+ 	 * Furthermore, $j is always kept so that $j == $other_len or
+ 	 * $other_changed[$j] == false.
 	 */
! 	 while ($j < $other_len && $other_changed[$j])
! 		$j++;
! 	 
! 	 while ($i < $len && ! $changed[$i])
 	 {
! 		USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
! 		$i++; $j++;
! 		while ($j < $other_len && $other_changed[$j])
! 		 $j++;
 	 }
 
***************
*** 361,368 ****
 
 	 // Find the end of this run of changes.
! 	 while (isset($changed[++$i]))
 		continue;
- 	 while ($other_changed[$j])
- 		$j++;
 
 	 do
--- 379,384 ----
 
 	 // Find the end of this run of changes.
! 	 while (++$i < $len && $changed[$i])
 		continue;
 
 	 do
***************
*** 379,390 ****
 		 * This merges with previous changed regions.
 		 */
! 		while ($start && $lines[$start - 1] == $lines[$i - 1])
 		 {
 		 $changed[--$start] = 1;
 		 $changed[--$i] = false;
! 		 while ($changed[$start - 1])
 			$start--;
 		 while ($other_changed[--$j])
 			continue;
 		 }
 
--- 395,408 ----
 		 * This merges with previous changed regions.
 		 */
! 		while ($start > 0 && $lines[$start - 1] == $lines[$i - 1])
 		 {
 		 $changed[--$start] = 1;
 		 $changed[--$i] = false;
! 		 while ($start > 0 && $changed[$start - 1])
 			$start--;
+ 		 USE_ASSERTS && assert('$j > 0');
 		 while ($other_changed[--$j])
 			continue;
+ 		 USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
 		 }
 
***************
*** 394,398 ****
 		 * CORRESPONDING == LEN means no such point has been found.
 		 */
! 		$corresponding = empty($other_changed[$j - 1]) ? $len : $i;
 
 		/*
--- 412,416 ----
 		 * CORRESPONDING == LEN means no such point has been found.
 		 */
! 		$corresponding = $j < $other_len ? $i : $len;
 
 		/*
***************
*** 403,414 ****
 		 * the changed region is moved forward as far as possible.
 		 */
! 		while ($i != $len && $lines[$start] == $lines[$i])
 		 {
 		 $changed[$start++] = false;
 		 $changed[$i++] = 1;
! 		 while ($changed[$i])
 			$i++;
! 		 while ($other_changed[++$j])
 			$corresponding = $i;
 		 }
 	 }
--- 421,439 ----
 		 * the changed region is moved forward as far as possible.
 		 */
! 		while ($i < $len && $lines[$start] == $lines[$i])
 		 {
 		 $changed[$start++] = false;
 		 $changed[$i++] = 1;
! 		 while ($i < $len && $changed[$i])
 			$i++;
! 
! 		 USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
! 		 $j++;
! 		 if ($j < $other_len && $other_changed[$j])
! 		 {
 			$corresponding = $i;
+ 			while ($j < $other_len && $other_changed[$j])
+ 			 $j++;
+ 		 }
 		 }
 	 }
***************
*** 423,428 ****
--- 448,455 ----
 		$changed[--$start] = 1;
 		$changed[--$i] = 0;
+ 		USE_ASSERTS && assert('$j > 0');
 		while ($other_changed[--$j])
 		 continue;
+ 		USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
 	 }
 	 }
***************
*** 482,486 ****
 	 { // Was an add, turn it into a delete.
 		$nadd = sizeof($edit);
! 		if ($nadd == 0) die("assertion error");
 		$edit = -$nadd;
 	 }
--- 509,513 ----
 	 { // Was an add, turn it into a delete.
 		$nadd = sizeof($edit);
! 		USE_ASSERTS && assert ($nadd > 0);
 		$edit = -$nadd;
 	 }

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv3958
Modified Files:
	stdlib.php transform.php 
Log Message:
removed references, added footnotes
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** stdlib.php	2001年02月04日 18:19:30	1.22
--- stdlib.php	2001年02月07日 17:21:33	1.23
***************
*** 170,174 ****
 	 $link['link'] = "<a href=\"$ScriptUrl$match[1]\">$linkname</a>";
 } elseif (preg_match("#^\d+$#", $URL)) {
! $link['type'] = "reference-$linktype";
 	 $link['link'] = $URL;
 } else {
--- 170,174 ----
 	 $link['link'] = "<a href=\"$ScriptUrl$match[1]\">$linkname</a>";
 } elseif (preg_match("#^\d+$#", $URL)) {
! $link['type'] = "footnote-$linktype";
 	 $link['link'] = $URL;
 } else {
Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** transform.php	2001年02月07日 16:38:33	1.10
--- transform.php	2001年02月07日 17:21:33	1.11
***************
*** 266,269 ****
--- 266,271 ----
 function wtt_bracketlinks($line, &$trfrm)
 {
+ static $footnotes = array();
+ 
 // protecting [[
 $n = $ntok = $trfrm->tokencounter;
***************
*** 277,281 ****
 while ($n < $ntok) {
 	$link = ParseAndLink($trfrm->replacements[$n]);
! 	$trfrm->replacements[$n++] = $link['link'];
 }
 
--- 279,294 ----
 while ($n < $ntok) {
 	$link = ParseAndLink($trfrm->replacements[$n]);
! 	if (strpos($link['type'], 'footnote') === false) {
! 	 $trfrm->replacements[$n] = $link['link'];
! 	} else {
! 	 $ftnt = $link['link'];
! 	 if (isset($footnotes[$ftnt])) {
! 	 $trfrm->replacements[$n] = "<A NAME=\"footnote-$ftnt\"></A><A HREF=\"#footnote-rev-$ftnt\">[$ftnt]</A>";
! 	 } else { // first encounter of [x]
! 	 $trfrm->replacements[$n] = "<A NAME=\"footnote-rev-$ftnt\"></A><SUP><A HREF=\"#footnote-$ftnt\">[$ftnt]</A></SUP>";
! 	 $footnotes[$ftnt] = 1;
! 	 }
! 	}
! 	$n++;
 }
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv27056/lib
Modified Files:
	transform.php 
Log Message:
clean up of SetHTMLMode() -- patch from Neil Brown
Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** transform.php	2001年02月04日 18:22:34	1.9
--- transform.php	2001年02月07日 16:38:33	1.10
***************
*** 91,95 ****
 
 } elseif ($tagtype == NESTED_LEVEL) {
! if ($level < $this->stack->cnt()) {
 // $tag has fewer nestings (old: tabs) than stack,
 	 // reduce stack to that tab count
--- 91,95 ----
 
 } elseif ($tagtype == NESTED_LEVEL) {
! if ($level <= $this->stack->cnt()) {
 // $tag has fewer nestings (old: tabs) than stack,
 	 // reduce stack to that tab count
***************
*** 111,115 ****
 	 }
 
! } elseif ($level > $this->stack->cnt()) {
 // we add the diff to the stack
 // stack might be zero
--- 111,115 ----
 	 }
 
! } else { // $level > $this->stack->cnt()
 // we add the diff to the stack
 // stack might be zero
***************
*** 122,139 ****
 }
 }
- 
- } else { // $level == $stack->cnt()
- if ($tag == $this->stack->top()) {
- return; // same tag? -> nothing to do
- } else {
- 	 // different tag - close old one, add new one
- $closetag = $this->stack->pop();
- $retvar .= "</$closetag>\n";
- $retvar .= "<$tag>\n";
- $this->stack->push($tag);
- }
 }
 
- 
 } else { // unknown $tagtype
 ExitWiki ("Passed bad tag type value in SetHTMLOutputMode");
--- 122,127 ----

Update of /cvsroot/phpwiki/phpwiki/admin
In directory usw-pr-cvs1:/tmp/cvs-serv11175/admin
Modified Files:
	zip.php 
Log Message:
Fix bug #131024: full zip dump hangs when using dbalib.php (and
perhaps other) backends. 
Index: zip.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/zip.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** zip.php	2000年11月08日 15:30:16	1.1
--- zip.php	2001年02月07日 02:23:24	1.2
***************
*** 1,5 ****
 <?php // $Id$
 
! function MailifyPage ($pagehash, $archive = false)
 {
 global $SERVER_ADMIN, $ArchivePageStore;
--- 1,5 ----
 <?php // $Id$
 
! function MailifyPage ($pagehash, $oldpagehash = false)
 {
 global $SERVER_ADMIN, $ArchivePageStore;
***************
*** 13,23 ****
 $head .= "Mime-Version: 1.0 (Produced by PhpWiki 1.1.x)\r\n";
 
! if ($archive)
 {
! $oldpage = RetrievePage($archive, $pagehash['pagename'], $ArchivePageStore);
! if (is_array($oldpage))
! 	 return $head . MimeMultipart(array(MimeifyPage($oldpage),
! 					 MimeifyPage($pagehash)));
 }
 return $head . MimeifyPage($pagehash);
 }
--- 13,22 ----
 $head .= "Mime-Version: 1.0 (Produced by PhpWiki 1.1.x)\r\n";
 
! if (is_array($oldpagehash))
 {
! return $head . MimeMultipart(array(MimeifyPage($oldpagehash),
! 				 MimeifyPage($pagehash)));
 }
+ 
 return $head . MimeifyPage($pagehash);
 }
***************
*** 38,42 ****
 
 if ($include_archive) {
- $dba = OpenDataBase($ArchivePageStore);
 $zipname = "wikidb.zip";
 }
--- 37,40 ----
***************
*** 48,53 ****
--- 46,58 ----
 set_time_limit(30);	// Reset watchdog.
 $pagehash = RetrievePage($dbi, $pagename, $WikiPageStore);
+ 
 if (! is_array($pagehash))
 	continue;
+ 
+ if ($include_archive)
+ 	$oldpagehash = RetrievePage($dbi, $pagename, $ArchivePageStore);
+ else
+ $oldpagehash = false;
+ 
 $attrib = array('mtime' => $pagehash['lastmodified'],
 		 'is_ascii' => 1);
***************
*** 55,59 ****
 	 $attrib['write_protected'] = 1;
 
! $content = MailifyPage($pagehash, $dba);
 		 
 $zip->addRegularFile( rawurlencode($pagehash['pagename']),
--- 60,64 ----
 	 $attrib['write_protected'] = 1;
 
! $content = MailifyPage($pagehash, $oldpagehash);
 		 
 $zip->addRegularFile( rawurlencode($pagehash['pagename']),
***************
*** 61,67 ****
 }
 $zip->finish();
- 
- if ($dba)
- CloseDataBase($dba);
 }
 
--- 66,69 ----

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv24559/lib
Modified Files:
	ziplib.php 
Log Message:
Jeff emerges from his hole long enough to fix a trivial bug which causes
trouble when trying to restore a wiki from a zip archive which uses the
'binary' type MIME encoding. This is only pertinent for zip archives
generated by certain old beta versions of phpwiki.
Index: ziplib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ziplib.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ziplib.php	2001年01月01日 23:13:32	1.2
--- ziplib.php	2001年02月06日 23:16:31	1.3
***************
*** 672,676 ****
 if ($encoding == 'quoted-printable')
 $data = QuotedPrintableDecode($data);
! else if ($encoding && $encoding == 'binary')
 die("Unknown encoding type: $encoding");
 
--- 672,676 ----
 if ($encoding == 'quoted-printable')
 $data = QuotedPrintableDecode($data);
! else if ($encoding && $encoding != 'binary')
 die("Unknown encoding type: $encoding");
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv27282
Modified Files:
	stdlib.php 
Log Message:
moved SetHTMLOutputMode(), RenderQuickSearch(), RenderFullSearch(), and RenderMostPopular() to transform.php
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** stdlib.php	2001年01月15日 12:32:57	1.21
--- stdlib.php	2001年02月04日 18:19:30	1.22
***************
*** 76,110 ****
 }
 
- 
- function RenderQuickSearch($value = '') {
- global $ScriptUrl;
- return "<form action=\"$ScriptUrl\">\n" .
- 	 "<input type=text size=30 name=search value=\"$value\">\n" .
- 	 "<input type=submit value=\"". gettext("Search") .
- 	 "\"></form>\n";
- }
- 
- function RenderFullSearch($value = '') {
- global $ScriptUrl;
- return "<form action=\"$ScriptUrl\">\n" .
- 	 "<input type=text size=30 name=full value=\"$value\">\n" .
- 	 "<input type=submit value=\"". gettext("Search") .
- 	 "\"></form>\n";
- }
- 
- function RenderMostPopular() {
- global $ScriptUrl, $dbi;
- 
- $query = InitMostPopular($dbi, MOST_POPULAR_LIST_LENGTH);
- $result = "<DL>\n";
- while ($qhash = MostPopularNextMatch($dbi, $query)) {
- 	 $result .= "<DD>$qhash[hits] ... " . LinkExistingWikiWord($qhash['pagename']) . "\n";
- }
- $result .= "</DL>\n";
- 
- return $result;
- }
- 
- 
 function ParseAdminTokens($line) {
 global $ScriptUrl;
--- 76,79 ----
***************
*** 158,254 ****
 } 
 // end class definition
- 
- 
- // I couldn't move this to lib/config.php because it wasn't declared yet.
- $stack = new Stack;
- 
- /* 
- Wiki HTML output can, at any given time, be in only one mode.
- It will be something like Unordered List, Preformatted Text,
- plain text etc. When we change modes we have to issue close tags
- for one mode and start tags for another.
- 
- $tag ... HTML tag to insert
- $tagtype ... ZERO_LEVEL - close all open tags before inserting $tag
- 		 NESTED_LEVEL - close tags until depths match
- $level ... nesting level (depth) of $tag
- 		 nesting is arbitrary limited to 10 levels
- */
- 
- function SetHTMLOutputMode($tag, $tagtype, $level)
- {
- global $stack;
- $retvar = '';
- 
- if ($tagtype == ZERO_LEVEL) {
- // empty the stack until $level == 0;
- if ($tag == $stack->top()) {
- return; // same tag? -> nothing to do
- }
- while ($stack->cnt() > 0) {
- $closetag = $stack->pop();
- $retvar .= "</$closetag>\n";
- }
- 
- if ($tag) {
- $retvar .= "<$tag>\n";
- $stack->push($tag);
- }
- 
- 
- } elseif ($tagtype == NESTED_LEVEL) {
- if ($level < $stack->cnt()) {
- // $tag has fewer nestings (old: tabs) than stack,
- 	 // reduce stack to that tab count
- while ($stack->cnt() > $level) {
- $closetag = $stack->pop();
- if ($closetag == false) {
- //echo "bounds error in tag stack";
- break;
- }
- $retvar .= "</$closetag>\n";
- }
- 
- 	 // if list type isn't the same,
- 	 // back up one more and push new tag
- 	 if ($tag != $stack->top()) {
- 	 $closetag = $stack->pop();
- 	 $retvar .= "</$closetag><$tag>\n";
- 	 $stack->push($tag);
- 	 }
- 
- } elseif ($level > $stack->cnt()) {
- // we add the diff to the stack
- // stack might be zero
- while ($stack->cnt() < $level) {
- $retvar .= "<$tag>\n";
- $stack->push($tag);
- if ($stack->cnt() > 10) {
- // arbitrarily limit tag nesting
- ExitWiki(gettext ("Stack bounds exceeded in SetHTMLOutputMode"));
- }
- }
- 
- } else { // $level == $stack->cnt()
- if ($tag == $stack->top()) {
- return; // same tag? -> nothing to do
- } else {
- 	 // different tag - close old one, add new one
- $closetag = $stack->pop();
- $retvar .= "</$closetag>\n";
- $retvar .= "<$tag>\n";
- $stack->push($tag);
- }
- }
- 
- 
- } else { // unknown $tagtype
- ExitWiki ("Passed bad tag type value in SetHTMLOutputMode");
- }
- 
- return $retvar;
- }
- // end SetHTMLOutputMode
- 
 
 
--- 127,130 ----

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv27383
Modified Files:
	transform.php 
Log Message:
redesign of transfrom.php: modularization
markup functions are now registered to WikiTransform object
first working version.
removed HTML mode "|", tab markup, and %%ADMIN-%% tokens.
(more functionality to be added)
Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** transform.php	2001年01月04日 18:34:15	1.8
--- transform.php	2001年02月04日 18:22:34	1.9
***************
*** 1,6 ****
 <?php rcs_id('$Id$');
- // expects $pagehash and $html to be set
 
! function tokenize($str, $pattern, &$orig, &$ntokens) {
 global $FieldSeparator;
 // Find any strings in $str that match $pattern and
--- 1,261 ----
 <?php rcs_id('$Id$');
 
! define('WT_TOKENIZER', 1);
! define('WT_SIMPLE_MARKUP', 2);
! define('WT_MODE_MARKUP', 3);
! 
! class WikiTransform
! {
! /*
! function WikiTransform() -- init
! 
! function register($type, $function)
! 	Registers transformer functions
! 	This should be done *before* calling do_transform
! 
! 	$type ... one of WT_TOKENIZER, WT_SIMPLE_MARKUP, WT_MODE_MARKUP
! 		 Currently on WT_MODE_MARKUP has a special meaning.
! 		 If one WT_MODE_MARKUP really sets the html mode, then
! 		 all successive WT_MODE_MARKUP functions are skipped
! 
! 	$function ... function name
! 
! function SetHTMLMode($tag, $tagtype, $level)
! 	Wiki HTML output can, at any given time, be in only one mode.
! 	It will be something like Unordered List, Preformatted Text,
! 	plain text etc. When we change modes we have to issue close tags
! 	for one mode and start tags for another.
! 	SetHTMLMode takes care of this.
! 
! 	$tag ... HTML tag to insert
! 	$tagtype ... ZERO_LEVEL - close all open tags before inserting $tag
! 		 NESTED_LEVEL - close tags until depths match
! 	$level ... nesting level (depth) of $tag
! 		 nesting is arbitrary limited to 10 levels
! 
! function do_transform($html, $content)
! 	contains main-loop and calls transformer functions
! 
! 	$html ... HTML header (if needed, otherwise '')
! 	$content ... wiki markup as array of lines
! */
! 
! 
! // public variables (only meaningful during do_transform)
! var $linenumber;	// current linenumber
! var $replacements;	// storage for tokenized strings of current line
! var $tokencounter;	// counter of $replacements array
! 
! // private variables
! var $content;	// wiki markup, array of lines
! var $mode_set;	// stores if a HTML mode for this line has been set
! var $trfrm_func;	// array of registered functions
! var $stack;		// stack for SetHTMLMode (keeping track of open tags)
! 
! // init function
! function WikiTransform()
! {
! $this->trfrm_func = array();
! $this->stack = new Stack;
! }
! 
! // register transformation functions
! function register($type, $function)
! {
! $this->trfrm_func[] = array ($type, $function);
! }
! 
! // sets current mode like list, preformatted text, plain text, ...
! // takes care of closing (open) tags
! function SetHTMLMode($tag, $tagtype, $level)
! {
! $this->mode_set = 1;	// in order to prevent other mode markup
! 				// to be executed
! $retvar = '';
! 
! if ($tagtype == ZERO_LEVEL) {
! // empty the stack until $level == 0;
! if ($tag == $this->stack->top()) {
! return; // same tag? -> nothing to do
! }
! while ($this->stack->cnt() > 0) {
! $closetag = $this->stack->pop();
! $retvar .= "</$closetag>\n";
! }
! 
! if ($tag) {
! $retvar .= "<$tag>\n";
! $this->stack->push($tag);
! }
! 
! 
! } elseif ($tagtype == NESTED_LEVEL) {
! if ($level < $this->stack->cnt()) {
! // $tag has fewer nestings (old: tabs) than stack,
! 	 // reduce stack to that tab count
! while ($this->stack->cnt() > $level) {
! $closetag = $this->stack->pop();
! if ($closetag == false) {
! //echo "bounds error in tag stack";
! break;
! }
! $retvar .= "</$closetag>\n";
! }
! 
! 	 // if list type isn't the same,
! 	 // back up one more and push new tag
! 	 if ($tag != $this->stack->top()) {
! 	 $closetag = $this->stack->pop();
! 	 $retvar .= "</$closetag><$tag>\n";
! 	 $this->stack->push($tag);
! 	 }
! 
! } elseif ($level > $this->stack->cnt()) {
! // we add the diff to the stack
! // stack might be zero
! while ($this->stack->cnt() < $level) {
! $retvar .= "<$tag>\n";
! $this->stack->push($tag);
! if ($this->stack->cnt() > 10) {
! // arbitrarily limit tag nesting
! ExitWiki(gettext ("Stack bounds exceeded in SetHTMLOutputMode"));
! }
! }
! 
! } else { // $level == $stack->cnt()
! if ($tag == $this->stack->top()) {
! return; // same tag? -> nothing to do
! } else {
! 	 // different tag - close old one, add new one
! $closetag = $this->stack->pop();
! $retvar .= "</$closetag>\n";
! $retvar .= "<$tag>\n";
! $this->stack->push($tag);
! }
! }
! 
! 
! } else { // unknown $tagtype
! ExitWiki ("Passed bad tag type value in SetHTMLOutputMode");
! }
! 
! return $retvar;
! }
! // end SetHTMLMode
! 
! 
! // work horse and main loop
! // this function does the transform from wiki markup to HTML
! function do_transform($html, $content)
! {
! global $FieldSeparator;
! 
! $this->content = $content;
! 
! // Loop over all lines of the page and apply transformation rules
! $numlines = count($this->content);
! for ($lnum = 0; $lnum < $numlines; $lnum++)
! {
! 	 $this->tokencounter = 0;
! 	 $this->replacements = array();
! 	 $this->linenumber = $lnum;
! 	 $line = $this->content[$lnum];
! 
! 	 // blank lines clear the current mode
! 	 if (!strlen($line) || $line == "\r") {
! $html .= $this->SetHTMLMode('', ZERO_LEVEL, 0);
! continue;
! 	 }
! 
! 	 $this->mode_set = 0;
! 
! 	 // main loop applying all registered functions
! 	 // tokenizers, markup, html mode, ...
! 	 // functions are executed in order of registering
! 	 for ($func = 0; $func < count($this->trfrm_func); $func++) {
! 	 // if HTMLmode is already set then skip all following
! 	 // WT_MODE_MARKUP functions
! 	 if ($this->mode_set &&
! 	 ($this->trfrm_func[$func][0] == WT_MODE_MARKUP)) {
! 	 continue;
! 	 }
! 	 // call registered function
! 	 $line = $this->trfrm_func[$func][1]($line, $this);
! 	 }
! 
! 	 // Replace tokens ($replacements was filled by wtt_* functions)
! 	 for ($i = 0; $i < $this->tokencounter; $i++) {
! 	 $line = str_replace($FieldSeparator.$FieldSeparator.$i.$FieldSeparator, $this->replacements[$i], $line);
! 	 }
! 
! 	 $html .= $line . "\n";
! }
! // close all tags
! $html .= $this->SetHTMLMode('', ZERO_LEVEL, 0);
! 
! return $html;
! }
! // end do_transfrom()
! 
! }
! // end class WikiTransform
! 
! 
! //////////////////////////////////////////////////////////
! 
! $transform = new WikiTransform;
! 
! // register functions
! // functions are applied in order of registering
! 
! $transform->register(WT_TOKENIZER, 'wtt_bracketlinks');
! $transform->register(WT_TOKENIZER, 'wtt_urls');
! $transform->register(WT_TOKENIZER, 'wtt_bumpylinks');
! 
! $transform->register(WT_SIMPLE_MARKUP, 'wtm_htmlchars');
! $transform->register(WT_SIMPLE_MARKUP, 'wtm_hr');
! $transform->register(WT_SIMPLE_MARKUP, 'wtm_linebreak');
! $transform->register(WT_SIMPLE_MARKUP, 'wtm_bold_italics');
! $transform->register(WT_SIMPLE_MARKUP, 'wtm_title_search');
! $transform->register(WT_SIMPLE_MARKUP, 'wtm_fulltext_search');
! $transform->register(WT_SIMPLE_MARKUP, 'wtm_mostpopular');
! 
! $transform->register(WT_MODE_MARKUP, 'wtm_list_ul');
! $transform->register(WT_MODE_MARKUP, 'wtm_list_ol');
! $transform->register(WT_MODE_MARKUP, 'wtm_list_dl');
! $transform->register(WT_MODE_MARKUP, 'wtm_preformatted');
! $transform->register(WT_MODE_MARKUP, 'wtm_headings');
! $transform->register(WT_MODE_MARKUP, 'wtm_paragraph');
! 
! $html = $transform->do_transform($html, $pagehash['content']);
! 
! 
! /*
! Requirements for functions registered to WikiTransform:
! 
! Signature: function wtm_xxxx($line, &$transform)
! 
! $line ... current line containing wiki markup
! 	(Note: it may already contain HTML from other transform functions)
! &$transform ... WikiTransform object -- public variables of this
! 	object and their use see above.
! 
! Functions have to return $line (doesn't matter if modified or not)
! All conversion should take place inside $line.
! 
! Tokenizer functions should use $transform->replacements to store
! the replacement strings. Also, they have to keep track of
! $transform->tokencounter. See functions below. Back substitution
! of tokenized strings is done by do_transform().
! */
! 
! 
! 
! //////////////////////////////////////////////////////////
! // Tokenizer functions
! 
! // helper function which does actual tokenizing and is
! // called by other wtt_* functions
! function wt_tokenize($str, $pattern, &$orig, &$ntokens) {
 global $FieldSeparator;
 // Find any strings in $str that match $pattern and
***************
*** 19,258 ****
 
 
! // Prepare replacements for references [\d+]
! for ($i = 1; $i < (NUM_LINKS + 1); $i++) {
! if (! empty($pagehash['refs'][$i])) {
! if (preg_match("/($InlineImages)$/i", $pagehash['refs'][$i])) {
! // embed images
! $embedded[$i] = LinkImage($pagehash['refs'][$i]);
! } else {
! // ordinary link
! $embedded[$i] = LinkURL($pagehash['refs'][$i], "[$i]");
! }
 }
- }
 
! 
! // only call these once, for efficiency
! $quick_search_box = RenderQuickSearch();
! $full_search_box = RenderFullSearch();
! $most_popular_list = RenderMostPopular();
! 
! 
! // Loop over all lines of the page and apply transformation rules
! $numlines = count($pagehash["content"]);
! 
! for ($index = 0; $index < $numlines; $index++) {
! unset($tokens);
! unset($replacements);
! $ntokens = 0;
! $replacements = array();
! 
! $tmpline = $pagehash['content'][$index];
! 
! if (!strlen($tmpline) || $tmpline == "\r") {
! // this is a blank line, send <p>
! $html .= SetHTMLOutputMode('', ZERO_LEVEL, 0);
! continue;
! }
! 
! /* If your web server is not accessble to the general public, you may
! allow this code below, which allows embedded HTML. If just anyone can reach
! your web server it is highly advised that you do not allow this.
! 
! elseif (preg_match("/(^\|)(.*)/", $tmpline, $matches)) {
! // HTML mode
! $html .= SetHTMLOutputMode("", ZERO_LEVEL, 0);
! $html .= $matches[2];
! continue;
 }
- */
 
 
- //////////////////////////////////////////////////////////
- // New linking scheme: links are in brackets. This will
- // emulate typical HTML linking as well as Wiki linking.
- 	
- // First need to protect [[. 
- $oldn = $ntokens;
- $tmpline = tokenize($tmpline, '\[\[', $replacements, $ntokens);
- while ($oldn < $ntokens)
- $replacements[$oldn++] = '[';
- 
- // Now process the [\d+] links which are numeric references	
- $oldn = $ntokens;
- $tmpline = tokenize($tmpline, '\[\s*\d+\s*\]', $replacements, $ntokens);
- while ($oldn < $ntokens) {
- 	 $num = (int) substr($replacements[$oldn], 1);
- if (! empty($embedded[$num]))
- $replacements[$oldn] = $embedded[$num];
- 	 $oldn++;
- }
 
! // match anything else between brackets 
! $oldn = $ntokens;
! $tmpline = tokenize($tmpline, '\[.+?\]', $replacements, $ntokens);
! while ($oldn < $ntokens) {
! 	$link = ParseAndLink($replacements[$oldn]);	
! 	$replacements[$oldn] = $link['link'];
! 	$oldn++;
! }
! 
! //////////////////////////////////////////////////////////
! // replace all URL's with tokens, so we don't confuse them
! // with Wiki words later. Wiki words in URL's break things.
! // URLs preceeded by a '!' are not linked
! 
! $tmpline = tokenize($tmpline, "!?\b($AllowedProtocols):[^\s<>\[\]\"'()]*[^\s<>\[\]\"'(),.?]", $replacements, $ntokens);
! while ($oldn < $ntokens) {
! if($replacements[$oldn][0] == '!')
! 	 $replacements[$oldn] = substr($replacements[$oldn], 1);
 	else
! 	 $replacements[$oldn] = LinkURL($replacements[$oldn]);
! $oldn++;
 }
 
! //////////////////////////////////////////////////////////
! // Link Wiki words
! // Wikiwords preceeded by a '!' are not linked
! 
! $oldn = $ntokens;
! $tmpline = tokenize($tmpline, "!?$WikiNameRegexp", $replacements, $ntokens);
! while ($oldn < $ntokens) {
! $old = $replacements[$oldn];
 if ($old[0] == '!') {
! 	 $replacements[$oldn] = substr($old,1);
 	} elseif (IsWikiPage($dbi, $old)) {
! 	 $replacements[$oldn] = LinkExistingWikiWord($old);
 	} else {
! 	 $replacements[$oldn] = LinkUnknownWikiWord($old);
 	}
! 	$oldn++;
 }
 
 
! //////////////////////////////////////////////////////////
! // escape HTML metachars
! $tmpline = str_replace('&', '&amp;', $tmpline);
! $tmpline = str_replace('>', '&gt;', $tmpline);
! $tmpline = str_replace('<', '&lt;', $tmpline);
 
- // four or more dashes to <hr>
- $tmpline = ereg_replace("^-{4,}", '<hr>', $tmpline);
 
! // %%% are linebreaks
! $tmpline = str_replace('%%%', '<br>', $tmpline);
 
! // bold italics (old way)
! $tmpline = preg_replace("|(''''')(.*?)(''''')|",
! "<strong><em>\2円</em></strong>", $tmpline);
 
! // bold (old way)
! $tmpline = preg_replace("|(''')(.*?)(''')|",
! "<strong>\2円</strong>", $tmpline);
 
! // bold
! $tmpline = preg_replace("|(__)(.*?)(__)|",
! "<strong>\2円</strong>", $tmpline);
 
! // italics
! $tmpline = preg_replace("|('')(.*?)('')|",
! "<em>\2円</em>", $tmpline);
 
 
- //////////////////////////////////////////////////////////
- // unordered, ordered, and dictionary list (using TAB)
 
! if (preg_match("/(^\t+)(.*?)(:\t)(.*$)/", $tmpline, $matches)) {
! // this is a dictionary list (<dl>) item
! $numtabs = strlen($matches[1]);
! $html .= SetHTMLOutputMode('dl', NESTED_LEVEL, $numtabs);
! 	 $tmpline = '';
! 	 if(trim($matches[2]))
! $tmpline = '<dt>' . $matches[2];
! 	 $tmpline .= '<dd>' . $matches[4];
! 
! } elseif (preg_match("/(^\t+)(\*|\d+|#)/", $tmpline, $matches)) {
! // this is part of a list (<ul>, <ol>)
! $numtabs = strlen($matches[1]);
! if ($matches[2] == '*') {
! $listtag = 'ul';
! } else {
! $listtag = 'ol'; // a rather tacit assumption. oh well.
! }
! $tmpline = preg_replace("/^(\t+)(\*|\d+|#)/", "", $tmpline);
! $html .= SetHTMLOutputMode($listtag, NESTED_LEVEL, $numtabs);
! $html .= '<li>';
 
 
! //////////////////////////////////////////////////////////
! // tabless markup for unordered, ordered, and dictionary lists
! // ul/ol list types can be mixed, so we only look at the last
! // character. Changes e.g. from "**#*" to "###*" go unnoticed.
! // and wouldn't make a difference to the HTML layout anyway.
! 
! // unordered lists <UL>: "*"
! } elseif (preg_match("/^([#*]*\*)[^#]/", $tmpline, $matches)) {
! // this is part of an unordered list
! $numtabs = strlen($matches[1]);
! $tmpline = preg_replace("/^([#*]*\*)/", '', $tmpline);
! $html .= SetHTMLOutputMode('ul', NESTED_LEVEL, $numtabs);
! $html .= '<li>';
! 
! // ordered lists <OL>: "#"
! } elseif (preg_match("/^([#*]*\#)/", $tmpline, $matches)) {
! // this is part of an ordered list
! $numtabs = strlen($matches[1]);
! $tmpline = preg_replace("/^([#*]*\#)/", "", $tmpline);
! $html .= SetHTMLOutputMode('ol', NESTED_LEVEL, $numtabs);
! $html .= '<li>';
! 
! // definition lists <DL>: ";text:text"
! } elseif (preg_match("/(^;+)(.*?):(.*$)/", $tmpline, $matches)) {
! // this is a dictionary list item
! $numtabs = strlen($matches[1]);
! $html .= SetHTMLOutputMode('dl', NESTED_LEVEL, $numtabs);
! 	 $tmpline = '';
! 	 if(trim($matches[2]))
! $tmpline = '<dt>' . $matches[2];
! 	 $tmpline .= '<dd>' . $matches[3];
 
 
- //////////////////////////////////////////////////////////
- // remaining modes: preformatted text, headings, normal text	
 
! } elseif (preg_match("/^\s+/", $tmpline)) {
! // this is preformatted text, i.e. <pre>
! $html .= SetHTMLOutputMode('pre', ZERO_LEVEL, 0);
 
- } elseif (preg_match("/^(!{1,3})[^!]/", $tmpline, $whichheading)) {
- 	 // lines starting with !,!!,!!! are headings
- 	 if($whichheading[1] == '!') $heading = 'h3';
- 	 elseif($whichheading[1] == '!!') $heading = 'h2';
- 	 elseif($whichheading[1] == '!!!') $heading = 'h1';
- 	 $tmpline = preg_replace("/^!+/", '', $tmpline);
- 	 $html .= SetHTMLOutputMode($heading, ZERO_LEVEL, 0);
 
! } else {
! // it's ordinary output if nothing else
! $html .= SetHTMLOutputMode('p', ZERO_LEVEL, 0);
 }
! 
! $tmpline = str_replace('%%Search%%', $quick_search_box, $tmpline);
! $tmpline = str_replace('%%Fullsearch%%', $full_search_box, $tmpline);
! $tmpline = str_replace('%%Mostpopular%%', $most_popular_list, $tmpline);
! if(defined('WIKI_ADMIN') && strstr($tmpline, '%%ADMIN-'))
! $tmpline = ParseAdminTokens($tmpline);
 
 
- ///////////////////////////////////////////////////////
- // Replace tokens
 
! for ($i = 0; $i < $ntokens; $i++)
! 	 $tmpline = str_replace($FieldSeparator.$FieldSeparator.$i.$FieldSeparator, $replacements[$i], $tmpline);
 
 
! $html .= $tmpline . "\n";
 }
 
! $html .= SetHTMLOutputMode('', ZERO_LEVEL, 0);
 ?>
--- 274,495 ----
 
 
! // New linking scheme: links are in brackets. This will
! // emulate typical HTML linking as well as Wiki linking.
! function wtt_bracketlinks($line, &$trfrm)
! {
! // protecting [[
! $n = $ntok = $trfrm->tokencounter;
! $line = wt_tokenize($line, '\[\[', $trfrm->replacements, $ntok);
! while ($n < $ntok) {
! $trfrm->replacements[$n++] = '[';
 }
 
! // match anything else between brackets 
! $line = wt_tokenize($line, '\[.+?\]', $trfrm->replacements, $ntok);
! while ($n < $ntok) {
! 	$link = ParseAndLink($trfrm->replacements[$n]);
! 	$trfrm->replacements[$n++] = $link['link'];
 }
 
+ $trfrm->tokencounter = $ntok;
+ return $line;
+ }
 
 
! // replace all URL's with tokens, so we don't confuse them
! // with Wiki words later. Wiki words in URL's break things.
! // URLs preceeded by a '!' are not linked
! function wtt_urls($line, &$trfrm)
! {
! global $AllowedProtocols;
! 
! $n = $ntok = $trfrm->tokencounter;
! $line = wt_tokenize($line, "!?\b($AllowedProtocols):[^\s<>\[\]\"'()]*[^\s<>\[\]\"'(),.?]", $trfrm->replacements, $ntok);
! while ($n < $ntok) {
! if($trfrm->replacements[$n][0] == '!')
! 	 $trfrm->replacements[$n] = substr($trfrm->replacements[$n], 1);
 	else
! 	 $trfrm->replacements[$n] = LinkURL($trfrm->replacements[$n]);
! $n++;
 }
+ 
+ $trfrm->tokencounter = $ntok;
+ return $line;
+ }
 
! // Link Wiki words (BumpyText)
! // Wikiwords preceeded by a '!' are not linked
! function wtt_bumpylinks($line, &$trfrm)
! {
! global $WikiNameRegexp, $dbi;
! 
! $n = $ntok = $trfrm->tokencounter;
! $line = wt_tokenize($line, "!?$WikiNameRegexp", $trfrm->replacements, $ntok);
! while ($n < $ntok) {
! $old = $trfrm->replacements[$n];
 if ($old[0] == '!') {
! 	 $trfrm->replacements[$n] = substr($old,1);
 	} elseif (IsWikiPage($dbi, $old)) {
! 	 $trfrm->replacements[$n] = LinkExistingWikiWord($old);
 	} else {
! 	 $trfrm->replacements[$n] = LinkUnknownWikiWord($old);
 	}
! 	$n++;
 }
 
+ $trfrm->tokencounter = $ntok;
+ return $line;
+ }
 
! // end of tokenizer functions
! //////////////////////////////////////////////////////////
 
 
! //////////////////////////////////////////////////////////
! // basic simple markup functions
 
! // escape HTML metachars
! function wtm_htmlchars($line, &$transformer)
! {
! $line = str_replace('&', '&amp;', $line);
! $line = str_replace('>', '&gt;', $line);
! $line = str_replace('<', '&lt;', $line);
! return($line);
! }
 
! // four or more dashes to <hr>
! function wtm_hr($line, &$transformer) {
! return ereg_replace("^-{4,}", '<hr>', $line);
! }
 
! // %%% are linebreaks
! function wtm_linebreak($line, &$transformer) {
! return str_replace('%%%', '<br>', $line);
! }
 
! // bold and italics
! function wtm_bold_italics($line, &$transformer) {
! $line = preg_replace('|(__)(.*?)(__)|', '<strong>2円</strong>', $line);
! $line = preg_replace("|('')(.*?)('')|", '<em>2円</em>', $line);
! return $line;
! }
 
 
 
! //////////////////////////////////////////////////////////
! // some tokens to be replaced by (dynamic) content
 
+ // wiki token: title search dialog
+ function wtm_title_search($line, &$transformer) {
+ global $ScriptUrl;
+ if (strpos($line, '%%Search%%') !== false) {
+ $html = "<form action=\"$ScriptUrl\">\n" .
+ 	 "<input type=text size=30 name=search>\n" .
+ 	 "<input type=submit value=\"". gettext("Search") .
+ 	 "\"></form>\n";
+ 	 $line = str_replace('%%Search%%', $html, $line);
+ }
+ return $line;
+ }
 
! // wiki token: fulltext search dialog
! function wtm_fulltext_search($line, &$transformer) {
! global $ScriptUrl;
! if (strpos($line, '%%Fullsearch%%') !== false) {
! $html = "<form action=\"$ScriptUrl\">\n" .
! 	 "<input type=text size=30 name=full\n" .
! 	 "<input type=submit value=\"". gettext("Search") .
! 	 "\"></form>\n";
! 	 $line = str_replace('%%Fullsearch%%', $html, $line);
! }
! return $line;
! }
 
+ // wiki token: mostpopular list
+ function wtm_mostpopular($line, &$transformer) {
+ global $ScriptUrl, $dbi;
+ if (strpos($line, '%%Mostpopular%%') !== false) {
+ 	 $query = InitMostPopular($dbi, MOST_POPULAR_LIST_LENGTH);
+ 	 $html = "<DL>\n";
+ 	 while ($qhash = MostPopularNextMatch($dbi, $query)) {
+ 	 $html .= "<DD>$qhash[hits] ... " . LinkExistingWikiWord($qhash['pagename']) . "\n";
+ 	 }
+ 	 $html .= "</DL>\n";
+ 	 $line = str_replace('%%Mostpopular%%', $html, $line);
+ }
+ return $line;
+ }
 
 
! //////////////////////////////////////////////////////////
! // mode markup functions
 
 
! // tabless markup for unordered, ordered, and dictionary lists
! // ul/ol list types can be mixed, so we only look at the last
! // character. Changes e.g. from "**#*" to "###*" go unnoticed.
! // and wouldn't make a difference to the HTML layout anyway.
! 
! // unordered lists <UL>: "*"
! // has to be registereed before list OL
! function wtm_list_ul($line, &$trfrm) {
! if (preg_match("/^([#*]*\*)[^#]/", $line, $matches)) {
! $numtabs = strlen($matches[1]);
! $line = preg_replace("/^([#*]*\*)/", '', $line);
! $html = $trfrm->SetHTMLMode('ul', NESTED_LEVEL, $numtabs) . '<li>';
! $line = $html . $line;
 }
! return $line;
! }
 
+ // ordered lists <OL>: "#"
+ function wtm_list_ol($line, &$trfrm) {
+ if (preg_match("/^([#*]*\#)/", $line, $matches)) {
+ $numtabs = strlen($matches[1]);
+ $line = preg_replace("/^([#*]*\#)/", "", $line);
+ $html = $trfrm->SetHTMLMode('ol', NESTED_LEVEL, $numtabs) . '<li>';
+ $line = $html . $line;
+ }
+ return $line;
+ }
 
 
! // definition lists <DL>: ";text:text"
! function wtm_list_dl($line, &$trfrm) {
! if (preg_match("/(^;+)(.*?):(.*$)/", $line, $matches)) {
! $numtabs = strlen($matches[1]);
! $line = $trfrm->SetHTMLMode('dl', NESTED_LEVEL, $numtabs);
! 	 if(trim($matches[2]))
! $line = '<dt>' . $matches[2];
! 	 $line .= '<dd>' . $matches[3];
! }
! return $line;
! }
 
+ // mode: preformatted text, i.e. <pre>
+ function wtm_preformatted($line, &$trfrm) {
+ if (preg_match("/^\s+/", $line)) {
+ $line = $trfrm->SetHTMLMode('pre', ZERO_LEVEL, 0) . $line;
+ }
+ return $line;
+ }
 
! // mode: headings, i.e. <h1>, <h2>, <h3>
! // lines starting with !,!!,!!! are headings
! function wtm_headings($line, &$trfrm) {
! if (preg_match("/^(!{1,3})[^!]/", $line, $whichheading)) {
! 	 if($whichheading[1] == '!') $heading = 'h3';
! 	 elseif($whichheading[1] == '!!') $heading = 'h2';
! 	 elseif($whichheading[1] == '!!!') $heading = 'h1';
! 	 $line = preg_replace("/^!+/", '', $line);
! 	 $line = $trfrm->SetHTMLMode($heading, ZERO_LEVEL, 0) . $line;
! }
! return $line;
 }
 
! // default mode: simple text paragraph
! function wtm_paragraph($line, &$trfrm) {
! $line = $trfrm->SetHTMLMode('p', ZERO_LEVEL, 0) . $line;
! return $line;
! }
 ?>

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv946
Modified Files:
	RecentVisitors 
Log Message:
Corrected Ari's name.
Index: RecentVisitors
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/RecentVisitors,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** RecentVisitors	2001年02月02日 03:21:46	1.4
--- RecentVisitors	2001年02月02日 03:51:58	1.5
***************
*** 1,5 ****
 Sign and date your name below!
 
! Arno Hollosi, Ari Aredridel, Jeff Dairiki, Steve Wainstead, the PhpWiki authors.
 
 
--- 1,5 ----
 Sign and date your name below!
 
! Arno Hollosi, Aredridel Stauck, Jeff Dairiki, Steve Wainstead, the PhpWiki authors.
 
 

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv30421
Modified Files:
	ConvertSpacesToTabs 
Log Message:
Added note that this page is largely obsolete.
Index: ConvertSpacesToTabs
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/ConvertSpacesToTabs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ConvertSpacesToTabs	2000年11月06日 16:14:43	1.4
--- ConvertSpacesToTabs	2001年02月02日 03:23:05	1.5
***************
*** 1,2 ****
--- 1,6 ----
+ You don't need to use tabs anymore in PhpWiki. Consider this page obsolete. See TextFormattingRules for how to use PhpWiki markup.
+ 
+ ----
+ 
 VariousBrowsers have trouble with the tab character used in the TextFormattingRules. If you can't type a tab, or, if you are fixing up a page written by someone who didn't type tabs, then you should have us convert spans of spaces to tabs for you. You request space to tab conversion with the checkbox that appears near the bottom of EditText and EditCopy pages. It looks something like this...
 

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv30205
Modified Files:
	RecentVisitors 
Log Message:
Added Ari.
Index: RecentVisitors
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/RecentVisitors,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** RecentVisitors	2000年08月10日 04:43:42	1.3
--- RecentVisitors	2001年02月02日 03:21:46	1.4
***************
*** 1,5 ****
 Sign and date your name below!
 
! Jeff Dairiki, Arno Hollosi, SteveWainstead, Php Wiki authors
 
 
--- 1,5 ----
 Sign and date your name below!
 
! Arno Hollosi, Ari Aredridel, Jeff Dairiki, Steve Wainstead, the PhpWiki authors.
 
 

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv29951
Modified Files:
	SteveWainstead 
Log Message:
Minor update.
Index: SteveWainstead
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/SteveWainstead,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** SteveWainstead	2000年10月18日 22:31:03	1.4
--- SteveWainstead	2001年02月02日 03:19:39	1.5
***************
*** 1,3 ****
! Hi. I built this WikiWikiWeb. I'm at http://wcsb.org/~swain/.
 
 Please report bugs to mailto:php...@li...
--- 1,3 ----
! Hi. I started building this WikiWikiWeb but many others help me now. I'm at http://wcsb.org/~swain/.
 
 Please report bugs to mailto:php...@li...

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv29781
Modified Files:
	ReleaseNotes 
Log Message:
Listed new features over version 1.0. There are a lot. They are big too.
Index: ReleaseNotes
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/ReleaseNotes,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ReleaseNotes	2000年11月06日 02:51:07	1.6
--- ReleaseNotes	2001年02月02日 03:18:44	1.7
***************
*** 1,2 ****
--- 1,21 ----
+ PhpWiki 1.2 is a huge advance over version 1.0:
+ 
+ * Database support for MySQL, Postgresql, mSQL, flat file and the new dba_ library in PHP4 is included.
+ * Internationalization: support for different languages, down to the source level, is included. German, Spanish, Swedish and Dutch are currently shipped with PhpWiki. An architecture is in place to easily add more languages.
+ * New linking schemes using square brackets in addition to the old style !BumpyText.
+ * Administration features include page locking, dumping the Wiki to a zip file, and deleting pages.
+ * A MostPopular page showing the most frequently hit pages.
+ * Full HTML compliance.
+ * Links at the bottom of pages describing relationships like incoming links from other pages and their hits, outgoing and their hits, and the most popular nearby pages.
+ * Color page diffs between the current and previous version.
+ * An info page to view page metadata.
+ * Far more customization capability for the admin.
+ * A templating system to separate the page HTML from the PHP code.
+ * New markup constructs for <B>, <I>, <DD>, <BR> and more.
+ * Tabless markup to supercede the older markup (both still supported).
+ 
+ 
+ ----
+ 
 PhpWiki 1.1.9 includes Spanish language pages, a full implementation for
 Postgresql, numerous bug fixes and more. See the HISTORY file for more

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv28177
Modified Files:
	README 
Log Message:
Updated: listed flat file Wiki as stable, included URL to bug list on
Sourceforge. 
Index: README
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** README	2000年12月12日 21:24:50	1.8
--- README	2001年02月02日 03:03:27	1.9
***************
*** 1,3 ****
- 
 This web application is licensed under the Gnu Public License, which
 should be included in the same directory as this README. A copy
--- 1,2 ----
***************
*** 9,12 ****
--- 8,14 ----
 See INSTALL.mSQL for using PhpWiki with mSQL.
 
+ For a list of current bugs see:
+ https://sourceforge.net/bugs/?group_id=6121
+ 
 The out-of-the-box version uses a dbm file in the /tmp directory; you may
 wish a more permanent place for yours, but make sure it's read/writable
***************
*** 15,21 ****
 NOTE: Not all database versions are equal. The MySQL and Postgresql
 implementations have the full set of features; DBM and mSQL are
! missing only a few, and the flat file implementation is alpha quality
! and waiting for your improvement. However all but the flat file
! version are suitable for production.
 
 index.php: the "main page", really a set of branching instructions
--- 17,27 ----
 NOTE: Not all database versions are equal. The MySQL and Postgresql
 implementations have the full set of features; DBM and mSQL are
! missing only a few, and the flat file implementation is solid
! and waiting for your improvement. All are suitable for production.
! 
! NOTE 2: Not all the admin functions are implemented, but the page
! locking sure is nice.
! 
! MANIFEST:
 
 index.php: the "main page", really a set of branching instructions
***************
*** 23,27 ****
 
 lib/config.php: configuration options, constants, global variables
! lib/db_filesystem.php alpha support for flat file Wiki	
 lib/dbmlib.php: database access functions for dbm files
 lib/display.php: display a page (this calls "lib/transform.php")
--- 29,33 ----
 
 lib/config.php: configuration options, constants, global variables
! lib/db_filesystem.php support for flat file Wiki	
 lib/dbmlib.php: database access functions for dbm files
 lib/display.php: display a page (this calls "lib/transform.php")

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv26867
Modified Files:
	INSTALL.pgsql 
Log Message:
Added comment about the warnings on loading; updated the info about
editing config.php, which was a little dated.
Index: INSTALL.pgsql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/INSTALL.pgsql,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** INSTALL.pgsql	2000年10月08日 19:19:59	1.6
--- INSTALL.pgsql	2001年02月02日 02:55:31	1.7
***************
*** 1,4 ****
! $Id$
 
 Installation instructions for PhpWiki with a Postgresql database
 
--- 1,19 ----
! ----------
! NOTE for the 1.2 release: You may see a few warnings when you first
! load the pages. They may look like this:
 
+ 
+ ***
+ Warning: PostgresSQL query failed: ERROR: ExecAppend: Fail to add null
+ value in not null attribute pagename in lib/pgsql.php on line 417
+ 
+ Inserting page ConvertSpacesToTabs, version 1 from text file
+ ***
+ 
+ This is not a problem since PhpWiki is trying to update a table that
+ tracks hits and links.
+ ----------
+ 
+ 
 Installation instructions for PhpWiki with a Postgresql database
 
***************
*** 18,22 ****
 
 (This is from a stock 6.2 Red Hat distro, which ships with an rpm of
! PHP 3.0.12,but should give you an idea. I had to add the line for
 .php).
 
--- 33,37 ----
 
 (This is from a stock 6.2 Red Hat distro, which ships with an rpm of
! PHP 3.0.12, but should give you an idea. I had to add the line for
 .php).
 
***************
*** 33,39 ****
 the INSTALL, the time comes to move to Postgresql.
 
! Edit lib/config.php and comment out the lines for DBM file usage; then
! uncomment the lines for Postgresql. The lines are clearly commented and 
! you should have no problem with this.
 
 Next you need to create a database called "wiki".
--- 48,53 ----
 the INSTALL, the time comes to move to Postgresql.
 
! Edit lib/config.php and edit $WhichDatabase for Postgresql. The lines
! are clearly commented and you should have no problem with this.
 
 Next you need to create a database called "wiki".
***************
*** 53,54 ****
--- 67,71 ----
 sw...@wc...
 
+ Report bugs to php...@li...
+ 
+ $Id$
\ No newline at end of file

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv27863
Modified Files:
	CREDITS 
Log Message:
fixed some mailto: links, added Pablo to spanish translation
Index: CREDITS
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/CREDITS,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** CREDITS	2001年01月31日 07:40:55	1.9
--- CREDITS	2001年02月01日 07:12:59	1.10
***************
*** 29,32 ****
--- 29,33 ----
 ;[ Sandino Araico Sánchez | mailto:sa...@sa... ] :
 ;: contributed Spanish translation
+ ;: Pablo added some updates
 
 ;[ Jon Åslund | mailto:d9...@na... ] :
***************
*** 39,49 ****
 ! Patches
 
! ;[Joel Uckelman | uck...@ia... ] :
 ;: ported the dbmlib.php to the new dba_* interface, which is the default in PHP 4.0.4 and later.
 
! ;[ Pablo Roca Rozas | pr...@cl... ] :
 ;: contributed a new logo image file and updated the Spanish translation
 
! ;[Scott R. Anderson | sr...@di... ] :
 ;: contributed a patch to allow authorized users' names to appear in RecentChanges.
 
--- 40,50 ----
 ! Patches
 
! ;[Joel Uckelman | mailto:uck...@ia... ] :
 ;: ported the dbmlib.php to the new dba_* interface, which is the default in PHP 4.0.4 and later.
 
! ;[ Pablo Roca Rozas | mailto:pr...@cl... ] :
 ;: contributed a new logo image file and updated the Spanish translation
 
! ;[Scott R. Anderson | mailto:sr...@di... ] :
 ;: contributed a patch to allow authorized users' names to appear in RecentChanges.
 

Update of /cvsroot/phpwiki/phpwiki/locale/es/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv27228/es/pgsrc
Modified Files:
	AgregarPaginas BuenEstilo BuscarPagina CajaDeArena 
	CambiosRecientes ComoUsarWiki ConvierteEspaciosEnTabs 
	EditarElTexto KBrown MasAcercadeLaMecanica MasPopulares 
	PhpWiki ReglasDeFormatoDeTexto VisitantesRecientes WabiSabi 
	WikiWikiWeb 
Log Message:
update to spanish locale by Pablo Roca Rozas
Index: AgregarPaginas
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/AgregarPaginas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** AgregarPaginas	2000年11月02日 21:15:33	1.1
--- AgregarPaginas	2001年02月01日 07:06:39	1.2
***************
*** 1,11 ****
! To add a new page to Wiki, all you have to do is come up with a meaningful title, capatalize all the words and StringThemTogetherLikeThis. Wiki automagically recognizes it as a hyperlink.
! 
! Then you can go ahead and ClickTheQuestionMark at the end of your new hyperlink, and the Wiki will give you a window for making the new page.
! 
! If you wish to add documents with complex markup to the Wiki, you might be better off providing a URL to it than trying to add the text of the document here, like so:
! 
! PhpWiki project homepage: http://wcsb.org/~swain/php/wiki/
! 
! El Wiki no soporta tags de HTML (ver ReglasDeFormatoDeTexto). <tags>son rendereadas solo como texto.</tags> el Wiki está hecho para ser tan simple como sea posible para promover su uso.
! 
! Note that there is a feature that your system administrator can enable to allow embedded HTML, but there are security risks involved.
--- 1,11 ----
! Para añadir una nueva página a Wiki, todo lo que tiene que hacer es empezar con un titulo significativo, capitalizar todas las palabras como EsteEsUnTituloCapitalizado. Wiki lo reconoce automáticamente como un hipervínculo.
! 
! Entonces se debe pulsar el ? al final de su hipervínculo, y el Wiki le dará una ventana para hacer la nueva página.
! 
! Si desea añadir al Wiki, documentos con formato muy complejo, es mejor que ponga una URL hacia el documento antes que añadir aqui el texto del documento, como:
! 
! Página web del proyecto PhpWiki: http://wcsb.org/~swain/php/wiki/
! 
! El Wiki no soporta HTML tags (ver ReglasDeFormatoDeTexto). <tags>son renderizados solo como texto.</tags> el Wiki está hecho para ser lo mas simple posible y así promover su uso.
! 
! Tenga en cuenta que existe la posibilidad de que el administrador del sistema pueda activar código HTML embebido, pero esto tiene riesgos de seguridad.
Index: BuenEstilo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/BuenEstilo,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** BuenEstilo	2000年11月02日 21:15:33	1.1
--- BuenEstilo	2001年02月01日 07:06:39	1.2
***************
*** 1,13 ****
! "Young writers often suppose that style is a garnish for the meat of 
! prose, a sauce by which a dull dish is made palatable. Style has no such 
! separate entity; it is nondetachable, unfilterable. The beginner should 
! approach style warily, realizing that it is himself he is approaching, no 
! other; and he should begin by turning resolutely away from all devices 
! that are popularly believed to indicate style--all mannerisms, tricks, 
! adornments. The approach to style is by way of plainness, simplicity, 
! orderliness, sincerity." 
! 
! --Strunk and White, "The Elements of Style"
! 
! ''And thus an American textbook, typical required reading for 10th-grade English students, unknowingly extols some virtues of WabiSabi''
! --scummings
--- 1,13 ----
! "Young writers often suppose that style is a garnish for the meat of 
! prose, a sauce by which a dull dish is made palatable. Style has no such 
! separate entity; it is nondetachable, unfilterable. The beginner should 
! approach style warily, realizing that it is himself he is approaching, no 
! other; and he should begin by turning resolutely away from all devices 
! that are popularly believed to indicate style--all mannerisms, tricks, 
! adornments. The approach to style is by way of plainness, simplicity, 
! orderliness, sincerity." 
! 
! --Strunk y White, "Los elementos del estilo"
! 
! ''And thus an American textbook, typical required reading for 10th-grade English students, unknowingly extols some virtues of WabiSabi''
! --scummings
Index: BuscarPagina
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/BuscarPagina,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** BuscarPagina	2000年11月02日 21:15:33	1.1
--- BuscarPagina	2001年02月01日 07:06:39	1.2
***************
*** 1,19 ****
! Aquí hay algunos buenos puntos para comenzar la búsqueda.
! 
! 	* ComoUsarWiki tiene una rápida introducción sobre el markup del Wiki.
! 	* CambiosRecientes Graabda automáticamente
! 	* MasAcercadeLaMecanica de navegar y editar en este servidor
! 
! 
! 
! Aquí hay una búsqueda de títulos. Intenta con algo como ''wiki'' 
! o ''sandwich''.
! 
! %%Search%%
! 
! Usa el siguiente para una búsqueda completa de texto. Esto toma unos pocos segundos. Los resultados mostrarán todas las líneas en una página dada que contengan un acierto.
! 
! %%Fullsearch%%
! 
! 
! 
--- 1,19 ----
! Aquí hay algunos buenos consejos para comenzar la búsqueda.
! 
! 	* ComoUsarWiki tiene una rápida introducción sobre el lenguaje de códigos de Wiki.
! 	* CambiosRecientes grabada automáticamente
! 	* MasAcercadeLaMecanica sobre navegar y editar en este servidor
! 
! 
! 
! Aquí hay una búsqueda de títulos. Intente con algo como ''wiki'' 
! o ''sandwich''.
! 
! %%Search%%
! 
! Use lo siguiente para una búsqueda completa de texto. Esto tarda unos pocos segundos. Los resultados mostrarán todas las líneas en una página dada que contengan un acierto.
! 
! %%Fullsearch%%
! 
! 
! 
Index: CajaDeArena
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/CajaDeArena,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CajaDeArena	2000年11月02日 21:15:33	1.1
--- CajaDeArena	2001年02月01日 07:06:39	1.2
***************
*** 1,4 ****
! Aquí pueden probar su Wiki.
! 
! Diviértanse :-)
! 
--- 1,4 ----
! Aquí pueden probar su Wiki.
! 
! Diviértanse :-)
! 
Index: CambiosRecientes
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/CambiosRecientes,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CambiosRecientes	2000年11月02日 21:15:33	1.1
--- CambiosRecientes	2001年02月01日 07:06:39	1.2
***************
*** 1,27 ****
! The most recently changed pages are listed below.
! 
! ____Day one (first day for this Wiki)
! * [AgregarPaginas]
! * [BuenEstilo]
! * [BuscarPagina]
! * [CajaDeArena]
! * [CambiosRecientes]
! * [ComoUsarWiki]
! * [ConvierteEspaciosEnTabs]
! * [EditarElTexto]
! * [KBrown]
! * [MasAcercadeLaMecanica]
! * [MasPopulares]
! * [PhpWiki]
! * [PrimeraPlana]
! * [ReglasDeFormatoDeTexto]
! * [SteveWainstead]
! * [VisitantesRecientes]
! * [WabiSabi]
! * [WikiWikiWeb]
! 
! Quick page search:
! %%Search%%
! ----
! 
! 
--- 1,27 ----
! Los cambios mas recientes son:
! 
! ____Dia uno (primer dia de este Wiki)
! * [AgregarPaginas]
! * [BuenEstilo]
! * [BuscarPagina]
! * [CajaDeArena]
! * [CambiosRecientes]
! * [ComoUsarWiki]
! * [ConvierteEspaciosEnTabs]
! * [EditarElTexto]
! * [KBrown]
! * [MasAcercadeLaMecanica]
! * [MasPopulares]
! * [PhpWiki]
! * [PaginaPrincipal]
! * [ReglasDeFormatoDeTexto]
! * [SteveWainstead]
! * [VisitantesRecientes]
! * [WabiSabi]
! * [WikiWikiWeb]
! 
! Busqueda rápida de páginas:
! %%Search%%
! ----
! 
! 
Index: ComoUsarWiki
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/ComoUsarWiki,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ComoUsarWiki	2000年11月02日 21:15:33	1.1
--- ComoUsarWiki	2001年02月01日 07:06:39	1.2
***************
*** 1,36 ****
! ''"Wiki wiki"'' means "quick" in Hawai'ian.
! 
! '''All you really need to know is:'''
! 
! 	* To edit any page click on the Edit Text link at the bottom of
! the page. You should do that right now, and read the source code of this
! page. It will make more sense.
! 	* You get italics by surrounding words with two single quotes on
! either side ''like this''.
! 	* You get '''bold text''' by using three quotes on either side.
! 	* And, '''''bold italics''''' with five.
! 	* You get bullets by using a tab and an asterick *
! 	* If you use Windows, you can't use your tab key. It's Bill Gates's fault. But you can check the little box that says Convert Spaces To Tabs. You can type a bunch of spaces and the Wiki will recognize them as a tab.
! 	* To have plain monospaced font, indent with a space:
! 
! this is a poem 
! about monospacing
! nothing rhymes with poem
! nothing rhymes with monospacing
! 
! 	* You can seperate paragraphs with an extra blank line. Example:
! 
! I am a paragraph.
! 
! I am a paragraph too. We're just very small paragraphs.
! 
! 
! 	* You can get horizontal rules with four or more dashes like this:
! ----
! 	* To create hyperlinks you just capitalize the words and string them together. Let's say you want to create a page about how Steve Wainstead eats worms. All you have to do is capitalize each word and string them together like this: SteveWainsteadEatsWorms. If the page does not exist yet a question mark appears after the link, inviting you to create the page: ThisPageShouldNotExist. (And please don't ruin the example by creating one.) 
! 	* To link to pages outside the Wiki, you can just type in the URL and Wiki will link it for you: http://www.nytimes.com/
! * To put images in, just provide the hyperlink in brackets like this: [[http://www.yourhost.yourdomain/images/picture.png]. Image URLs not in brackets will just appear as hyperlinks to the image.
! 	* Ahora estás listo para comenzar a AgregarPaginas.
! 
! ----
! A WikiWikiWeb is meant to be fast and easy to edit. It has very simple markup that you can read about in TextFormattingRules.
--- 1,36 ----
! ''"Wiki wiki"'' significa "rápido" en Hawaiano.
! 
! '''Lo que necesita saber es:'''
! 
! 	* Para editar cualquier página haga click en el vínculo que hay
! al final de la página. Debería hacer esto ahora y leer el código fuente
! de esta página. Se hará una idea mas clara de como funciona esto.
! 	* Se obtiene cursiva poniendo rodeando las palabras con dos comillas simples
! a cada lado ''como este''.
! 	* Se consigue '''texto en negrita''' usando tres simples comillas a ambos lados.
! 	* Y, '''''cursiva negrilla''''' con cinco.
! 	* Para tener una lista con puntos se hace poniendo un tablulador y un asterisco *
! 	* Si usa Windows, no se puede utilizar la tecla TAB. Es culpa de Bill Gates. Pero puede marcar el pequeño cuadrado que dice Convierte Espacios En Tabs. Se pueden poner muchos espacios y Wiki los reconocerá como un tabulador.
! 	* Para tener texto monoespaciado, indentelo con un espacio:
! 
! esto es un poema
! sobre monoespaciado
! nada rima con poema
! nada rima con monoespaciado
! 
! 	* Se pueden separar parrafos con una line en blanco. Ejemplo:
! 
! Yo soy un parrafo.
! 
! Yo tambien soy un parrafo. Ambos somos pequeños parrafos.
! 
! 
! 	* Se pueden poner lineas horizontales con cuatro o más guiones como estos:
! ----
! 	* Para crear hipervínculos solamente hay que poner las palabras juntas y capitalizarlas. Imaginemonos que quiere crear una página sobre como Steve Wainstead come gusanos. Todo lo que tiene que hacer es algo parecido a: SteveWainsteadComeGusanos. Si la página no existe, entonces aparecerá un simbolo ? después del vínculo, invitandole a crear la página: EstaPaginaNoDeberiaExistir. (Y por favor no arruine este ejemplo creando una aquí) 
! 	* Para vincular páginas fuera del Wiki, simplementa hay que poner la URL y Wiki lo vinculará por usted: http://www.nytimes.com/
! 	* Para poner imágenes, simplemente ponga el hipervínculo entre corchetes, por ejemplo: [[http://www.yourhost.yourdomain/images/picture.png]. Las URL de imagenes que no esten entre corchetes aparecerán como vínculos a la imagen.
! 	* Ahora está listo para comenzar a AgregarPaginas.
! 
! ----
! Un WikiWikiWeb está preparado para ser rápido y de facil edición. Tiene un código muy simple, sobre el cual se puede leer en ReglasDeFormatoDeTexto.
Index: ConvierteEspaciosEnTabs
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/ConvierteEspaciosEnTabs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ConvierteEspaciosEnTabs	2000年11月02日 21:15:33	1.1
--- ConvierteEspaciosEnTabs	2001年02月01日 07:06:39	1.2
***************
*** 1,19 ****
! VariousBrowsers have trouble with the tab character used in the TextFormattingRules. If you can't type a tab, or, if you are fixing up a page written by someone who didn't type tabs, then you should have us convert spans of spaces to tabs for you. You request space to tab conversion with the checkbox that appears near the bottom of EditText and EditCopy pages. It looks something like this...
! 
! [[o] I can't type tabs. Please ConvertSpacesToTabs for me when I save.
! 
! A span of spaces must be at least '''three''' spaces long to be recognized 
! as a tab. Use multiples of '''eight''' spaces to make multiple tabs. 
! Each span of eight spaces will convert to one tab. If the 
! last span comes up a little short, that's ok, as long as 
! there are at least three spaces in the last (only) span.
! 
! '''Check your work.''' This sort of heuristic can lead to 
! unexpected results. 
! -----
! [Maintenance note: This page is seen when the user clicks on the 
! "ConvertSpacesToTabs" link on any edit screen. It describes what happens 
! when you ask the system to do this, why you would want it to, and ways to 
! avoid the spaces-instead-of-tabs problem.]
! 
! 
--- 1,17 ----
! DiversosNavegadores tienen problemas al usar en caractaer TAB en las ReglasDeFormatoDeTexto. Si no puede escribir un TAB, o si está arreglando una página escrita por alguien que no halla puesto los TABs, entonces debería de permitir a Wiki convertir varios espacios en tabs. Usted solicita una conversion de espacios a tabs en el cuadro que aparece al final de las páginas EditarElTexto and EditarCopia. Tal y como...
! 
! [[o] No puedo escribir tabs. Por favor ConvierteEspaciosEnTabs por mi cuando salve.
! 
! Un grupo de espacios debe ser al menos '''tres''' espacios para ser reconocidos 
! como un tab. Use multiplos of '''ocho''' espacios para hacer multiples tabulaciones. 
! Cada grupo de ocho espacios será convertido a una tabulación. Aunque el último 
! grupo sea un poco mas pequeño no hay problema, si tiene al menos tres espacios.
! 
! '''Compruebe su trabajo.''' Sino puede obtener resultados inesperados. 
! -----
! [Nota: Esta página es vista cuando el usuario hace click sobre el
! enlave "ConvierteEspaciosEnTabs" en cualquier pantalla de edición. 
! Describe lo que sucede cuando se le pide al sistema hacer esto, y es
! el camino para evitar el problema de "espacios en vez de tabs".]
! 
! 
Index: EditarElTexto
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/EditarElTexto,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** EditarElTexto	2000年11月02日 21:15:33	1.1
--- EditarElTexto	2001年02月01日 07:06:39	1.2
***************
*** 1 ****
! Todas las páginas (excepto los resultados de búsquedas) tienen una liga hacia EditarElTexto en la parte de abajo. Al hacer click sobre esa liga se puede editar el texto que se está leyendo.
--- 1 ----
! Todas las páginas (excepto los resultados de búsquedas) tienen una enlace hacia EditarElTexto en la parte inferior. Al hacer click sobre este enlace se puede editar el texto que se está leyendo.
Index: KBrown
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/KBrown,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** KBrown	2000年11月02日 21:15:33	1.1
--- KBrown	2001年02月01日 07:06:39	1.2
***************
*** 1,6 ****
! Puse mi mejor esfuerzo para traducir esta página al español. 
! Me pueden encontrar en http://sandino.net y mailto:kb...@sa....
! 
! Por favor envíen reportes de bugs a mailto:php...@li...
! 
! 
--- 1,8 ----
! Puse mi mejor esfuerzo para traducir esta página al español. 
! Me pueden encontrar en http://sandino.net y mailto:kb...@sa....
! 
! Por favor envíen reportes de bugs a mailto:php...@li...
! 
! Ultima corrección por Pablo Roca (pr...@cl...) Enero 2001
! 
! 
Index: MasAcercadeLaMecanica
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/MasAcercadeLaMecanica,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MasAcercadeLaMecanica	2000年11月02日 21:15:33	1.1
--- MasAcercadeLaMecanica	2001年02月01日 07:06:39	1.2
***************
*** 1,17 ****
! PhpWiki is written in the server-side scripting language PHP, available from http://www.php.net/. PHP resembles C and Perl in its syntax, and functions much like ASP, EmbPerl or JSP.
! 
! PhpWiki consists of a dozen or so files of mixed PHP and HTML. The web pages that make up a WikiWikiWeb based on PHP live in a DBM file with backup copies of previous versions of pages stored in a second DBM file.
! 
! Every time a user hits the site the page requested is pulled from the DBM and rendered on the fly. The user only ever requests the file index.php, which then decides which other php files to include.
! 
! Links to pages in the wiki are automatically linked: PhpWiki. This might be the single most compelling aspect of a wiki, the ability to add pages simply by linking to them. The next most compelling thing is how easily external URL's link:
! 	# http://www.wcsb.org/
! 	# ftp://ftp.redhat.com/
! 	# news://news.mozilla.org/
! 
! Combined with one namespace and a simple markup, a Wiki exhibits many of the characteristics of WabiSabi.
! 
! PhpWiki is licensed under the Gnu General Public license, which you should be able to see here: http://www.gnu.org/copyleft/gpl.txt.
! 
! 
! 
--- 1,17 ----
! PhpWiki está escrito con el lenguaje de servidor PHP, disponible en http://www.php.net/. El PHP se asemeja a C y Perl en su sintaxis, y funciona muy parecido a ASP, EmbPerl o JSP.
! 
! PhpWiki consiste en mas o menos de una docena de ficheros mixtos PHP y HTML. Las páginas web de un WikiWikiWeb que se construyen en PHP residen en un fichero de base de datos con copias de seguridad de versiones previas, almacenadas en un segundo fichero.
! 
! Cada vez que el usuario haga click el el sitio web, la página solicitada es traida de la base de datos y renderizada al vuelo. El usuario solo solicita el fichero index.php, en donde se decide que otros fichero php se deben incluir.
! 
! Los vínculos a páginas Wiki son automáticamente realizados, como: PhpWiki. Este puede ser el aspecto mas importante de un Wiki, la capacidad de añadir páginas que se autoenlazan. Otro aspecto interesante es como se enlanzan facilmente URL's:
! 	# http://www.wcsb.org/
! 	# ftp://ftp.redhat.com/
! 	# news://news.mozilla.org/
! 
! Combinando un espacio de almacenamiento y un lenguaje de control sencillo, un Wiki expone muchas de las caracteristicas de WabiSabi.
! 
! PhpWiki es licenciado bajo GNU (Licencia Pública General), la cual se puede ver aquí: http://www.gnu.org/copyleft/gpl.txt.
! 
! 
! 
Index: MasPopulares
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/MasPopulares,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MasPopulares	2000年11月02日 21:15:33	1.1
--- MasPopulares	2001年02月01日 07:06:39	1.2
***************
*** 1,4 ****
! Las 20 páginas más populares de este wiki:
! (número de hits, nombre de la página)
! 
! %%Mostpopular%%
--- 1,4 ----
! Las 20 páginas más populares de este wiki:
! (número de hits, nombre de la página)
! 
! %%Mostpopular%%
Index: PhpWiki
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/PhpWiki,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PhpWiki	2000年11月02日 21:15:33	1.1
--- PhpWiki	2001年02月01日 07:06:39	1.2
***************
*** 1,6 ****
! You are using PhpWiki at this very moment. Incredible, ain't it?
! 
! Visit our home page at http://phpwiki.sourceforge.net/ and see PhpWiki
! in action at http://phpwiki.sourceforge.net/phpwiki/.
! 
! 
--- 1,6 ----
! Esta usando PhpWiki en este momento. ¿No es increible?
! 
! Visite nuestra web en http://phpwiki.sourceforge.net/ y vea PhpWiki
! en acción en http://phpwiki.sourceforge.net/phpwiki/.
! 
! 
Index: ReglasDeFormatoDeTexto
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/ReglasDeFormatoDeTexto,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ReglasDeFormatoDeTexto	2000年11月02日 21:15:33	1.1
--- ReglasDeFormatoDeTexto	2001年02月01日 07:06:39	1.2
***************
*** 1,64 ****
! '''Paragraphs'''
! 
! * Don't indent paragraphs
! * Words wrap and fill as needed
! * Use blank lines as separators
! * Four or more minus signs make a horizontal rule
! * %%''''% makes a linebreak (in headings and lists too)
! 
! 
! '''Lists'''
! 
! * asterick for first level
! ** asterick-asterick for second level, etc.
! * Use * for bullet lists, # for numbered lists (mix at will)
! * tab-Term:-tab Definition for definition lists
! * One line for each item
! * Other leading whitespace signals preformatted text, changes font.
! 
! '''Headings'''
! 
! * '!' at the start of a line makes a small heading
! * '!!' at the start of a line makes a medium heading 
! * '!!!' at the start of a line makes a large heading
! 
! '''Fonts'''
! * Indent with one or more spaces to use a monospace font:
! 
! This is in monospace
! This is not
! 
! '''Indented Paragraphs'''
! ''(Quotes)''
! 
! * tab-space-:-tab -- often used (with emphasis) for quotations.
! 
! 
! '''Emphasis'''
! 
! * Use doubled single-quotes ('') for emphasis (usually italics)
! * Use doubled underscores (__) for strong emphasis (usually bold)
! * Mix them at will: ''__bold italics__''
! * ''Emphasis'' can be used ''multiple'' times within a line, but ''cannot'' cross line boundaries:
! 
! ''this
! will not work''
! 
! '''References'''
! * Hyperlinks to other pages within the Wiki are made by placing the page name in square brackets: [this is a page link] or UsingWikiWords (preferred)
! * Hyperlinks to external pages are done like this: [http://www.wcsb.org/]
! * You can name the links to the external pages by providing a name, a bar (|) and then the hyperlink: [Steve's home page | http://wcsb.org/~swain/] 
! * You can suppress linking to old-style references by preceeding the word with a '!', e.g. !NotLinkedAsWikiName
! * [1], [2], [3], [4] refer to remote references. Click EditLinks on the edit form to enter URLs. These differ from the newer linking scheme; references are unique to a page.
! * Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/
! * URLs ending with .png, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/phpwiki/png.png]
! 
! 
! '''HTML Mark-Up Language'''
! 
! * Don't bother
! * < and > are themselves
! * The & characters will not work
! * If you really must use HTML, your system administrator can enable this feature. Start each line with a bar (|). Note that this feature is disabled by default.
! 
! 
--- 1,64 ----
! '''Parrafos'''
! 
! * No indente los parrafos
! * Las palabras se acomodan automaticamente
! * Use lines en blanco como seperarodes de pararrafos
! * Cuatro o mas guiones hacen una linea horizontal
! * %%''''% hace una ruptura de linea (tambien en cabeceras y listas)
! 
! 
! '''Listas'''
! 
! * asterisco para primer nivel
! ** asterico-asterico para segundo nivel, etc.
! * Use * para listas, # para listas numeradas (se pueden mezclar)
! * tab-Term:-tab Definición para definicíon de listas
! * Una linea por cada item
! * cualquier otro espacio en blanco señala texto preformateado, acmbia el tipo de letra.
! 
! '''Cabeceras'''
! 
! * '!' al principio hace una pequeña cabecera
! * '!!' al principio hace una cabecera mediana
! * '!!!' al principio hace una cabecera grande
! 
! '''Tipos de Letra'''
! * Indente con uno o mas espacios para usar tipo de letra monoespaciado:
! 
! Esto es monoespaciado
! Esto no
! 
! '''Parrafos indentados'''
! ''(Citas)''
! 
! * tab-epacio-:-tab -- a menudo usado (con énfasis) para citas.
! 
! 
! '''Enfasis'''
! 
! * Use dobles comillas simples ('') para énfasis (normalmente cursiva)
! * Use doble subrayado (__) para un énfasis fuerte (normalmente negrita)
! * Mezclelos y seran: ''__negrita cursiva__''
! * ''Enfasis'' puede ser usado ''multiples'' veces en una linea, pero no puede ir a traves de mas de una linea:
! 
! ''esto
! no funcionará''
! 
! '''Referencias'''
! * Los enlaces a otras páginas dentro de Wiki son realizadas poniendo el nombre entre corchetes: [esto es un vinculo de página] o UsandoPalabarasWiki (preferido)
! * Los enlaces a páginas externas son realizados como este: [http://www.wcsb.org/]
! * Puede nombrar los enlaces a páginas externas poniendo un nombre, una barra (|) y el enlace: [página web de Steve | http://wcsb.org/~swain/] 
! * Puede suprimir enlace a viejas referencias, precediendo la palabra con un '!', e.j. !NotLinkedAsWikiName
! * [1], [2], [3], [4] se refieren a referencias remotas. Haga clik en EditarEnlaces en el formulario de edición para poner las URLs. Esto difiere de nuevo esquema de enlaces; las referencias son únicas para una página.
! * También, el sistema antiguo de enlazar los URL's sigue siendo soportado: preceda los URLs con "http:", "ftp:" o "mailto:" para crear enlaces automáticamante como en: http://c2.com/
! * Las URLs que finalizan en .png, o .jpg son visualizadas si están entre corchetes: [http://phpwiki.sourceforge.net/phpwiki/png.png]
! 
! 
! '''Lenguaje HTML'''
! 
! * No se preocupe de el
! * < y > son si mismos
! * Los caracters & no funcionarán
! * Si realmente desea usar HTML, su administrador del sistema debe activar esta característica. Empiece cada líneas con una barra vertical (|). Tenga en cuenta que esta característica está desactivada por defecto.
! 
! 
Index: VisitantesRecientes
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/VisitantesRecientes,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** VisitantesRecientes	2000年11月02日 21:15:33	1.1
--- VisitantesRecientes	2001年02月01日 07:06:39	1.2
***************
*** 1,7 ****
! Sign and date your name below!
! 
! Jeff Dairiki, Arno Hollosi, SteveWainstead, Php Wiki authors
! 
! 2000年11月01日 [KBrown] - traducción al español
! 
! 
--- 1,7 ----
! ¡Firme y ponga su fecha a continuación!
! 
! Jeff Dairiki, Arno Hollosi, SteveWainstead, autores de Php Wiki
! 
! 2000年11月01日 [KBrown] - traducción al español
! 
! 
Index: WabiSabi
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/WabiSabi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** WabiSabi	2000年11月02日 21:15:33	1.1
--- WabiSabi	2001年02月01日 07:06:39	1.2
***************
*** 1,26 ****
! Since wabi-sabi represents a comprehensive Japanese world view or aesthetic system, it is difficult to explain precisely in western terms. According to Leonard Koren, wabi-sabi is the most conspicuous and characteristic feature of what we think of as traditional Japanese beauty and it "occupies roughly the same position in the Japanese pantheon of aesthetic values as do the Greek ideals of beauty and perfection in the West."
! 
! Wabi-sabi is a beauty of things imperfect, impermanent, and incomplete.
! 
! It is the beauty of things modest and humble.
! 
! It is the beauty of things unconventional.
! 
! The concepts of wabi-sabi correlate with the concepts of Zen Buddhism, as the first Japanese involved with wabi-sabi were tea masters, priests, and monks who practiced Zen. Zen Buddhism originated in India, traveled to China in the 6th century, and was first introduced in Japan around the 12th century. Zen emphasizes "direct, intuitive insight into transcendental truth beyond all intellectual conception." At the core of wabi- sabi is the importance of transcending ways of looking and thinking about things/existence.
! 
! 	*All things are impermanent
! 	*All things are imperfect
! 	*All things are incomplete 
! 
! Material characteristics of wabi-sabi:
! 
! 	*suggestion of natural process
! 	*irregular
! 	*intimate
! 	*unpretentious
! 	*earthy
! 	*simple
! 
! For more about wabi-sabi, see
! http://www.art.unt.edu/ntieva/artcurr/japan/wabisabi.htm
! 
--- 1,25 ----
! Debido a que wabi-sabi representa un punto de vista del mundo Japones o un sistema asceta, es dificil explicarlo en terminos occidentales. Según Leonard Koren, wabi-sabi es la característica más visible de lo que pensamos sobre belleza tradicional japonesa y "ocupa la misma posición en la lista de valores ascetas japoneses de la misma manera que lo hacen los ideales de la belleza y perfección Griesgas que se usan en Occidente."
! 
! Wabi-sabi es la belleza del las cosas imperfectas, no permamentes e incompletas.
! 
! Es la belleza de cosas modestas y humildes.
! 
! Es la belleza de cosas no convencionales.
! 
! Los conceptos de wabi-sabi están relacionados con los conceptos del budismo Zen, asi los primeros japoneses que practicaron wabi-sabi eran maestros de té, curas y monjes que practicaban el Zen. El budismo Zen es originario de la India, pasó a China en el siglo 6, y fué introducido por primera vez en Japón sobre el siglo 12. El Zen enfatiza la "penetración intuitiva en la verdad transcendental más allá de todo concepto intelectual." El corazón del wabi-sabi es la importancia de caminos transcendentales sobre la observación y el pensamiento sobre las cosas y la existencia.
! 	*Todas las cosas son no permamentes
! 	*Todas las cosas son imperfectas
! 	*Todas las cosas son incompletas 
! 
! Características materiales de wabi-sabi:
! 
! 	*sugerencia de un proceso natural
! 	*irregular
! 	*intima
! 	*no pretenciosa
! 	*terrenal
! 	*simple
! 
! Para saber mas sobre wabi-sabi, mira en:
! http://www.art.unt.edu/ntieva/artcurr/japan/wabisabi.htm
! 
Index: WikiWikiWeb
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/WikiWikiWeb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** WikiWikiWeb	2000年11月02日 21:15:33	1.1
--- WikiWikiWeb	2001年02月01日 07:06:39	1.2
***************
*** 1,13 ****
! Un WikiWikiWeb es un sitio donde todos pueden colaborar con el contenido. El Wiki más conocido y usado es el Portland Pattern Repository en http://c2.com/cgi-bin/wiki?WikiWikiWeb.
! 
! Encontré estos enunciados ahí particularmente relevantes:
! 
! ''El punto es hacer la forma para EditarElTexto simple y la búsqueda de BuscarPagina rápida.''
! 
! ''En adición a ser rápido, éste sitio también aspira a los ideales del Zen generalmente etiquetados WabiSabi. El Zen encuentra belleza en lo imperfecto y efímero. Cuando desciende a esto, es todo lo que necesitas.''
! 
! También se puede firmar en VisitantesRecientes, o leer acerca de ComoUsarWiki y AgregarPaginas. Actualmente este wiki no tiene "tema" de discusión así que ¡adelante, a jugar con él y a divertrse!
! 
! --SteveWainstead 
! --traducido al español por [KBrown]
! 
--- 1,13 ----
! Un WikiWikiWeb es un sitio donde todos pueden colaborar con el contenido. El Wiki más conocido y usado es el Portland Pattern Repository en http://c2.com/cgi-bin/wiki?WikiWikiWeb.
! 
! Alli encontré estas frases particularmente relevantes:
! 
! ''La clave es poder EditarElTexto de una manera sencilla y la búsqueda de BuscarPagina rápida.''
! 
! ''Aparte de ser rápido, éste sitio también aspira a los ideales del Zen generalmente etiquetados WabiSabi. El Zen encuentra belleza en lo imperfecto y efímero. Cuando se llega a esto, es todo lo que se necesita.''
! 
! También se puede firmar en VisitantesRecientes, o leer acerca de ComoUsarWiki y AgregarPaginas. Actualmente este wiki no tiene "tema" de discusión así que ¡adelante, a jugar con él y a divertirse!
! 
! --SteveWainstead 
! --traducido al español por [KBrown]
! 

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory usw-pr-cvs1:/tmp/cvs-serv27228/po
Modified Files:
	es.po 
Log Message:
update to spanish locale by Pablo Roca Rozas
Index: es.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/es.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** es.po	2000年12月22日 20:18:13	1.3
--- es.po	2001年02月01日 07:06:39	1.4
***************
*** 1,75 ****
! # es.po -- PhpWiki's spanish language file
! # Copyright (C) 2000 Sandino Araico Sánchez <sa...@sa...>.
! # Sandino Araico Sánchez <sa...@sa...>, 2000.
! #
! #
! # Don't change the format of the first three lines,
! # the TP robot wants them like this (I hope).
! #
! #
 msgid ""
 msgstr ""
! "Project-Id-Version: phpwiki 1.1.8\n"
! "POT-Creation-Date: 2000年12月22日 21:16+0100\n"
! "PO-Revision-Date: 2000年10月27日 16:10-0500\n"
! "Last-Translator: Sandino Araico Sánchez <sa...@sa...>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
! "Date: 2000年10月27日 16:10-0500\n"
! "From: <sa...@sa...>\n"
 
 #: admin.php:26
 msgid "You entered an invalid login or password."
 msgstr ""
 
 #: admin.php:47
 #, c-format
 msgid "You are about to remove '%s' permanently!"
! msgstr ""
 
 #: admin.php:50
 #, c-format
 msgid "Click %shere%s to remove the page now."
! msgstr ""
 
 #: admin.php:53
 msgid "Otherwise press the \"Back\" button of your browser."
 msgstr ""
 
 #: admin.php:55
 msgid "Function not yet implemented."
! msgstr ""
 
 #: admin.php:57 admin.php:65
 msgid "Remove page"
! msgstr ""
 
 #: admin.php:63
 #, c-format
 msgid "Removed page '%s' succesfully."
! msgstr ""
 
! #: lib/config.php:162
 msgid "templates/browse.html"
 msgstr "locale/es/templates/browse.html"
 
! #: lib/config.php:163
 msgid "templates/editpage.html"
 msgstr "locale/es/templates/editpage.html"
 
! #: lib/config.php:164
 msgid "templates/editlinks.html"
 msgstr "locale/es/templates/editlinks.html"
 
! #: lib/config.php:165
 msgid "templates/message.html"
 msgstr "locale/es/templates/message.html"
 
! #: lib/config.php:181
 msgid "./pgsrc"
 msgstr "locale/es/pgsrc"
 
 #: lib/diff.php:682
 #, c-format
--- 1,92 ----
! # es.po -- PhpWiki's spanish language file
! # Copyright (C) 2000 Sandino Araico Sánchez <sa...@sa...>.
! # Sandino Araico Sánchez <sa...@sa...>, 2000.
! #
! # ultima modificación por Pablo Roca (pr...@cl...)
! #
! # Don't change the format of the first three lines,
! # the TP robot wants them like this (I hope).
! #
! #
! #, fuzzy
 msgid ""
 msgstr ""
! "Project-Id-Version: phpwiki 1.2.0\n"
! "POT-Creation-Date: 2001年02月01日 07:58+0100\n"
! "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
! "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
! "Date: 2001年01月12日 16:10-0500\n"
! "From: <pr...@cl...>\n"
 
+ # admin.php:26
 #: admin.php:26
 msgid "You entered an invalid login or password."
 msgstr ""
+ "Se h&aacute; introducido un nombre de usuario o palabra de paso invalido."
 
+ # admin.php:47
 #: admin.php:47
 #, c-format
 msgid "You are about to remove '%s' permanently!"
! msgstr "¡Va a borrar '%s' permanentemente!"
 
+ # admin.php:50
 #: admin.php:50
 #, c-format
 msgid "Click %shere%s to remove the page now."
! msgstr "Haga Click %aqu&iacute;% para borrar la p&aacute;gina ahora"
 
+ # admin.php:53
 #: admin.php:53
 msgid "Otherwise press the \"Back\" button of your browser."
 msgstr ""
+ "En caso contrario pulse el bot&oacute; \"Atr&aacute;s\" en su navegador"
 
+ # admin.php:55
 #: admin.php:55
 msgid "Function not yet implemented."
! msgstr "Funci&oacute;n todav&iacute; no implementada"
 
+ # admin.php:57 admin.php:65
 #: admin.php:57 admin.php:65
 msgid "Remove page"
! msgstr "Borrar p&aacute;gina"
 
+ # admin.php:63
 #: admin.php:63
 #, c-format
 msgid "Removed page '%s' succesfully."
! msgstr "P&aacute;gina '%s' borrada satisfactoriamente."
 
! # lib/config.php:162
! #: lib/config.php:195
 msgid "templates/browse.html"
 msgstr "locale/es/templates/browse.html"
 
! # lib/config.php:163
! #: lib/config.php:196
 msgid "templates/editpage.html"
 msgstr "locale/es/templates/editpage.html"
 
! # lib/config.php:164
! #: lib/config.php:197
 msgid "templates/editlinks.html"
 msgstr "locale/es/templates/editlinks.html"
 
! # lib/config.php:165
! #: lib/config.php:198
 msgid "templates/message.html"
 msgstr "locale/es/templates/message.html"
 
! # lib/config.php:181
! #: lib/config.php:214
 msgid "./pgsrc"
 msgstr "locale/es/pgsrc"
 
+ # lib/diff.php:682
 #: lib/diff.php:682
 #, c-format
***************
*** 77,88 ****
--- 94,108 ----
 msgstr "WikiDiff::apply: conteo de l&iacute;neas difiere: %s != %s"
 
+ # lib/diff.php:742
 #: lib/diff.php:742
 msgid "WikiDiff::_check: failed"
 msgstr "WikiDiff::_check: fall&oacute;"
 
+ # lib/diff.php:752
 #: lib/diff.php:752
 msgid "WikiDiff::_check: edit sequence is non-optimal"
 msgstr "WikiDiff::_check: secuencia de edici&oacute;n no es &oacute;ptima"
 
+ # lib/diff.php:756
 #: lib/diff.php:756
 #, c-format
***************
*** 90,97 ****
--- 110,119 ----
 msgstr "WikiDiff Ok: LCS = %s"
 
+ # lib/diff.php:997
 #: lib/diff.php:997
 msgid "Current page:"
 msgstr "P&aacute;gina actual:"
 
+ # lib/diff.php:1001 lib/diff.php:1019
 #: lib/diff.php:1001 lib/diff.php:1019
 #, c-format
***************
*** 99,102 ****
--- 121,125 ----
 msgstr "versi&oacute;n %s"
 
+ # lib/diff.php:1003 lib/diff.php:1021
 #: lib/diff.php:1003 lib/diff.php:1021
 #, c-format
***************
*** 104,107 ****
--- 127,131 ----
 msgstr "modificado por &uacute;ltima vez el %s"
 
+ # lib/diff.php:1006 lib/diff.php:1024
 #: lib/diff.php:1006 lib/diff.php:1024
 #, c-format
***************
*** 109,124 ****
--- 133,152 ----
 msgstr "por %s"
 
+ # lib/diff.php:1010 lib/diff.php:1028
 #: lib/diff.php:1010 lib/diff.php:1028
 msgid "None"
 msgstr "Ninguno"
 
+ # lib/diff.php:1015
 #: lib/diff.php:1015
 msgid "Archived page:"
 msgstr "P&aacute;gina archivada:"
 
+ # lib/diff.php:1037
 #: lib/diff.php:1037
 msgid "Versions are identical"
 msgstr "Las versiones son id&eacute;nticas"
 
+ # lib/diff.php:1045
 #: lib/diff.php:1045
 #, c-format
***************
*** 126,138 ****
 msgstr "Diferencia de %s."
 
! #: lib/display.php:14
 msgid "FrontPage"
! msgstr "PrimeraPlana"
 
! #: lib/display.php:31 lib/editpage.php:50
 #, c-format
 msgid "Describe %s here."
 msgstr "Describe %s aqu&iacute;."
 
 #: lib/editpage.php:19
 #, c-format
--- 154,169 ----
 msgstr "Diferencia de %s."
 
! # lib/display.php:14
! #: lib/display.php:12
 msgid "FrontPage"
! msgstr "PaginaPrincipal"
 
! # lib/display.php:31 lib/editpage.php:50
! #: lib/display.php:29 lib/editpage.php:50
 #, c-format
 msgid "Describe %s here."
 msgstr "Describe %s aqu&iacute;."
 
+ # lib/editpage.php:19
 #: lib/editpage.php:19
 #, c-format
***************
*** 140,150 ****
 msgstr "Copia de %s"
 
 #: lib/editpage.php:23
 msgid "No page name passed into editpage!"
! msgstr ""
! "¡Ning&uacute;n nombre de p&aacute;gina pas&oacute; dentro de la "
! "p&aacute;gina de edici&oacute;n!"
 
! #: lib/editpage.php:31 lib/savepage.php:52
 msgid "This page has been locked by the administrator and cannot be edited."
 msgstr ""
--- 171,181 ----
 msgstr "Copia de %s"
 
+ # lib/editpage.php:23
 #: lib/editpage.php:23
 msgid "No page name passed into editpage!"
! msgstr "No se h&aacute; pasado nombre de p&aacute;gina a editarpagina"
 
! # lib/editpage.php:31 lib/savepage.php:52
! #: lib/editpage.php:31 lib/savepage.php:121
 msgid "This page has been locked by the administrator and cannot be edited."
 msgstr ""
***************
*** 152,179 ****
 "editada."
 
! #: lib/editpage.php:33 lib/savepage.php:32 lib/savepage.php:53
! #, fuzzy
 msgid "Sorry for the inconvenience."
 msgstr "Disculpe la inconveniencia."
 
! #: lib/editpage.php:35 lib/savepage.php:54
 #, c-format
 msgid "Problem while editing %s"
 msgstr "Problema al editar %s"
 
! #: lib/fullsearch.php:15
 #, c-format
 msgid "Searching for \"%s\" ....."
 msgstr "Buscando \"%s\" ..."
 
! #: lib/fullsearch.php:45
 #, c-format
 msgid "%d matches found in %d pages."
 msgstr "%d veces encontrado en %d p&aacute;ginas."
 
! #: lib/fullsearch.php:48
 msgid "Full Text Search Results"
 msgstr "Resultados de la búsqueda en el texto completo"
 
 #: lib/msql.php:29 lib/mysql.php:36
 msgid "Cannot establish connection to database, giving up."
--- 183,215 ----
 "editada."
 
! # lib/editpage.php:33 lib/savepage.php:32 lib/savepage.php:53
! #: lib/editpage.php:33 lib/savepage.php:99 lib/savepage.php:122
 msgid "Sorry for the inconvenience."
 msgstr "Disculpe la inconveniencia."
 
! # lib/editpage.php:35 lib/savepage.php:54
! #: lib/editpage.php:35 lib/savepage.php:123
 #, c-format
 msgid "Problem while editing %s"
 msgstr "Problema al editar %s"
 
! # lib/fullsearch.php:15
! #: lib/fullsearch.php:9 lib/search.php:9
 #, c-format
 msgid "Searching for \"%s\" ....."
 msgstr "Buscando \"%s\" ..."
 
! # lib/fullsearch.php:45
! #: lib/fullsearch.php:41
 #, c-format
 msgid "%d matches found in %d pages."
 msgstr "%d veces encontrado en %d p&aacute;ginas."
 
! # lib/fullsearch.php:48
! #: lib/fullsearch.php:45
 msgid "Full Text Search Results"
 msgstr "Resultados de la búsqueda en el texto completo"
 
+ # lib/msql.php:29 lib/mysql.php:36
 #: lib/msql.php:29 lib/mysql.php:36
 msgid "Cannot establish connection to database, giving up."
***************
*** 182,185 ****
--- 218,222 ----
 "vencido."
 
+ # lib/msql.php:31 lib/msql.php:37
 #: lib/msql.php:31 lib/msql.php:37
 #, c-format
***************
*** 187,200 ****
 msgstr "Mensaje de error: %s"
 
 #: lib/msql.php:35 lib/mysql.php:42
 #, c-format
 msgid "Cannot open database %s, giving up."
! msgstr "No puedo abrir la base de datos %s me doy por vencido."
 
 #: lib/msql.php:210 lib/msql.php:286
 #, c-format
 msgid "Insert/update failed: %s"
! msgstr "Inserci&oacute;n/actualizaci&oacute;n fall&oacute;: %s"
 
 #: lib/msql.php:221 lib/msql.php:296
 #, c-format
--- 224,240 ----
 msgstr "Mensaje de error: %s"
 
+ # lib/msql.php:35 lib/mysql.php:42
 #: lib/msql.php:35 lib/mysql.php:42
 #, c-format
 msgid "Cannot open database %s, giving up."
! msgstr "No se puede abrir la base de datos %s , me doy por vencido."
 
+ # lib/msql.php:210 lib/msql.php:286
 #: lib/msql.php:210 lib/msql.php:286
 #, c-format
 msgid "Insert/update failed: %s"
! msgstr "Inserci&oacute;n/Actualizaci&oacute;n fall&oacute;: %s"
 
+ # lib/msql.php:221 lib/msql.php:296
 #: lib/msql.php:221 lib/msql.php:296
 #, c-format
***************
*** 202,205 ****
--- 242,246 ----
 msgstr "Eliminaci&oacute;n en %s fall&oacute;: %s"
 
+ # lib/msql.php:237 lib/msql.php:312
 #: lib/msql.php:237 lib/msql.php:312
 #, c-format
***************
*** 207,241 ****
 msgstr "Inserci&oacute;n en %s fall&oacute;: %s"
 
! #: lib/mysql.php:38 lib/mysql.php:44 lib/mysql.php:118 lib/mysql.php:158
 #, c-format
 msgid "MySQL error: %s"
 msgstr "Error de MySQL: %s"
 
! #: lib/mysql.php:116
 #, c-format
 msgid "Error writing page '%s'"
 msgstr "Error al escribir la p&aacute;gina `%s'"
 
! #: lib/mysql.php:156
 #, c-format
 msgid "Cannot delete '%s' from table '%s'"
 msgstr ""
 
 #: lib/pageinfo.php:9
 msgid "Enter a page name"
 msgstr "Escriba un nombre de p&aacute;gina"
 
! #: lib/pageinfo.php:10 lib/stdlib.php:239
 msgid "Go"
 msgstr "Aceptar"
 
 #: lib/pageinfo.php:21
 msgid "Show the page source and references"
! msgstr "Mostrar la fuente de la p&aacute;gina y referencias"
 
 #: lib/pageinfo.php:26 lib/pageinfo.php:75
 msgid "PageInfo"
 msgstr "InformacionDeLaPagina"
 
 #: lib/pageinfo.php:36
 #, c-format
--- 248,294 ----
 msgstr "Inserci&oacute;n en %s fall&oacute;: %s"
 
! # lib/mysql.php:38 lib/mysql.php:44 lib/mysql.php:118 lib/mysql.php:158
! #: lib/mysql.php:38 lib/mysql.php:44 lib/mysql.php:123 lib/mysql.php:163
 #, c-format
 msgid "MySQL error: %s"
 msgstr "Error de MySQL: %s"
 
! # lib/mysql.php:116
! #: lib/mysql.php:121
 #, c-format
 msgid "Error writing page '%s'"
 msgstr "Error al escribir la p&aacute;gina `%s'"
 
! # lib/mysql.php:156
! #: lib/mysql.php:161
 #, c-format
 msgid "Cannot delete '%s' from table '%s'"
+ msgstr "No se puede borrar '%s' de la tabla '%s'"
+ 
+ #: lib/navigate.php:81
+ msgid "RelatedPages"
 msgstr ""
 
+ # lib/pageinfo.php:9
 #: lib/pageinfo.php:9
 msgid "Enter a page name"
 msgstr "Escriba un nombre de p&aacute;gina"
 
! # lib/pageinfo.php:10 lib/stdlib.php:239
! #: lib/pageinfo.php:10 lib/stdlib.php:116
 msgid "Go"
 msgstr "Aceptar"
 
+ # lib/pageinfo.php:21
 #: lib/pageinfo.php:21
 msgid "Show the page source and references"
! msgstr "Mostrar el c&oacute;digo fuente de la p&aacute;gina y referencias"
 
+ # lib/pageinfo.php:26 lib/pageinfo.php:75
 #: lib/pageinfo.php:26 lib/pageinfo.php:75
 msgid "PageInfo"
 msgstr "InformacionDeLaPagina"
 
+ # lib/pageinfo.php:36
 #: lib/pageinfo.php:36
 #, c-format
***************
*** 243,255 ****
 msgstr "El nombre de la p&aacute;gina `%s' no est&aacute; en la base de datos"
 
 #: lib/pageinfo.php:64
 msgid "Current version"
 msgstr "Versi&oacute;n actual:"
 
 #: lib/pageinfo.php:70
 msgid "Archived version"
 msgstr "Versi&oacute;n archivada:"
 
! #: lib/savepage.php:18
 msgid ""
 "PhpWiki is unable to save your changes, because another user edited and "
--- 296,316 ----
 msgstr "El nombre de la p&aacute;gina `%s' no est&aacute; en la base de datos"
 
+ # lib/pageinfo.php:64
 #: lib/pageinfo.php:64
 msgid "Current version"
 msgstr "Versi&oacute;n actual:"
 
+ # lib/pageinfo.php:70
 #: lib/pageinfo.php:70
 msgid "Archived version"
 msgstr "Versi&oacute;n archivada:"
 
! # lib/stdlib.php:384 lib/stdlib.php:445
! #: lib/savepage.php:16 lib/savepage.php:74
! msgid "RecentChanges"
! msgstr "CambiosRecientes"
! 
! # lib/savepage.php:18
! #: lib/savepage.php:85
 msgid ""
 "PhpWiki is unable to save your changes, because another user edited and "
***************
*** 257,305 ****
 "changes from the previous author would be lost."
 msgstr ""
 
! #: lib/savepage.php:20
 msgid "In order to recover from this situation follow these steps:"
! msgstr ""
 
! #: lib/savepage.php:22
 msgid "Use your browser's <b>Back</b> button to go back to the edit page."
 msgstr ""
 
! #: lib/savepage.php:24
 msgid ""
 "Copy your changes to the clipboard or to another temporary place (e.g. text "
 "editor)."
 msgstr ""
 
! #: lib/savepage.php:26
 msgid ""
 "<b>Reload</b> the page. You should now see the most current version of the "
 "page. Your changes are no longer there."
 msgstr ""
 
! #: lib/savepage.php:28
 msgid ""
 "Make changes to the file again. Paste your additions from the clipboard (or "
 "text editor)."
 msgstr ""
 
! #: lib/savepage.php:30
 msgid "Press <b>Save</b> again."
! msgstr ""
 
! #: lib/savepage.php:36
! #, fuzzy, c-format
 msgid "Problem while updating %s"
 msgstr "Problema al editar %s"
 
! #: lib/savepage.php:76
 #, c-format
 msgid "Thank you for editing %s."
 msgstr "Gracias por editar %s."
 
! #: lib/savepage.php:106
 msgid "Your careful attention to detail is much appreciated."
! msgstr "Tu cuidadosa atenci&oacute;n a los detalles es muy agradecida."
 
 #: lib/setupwiki.php:21
 #, c-format
--- 318,400 ----
 "changes from the previous author would be lost."
 msgstr ""
+ "PhpWiki no es capaz de grabar sus cambios, debido a que otro "
+ "usuarioh&aacute; editado y guardado la p&aacute;gina mientras usted estaba "
+ "editando esta p&aacute;gina. Si se guarda ahora los cambios del autor "
+ "anterior se podr&iacute;an perder."
 
! # lib/savepage.php:20
! #: lib/savepage.php:87
 msgid "In order to recover from this situation follow these steps:"
! msgstr "Para restaurar esta situaci&oacute;n siga los siguientes pasos:"
 
! # lib/savepage.php:22
! #: lib/savepage.php:89
 msgid "Use your browser's <b>Back</b> button to go back to the edit page."
 msgstr ""
+ "Use el bot&oacute;n <b>Atr&aacute;s<b> para retornar a la p&aacute;gina "
+ "editada"
 
! # lib/savepage.php:24
! #: lib/savepage.php:91
 msgid ""
 "Copy your changes to the clipboard or to another temporary place (e.g. text "
 "editor)."
 msgstr ""
+ "Copie sus cambios al portapapeles o a otro sitio temporal (p.ej. editor de "
+ "textos)."
 
! # lib/savepage.php:26
! #: lib/savepage.php:93
 msgid ""
 "<b>Reload</b> the page. You should now see the most current version of the "
 "page. Your changes are no longer there."
 msgstr ""
+ "<b>Vuelva a cargar</b> la p&aacute;gina. Ahora podr&aacute; ver la "
+ "versi&oacute;n mas actual de la p&aacute;gina. Sus cambios no est&aacute;n "
+ "ah&iacute;."
 
! # lib/savepage.php:28
! #: lib/savepage.php:95
 msgid ""
 "Make changes to the file again. Paste your additions from the clipboard (or "
 "text editor)."
 msgstr ""
+ "Haga cambios a la p&aacute;gina otra vez. Pegue sus modificaciones del "
+ "portapapeles (o del editor de textos)."
 
! # lib/savepage.php:30
! #: lib/savepage.php:97
 msgid "Press <b>Save</b> again."
! msgstr "Pulse <b>Guardar<b> otra vez."
 
! # lib/savepage.php:36
! #: lib/savepage.php:103
! #, c-format
 msgid "Problem while updating %s"
 msgstr "Problema al editar %s"
 
! # lib/savepage.php:76
! #: lib/savepage.php:146
 #, c-format
 msgid "Thank you for editing %s."
 msgstr "Gracias por editar %s."
 
! # lib/savepage.php:106
! #: lib/savepage.php:176
 msgid "Your careful attention to detail is much appreciated."
! msgstr "Se agradece una cuidadosa atenci&oacute;n a los detalles."
 
+ #: lib/search.php:25
+ #, c-format
+ msgid "%d pages match your query."
+ msgstr ""
+ 
+ # lib/fullsearch.php:48
+ #: lib/search.php:28
+ #, fuzzy
+ msgid "Title Search Results"
+ msgstr "Resultados de la búsqueda en el texto completo"
+ 
+ # lib/setupwiki.php:21
 #: lib/setupwiki.php:21
 #, c-format
***************
*** 307,338 ****
 msgstr "Insertando p&aacute;gina %s, versi&oacute;n %s de %s"
 
 #: lib/stdlib.php:36
 msgid "WikiFatalError"
 msgstr "ErrorFatalDeWiki"
 
! #: lib/stdlib.php:53
 #, c-format
 msgid "%d best incoming links:"
! msgstr "%d mejores ligas de entrada:"
 
! #: lib/stdlib.php:63
 #, c-format
 msgid "%d best outgoing links:"
! msgstr "%d mejores ligas de salida:"
 
! #: lib/stdlib.php:74
 #, c-format
 msgid "%d most popular nearby:"
 msgstr "%d las m&aacute;s populares:"
- 
- #: lib/stdlib.php:207 lib/stdlib.php:215
- msgid "Search"
- msgstr ""
- 
- #: lib/stdlib.php:330
- msgid "Stack bounds exceeded in SetHTMLOutputMode"
- msgstr "L&iacute;mites de la pila excedidos en SetHTMLOutputMode"
- 
- #: lib/stdlib.php:384 lib/stdlib.php:445
- msgid "RecentChanges"
- msgstr "CambiosRecientes"
--- 402,435 ----
 msgstr "Insertando p&aacute;gina %s, versi&oacute;n %s de %s"
 
+ # lib/stdlib.php:36
 #: lib/stdlib.php:36
 msgid "WikiFatalError"
 msgstr "ErrorFatalDeWiki"
+ 
+ # lib/stdlib.php:207 lib/stdlib.php:215
+ #: lib/stdlib.php:83 lib/stdlib.php:91
+ msgid "Search"
+ msgstr "Buscar"
+ 
+ # lib/stdlib.php:330
+ #: lib/stdlib.php:228
+ msgid "Stack bounds exceeded in SetHTMLOutputMode"
+ msgstr "L&iacute;mites de la pila excedidos en SetHTMLOutputMode"
 
! # lib/stdlib.php:53
! #: lib/stdlib.php:350
 #, c-format
 msgid "%d best incoming links:"
! msgstr "%d mejores enlaces de entrada:"
 
! # lib/stdlib.php:63
! #: lib/stdlib.php:360
 #, c-format
 msgid "%d best outgoing links:"
! msgstr "%d mejores enlaces de salida:"
 
! # lib/stdlib.php:74
! #: lib/stdlib.php:371
 #, c-format
 msgid "%d most popular nearby:"
 msgstr "%d las m&aacute;s populares:"

Update of /cvsroot/phpwiki/phpwiki/locale/es/templates
In directory usw-pr-cvs1:/tmp/cvs-serv27228/es/templates
Modified Files:
	browse.html editlinks.html editpage.html message.html 
Log Message:
update to spanish locale by Pablo Roca Rozas
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/templates/browse.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** browse.html	2000年11月13日 11:22:10	1.2
--- browse.html	2001年02月01日 07:06:39	1.3
***************
*** 1,35 ****
! <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###PAGE###</title>
! </head>
! 
! <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
! <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a href="###SCRIPTURL###?full=###PAGEURL###">###PAGE###</a></h1>
! ###IF:ADMIN###<FORM ACTION="###SCRIPTURL###" METHOD=POST>
! ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Unlock page</a>]
! ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Lock page</a>]
! - - 
! [<a href="###SCRIPTURL###?remove=###PAGEURL###">Remove page</A>]
! <hr noshade>
! ###ENDIF:ADMIN###
! <P>
! ###CONTENT###
! 
! <hr noshade>
! ###IF ADMIN###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a>
! ###IF:!ADMIN###
! ###IF LOCK###Page locked
! ###IF !LOCK###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a>
! ###ENDIF:!ADMIN###
! de esta página (editada por última vez ###LASTMODIFIED###
! [<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>]
! [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>])
! <br>
! <a href="###SCRIPTURL###?BuscarPagina">BuscarP&aacute;gina</a> 
! <hr noshade>
! <small>###RELATEDPAGES###</small>
! 
! </body>
! </html>
--- 1,30 ----
! <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###PAGE###</title>
! </head>
! 
! <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
! <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a href="###SCRIPTURL###?full=###PAGEURL###">###PAGE###</a></h1>
! ###IF:ADMIN###<FORM ACTION="###SCRIPTURL###" METHOD=POST>
! ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Desbloquear p&aacute;gina</a>] 
! ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Bloquear p&aacute;gina</a>] 
! - - [<a href="###SCRIPTURL###?remove=###PAGEURL###">Borrar p&aacute;gina</A>] 
! <hr noshade>
! ###ENDIF:ADMIN###
! <P>
! ###CONTENT###
! <hr noshade>
! ###IF ADMIN###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a> 
! de esta p&aacute;gina ###IF:!ADMIN### ###IF LOCK###P&aacute;gina bloqueada ###IF 
! !LOCK###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a> de esta 
! p&aacute;gina ###ENDIF:!ADMIN### (editada por &uacute;ltima vez ###LASTMODIFIED###) 
! [<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>] [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>]) 
! <br>
! <a href="###SCRIPTURL###?FindPage">BuscarP&aacute;gina</a> navegando o buscando 
! <hr noshade>
! <small>###RELATEDPAGES###</small>
! 
! </form></body>
! </html>
Index: editlinks.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/templates/editlinks.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** editlinks.html	2000年11月02日 21:15:33	1.1
--- editlinks.html	2001年02月01日 07:06:39	1.2
***************
*** 1,37 ****
! <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###PAGE###</title>
! </head>
! 
! <body bgcolor=moccasin text=black alink=red link=darkblue vlink=darkmagenta>
! 
! <form method="POST" action="###SCRIPTURL###">
! 
! <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
! Editar ligas de ###PAGE### 
! <input type="submit" value=" Save ">
! <input type="reset" value=" Reset "></h1>
! 
! <P>
! [1] <input type="text" size="55" name="r1" value="###R1###"><br>
! [2] <input type="text" size="55" name="r2" value="###R2###"><br>
! [3] <input type="text" size="55" name="r3" value="###R3###"><br>
! [4] <input type="text" size="55" name="r4" value="###R4###"><br>
! [5] <input type="text" size="55" name="r5" value="###R5###"><br>
! [6] <input type="text" size="55" name="r6" value="###R6###"><br>
! [7] <input type="text" size="55" name="r7" value="###R7###"><br>
! [8] <input type="text" size="55" name="r8" value="###R8###"><br>
! [9] <input type="text" size="55" name="r9" value="###R9###"><br>
! [10] <input type="text" size="55" name="r10" value="###R10###"><br>
! [11] <input type="text" size="55" name="r11" value="###R11###"><br>
! [12] <input type="text" size="55" name="r12" value="###R12###"><br>
! 
! <p>
! Escriba la URL completa (http:// ...) para cada referencia citada en el texto.
! <BR>Protocolos permitidos son: ###ALLOWEDPROTOCOLS###
! 
! <input type="hidden" name="post" value="###PAGEURL###">
! </form>
! </body>
! </html>
--- 1,36 ----
! <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###PAGE###</title>
! </head>
! 
! <body bgcolor=moccasin text=black alink=red link=darkblue vlink=darkmagenta>
! 
! <form method="POST" action="###SCRIPTURL###">
! 
! <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a> 
! Editar enlaces de ###PAGE### 
! <input type="submit" value=" Save ">
! <input type="reset" value=" Reset "></h1>
! 
! <P>
! [1] <input type="text" size="55" name="r1" value="###R1###"><br>
! [2] <input type="text" size="55" name="r2" value="###R2###"><br>
! [3] <input type="text" size="55" name="r3" value="###R3###"><br>
! [4] <input type="text" size="55" name="r4" value="###R4###"><br>
! [5] <input type="text" size="55" name="r5" value="###R5###"><br>
! [6] <input type="text" size="55" name="r6" value="###R6###"><br>
! [7] <input type="text" size="55" name="r7" value="###R7###"><br>
! [8] <input type="text" size="55" name="r8" value="###R8###"><br>
! [9] <input type="text" size="55" name="r9" value="###R9###"><br>
! [10] <input type="text" size="55" name="r10" value="###R10###"><br>
! [11] <input type="text" size="55" name="r11" value="###R11###"><br>
! [12] <input type="text" size="55" name="r12" value="###R12###"><br>
! 
! <p> Escriba la URL completa (http:// ...) para cada referencia citada en el texto. 
! <br>
! Protocolos permitidos son: ###ALLOWEDPROTOCOLS### 
! <input type="hidden" name="post" value="###PAGEURL###">
! </form>
! </body>
! </html>
Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/templates/editpage.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** editpage.html	2000年11月13日 11:22:10	1.2
--- editpage.html	2001年02月01日 07:06:39	1.3
***************
*** 1,45 ****
! <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###PAGE###</title>
! </head>
! 
! <body>
! 
! <form method="POST" action="###SCRIPTURL###">
! 
! <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
! Editar ###PAGE###
! <input type="submit" value=" Save "></h1>
! 
! <textarea name="content" ROWS="22" COLS="80" wrap="virtual">###CONTENT###</textarea>
! <br>
! 
! <input type="checkbox" name="convert" value="tabs" >
! No puedo escribir tabs.
! Por favor <a href="###SCRIPTURL###?ConvierteEspaciosEnTabs">ConvierteEspaciosEnTabs</a>
! por mi cuando salve.
! <p><a href="###SCRIPTURL###?BuenEstilo">BuenEstilo</a> tips para editar.
! 
! <br>
! <a href="###SCRIPTURL###?links=###PAGEURL###">EditarLigas</a> a otros servidores.
! 
! ###IF COPY###<br><a href="###SCRIPTURL###?copy=###PAGEURL###">EditarCopia</a> De un autor previo
! 
! <hr noshade>
! <small>
! <b>&Eacute;nfasis:</b> '' para it&aacute;licas, ''' para bold, ''''' para ambos
! <br><b>Listas:</b> tab-* para listas de balazos, tab-# para listas numeradas, tab-Term:-tab para listas de definiciones
! <br><b>Referencias:</b> UnirPalabrasEnMay&uacute;sculas o user corchetes para una [liga hacia una p&aacute;gina] o URL [http://cool.wiki.int/].
! <br><b>Referencias:</b> Use [1],[2],[3],... y EditarLigas. Evite hacer ligas con "!": !NoHiperLigue. Ligas con nombres como [text | URL]
! <br><b>Varios:</b>"!", "!!", "!!!" para hacer t&iacute;tulos,
! "%%%" hace un salto de l&iacute;nea, "- - - -" Hace una barra horizontal, escapar "[" con "[["
! <br>M&aacute;s en
! <a href="###SCRIPTURL###?ReglasDeFormatoDeTexto"><b>ReglasDeFormatoDeTexto</b></a>
! </small>
! 
! <input type="hidden" name="post" value="###PAGEURL###">
! <input type="hidden" name="editversion" value="###VERSION###">
! </form>
! </body>
! </html>
--- 1,42 ----
! <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###PAGE###</title>
! </head>
! 
! <body>
! 
! <form method="POST" action="###SCRIPTURL###">
! 
! <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a> 
! Editar ###PAGE### 
! <input type="submit" value=" Save "></h1>
! 
! <textarea name="content" ROWS="22" COLS="80" wrap="virtual">###CONTENT###</textarea>
! <br>
! 
! <input type="checkbox" name="convert" value="tabs" >
! No puedo escribir tabulaciones. Por favor <a href="###SCRIPTURL###?ConvierteEspaciosEnTabs">ConvierteEspaciosEnTabs</a> 
! al guardar. 
! <p><a href="###SCRIPTURL###?BuenEstilo">BuenEstilo</a> tips para editar. <br>
! <a href="###SCRIPTURL###?links=###PAGEURL###">EditarEnlaces</a> a otros servidores. 
! ###IF COPY###<br>
! <a href="###SCRIPTURL###?copy=###PAGEURL###">EditarCopia</a> De un autor previo 
! <hr noshade>
! <small> <b>&Eacute;nfasis:</b> '' para it&aacute;licas, ''' para bold, ''''' 
! para ambos <br>
! <b>Listas:</b> tab-* para listas de balazos, tab-# para listas numeradas, tab-Term:-tab 
! para listas de definiciones <br>
! <b>Referencias:</b> UnirPalabrasEnMay&uacute;sculas o usar corchetes para una 
! [enlace hacia una p&aacute;gina] o URL [http://cool.wiki.int/]. <br>
! <b>Referencias:</b> Use [1],[2],[3],... y EditarEnlacess. Evite hacer enlaces 
! con "!": !NoHiperEnlaces. Enlaces con nombres como [text | URL] <br>
! <b>Varios:</b>"!", "!!", "!!!" para hacer t&iacute;tulos, "%%%" hace un salto 
! de l&iacute;nea, "- - - -" Hace una linea horizontal, escapar "[" con "[[" <br>
! M&aacute;s en <a href="###SCRIPTURL###?ReglasDeFormatoDeTexto"><b>ReglasDeFormatoDeTexto</b></a> 
! </small> 
! <input type="hidden" name="post" value="###PAGEURL###">
! <input type="hidden" name="editversion" value="###VERSION###">
! </form>
! </body>
! </html>
Index: message.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/templates/message.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** message.html	2000年11月02日 21:15:33	1.1
--- message.html	2001年02月01日 07:06:39	1.2
***************
*** 1,15 ****
! <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###PAGE###</title>
! </head>
! 
! <body bgcolor=linen text=black alink=red link=darkblue vlink=darkmagenta>
! 
! <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
! ###PAGE###</h1>
! 
! ###CONTENT###
! 
! </body>
! </html>
--- 1,15 ----
! <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###PAGE###</title>
! </head>
! 
! <body bgcolor=linen text=black alink=red link=darkblue vlink=darkmagenta>
! 
! <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
! ###PAGE###</h1>
! 
! ###CONTENT###
! 
! </body>
! </html>

Update of /cvsroot/phpwiki/phpwiki/locale/es/LC_MESSAGES
In directory usw-pr-cvs1:/tmp/cvs-serv27228/es/LC_MESSAGES
Modified Files:
	phpwiki.mo phpwiki.php 
Log Message:
update to spanish locale by Pablo Roca Rozas
Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Binary files /tmp/cvs5vuqBR and /tmp/cvskE0kdB differ
Index: phpwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/LC_MESSAGES/phpwiki.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** phpwiki.php	2000年11月13日 11:22:10	1.2
--- phpwiki.php	2001年02月01日 07:06:39	1.3
***************
*** 1,4 ****
--- 1,18 ----
 <?php
 
+ $locale["You entered an invalid login or password."] =
+ "Se h&aacute; introducido un nombre de usuario o palabra de paso invalido.";
+ $locale["You are about to remove '%s' permanently!"] =
+ "¡Va a borrar '%s' permanentemente!";
+ $locale["Click %shere%s to remove the page now."] =
+ "Haga Click %aqu&iacute;% para borrar la p&aacute;gina ahora";
+ $locale["Otherwise press the \"Back\" button of your browser."] =
+ "En caso contrario pulse el bot&oacute; \"Atr&aacute;s\" en su navegador";
+ $locale["Function not yet implemented."] =
+ "Funci&oacute;n todav&iacute; no implementada";
+ $locale["Remove page"] =
+ "Borrar p&aacute;gina";
+ $locale["Removed page '%s' succesfully."] =
+ "P&aacute;gina '%s' borrada satisfactoriamente.";
 $locale["templates/browse.html"] =
 "locale/es/templates/browse.html";
***************
*** 36,40 ****
 "Diferencia de %s.";
 $locale["FrontPage"] =
! "PrimeraPlana";
 $locale["Describe %s here."] =
 "Describe %s aqu&iacute;.";
--- 50,54 ----
 "Diferencia de %s.";
 $locale["FrontPage"] =
! "PaginaPrincipal";
 $locale["Describe %s here."] =
 "Describe %s aqu&iacute;.";
***************
*** 42,46 ****
 "Copia de %s";
 $locale["No page name passed into editpage!"] =
! "¡Ning&uacute;n nombre de p&aacute;gina pas&oacute; dentro de la p&aacute;gina de edici&oacute;n!";
 $locale["This page has been locked by the administrator and cannot be edited."] =
 "Esta p&aacute;gina ha sido bloqueada por el administrador y no puede ser editada.";
--- 56,60 ----
 "Copia de %s";
 $locale["No page name passed into editpage!"] =
! "No se h&aacute; pasado nombre de p&aacute;gina a editarpagina";
 $locale["This page has been locked by the administrator and cannot be edited."] =
 "Esta p&aacute;gina ha sido bloqueada por el administrador y no puede ser editada.";
***************
*** 60,66 ****
 "Mensaje de error: %s";
 $locale["Cannot open database %s, giving up."] =
! "No puedo abrir la base de datos %s me doy por vencido.";
 $locale["Insert/update failed: %s"] =
! "Inserci&oacute;n/actualizaci&oacute;n fall&oacute;: %s";
 $locale["Delete on %s failed: %s"] =
 "Eliminaci&oacute;n en %s fall&oacute;: %s";
--- 74,80 ----
 "Mensaje de error: %s";
 $locale["Cannot open database %s, giving up."] =
! "No se puede abrir la base de datos %s , me doy por vencido.";
 $locale["Insert/update failed: %s"] =
! "Inserci&oacute;n/Actualizaci&oacute;n fall&oacute;: %s";
 $locale["Delete on %s failed: %s"] =
 "Eliminaci&oacute;n en %s fall&oacute;: %s";
***************
*** 71,74 ****
--- 85,90 ----
 $locale["Error writing page '%s'"] =
 "Error al escribir la p&aacute;gina `%s'";
+ $locale["Cannot delete '%s' from table '%s'"] =
+ "No se puede borrar '%s' de la tabla '%s'";
 $locale["Enter a page name"] =
 "Escriba un nombre de p&aacute;gina";
***************
*** 76,80 ****
 "Aceptar";
 $locale["Show the page source and references"] =
! "Mostrar la fuente de la p&aacute;gina y referencias";
 $locale["PageInfo"] =
 "InformacionDeLaPagina";
--- 92,96 ----
 "Aceptar";
 $locale["Show the page source and references"] =
! "Mostrar el c&oacute;digo fuente de la p&aacute;gina y referencias";
 $locale["PageInfo"] =
 "InformacionDeLaPagina";
***************
*** 85,88 ****
--- 101,120 ----
 $locale["Archived version"] =
 "Versi&oacute;n archivada:";
+ $locale["RecentChanges"] =
+ "CambiosRecientes";
+ $locale["PhpWiki is unable to save your changes, because another user edited and saved the page while you were editing the page too. If saving proceeded now changes from the previous author would be lost."] =
+ "PhpWiki no es capaz de grabar sus cambios, debido a que otro usuarioh&aacute; editado y guardado la p&aacute;gina mientras usted estaba editando esta p&aacute;gina. Si se guarda ahora los cambios del autor anterior se podr&iacute;an perder.";
+ $locale["In order to recover from this situation follow these steps:"] =
+ "Para restaurar esta situaci&oacute;n siga los siguientes pasos:";
+ $locale["Use your browser's <b>Back</b> button to go back to the edit page."] =
+ "Use el bot&oacute;n <b>Atr&aacute;s<b> para retornar a la p&aacute;gina editada";
+ $locale["Copy your changes to the clipboard or to another temporary place (e.g. text editor)."] =
+ "Copie sus cambios al portapapeles o a otro sitio temporal (p.ej. editor de textos).";
+ $locale["<b>Reload</b> the page. You should now see the most current version of the page. Your changes are no longer there."] =
+ "<b>Vuelva a cargar</b> la p&aacute;gina. Ahora podr&aacute; ver la versi&oacute;n mas actual de la p&aacute;gina. Sus cambios no est&aacute;n ah&iacute;.";
+ $locale["Make changes to the file again. Paste your additions from the clipboard (or text editor)."] =
+ "Haga cambios a la p&aacute;gina otra vez. Pegue sus modificaciones del portapapeles (o del editor de textos).";
+ $locale["Press <b>Save</b> again."] =
+ "Pulse <b>Guardar<b> otra vez.";
 $locale["Problem while updating %s"] =
 "Problema al editar %s";
***************
*** 90,108 ****
 "Gracias por editar %s.";
 $locale["Your careful attention to detail is much appreciated."] =
! "Tu cuidadosa atenci&oacute;n a los detalles es muy agradecida.";
 $locale["Inserting page %s, version %s from %s"] =
 "Insertando p&aacute;gina %s, versi&oacute;n %s de %s";
 $locale["WikiFatalError"] =
 "ErrorFatalDeWiki";
 $locale["%d best incoming links:"] =
! "%d mejores ligas de entrada:";
 $locale["%d best outgoing links:"] =
! "%d mejores ligas de salida:";
 $locale["%d most popular nearby:"] =
 "%d las m&aacute;s populares:";
- $locale["Stack bounds exceeded in SetHTMLOutputMode"] =
- "L&iacute;mites de la pila excedidos en SetHTMLOutputMode";
- $locale["RecentChanges"] =
- "CambiosRecientes";
 
 ;?>
--- 122,142 ----
 "Gracias por editar %s.";
 $locale["Your careful attention to detail is much appreciated."] =
! "Se agradece una cuidadosa atenci&oacute;n a los detalles.";
! $locale["Title Search Results"] =
! "Resultados de la búsqueda en el texto completo";
 $locale["Inserting page %s, version %s from %s"] =
 "Insertando p&aacute;gina %s, versi&oacute;n %s de %s";
 $locale["WikiFatalError"] =
 "ErrorFatalDeWiki";
+ $locale["Search"] =
+ "Buscar";
+ $locale["Stack bounds exceeded in SetHTMLOutputMode"] =
+ "L&iacute;mites de la pila excedidos en SetHTMLOutputMode";
 $locale["%d best incoming links:"] =
! "%d mejores enlaces de entrada:";
 $locale["%d best outgoing links:"] =
! "%d mejores enlaces de salida:";
 $locale["%d most popular nearby:"] =
 "%d las m&aacute;s populares:";
 
 ;?>

Update of /cvsroot/phpwiki/phpwiki/locale/es/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv27126/es/pgsrc
Added Files:
	PaginaPrincipal 
Removed Files:
	PrimeraPlana 
Log Message:
renamed 'PrimeraPlana' to 'PaginaPrincipal'
--- NEW FILE ---
*¿Qué es un WikiWikiWeb? Una descripción de esta aplicación.
*Aprenda ComoUsarWiki y aprenda acerca como AgregarPaginas.
*Use la página de CajaDeArena para experimentar con las páginas Wiki.
*Por favor firme en los VisitantesRecientes.
*Vea en los CambiosRecientes las últimas modificaciones.
*Averigüe que paginas son MasPopulares.
*Lea las NotasDeLiberacion
--- PrimeraPlana DELETED ---

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv18290
Modified Files:
	HISTORY 
Log Message:
Wrote list of additions/changes for 1.2
Index: HISTORY
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/HISTORY,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** HISTORY	2000年11月06日 03:19:16	1.11
--- HISTORY	2001年02月01日 05:35:01	1.12
***************
*** 1,2 ****
--- 1,18 ----
+ 1.2.0 02/01/01
+ * Support for PHP 4.0.4 (using the dba_* interface for DBM files),
+ thanks to Joel Uckelman
+ * Swedish translation added, thanks to Jon Åslund
+ * dbmlib.php has all functions in mysql/postgresql, thanks to Jan Hidder
+ * German version updated
+ * Dutch translation updated
+ * Spanish version updated
+ * More robust support for flat file based Wiki (INSTALL.flatfile
+ included)
+ * "named internal links," i.e. [wow | FrontPage]
+ * New IF syntax added to templates
+ * New PhpWikiAdministration page added
+ * New term/defintion syntax (for <DT><DD> tags)
+ * Plenty of bug fixes
+ 
 1.1.9 11/05/00: 
 * Spanish language support added, thanks to Sandino Araico 

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv11900
Modified Files:
	INSTALL.flatfile 
Log Message:
Minor addition of info, and a note on the stability and features in
the flat file version.
Index: INSTALL.flatfile
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/INSTALL.flatfile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** INSTALL.flatfile	2001年01月06日 19:30:31	1.1
--- INSTALL.flatfile	2001年02月01日 04:34:08	1.2
***************
*** 2,6 ****
 MySQL or Postgresql, and your system does not support DBM files
 or (worse) has a broken implementation like NDBM on Solaris, then
! a flat file Wiki might work for you.
 
 Installation is similar to using a DBM file for storing the pages.
--- 2,9 ----
 MySQL or Postgresql, and your system does not support DBM files
 or (worse) has a broken implementation like NDBM on Solaris, then
! a flat file Wiki should work for you. Note that as of 1.2 most of the
! Wiki functionality is there... the MostPopular is not implemented yet
! so you will want to delete that link from the FrontPage (or better
! yet, write it and mail us a patch ;-)
 
 Installation is similar to using a DBM file for storing the pages.
***************
*** 79,84 ****
 you. The drawback to this approach is that you won't be able to edit
 the files or copy them from the command line, but most people can live
! with this limitation. This will require you to TEMPORARILY make the
! phpwiki/ directory world writable:
 
 cd ..
--- 82,90 ----
 you. The drawback to this approach is that you won't be able to edit
 the files or copy them from the command line, but most people can live
! with this limitation. (This is how you would do it on SourceForge, by
! the way; they have a cron job that sweeps the filesystem every few
! hours looking for things that are set world writable and change the
! permission.) This will require you to TEMPORARILY make the phpwiki/
! directory world writable:
 
 cd ..