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

[phpwiki-checkins] CVS: phpwiki/templates browse.html,1.7,1.8

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/templates
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19912

Modified Files:
	browse.html 
Log Message:
included admin section

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** browse.html	2000/10/20 11:49:07	1.7
--- browse.html	2000/11/08 15:49:15	1.8
***************
*** 8,16 ****
  <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>
  <P>
  ###CONTENT###
  <hr noshade>
! <a href="###SCRIPTURL###?edit=###PAGEURL###">EditText</a>
!  of this page (last edited ###LASTMODIFIED###)
  [<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>]
  [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>])
--- 8,27 ----
  <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>]
+ - - 
+ [Remove page &gt;<a href="###SCRIPTURL###?remove=###PAGEURL###">.</A>&lt;]
+ <hr noshade>
+ ###ENDIF:ADMIN###
  <P>
  ###CONTENT###
  <hr noshade>
! ###IF ADMIN###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditText</a> of this page
! ###IF:!ADMIN###
! ###IF LOCK###Page locked
! ###IF !LOCK###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditText</a> of this page
! ###ENDIF:!ADMIN###
! (last edited ###LASTMODIFIED###)
  [<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>]
  [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>])

[phpwiki-checkins] CVS: phpwiki admin.php,1.1,1.2

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19217

Modified Files:
	admin.php 
Log Message:
removed default user/pwd

Index: admin.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** admin.php	2000/11/08 15:32:34	1.1
--- admin.php	2000/11/08 15:43:46	1.2
***************
*** 10,15 ****
     // set these to your preferences. For heaven's sake
     // pick a good password!
!    $wikiadmin   = "wiki";
!    $adminpasswd = "wiki";
  
     // Do not tolerate sloppy systems administration
--- 10,15 ----
     // set these to your preferences. For heaven's sake
     // pick a good password!
!    $wikiadmin   = "";
!    $adminpasswd = "";
  
     // Do not tolerate sloppy systems administration

[phpwiki-checkins] CVS: phpwiki/lib mysql.php,1.3,1.4

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19048

Modified Files:
	mysql.php 
Log Message:
added function RemovePage()

Index: mysql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/mysql.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** mysql.php	2000/10/20 11:42:52	1.3
--- mysql.php	2000/11/08 15:40:56	1.4
***************
*** 146,149 ****
--- 146,174 ----
  
  
+    function RemovePage($dbi, $pagename) {
+       global $WikiPageStore, $ArchivePageStore;
+ 
+       $pagename = addslashes($pagename);
+       $msg = gettext ("Cannot delete '%s' from table '%s'");
+       $msg .= "<br>\n";
+       $msg .= gettext ("MySQL error: %s");
+ 
+       if (!mysql_query("delete from $WikiPageStore where pagename='$pagename'", $dbi['dbc']))
+          ExitWiki(sprintf($msg, $pagename, $WikiPageStore, mysql_error()));
+ 
+       if (!mysql_query("delete from $ArchivePageStore where pagename='$pagename'", $dbi['dbc']))
+          ExitWiki(sprintf($msg, $pagename, $ArchivePageStore, mysql_error()));
+ 
+       if (!mysql_query("delete from wikilinks where frompage='$pagename'", $dbi['dbc']))
+          ExitWiki(sprintf($msg, $pagename, 'wikilinks', mysql_error()));
+ 
+       if (!mysql_query("delete from hitcount where pagename='$pagename'", $dbi['dbc']))
+          ExitWiki(sprintf($msg, $pagename, 'hitcount', mysql_error()));
+ 
+       if (!mysql_query("delete from wikiscore where pagename='$pagename'", $dbi['dbc']))
+          ExitWiki(sprintf($msg, $pagename, 'wikiscore', mysql_error()));
+    }
+ 
+ 
     function IncreaseHitCount($dbi, $pagename)
     {

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.14,1.15 stdlib.php,1.8,1.9 editpage.php,1.6,1.7 savepage.php,1.5,1.6 transform.php,1.6,1.7

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv18972

Modified Files:
	config.php stdlib.php editpage.php savepage.php transform.php 
Log Message:
updates due to new admin structure

Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** config.php	2000/11/01 10:24:58	1.14
--- config.php	2000/11/08 15:40:00	1.15
***************
*** 1,19 ****
  <?php
     if (!function_exists('rcs_id')) {
        function rcs_id($id) { echo "<!-- $id -->\n"; };
     }
     rcs_id('$Id$');
  
     /////////////////////////////////////////////////////////////////////
     // Constants and settings. Edit the values below for your site.
  
     // URL of index.php e.g. http://yoursite.com/phpwiki/index.php
     // you can leave this empty - it will be calculated automatically
     $ScriptUrl = "";
  
     //  Select your language - default language "C": English
     // other languages available: Dutch "nl", Spanish "es"
     $LANG="C";
- 
     /////////////////////////////////////////////////////////////////////
     // Database section
--- 1,30 ----
  <?php
+    // essential internal stuff -- skip it
+    set_magic_quotes_runtime(0);
+    error_reporting(E_ALL ^ E_NOTICE);
+ 
     if (!function_exists('rcs_id')) {
        function rcs_id($id) { echo "<!-- $id -->\n"; };
     }
     rcs_id('$Id$');
+    // end essential internal stuff
+ 
  
     /////////////////////////////////////////////////////////////////////
     // Constants and settings. Edit the values below for your site.
+    /////////////////////////////////////////////////////////////////////
  
+ 
     // URL of index.php e.g. http://yoursite.com/phpwiki/index.php
     // you can leave this empty - it will be calculated automatically
     $ScriptUrl = "";
+    // URL of admin.php e.g. http://yoursite.com/phpwiki/admin.php
+    // you can leave this empty - it will be calculated automatically
+    // if you fill in $ScriptUrl you *MUST* fill in $AdminUrl as well!
+    $AdminUrl = "";
  
     //  Select your language - default language "C": English
     // other languages available: Dutch "nl", Spanish "es"
     $LANG="C";
     /////////////////////////////////////////////////////////////////////
     // Database section
***************
*** 180,185 ****
  
     if (empty($ScriptUrl)) {
!       $ScriptUrl = "http://$SERVER_NAME:$SERVER_PORT$SCRIPT_NAME";
     }
  
     $LogoImage = "<img src=\"$logo\" border=0 ALT=\"[PhpWiki!]\">";
--- 191,199 ----
  
     if (empty($ScriptUrl)) {
!       $port = ($SERVER_PORT == 80) ? '' : ":$SERVER_PORT";
!       $ScriptUrl = "http://$SERVER_NAME$port$SCRIPT_NAME";
     }
+    if (defined('WIKI_ADMIN') && !empty($AdminUrl))
+       $ScriptUrl = $AdminUrl;
  
     $LogoImage = "<img src=\"$logo\" border=0 ALT=\"[PhpWiki!]\">";

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** stdlib.php	2000/11/01 11:31:41	1.8
--- stdlib.php	2000/11/08 15:40:00	1.9
***************
*** 1,4 ****
- <!-- $Id$ -->
  <?php
     /*
        Standard functions for Wiki functionality
--- 1,4 ----
  <?php
+    rcs_id('$Id$');
     /*
        Standard functions for Wiki functionality
***************
*** 38,42 ****
           print "\n</BODY></HTML>";
        }
!       exit();
     }
  
--- 38,42 ----
           print "\n</BODY></HTML>";
        }
!       exit;
     }
  
***************
*** 93,126 ****
           unset($hash);
  
        $page = join('', file($templates[$template]));
!       $page = str_replace('###', "#$FieldSeparator#", $page);
  
        // valid for all pagetypes
!       $page = str_replace("#$FieldSeparator#SCRIPTURL#$FieldSeparator#",
! 			$ScriptUrl, $page);
!       $page = str_replace("#$FieldSeparator#PAGE#$FieldSeparator#",
! 			htmlspecialchars($name), $page);
!       $page = str_replace("#$FieldSeparator#ALLOWEDPROTOCOLS#$FieldSeparator#",
! 			$AllowedProtocols, $page);
!       $page = str_replace("#$FieldSeparator#LOGO#$FieldSeparator#",
!                         $logo, $page);
! 
        // invalid for messages (search results, error messages)
        if ($template != 'MESSAGE') {
!          $page = str_replace("#$FieldSeparator#PAGEURL#$FieldSeparator#",
! 			rawurlencode($name), $page);
!          $page = str_replace("#$FieldSeparator#LASTMODIFIED#$FieldSeparator#",
  			date($datetimeformat, $hash['lastmodified']), $page);
!          $page = str_replace("#$FieldSeparator#LASTAUTHOR#$FieldSeparator#",
! 			$hash['author'], $page);
!          $page = str_replace("#$FieldSeparator#VERSION#$FieldSeparator#",
! 			$hash['version'], $page);
! 	 if (strstr($page, "#$FieldSeparator#HITS#$FieldSeparator#")) {
!             $page = str_replace("#$FieldSeparator#HITS#$FieldSeparator#",
! 			GetHitCount($dbi, $name), $page);
  	 }
! 	 if (strstr($page, "#$FieldSeparator#RELATEDPAGES#$FieldSeparator#")) {
!             $page = str_replace("#$FieldSeparator#RELATEDPAGES#$FieldSeparator#",
! 			LinkRelatedPages($dbi, $name), $page);
  	 }
        }
--- 93,155 ----
           unset($hash);
  
+       function _dotoken ($id, $val, &$page) {
+ 	 global $FieldSeparator;
+          $page = str_replace("$FieldSeparator#$id$FieldSeparator#",
+ 				$val, $page);
+       }
+ 
+       function _iftoken ($id, $condition, &$page) {
+          global $FieldSeparator;
+ 
+ 	 // line based IF directive
+ 	 $lineyes = "$FieldSeparator#IF $id$FieldSeparator#";
+ 	 $lineno = "$FieldSeparator#IF !$id$FieldSeparator#";
+          // block based IF directive
+ 	 $blockyes = "$FieldSeparator#IF:$id$FieldSeparator#";
+ 	 $blockyesend = "$FieldSeparator#ENDIF:$id$FieldSeparator#";
+ 	 $blockno = "$FieldSeparator#IF:!$id$FieldSeparator#";
+ 	 $blocknoend = "$FieldSeparator#ENDIF:!$id$FieldSeparator#";
+ 
+ 	 if ($condition) {
+ 	    $page = str_replace($lineyes, '', $page);
+ 	    $page = str_replace($blockyes, '', $page);
+ 	    $page = str_replace($blockyesend, '', $page);
+ 	    $page = preg_replace("/$blockno(.*?)$blocknoend/s", '', $page);
+ 	    $page = ereg_replace("{$lineno}[^\n]*\n", '', $page);
+          } else {
+ 	    $page = str_replace($lineno, '', $page);
+ 	    $page = str_replace($blockno, '', $page);
+ 	    $page = str_replace($blocknoend, '', $page);
+ 	    $page = preg_replace("/$blockyes(.*?)$blockyesend/s", '', $page);
+ 	    $page = ereg_replace("{$lineyes}[^\n]*\n", '', $page);
+ 	 }
+       }
+ 
        $page = join('', file($templates[$template]));
!       $page = str_replace('###', "$FieldSeparator#", $page);
  
        // valid for all pagetypes
!       _iftoken('COPY', isset($hash['copy']), $page);
!       _iftoken('LOCK',	(isset($hash['flags']) &&
! 			($hash['flags'] & FLAG_PAGE_LOCKED)), $page);
!       _iftoken('ADMIN', defined('WIKI_ADMIN'), $page);
! 
!       _dotoken('SCRIPTURL', $ScriptUrl, $page);
!       _dotoken('PAGE', htmlspecialchars($name), $page);
!       _dotoken('ALLOWEDPROTOCOLS', $AllowedProtocols, $page);
!       _dotoken('LOGO', $logo, $page);
!       
        // invalid for messages (search results, error messages)
        if ($template != 'MESSAGE') {
!          _dotoken('PAGEURL', rawurlencode($name), $page);
!          _dotoken('LASTMODIFIED',
  			date($datetimeformat, $hash['lastmodified']), $page);
!          _dotoken('LASTAUTHOR', $hash['author'], $page);
!          _dotoken('VERSION', $hash['version'], $page);
! 	 if (strstr($page, "$FieldSeparator#HITS$FieldSeparator#")) {
!             _dotoken('HITS', GetHitCount($dbi, $name), $page);
  	 }
! 	 if (strstr($page, "$FieldSeparator#RELATEDPAGES$FieldSeparator#")) {
!             _dotoken('RELATEDPAGES', LinkRelatedPages($dbi, $name), $page);
  	 }
        }
***************
*** 129,146 ****
        if ($template == 'EDITLINKS') {
  	 for ($i = 1; $i <= NUM_LINKS; $i++)
! 	    $page = str_replace("#$FieldSeparator#R$i#$FieldSeparator#",
! 			$hash['refs'][$i], $page);
!       }
! 
!       if (isset($hash['copy'])) {
! 	 $page = str_replace("#$FieldSeparator#IFCOPY#$FieldSeparator#",
! 			'', $page);
!       } else {
! 	 $page = ereg_replace("#$FieldSeparator#IFCOPY#$FieldSeparator#[^\n]*",
! 			'', $page);
        }
  
!       $page = str_replace("#$FieldSeparator#CONTENT#$FieldSeparator#",
! 			$content, $page);
        print $page;
     }
--- 158,165 ----
        if ($template == 'EDITLINKS') {
  	 for ($i = 1; $i <= NUM_LINKS; $i++)
! 	    _dotoken("R$i", $hash['refs'][$i], $page);
        }
  
!       _dotoken('CONTENT', $content, $page);
        print $page;
     }
***************
*** 207,210 ****
--- 226,243 ----
        
        return $result;
+    }
+ 
+    function ParseAdminTokens($line) {
+       global $ScriptUrl;
+       
+       while (preg_match("/%%ADMIN-INPUT-(.*?)-(\w+)%%/", $line, $matches)) {
+ 	 $head = str_replace("_", " ", $matches[2]);
+          $form = "<FORM ACTION=\"$ScriptUrl\" METHOD=POST>"
+ 		."$head: <INPUT NAME=$matches[1] SIZE=20> "
+ 		."<INPUT TYPE=SUBMIT VALUE=\"" . gettext("Go") . "\">"
+ 		."</FORM>";
+ 	 $line = str_replace($matches[0], $form, $line);
+       }
+       return $line;
     }
  

Index: editpage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** editpage.php	2000/11/01 11:31:41	1.6
--- editpage.php	2000/11/08 15:40:00	1.7
***************
*** 27,31 ****
     if (is_array($pagehash)) {
  
!       if (($pagehash['flags'] & FLAG_PAGE_LOCKED) && !$admin_edit) {
  	 $html = "<p>";
  	 $html .= gettext ("This page has been locked by the administrator and cannot be edited.");
--- 27,31 ----
     if (is_array($pagehash)) {
  
!       if (($pagehash['flags'] & FLAG_PAGE_LOCKED) && !defined('WIKI_ADMIN')) {
  	 $html = "<p>";
  	 $html .= gettext ("This page has been locked by the administrator and cannot be edited.");

Index: savepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** savepage.php	2000/11/01 11:31:41	1.5
--- savepage.php	2000/11/08 15:40:00	1.6
***************
*** 49,53 ****
        $newpage = 1;
     } else {
!       if (($pagehash['flags'] & FLAG_PAGE_LOCKED) && !$admin_edit) {
  	 $html = "<p>" . gettext ("This page has been locked by the administrator and cannot be edited.");
  	 $html .= "\n<p>" . gettext ("Sorry for the inconvenience.");
--- 49,53 ----
        $newpage = 1;
     } else {
!       if (($pagehash['flags'] & FLAG_PAGE_LOCKED) && !defined('WIKI_ADMIN')) {
  	 $html = "<p>" . gettext ("This page has been locked by the administrator and cannot be edited.");
  	 $html .= "\n<p>" . gettext ("Sorry for the inconvenience.");

Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** transform.php	2000/10/31 19:24:08	1.6
--- transform.php	2000/11/08 15:40:00	1.7
***************
*** 236,239 ****
--- 236,241 ----
        $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);
  
        ///////////////////////////////////////////////////////

[phpwiki-checkins] CVS: phpwiki index.php,1.4,1.5

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory slayer.i.sourceforge.net:/tmp/cvs-serv18319

Modified Files:
	index.php 
Log Message:
adapted, so that index.php can be included by admin.php

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** index.php	2000/11/01 11:31:40	1.4
--- index.php	2000/11/08 15:34:06	1.5
***************
*** 7,20 ****
     */
  
!    set_magic_quotes_runtime(0);
!    error_reporting(E_ALL ^ E_NOTICE);   // remove E_NOTICE for debugging
  
!    include "lib/config.php";
!    include "lib/stdlib.php";
  
-    // All requests require the database
-    $dbi = OpenDataBase($WikiPageStore);
- 
- 
     // Allow choice of submit buttons to determine type of search:
     if (isset($searchtype) && ($searchtype == 'full'))
--- 7,18 ----
     */
  
!    if (!defined('WIKI_ADMIN')) { // index.php not included by admin.php?
!       include "lib/config.php";
!       include "lib/stdlib.php";
  
!       // All requests require the database
!       $dbi = OpenDataBase($WikiPageStore);
!    }
  
     // Allow choice of submit buttons to determine type of search:
     if (isset($searchtype) && ($searchtype == 'full'))
***************
*** 24,28 ****
  
     if (isset($edit)) {
-       $admin_edit = 0;
        include "lib/editpage.php";
     } elseif (isset($links)) {
--- 22,25 ----

[phpwiki-checkins] CVS: phpwiki admin.php,NONE,1.1

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory slayer.i.sourceforge.net:/tmp/cvs-serv18254

Added Files:
	admin.php 
Log Message:
initial commit of admin.php

***** Error reading new file: (2, 'No such file or directory')

[phpwiki-checkins] CVS: phpwiki/admin dumpserial.php,NONE,1.1 loadserial.php,NONE,1.1 lockpage.php,NONE,1.1 zip.php,NONE,1.1 wiki_dumpserial.php,1.5,NONE wiki_loadserial.php,1.4,NONE wiki_lockpage.php,1.4,NONE wiki_zip.php3,1.10,NONE

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/admin
In directory slayer.i.sourceforge.net:/tmp/cvs-serv18073

Added Files:
	dumpserial.php loadserial.php lockpage.php zip.php 
Removed Files:
	wiki_dumpserial.php wiki_loadserial.php wiki_lockpage.php 
	wiki_zip.php3 
Log Message:
renaming files to scheme used in lib/: dropping wiki_ prefix

***** Error reading new file: (2, 'No such file or directory')
***** Error reading new file: (2, 'No such file or directory')
***** Error reading new file: (2, 'No such file or directory')
***** Error reading new file: (2, 'No such file or directory')
--- wiki_dumpserial.php DELETED ---

--- wiki_loadserial.php DELETED ---

--- wiki_lockpage.php DELETED ---

--- wiki_zip.php3 DELETED ---

[phpwiki-checkins] CVS: phpwiki/admin index.php3,1.9,NONE wiki_auth.php3,1.3,NONE wiki_adminforms.php,1.8,NONE

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/admin
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17799

Removed Files:
	index.php3 wiki_auth.php3 wiki_adminforms.php 
Log Message:
admin change - removed obsolete files - functionality is now in admin.php

--- index.php3 DELETED ---

--- wiki_auth.php3 DELETED ---

--- wiki_adminforms.php DELETED ---

[phpwiki-checkins] CVS: phpwiki/lib msql.php,1.4,1.5

[Steve W. <wai...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv30460

Modified Files:
	msql.php 
Log Message:
Added GetWikiPageLinks, SetWikiPageLinks, eliminated error messages,
though the functionality is still not there.

Index: msql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/msql.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** msql.php	2000/11/03 05:27:51	1.4
--- msql.php	2000/11/07 05:13:22	1.5
***************
*** 452,455 ****
--- 452,514 ----
     }
  
+    ////////////////////////////////////////
+    // functionality for the wikilinks table
+ 
+    // takes a page name, returns array of scored incoming and outgoing links
+    function GetWikiPageLinks($dbi, $pagename) {
+       $links = array();
+       $pagename = addslashes($pagename);
+       $res = msql_query("select wikilinks.topage, wikiscore.score from wikilinks, wikiscore where wikilinks.topage=wikiscore.pagename and wikilinks.frompage='$pagename' order by score desc, topage", $dbi['dbc']);
+ 
+       $rows = msql_num_rows($res);
+       for ($i = 0; $i < $rows; $i++) {
+ 	 $out = msql_fetch_array($res);
+ 	 $links['out'][] = array($out['topage'], $out['score']);
+       }
+ 
+       $res = msql_query("select wikilinks.frompage, wikiscore.score from wikilinks, wikiscore where wikilinks.frompage=wikiscore.pagename and wikilinks.topage='$pagename' order by score desc, frompage", $dbi['dbc']);
+       $rows = msql_num_rows($res);
+       for ($i = 0; $i < $rows; $i++) {
+ 	 $out = msql_fetch_array($res);
+ 	 $links['in'][] = array($out['frompage'], $out['score']);
+       }
+ 
+       $res = msql_query("select distinct hitcount.pagename, hitcount.hits from wikilinks, hitcount where (wikilinks.frompage=hitcounts.pagename and wikilinks.topage='$pagename') or (wikilinks.topage=pagename and wikilinks.frompage='$pagename') order by hitcount.hits desc, wikilinks.pagename", $dbi['dbc']);
+       $rows = msql_num_rows($res);
+       for ($i = 0; $i < $rows; $i++) {
+ 	 $out = msql_fetch_array($res);
+ 	 $links['popular'][] = array($out['pagename'], $out['hits']);
+       }
+ 
+       return $links;
+    }
+ 
+ 
+    // takes page name, list of links it contains
+    // the $linklist is an array where the keys are the page names
+    function SetWikiPageLinks($dbi, $pagename, $linklist) {
+       $frompage = addslashes($pagename);
+ 
+       // first delete the old list of links
+       msql_query("delete from wikilinks where frompage='$frompage'",
+ 		$dbi["dbc"]);
+ 
+       // the page may not have links, return if not
+       if (! count($linklist))
+          return;
+       // now insert the new list of links
+       while (list($topage, $count) = each($linklist)) {
+          $topage = addslashes($topage);
+ 	 if($topage != $frompage) {
+             msql_query("insert into wikilinks (frompage, topage) " .
+                      "values ('$frompage', '$topage')", $dbi["dbc"]);
+ 	 }
+       }
+ 
+       // update pagescore. rotsa ruck.
+       msql_query("delete from wikiscore", $dbi["dbc"]);
+       msql_query("insert into wikiscore select w1.topage, count(*) from wikilinks as w1, wikilinks as w2 where w2.topage=w1.frompage group by w1.topage", $dbi["dbc"]);
+    }
+ 
  
  ?>

[phpwiki-checkins] CVS: phpwiki/locale/de/pgsrc EditiereText,1.1,1.2 FrischeSeiten,1.1,1.2 GaesteBuch,1.1,1.2 MeistBesucht,1.1,1.2 SandKiste,1.1,1.2 StartSeite,1.1,1.2 WieManWikiBenutzt,1.1,1.2

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/pgsrc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv536

Modified Files:
	EditiereText FrischeSeiten GaesteBuch MeistBesucht SandKiste 
	StartSeite WieManWikiBenutzt 
Log Message:
translated into German

Index: EditiereText
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/EditiereText,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** EditiereText	2000/11/02 21:15:32	1.1
--- EditiereText	2000/11/06 17:31:54	1.2
***************
*** 1 ****
! All pages (except search results) have an EditText link at the bottom. You can edit the page you are reading by clicking that link.
--- 1 ----
! Alle Seiten haben einen EditiereText link am unteren Ende. Man kann eine Seite editieren, indem man diesen Link anklickt.

Index: FrischeSeiten
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/FrischeSeiten,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FrischeSeiten	2000/11/02 21:15:32	1.1
--- FrischeSeiten	2000/11/06 17:31:54	1.2
***************
*** 1,5 ****
! The most recently changed pages are listed below.
  
! ____Day one (first day for this Wiki)
  * [SeitenErzeugen]
  * [KonvertiereLeerzeichenZuTabs]
--- 1,5 ----
! Hier findest du eine Liste kürzlich veränderter oder neuer Seiten.
  
! ____Erster Tag dises Wikis
  * [SeitenErzeugen]
  * [KonvertiereLeerzeichenZuTabs]
***************
*** 22,28 ****
  * [WikiWikiWeb]
  
! Quick page search:
  %%Search%%
- ----
- 
- 
--- 22,25 ----
  * [WikiWikiWeb]
  
! Schnelle Titelsuche:
  %%Search%%

Index: GaesteBuch
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/GaesteBuch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** GaesteBuch	2000/11/02 21:15:32	1.1
--- GaesteBuch	2000/11/06 17:31:54	1.2
***************
*** 1,5 ****
! Sign and date your name below!
  
! Jeff Dairiki, Arno Hollosi, SteveWainstead, Php Wiki authors
  
  
--- 1,5 ----
! Trage dich einfach mit Namen und Datum unten ein!
  
! Jeff Dairiki, Arno Hollosi, SteveWainstead, Php Wiki Autoren
  
  

Index: MeistBesucht
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/MeistBesucht,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MeistBesucht	2000/11/02 21:15:32	1.1
--- MeistBesucht	2000/11/06 17:31:54	1.2
***************
*** 1,4 ****
! The 20 most popular pages of this wiki:
! (hitcount, pagename)
  
  %%Mostpopular%%
--- 1,4 ----
! Eine Liste der meistbesuchten Seiten dieses Wikis:
! (Zähler, Seitenname)
  
  %%Mostpopular%%

Index: SandKiste
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/SandKiste,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SandKiste	2000/11/02 21:15:32	1.1
--- SandKiste	2000/11/06 17:31:54	1.2
***************
*** 1,4 ****
! You can try out Wiki in here.
  
! Have fun :-)
  
--- 1,5 ----
! In der SandKiste kannst du dich so richtig austoben und alle Wikimerkmale
! ausprobieren.
  
! Viel Spass :-)
  

Index: StartSeite
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/StartSeite,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** StartSeite	2000/11/02 21:15:32	1.1
--- StartSeite	2000/11/06 17:31:54	1.2
***************
*** 1,9 ****
! *What is a WikiWikiWeb? A description of this application.
! *Learn WieManWikiBenutzt and learn about SeitenErzeugen.
! *Use the SandKiste page to experiment with Wiki pages.
! *Please sign your name in GaesteBuch.
! *See FrischeSeiten for the latest page additions and changes.
! *Find out which pages are MeistBesucht.
! *Read the ReleaseNotes
! 
! 
--- 1,7 ----
! * Was ist ein WikiWikiWeb? Eine kurze Beschreibung dieser Applikation.
! * Lerne WieManWikiBenutzt und lerne über SeitenErzeugen.
! * Die SandKiste ist zum Spielen und zum Experimentieren.
! * Bitte trage dich im GaesteBuch ein.
! * Jüngste Veränderungen findest man unter FrischeSeiten.
! * Eine Liste der [MeistBesucht]en Seiten.
! * ReleaseNotes (in Englisch)

Index: WieManWikiBenutzt
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/WieManWikiBenutzt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** WieManWikiBenutzt	2000/11/02 21:15:32	1.1
--- WieManWikiBenutzt	2000/11/06 17:31:54	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.
! 	* Now you are ready to begin SeitenErzeugen.
  
  ----
! A WikiWikiWeb is meant to be fast and easy to edit. It has very simple markup that you can read about in TextFormatierungsRegeln.
--- 1,32 ----
! ''"Wiki wiki"'' heißt "schnell" auf Hawai'anisch.
  
! __Alles was du wissen mußt ist:__
  
! * Um eine Seite zu editieren klicke auf "EditiereText" am unteren Ende der Seite. Du solltest das gleich jetzt tun und den Quelltext dieser Seite lesen - es ergibt dann mehr Sinn.
! * Italics bekommt man, indem man Wörter in jeweils zwei Apostrophen ' einschließt, ''wie in diesem Beispiel''.
! * Fette Schrift bekommt man, indem man Wörter in jeweils zwei untergesetzten Strichen einschließt, __wie in diesem Beispiel__
! * Und beides, indem man __''beides verwendet''__.
! * Eine unsortierte Liste erhält man, indem man eine Zeile mit '*' startet.
! * Vorformatierten Text rückt man mit zumindest einem Leerzeichen ein:
  
!  Das ist ein Gedicht
!  über vorformatierten Text
!  Es gibt Reime mit Gedicht
!  aber nicht mit Text
  
! * Absätze werden durch eine Leerzeile voneinander getrennt.
  
! Ich bin ein Absatz.
  
! Ich bin auch ein Absatz. Wir sind halt sehr kleine Absätze.
  
! * Eine horizontale Trennlinie bekommt man indem man vier oder mehr Bindestriche an den Anfang einer Zeile stellt:
  ----
! * Links kann man erzeugen, indem man einzelne Wörter, deren Anfangsbuchstabe groß geschrieben wird, zusammenfügt. Wenn du also etwa eine Seite darüber  schreiben willst, daß Arno Ratten mag, schreibst du: ArnoMagRatten. Falls die Seite noch nicht existiert erscheint dahinter ein Fragezeichen, das dir die Möglichkeit gibt die Seite zu erzeugen: DieseSeiteSollteNichtExistieren. (Und bitte verdirb das Beispiel nicht, indem du diese Seite erzeugst).
! * Um externe Links zu setzen, kannst du einfach die URL eintippen und PhpWiki erzeugt einen passenden Link, z.B. http://www.diezeit.de/
! * Um Bilder einzubinden, schließt man deren URL in eckigen Klammern ein, wie hier: [http://www.yourhost.yourdomain/images/picture.png]. Falls die URL des Bildes nicht in eckigen Klammern steht, wird einfach nur die URL (nicht aber das Bild) angezeigt.
! * Jetzt kann es eigentlich schon mit dem SeitenErzeugen losgehen!
  
  ----
! WikiWikiWeb soll schnell und einfach zu editieren sein. Es hat eine sehr
! einfache Syntax, über die du in TextFormatierungsRegeln mehr erfahren kannst.

[phpwiki-checkins] CVS: phpwiki CREDITS,1.4,1.5

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory slayer.i.sourceforge.net:/tmp/cvs-serv28890

Modified Files:
	CREDITS 
Log Message:
wikified CREDITS

Index: CREDITS
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/CREDITS,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** CREDITS	2000/11/03 04:51:20	1.4
--- CREDITS	2000/11/06 16:31:43	1.5
***************
*** 1,33 ****
! Sandino Araico Sánchez <sa...@sa...> contributed a patch for
! Spanish translations for PhpWiki.
  
! Jan Nieuwenhuizen <ja...@gn...> contributed a major patch to
! supply default pages in Dutch; this led to an architecture to support
! internationalization, and PhpWiki can now accomodate pages in any
! language.
  
! Neil Brown <ne...@cs...> has contributed numerous useful
! patches for the 1.1.8 release.
  
! Aredridel Niothke <are...@nb...> has started a flat file
! database for Phpwiki, which is included in the 1.1.8 release.
  
! Arno Hollosi wrote the MySQL library, the templates, and wrote the 
! finished version of the database schema, plus many other things too
! numerous to mention.
  
! Jeff Dairiki <da...@da...> wrote the diff code and a complete
! rewrite of PhpWiki using PHP classes.
  
! Jeremie Kass <je...@um...> contributed a patch so the logo is 
! decided in the templates instead of being hardcoded.
  
- In the 1.0 series:
  
! John Jorgensen http://c2.com/cgi-bin/wiki?AnotherPhpWiki,
! Tim Voght http://c2.com/cgi-bin/wiki?TimVoght,
! Grant Morgan http://c2.com/cgi-bin/wiki?GrantMorgan,
  
! and especially Clifford A. Adams:
! http://c2.com/cgi-bin/wiki?CliffordAdams
  
--- 1,53 ----
! !! The PhpWiki Development Team
  
! Please report bugs to mailto:php...@li...
  
! ! Core team
  
! ;[ Steve Wainstead | mailto:sw...@wc... ] :
! ;: original author
! ;: chief in charge
  
! ;[ Arno Hollosi | mailto:aho...@ma... ] :
! ;: wrote the MySQL library, the templates, and the database schema
! ;: plus many other things too numerous to mention.
  
! ;[ Jeff Dairiki | mailto:da...@da... ] :
! ;: wrote the diff code
! ;: did a complete rewrite of PhpWiki using PHP classes.
  
! ;[ Aredridel Niothke | mailto:are...@nb... ] :
! ;: has started a flat file database for Phpwiki.
  
  
! ! Localization
  
! ;[ Jan Nieuwenhuizen | mailto:ja...@gn... ] :
! ;: built architecture to support internationalization
! ;: contributed Dutch translation
! 
! ;[ Sandino Araico Sánchez | mailto:sa...@sa... ] :
! ;: contributed Spanish translation
! 
! ; Arno : contributed German translation
! 
! 
! 
! ! Patches
! 
! ;[Neil Brown | mailto:ne...@cs... ] :
! ;: has contributed numerous useful patches e.g. nested definition lists
! 
! ;[Jeremie Kass | mailto:je...@um... ] :
! ;: contributed a patch so the logo is decided in the templates instead of being hardcoded.
! 
! 
! ------------
! 
! !! In the 1.0 series:
! 
! * John Jorgensen http://c2.com/cgi-bin/wiki?AnotherPhpWiki,
! * Tim Voght http://c2.com/cgi-bin/wiki?TimVoght,
! * Grant Morgan http://c2.com/cgi-bin/wiki?GrantMorgan,
! * and especially Clifford A. Adams: http://c2.com/cgi-bin/wiki?CliffordAdams
  

[phpwiki-checkins] CVS: phpwiki/pgsrc AddingPages,1.3,1.4 ConvertSpacesToTabs,1.3,1.4 FindPage,1.3,1.4 FrontPage,1.4,1.5 HowToUseWiki,1.3,1.4 MoreAboutMechanics,1.3,1.4 RecentChanges,1.13,1.14 TextFormattingRules,1.6,1.7 WabiSabi,1.2,1.3 WikiWikiWeb,1.1,1.2

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv27490/pgsrc

Modified Files:
	AddingPages ConvertSpacesToTabs FindPage FrontPage 
	HowToUseWiki MoreAboutMechanics RecentChanges 
	TextFormattingRules WabiSabi WikiWikiWeb 
Log Message:
removed tab syntax, bold ''' -> bold __, plus other minor corrections

Index: AddingPages
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/AddingPages,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AddingPages	2000/11/06 02:46:59	1.3
--- AddingPages	2000/11/06 16:14:42	1.4
***************
*** 1,3 ****
! 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.
--- 1,4 ----
! 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. Alternatively, you can put
! anything into [square brackets].
  
  Then you can go ahead and ClickTheQuestionMark at the end of your new hyperlink, and the Wiki will give you a window for making the new page.

Index: ConvertSpacesToTabs
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/ConvertSpacesToTabs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ConvertSpacesToTabs	2000/06/03 11:19:56	1.3
--- ConvertSpacesToTabs	2000/11/06 16:14:43	1.4
***************
*** 3,14 ****
   [[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 
--- 3,13 ----
   [[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 

Index: FindPage
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/FindPage,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** FindPage	2000/06/26 21:23:41	1.3
--- FindPage	2000/11/06 16:14:43	1.4
***************
*** 1,10 ****
  Here are some good starting points for browsing.
  
! 	* HowToUseWiki gives you the quick lowdown on Wiki markup.
! 	* RecentChanges recorded automatically
! 	* MoreAboutMechanics of browsing and editing on this server
  
- 
- 
  Here's a title search.   Try something like ''wiki'' 
  or ''sandwich''.
--- 1,8 ----
  Here are some good starting points for browsing.
  
! * HowToUseWiki gives you the quick lowdown on Wiki markup.
! * RecentChanges recorded automatically
! * MoreAboutMechanics of browsing and editing on this server
  
  Here's a title search.   Try something like ''wiki'' 
  or ''sandwich''.
***************
*** 15,19 ****
  
  %%Fullsearch%%
- 
- 
- 
--- 13,14 ----

Index: FrontPage
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/FrontPage,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** FrontPage	2000/09/23 14:56:59	1.4
--- FrontPage	2000/11/06 16:14:43	1.5
***************
*** 1,9 ****
! *What is a WikiWikiWeb? A description of this application.
! *Learn HowToUseWiki and learn about AddingPages.
! *Use the SandBox page to experiment with Wiki pages.
! *Please sign your name in RecentVisitors.
! *See RecentChanges for the latest page additions and changes.
! *Find out which pages are MostPopular.
! *Read the ReleaseNotes
  
  
--- 1,9 ----
! * What is a WikiWikiWeb? A description of this application.
! * Learn HowToUseWiki and learn about AddingPages.
! * Use the SandBox page to experiment with Wiki pages.
! * Please sign your name in RecentVisitors.
! * See RecentChanges for the latest page additions and changes.
! * Find out which pages are MostPopular.
! * Read the ReleaseNotes
  
  

Index: HowToUseWiki
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/HowToUseWiki,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** HowToUseWiki	2000/08/10 15:29:20	1.3
--- HowToUseWiki	2000/11/06 16:14:43	1.4
***************
*** 1,16 ****
  ''"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 
--- 1,12 ----
  ''"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 two underscores on either side.
! * And, __''bold italics''__ by using both.
! * You get bullets by using an asterisk * at the start of the line
! * To have plain monospaced font, indent with a space:
  
   this is a poem 
***************
*** 19,23 ****
   nothing rhymes with monospacing
  
! 	* You can seperate paragraphs with an extra blank line. Example:
  
  I am a paragraph.
--- 15,19 ----
   nothing rhymes with monospacing
  
! * You can seperate paragraphs with an extra blank line. Example:
  
  I am a paragraph.
***************
*** 26,35 ****
  
  
! 	* 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.
! 	* Now you are ready to begin AddingPages.
  
  ----
--- 22,31 ----
  
  
! * 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.
! * Now you are ready to begin AddingPages.
  
  ----

Index: MoreAboutMechanics
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/MoreAboutMechanics,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MoreAboutMechanics	2000/10/08 18:12:14	1.3
--- MoreAboutMechanics	2000/11/06 16:14:43	1.4
***************
*** 6,17 ****
  
  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.
- 
- 
  
--- 6,15 ----
  
  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.
  

Index: RecentChanges
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/RecentChanges,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** RecentChanges	2000/10/25 04:19:27	1.13
--- RecentChanges	2000/11/06 16:14:43	1.14
***************
*** 22,26 ****
  * [WikiWikiWeb]
  
! Quick page search:
  %%Search%%
  ----
--- 22,26 ----
  * [WikiWikiWeb]
  
! Quick title search:
  %%Search%%
  ----

Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** TextFormattingRules	2000/11/06 02:46:07	1.6
--- TextFormattingRules	2000/11/06 16:14:43	1.7
***************
*** 1,3 ****
! '''Paragraphs'''
  
  * Don't indent paragraphs
--- 1,3 ----
! ! Paragraphs
  
  * Don't indent paragraphs
***************
*** 8,12 ****
  
  
! '''Lists'''
  
  * asterick for first level
--- 8,12 ----
  
  
! ! Lists
  
  * asterick for first level
***************
*** 18,22 ****
  * Other leading whitespace signals preformatted text, changes font.
  
! '''Headings'''
  
  * '!' at the start of a line makes a small heading
--- 18,22 ----
  * Other leading whitespace signals preformatted text, changes font.
  
! ! Headings
  
  * '!' at the start of a line makes a small heading
***************
*** 24,28 ****
  * '!!!' at the start of a line makes a large heading
  
! '''Fonts'''
  * Indent with one or more spaces to use a monospace font:
  
--- 24,29 ----
  * '!!!' at the start of a line makes a large heading
  
! ! Fonts
! 
  * Indent with one or more spaces to use a monospace font:
  
***************
*** 30,34 ****
  This is not
  
! '''Indented Paragraphs'''
  ''(Quotes)''
  
--- 31,35 ----
  This is not
  
! !Indented Paragraphs
  ''(Quotes)''
  
***************
*** 37,45 ****
  ;: this is an indented block of text
  
! '''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:
  
--- 38,46 ----
  ;: this is an indented block of text
  
! ! 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:
  
***************
*** 47,51 ****
  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/]
--- 48,52 ----
  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/]
***************
*** 57,61 ****
  
  
! '''HTML Mark-Up Language'''
  
  * Don't bother
--- 58,62 ----
  
  
! ! HTML Mark-Up Language
  
  * Don't bother
***************
*** 63,66 ****
  * 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.
- 
- 
--- 64,65 ----

Index: WabiSabi
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/WabiSabi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** WabiSabi	2000/06/02 15:59:04	1.2
--- WabiSabi	2000/11/06 16:14:43	1.3
***************
*** 1,3 ****
! 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.
--- 1,3 ----
! 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.
***************
*** 7,24 ****
  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
--- 7,24 ----
  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

Index: WikiWikiWeb
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/WikiWikiWeb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** WikiWikiWeb	2000/08/10 03:03:07	1.1
--- WikiWikiWeb	2000/11/06 16:14:43	1.2
***************
*** 7,11 ****
  ''In addition to being quick, this site also aspires to Zen ideals generally labeled WabiSabi. Zen finds beauty in the imperfect and ephemeral. When it comes down to it, that's all you need.''
  
! You can say hello on RecentVisitors, or read about HowToUseWiki and AddingPages. Currently this Wiki has no "theme" for discussion, so go ahead and play with it and have fun!
  
  --SteveWainstead
--- 7,11 ----
  ''In addition to being quick, this site also aspires to Zen ideals generally labeled WabiSabi. Zen finds beauty in the imperfect and ephemeral. When it comes down to it, that's all you need.''
  
! You can say hello on RecentVisitors, or read about HowToUseWiki and AddingPages. Go ahead, join the discussion, play with it, and have fun!
  
  --SteveWainstead

[phpwiki-checkins] CVS: phpwiki HISTORY,1.10,1.11

[Steve W. <wai...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17628

Modified Files:
	HISTORY 
Log Message:
Updates for 1.1.9.

Index: HISTORY
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/HISTORY,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** HISTORY	2000/10/25 05:06:36	1.10
--- HISTORY	2000/11/06 03:19:16	1.11
***************
*** 1,2 ****
--- 1,15 ----
+ 1.1.9 11/05/00: 
+ * Spanish language support added, thanks to Sandino Araico 
+   Sánchez <sa...@sa...>
+ * German language support thanks to Arno Hollosi
+ * Postgresql version brought up to date (plus fixes from Sandino)
+ * Neil Brown contributed a patch Arno worked in to heavily modify
+   lib/transform.php, much cleaner structure now
+ * Various page updates to English pages
+ * Schema update for mSQL
+ * Assorted E_NOTICE warnings fixed throughout (though still not done)
+ * URL no longer stored in page source of RecentChanges
+ * various bugs squashed
+ 
  1.1.8 10/25/00: 
  * Internationalization, with support for Dutch, and an architecture

[phpwiki-checkins] CVS: phpwiki/pgsrc ReleaseNotes,1.5,1.6

[Steve W. <wai...@us...>]

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv15834

Modified Files:
	ReleaseNotes 
Log Message:
Added a few words about 1.1.9.


Index: ReleaseNotes
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/ReleaseNotes,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ReleaseNotes	2000/10/23 20:55:24	1.5
--- ReleaseNotes	2000/11/06 02:51:07	1.6
***************
*** 1,2 ****
--- 1,8 ----
+ PhpWiki 1.1.9 includes Spanish language pages, a full implementation for
+ Postgresql, numerous bug fixes and more. See the HISTORY file for more
+ info: http://phpwiki.sourceforge.net/phpwiki/HISTORY
+ 
+ ----
+ 
  PhpWiki 1.1.6 is a major revision of PhpWiki. The ability to have themes (via an
  easy-to-edit template system) has been added; the schema for MySQL has been

[phpwiki-checkins] CVS: phpwiki/pgsrc AddingPages,1.2,1.3

[Steve W. <wai...@us...>]

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv15523

Modified Files:
	AddingPages 
Log Message:
Changed the example to point to the current PhpWiki homepage.


Index: AddingPages
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/AddingPages,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AddingPages	2000/06/02 15:59:04	1.2
--- AddingPages	2000/11/06 02:46:59	1.3
***************
*** 5,9 ****
  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/
  
  The Wiki does not support HTML tags (see TextFormattingRules).  <tags>They will just render like text.</tags> Wiki is meant to be as simple as possible to encourage use.
--- 5,9 ----
  If you wish to add documents with complex markup to the Wiki, you might be better off providing a URL to it than trying to add the text of the document here, like so:
  
!  PhpWiki project homepage: http://phpwiki.sourceforge.net/
  
  The Wiki does not support HTML tags (see TextFormattingRules).  <tags>They will just render like text.</tags> Wiki is meant to be as simple as possible to encourage use.

[phpwiki-checkins] CVS: phpwiki/pgsrc TextFormattingRules,1.5,1.6

[Steve W. <wai...@us...>]

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv15464

Modified Files:
	TextFormattingRules 
Log Message:
Removed last remaining references to using tabs, and put in an example
of the new term-definition syntax.


Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** TextFormattingRules	2000/11/02 04:03:54	1.5
--- TextFormattingRules	2000/11/06 02:46:07	1.6
***************
*** 13,17 ****
  ** 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.
--- 13,18 ----
  ** asterick-asterick for second level, etc.
  * Use * for bullet lists, # for numbered lists (mix at will)
! * semicolon-term-colon-definition for definition lists:
! ;term here:definition here, as in the <DL><DT><DD> list
  * One line for each item
  * Other leading whitespace signals preformatted text, changes font.
***************
*** 32,42 ****
  ''(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:
--- 33,44 ----
  ''(Quotes)''
  
! * semicolon-colon -- works like <BLOCKQUOTE>
  
+ ;: this is an indented block of text
  
  '''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:
***************
*** 48,56 ****
  * 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/images/png.png]
  
  
--- 50,58 ----
  * 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: [PhpWiki home page | http://phpwiki.sourceforge.net/]  
  * 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, .gif, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/phpwiki/images/png.png]
  
  

[phpwiki-checkins] CVS: phpwiki/schemas schema.minisql,1.5,1.6

[Steve W. <wai...@us...>]

Update of /cvsroot/phpwiki/phpwiki/schemas
In directory slayer.i.sourceforge.net:/tmp/cvs-serv14447

Modified Files:
	schema.minisql 
Log Message:
Added/tested wikiscore table.

Index: schema.minisql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/schema.minisql,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** schema.minisql	2000/06/29 04:30:31	1.5
--- schema.minisql	2000/11/03 05:50:52	1.6
***************
*** 9,12 ****
--- 9,13 ----
  drop table hottopics\g
  drop table hitcount\g
+ drop table wikiscore\g
  
  # metadata about the page
***************
*** 99,100 ****
--- 100,109 ----
  \g
  
+ CREATE TABLE wikiscore (
+         pagename CHAR(100) NOT NULL,
+         score INT NOT NULL
+         )
+ \g
+ 
+ CREATE UNIQUE INDEX hitcount_index ON wikiscore (pagename)
+ \g

[phpwiki-checkins] CVS: phpwiki/lib msql.php,1.3,1.4

[Steve W. <wai...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv13179

Modified Files:
	msql.php 
Log Message:
Fixed all instances that caused E_NOTICE messages.

Index: msql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/msql.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** msql.php	2000/10/20 11:42:52	1.3
--- msql.php	2000/11/03 05:27:51	1.4
***************
*** 59,62 ****
--- 59,67 ----
     function msqlDecomposeString($string) {
        $ret_arr = array();
+ 
+       // initialize the array to satisfy E_NOTICE
+       for ($i = 0; $i < MSQL_MAX_LINE_LENGTH; $i++) {
+          $ret_arr[$i] = "";
+       }
        $el = 0;
     
***************
*** 110,114 ****
        }
        $pagehash["author"] = addslashes($pagehash["author"]);
!       $pagehash["refs"] = serialize($pagehash["refs"]);
  
        return $pagehash;
--- 115,123 ----
        }
        $pagehash["author"] = addslashes($pagehash["author"]);
!       if (empty($pagehash["refs"])) {
!          $pagehash["refs"] = "";
!       } else {
!          $pagehash["refs"] = serialize($pagehash["refs"]);
!       }
  
        return $pagehash;
***************
*** 141,144 ****
--- 150,154 ----
                    "order by lineno";
  
+          $msql_content = "";
           if ($res = msql_query($query, $dbi['dbc'])) {
              $dbhash["content"] = array();

[phpwiki-checkins] CVS: phpwiki CREDITS,1.3,1.4

[Steve W. <wai...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory slayer.i.sourceforge.net:/tmp/cvs-serv10828

Modified Files:
	CREDITS 
Log Message:
Credited Sandino for the Spanish language translations.


Index: CREDITS
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/CREDITS,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** CREDITS	2000/10/25 04:56:39	1.3
--- CREDITS	2000/11/03 04:51:20	1.4
***************
*** 1,2 ****
--- 1,5 ----
+ Sandino Araico Sánchez <sa...@sa...> contributed a patch for
+ Spanish translations for PhpWiki.
+ 
  Jan Nieuwenhuizen <ja...@gn...> contributed a major patch to
  supply default pages in Dutch; this led to an architecture to support
***************
*** 7,11 ****
  patches for the 1.1.8 release.
  
! Aredridel Niothke     <are...@nb...> has started a flat file
  database for Phpwiki, which is included in the 1.1.8 release.
  
--- 10,14 ----
  patches for the 1.1.8 release.
  
! Aredridel Niothke <are...@nb...> has started a flat file
  database for Phpwiki, which is included in the 1.1.8 release.
  

[phpwiki-checkins] CVS: phpwiki/locale/po de.po,NONE,1.1 es.po,NONE,1.1 nl.po,1.4,1.5 phpwiki.pot,1.4,1.5

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19863/po

Modified Files:
	nl.po phpwiki.pot 
Added Files:
	de.po es.po 
Log Message:
Spanish pages by Sandino Araico Sánchez <sa...@sa...>
Initial set of German pages by me (Arno)


--- NEW FILE ---
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Free Software Foundation, Inc.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: phpwiki 1.1.8\n"
"POT-Creation-Date: 2000-11-02 22:18+0100\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Arno Hollosi <aho...@ma...>\n"
"Language-Team: German <de...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=8859-1\n"
"Content-Transfer-Encoding: 8bit\n"

#: lib/config.php:148
msgid "templates/browse.html"
msgstr "locale/de/templates/browse.html"

#: lib/config.php:149
msgid "templates/editpage.html"
msgstr "locale/de/editpage.html"

#: lib/config.php:150
msgid "templates/editlinks.html"
msgstr "locale/de/editlinks.html"

#: lib/config.php:151
msgid "templates/message.html"
msgstr "locale/de/message.html"

#: lib/config.php:167
msgid "./pgsrc"
msgstr "locale/de/pgsrc"

#: lib/diff.php:682
#, c-format
msgid "WikiDiff::apply: line count mismatch: %s != %s"
msgstr ""

#: lib/diff.php:742
msgid "WikiDiff::_check: failed"
msgstr ""

#: lib/diff.php:752
msgid "WikiDiff::_check: edit sequence is non-optimal"
msgstr ""

#: lib/diff.php:756
#, c-format
msgid "WikiDiff Okay: LCS = %s"
msgstr ""

#: lib/diff.php:997
msgid "Current page:"
msgstr "Aktuelle Seite:"

#: lib/diff.php:1001 lib/diff.php:1019
#, c-format
msgid "version %s"
msgstr "Version %s"

#: lib/diff.php:1003 lib/diff.php:1021
#, c-format
msgid "last modified on %s"
msgstr "zuletzt verändert am %s"

#: lib/diff.php:1006 lib/diff.php:1024
#, c-format
msgid "by %s"
msgstr "von %s"

#: lib/diff.php:1010 lib/diff.php:1028
msgid "None"
msgstr "Keine"

#: lib/diff.php:1015
msgid "Archived page:"
msgstr "Archivierte Seite:"

#: lib/diff.php:1037
msgid "Versions are identical"
msgstr "Versionen sind identisch"

#: lib/diff.php:1045
#, c-format
msgid "Diff of %s."
msgstr "Diff von %s."

#: lib/display.php:14
msgid "FrontPage"
msgstr "StartSeite"

#: lib/display.php:31 lib/editpage.php:50
#, c-format
msgid "Describe %s here."
msgstr "Beschreibe %s hier."

#: lib/editpage.php:19
#, c-format
msgid "Copy of %s"
msgstr "Kopie von %s"

#: lib/editpage.php:23
msgid "No page name passed into editpage!"
msgstr "Kein Seitenname an EditierSeite übergeben!"

#: lib/editpage.php:31 lib/savepage.php:52
msgid "This page has been locked by the administrator and cannot be edited."
msgstr ""
"Diese Seite wurde vom Administrator gesperrt und kann nicht editiert werden."

#: lib/editpage.php:33 lib/savepage.php:32 lib/savepage.php:53
#, fuzzy
msgid "Sorry for the inconvenience."
msgstr "Entschuldigung für die Unannehmlichkeiten."

#: lib/editpage.php:35 lib/savepage.php:54
#, c-format
msgid "Problem while editing %s"
msgstr "Problem während dem Editieren von %s"

#: lib/fullsearch.php:15
#, c-format
msgid "Searching for \"%s\" ....."
msgstr "Suche nach \"%s\" ....."

#: lib/fullsearch.php:44
#, c-format
msgid "%d matches found in %d pages."
msgstr "%d Treffer in %d Seiten."

#: lib/fullsearch.php:47
msgid "Full Text Search Results"
msgstr "Volltext-Suchresultate"

#: lib/msql.php:29 lib/mysql.php:33
msgid "Cannot establish connection to database, giving up."
msgstr "Kann Verbindung zu Datenbank nicht aufbauen - Abbruch."

#: lib/msql.php:31 lib/msql.php:37
#, c-format
msgid "Error message: %s"
msgstr "Fehlermeldung: %s"

#: lib/msql.php:35 lib/mysql.php:39
#, c-format
msgid "Cannot open database %s, giving up."
msgstr "Kann Datenbank %s nicht öffnen - Abbruch."

#: lib/msql.php:200 lib/msql.php:276
#, c-format
msgid "Insert/update failed: %s"
msgstr "Einfügen/Verändern fehlgeschlagen: %s"

#: lib/msql.php:211 lib/msql.php:286
#, c-format
msgid "Delete on %s failed: %s"
msgstr "Löschen in %s fehlgeschlagen: %s"

#: lib/msql.php:227 lib/msql.php:302
#, c-format
msgid "Insert into %s failed: %s"
msgstr "Einfügen in %s fehlgeschlagen: %s"

#: lib/mysql.php:35 lib/mysql.php:41 lib/mysql.php:115
#, c-format
msgid "MySQL error: %s"
msgstr "MySQL Fehler: %s"

#: lib/mysql.php:113
#, c-format
msgid "Error writing page '%s'"
msgstr "Fehler beim Schreiben der Seite '%s'"

#: lib/pageinfo.php:9
msgid "Enter a page name"
msgstr ""

#: lib/pageinfo.php:10
msgid "Go"
msgstr ""

#: lib/pageinfo.php:21
msgid "Show the page source and references"
msgstr ""

#: lib/pageinfo.php:26 lib/pageinfo.php:75
msgid "PageInfo"
msgstr "SeitenInfo"

#: lib/pageinfo.php:36
#, c-format
msgid "Page name '%s' is not in the database"
msgstr ""

#: lib/pageinfo.php:64
#, fuzzy
msgid "Current version"
msgstr "Aktuelle Seite:"

#: lib/pageinfo.php:70
#, fuzzy
msgid "Archived version"
msgstr "Archivierte Seite:"

#: lib/savepage.php:18
msgid ""
"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."
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 "Problem während dem Editieren von %s"

#: lib/savepage.php:76
#, c-format
msgid "Thank you for editing %s."
msgstr "Danke für das Editieren von %s."

#: lib/savepage.php:106
msgid "Your careful attention to detail is much appreciated."
msgstr "Deine besondere Aufmerksamkeit für Details wird sehr geschätzt."

#: lib/setupwiki.php:21
#, c-format
msgid "Inserting page %s, version %s from %s"
msgstr "Füge Seite %s ein, Version %s vom %s"

#: lib/stdlib.php:36
msgid "WikiFatalError"
msgstr "FatalerWikiFehler"

#: lib/stdlib.php:53
#, c-format
msgid "%d best incoming links:"
msgstr "Die %d besten hereinkommenden Links:"

#: lib/stdlib.php:63
#, c-format
msgid "%d best outgoing links:"
msgstr "Die %d besten hinausgehenden Links:"

#: lib/stdlib.php:74
#, c-format
msgid "%d most popular nearby:"
msgstr "Die %d meistbesuchten Seiten in der Nähe:"

#: lib/stdlib.php:186 lib/stdlib.php:194
msgid "Search"
msgstr ""

#: lib/stdlib.php:295
msgid "Stack bounds exceeded in SetHTMLOutputMode"
msgstr "Interner Fehler: Stackgrenze in SetHTMLOutputMode überschritten."

#: lib/stdlib.php:349 lib/stdlib.php:412
msgid "RecentChanges"
msgstr "JuengsteVeraenderungen"

--- NEW FILE ---
# 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-11-02 22:18+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"

#: lib/config.php:148
msgid "templates/browse.html"
msgstr "locale/es/templates/browse.html"

#: lib/config.php:149
msgid "templates/editpage.html"
msgstr "locale/es/templates/editpage.html"

#: lib/config.php:150
msgid "templates/editlinks.html"
msgstr "locale/es/templates/editlinks.html"

#: lib/config.php:151
msgid "templates/message.html"
msgstr "locale/es/templates/message.html"

#: lib/config.php:167
msgid "./pgsrc"
msgstr "locale/es/pgsrc"

#: lib/diff.php:682
#, c-format
msgid "WikiDiff::apply: line count mismatch: %s != %s"
msgstr "WikiDiff::apply: conteo de l&iacute;neas difiere: %s != %s"

#: lib/diff.php:742
msgid "WikiDiff::_check: failed"
msgstr "WikiDiff::_check: fall&oacute;"

#: 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
#, c-format
msgid "WikiDiff Okay: LCS = %s"
msgstr "WikiDiff Ok: LCS = %s"

#: lib/diff.php:997
msgid "Current page:"
msgstr "P&aacute;gina actual:"

#: lib/diff.php:1001 lib/diff.php:1019
#, c-format
msgid "version %s"
msgstr "versi&oacute;n %s"

#: lib/diff.php:1003 lib/diff.php:1021
#, c-format
msgid "last modified on %s"
msgstr "modificado por &uacute;ltima vez el %s"

#: lib/diff.php:1006 lib/diff.php:1024
#, c-format
msgid "by %s"
msgstr "por %s"

#: lib/diff.php:1010 lib/diff.php:1028
msgid "None"
msgstr "Ninguno"

#: lib/diff.php:1015
msgid "Archived page:"
msgstr "P&aacute;gina archivada:"

#: lib/diff.php:1037
msgid "Versions are identical"
msgstr "Las versiones son id&eacute;nticas"

#: lib/diff.php:1045
#, c-format
msgid "Diff of %s."
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
msgid "Copy of %s"
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 ""
"Esta p&aacute;gina ha sido bloqueada por el administrador y no puede ser "
"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:44
#, c-format
msgid "%d matches found in %d pages."
msgstr "%d veces encontrado en %d p&aacute;ginas."

#: lib/fullsearch.php:47
msgid "Full Text Search Results"
msgstr "Resultados de la búsqueda en el texto completo"

#: lib/msql.php:29 lib/mysql.php:33
msgid "Cannot establish connection to database, giving up."
msgstr ""
"No se puede establecer conexi&oacute;n con la base de datos, me doy por "
"vencido."

#: lib/msql.php:31 lib/msql.php:37
#, c-format
msgid "Error message: %s"
msgstr "Mensaje de error: %s"

#: lib/msql.php:35 lib/mysql.php:39
#, 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:200 lib/msql.php:276
#, c-format
msgid "Insert/update failed: %s"
msgstr "Inserci&oacute;n/actualizaci&oacute;n fall&oacute;: %s"

#: lib/msql.php:211 lib/msql.php:286
#, c-format
msgid "Delete on %s failed: %s"
msgstr "Eliminaci&oacute;n en %s fall&oacute;: %s"

#: lib/msql.php:227 lib/msql.php:302
#, c-format
msgid "Insert into %s failed: %s"
msgstr "Inserci&oacute;n en %s fall&oacute;: %s"

#: lib/mysql.php:35 lib/mysql.php:41 lib/mysql.php:115
#, c-format
msgid "MySQL error: %s"
msgstr "Error de MySQL: %s"

#: lib/mysql.php:113
#, c-format
msgid "Error writing page '%s'"
msgstr "Error al escribir la p&aacute;gina `%s'"

#: lib/pageinfo.php:9
msgid "Enter a page name"
msgstr "Escriba un nombre de p&aacute;gina"

#: lib/pageinfo.php:10
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
msgid "Page name '%s' is not in the database"
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 "
"saved the page while you were editing the page too. If saving proceeded now "
"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
msgid "Inserting page %s, version %s from %s"
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:186 lib/stdlib.php:194
msgid "Search"
msgstr ""

#: lib/stdlib.php:295
msgid "Stack bounds exceeded in SetHTMLOutputMode"
msgstr "L&iacute;mites de la pila excedidos en SetHTMLOutputMode"

#: lib/stdlib.php:349 lib/stdlib.php:412
msgid "RecentChanges"
msgstr "CambiosRecientes"

Index: nl.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/nl.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** nl.po	2000/10/26 15:38:38	1.4
--- nl.po	2000/11/02 21:15:33	1.5
***************
*** 11,15 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.7\n"
! "POT-Creation-Date: 2000-10-26 17:45+0200\n"
  "PO-Revision-Date: 2000-09-30 02:23+0200\n"
  "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
--- 11,15 ----
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.7\n"
! "POT-Creation-Date: 2000-11-02 22:18+0100\n"
  "PO-Revision-Date: 2000-09-30 02:23+0200\n"
  "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
***************
*** 21,94 ****
  "From:  <ja...@gn...>\n"
  
! #: lib/config.php:158
! msgid "./pgsrc"
! msgstr "locale/nl/pgsrc"
! 
! #: lib/config.php:174
  msgid "templates/browse.html"
  msgstr "locale/nl/templates/browse.html"
  
! #: lib/config.php:175
  msgid "templates/editpage.html"
  msgstr "locale/nl/templates/editpage.html"
  
! #: lib/config.php:176
  msgid "templates/editlinks.html"
  msgstr "locale/nl/templates/editlinks.html"
  
! #: lib/config.php:177
  msgid "templates/message.html"
  msgstr "locale/nl/templates/message.html"
  
! #: lib/diff.php:675
  #, c-format
  msgid "WikiDiff::apply: line count mismatch: %s != %s"
  msgstr ""
  
! #: lib/diff.php:735
  msgid "WikiDiff::_check: failed"
  msgstr ""
  
! #: lib/diff.php:745
  msgid "WikiDiff::_check: edit sequence is non-optimal"
  msgstr ""
  
! #: lib/diff.php:749
  #, c-format
  msgid "WikiDiff Okay: LCS = %s"
  msgstr ""
  
! #: lib/diff.php:988
  msgid "Current page:"
  msgstr "Huidige pagina:"
  
! #: lib/diff.php:992 lib/diff.php:1010
  #, c-format
  msgid "version %s"
  msgstr "versie %s"
  
! #: lib/diff.php:994 lib/diff.php:1012
  #, c-format
  msgid "last modified on %s"
  msgstr "laatste verandering op %s"
  
! #: lib/diff.php:997 lib/diff.php:1015
  #, c-format
  msgid "by %s"
  msgstr "door %s"
  
! #: lib/diff.php:1001 lib/diff.php:1019
  msgid "None"
  msgstr "Geen"
  
! #: lib/diff.php:1006
  msgid "Archived page:"
  msgstr "Gearchiveerde pagina:"
  
! #: lib/diff.php:1028
  msgid "Versions are identical"
  msgstr "Versies zijn identiek"
  
! #: lib/diff.php:1036
  #, c-format
  msgid "Diff of %s."
--- 21,94 ----
  "From:  <ja...@gn...>\n"
  
! #: lib/config.php:148
  msgid "templates/browse.html"
  msgstr "locale/nl/templates/browse.html"
  
! #: lib/config.php:149
  msgid "templates/editpage.html"
  msgstr "locale/nl/templates/editpage.html"
  
! #: lib/config.php:150
  msgid "templates/editlinks.html"
  msgstr "locale/nl/templates/editlinks.html"
  
! #: lib/config.php:151
  msgid "templates/message.html"
  msgstr "locale/nl/templates/message.html"
  
! #: lib/config.php:167
! msgid "./pgsrc"
! msgstr "locale/nl/pgsrc"
! 
! #: lib/diff.php:682
  #, c-format
  msgid "WikiDiff::apply: line count mismatch: %s != %s"
  msgstr ""
  
! #: lib/diff.php:742
  msgid "WikiDiff::_check: failed"
  msgstr ""
  
! #: lib/diff.php:752
  msgid "WikiDiff::_check: edit sequence is non-optimal"
  msgstr ""
  
! #: lib/diff.php:756
  #, c-format
  msgid "WikiDiff Okay: LCS = %s"
  msgstr ""
  
! #: lib/diff.php:997
  msgid "Current page:"
  msgstr "Huidige pagina:"
  
! #: lib/diff.php:1001 lib/diff.php:1019
  #, c-format
  msgid "version %s"
  msgstr "versie %s"
  
! #: lib/diff.php:1003 lib/diff.php:1021
  #, c-format
  msgid "last modified on %s"
  msgstr "laatste verandering op %s"
  
! #: lib/diff.php:1006 lib/diff.php:1024
  #, c-format
  msgid "by %s"
  msgstr "door %s"
  
! #: lib/diff.php:1010 lib/diff.php:1028
  msgid "None"
  msgstr "Geen"
  
! #: lib/diff.php:1015
  msgid "Archived page:"
  msgstr "Gearchiveerde pagina:"
  
! #: lib/diff.php:1037
  msgid "Versions are identical"
  msgstr "Versies zijn identiek"
  
! #: lib/diff.php:1045
  #, c-format
  msgid "Diff of %s."
***************
*** 113,126 ****
  msgstr "Geen paginanaam doorgegeven aan veranderpagina"
  
! #: lib/editpage.php:31
  msgid "This page has been locked by the administrator and cannot be edited."
  msgstr ""
  "Deze pagina is afgesloten door de beheerder en kan niet veranderd worden."
  
! #: lib/editpage.php:33 lib/savepage.php:24
  msgid "Sorry for the inconvenience."
  msgstr "Excuses voor het ongemak."
  
! #: lib/editpage.php:35
  #, c-format
  msgid "Problem while editing %s"
--- 113,126 ----
  msgstr "Geen paginanaam doorgegeven aan veranderpagina"
  
! #: lib/editpage.php:31 lib/savepage.php:52
  msgid "This page has been locked by the administrator and cannot be edited."
  msgstr ""
  "Deze pagina is afgesloten door de beheerder en kan niet veranderd worden."
  
! #: lib/editpage.php:33 lib/savepage.php:32 lib/savepage.php:53
  msgid "Sorry for the inconvenience."
  msgstr "Excuses voor het ongemak."
  
! #: lib/editpage.php:35 lib/savepage.php:54
  #, c-format
  msgid "Problem while editing %s"
***************
*** 209,213 ****
  msgstr "Gearchiveerde versie:"
  
! #: lib/savepage.php:17
  msgid ""
  "PhpWiki is unable to save your changes, because another user edited and "
--- 209,213 ----
  msgstr "Gearchiveerde versie:"
  
! #: lib/savepage.php:18
  msgid ""
  "PhpWiki is unable to save your changes, because another user edited and "
***************
*** 220,228 ****
  "de vorige auteur verloren gaan."
  
! #: lib/savepage.php:18
  msgid "In order to recover from this situation follow these steps:"
  msgstr "Om uit deze benarde situatie te geraken, volg je deze stappen:"
  
! #: lib/savepage.php:19
  msgid "Use your browser's <b>Back</b> button to go back to the edit page."
  msgstr ""
--- 220,228 ----
  "de vorige auteur verloren gaan."
  
! #: lib/savepage.php:20
  msgid "In order to recover from this situation follow these steps:"
  msgstr "Om uit deze benarde situatie te geraken, volg je deze stappen:"
  
! #: lib/savepage.php:22
  msgid "Use your browser's <b>Back</b> button to go back to the edit page."
  msgstr ""
***************
*** 230,234 ****
  "verander tekst pagina."
  
! #: lib/savepage.php:20
  msgid ""
  "Copy your changes to the clipboard or to another temporary place (e.g. text "
--- 230,234 ----
  "verander tekst pagina."
  
! #: lib/savepage.php:24
  msgid ""
  "Copy your changes to the clipboard or to another temporary place (e.g. text "
***************
*** 238,242 ****
  "(bijv. een tekst editor)."
  
! #: lib/savepage.php:21
  msgid ""
  "<b>Reload</b> the page. You should now see the most current version of the "
--- 238,242 ----
  "(bijv. een tekst editor)."
  
! #: lib/savepage.php:26
  msgid ""
  "<b>Reload</b> the page. You should now see the most current version of the "
***************
*** 246,250 ****
  "moeten zien.  Jouw veranderingen staan er nu niet meer."
  
! #: lib/savepage.php:22
  msgid ""
  "Make changes to the file again. Paste your additions from the clipboard (or "
--- 246,250 ----
  "moeten zien.  Jouw veranderingen staan er nu niet meer."
  
! #: lib/savepage.php:28
  msgid ""
  "Make changes to the file again. Paste your additions from the clipboard (or "
***************
*** 254,272 ****
  "het klipbord (of tekst editor)."
  
! #: lib/savepage.php:23
  msgid "Press <b>Save</b> again."
  msgstr "Druk opnieuw op <b>Bewaar</b>."
  
! #: lib/savepage.php:27
  #, c-format
  msgid "Problem while updating %s"
  msgstr "Probleem tijdens veranderen van %s"
  
! #: lib/savepage.php:59
  #, c-format
  msgid "Thank you for editing %s."
  msgstr "Bedankt voor het veranderen van %s."
  
! #: lib/savepage.php:89
  msgid "Your careful attention to detail is much appreciated."
  msgstr "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd."
--- 254,272 ----
  "het klipbord (of tekst editor)."
  
! #: lib/savepage.php:30
  msgid "Press <b>Save</b> again."
  msgstr "Druk opnieuw op <b>Bewaar</b>."
  
! #: lib/savepage.php:36
  #, c-format
  msgid "Problem while updating %s"
  msgstr "Probleem tijdens veranderen van %s"
  
! #: lib/savepage.php:76
  #, c-format
  msgid "Thank you for editing %s."
  msgstr "Bedankt voor het veranderen van %s."
  
! #: lib/savepage.php:106
  msgid "Your careful attention to detail is much appreciated."
  msgstr "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd."
***************
*** 300,308 ****
  msgstr ""
  
! #: lib/stdlib.php:292
  msgid "Stack bounds exceeded in SetHTMLOutputMode"
  msgstr ""
  
! #: lib/stdlib.php:347 lib/stdlib.php:410
  msgid "RecentChanges"
  msgstr "RecenteVeranderingen"
--- 300,308 ----
  msgstr ""
  
! #: lib/stdlib.php:295
  msgid "Stack bounds exceeded in SetHTMLOutputMode"
  msgstr ""
  
! #: lib/stdlib.php:349 lib/stdlib.php:412
  msgid "RecentChanges"
  msgstr "RecenteVeranderingen"

Index: phpwiki.pot
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/phpwiki.pot,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** phpwiki.pot	2000/10/26 15:38:38	1.4
--- phpwiki.pot	2000/11/02 21:15:33	1.5
***************
*** 7,11 ****
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
! "POT-Creation-Date: 2000-10-26 17:45+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--- 7,11 ----
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
! "POT-Creation-Date: 2000-11-02 22:18+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
***************
*** 15,88 ****
  "Content-Transfer-Encoding: ENCODING\n"
  
! #: lib/config.php:158
! msgid "./pgsrc"
! msgstr ""
! 
! #: lib/config.php:174
  msgid "templates/browse.html"
  msgstr ""
  
! #: lib/config.php:175
  msgid "templates/editpage.html"
  msgstr ""
  
! #: lib/config.php:176
  msgid "templates/editlinks.html"
  msgstr ""
  
! #: lib/config.php:177
  msgid "templates/message.html"
  msgstr ""
  
! #: lib/diff.php:675
  #, c-format
  msgid "WikiDiff::apply: line count mismatch: %s != %s"
  msgstr ""
  
! #: lib/diff.php:735
  msgid "WikiDiff::_check: failed"
  msgstr ""
  
! #: lib/diff.php:745
  msgid "WikiDiff::_check: edit sequence is non-optimal"
  msgstr ""
  
! #: lib/diff.php:749
  #, c-format
  msgid "WikiDiff Okay: LCS = %s"
  msgstr ""
  
! #: lib/diff.php:988
  msgid "Current page:"
  msgstr ""
  
! #: lib/diff.php:992 lib/diff.php:1010
  #, c-format
  msgid "version %s"
  msgstr ""
  
! #: lib/diff.php:994 lib/diff.php:1012
  #, c-format
  msgid "last modified on %s"
  msgstr ""
  
! #: lib/diff.php:997 lib/diff.php:1015
  #, c-format
  msgid "by %s"
  msgstr ""
  
! #: lib/diff.php:1001 lib/diff.php:1019
  msgid "None"
  msgstr ""
  
! #: lib/diff.php:1006
  msgid "Archived page:"
  msgstr ""
  
! #: lib/diff.php:1028
  msgid "Versions are identical"
  msgstr ""
  
! #: lib/diff.php:1036
  #, c-format
  msgid "Diff of %s."
--- 15,88 ----
  "Content-Transfer-Encoding: ENCODING\n"
  
! #: lib/config.php:148
  msgid "templates/browse.html"
  msgstr ""
  
! #: lib/config.php:149
  msgid "templates/editpage.html"
  msgstr ""
  
! #: lib/config.php:150
  msgid "templates/editlinks.html"
  msgstr ""
  
! #: lib/config.php:151
  msgid "templates/message.html"
  msgstr ""
  
! #: lib/config.php:167
! msgid "./pgsrc"
! msgstr ""
! 
! #: lib/diff.php:682
  #, c-format
  msgid "WikiDiff::apply: line count mismatch: %s != %s"
  msgstr ""
  
! #: lib/diff.php:742
  msgid "WikiDiff::_check: failed"
  msgstr ""
  
! #: lib/diff.php:752
  msgid "WikiDiff::_check: edit sequence is non-optimal"
  msgstr ""
  
! #: lib/diff.php:756
  #, c-format
  msgid "WikiDiff Okay: LCS = %s"
  msgstr ""
  
! #: lib/diff.php:997
  msgid "Current page:"
  msgstr ""
  
! #: lib/diff.php:1001 lib/diff.php:1019
  #, c-format
  msgid "version %s"
  msgstr ""
  
! #: lib/diff.php:1003 lib/diff.php:1021
  #, c-format
  msgid "last modified on %s"
  msgstr ""
  
! #: lib/diff.php:1006 lib/diff.php:1024
  #, c-format
  msgid "by %s"
  msgstr ""
  
! #: lib/diff.php:1010 lib/diff.php:1028
  msgid "None"
  msgstr ""
  
! #: lib/diff.php:1015
  msgid "Archived page:"
  msgstr ""
  
! #: lib/diff.php:1037
  msgid "Versions are identical"
  msgstr ""
  
! #: lib/diff.php:1045
  #, c-format
  msgid "Diff of %s."
***************
*** 107,119 ****
  msgstr ""
  
! #: lib/editpage.php:31
  msgid "This page has been locked by the administrator and cannot be edited."
  msgstr ""
  
! #: lib/editpage.php:33 lib/savepage.php:24
  msgid "Sorry for the inconvenience."
  msgstr ""
  
! #: lib/editpage.php:35
  #, c-format
  msgid "Problem while editing %s"
--- 107,119 ----
  msgstr ""
  
! #: lib/editpage.php:31 lib/savepage.php:52
  msgid "This page has been locked by the administrator and cannot be edited."
  msgstr ""
  
! #: lib/editpage.php:33 lib/savepage.php:32 lib/savepage.php:53
  msgid "Sorry for the inconvenience."
  msgstr ""
  
! #: lib/editpage.php:35 lib/savepage.php:54
  #, c-format
  msgid "Problem while editing %s"
***************
*** 202,206 ****
  msgstr ""
  
! #: lib/savepage.php:17
  msgid ""
  "PhpWiki is unable to save your changes, because another user edited and "
--- 202,206 ----
  msgstr ""
  
! #: lib/savepage.php:18
  msgid ""
  "PhpWiki is unable to save your changes, because another user edited and "
***************
*** 209,221 ****
  msgstr ""
  
! #: lib/savepage.php:18
  msgid "In order to recover from this situation follow these steps:"
  msgstr ""
  
! #: lib/savepage.php:19
  msgid "Use your browser's <b>Back</b> button to go back to the edit page."
  msgstr ""
  
! #: lib/savepage.php:20
  msgid ""
  "Copy your changes to the clipboard or to another temporary place (e.g. text "
--- 209,221 ----
  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 "
***************
*** 223,227 ****
  msgstr ""
  
! #: lib/savepage.php:21
  msgid ""
  "<b>Reload</b> the page. You should now see the most current version of the "
--- 223,227 ----
  msgstr ""
  
! #: lib/savepage.php:26
  msgid ""
  "<b>Reload</b> the page. You should now see the most current version of the "
***************
*** 229,233 ****
  msgstr ""
  
! #: lib/savepage.php:22
  msgid ""
  "Make changes to the file again. Paste your additions from the clipboard (or "
--- 229,233 ----
  msgstr ""
  
! #: lib/savepage.php:28
  msgid ""
  "Make changes to the file again. Paste your additions from the clipboard (or "
***************
*** 235,253 ****
  msgstr ""
  
! #: lib/savepage.php:23
  msgid "Press <b>Save</b> again."
  msgstr ""
  
! #: lib/savepage.php:27
  #, c-format
  msgid "Problem while updating %s"
  msgstr ""
  
! #: lib/savepage.php:59
  #, c-format
  msgid "Thank you for editing %s."
  msgstr ""
  
! #: lib/savepage.php:89
  msgid "Your careful attention to detail is much appreciated."
  msgstr ""
--- 235,253 ----
  msgstr ""
  
! #: lib/savepage.php:30
  msgid "Press <b>Save</b> again."
  msgstr ""
  
! #: lib/savepage.php:36
  #, c-format
  msgid "Problem while updating %s"
  msgstr ""
  
! #: lib/savepage.php:76
  #, c-format
  msgid "Thank you for editing %s."
  msgstr ""
  
! #: lib/savepage.php:106
  msgid "Your careful attention to detail is much appreciated."
  msgstr ""
***************
*** 281,289 ****
  msgstr ""
  
! #: lib/stdlib.php:292
  msgid "Stack bounds exceeded in SetHTMLOutputMode"
  msgstr ""
  
! #: lib/stdlib.php:347 lib/stdlib.php:410
  msgid "RecentChanges"
  msgstr ""
--- 281,289 ----
  msgstr ""
  
! #: lib/stdlib.php:295
  msgid "Stack bounds exceeded in SetHTMLOutputMode"
  msgstr ""
  
! #: lib/stdlib.php:349 lib/stdlib.php:412
  msgid "RecentChanges"
  msgstr ""

[phpwiki-checkins] CVS: phpwiki/locale/es/LC_MESSAGES phpwiki.mo,NONE,1.1 phpwiki.php,NONE,1.1

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/es/LC_MESSAGES
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19863/es/LC_MESSAGES

Added Files:
	phpwiki.mo phpwiki.php 
Log Message:
Spanish pages by Sandino Araico Sánchez <sa...@sa...>
Initial set of German pages by me (Arno)


--- NEW FILE ---
Þ•

	






POT-Creation-Date: 2000-11-02 22:18+0100
PO-Revision-Date: 2000-10-27 16:10-0500
Last-Translator: Sandino Araico Sánchez <sa...@sa...>
Language-Team: 
MIME-Version: 1.0
Content-Type: text/plain; charset=8859-1
Content-Transfer-Encoding: 8bit
Date: 2000-10-27 16:10-0500
From:  <sa...@sa...>

--- NEW FILE ---
<?php

$locale["templates/browse.html"] =
   "locale/es/templates/browse.html";
$locale["templates/editpage.html"] =
   "locale/es/templates/editpage.html";
$locale["templates/editlinks.html"] =
   "locale/es/templates/editlinks.html";
$locale["templates/message.html"] =
   "locale/es/templates/message.html";
$locale["./pgsrc"] =
   "locale/es/pgsrc";
$locale["WikiDiff::apply: line count mismatch: %s != %s"] =
   "WikiDiff::apply: conteo de l&iacute;neas difiere: %s != %s";
$locale["WikiDiff::_check: failed"] =
   "WikiDiff::_check: fall&oacute;";
$locale["WikiDiff::_check: edit sequence is non-optimal"] =
   "WikiDiff::_check: secuencia de edici&oacute;n no es &oacute;ptima";
$locale["WikiDiff Okay: LCS = %s"] =
   "WikiDiff Ok: LCS = %s";
$locale["Current page:"] =
   "P&aacute;gina actual:";
$locale["version %s"] =
   "versi&oacute;n %s";
$locale["last modified on %s"] =
   "modificado por &uacute;ltima vez el %s";
$locale["by %s"] =
   "por %s";
$locale["None"] =
   "Ninguno";
$locale["Archived page:"] =
   "P&aacute;gina archivada:";
$locale["Versions are identical"] =
   "Las versiones son id&eacute;nticas";
$locale["Diff of %s."] =
   "Diferencia de %s.";
$locale["FrontPage"] =
   "PrimeraPlana";
$locale["Describe %s here."] =
   "Describe %s aqu&iacute;.";
$locale["Copy of %s"] =
   "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.";
$locale["Sorry for the inconvenience."] =
   "Disculpe la inconveniencia.";
$locale["Problem while editing %s"] =
   "Problema al editar %s";
$locale["Searching for \"%s\" ....."] =
   "Buscando \"%s\" ...";
$locale["%d matches found in %d pages."] =
   "%d veces encontrado en %d p&aacute;ginas.";
$locale["Full Text Search Results"] =
   "Resultados de la búsqueda en el texto completo";
$locale["Cannot establish connection to database, giving up."] =
   "No se puede establecer conexi&oacute;n con la base de datos, me doy por vencido.";
$locale["Error message: %s"] =
   "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";
$locale["Insert into %s failed: %s"] =
   "Inserci&oacute;n en %s fall&oacute;: %s";
$locale["MySQL error: %s"] =
   "Error de MySQL: %s";
$locale["Error writing page '%s'"] =
   "Error al escribir la p&aacute;gina `%s'";
$locale["Enter a page name"] =
   "Escriba un nombre de p&aacute;gina";
$locale["Go"] =
   "Aceptar";
$locale["Show the page source and references"] =
   "Mostrar la fuente de la p&aacute;gina y referencias";
$locale["PageInfo"] =
   "InformacionDeLaPagina";
$locale["Page name '%s' is not in the database"] =
   "El nombre de la p&aacute;gina `%s' no est&aacute; en la base de datos";
$locale["Current version"] =
   "Versi&oacute;n actual:";
$locale["Archived version"] =
   "Versi&oacute;n archivada:";
$locale["Problem while updating %s"] =
   "Problema al editar %s";
$locale["Thank you for editing %s."] =
   "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";

;?>

[phpwiki-checkins] CVS: phpwiki/locale/de/templates browse.html,NONE,1.1 editlinks.html,NONE,1.1 editpage.html,NONE,1.1 message.html,NONE,1.1

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/templates
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19863/de/templates

Added Files:
	browse.html editlinks.html editpage.html message.html 
Log Message:
Spanish pages by Sandino Araico Sánchez <sa...@sa...>
Initial set of German pages by me (Arno)


--- NEW FILE ---
<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###?related=###PAGEURL###">###PAGE###</a></h1>
<P>
###CONTENT###
<hr noshade>
<a href="###SCRIPTURL###?edit=###PAGEURL###">TextEditieren</a>
 (Seite zuletzt am ###LASTMODIFIED### verändert)
[<a href="###SCRIPTURL###?info=###PAGEURL###">Info</a>]
[<a href="###SCRIPTURL###?diff=###PAGEURL###">Diff</a>])
<br>
<a href="###SCRIPTURL###?SeiteFinden">SeiteFinden</a>
<hr noshade>
<small>###RELATEDPAGES###</small>

</body>
</html>

--- NEW FILE ---
<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###">

<table cellpadding=2>
<tr><td bgcolor=black><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]"></a></td>
<td><h1>Verweise von ###PAGE### editieren
<input type="submit" value=" Speichern ">
<input type="reset" value=" Zurücksetzen "></h1>
</td></tr></table>

<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>
Bitte gib die vollständige URL (http:// ...) für jeden Verweis im Text ein.
<BR>Erlaubte Protokolle: ###ALLOWEDPROTOCOLS###

<input type="hidden" name="post" value="###PAGEURL###">
</form>
</body>
</html>

--- NEW FILE ---
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>###PAGE###</title>
</head>

<body>

<form method="POST" action="###SCRIPTURL###">

<table cellpadding="2">
<tr><td bgcolor="black"><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]"></a></td>
<td><h1>###PAGE### editieren
<input type="submit" value=" Speichern "></h1>
</td></tr></table>

<textarea name="content" ROWS="22" COLS="80" wrap="virtual">###CONTENT###</textarea>
<br>

<input type="checkbox" name="convert" value="tabs" >
Ich kann keine Tabulatoren verwenden.
Bitte <a href="###SCRIPTURL###?KonvertiereLeerzeichenZuTabs">KonvertiereLeerzeichenZuTabs</a>
für mich, wenn ich speichere.
<p><a href="###SCRIPTURL###?GuterStil">GuterStil</a>: Tips fürs Editieren.

<br>
<a href="###SCRIPTURL###?links=###PAGEURL###">EditiereVerweise</a> zu anderen Webseiten.

###IFCOPY###<br><a href="###SCRIPTURL###?copy=###PAGEURL###">EditiereArchivSeite</a> vom vorhergenden Autor.

<hr noshade>
<small>
<b>Emphasis:</b> '' for italics, ''' for bold, ''''' for both
<br><b>Lists:</b> tab-* for bullet lists, tab-# for numbered lists, tab-Term:-tab for definition lists
<br><b>References:</b> JoinCapitalizedWords or use square brackets for a [page link] or URL [http://cool.wiki.int/].
<br><b>References:</b> Use [1],[2],[3],... and EditLinks. Avoid linking with "!": !DoNotHyperlink, name links like [text | URL]
<br><b>Misc:</b>"!", "!!", "!!!" make headings,
"%%%" makes a linebreak, "- - - -" makes a horizontal rule, escape "[" with "[["
<br>more on
<a href="###SCRIPTURL###?TextFormattingRules"><b>TextFormattingRules</b></a>
</small>

<input type="hidden" name="post" value="###PAGEURL###">
<input type="hidden" name="editversion" value="###VERSION###">
</form>
</body>
</html>

--- NEW FILE ---
<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>

<table cellpadding=2>
<tr><td bgcolor=black><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]"></a></td>
<td><h1>###PAGE###</h1>
</td></tr></table>

###CONTENT###

</body>
</html>

[phpwiki-checkins] CVS: phpwiki/locale/es/templates browse.html,NONE,1.1 editlinks.html,NONE,1.1 editpage.html,NONE,1.1 message.html,NONE,1.1

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/es/templates
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19863/es/templates

Added Files:
	browse.html editlinks.html editpage.html message.html 
Log Message:
Spanish pages by Sandino Araico Sánchez <sa...@sa...>
Initial set of German pages by me (Arno)


--- NEW FILE ---
<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>
<P>
###CONTENT###

<hr noshade>
<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a>
 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>

--- NEW FILE ---
<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>

--- NEW FILE ---
<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.

###IFCOPY###<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>

--- NEW FILE ---
<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>

[phpwiki-checkins] CVS: phpwiki/locale/nl/LC_MESSAGES phpwiki.mo,1.5,1.6 phpwiki.php,1.5,1.6

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19863/nl/LC_MESSAGES

Modified Files:
	phpwiki.mo phpwiki.php 
Log Message:
Spanish pages by Sandino Araico Sánchez <sa...@sa...>
Initial set of German pages by me (Arno)


Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
Binary files /tmp/cvshdyOGw and /tmp/cvselNVbT differ

Index: phpwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES/phpwiki.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** phpwiki.php	2000/10/26 15:38:38	1.5
--- phpwiki.php	2000/11/02 21:15:33	1.6
***************
*** 1,6 ****
  <?php
  
- $locale["./pgsrc"] =
-    "locale/nl/pgsrc";
  $locale["templates/browse.html"] =
     "locale/nl/templates/browse.html";
--- 1,4 ----
***************
*** 11,14 ****
--- 9,14 ----
  $locale["templates/message.html"] =
     "locale/nl/templates/message.html";
+ $locale["./pgsrc"] =
+    "locale/nl/pgsrc";
  $locale["Current page:"] =
     "Huidige pagina:";

[phpwiki-checkins] CVS: phpwiki/locale/es/pgsrc AgregarPaginas,NONE,1.1 BuenEstilo,NONE,1.1 BuscarPagina,NONE,1.1 CajaDeArena,NONE,1.1 CambiosRecientes,NONE,1.1 ComoUsarWiki,NONE,1.1 ConvierteEspaciosEnTabs,NONE,1.1 EditarElTexto,NONE,1.1 KBrown,NONE,1.1 MasAcercadeLaMecanica,NONE,1.1 MasPopulares,NONE,1.1 PhpWiki,NONE,1.1 PrimeraPlana,NONE,1.1 ReglasDeFormatoDeTexto,NONE,1.1 VisitantesRecientes,NONE,1.1 WabiSabi,NONE,1.1 WikiWikiWeb,NONE,1.1

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/es/pgsrc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19863/es/pgsrc

Added Files:
	AgregarPaginas BuenEstilo BuscarPagina CajaDeArena 
	CambiosRecientes ComoUsarWiki ConvierteEspaciosEnTabs 
	EditarElTexto KBrown MasAcercadeLaMecanica MasPopulares 
	PhpWiki PrimeraPlana ReglasDeFormatoDeTexto 
	VisitantesRecientes WabiSabi WikiWikiWeb 
Log Message:
Spanish pages by Sandino Araico Sánchez <sa...@sa...>
Initial set of German pages by me (Arno)


--- NEW FILE ---
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.

--- NEW FILE ---
"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

--- NEW FILE ---
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%%




--- NEW FILE ---
Aquí pueden probar su Wiki.

Diviértanse :-)


--- NEW FILE ---
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%%
----



--- NEW FILE ---
''"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.

--- NEW FILE ---
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.]



--- NEW FILE ---
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.

--- NEW FILE ---
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...



--- NEW FILE ---
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.




--- NEW FILE ---
Las 20 páginas más populares de este wiki:
(número de hits, nombre de la página)

%%Mostpopular%%

--- NEW FILE ---
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/.



--- NEW FILE ---
*¿Qué es un WikiWikiWeb? Una descripción de esta aplicación.
*Aprenda ComoUsarWiki y aprenda acerca de AgregarPaginas.
*Use la página de CajaDeArena para experimentar con las páginas Wiki.
*Por favor firme con su nombre en los VisitantesRecientes.
*Vea en los CambiosRecientes las últimas adiciones de páginas y cambios.
*Averigüe que paginas son MasPopulares.
*Lea las NotasDeLiberacion



--- NEW FILE ---
'''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.



--- NEW FILE ---
Sign and date your name below!

Jeff Dairiki, Arno Hollosi, SteveWainstead, Php Wiki authors

2000-11-01 [KBrown] - traducción al español



--- NEW FILE ---
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


--- NEW FILE ---
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]