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

[phpwiki-checkins] CVS: phpwiki README.coding,1.3,1.4

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

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv30827

Modified Files:
	README.coding 
Log Message:
Added bit about following the PEAR coding standards; provided link;
made sure the Wiki formatting was correct.

Index: README.coding
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/README.coding,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** README.coding	2001/06/22 21:52:06	1.3
--- README.coding	2001/06/26 17:23:59	1.4
***************
*** 1,4 ****
! Here are the beginnings of some coding guidelines for PhpWiki.
  
  ! I18N: Using gettext()
  
--- 1,9 ----
! Here are the coding guidelines for PhpWiki.
  
+ ! Follow the style of the PEAR Coding Standards: 
+ * http://www.php.net/manual/en/pear.standards.php
+ There's code snippets for configuring Emacs and Vim as well as several
+ other text editors.
+ 
  ! I18N: Using gettext()
  
***************
*** 22,26 ****
  argue that it's better to use tabs and let people set their tab width,
  but I think we're better off using just spaces because aligned
! comments in the right region will not align correctly.
  
  Use php-mode as well. This is freely available on the net
--- 27,32 ----
  argue that it's better to use tabs and let people set their tab width,
  but I think we're better off using just spaces because aligned
! comments in the right region will not align correctly. For a detailed
! argument see http://www.jwz.org/doc/tabs-vs-spaces.html.
  
  Use php-mode as well. This is freely available on the net
***************
*** 28,35 ****
  in your .emacs file:
  
! (load "your-path-to-lisp-files/php-mode")
! (setq auto-mode-alist
!       (append '(
!                 ("\\.php\\d?\\'" . php-mode)) auto-mode-alist))
  
  so when you open .php files in Emacs it will start PHP mode
--- 34,41 ----
  in your .emacs file:
  
!  (load "your-path-to-lisp-files/php-mode")
!  (setq auto-mode-alist
!        (append '(
!                  ("\\.php\\d?\\'" . php-mode)) auto-mode-alist))
  
  so when you open .php files in Emacs it will start PHP mode
***************
*** 42,44 ****
  it to this README.
  
- Steve Wainstead
\ No newline at end of file
--- 48,49 ----

[phpwiki-checkins] CVS: phpwiki README.coding,1.2,1.3

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

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv6449

Modified Files:
	README.coding 
Log Message:
Corrected the URL for php-mode. I use the one from ontosys.com, but
there is another from sourceforge.

Index: README.coding
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/README.coding,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** README.coding	2001/06/22 21:35:44	1.2
--- README.coding	2001/06/22 21:52:06	1.3
***************
*** 25,29 ****
  
  Use php-mode as well. This is freely available on the net
! (http://sourceforge.net/projects/php-mode/). Put something like this
  in your .emacs file:
  
--- 25,29 ----
  
  Use php-mode as well. This is freely available on the net
! (http://www.ontosys.com/src/php-mode.el). Put something like this
  in your .emacs file:
  
***************
*** 35,38 ****
--- 35,41 ----
  so when you open .php files in Emacs it will start PHP mode
  automatically.
+ 
+ There is another php-mode.el I have not tried:
+ http://sourceforge.net/projects/php-mode/
  
  I'm sure Vim has a similar mode, if someone would let us know I'll add

[phpwiki-checkins] CVS: phpwiki README.coding,1.1,1.2

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

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv1926

Modified Files:
	README.coding 
Log Message:
Added bit about Emacs mode, where to get it, how to add it to your
.emacs file, and a request for Vim info.

Index: README.coding
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/README.coding,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** README.coding	2001/05/31 17:35:32	1.1
--- README.coding	2001/06/22 21:35:44	1.2
***************
*** 19,20 ****
--- 19,41 ----
   BAD:   define("MES", "howdy");  gettext(MES);
  
+ For editing files in Emacs, set indent-tabs-mode to nil. Some people
+ argue that it's better to use tabs and let people set their tab width,
+ but I think we're better off using just spaces because aligned
+ comments in the right region will not align correctly.
+ 
+ Use php-mode as well. This is freely available on the net
+ (http://sourceforge.net/projects/php-mode/). Put something like this
+ in your .emacs file:
+ 
+ (load "your-path-to-lisp-files/php-mode")
+ (setq auto-mode-alist
+       (append '(
+                 ("\\.php\\d?\\'" . php-mode)) auto-mode-alist))
+ 
+ so when you open .php files in Emacs it will start PHP mode
+ automatically.
+ 
+ I'm sure Vim has a similar mode, if someone would let us know I'll add
+ it to this README.
+ 
+ Steve Wainstead
\ No newline at end of file

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

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv31982

Modified Files:
	dbalib.php 
Log Message:
Same as dbmlib.php: ran indent-region on whole buffer, corrected
missed spots, untabify.

Index: dbalib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/dbalib.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dbalib.php	2001/02/17 05:36:21	1.4
--- dbalib.php	2001/06/22 21:27:55	1.5
***************
*** 1,28 ****
  <?php  
  
!    rcs_id('$Id$');
  
!    /*
!       Database functions:
  
!       OpenDataBase($dbname) 
!       CloseDataBase($dbi) 
!       PadSerializedData($data) 
!       UnPadSerializedData($data) 
!       RetrievePage($dbi, $pagename, $pagestore) 
!       InsertPage($dbi, $pagename, $pagehash) 
!       SaveCopyToArchive($dbi, $pagename, $pagehash) 
!       IsWikiPage($dbi, $pagename) 
!       IsInArchive($dbi, $pagename) 
!       InitTitleSearch($dbi, $search) 
!       TitleSearchNextMatch($dbi, &$pos) 
!       InitFullSearch($dbi, $search) 
!       FullSearchNextMatch($dbi, &$pos) 
!       IncreaseHitCount($dbi, $pagename) 
!       GetHitCount($dbi, $pagename) 
!       InitMostPopular($dbi, $limit) 
!       MostPopularNextMatch($dbi, &$res) 
!       GetAllWikiPagenames($dbi) 
!    */
  
  
--- 1,28 ----
  <?php  
  
! rcs_id('$Id$');
  
! /*
!   Database functions:
  
!   OpenDataBase($dbname) 
!   CloseDataBase($dbi) 
!   PadSerializedData($data) 
!   UnPadSerializedData($data) 
!   RetrievePage($dbi, $pagename, $pagestore) 
!   InsertPage($dbi, $pagename, $pagehash) 
!   SaveCopyToArchive($dbi, $pagename, $pagehash) 
!   IsWikiPage($dbi, $pagename) 
!   IsInArchive($dbi, $pagename) 
!   InitTitleSearch($dbi, $search) 
!   TitleSearchNextMatch($dbi, &$pos) 
!   InitFullSearch($dbi, $search) 
!   FullSearchNextMatch($dbi, &$pos) 
!   IncreaseHitCount($dbi, $pagename) 
!   GetHitCount($dbi, $pagename) 
!   InitMostPopular($dbi, $limit) 
!   MostPopularNextMatch($dbi, &$res) 
!   GetAllWikiPagenames($dbi) 
! */
  
  
***************
*** 30,44 ****
  function _dbname($base)
  {
!   extract($GLOBALS['DBParams']);
!   return "$directory/${database}${prefix}${base}";
  }
  
  $WikiPageStore = "wiki";
  $ArchivePageStore = "archive";
! $WikiDB = array('wiki'		=> _dbname('pagesdb'),
! 		'archive'	=> _dbname('archivedb'),
! 		'wikilinks'	=> _dbname('linksdb'),
! 		'hottopics'	=> _dbname('hottopicsdb'),
! 		'hitcount'	=> _dbname('hitcountdb'));
  
  if (preg_match('@^/tmp\b@', $DBParams['directory']))
--- 30,44 ----
  function _dbname($base)
  {
!    extract($GLOBALS['DBParams']);
!    return "$directory/${database}${prefix}${base}";
  }
  
  $WikiPageStore = "wiki";
  $ArchivePageStore = "archive";
! $WikiDB = array('wiki'          => _dbname('pagesdb'),
!                 'archive'       => _dbname('archivedb'),
!                 'wikilinks'     => _dbname('linksdb'),
!                 'hottopics'     => _dbname('hottopicsdb'),
!                 'hitcount'      => _dbname('hitcountdb'));
  
  if (preg_match('@^/tmp\b@', $DBParams['directory']))
***************
*** 46,274 ****
  
  define('MAX_DBM_ATTEMPTS', $DBParams['timeout']);
!    
!    // open a database and return the handle
!    // loop until we get a handle; php has its own
!    // locking mechanism, thank god.
!    // Suppress ugly error message with @.
! 
!    function OpenDataBase($dbname) {
!       global $WikiDB; // hash of all the DBM file names
! 
!       reset($WikiDB);
!       while (list($key, $file) = each($WikiDB)) {
!          while (($dbi[$key] = @dba_open($file, "c", "gdbm")) < 1) {
!             $numattempts++;
!             if ($numattempts > MAX_DBM_ATTEMPTS) {
!                ExitWiki("Cannot open database '$key' : '$file', giving up.");
!             }
!             sleep(1);
           }
        }
-       return $dbi;
     }
  
  
!    function CloseDataBase($dbi) {
!       reset($dbi);
!       while (list($dbmfile, $dbihandle) = each($dbi)) {
!          dba_close($dbihandle);
!       }
!       return;
     }
  
  
!    // take a serialized hash, return same padded out to
!    // the next largest number bytes divisible by 500. This
!    // is to save disk space in the long run, since DBM files
!    // leak memory.
!    function PadSerializedData($data) {
!       // calculate the next largest number divisible by 500
!       $nextincr = 500 * ceil(strlen($data) / 500);
!       // pad with spaces
!       $data = sprintf("%-${nextincr}s", $data);
!       return $data;
!    }
  
!    // strip trailing whitespace from the serialized data 
!    // structure.
!    function UnPadSerializedData($data) {
!       return chop($data);
!    }
  
!    // Return hash of page + attributes or default
!    function RetrievePage($dbi, $pagename, $pagestore) {
!       if ($data = dba_fetch($pagename, $dbi[$pagestore])) {
!          // unserialize $data into a hash
!          $pagehash = unserialize(UnPadSerializedData($data));
!          return $pagehash;
!       } else {
!          return -1;
!       }
     }
  
!    // Either insert or replace a key/value (a page)
!    function InsertPage($dbi, $pagename, $pagehash) {
!       $pagedata = PadSerializedData(serialize($pagehash));
! 
!       if (!dba_insert($pagename, $pagedata, $dbi['wiki'])) {
!          if (!dba_replace($pagename, $pagedata, $dbi['wiki'])) {
!             ExitWiki("Error inserting page '$pagename'");
!          }
!       } 
!    }
  
  
!    // for archiving pages to a seperate dbm
!    function SaveCopyToArchive($dbi, $pagename, $pagehash) {
!       global $ArchivePageStore;
! 
!       $pagedata = PadSerializedData(serialize($pagehash));
! 
!       if (!dba_insert($pagename, $pagedata, $dbi[$ArchivePageStore])) {
!          if (!dba_replace($pagename, $pagedata, $dbi['archive'])) {
!             ExitWiki("Error storing '$pagename' into archive");
!          }
!       } 
!    }
  
  
!    function IsWikiPage($dbi, $pagename) {
!       return dba_exists($pagename, $dbi['wiki']);
!    }
  
  
!    function IsInArchive($dbi, $pagename) {
!       return dba_exists($pagename, $dbi['archive']);
!    }
  
  
!    // setup for title-search
!    function InitTitleSearch($dbi, $search) {
!       $pos['search'] = $search;
!       $pos['key'] = dba_firstkey($dbi['wiki']);
  
!       return $pos;
!    }
  
!    // iterating through database
!    function TitleSearchNextMatch($dbi, &$pos) {
!       while ($pos['key']) {
!          $page = $pos['key'];
!          $pos['key'] = dba_nextkey($dbi['wiki']);
  
!          if (eregi($pos['search'], $page)) {
!             return $page;
!          }
        }
-       return 0;
     }
  
!    // setup for full-text search
!    function InitFullSearch($dbi, $search) {
!       return InitTitleSearch($dbi, $search);
!    }
  
!    //iterating through database
!    function FullSearchNextMatch($dbi, &$pos) {
!       while ($pos['key']) {
!          $key = $pos['key'];
!          $pos['key'] = dba_nextkey($dbi['wiki']);
! 
!          $pagedata = dba_fetch($key, $dbi['wiki']);
!          // test the serialized data
!          if (eregi($pos['search'], $pagedata)) {
! 	    $page['pagename'] = $key;
!             $pagedata = unserialize(UnPadSerializedData($pagedata));
! 	    $page['content'] = $pagedata['content'];
! 	    return $page;
! 	 }
        }
-       return 0;
     }
  
!    ////////////////////////
!    // new database features
  
  
!    function IncreaseHitCount($dbi, $pagename) {
  
!       if (dba_exists($pagename, $dbi['hitcount'])) {
!          // increase the hit count
!          // echo "$pagename there, incrementing...<br>\n";
!          $count = dba_fetch($pagename, $dbi['hitcount']);
!          $count++;
!          dba_replace($pagename, $count, $dbi['hitcount']);
!       } else {
!          // add it, set the hit count to one
!          // echo "adding $pagename to hitcount...<br>\n";
!          $count = 1;
!          dba_insert($pagename, $count, $dbi['hitcount']);
!       }
     }
  
!    function GetHitCount($dbi, $pagename) {
  
!       if (dba_exists($pagename, $dbi['hitcount'])) {
!          // increase the hit count
!          $count = dba_fetch($pagename, $dbi['hitcount']);
!          return $count;
!       } else {
!          return 0;
!       }
     }
  
- 
-    function InitMostPopular($dbi, $limit) {
-       // iterate through the whole dbm file for hit counts
-       // sort the results highest to lowest, and return 
-       // n..$limit results
  
!       $pagename = dba_firstkey($dbi['hitcount']);
!       $res[$pagename] = dba_fetch($pagename, $dbi['hitcount']);
  
!       while ($pagename = dba_nextkey($dbi['hitcount'])) {
!          $res[$pagename] = dba_fetch($pagename, $dbi['hitcount']);
!          //echo "got $pagename with value " . $res[$pagename] . "<br>\n";
!       }
  
!       arsort($res);
!       return($res);
     }
  
!    function MostPopularNextMatch($dbi, &$res) {
  
!       // the return result is a two element array with 'hits'
!       // and 'pagename' as the keys
  
!       if (count($res) == 0)
!          return 0;
  
!       if (list($pagename, $hits) = each($res)) {
!          //echo "most popular next match called<br>\n";
!          //echo "got $pagename, $hits back<br>\n";
!          $nextpage = array(
!             "hits" => $hits,
!             "pagename" => $pagename
           );
!          // $dbm_mostpopular_cntr++;
!          return $nextpage;
!       } else {
!          return 0;
!       }
!    } 
  
!    function GetAllWikiPagenames($dbi) {
!       $namelist = array();
!       $ctr = 0;
! 
!       $namelist[$ctr] = $key = dba_firstkey($dbi);
! 
!       while ($key = dba_nextkey($dbi)) {
!          $ctr++;
!          $namelist[$ctr] = $key;
!       }
  
!       return $namelist;
     }
  
  // For emacs users
--- 46,274 ----
  
  define('MAX_DBM_ATTEMPTS', $DBParams['timeout']);
! 
! // open a database and return the handle
! // loop until we get a handle; php has its own
! // locking mechanism, thank god.
! // Suppress ugly error message with @.
! 
! function OpenDataBase($dbname) {
!    global $WikiDB; // hash of all the DBM file names
! 
!    reset($WikiDB);
!    while (list($key, $file) = each($WikiDB)) {
!       while (($dbi[$key] = @dba_open($file, "c", "gdbm")) < 1) {
!          $numattempts++;
!          if ($numattempts > MAX_DBM_ATTEMPTS) {
!             ExitWiki("Cannot open database '$key' : '$file', giving up.");
           }
+          sleep(1);
        }
     }
+    return $dbi;
+ }
  
  
! function CloseDataBase($dbi) {
!    reset($dbi);
!    while (list($dbmfile, $dbihandle) = each($dbi)) {
!       dba_close($dbihandle);
     }
+    return;
+ }
  
  
! // take a serialized hash, return same padded out to
! // the next largest number bytes divisible by 500. This
! // is to save disk space in the long run, since DBM files
! // leak memory.
! function PadSerializedData($data) {
!    // calculate the next largest number divisible by 500
!    $nextincr = 500 * ceil(strlen($data) / 500);
!    // pad with spaces
!    $data = sprintf("%-${nextincr}s", $data);
!    return $data;
! }
  
! // strip trailing whitespace from the serialized data 
! // structure.
! function UnPadSerializedData($data) {
!    return chop($data);
! }
  
! // Return hash of page + attributes or default
! function RetrievePage($dbi, $pagename, $pagestore) {
!    if ($data = dba_fetch($pagename, $dbi[$pagestore])) {
!       // unserialize $data into a hash
!       $pagehash = unserialize(UnPadSerializedData($data));
!       return $pagehash;
!    } else {
!       return -1;
     }
+ }
  
! // Either insert or replace a key/value (a page)
! function InsertPage($dbi, $pagename, $pagehash) {
!    $pagedata = PadSerializedData(serialize($pagehash));
! 
!    if (!dba_insert($pagename, $pagedata, $dbi['wiki'])) {
!       if (!dba_replace($pagename, $pagedata, $dbi['wiki'])) {
!          ExitWiki("Error inserting page '$pagename'");
!       }
!    } 
! }
  
  
! // for archiving pages to a seperate dbm
! function SaveCopyToArchive($dbi, $pagename, $pagehash) {
!    global $ArchivePageStore;
! 
!    $pagedata = PadSerializedData(serialize($pagehash));
! 
!    if (!dba_insert($pagename, $pagedata, $dbi[$ArchivePageStore])) {
!       if (!dba_replace($pagename, $pagedata, $dbi['archive'])) {
!          ExitWiki("Error storing '$pagename' into archive");
!       }
!    } 
! }
  
  
! function IsWikiPage($dbi, $pagename) {
!    return dba_exists($pagename, $dbi['wiki']);
! }
  
  
! function IsInArchive($dbi, $pagename) {
!    return dba_exists($pagename, $dbi['archive']);
! }
  
  
! // setup for title-search
! function InitTitleSearch($dbi, $search) {
!    $pos['search'] = $search;
!    $pos['key'] = dba_firstkey($dbi['wiki']);
  
!    return $pos;
! }
  
! // iterating through database
! function TitleSearchNextMatch($dbi, &$pos) {
!    while ($pos['key']) {
!       $page = $pos['key'];
!       $pos['key'] = dba_nextkey($dbi['wiki']);
  
!       if (eregi($pos['search'], $page)) {
!          return $page;
        }
     }
+    return 0;
+ }
  
! // setup for full-text search
! function InitFullSearch($dbi, $search) {
!    return InitTitleSearch($dbi, $search);
! }
  
! //iterating through database
! function FullSearchNextMatch($dbi, &$pos) {
!    while ($pos['key']) {
!       $key = $pos['key'];
!       $pos['key'] = dba_nextkey($dbi['wiki']);
! 
!       $pagedata = dba_fetch($key, $dbi['wiki']);
!       // test the serialized data
!       if (eregi($pos['search'], $pagedata)) {
!          $page['pagename'] = $key;
!          $pagedata = unserialize(UnPadSerializedData($pagedata));
!          $page['content'] = $pagedata['content'];
!          return $page;
        }
     }
+    return 0;
+ }
  
! ////////////////////////
! // new database features
  
  
! function IncreaseHitCount($dbi, $pagename) {
  
!    if (dba_exists($pagename, $dbi['hitcount'])) {
!       // increase the hit count
!       // echo "$pagename there, incrementing...<br>\n";
!       $count = dba_fetch($pagename, $dbi['hitcount']);
!       $count++;
!       dba_replace($pagename, $count, $dbi['hitcount']);
!    } else {
!       // add it, set the hit count to one
!       // echo "adding $pagename to hitcount...<br>\n";
!       $count = 1;
!       dba_insert($pagename, $count, $dbi['hitcount']);
     }
+ }
  
! function GetHitCount($dbi, $pagename) {
  
!    if (dba_exists($pagename, $dbi['hitcount'])) {
!       // increase the hit count
!       $count = dba_fetch($pagename, $dbi['hitcount']);
!       return $count;
!    } else {
!       return 0;
     }
+ }
  
  
! function InitMostPopular($dbi, $limit) {
!    // iterate through the whole dbm file for hit counts
!    // sort the results highest to lowest, and return 
!    // n..$limit results
  
!    $pagename = dba_firstkey($dbi['hitcount']);
!    $res[$pagename] = dba_fetch($pagename, $dbi['hitcount']);
  
!    while ($pagename = dba_nextkey($dbi['hitcount'])) {
!       $res[$pagename] = dba_fetch($pagename, $dbi['hitcount']);
!       //echo "got $pagename with value " . $res[$pagename] . "<br>\n";
     }
  
!    arsort($res);
!    return($res);
! }
  
! function MostPopularNextMatch($dbi, &$res) {
  
!    // the return result is a two element array with 'hits'
!    // and 'pagename' as the keys
  
!    if (count($res) == 0)
!       return 0;
! 
!    if (list($pagename, $hits) = each($res)) {
!       //echo "most popular next match called<br>\n";
!       //echo "got $pagename, $hits back<br>\n";
!       $nextpage = array(
!          "hits" => $hits,
!          "pagename" => $pagename
           );
!       // $dbm_mostpopular_cntr++;
!       return $nextpage;
!    } else {
!       return 0;
!    }
! } 
  
! function GetAllWikiPagenames($dbi) {
!    $namelist = array();
!    $ctr = 0;
  
!    $namelist[$ctr] = $key = dba_firstkey($dbi);
! 
!    while ($key = dba_nextkey($dbi)) {
!       $ctr++;
!       $namelist[$ctr] = $key;
     }
+ 
+    return $namelist;
+ }
  
  // For emacs users

[phpwiki-checkins] CVS: phpwiki/lib dbmlib.php,1.9,1.10

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv30925

Modified Files:
	dbmlib.php 
Log Message:
Converted white space only; I ran indent-region on the whole buffer in
Emacs while in PHP mode; then I hunted through the file for any
inconsistencies (there were a couple), then ran untabify on the whole
buffer. This is largely what the code style should look like.

Index: dbmlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/dbmlib.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** dbmlib.php	2001/02/17 05:36:21	1.9
--- dbmlib.php	2001/06/22 21:24:40	1.10
***************
*** 1,39 ****
  <?php  
  
!    rcs_id('$Id$');
  
!    /*
!       Database functions:
  
!       OpenDataBase($table)
!       CloseDataBase($dbi)
!       RetrievePage($dbi, $pagename, $pagestore)
[...975 lines suppressed...]
!    // set the new tolinks for $pagename
!    $cache[$pagename]['tolinks'] = $linklist;
  
!    // add $pagename to the fromlinks of pages in $linklist
!    reset($linklist);
!    while (list($link, $dummy) = each($linklist)) {
!       if ($cache[$link])        // existing page?
!          $cache[$link]['fromlinks'][$pagename] = 1;
!    }
  
!    // Phase 4: write $cache back to 'wikilinks'
!    // ---------------------------------------------------------------
  
!    reset($cache);
!    while (list($link,$fromAndTolinks) = each($cache))
!       InsertPage($dbi, $link, $fromAndTolinks, 'wikilinks');
  
! }
  
  // For emacs users

[phpwiki-checkins] CVS: phpwiki/locale/es/pgsrc NotasDeLiberacion,NONE,1.1.2.1 PaginaPrincipal,1.1,1.1.2.1

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/es/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv7131/locale/es/pgsrc

Modified Files:
      Tag: release-1_2-branch
	PaginaPrincipal 
Added Files:
      Tag: release-1_2-branch
	NotasDeLiberacion 
Log Message:
Added missing page 'NotasDeLiberacion' containing a pointer
to the English 'ReleaseNotes'.



--- NEW FILE ---
In English: ReleaseNotes.

Index: PaginaPrincipal
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/pgsrc/Attic/PaginaPrincipal,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** PaginaPrincipal	2001/02/01 07:05:59	1.1
--- PaginaPrincipal	2001/06/14 00:41:26	1.1.2.1
***************
*** 5,9 ****
  *Vea en los CambiosRecientes las últimas modificaciones.
  *Averigüe que paginas son MasPopulares.
! *Lea las NotasDeLiberacion
  
  
--- 5,9 ----
  *Vea en los CambiosRecientes las últimas modificaciones.
  *Averigüe que paginas son MasPopulares.
! *Lea las NotasDeLiberacion.
  
  

[phpwiki-checkins] CVS: phpwiki/templates browse.html,1.9,1.9.2.1

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv6715/templates

Modified Files:
      Tag: release-1_2-branch
	browse.html 
Log Message:
Deleted extraneous <form> tag (which was only emitted in admin mode).



Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -r1.9 -r1.9.2.1
*** browse.html	2000/11/09 16:29:10	1.9
--- browse.html	2001/06/14 00:39:55	1.9.2.1
***************
*** 8,12 ****
  <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>]
--- 8,12 ----
  <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###
  ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Unlock page</a>]
  ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Lock page</a>]

[phpwiki-checkins] CVS: phpwiki/locale/it/templates browse.html,1.1.2.1,1.1.2.2

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/it/templates
In directory usw-pr-cvs1:/tmp/cvs-serv6715/locale/it/templates

Modified Files:
      Tag: release-1_2-branch
	browse.html 
Log Message:
Deleted extraneous <form> tag (which was only emitted in admin mode).



Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/it/templates/browse.html,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** browse.html	2001/05/21 16:10:32	1.1.2.1
--- browse.html	2001/06/14 00:39:55	1.1.2.2
***************
*** 8,12 ****
  <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###">Sblocca la pagina</a>]
  ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Blocca la pagina</a>]
--- 8,12 ----
  <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###
  ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Sblocca la pagina</a>]
  ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Blocca la pagina</a>]

[phpwiki-checkins] CVS: phpwiki/locale/nl/templates browse.html,1.3,1.3.2.1

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/nl/templates
In directory usw-pr-cvs1:/tmp/cvs-serv6715/locale/nl/templates

Modified Files:
      Tag: release-1_2-branch
	browse.html 
Log Message:
Deleted extraneous <form> tag (which was only emitted in admin mode).



Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/templates/browse.html,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** browse.html	2000/11/13 11:22:10	1.3
--- browse.html	2001/06/14 00:39:55	1.3.2.1
***************
*** 8,12 ****
  <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>]
--- 8,12 ----
  <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###
  ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Unlock page</a>]
  ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Lock page</a>]

[phpwiki-checkins] CVS: phpwiki/locale/sv/templates browse.html,1.1,1.1.2.1

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/sv/templates
In directory usw-pr-cvs1:/tmp/cvs-serv6715/locale/sv/templates

Modified Files:
      Tag: release-1_2-branch
	browse.html 
Log Message:
Deleted extraneous <form> tag (which was only emitted in admin mode).



Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/sv/templates/browse.html,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** browse.html	2001/01/31 07:36:48	1.1
--- browse.html	2001/06/14 00:39:55	1.1.2.1
***************
*** 8,12 ****
  <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###">Lås upp sida</a>]
  ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Lås sida</a>]
--- 8,12 ----
  <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###
  ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Lås upp sida</a>]
  ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Lås sida</a>]

[phpwiki-checkins] CVS: phpwiki/locale/de/templates browse.html,1.3,1.3.2.1

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/templates
In directory usw-pr-cvs1:/tmp/cvs-serv6715/locale/de/templates

Modified Files:
      Tag: release-1_2-branch
	browse.html 
Log Message:
Deleted extraneous <form> tag (which was only emitted in admin mode).



Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/templates/browse.html,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** browse.html	2000/11/13 21:52:52	1.3
--- browse.html	2001/06/14 00:39:55	1.3.2.1
***************
*** 8,12 ****
  <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###">Seite freigeben</a>]
  ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Seite sperren</a>]
--- 8,12 ----
  <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###
  ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Seite freigeben</a>]
  ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Seite sperren</a>]

[phpwiki-checkins] CVS: phpwiki/locale/es/templates browse.html,1.3,1.3.2.1

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/es/templates
In directory usw-pr-cvs1:/tmp/cvs-serv5819/locale/es/templates

Modified Files:
      Tag: release-1_2-branch
	browse.html 
Log Message:
The line-breaks in the file were screwed up somehow.
They're now fixed, as suggested by Aníbal Rojas <ar...@va...>.

Also, deleted extraneous <form> tag (which was only emitted in admin mode).



Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/templates/browse.html,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** browse.html	2001/02/01 07:06:39	1.3
--- browse.html	2001/06/14 00:38:31	1.3.2.1
***************
*** 8,12 ****
  <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
  <a href="###SCRIPTURL###?full=###PAGEURL###">###PAGE###</a></h1>
! ###IF:ADMIN###<FORM ACTION="###SCRIPTURL###" METHOD=POST>
    ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Desbloquear p&aacute;gina</a>] 
    ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Bloquear p&aacute;gina</a>] 
--- 8,12 ----
  <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###
    ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Desbloquear p&aacute;gina</a>] 
    ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Bloquear p&aacute;gina</a>] 
***************
*** 17,30 ****
  ###CONTENT###
  <hr noshade>
!   ###IF ADMIN###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a> 
!   de esta p&aacute;gina ###IF:!ADMIN### ###IF LOCK###P&aacute;gina bloqueada ###IF 
!   !LOCK###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a> de esta 
!   p&aacute;gina ###ENDIF:!ADMIN### (editada por &uacute;ltima vez ###LASTMODIFIED###) 
!   [<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>] [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>]) 
!   <br>
!   <a href="###SCRIPTURL###?FindPage">BuscarP&aacute;gina</a> navegando o buscando 
!   <hr noshade>
  <small>###RELATEDPAGES###</small>
  
! </form></body>
  </html>
--- 17,33 ----
  ###CONTENT###
  <hr noshade>
! ###IF ADMIN###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a> de esta p&aacute;gina 
! ###IF:!ADMIN###
! ###IF LOCK###P&aacute;gina bloqueada
! ###IF !LOCK###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a> de esta p&aacute;gina
! ###ENDIF:!ADMIN###
! (editada por &uacute;ltima vez ###LASTMODIFIED###) 
! [<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>] 
! [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>]) 
! <br>
! <a href="###SCRIPTURL###?FindPage">BuscarP&aacute;gina</a> navegando o buscando 
! <hr noshade>
  <small>###RELATEDPAGES###</small>
  
! </body>
  </html>

[phpwiki-checkins] CVS: phpwiki/locale/nl/LC_MESSAGES phpwiki.mo,1.12,1.13 phpwiki.php,1.11,1.12

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES
In directory usw-pr-cvs1:/tmp/cvs-serv9617/locale/nl/LC_MESSAGES

Modified Files:
	phpwiki.mo phpwiki.php 
Log Message:
Re-make *.{po,mo} files.



Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
Binary files /tmp/cvsmZuplJ and /tmp/cvswV3hCi differ

Index: phpwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES/phpwiki.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** phpwiki.php	2001/04/07 17:13:28	1.11
--- phpwiki.php	2001/05/31 17:48:05	1.12
***************
*** 1,4 ****
--- 1,6 ----
  <?php
  
+ $locale["!References"] =
+    "!Referenties";
  $locale["%d best incoming links:"] =
     "%d beste inkomende koppelingen:";
***************
*** 9,16 ****
--- 11,28 ----
  $locale["%d most popular nearby:"] =
     "%d meest gevraagde in de buurt:";
+ $locale["%d pages match your query."] =
+    "%d pagina's voldoen aan je vraag.";
  $locale["(first day for this Wiki)"] =
     "(eerste dag voor deze Wiki)";
+ $locale["(new)"] =
+    "(nieuw)";
+ $locale["- saved"] =
+    "- bewaard";
+ $locale["- skipped"] =
+    "- overgeslagen";
  $locale["<b>Reload</b> the page. You should now see the most current version of the page. Your changes are no longer there."] =
     "<b>Reload</b> de pagina.  Je zou nu de meest recente versie van de pagina moeten zien.  Jouw veranderingen staan er nu niet meer.";
+ $locale["Action $action is disabled in this wiki."] =
+    "Actie $action is niet beschikbaar in deze wiki.";
  $locale["Archived page:"] =
     "Gearchiveerde pagina:";
***************
*** 23,30 ****
  $locale["Cannot open database %s, giving up."] =
     "Kan data base %s niet openen, geef op.";
  $locale["Copy of %s"] =
     "Kopie van %s";
  $locale["Copy your changes to the clipboard or to another temporary place (e.g. text editor)."] =
!    "Kopiëer je veranderingen naar het klipbord of een andere tijdelijke plaats (bijv. een tekst editor).";
  $locale["Current page:"] =
     "Huidige pagina:";
--- 35,46 ----
  $locale["Cannot open database %s, giving up."] =
     "Kan data base %s niet openen, geef op.";
+ $locale["Click <a href=\"%s\">here</a> to remove the page now."] =
+    "Klik <a href=\"%s\">hier</a> om de pagina nu te verwijderen.";
+ $locale["Complete."] =
+    "Klaar.";
  $locale["Copy of %s"] =
     "Kopie van %s";
  $locale["Copy your changes to the clipboard or to another temporary place (e.g. text editor)."] =
!    "Kopier je veranderingen naar het klipbord of een andere tijdelijke plaats (bijv. een tekst editor).";
  $locale["Current page:"] =
     "Huidige pagina:";
***************
*** 44,50 ****
     "Volledige tekst zoek resultaten";
  $locale["Function not yet implemented."] =
!    "Functie nog niet geïmplementeerd.";
  $locale["HomePage"] =
!    "VoorPagina";
  $locale["In order to recover from this situation follow these steps:"] =
     "Om uit deze benarde situatie te geraken, volg je deze stappen:";
--- 60,66 ----
     "Volledige tekst zoek resultaten";
  $locale["Function not yet implemented."] =
!    "Functie nog niet gemplementeerd.";
  $locale["HomePage"] =
!    "ThuisPagina";
  $locale["In order to recover from this situation follow these steps:"] =
     "Om uit deze benarde situatie te geraken, volg je deze stappen:";
***************
*** 53,56 ****
--- 69,78 ----
  $locale["Insert/update failed: %s"] =
     "Insert/update gefaald: %s";
+ $locale["Lists nested too deep in SetHTMLOutputMode"] =
+    "Lijsten nesten te diep in SetHTMLOutputMode";
+ $locale["Loading up virgin wiki"] =
+    "Laden van maagdelijke wiki";
+ $locale["MIME file"] =
+    "MIME bestand";
  $locale["Make changes to the file again. Paste your additions from the clipboard (or text editor)."] =
     "Breng je veranderingen aan de pagina opnieuw aan.  Plak je toevoeginen van het klipbord (of tekst editor).";
***************
*** 81,96 ****
--- 103,128 ----
  $locale["Removed page '%s' succesfully."] =
     "Pagina '%s' verwijderd.";
+ $locale["Return to "] =
+    "Terug naar ";
  $locale["Search"] =
     "Zoek";
  $locale["Searching for \"%s\" ....."] =
     "Zoeken naar \"%s\" ...";
+ $locale["Serialized file"] =
+    "Geserialiseerd bestand";
+ $locale["Show the page source"] =
+    "Toon de pagina bron tekst";
  $locale["Sorry for the inconvenience."] =
     "Excuses voor het ongemak.";
  $locale["Thank you for editing %s."] =
     "Bedankt voor het veranderen van %s.";
+ $locale["The PhpWiki programming team"] =
+    "Het PhpWiki programmeerteam";
  $locale["The most recently changed pages are listed below."] =
     "De meest recent veranderde pagina's staan hieronder:";
  $locale["This page has been locked by the administrator and cannot be edited."] =
     "Deze pagina is afgesloten door de beheerder en kan niet veranderd worden.";
+ $locale["Title Search Results"] =
+    "Titel zoek resultaten";
  $locale["Use your browser's <b>Back</b> button to go back to the edit page."] =
     "Gebruik de <b>Terug</b> knop van je bladeraar om terug te gaan naar de verander tekst pagina.";
***************
*** 103,112 ****
  $locale["You entered an invalid login or password."] =
     "Je hebt een ongeldige gebruikersnaam of wachtwoord ingevoerd.";
  $locale["Your careful attention to detail is much appreciated."] =
     "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd.";
  $locale["by %s"] =
     "door %s";
  $locale["last modified on %s"] =
!    "laatste verandering op %s";
  $locale["version %s"] =
     "versie %s";
--- 135,160 ----
  $locale["You entered an invalid login or password."] =
     "Je hebt een ongeldige gebruikersnaam of wachtwoord ingevoerd.";
+ $locale["You must set the administrator account and password before you can log in."] =
+    "Je moet de beheerder gebruiker en het wachtwoord zetten voordat je in kan loggen.";
+ $locale["You must specify a directory to dump to"] =
+    "Je moet een directory specificeren om in te storten";
+ $locale["You must specify a source to read from"] =
+    "Je moet een bron specificeren om van te lezen.";
  $locale["Your careful attention to detail is much appreciated."] =
     "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd.";
+ $locale["[%d] See [%s]"] =
+    "[%d] Zie [%s]";
+ $locale["as version %d"] =
+    "als versie %d";
  $locale["by %s"] =
     "door %s";
+ $locale["from %s"] =
+    "van %s";
+ $locale["is identical to current version %d"] =
+    "is gelijk aaan huidige versie %d";
  $locale["last modified on %s"] =
!    "meest recente verandering op %s";
! $locale["plain file"] =
!    "plat bestand";
  $locale["version %s"] =
     "versie %s";

[phpwiki-checkins] CVS: phpwiki/locale/po de.po,1.10,1.11 es.po,1.9,1.10 it.po,1.2,1.3 phpwiki.pot,1.11,1.12 sv.po,1.5,1.6

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory usw-pr-cvs1:/tmp/cvs-serv9617/locale/po

Modified Files:
	de.po es.po it.po phpwiki.pot sv.po 
Log Message:
Re-make *.{po,mo} files.



Index: de.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/de.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** de.po	2001/05/21 17:25:37	1.10
--- de.po	2001/05/31 17:48:05	1.11
***************
*** 7,11 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.8\n"
! "POT-Creation-Date: 2001-05-21 09:36-0700\n"
  "PO-Revision-Date: 2000-10-31 02:23+0200\n"
  "Last-Translator: Arno Hollosi <aho...@ma...>\n"
--- 7,11 ----
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.8\n"
! "POT-Creation-Date: 2001-05-31 09:42-0700\n"
  "PO-Revision-Date: 2000-10-31 02:23+0200\n"
  "Last-Translator: Arno Hollosi <aho...@ma...>\n"
***************
*** 112,115 ****
--- 112,119 ----
  msgstr ""
  
+ #: ../lib/loadsave.php:16
+ msgid "Return to "
+ msgstr ""
+ 
  #: ../lib/loadsave.php:99 ../lib/main.php:158
  msgid "You must specify a directory to dump to"
***************
*** 139,142 ****
--- 143,171 ----
  msgstr "Version %s"
  
+ #: ../lib/loadsave.php:263
+ msgid "MIME file"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:268
+ msgid "Serialized file"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:275
+ msgid "plain file"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:363 ../lib/loadsave.php:378 ../lib/loadsave.php:409
+ #: ../lib/stdlib.php:595 ../lib/stdlib.php:664
+ msgid "RecentChanges"
+ msgstr "FrischeSeiten"
+ 
+ #: ../lib/loadsave.php:373
+ msgid "The PhpWiki programming team"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:375
+ msgid "Loading up virgin wiki"
+ msgstr ""
+ 
  #: ../lib/main.php:41 ../lib/main.php:99 ../lib/main.php:101
  msgid "HomePage"
***************
*** 312,319 ****
  msgstr "Die %d meistbesuchten Seiten in der Nähe:"
  
- #: ../lib/stdlib.php:595 ../lib/stdlib.php:664
- msgid "RecentChanges"
- msgstr "FrischeSeiten"
- 
  #: ../lib/stdlib.php:611
  msgid "The most recently changed pages are listed below."
--- 341,344 ----
***************
*** 328,331 ****
--- 353,360 ----
  msgstr "Schnelle Titelsuche:"
  
+ #: ../lib/stdlib.php:645
+ msgid "(new)"
+ msgstr ""
+ 
  #: ../lib/transform.php:114
  #, fuzzy
***************
*** 336,341 ****
  msgid "Search"
  msgstr "Suche"
  
! #: ../lib/userauth.php:158
  msgid "You entered an invalid login or password."
  msgstr "Du hast ein ungültiges Login oder Passwort eingegeben."
--- 365,388 ----
  msgid "Search"
  msgstr "Suche"
+ 
+ #: ../lib/userauth.php:83
+ #, c-format
+ msgid "to perform action '%s'"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:85
+ msgid "to do that"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:86
+ msgid "You must be logged in as an administrator"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:154
+ msgid ""
+ "You must set the administrator account and password before you can log in."
+ msgstr ""
  
! #: ../lib/userauth.php:166
  msgid "You entered an invalid login or password."
  msgstr "Du hast ein ungültiges Login oder Passwort eingegeben."

Index: es.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/es.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** es.po	2001/05/21 17:25:37	1.9
--- es.po	2001/05/31 17:48:05	1.10
***************
*** 13,17 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.2.0\n"
! "POT-Creation-Date: 2001-05-21 09:36-0700\n"
  "PO-Revision-Date: 2000-02-01 00:50-0500\n"
  "Last-Translator: Pablo Roca <pr...@cl...>\n"
--- 13,17 ----
  msgstr ""
  "Project-Id-Version: phpwiki 1.2.0\n"
! "POT-Creation-Date: 2001-05-31 09:42-0700\n"
  "PO-Revision-Date: 2000-02-01 00:50-0500\n"
  "Last-Translator: Pablo Roca <pr...@cl...>\n"
***************
*** 140,143 ****
--- 140,147 ----
  msgstr ""
  
+ #: ../lib/loadsave.php:16
+ msgid "Return to "
+ msgstr ""
+ 
  #: ../lib/loadsave.php:99 ../lib/main.php:158
  msgid "You must specify a directory to dump to"
***************
*** 168,171 ****
--- 172,201 ----
  msgstr "versi&oacute;n %s"
  
+ #: ../lib/loadsave.php:263
+ msgid "MIME file"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:268
+ msgid "Serialized file"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:275
+ msgid "plain file"
+ msgstr ""
+ 
+ # lib/stdlib.php:384 lib/stdlib.php:445
+ #: ../lib/loadsave.php:363 ../lib/loadsave.php:378 ../lib/loadsave.php:409
+ #: ../lib/stdlib.php:595 ../lib/stdlib.php:664
+ msgid "RecentChanges"
+ msgstr "CambiosRecientes"
+ 
+ #: ../lib/loadsave.php:373
+ msgid "The PhpWiki programming team"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:375
+ msgid "Loading up virgin wiki"
+ msgstr ""
+ 
  # lib/display.php:14
  #: ../lib/main.php:41 ../lib/main.php:99 ../lib/main.php:101
***************
*** 372,380 ****
  msgstr "%d las m&aacute;s populares:"
  
- # lib/stdlib.php:384 lib/stdlib.php:445
- #: ../lib/stdlib.php:595 ../lib/stdlib.php:664
- msgid "RecentChanges"
- msgstr "CambiosRecientes"
- 
  #: ../lib/stdlib.php:611
  msgid "The most recently changed pages are listed below."
--- 402,405 ----
***************
*** 389,392 ****
--- 414,421 ----
  msgstr "Busqueda rápida de páginas:"
  
+ #: ../lib/stdlib.php:645
+ msgid "(new)"
+ msgstr ""
+ 
  # lib/stdlib.php:330
  #: ../lib/transform.php:114
***************
*** 400,405 ****
  msgstr "Buscar"
  
  # admin.php:26
! #: ../lib/userauth.php:158
  msgid "You entered an invalid login or password."
  msgstr ""
--- 429,452 ----
  msgstr "Buscar"
  
+ #: ../lib/userauth.php:83
+ #, c-format
+ msgid "to perform action '%s'"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:85
+ msgid "to do that"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:86
+ msgid "You must be logged in as an administrator"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:154
+ msgid ""
+ "You must set the administrator account and password before you can log in."
+ msgstr ""
+ 
  # admin.php:26
! #: ../lib/userauth.php:166
  msgid "You entered an invalid login or password."
  msgstr ""

Index: it.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/it.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** it.po	2001/05/21 17:28:44	1.2
--- it.po	2001/05/31 17:48:05	1.3
***************
*** 7,11 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.2.0\n"
! "POT-Creation-Date: 2001-05-21 09:36-0700\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: Marco Milanesi <kp...@ad...>\n"
--- 7,11 ----
  msgstr ""
  "Project-Id-Version: phpwiki 1.2.0\n"
! "POT-Creation-Date: 2001-05-31 09:42-0700\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: Marco Milanesi <kp...@ad...>\n"
***************
*** 112,115 ****
--- 112,119 ----
  msgstr ""
  
+ #: ../lib/loadsave.php:16
+ msgid "Return to "
+ msgstr ""
+ 
  #: ../lib/loadsave.php:99 ../lib/main.php:158
  msgid "You must specify a directory to dump to"
***************
*** 139,142 ****
--- 143,171 ----
  msgstr "versione %s"
  
+ #: ../lib/loadsave.php:263
+ msgid "MIME file"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:268
+ msgid "Serialized file"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:275
+ msgid "plain file"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:363 ../lib/loadsave.php:378 ../lib/loadsave.php:409
+ #: ../lib/stdlib.php:595 ../lib/stdlib.php:664
+ msgid "RecentChanges"
+ msgstr "ModificheRecenti"
+ 
+ #: ../lib/loadsave.php:373
+ msgid "The PhpWiki programming team"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:375
+ msgid "Loading up virgin wiki"
+ msgstr ""
+ 
  #: ../lib/main.php:41 ../lib/main.php:99 ../lib/main.php:101
  msgid "HomePage"
***************
*** 309,316 ****
  msgstr "%d pi&ugrave; popolari:"
  
- #: ../lib/stdlib.php:595 ../lib/stdlib.php:664
- msgid "RecentChanges"
- msgstr "ModificheRecenti"
- 
  #: ../lib/stdlib.php:611
  msgid "The most recently changed pages are listed below."
--- 338,341 ----
***************
*** 325,328 ****
--- 350,357 ----
  msgstr ""
  
+ #: ../lib/stdlib.php:645
+ msgid "(new)"
+ msgstr ""
+ 
  #: ../lib/transform.php:114
  msgid "Lists nested too deep in SetHTMLOutputMode"
***************
*** 332,337 ****
  msgid "Search"
  msgstr "Ricerca"
  
! #: ../lib/userauth.php:158
  msgid "You entered an invalid login or password."
  msgstr "Nome utente o password errata."
--- 361,384 ----
  msgid "Search"
  msgstr "Ricerca"
+ 
+ #: ../lib/userauth.php:83
+ #, c-format
+ msgid "to perform action '%s'"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:85
+ msgid "to do that"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:86
+ msgid "You must be logged in as an administrator"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:154
+ msgid ""
+ "You must set the administrator account and password before you can log in."
+ msgstr ""
  
! #: ../lib/userauth.php:166
  msgid "You entered an invalid login or password."
  msgstr "Nome utente o password errata."

Index: phpwiki.pot
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/phpwiki.pot,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** phpwiki.pot	2001/05/21 17:26:11	1.11
--- phpwiki.pot	2001/05/31 17:48:05	1.12
***************
*** 7,11 ****
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
! "POT-Creation-Date: 2001-05-21 09:36-0700\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: 2001-05-31 09:42-0700\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
***************
*** 110,113 ****
--- 110,117 ----
  msgstr ""
  
+ #: ../lib/loadsave.php:16
+ msgid "Return to "
+ msgstr ""
+ 
  #: ../lib/loadsave.php:99 ../lib/main.php:158
  msgid "You must specify a directory to dump to"
***************
*** 137,140 ****
--- 141,169 ----
  msgstr ""
  
+ #: ../lib/loadsave.php:263
+ msgid "MIME file"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:268
+ msgid "Serialized file"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:275
+ msgid "plain file"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:363 ../lib/loadsave.php:378 ../lib/loadsave.php:409
+ #: ../lib/stdlib.php:595 ../lib/stdlib.php:664
+ msgid "RecentChanges"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:373
+ msgid "The PhpWiki programming team"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:375
+ msgid "Loading up virgin wiki"
+ msgstr ""
+ 
  #: ../lib/main.php:41 ../lib/main.php:99 ../lib/main.php:101
  msgid "HomePage"
***************
*** 294,301 ****
  msgstr ""
  
- #: ../lib/stdlib.php:595 ../lib/stdlib.php:664
- msgid "RecentChanges"
- msgstr ""
- 
  #: ../lib/stdlib.php:611
  msgid "The most recently changed pages are listed below."
--- 323,326 ----
***************
*** 310,313 ****
--- 335,342 ----
  msgstr ""
  
+ #: ../lib/stdlib.php:645
+ msgid "(new)"
+ msgstr ""
+ 
  #: ../lib/transform.php:114
  msgid "Lists nested too deep in SetHTMLOutputMode"
***************
*** 317,322 ****
  msgid "Search"
  msgstr ""
  
! #: ../lib/userauth.php:158
  msgid "You entered an invalid login or password."
  msgstr ""
--- 346,369 ----
  msgid "Search"
  msgstr ""
+ 
+ #: ../lib/userauth.php:83
+ #, c-format
+ msgid "to perform action '%s'"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:85
+ msgid "to do that"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:86
+ msgid "You must be logged in as an administrator"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:154
+ msgid ""
+ "You must set the administrator account and password before you can log in."
+ msgstr ""
  
! #: ../lib/userauth.php:166
  msgid "You entered an invalid login or password."
  msgstr ""

Index: sv.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/sv.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** sv.po	2001/05/21 17:25:37	1.5
--- sv.po	2001/05/31 17:48:05	1.6
***************
*** 7,11 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.9\n"
! "POT-Creation-Date: 2001-05-21 09:36-0700\n"
  "PO-Revision-Date: 2001-01-27 01:58+0200\n"
  "Last-Translator: Jon Åslund <jo...@he...>\n"
--- 7,11 ----
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.9\n"
! "POT-Creation-Date: 2001-05-31 09:42-0700\n"
  "PO-Revision-Date: 2001-01-27 01:58+0200\n"
  "Last-Translator: Jon Åslund <jo...@he...>\n"
***************
*** 110,113 ****
--- 110,117 ----
  msgstr ""
  
+ #: ../lib/loadsave.php:16
+ msgid "Return to "
+ msgstr ""
+ 
  #: ../lib/loadsave.php:99 ../lib/main.php:158
  msgid "You must specify a directory to dump to"
***************
*** 137,140 ****
--- 141,169 ----
  msgstr "version %s"
  
+ #: ../lib/loadsave.php:263
+ msgid "MIME file"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:268
+ msgid "Serialized file"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:275
+ msgid "plain file"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:363 ../lib/loadsave.php:378 ../lib/loadsave.php:409
+ #: ../lib/stdlib.php:595 ../lib/stdlib.php:664
+ msgid "RecentChanges"
+ msgstr "SenasteÄndringar"
+ 
+ #: ../lib/loadsave.php:373
+ msgid "The PhpWiki programming team"
+ msgstr ""
+ 
+ #: ../lib/loadsave.php:375
+ msgid "Loading up virgin wiki"
+ msgstr ""
+ 
  #: ../lib/main.php:41 ../lib/main.php:99 ../lib/main.php:101
  msgid "HomePage"
***************
*** 307,314 ****
  msgstr "De %d mest populära grannarna:"
  
- #: ../lib/stdlib.php:595 ../lib/stdlib.php:664
- msgid "RecentChanges"
- msgstr "SenasteÄndringar"
- 
  #: ../lib/stdlib.php:611
  msgid "The most recently changed pages are listed below."
--- 336,339 ----
***************
*** 323,326 ****
--- 348,355 ----
  msgstr "Snabb titelsökning:"
  
+ #: ../lib/stdlib.php:645
+ msgid "(new)"
+ msgstr ""
+ 
  #: ../lib/transform.php:114
  #, fuzzy
***************
*** 331,336 ****
  msgid "Search"
  msgstr "Sök"
  
! #: ../lib/userauth.php:158
  msgid "You entered an invalid login or password."
  msgstr "Du har angett ett otillåtet användarnamn eller lösenord."
--- 360,383 ----
  msgid "Search"
  msgstr "Sök"
+ 
+ #: ../lib/userauth.php:83
+ #, c-format
+ msgid "to perform action '%s'"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:85
+ msgid "to do that"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:86
+ msgid "You must be logged in as an administrator"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:154
+ msgid ""
+ "You must set the administrator account and password before you can log in."
+ msgstr ""
  
! #: ../lib/userauth.php:166
  msgid "You entered an invalid login or password."
  msgstr "Du har angett ett otillåtet användarnamn eller lösenord."

[phpwiki-checkins] CVS: phpwiki/locale/nl/pgsrc GebruikersVoorkeuren,NONE,1.1 PhpWiki,NONE,1.1 PhpWikiBeheer,NONE,1.1 ThuisPagina,NONE,1.1 ToverPhpWikiURLs,NONE,1.1 HoeWikiTeGebruiken,1.4,1.5 MeerOverTechnieken,1.3,1.4 PaginasToevoegen,1.4,1.5 UitgaveNoten,1.2,1.3 WabiSabi,1.4,1.5 ZoekPagina,1.3,1.4 VoorPagina,1.1,NONE

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/nl/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv9423/locale/nl/pgsrc

Modified Files:
	HoeWikiTeGebruiken MeerOverTechnieken PaginasToevoegen 
	UitgaveNoten WabiSabi ZoekPagina 
Added Files:
	GebruikersVoorkeuren PhpWiki PhpWikiBeheer ThuisPagina 
	ToverPhpWikiURLs 
Removed Files:
	VoorPagina 
Log Message:
Dutch translation updates by Jan Nieuwenhuizen <ja...@gn...>.


--- NEW FILE ---
Mime-Version: 1.0
Content-Type: application/x-phpwiki;
  pagename=GebruikersVoorkeuren;
  flags=PAGE_LOCKED
Content-Transfer-Encoding: binary

Je kunt nu enkele gebruikersvoorkeuren instellen.  De waarden van deze
instellingen worden momenteel bewaard in een koekje (dus je bladeraar
moet koekjes accepteren om van gebruikersvoorkeuren gebruik te kunnen maken).

! !InvoerVeld Afmetingen.

[Zet Breedte | phpwiki:?action=setprefs&edit_area_width=3()]
[Zet Hoogte | phpwiki:?action=setprefs&edit_area_height=3()]

--- NEW FILE ---
Je gebruikt PhpWiki nu, op dit moment.  Ongelooflijk, nietwaar?

Bezoek onze thuispagina op http://phpwiki.sourceforge.net/ en zie PhpWiki
in actie op http://phpwiki.sourceforge.net/phpwiki/.


--- NEW FILE ---
>From hos...@da...  Sat Feb 10 21:28:19 2001
Subject: PhpWikiBeheer
From: hos...@da... (PhpWiki)
Date: Sat, 10 Feb 2001 20:11:14 -0800
Mime-Version: 1.0 (Produced by PhpWiki 1.1.x)
Content-Type: application/x-phpwiki;
  pagename=PhpWikiBeheer;
  flags=PAGE_LOCKED
Content-Transfer-Encoding: binary

__Noot__: Het merendeel van de acties op deze pagina vereist beheer
privileges.  Ze zullen niet werken tenzij je een beheer gebruikersnaam
en wachtwoord in het PhpWiki configuratiebestand hebt gezet.

-----------
! Log In

 __[Log In | phpwiki:?action=login]__

Dit staat je toe in te loggen.  Wanneer je ingelogd bent, kun je
pagina's ''afsluiten'', ''openen'', en ''verwijderen''.  Je kunt ook
''gesloten'' pagina's wijzigen.

----------

!! Kiekjes of Backups maken

! ZIP bestanden van database

Deze koppelingen leiden naar zip bestanden, aangemaakt terwijl je
wacht, die alle pagina's van je Wiki bevatten.  Het zip bestand wordt
gedowload naar je lokale computer.

Dit __[ZIP Kiekje | phpwiki:?action=zip]__ bevat enkel de meest recente versies van elke pagina, terwijl deze __[ZIP Stort | phpwiki:?action=zip&include=all]__ alle gearchiveerde versies bevat.

(Als de PhpWiki geconfigureerd is dit toe te staan,) kan iedereen een
zip bestand downloaden.

Als je php ''zlib'' ondersteuning heeft, worden de bestanden is het
archief gecomprimeerd, anders worden ze simpelweg opgeslagen.

! Stort in directory

Hier kun je pagina's van je Wiki in een willekeurige directory storten.

[ Stort pagina's | phpwiki:?action=dumpserial&directory=(/tmp/wikistort) ]

De meest recente versie van elke pagina wordt naar de directory geschreven,
een pagina be bestand.  Je server moet schrijfpermissies naar die directory
hebben.

-----------

!! Herladen

Als je een stel pagina's van PhpWiki hebt gestort, kun je ze hier
herladen.  Noot dat pagina's in je database zullen worden
overschreven; dus, als je je ThuisPagina hebt gestort en je laadt
vanuit dit formulier, zal de pagina die nu in je database staat worden
overschreven.  Als je een selectie wilt maken, verwijder dan de
pagina's uit de directory (of uit het zip bestand) die je niet wil
laden.

! Upload bestand

Hier kun je ZIP archieven uploaden, of individuele bestanden van je (client)
machine.

[ Upload | phpwiki:?action=upload&file=50()upload ]

! Laad bestand

Here you can load ZIP archives, individual files or entire directories.
The file or directory must be local to the http server.
You can also use this form to load from an http: or ftp: URL.

[ Laad | phpwiki:?action=loadfile&source=50(/tmp/wikidump) ]

-----------

!! Formaat van de bestanden

Momenteel worden de pagina's opgeslagen, een per bestand, als MIME ([
RFC2045 | http://www.faqs.org/rfcs/rfc2045.html ]) e-mail ([ RFC822 |
http://www.faqs.org/rfcs/rfc822.html ]) berichten.  Het content-type
''application/x-phpwiki'' wordt gebruikt, en pagina meta-data wordt
gecodeerd in de content-type parameters.
(Als het bestand meerdere versies van een pagina bevat, is het type
''multipart/mixed'', en bevat een aantal onderdelen, elke van type
''application/x-phpwiki''.)
De body van het bericht bevat de tekst van de pagina.

! Oude formaten

__Geserialiseerde bestanden__

De stort naar directory opdracht stortte voorheen de pagina's als php
''serialized()'' strings.  Dit maakte de bestanden slecht geschikt
voor menselijke consumptie, en bijna onmogelijk te veranderen.

__Platte bestanden__

Nog vroeger werd de pagina tekst gewoon naar een bestand gestort ---
dit betekent dat alle pagina meta-data verloren ging.

The upload and load functions will automatically recognize each of these
three types of files, and handle them accordingly.
Note that when loading ''plain files'', the page name is deduced from the
file name.

De upload en laad functies herkennen automatisch alle van deze drie
verschillenden types van bestanden, en verwerken ze aldus.  Noot dat
bij het laden van ''platte bestanden'' de paginanaam wordt afgeleidt
van de bestandsnaam.

--- NEW FILE ---
* Wat is een WikiWikiWeb? Een beschrijving van deze toepassing.
* Leer HoeWikiTeGebruiken en leer over PaginasToevoegen.
* Speel in de ZandBak om met Wiki pagina's te oefenen.
* Zet je naam alsjeblieft in RecenteBezoekers.
* Zie RecenteVeranderingen voor de meest recente toevoegingen en veranderingen.
* Ontdek welke pagina's het MeestBezocht worden.
* Lees de UitgaveNoten.

--- NEW FILE ---
Mime-Version: 1.0 (Produced by PhpWiki 1.1.x)
Content-Type: application/x-phpwiki;
  pagename=ToverPhpWikiURLs;
  flags=PAGE_LOCKED
Content-Transfer-Encoding: binary

!!! Over phpwiki: URLs

Een speciaal typen URL is beschikbaar voor het maken van koppelingen
naar beheers- en andere speciale functies in PhpWiki.  Hier is een
korte beschrijving hoe ze werken.

De basissyntax van een phpwiki: URL is
  __phpwiki:__''paginanaam''__?__''vraag-argen''

Als ''paginanaam'' wordt weggelaten, wordt het de huidige pagina.

''Vraag-argen'' moet een reeks van parameters in standaard HTTP GET
formaat zijn.

''Vraag-argen''

FIXME: can these be localised?
De "action=''x''" parameter moet altijd worden opgegeven.  Het kan er
een zijn van __browse__, __info__, __diff__, __search__, __edit__,
__zip__, __dumpserial__, __loadserial__, __remove__, __lock__,
__unlock__, __login__, __logout__, __setprefs__ of __save__.
The standaard actie is __browse__.


Sommige van deze acties accepteren andere parameters.

;__info__: Accepteert __showpagesource__.
;__search__: Accepteert __searchterm__, and __searchtype__.
;__edit__: Accepteert __version__.
;__remove__: Accepteert __verify__.
;__save__: Accepteert __editversion__, __minor_edit__, en __content__.
;__setprefs__: Accepteert __edit_area_width__, __edit_area_height__.

!! Tover Koppelingen Schrijven in Wiki Pagina's

Een toverkoppeling ziet eruit als:

  __[[__ ''tekst'' __|__ ''phpwiki-url'' __]__


Het "''tekst'' __|__" deel is optioneel maar meestal wel aan te raden.
Als dit is opgegeven wordt dit het etiket voor de koppeling.

Het ''phpwiki-url'' gedeelte is ook optioneel.  Als dit wordt
weggelaten, wijst de koppeling naar de huidige wiki-pagina.

!Enkele voorbeelden

  [[ Verander de !ZandBak | phpwiki:!ZandBak?action=edit ]
zal een koppeling maken die je direct naar het wijzigen van de ZandBak brengt,
aldus:
[ Verander de ZandBak | phpwiki:ZandBak?action=edit ].

Andere mogelijkheden:
* [ Diff de ZandBak | phpwiki:ZandBak?action=diff ],
* [ Sluit de ThuisPagina af | phpwiki:ThuisPagina?action=lock ],
* [ Krijg een Volledige Zip Stort | phpwiki:?action=zip&include=all ],
* [ Paginatitels die 'wiki' bevatten | phpwiki:?action=search&searchterm=wiki ],

!! Tover Formulieren schrijven in Wiki Pagina's

Als een van de ''vraag-argen'' een waarde heeft als
  ''arg''__=__''opt-breedte''__(__''opt-verstek-waarde''__)__
zal de koppeling worden weergegeven als een formulier, in plaats van een anker.

''Opt-breedte'', als opgegeven specificeert de breedte van het invoerveld,
terwijld ''opt-verstek-waarde'' de verstekwaarde voor de invoer specificeert.
Als ''tekst'' wordt opgegeven in de koppelijng, dan wordt een submit-knop
met dat etiket opgenomen in het formulier, zoniet wordt de submit knop
achterwege gelaten.

Voorbeelden:

  [[ Volledige Zoektocht | phpwiki:?action=search&searchtype=full&searchterm=() ] 
geeft
[ Volledige Zoektocht | phpwiki:?action=search&searchtype=full&searchterm=() ] 

Terwijl
  [[ phpwiki:?action=search&searchterm=12() ]
oplevert
[ phpwiki:?action=search&searchterm=12() ]

Andere voorbeelden:
[ Blader Pagina | phpwiki:?action=browse&pagename=() ]


Index: HoeWikiTeGebruiken
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/pgsrc/HoeWikiTeGebruiken,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** HoeWikiTeGebruiken	2001/04/07 17:13:28	1.4
--- HoeWikiTeGebruiken	2001/05/31 17:46:58	1.5
***************
*** 8,16 ****
  * Je maakt cursieve tekst door woorden tussen enkele
  aanhalingtekens te zetten ''zoals dit''.
! * Je maakt __vette tekst__ door aan weerszijden drie
! aanhalingtekens te gebruiken. (FIXME: two underscores for bold.)
! * En, ''__vet schuingedrukt__'' met vijf. (FIXME: )
  * Je maakt punten met een tab en een sterretje *.
! * Als je Windows gebruikt, dan werkt je tab toets niet.  Dat is de schuld van Bill Gates.  Maar je kunt het kleine knopje indrukken, genaamd Vertaal Spaties Naar Tabs.  Je kunt een stel spaties tiepen die Wiki dan herkent als ware ze een tab.
  * Om een gewoon, niet proportioneel font te krijgen, spring in met een spatie:
  
--- 8,18 ----
  * Je maakt cursieve tekst door woorden tussen enkele
  aanhalingtekens te zetten ''zoals dit''.
! * Je maakt __vette tekst__ door aan weerszijden twee underscores te gebruiken.
! * En, ''__vet schuingedrukt__'' door beiden te gebruiken.
  * Je maakt punten met een tab en een sterretje *.
! * Als je Windows gebruikt, dan werkt je tab toets niet.  Dat is de
! schuld van Bill Gates.  Maar je kunt het kleine knopje indrukken,
! genaamd Vertaal Spaties Naar Tabs.  Je kunt een stel spaties tiepen
! die Wiki dan herkent als ware ze een tab.
  * Om een gewoon, niet proportioneel font te krijgen, spring in met een spatie:
  
***************
*** 28,35 ****
  * Je maakt een horizontale lijn met vier of meer streepjes zoals hier:
  ----
! * Om hyperkoppelingen te maken hoef je slechts de woorden met hoofdletters en aan elkaar te schrijven.  Laten we zeggen dat je een pagina wilt maken over die Jan Nieuwenhuizen eet wormen.  Het enige dat je hoeft te doen is elk woord met een hoofdletter beginen en ze aan elkaar schrijven: JanNieuwenhuizenEetWormen.  Als de pagina nog niet bestaat, verschijnt er een vraagteken achter de koppeling, die je uitnodigt om de pagina aan te maken: DezePaginaMagNietBestaan.  (Verpest dit voorbeeld nou alsjeblieft niet door er een aan te maken.)
! * Om naar pagina's buiten de Wiki te koppelen, tiep je gewoon de URL in en Wiki maakt de koppelinig voor jou: http://www.volkskrant.nl/.
! * Om plaatjes in te voegen, zet de koppeling gewoon tussen vierkante haken zoals hier: [http://www.jouwgastheer.jouwdomein/plaatjes/figuur.png].  URLs naar plaatjes die niet tussen vierkante haken staan, verschijnen als een gewone koppeling naar het plaatje.
! * Nu ben je klaar om te beginnen met PaginasToevoegen.
  
  ----
--- 30,49 ----
  * Je maakt een horizontale lijn met vier of meer streepjes zoals hier:
  ----
! * Om hyperkoppelingen te maken hoef je slechts de woorden met
! hoofdletters en aan elkaar te schrijven.  Laten we zeggen dat je een
! pagina wilt maken over die Jan Nieuwenhuizen eet wormen.  Het enige
! dat je hoeft te doen is elk woord met een hoofdletter beginen en ze
! aan elkaar schrijven: JanNieuwenhuizenEetWormen.  Als de pagina nog
! niet bestaat, verschijnt er een vraagteken achter de koppeling, die je
! uitnodigt om de pagina aan te maken: DezePaginaMagNietBestaan.
! (Verpest dit voorbeeld nou alsjeblieft niet door er een aan te maken.)
! * Om naar pagina's buiten de Wiki te koppelen, tiep je gewoon de URL
! * in en Wiki maakt de koppelinig voor jou: http://www.volkskrant.nl/.
! * Om plaatjes in te voegen, zet de koppeling gewoon tussen vierkante
! * haken zoals hier:
! * [http://www.jouwgastheer.jouwdomein/plaatjes/figuur.png].  URLs naar
! * plaatjes die niet tussen vierkante haken staan, verschijnen als een
! * gewone koppeling naar het plaatje.  Nu ben je klaar om te beginnen
! * met PaginasToevoegen.
  
  ----
***************
*** 37,38 ****
--- 51,56 ----
  heeft een erg eenvoudige formattering waarover je kunt lezen in
  TekstFormatteringsRegels.
+ ----
+ Als de afmetingen van het invoerveld dat je krijgt je niet bevallen, kun je
+ die veranderen.
+ Zie GebruikersVoorkeuren.
\ No newline at end of file

Index: MeerOverTechnieken
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/pgsrc/MeerOverTechnieken,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MeerOverTechnieken	2001/04/07 17:13:28	1.3
--- MeerOverTechnieken	2001/05/31 17:46:58	1.4
***************
*** 1,9 ****
! PhpWiki is geschreven in de server-zijde scripttaal PHP, die verkrijgbaar is op http://www.php.net/.  PHP lijkt kwa syntax op C en Perl en functioneert goed vergelijkbaar met ASP, EmbPerl of JSP.
  
! PhpWiki bestaat uit een tal bestanden met een mengsel van PHP en HTML.  De webpagina's waaruit het WikiWikiWeb gebaseerd op PHP bestaat, komen uit een data base, waarin ook backups van vorige versies worden bewaard.
  
! Steeds wanneer een gebruiker de site bezoekt, wordt de gevraagde pagina uit de data base gehaald en weergegeven.  De gebruiker vraagt enkel altijd het bestand index.php op, dat dan beslist welke andere php bestanden worden ingevoegd.
  
! Koppelingen naar pagina's in de Wiki worden automaties gemaakt: PhpWiki.  Dit zou best wel eens het aantrekkelijkste onderdeel van een Wiki kunnen zijn, de mogelijkheid van pagina's toevoegen, enkel door het maken van een koppeling.  Het op een na aantrekkelijkst is het gemak waarmee externe URL's gekoppeld kunnen worden:
  
  # http://www.lilypond.org/
--- 1,21 ----
! PhpWiki is geschreven in de server-zijde scripttaal PHP, die
! verkrijgbaar is op http://www.php.net/.  PHP lijkt kwa syntax op C en
! Perl en functioneert goed vergelijkbaar met ASP, EmbPerl of JSP.
  
! PhpWiki bestaat uit een tal bestanden met een mengsel van PHP en HTML.
! De webpagina's waaruit het WikiWikiWeb gebaseerd op PHP bestaat, komen
! uit een data base, waarin ook backups van vorige versies worden
! bewaard.
  
! Steeds wanneer een gebruiker de site bezoekt, wordt de gevraagde
! pagina uit de data base gehaald en weergegeven.  De gebruiker vraagt
! enkel altijd het bestand index.php op, dat dan beslist welke andere
! php bestanden worden ingevoegd.
  
! Koppelingen naar pagina's in de Wiki worden automatisch gemaakt:
! PhpWiki.  Dit zou best wel eens het aantrekkelijkste onderdeel van een
! Wiki kunnen zijn, de mogelijkheid van pagina's toevoegen, enkel door
! het maken van een koppeling.  Het op een na aantrekkelijkst is het
! gemak waarmee externe URL's gekoppeld kunnen worden:
  
  # http://www.lilypond.org/
***************
*** 11,15 ****
  # news://news.mozilla.org/
  
! Gecombineerd met een enkele naamruimte en eenvoudige opmaak, vertoont een Wiki vele karakteristieken van WabiSabi.
  
  PhpWiki wordt uitgebracht onder de GNU Algemene Openbare Licentie ([GNU General Public License | http://www.gnu.org/copyleft/gpl.html]).
--- 23,28 ----
  # news://news.mozilla.org/
  
! Gecombineerd met een enkele naamruimte en eenvoudige opmaak, vertoont
! een Wiki vele karakteristieken van WabiSabi.
  
  PhpWiki wordt uitgebracht onder de GNU Algemene Openbare Licentie ([GNU General Public License | http://www.gnu.org/copyleft/gpl.html]).

Index: PaginasToevoegen
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/pgsrc/PaginasToevoegen,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** PaginasToevoegen	2001/03/03 19:43:14	1.4
--- PaginasToevoegen	2001/05/31 17:46:58	1.5
***************
*** 1,5 ****
  Voor het toevoegen van een nieuwe pagina aan Wiki, hoef je alleen maar een
  zinvolle titel de bedenken, de woorden met een hoofdletter te beginnen, en
! ZeAanElkaarTeSchrijvenZoalsDit.  Wiki herkent dit automagies als een
  koppeling.
  
--- 1,5 ----
  Voor het toevoegen van een nieuwe pagina aan Wiki, hoef je alleen maar een
  zinvolle titel de bedenken, de woorden met een hoofdletter te beginnen, en
! ZeAanElkaarTeSchrijvenZoalsDit.  Wiki herkent dit automagisch als een
  koppeling.
  

Index: UitgaveNoten
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/pgsrc/UitgaveNoten,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** UitgaveNoten	2000/10/22 19:52:02	1.2
--- UitgaveNoten	2001/05/31 17:46:58	1.3
***************
*** 1,3 ****
! Zie ook ReleaseNotes.
! 
! 
--- 1 ----
! Zie ReleaseNotes.

Index: WabiSabi
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/pgsrc/WabiSabi,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** WabiSabi	2001/04/07 17:13:28	1.4
--- WabiSabi	2001/05/31 17:46:58	1.5
***************
*** 1,3 ****
! Omdat wabi-sabi een alomvattend japans wereldbeeld of estheties systeem
  vertegenwoordigt, is het lastig exact te beschrijven in westerse begrippen.
  Volgens Leonard Koren is wabi-sabi het meest pakkende en karakteristieke
--- 1,3 ----
! Omdat wabi-sabi een alomvattend japans wereldbeeld of esthetisch systeem
  vertegenwoordigt, is het lastig exact te beschrijven in westerse begrippen.
  Volgens Leonard Koren is wabi-sabi het meest pakkende en karakteristieke

Index: ZoekPagina
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/pgsrc/ZoekPagina,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ZoekPagina	2001/04/07 17:13:28	1.3
--- ZoekPagina	2001/05/31 17:46:58	1.4
***************
*** 2,6 ****
  
  * HoeWikiTeGebruiken maakt snel wegwijs in Wiki.
! * RecenteVeranderingen worden automaties bijgehouden.
  * MeerOverTechnieken van het bladeren en veranderen van deze server.
  
--- 2,6 ----
  
  * HoeWikiTeGebruiken maakt snel wegwijs in Wiki.
! * RecenteVeranderingen worden automatisch bijgehouden.
  * MeerOverTechnieken van het bladeren en veranderen van deze server.
  
***************
*** 14,18 ****
  
  %%Fullsearch%%
! 
  
  
--- 14,22 ----
  
  %%Fullsearch%%
! ------
! Scheid woorden met een spatie.  Alle woorden moeten gevonden worden.
! %%%Om woorden uit te zonderen, plak er een '-' voor.
! %%%Voorbeeld: 'wiki tekst -php' zoekt naar alle pagina's die de woorden
! 'wiki' __en__ 'tekst' bevatten, maar __niet__ het woord 'php.
  
  

--- VoorPagina DELETED ---

[phpwiki-checkins] CVS: phpwiki/locale/nl/templates browse.html,1.4,1.5 editpage.html,1.8,1.9 message.html,1.3,1.4

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/nl/templates
In directory usw-pr-cvs1:/tmp/cvs-serv9423/locale/nl/templates

Modified Files:
	browse.html editpage.html message.html 
Log Message:
Dutch translation updates by Jan Nieuwenhuizen <ja...@gn...>.


Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/templates/browse.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** browse.html	2001/04/07 17:13:28	1.4
--- browse.html	2001/05/31 17:46:58	1.5
***************
*** 11,28 ****
  <link rel="stylesheet" title="phpwiki" href="###CSS_URL###" type="text/css">
  </head>
- 
  <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
! <h1><a class="wikilink" href="###BROWSE###VoorPagina"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
  <a class='wikiaction'
    href="###ACTION###search&amp;searchtype=full&amp;searchterm=###PAGEURL###"
  ><span class='wikiword'>###PAGE###</span></a></h1>
  ###IF:!ANONYMOUS###
! <p>You are logged in as <em>###USERID###</em>.
  [<a class="wikiaction" href="###ACTION###logout">Log Out</a>]</p>
  ###IF:ADMIN###
! ###IF LOCK###[<a class="wikiadmin" href="###ACTION###unlock">Unlock page</a>]
! ###IF !LOCK###[<a class="wikiadmin" href="###ACTION###lock">Lock page</a>]
  - - 
! [<a class="wikiadmin" href="###ACTION###remove">Remove page</a>]
  ###ENDIF:ADMIN###
  <hr noshade>
--- 11,28 ----
  <link rel="stylesheet" title="phpwiki" href="###CSS_URL###" type="text/css">
  </head>
  <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
! <h1><a class="wikilink" href="###BROWSE###ThuisPagina"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
  <a class='wikiaction'
    href="###ACTION###search&amp;searchtype=full&amp;searchterm=###PAGEURL###"
  ><span class='wikiword'>###PAGE###</span></a></h1>
  ###IF:!ANONYMOUS###
! <p>Je bent ingelogd als <em>###USERID###</em>.
  [<a class="wikiaction" href="###ACTION###logout">Log Out</a>]</p>
  ###IF:ADMIN###
! ###IF LOCK###[<a class="wikiadmin" href="###ACTION###unlock">Sluit
! pagina af</a>]
! ###IF !LOCK###[<a class="wikiadmin" href="###ACTION###lock">Open pagina</a>]
  - - 
! [<a class="wikiadmin" href="###ACTION###remove">Verwijder pagina</a>]
  ###ENDIF:ADMIN###
  <hr noshade>
***************
*** 39,43 ****
  ###IF !LOCK###<a class="wikiaction" href="###ACTION###edit">VeranderTekst</a>
  ###ENDIF:!ADMIN###
! van deze pagina (laatste verandering ###LASTMODIFIED###
  [<a class="wikiaction" href="###ACTION###info">info</a>]
  [<a class="wikiaction" href="###ACTION###diff">diff</a>])
--- 39,43 ----
  ###IF !LOCK###<a class="wikiaction" href="###ACTION###edit">VeranderTekst</a>
  ###ENDIF:!ADMIN###
! van deze pagina (meest recente verandering ###LASTMODIFIED###
  [<a class="wikiaction" href="###ACTION###info">info</a>]
  [<a class="wikiaction" href="###ACTION###diff">diff</a>])

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/templates/editpage.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** editpage.html	2001/04/07 17:13:28	1.8
--- editpage.html	2001/05/31 17:46:58	1.9
***************
*** 14,18 ****
  <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
  <form class="wikiaction" method="POST" action="###BROWSE_PAGE###">
! <h1><a class="wikilink" href="###BROWSE###VoorPagina"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
  Verander <span="wikiword">###PAGE###</span>
  <input type="submit" value=" Bewaar "></h1>
--- 14,18 ----
  <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
  <form class="wikiaction" method="POST" action="###BROWSE_PAGE###">
! <h1><a class="wikilink" href="###BROWSE###ThuisPagina"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
  Verander <span="wikiword">###PAGE###</span>
  <input type="submit" value=" Bewaar "></h1>
***************
*** 24,28 ****
  <br>
  ###IF:MINOR_EDIT_CHECKBOX###
!   ###MINOR_EDIT_CHECKBOX### This is a minor change, don't archive old version.
    <br>
  ###ENDIF:MINOR_EDIT_CHECKBOX###
--- 24,28 ----
  <br>
  ###IF:MINOR_EDIT_CHECKBOX###
!   ###MINOR_EDIT_CHECKBOX### Dit is een kleine verandering, archiveer oude versie niet.
    <br>
  ###ENDIF:MINOR_EDIT_CHECKBOX###
***************
*** 31,34 ****
--- 31,36 ----
  <a class="wikilink" href="###BROWSE###VertaalSpatiesNaarTabs"><span class="wikiword">VertaalSpatiesNaarTabs</span></a>
  voor mij als ik bewaar.
+ <p>Je kunt de afmetingen van het invoerveld veranderen.
+ Zie <a class="wikilink" href="###BROWSE###GebruikersVoorkeuren"><span class="wikiword">GebruikersVoorkeuren</span></a>.</p>
  <p><a class="wikilink" href="###BROWSE###GoedeStijl"><span class="wikiword">GoedeStijl</span></a> tips for
  veranderen.
***************
*** 42,46 ****
  <br><b>Verwijzingen:</b> KapitaliseerEnSchrijfAanElkaar of gebruik vierkante haken [pagina koppeling] of URL [http://koel.wiki.int/].
  <br><b>Footnotes:</b> Gebruik [1],[2],[3],...
! <br><b>Preventing linking:</b> Vermijdt kopplingen met "!": !KoppelNiet, noem koppelingen met [[naam | URL].
  <br><b>Allerlei:</b>"!", "!!", "!!!" maak koppen,
  "%%%" maak regelbreuk, "- - - -" maak horizontale lijn
--- 44,48 ----
  <br><b>Verwijzingen:</b> KapitaliseerEnSchrijfAanElkaar of gebruik vierkante haken [pagina koppeling] of URL [http://koel.wiki.int/].
  <br><b>Footnotes:</b> Gebruik [1],[2],[3],...
! <br><b>Vermijden van koppelingen:</b> Vermijdt kopplingen met "!": !KoppelNiet, noem koppelingen met [[naam | URL].
  <br><b>Allerlei:</b>"!", "!!", "!!!" maak koppen,
  "%%%" maak regelbreuk, "- - - -" maak horizontale lijn

Index: message.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/templates/message.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** message.html	2001/04/07 17:13:28	1.3
--- message.html	2001/05/31 17:46:58	1.4
***************
*** 13,17 ****
  
  <body bgcolor=linen text=black alink=red link=darkblue vlink=darkmagenta>
! <h1><a class="wikilink" href="###BROWSE###VoorPagina"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
  ###PAGE###</h1>
  
--- 13,17 ----
  
  <body bgcolor=linen text=black alink=red link=darkblue vlink=darkmagenta>
! <h1><a class="wikilink" href="###BROWSE###ThuisPagina"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
  ###PAGE###</h1>
  

[phpwiki-checkins] CVS: phpwiki/locale/po nl.po,1.12,1.13

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory usw-pr-cvs1:/tmp/cvs-serv9423/locale/po

Modified Files:
	nl.po 
Log Message:
Dutch translation updates by Jan Nieuwenhuizen <ja...@gn...>.


Index: nl.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/nl.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** nl.po	2001/05/21 17:25:37	1.12
--- nl.po	2001/05/31 17:46:58	1.13
***************
*** 11,20 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.7\n"
! "POT-Creation-Date: 2001-05-21 09:36-0700\n"
  "PO-Revision-Date: 2000-09-30 02:23+0200\n"
  "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
  "Language-Team: Dutch <nl...@li...>\n"
  "MIME-Version: 1.0\n"
! "Content-Type: text/plain; charset=8859-1\n"
  "Content-Transfer-Encoding: 8bit\n"
  "Date: 1998-05-26 11:26:28+0200\n"
--- 11,20 ----
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.7\n"
! "POT-Creation-Date: 2001-05-31 09:42-0700\n"
  "PO-Revision-Date: 2000-09-30 02:23+0200\n"
  "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
  "Language-Team: Dutch <nl...@li...>\n"
  "MIME-Version: 1.0\n"
! "Content-Type: text/plain; charset=iso-8859-1\n"
  "Content-Transfer-Encoding: 8bit\n"
  "Date: 1998-05-26 11:26:28+0200\n"
***************
*** 47,51 ****
  #, c-format
  msgid "last modified on %s"
! msgstr "laatste verandering op %s"
  
  #: ../lib/diff.php:1042
--- 47,51 ----
  #, c-format
  msgid "last modified on %s"
! msgstr "meest recente verandering op %s"
  
  #: ../lib/diff.php:1042
***************
*** 115,158 ****
  #: ../lib/loadsave.php:15
  msgid "Complete."
! msgstr ""
  
  #: ../lib/loadsave.php:99 ../lib/main.php:158
  msgid "You must specify a directory to dump to"
! msgstr ""
  
  #: ../lib/loadsave.php:175
  #, c-format
  msgid "from %s"
! msgstr ""
  
  #: ../lib/loadsave.php:185
  #, c-format
  msgid "is identical to current version %d"
! msgstr ""
  
  #: ../lib/loadsave.php:190
  msgid "- skipped"
! msgstr ""
  
  #: ../lib/loadsave.php:211
  msgid "- saved"
! msgstr ""
  
  #: ../lib/loadsave.php:213
! #, fuzzy, c-format
  msgid "as version %d"
! msgstr "versie %s"
  
  #: ../lib/main.php:41 ../lib/main.php:99 ../lib/main.php:101
  msgid "HomePage"
! msgstr "VoorPagina"
  
  #: ../lib/main.php:112
  msgid "Action $action is disabled in this wiki."
! msgstr ""
  
  #: ../lib/main.php:166
  msgid "You must specify a source to read from"
! msgstr ""
  
  #: ../lib/msql.php:38 ../lib/mysql.php:47
--- 115,187 ----
  #: ../lib/loadsave.php:15
  msgid "Complete."
! msgstr "Klaar."
! 
! #: ../lib/loadsave.php:16
! msgid "Return to "
! msgstr "Terug naar "
  
  #: ../lib/loadsave.php:99 ../lib/main.php:158
  msgid "You must specify a directory to dump to"
! msgstr "Je moet een directory specificeren om in te storten"
  
  #: ../lib/loadsave.php:175
  #, c-format
  msgid "from %s"
! msgstr "van %s"
  
  #: ../lib/loadsave.php:185
  #, c-format
  msgid "is identical to current version %d"
! msgstr "is gelijk aaan huidige versie %d"
  
  #: ../lib/loadsave.php:190
  msgid "- skipped"
! msgstr "- overgeslagen"
  
  #: ../lib/loadsave.php:211
  msgid "- saved"
! msgstr "- bewaard"
  
  #: ../lib/loadsave.php:213
! #, c-format
  msgid "as version %d"
! msgstr "als versie %d"
! 
! #: ../lib/loadsave.php:263
! msgid "MIME file"
! msgstr "MIME bestand"
! 
! #: ../lib/loadsave.php:268
! msgid "Serialized file"
! msgstr "Geserialiseerd bestand"
! 
! #: ../lib/loadsave.php:275
! msgid "plain file"
! msgstr "plat bestand"
! 
! #: ../lib/loadsave.php:363 ../lib/loadsave.php:378 ../lib/loadsave.php:409
! #: ../lib/stdlib.php:595 ../lib/stdlib.php:664
! msgid "RecentChanges"
! msgstr "RecenteVeranderingen"
! 
! #: ../lib/loadsave.php:373
! msgid "The PhpWiki programming team"
! msgstr "Het PhpWiki programmeerteam"
! 
! #: ../lib/loadsave.php:375
! msgid "Loading up virgin wiki"
! msgstr "Laden van maagdelijke wiki"
  
  #: ../lib/main.php:41 ../lib/main.php:99 ../lib/main.php:101
  msgid "HomePage"
! msgstr "ThuisPagina"
  
  #: ../lib/main.php:112
  msgid "Action $action is disabled in this wiki."
! msgstr "Actie $action is niet beschikbaar in deze wiki."
  
  #: ../lib/main.php:166
  msgid "You must specify a source to read from"
! msgstr "Je moet een bron specificeren om van te lezen."
  
  #: ../lib/msql.php:38 ../lib/mysql.php:47
***************
*** 207,213 ****
  
  #: ../lib/pageinfo.php:48
- #, fuzzy
  msgid "Show the page source"
! msgstr "Toon de bron tekst en de koppelingen van de pagina"
  
  #: ../lib/pageinfo.php:54
--- 236,241 ----
  
  #: ../lib/pageinfo.php:48
  msgid "Show the page source"
! msgstr "Toon de pagina bron tekst"
  
  #: ../lib/pageinfo.php:54
***************
*** 253,257 ****
  "editor)."
  msgstr ""
! "Kopiëer je veranderingen naar het klipbord of een andere tijdelijke plaats "
  "(bijv. een tekst editor)."
  
--- 281,285 ----
  "editor)."
  msgstr ""
! "Kopier je veranderingen naar het klipbord of een andere tijdelijke plaats "
  "(bijv. een tekst editor)."
  
***************
*** 293,302 ****
  #, c-format
  msgid "%d pages match your query."
! msgstr ""
  
  #: ../lib/search.php:30
- #, fuzzy
  msgid "Title Search Results"
! msgstr "Volledige tekst zoek resultaten"
  
  #: ../lib/stdlib.php:427
--- 321,329 ----
  #, c-format
  msgid "%d pages match your query."
! msgstr "%d pagina's voldoen aan je vraag."
  
  #: ../lib/search.php:30
  msgid "Title Search Results"
! msgstr "Titel zoek resultaten"
  
  #: ../lib/stdlib.php:427
***************
*** 315,322 ****
  msgstr "%d meest gevraagde in de buurt:"
  
- #: ../lib/stdlib.php:595 ../lib/stdlib.php:664
- msgid "RecentChanges"
- msgstr "RecenteVeranderingen"
- 
  #: ../lib/stdlib.php:611
  msgid "The most recently changed pages are listed below."
--- 342,345 ----
***************
*** 331,344 ****
  msgstr "Zoek snel een pagina op:"
  
  #: ../lib/transform.php:114
- #, fuzzy
  msgid "Lists nested too deep in SetHTMLOutputMode"
! msgstr "Stack grenzen overschreden in SetHTMLOutputMode"
  
  #: ../lib/transform.php:461 ../lib/transform.php:473
  msgid "Search"
  msgstr "Zoek"
  
! #: ../lib/userauth.php:158
  msgid "You entered an invalid login or password."
  msgstr "Je hebt een ongeldige gebruikersnaam of wachtwoord ingevoerd."
--- 354,391 ----
  msgstr "Zoek snel een pagina op:"
  
+ #: ../lib/stdlib.php:645
+ msgid "(new)"
+ msgstr "(nieuw)"
+ 
  #: ../lib/transform.php:114
  msgid "Lists nested too deep in SetHTMLOutputMode"
! msgstr "Lijsten nesten te diep in SetHTMLOutputMode"
  
  #: ../lib/transform.php:461 ../lib/transform.php:473
  msgid "Search"
  msgstr "Zoek"
+ 
+ #: ../lib/userauth.php:83
+ #, c-format
+ msgid "to perform action '%s'"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:85
+ msgid "to do that"
+ msgstr ""
+ 
+ #: ../lib/userauth.php:86
+ #, fuzzy
+ msgid "You must be logged in as an administrator"
+ msgstr "Je moet ingelogd zijn als beheerder om te $action."
+ 
+ #: ../lib/userauth.php:154
+ msgid ""
+ "You must set the administrator account and password before you can log in."
+ msgstr ""
+ "Je moet de beheerder gebruiker en het wachtwoord zetten voordat je in kan "
+ "loggen."
  
! #: ../lib/userauth.php:166
  msgid "You entered an invalid login or password."
  msgstr "Je hebt een ongeldige gebruikersnaam of wachtwoord ingevoerd."
***************
*** 347,359 ****
  #, c-format
  msgid "[%d] See [%s]"
! msgstr ""
  
  #: ../lib/ziplib.php:665
  msgid "!References"
! msgstr ""
  
  #: ../admin/removepage.php:6
  msgid "Function not yet implemented."
! msgstr "Functie nog niet geïmplementeerd."
  
  #: ../admin/removepage.php:10
--- 394,406 ----
  #, c-format
  msgid "[%d] See [%s]"
! msgstr "[%d] Zie [%s]"
  
  #: ../lib/ziplib.php:665
  msgid "!References"
! msgstr "!Referenties"
  
  #: ../admin/removepage.php:6
  msgid "Function not yet implemented."
! msgstr "Functie nog niet gemplementeerd."
  
  #: ../admin/removepage.php:10
***************
*** 363,369 ****
  
  #: ../admin/removepage.php:13
! #, fuzzy, c-format
  msgid "Click <a href=\"%s\">here</a> to remove the page now."
! msgstr "Klik %shier%s om de pagina nu te verwijderen."
  
  #: ../admin/removepage.php:17
--- 410,416 ----
  
  #: ../admin/removepage.php:13
! #, c-format
  msgid "Click <a href=\"%s\">here</a> to remove the page now."
! msgstr "Klik <a href=\"%s\">hier</a> om de pagina nu te verwijderen."
  
  #: ../admin/removepage.php:17
***************
*** 379,407 ****
  msgid "Remove page"
  msgstr "Verwijder pagina"
- 
- #~ msgid "templates/browse.html"
- #~ msgstr "locale/nl/templates/browse.html"
- 
- #~ msgid "templates/editpage.html"
- #~ msgstr "locale/nl/templates/editpage.html"
- 
- #~ msgid "templates/editlinks.html"
- #~ msgstr "locale/nl/templates/editlinks.html"
- 
- #~ msgid "templates/message.html"
- #~ msgstr "locale/nl/templates/message.html"
- 
- #~ msgid "./pgsrc"
- #~ msgstr "locale/nl/pgsrc"
- 
- #~ msgid "No page name passed into editpage!"
- #~ msgstr "Geen paginanaam doorgegeven aan veranderpagina"
- 
- #~ msgid "Enter a page name"
- #~ msgstr "Geef de naam van een pagina"
- 
- #~ msgid "Go"
- #~ msgstr "Ga"
- 
- #~ msgid "Inserting page %s, version %s from %s"
- #~ msgstr "Voeg pagina %s toe, versie %s van %s"
--- 426,427 ----

[phpwiki-checkins] CVS: phpwiki/pgsrc FindPage,1.5,1.6 HomePage,1.1,1.2

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv9218/pgsrc

Modified Files:
	FindPage HomePage 
Log Message:
Missing periods added by Jan Nieuwenhuizen <ja...@gn...>.


Index: FindPage
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/FindPage,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** FindPage	2000/11/18 13:50:35	1.5
--- FindPage	2001/05/31 17:45:41	1.6
***************
*** 2,7 ****
  
  * 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'' 
--- 2,7 ----
  
  * 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'' 

Index: HomePage
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/HomePage,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** HomePage	2001/04/06 18:08:04	1.1
--- HomePage	2001/05/31 17:45:41	1.2
***************
*** 5,7 ****
  * See RecentChanges for the latest page additions and changes.
  * Find out which pages are MostPopular.
! * Read the ReleaseNotes
--- 5,7 ----
  * See RecentChanges for the latest page additions and changes.
  * Find out which pages are MostPopular.
! * Read the ReleaseNotes.

[phpwiki-checkins] CVS: phpwiki/pgsrc MagicPhpWikiURLs,1.3,1.4

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv9031/pgsrc

Modified Files:
	MagicPhpWikiURLs 
Log Message:
Documentation fix (phpwiki: URLs) (per request by Jan).


Index: MagicPhpWikiURLs
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/MagicPhpWikiURLs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MagicPhpWikiURLs	2001/04/06 18:21:37	1.3
--- MagicPhpWikiURLs	2001/05/31 17:45:24	1.4
***************
*** 45,50 ****
  If given it will provide the label for the link.
  
! The ''pagename'' part is optional, too.  If omitted, the link will
! refer to the current wiki-page.
  
  !Some examples
--- 45,49 ----
  If given it will provide the label for the link.
  
! The ''phpwiki-url'' is a __phpwiki:__ URL as described above.
  
  !Some examples

[phpwiki-checkins] CVS: phpwiki/lib loadsave.php,1.5,1.6 stdlib.php,1.38,1.39 userauth.php,1.5,1.6

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv8408/lib

Modified Files:
	loadsave.php stdlib.php userauth.php 
Log Message:
Gettext()ification of more strings, by Jan Nieuwenhuizen <ja...@gn...>
(with a few fixes by me.)



Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** loadsave.php	2001/04/07 00:34:30	1.5
--- loadsave.php	2001/05/31 17:43:05	1.6
***************
*** 13,18 ****
  {
     // FIXME: This is a hack
!    echo Element('p', QElement('b', gettext("Complete.")));
!    echo Element('p', "Return to " . LinkExistingWikiWord($GLOBALS['pagename']));
     echo "</body></html>\n";
  }
--- 13,18 ----
  {
     // FIXME: This is a hack
!    echo Element('p', QElement('b', gettext ("Complete.")));
!    echo Element('p', gettext ("Return to ") . LinkExistingWikiWord($GLOBALS['pagename']));
     echo "</body></html>\n";
  }
***************
*** 260,268 ****
        usort($parts, 'SortByPageVersion');
        for (reset($parts); $page = current($parts); next($parts))
! 	 SavePage($dbi, $page, $defaults, "MIME file $filename", $basename);
     }
     else if ( ($page = ParseSerializedPage($text)) )
     {
!       SavePage($dbi, $page, $defaults, "Serialized file $filename", $basename);
     }
     else
--- 260,270 ----
        usort($parts, 'SortByPageVersion');
        for (reset($parts); $page = current($parts); next($parts))
! 	 SavePage($dbi, $page, $defaults, 
! 	 	  gettext ("MIME file") . " $filename", $basename);
     }
     else if ( ($page = ParseSerializedPage($text)) )
     {
!       SavePage($dbi, $page, $defaults, 
!                gettext ("Serialized file") . " $filename", $basename);
     }
     else
***************
*** 270,274 ****
        // Assume plain text file.
        $page['content'] = preg_split('/[ \t\r]*\n/', chop($text));
!       SavePage($dbi, $page, $defaults, "plain file $filename", $basename);
     }
  }
--- 272,277 ----
        // Assume plain text file.
        $page['content'] = preg_split('/[ \t\r]*\n/', chop($text));
!       SavePage($dbi, $page, $defaults, 
!                gettext ("plain file") . " $filename", $basename);
     }
  }
***************
*** 284,288 ****
  	   || ($exclude && in_array($fn, $exclude)) )
        {
! 	 print Element('dt', LinkExistingWikiWord($fn)) . QElement('dd', 'Skipping');
  	 continue;
        }
--- 287,292 ----
  	   || ($exclude && in_array($fn, $exclude)) )
        {
! 	 print Element('dt', LinkExistingWikiWord($fn))
! 	    . QElement('dd', gettext("Skipping"));
  	 continue;
        }
***************
*** 358,362 ****
     StartLoadDump("Loading '$source'");
     echo "<dl>\n";
!    LoadAny($dbi, $source, false, array(gettext('RecentChanges')));
     echo "</dl>\n";
     EndLoadDump();
--- 362,366 ----
     StartLoadDump("Loading '$source'");
     echo "<dl>\n";
!    LoadAny($dbi, $source, false, array(gettext("RecentChanges")));
     echo "</dl>\n";
     EndLoadDump();
***************
*** 368,377 ****
  
     //FIXME: This is a hack
!    $user->userid = 'The PhpWiki programming team';
     
!    StartLoadDump('Loading up virgin wiki');
     echo "<dl>\n";
  
!    $ignore = array(gettext('RecentChanges'));
  
     LoadAny($dbi, FindLocalizedFile(WIKI_PGSRC), false, $ignore);
--- 372,381 ----
  
     //FIXME: This is a hack
!    $user->userid = gettext("The PhpWiki programming team");
     
!    StartLoadDump(gettext("Loading up virgin wiki"));
     echo "<dl>\n";
  
!    $ignore = array(gettext("RecentChanges"));
  
     LoadAny($dbi, FindLocalizedFile(WIKI_PGSRC), false, $ignore);
***************
*** 404,408 ****
     
     if (IsZipFile($fd))
!       LoadZip($dbi, $fd, false, array(gettext('RecentChanges')));
     else
        Loadfile($dbi, $name, fread($fd, MAX_UPLOAD_SIZE));
--- 408,412 ----
     
     if (IsZipFile($fd))
!       LoadZip($dbi, $fd, false, array(gettext("RecentChanges")));
     else
        Loadfile($dbi, $name, fread($fd, MAX_UPLOAD_SIZE));

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** stdlib.php	2001/04/07 00:34:30	1.38
--- stdlib.php	2001/05/31 17:43:05	1.39
***************
*** 643,647 ****
     // add the updated page's name to the array
     if($isnewpage) {
!       $newpage[$k++] = "* [$pagename] (new) ..... $userid\r";
     } else {
        $diffurl = "phpwiki:" . rawurlencode($pagename) . "?action=diff";
--- 643,647 ----
     // add the updated page's name to the array
     if($isnewpage) {
!       $newpage[$k++] = "* [$pagename] " . gettext("(new)") . " ..... $userid\r";
     } else {
        $diffurl = "phpwiki:" . rawurlencode($pagename) . "?action=diff";

Index: userauth.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/userauth.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** userauth.php	2001/03/14 19:45:12	1.5
--- userauth.php	2001/05/31 17:43:05	1.6
***************
*** 77,86 ****
     }
  
!    function must_be_admin ($action = "do that") {
!       if (! $this->is_admin())
! 	 ExitWiki("You must be logged in as an administrator to $action.");
     }
  
- 
     // This is a bit of a hack:
     function setPreferences ($prefs) {
--- 77,92 ----
     }
  
!    function must_be_admin ($action = "") {
!       if (! $this->is_admin()) 
!       {
! 	 if ($action)
! 	    $to_what = sprintf(gettext("to perform action '%s'"), $action);
! 	 else
! 	    $to_what = gettext("to do that");
! 	 ExitWiki(gettext("You must be logged in as an administrator")
! 		  . " $to_what");
!       }
     }
  
     // This is a bit of a hack:
     function setPreferences ($prefs) {
***************
*** 144,149 ****
        if (!defined('ADMIN_USER') || !defined('ADMIN_PASSWD')
  	  || ADMIN_USER == '' || ADMIN_PASSWD =='') {
! 	 return "<p><b>You must set the administrator account and password " .
! 	    "before you can log in.</b></p>\n";
        }
  
--- 150,157 ----
        if (!defined('ADMIN_USER') || !defined('ADMIN_PASSWD')
  	  || ADMIN_USER == '' || ADMIN_PASSWD =='') {
! 	 return
! 	    "<p><b>"
! 	    . gettext("You must set the administrator account and password before you can log in.")
! 	    . "</b></p>\n";
        }
  

[phpwiki-checkins] CVS: phpwiki/lib logger.php,1.1,1.2

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv7906/lib

Modified Files:
	logger.php 
Log Message:
Minor fix to cleanup "Undefined variable: time" notice.


Index: logger.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/logger.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** logger.php	2001/02/16 04:43:08	1.1
--- logger.php	2001/05/31 17:41:55	1.2
***************
*** 37,41 ****
    
     // Format time into NCSA format.
!    function _ncsa_time() {
        if (!$time)
  	 $time = time();
--- 37,41 ----
    
     // Format time into NCSA format.
!    function _ncsa_time($time = false) {
        if (!$time)
  	 $time = time();

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.39,1.40

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv6597/lib

Modified Files:
	config.php 
Log Message:
Revert $LANG back to being a global rather than an environment variable
(as per patches from Jan Nieuwenhuizen <ja...@gn...>.)

Use constants LC_ALL (&c) rather than literal "LC_ALL" as first
argument to setlocale().

Define constants LC_ALL and LC_CTYPE if needed (for PHP < 4.0.5).



Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** config.php	2001/04/07 00:34:30	1.39
--- config.php	2001/05/31 17:39:02	1.40
***************
*** 8,13 ****
   */
  
! // essential internal stuff
  
  set_magic_quotes_runtime(0);
  
--- 8,18 ----
   */
  
! if (!defined("LC_ALL")) {
!    // Backward compatibility (for PHP < 4.0.5)
!    define("LC_ALL", "LC_ALL");
!    define("LC_CTYPE", "LC_CTYPE");
! }
  
+ // essential internal stuff
  set_magic_quotes_runtime(0);
  
***************
*** 23,32 ****
  define("FLAG_PAGE_LOCKED", 1);
  
- //////////////////////////////////////////////////////////////////
- //
- // Set up localization
- //
- setlocale('LC_ALL', "");
-    
  // Search PHP's include_path to find file or directory.
  function FindFile ($file, $missing_okay = false)
--- 28,31 ----
***************
*** 60,65 ****
  function FindLocalizedFile ($file, $missing_okay = false)
  {
!    $language = getenv("LC_ALL");
     if (empty($language))
        $language = getenv("LC_MESSAGES");
     if (empty($language))
--- 59,67 ----
  function FindLocalizedFile ($file, $missing_okay = false)
  {
!    $language = $GLOBALS['LANG'];
!    
     if (empty($language))
+       $language = getenv("LC_ALL");
+    if (empty($language))
        $language = getenv("LC_MESSAGES");
     if (empty($language))
***************
*** 69,73 ****
     if (empty($language))
        $language = "C";
- 
     
     // FIXME: This wont work for DOS filenames.
--- 71,74 ----
***************
*** 107,110 ****
--- 108,114 ----
  else
  {
+    // Setup localisation
+    setlocale(LC_ALL, "$LANG");
+    putenv("LC_ALL=$LANG");
     bindtextdomain ("phpwiki", FindFile("locale"));
     textdomain ("phpwiki");
***************
*** 131,136 ****
  // FIXME: Not all environments may support en_US?  We should probably
  // have a list of locales to try.
! if (setlocale('LC_CTYPE', 0) == 'C')
!    setlocale('LC_CTYPE', 'en_US.iso-8859-1');
  
  /** string pcre_fix_posix_classes (string $regexp)
--- 135,140 ----
  // FIXME: Not all environments may support en_US?  We should probably
  // have a list of locales to try.
! if (setlocale(LC_CTYPE, 0) == 'C')
!    setlocale(LC_CTYPE, 'en_US.iso-8859-1');
  
  /** string pcre_fix_posix_classes (string $regexp)

[phpwiki-checkins] CVS: phpwiki index.php,1.16,1.17

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv6597

Modified Files:
	index.php 
Log Message:
Revert $LANG back to being a global rather than an environment variable
(as per patches from Jan Nieuwenhuizen <ja...@gn...>.)

Use constants LC_ALL (&c) rather than literal "LC_ALL" as first
argument to setlocale().

Define constants LC_ALL and LC_CTYPE if needed (for PHP < 4.0.5).



Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** index.php	2001/04/07 00:34:30	1.16
--- index.php	2001/05/31 17:39:01	1.17
***************
*** 116,127 ****
  // Select your language/locale - default language "C": English
  // other languages available: Dutch "nl", Spanish "es", German "de",
! // and Swedish "sv".
  //
  // Note that on some systems, apprently using these short forms for
  // the locale won't work.  On my home system 'LANG=de' won't result
  // in german pages.  Somehow the system must recognize the locale
! // as a valid locale before gettext() will work.  ('de_DE' works for
! // me.)
! putenv('LANG=C');
  
  // Setting the LANG environment variable (accomplished above) may or
--- 116,128 ----
  // Select your language/locale - default language "C": English
  // other languages available: Dutch "nl", Spanish "es", German "de",
! // Swedish "sv", and Italian, "it".
  //
  // Note that on some systems, apprently using these short forms for
  // the locale won't work.  On my home system 'LANG=de' won't result
  // in german pages.  Somehow the system must recognize the locale
! // as a valid locale before gettext() will work, i.e., use 'de_DE',
! // 'nl_NL'.
! $LANG='C';
! //$LANG='nl_NL';
  
  // Setting the LANG environment variable (accomplished above) may or

[phpwiki-checkins] CVS: phpwiki README.coding,NONE,1.1

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv6139

Added Files:
	README.coding 
Log Message:
New file: beginnings of coding style notes.



--- NEW FILE ---
Here are the beginnings of some coding guidelines for PhpWiki.

! I18N: Using gettext()

String literals which end up making it into the HTML output should be wrapped
with a call to ''gettext()''.  This allows translations to be substituted when 
PhpWiki is run in non-english environments.

It is important that the argument of ''gettext()'' be a constant string
literal, in double quotes (").

 OKAY:  gettext("This is a message.");
 OKAY:  gettext ("Fazool."); 
 OKAY:  sprintf(gettext("Hello %s"), $name);

 BAD:   gettext('This will be ignored by xgettext.');
 BAD:   gettext("Howdy" . ", wazoo");
 BAD:   gettext("Hello $name");
 BAD:   define("MES", "howdy");  gettext(MES);

[phpwiki-checkins] CVS: phpwiki/locale/po it.po,1.1,1.2

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory usw-pr-cvs1:/tmp/cvs-serv30597/locale/po

Added Files:
	it.po 
Log Message:
Add Italian translations by Marco Milanesi <kp...@ad...>.

I (GTD) munged the template files so that they more-or-less work
with the current alpha code.