phpwiki-talk

Re: [Phpwiki-talk] etc/*

[Jeff D. <da...@da...>]

>putting the code where my mouth is, this patch create
>a etc/* directory to put cfg there, so cleaning up index.php
>
>comments ?

All you've done is split index.php into four separate files.
What does this buy you?

Re: [Phpwiki-talk] PHPWiki accent support

[Jeff D. <da...@da...>]

Thank you for the comments Christian,

>I'm quite new to PHPWiki and not at all familiar with it, but I've noticed
>that at least in the default configuration there is no support for
>entitized accents (=C1 becoming Ã) as we commonly use in non-english
>countries.

Yes, but you can type them in as ISO-8859-1 eight-bit characters 
just fine.  (What you have to do to type these in depends on your
OS & browser &c.)

Do we want to support entities in the page text?  If we do then
'&' suddenly becomes a magic character.  (I vote against it.)

One cheap solution which might help a few people would be to add a
line containing the funky characters to the editpage.html form.
That way, people who can't figure out how to type in an accented
character could at least cut and paste the one they want.

>In my case, I've ... changed WikiNameRegexp to allow accents
>in the link names.

This has been done in the development branch.

It probably won't be done in the stable branch, since that would
change the semantics of existing wikis.  (I suppose the alternative
WikiNameRegexp could be added in a comment, though.)

See also:
 http://phpwiki.sourceforge.net/phpwiki/index.php?WikiNameRegexp

Jeff

[Phpwiki-talk] nightly builds up again

[Steve W. <sw...@pa...>]

I just noticed the crontab is back on my account at sourceforge, and the
nightly tarball is being made again.

~swain

---
                  http://www.panix.com/~swain/
"Without music to decorate it, time is just a bunch of boring
production deadlines or dates by which bills must be paid."
                     -- Frank Zappa

[Phpwiki-talk] PHPWiki accent support

[Christian R. R. <ki...@as...>]

Hey there,

I'm quite new to PHPWiki and not at all familiar with it, but I've noticed
that at least in the default configuration there is no support for
entitized accents (=C1 becoming Ã) as we commonly use in non-english
countries. In my case, I've hacked transform.php to provide for the
changes and also changed WikiNameRegexp to allow accents in the link
names.

Now a better way to do this would be to flat-out run text through
htmlentities() but I haven't seen the proper way to do this (how to match
on words and _then_ get then changed with htmlentities..) I've attached
the (kind of stupid) fixes I've made in the hope someone else wanting
something that works is helped.

Anyone having this sort of trouble? Spanish-speakers? Is this already
accounted for?

Take care,
--
/\/\ Christian Reis, Senior Engineer, Async Open Source, Brazil
~\/~ http://async.com.br/~kiko/ | [+55 16] 274 4311

Re: [Phpwiki-talk] ADODB

[Sergio A. K. <ser...@ho...>]

the "official" db abstraction layer for php is DB (from PEAR)
http://pear.php.net
DB is developed by Stig Baken (a long time php hacker)
DB is being distributed with php > 4

I'm working rigth now with DB, so far:
advantages: simple, clean design, ligthweigth, come with distros
disadvantages: WIP

last time I looked at ADODB, it seemed (to me) overdesigned,
complex and bloated, but I could be wrong.

/sergio

----- Original Message -----
From: "Steve Wainstead" <sw...@pa...>


>
> This looks like something similar to the Perl DBI, which PHP has needed
> for some time... isn't there another project, PHPLib, or something like
> that? This is the first project I've seen that isn't beta, btw.
>
> thanks Reini!
> ~swain
>
> On Thu, 7 Jun 2001, Reini Urban wrote:
>
> > Has anybody looked at this yet?
> > http://freshmeat.net/projects/adodb/
> >
> > ADODB is a set of advanced PHP database wrapper classes. It supports
MySQL,
> > PostgreSQL, Interbase, Oracle, MS SQL 7, Sybase,  DB2, FrontBase,
Foxpro,
> > Access, ADO, and generic ODBC. A metatype system is built in, making it
> > possible to figure out that types such  as CHAR, TEXT, and STRING are
> > equivalent in different databases. It also features an SQL to HTML popup
> > menu and SQL to HTML table support and recordset caching.
> >
> > This seems to solve some of our DB problems. Wouldn't it be easier to
use
> > such an external classlib?
> >
> >
> > _______________________________________________
> > Phpwiki-talk mailing list
> > Php...@li...
> > http://lists.sourceforge.net/lists/listinfo/phpwiki-talk
> >
>
> ---
>                   http://www.panix.com/~swain/
> "Without music to decorate it, time is just a bunch of boring
> production deadlines or dates by which bills must be paid."
>                      -- Frank Zappa
>
>
> _______________________________________________
> Phpwiki-talk mailing list
> Php...@li...
> http://lists.sourceforge.net/lists/listinfo/phpwiki-talk
>

Re: [Phpwiki-talk] ADODB

[Steve W. <sw...@pa...>]

This looks like something similar to the Perl DBI, which PHP has needed
for some time... isn't there another project, PHPLib, or something like
that? This is the first project I've seen that isn't beta, btw.

thanks Reini!
~swain

On Thu, 7 Jun 2001, Reini Urban wrote:

> Has anybody looked at this yet?
> http://freshmeat.net/projects/adodb/
>
> ADODB is a set of advanced PHP database wrapper classes. It supports MySQL,
> PostgreSQL, Interbase, Oracle, MS SQL 7, Sybase,  DB2, FrontBase, Foxpro,
> Access, ADO, and generic ODBC. A metatype system is built in, making it
> possible to figure out that types such  as CHAR, TEXT, and STRING are
> equivalent in different databases. It also features an SQL to HTML popup
> menu and SQL to HTML table support and recordset caching.
>
> This seems to solve some of our DB problems. Wouldn't it be easier to use
> such an external classlib?
>
>
> _______________________________________________
> Phpwiki-talk mailing list
> Php...@li...
> http://lists.sourceforge.net/lists/listinfo/phpwiki-talk
>

---
                  http://www.panix.com/~swain/
"Without music to decorate it, time is just a bunch of boring
production deadlines or dates by which bills must be paid."
                     -- Frank Zappa

[Phpwiki-talk] ADODB

[Reini U. <ru...@xa...>]

Has anybody looked at this yet?
http://freshmeat.net/projects/adodb/

ADODB is a set of advanced PHP database wrapper classes. It supports MySQL,
PostgreSQL, Interbase, Oracle, MS SQL 7, Sybase,  DB2, FrontBase, Foxpro,
Access, ADO, and generic ODBC. A metatype system is built in, making it
possible to figure out that types such  as CHAR, TEXT, and STRING are
equivalent in different databases. It also features an SQL to HTML popup
menu and SQL to HTML table support and recordset caching.

This seems to solve some of our DB problems. Wouldn't it be easier to use
such an external classlib?

RE: [Phpwiki-talk] gettext problems

[Pablo R. R. <pr...@cl...>]

Sergio,

> while I can see the point on using gettext with
> a languaje like C, I still cannot see the point on using gettext on
> a languaje like PHP.

:)

> a solution based on $HTTP_SERVER_VARS["HTTP_ACCEPT_LANGUAGE"]
> (ie. the client browser languaje) and a simple dictionary,
> is IMO better (and more simpler for translators)

Yes, or like phpnuke or phpbb does, defining variables for lang

> anyway, I get 1.2.0 to work with my locale using "es_AR" with
> this simple patch
> 
>       putenv ("LANG=$LANG");
> +      if ( setlocale('LC_ALL', "") == null)
> +        echo "INVALID locale";
>       bindtextdomain ("phpwiki", "./locale");

Cool! I'll try this.

Saludos,

Pablo Roca

Re: [Phpwiki-talk] gettext problems

[Sergio A. K. <ser...@ho...>]

hi pablo,

I agree 100% with you, while I can see the point on using gettext with
a languaje like C, I still cannot see the point on using gettext on
a languaje like PHP.

a solution based on $HTTP_SERVER_VARS["HTTP_ACCEPT_LANGUAGE"]
(ie. the client browser languaje) and a simple dictionary,
is IMO better (and more simpler for translators)

anyway, I get 1.2.0 to work with my locale using "es_AR" with
this simple patch

      putenv ("LANG=$LANG");
+      if ( setlocale('LC_ALL', "") == null)
+        echo "INVALID locale";
      bindtextdomain ("phpwiki", "./locale");

now, I don't know what to do with my changes, I'm just waiting
for mantainers feedback...

/sergio

----- Original Message ----- 
From: "Pablo Roca Rozas" <pr...@cl...>


> Hi Sergio,
> 
> I wa the man who did the spanish traslation according with the supplied
> instructions and some help from here.
> 
> Unluckyly, I can't put this to work in my site cause they don't allow
> the gettext, maybe I can check this with another ISP. But I don't feel
> comfortable with gettext oriented funcs, cause some ISP's don't use it.
> 
> Imagine how I feel .. :)
> 
> Pablo Roca

RE: [Phpwiki-talk] gettext problems

[Pablo R. R. <pr...@cl...>]

Hi Sergio,

I wa the man who did the spanish traslation according with the supplied
instructions and some help from here.

Unluckyly, I can't put this to work in my site cause they don't allow
the gettext, maybe I can check this with another ISP. But I don't feel
comfortable with gettext oriented funcs, cause some ISP's don't use it.

Imagine how I feel .. :)

Pablo Roca


> -----Mensaje original-----
> De: php...@li...
> [mailto:php...@li...]En nombre de Sergio A.
> Kessler
> Enviado el: lunes, 04 de junio de 2001 2:37
> Para: php...@li...
> Asunto: [Phpwiki-talk] gettext problems
>
>
> hi all,
>
> I'm having problems with the locale, I cannot get spanish...
>
> of course I've edited the lib/config.php {$LANG = "es"},
> and according with phpinfo() I have gettext support and is active
>
> anyone using other locale than english with the php rpms from RedHat 7.1 ?
>
> TIA,
> /sergio
>
>
> _______________________________________________
> Phpwiki-talk mailing list
> Php...@li...
> http://lists.sourceforge.net/lists/listinfo/phpwiki-talk

[Phpwiki-talk] etc/*

[Sergio A. K. <ser...@ho...>]

putting the code where my mouth is, this patch create
a etc/* directory to put cfg there, so cleaning up index.php

comments ?

(the patch was made against the nigthly build, downloaded an hour ago)

/sergio

diff -Nur phpwiki.orig/etc/db.conf.php phpwiki/etc/db.conf.php
--- phpwiki.orig/etc/db.conf.php        Wed Dec 31 21:00:00 1969
+++ phpwiki/etc/db.conf.php        Mon Jun  4 11:50:10 2001
@@ -0,0 +1,49 @@
+<?php
+
+/////////////////////////////////////////////////////////////////////
+//
+// Part Two:
+// Database Selection
+//
+/////////////////////////////////////////////////////////////////////
+
+//
+// This array holds the parameters which select the database to use.
+//
+// Not all of these parameters are used by any particular DB backend.
+//
+$DBParams = array(
+   // Select the database type:
+   // Uncomment one of these, or leave all commented for the default
+   // data base type ('dba' if supported, else 'dbm'.)
+   //'dbtype' => 'dba',
+   //'dbtype' => 'dbm',
+   //'dbtype' => 'mysql',
+   'dbtype' => 'pgsql',
+   //'dbtype' => 'msql',
+   //'dbtype' => 'file',
+
+   // Used by all DB types:
+   'database' => 'wiki',
+   'prefix' => '',        // prefix for filenames or table names
+
+   // Used by 'dbm', 'dba', 'file'
+   'directory' => "/tmp",
+
+   // 'dbm' and 'dba create files named "$directory/${database}{$prefix}*".
+   // 'file' creates files named "$directory/${database}/{$prefix}*/*".
+   // The sql types use tables named "{$prefix}*"
+
+   // Used by 'dbm', 'dba'
+   'timeout' => 20,
+
+   // Used by *sql as neccesary to log in to server:
+   'server'   => 'localhost',
+   'port'     => '',
+   'socket'   => '',
+   'user'     => 'guest',
+   'password' => ''
+);
+
+
+?>
\ No newline at end of file
diff -Nur phpwiki.orig/etc/layout.conf.php phpwiki/etc/layout.conf.php
--- phpwiki.orig/etc/layout.conf.php        Wed Dec 31 21:00:00 1969
+++ phpwiki/etc/layout.conf.php        Mon Jun  4 11:52:40 2001
@@ -0,0 +1,93 @@
+<?php
+
+/////////////////////////////////////////////////////////////////////
+//
+// Part Three:
+// Page appearance and layout
+//
+/////////////////////////////////////////////////////////////////////
+
+// 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=es');
+
+// Setting the LANG environment variable (accomplished above) may or
+// may not be sufficient to cause PhpWiki to produce dates in your
+// native language.  (It depends on the configuration of the operating
+// system on your http server.)  The problem is that, e.g. 'de' is
+// often not a valid locale.
+//
+// A standard locale name is typically of  the  form
+// language[_territory][.codeset][@modifier],  where  language is
+// an ISO 639 language code, territory is an ISO 3166 country code,
+// and codeset  is  a  character  set or encoding identifier like
+// ISO-8859-1 or UTF-8.
+//
+// You can tailor the locale used for time and date formatting by setting
+// the LC_TIME environment variable.  You'll have to experiment to find
+// the correct setting:
+//putenv('LC_TIME=de_DE');
+
+// If you specify a relative URL for the CSS and images,
+// the are interpreted relative to DATA_PATH (see below).
+// (The default value of DATA_PATH is the directory in which
+// index.php (this file) resides.)
+
+// CSS location
+define("CSS_URL", "phpwiki.css");
+
+// logo image (path relative to index.php)
+$logo = "images/wikibase.png";
+
+// Signature image which is shown after saving an edited page
+// If this is left blank (or unset), the signature will be omitted.
+//$SignatureImg = "images/signature.png";
+
+// Date & time formats used to display modification times, etc.
+// Formats are given as format strings to PHP strftime() function
+// See http://www.php.net/manual/en/function.strftime.php for details.
+$datetimeformat = "%B %e, %Y";        // may contain time of day
+$dateformat = "%B %e, %Y";        // must not contain time
+
+// this defines how many page names to list when displaying
+// the MostPopular pages; the default is to show the 20 most popular pages
+define("MOST_POPULAR_LIST_LENGTH", 20);
+
+// this defines how many page names to list when displaying related pages
+define("NUM_RELATED_PAGES", 5);
+
+// Template files (filenames are relative to script position)
+// However, if a LANG is set, they we be searched for in a locale
+// specific location first.
+$templates = array("BROWSE" =>    "templates/browse.html",
+                   "EDITPAGE" =>  "templates/editpage.html",
+                   "MESSAGE" =>   "templates/message.html");
+
+/* WIKI_PGSRC -- specifies the source for the initial page contents
+ * of the Wiki.  The setting of WIKI_PGSRC only has effect when
+ * the wiki is accessed for the first time (or after clearing the
+ * database.) WIKI_PGSRC can either name a directory or a zip file.
+ * In either case WIKI_PGSRC is scanned for files --- one file per page.
+ */
+define('WIKI_PGSRC', "pgsrc"); // Default (old) behavior.
+//define('WIKI_PGSRC', 'wiki.zip'); // New style.
+
+// DEFAULT_WIKI_PGSRC is only used when the language is *not*
+// the default (English) and when reading from a directory:
+// in that case some English pages are inserted into the wiki as well
+// DEFAULT_WIKI_PGSRC defines where the English pages reside
+// FIXME: is this really needed?  Can't we just copy
+//  these pages into the localized pgsrc?
+define('DEFAULT_WIKI_PGSRC', "pgsrc");
+// These are the pages which will get loaded from DEFAULT_WIKI_PGSRC.
+$GenericPages = array("ReleaseNotes", "SteveWainstead", "TestPage");
+
+
+?>
\ No newline at end of file
diff -Nur phpwiki.orig/etc/main.conf.php phpwiki/etc/main.conf.php
--- phpwiki.orig/etc/main.conf.php        Wed Dec 31 21:00:00 1969
+++ phpwiki/etc/main.conf.php        Mon Jun  4 11:49:00 2001
@@ -0,0 +1,61 @@
+<?php
+
+/*
+  This is the starting file for PhpWiki. All this file does
+   is set configuration options, and at the end of the file
+   it includes() the file lib/main.php, where the real action begins.
+
+   This file is divided into six parts: Parts Zero, One, Two, Three,
+   Four and Five. Each one has different configuration settings you
+   can change; in all cases the default should work on your system,
+   however, we recommend you tailor things to your particular setting.
+*/
+
+/////////////////////////////////////////////////////////////////////
+// Part Zero: If PHP needs help in finding where you installed the
+//   rest of the PhpWiki code, you can set the include_path here.
+//ini_set('include_path', '.:/where/you/installed/phpwiki');
+
+/////////////////////////////////////////////////////////////////////
+// Part Null: Don't touch this!
+
+define ('PHPWIKI_VERSION', '1.3.0pre');
+require "lib/prepend.php";
+rcs_id('$Id: index.php,v 1.16 2001/04/07 00:34:30 dairiki Exp $');
+
+/////////////////////////////////////////////////////////////////////
+//
+// Part One:
+// Authentication and security settings:
+//
+/////////////////////////////////////////////////////////////////////
+
+// If set, we will perform reverse dns lookups to try to convert the users
+// IP number to a host name, even if the http server didn't do it for us.
+define('ENABLE_REVERSE_DNS', true);
+
+// Username and password of administrator.
+// Set these to your preferences. For heaven's sake
+// pick a good password!
+define('ADMIN_USER', "");
+define('ADMIN_PASSWD', "");
+
+// If true, only the admin user can make zip dumps, else
+// zip dumps require no authentication.
+define('ZIPDUMP_AUTH', false);
+
+// The maximum file upload size.
+define('MAX_UPLOAD_SIZE', 16 * 1024 * 1024);
+
+// If the last edit is older than MINOR_EDIT_TIMEOUT seconds, the default
+// state for the "minor edit" checkbox on the edit page form will be off.
+define("MINOR_EDIT_TIMEOUT", 7 * 24 * 3600);
+
+// Actions listed in this array will not be allowed.
+//$DisabledActions = array('dumpserial', 'loadfile');
+
+// PhpWiki can generate an access_log (in "NCSA combined log" format)
+// for you.  If you want one, define this to the name of the log file.
+define('ACCESS_LOG', '/tmp/wiki_access_log');
+
+?>
diff -Nur phpwiki.orig/etc/misc.conf.php phpwiki/etc/misc.conf.php
--- phpwiki.orig/etc/misc.conf.php        Wed Dec 31 21:00:00 1969
+++ phpwiki/etc/misc.conf.php        Mon Jun  4 11:53:36 2001
@@ -0,0 +1,102 @@
+<?php
+
+/////////////////////////////////////////////////////////////////////
+//
+// Part four:
+// Mark-up options.
+//
+/////////////////////////////////////////////////////////////////////
+
+// allowed protocols for links - be careful not to allow "javascript:"
+// URL of these types will be automatically linked.
+// within a named link [name|uri] one more protocol is defined: phpwiki
+$AllowedProtocols = "http|https|mailto|ftp|news|gopher";
+
+// URLs ending with the following extension should be inlined as images
+$InlineImages = "png|jpg|gif";
+
+// Perl regexp for WikiNames ("bumpy words")
+// (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well
+$WikiNameRegexp =
"(?<![[:alnum:]])([[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])";
+
+// InterWiki linking -- wiki-style links to other wikis on the web
+//
+// Intermap file for InterWikiLinks -- define other wikis there
+// Leave this undefined to disable InterWiki linking.
+define('INTERWIKI_MAP_FILE', "lib/interwiki.map");
+
+/////////////////////////////////////////////////////////////////////
+//
+// Part five:
+// URL options -- you can probably skip this section.
+//
+/////////////////////////////////////////////////////////////////////
+/******************************************************************
+ *
+ * The following section contains settings which you can use to tailor
+ * the URLs which PhpWiki generates.
+ *
+ * Any of these parameters which are left undefined will be
+ * deduced automatically.  You need only set them explicitly
+ * if the auto-detected values prove to be incorrect.
+ *
+ * In most cases the auto-detected values should work fine,
+ * so hopefully you don't need to mess with this section.
+ *
+ ******************************************************************/
+
+/*
+ * Canonical name and httpd port of the server on which this
+ * PhpWiki resides.
+ */
+//define('SERVER_NAME', 'some.host.com');
+//define('SERVER_PORT', 80);
+
+/*
+ * Absolute URL (from the server root) of the PhpWiki
+ * script.
+ */
+//define('SCRIPT_NAME', '/some/where/index.php');
+
+/*
+ * Absolute URL (from the server root) of the directory
+ * in which relative URL's for images and other support files
+ * are interpreted.
+ */
+//define('DATA_PATH', '/some/where');
+
+/*
+ * Define to 'true' to use PATH_INFO to pass the pagename's.
+ * e.g. http://www.some.where/index.php/HomePage instead
+ * of http://www.some.where/index.php?pagename=HomePage
+ * FIXME: more docs (maybe in README).
+ */
+//define('USE_PATH_INFO', false);
+
+/*
+ * VIRTUAL_PATH is the canonical URL path under which your
+ * your wiki appears.  Normally this is the same as
+ * dirname(SCRIPT_NAME), however using, e.g. apaches mod_actions
+ * (or mod_rewrite), you can make it something different.
+ *
+ * If you do this, you should set VIRTUAL_PATH here.
+ *
+ * E.g. your phpwiki might be installed at at /scripts/phpwiki/index.php,
+ * but  * you've made it accessible through eg. /wiki/HomePage.
+ *
+ * One way to do this is to create a directory named 'wiki' in your
+ * server root.  The directory contains only one file: an .htaccess
+ * file which reads something like:
+ *
+ *    Action x-phpwiki-page /scripts/phpwiki/index.php
+ *    SetHandler x-phpwiki-page
+ *    DirectoryIndex /scripts/phpwiki/index.php
+ *
+ * In that case you should set VIRTUAL_PATH to '/wiki'.
+ *
+ * (VIRTUAL_PATH is only used if USE_PATH_INFO is true.)
+ */
+//define('VIRTUAL_PATH', '/SomeWiki');
+
+
+?>
\ No newline at end of file
diff -Nur phpwiki.orig/index.php phpwiki/index.php
--- phpwiki.orig/index.php        Fri Apr  6 21:34:30 2001
+++ phpwiki/index.php        Mon Jun  4 11:54:52 2001
@@ -1,302 +1,9 @@
 <?php

-/*
-  This is the starting file for PhpWiki. All this file does
-   is set configuration options, and at the end of the file
-   it includes() the file lib/main.php, where the real action begins.
-
-   This file is divided into six parts: Parts Zero, One, Two, Three,
-   Four and Five. Each one has different configuration settings you
-   can change; in all cases the default should work on your system,
-   however, we recommend you tailor things to your particular setting.
-*/
-
-/////////////////////////////////////////////////////////////////////
-// Part Zero: If PHP needs help in finding where you installed the
-//   rest of the PhpWiki code, you can set the include_path here.
-
-
-//ini_set('include_path', '.:/where/you/installed/phpwiki');
-
-/////////////////////////////////////////////////////////////////////
-// Part Null: Don't touch this!
-
-define ('PHPWIKI_VERSION', '1.3.0pre');
-require "lib/prepend.php";
-rcs_id('$Id: index.php,v 1.16 2001/04/07 00:34:30 dairiki Exp $');
-
-/////////////////////////////////////////////////////////////////////
-//
-// Part One:
-// Authentication and security settings:
-//
-/////////////////////////////////////////////////////////////////////
-
-// If set, we will perform reverse dns lookups to try to convert the users
-// IP number to a host name, even if the http server didn't do it for us.
-define('ENABLE_REVERSE_DNS', true);
-
-// Username and password of administrator.
-// Set these to your preferences. For heaven's sake
-// pick a good password!
-define('ADMIN_USER', "");
-define('ADMIN_PASSWD', "");
-
-// If true, only the admin user can make zip dumps, else
-// zip dumps require no authentication.
-define('ZIPDUMP_AUTH', false);
-
-// The maximum file upload size.
-define('MAX_UPLOAD_SIZE', 16 * 1024 * 1024);
-
-// If the last edit is older than MINOR_EDIT_TIMEOUT seconds, the default
-// state for the "minor edit" checkbox on the edit page form will be off.
-define("MINOR_EDIT_TIMEOUT", 7 * 24 * 3600);
-
-// Actions listed in this array will not be allowed.
-//$DisabledActions = array('dumpserial', 'loadfile');
-
-// PhpWiki can generate an access_log (in "NCSA combined log" format)
-// for you.  If you want one, define this to the name of the log file.
-define('ACCESS_LOG', '/tmp/wiki_access_log');
-
-/////////////////////////////////////////////////////////////////////
-//
-// Part Two:
-// Database Selection
-//
-/////////////////////////////////////////////////////////////////////
-
-//
-// This array holds the parameters which select the database to use.
-//
-// Not all of these parameters are used by any particular DB backend.
-//
-$DBParams = array(
-   // Select the database type:
-   // Uncomment one of these, or leave all commented for the default
-   // data base type ('dba' if supported, else 'dbm'.)
-   //'dbtype' => 'dba',
-   //'dbtype' => 'dbm',
-   //'dbtype' => 'mysql',
-   //'dbtype' => 'pgsql',
-   //'dbtype' => 'msql',
-   //'dbtype' => 'file',
-
-   // Used by all DB types:
-   'database' => 'wiki',
-   'prefix' => '',        // prefix for filenames or table names
-
-   // Used by 'dbm', 'dba', 'file'
-   'directory' => "/tmp",
-
-   // 'dbm' and 'dba create files named "$directory/${database}{$prefix}*".
-   // 'file' creates files named "$directory/${database}/{$prefix}*/*".
-   // The sql types use tables named "{$prefix}*"
-
-   // Used by 'dbm', 'dba'
-   'timeout' => 20,
-
-   // Used by *sql as neccesary to log in to server:
-   'server'   => 'localhost',
-   'port'     => '',
-   'socket'   => '',
-   'user'     => 'guest',
-   'password' => ''
-);
-
-
-/////////////////////////////////////////////////////////////////////
-//
-// Part Three:
-// Page appearance and layout
-//
-/////////////////////////////////////////////////////////////////////
-
-// 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
-// may not be sufficient to cause PhpWiki to produce dates in your
-// native language.  (It depends on the configuration of the operating
-// system on your http server.)  The problem is that, e.g. 'de' is
-// often not a valid locale.
-//
-// A standard locale name is typically of  the  form
-// language[_territory][.codeset][@modifier],  where  language is
-// an ISO 639 language code, territory is an ISO 3166 country code,
-// and codeset  is  a  character  set or encoding identifier like
-// ISO-8859-1 or UTF-8.
-//
-// You can tailor the locale used for time and date formatting by setting
-// the LC_TIME environment variable.  You'll have to experiment to find
-// the correct setting:
-//putenv('LC_TIME=de_DE');
-
-// If you specify a relative URL for the CSS and images,
-// the are interpreted relative to DATA_PATH (see below).
-// (The default value of DATA_PATH is the directory in which
-// index.php (this file) resides.)
-
-// CSS location
-define("CSS_URL", "phpwiki.css");
-
-// logo image (path relative to index.php)
-$logo = "images/wikibase.png";
-
-// Signature image which is shown after saving an edited page
-// If this is left blank (or unset), the signature will be omitted.
-//$SignatureImg = "images/signature.png";
-
-// Date & time formats used to display modification times, etc.
-// Formats are given as format strings to PHP strftime() function
-// See http://www.php.net/manual/en/function.strftime.php for details.
-$datetimeformat = "%B %e, %Y";        // may contain time of day
-$dateformat = "%B %e, %Y";        // must not contain time
-
-// this defines how many page names to list when displaying
-// the MostPopular pages; the default is to show the 20 most popular pages
-define("MOST_POPULAR_LIST_LENGTH", 20);
-
-// this defines how many page names to list when displaying related pages
-define("NUM_RELATED_PAGES", 5);
-
-// Template files (filenames are relative to script position)
-// However, if a LANG is set, they we be searched for in a locale
-// specific location first.
-$templates = array("BROWSE" =>    "templates/browse.html",
-                   "EDITPAGE" =>  "templates/editpage.html",
-                   "MESSAGE" =>   "templates/message.html");
-
-/* WIKI_PGSRC -- specifies the source for the initial page contents
- * of the Wiki.  The setting of WIKI_PGSRC only has effect when
- * the wiki is accessed for the first time (or after clearing the
- * database.) WIKI_PGSRC can either name a directory or a zip file.
- * In either case WIKI_PGSRC is scanned for files --- one file per page.
- */
-define('WIKI_PGSRC', "pgsrc"); // Default (old) behavior.
-//define('WIKI_PGSRC', 'wiki.zip'); // New style.
-
-// DEFAULT_WIKI_PGSRC is only used when the language is *not*
-// the default (English) and when reading from a directory:
-// in that case some English pages are inserted into the wiki as well
-// DEFAULT_WIKI_PGSRC defines where the English pages reside
-// FIXME: is this really needed?  Can't we just copy
-//  these pages into the localized pgsrc?
-define('DEFAULT_WIKI_PGSRC', "pgsrc");
-// These are the pages which will get loaded from DEFAULT_WIKI_PGSRC.
-$GenericPages = array("ReleaseNotes", "SteveWainstead", "TestPage");
-
-/////////////////////////////////////////////////////////////////////
-//
-// Part four:
-// Mark-up options.
-//
-/////////////////////////////////////////////////////////////////////
-
-// allowed protocols for links - be careful not to allow "javascript:"
-// URL of these types will be automatically linked.
-// within a named link [name|uri] one more protocol is defined: phpwiki
-$AllowedProtocols = "http|https|mailto|ftp|news|gopher";
-
-// URLs ending with the following extension should be inlined as images
-$InlineImages = "png|jpg|gif";
-
-// Perl regexp for WikiNames ("bumpy words")
-// (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well
-$WikiNameRegexp =
"(?<![[:alnum:]])([[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])";
-
-// InterWiki linking -- wiki-style links to other wikis on the web
-//
-// Intermap file for InterWikiLinks -- define other wikis there
-// Leave this undefined to disable InterWiki linking.
-define('INTERWIKI_MAP_FILE', "lib/interwiki.map");
-
-/////////////////////////////////////////////////////////////////////
-//
-// Part five:
-// URL options -- you can probably skip this section.
-//
-/////////////////////////////////////////////////////////////////////
-/******************************************************************
- *
- * The following section contains settings which you can use to tailor
- * the URLs which PhpWiki generates.
- *
- * Any of these parameters which are left undefined will be
- * deduced automatically.  You need only set them explicitly
- * if the auto-detected values prove to be incorrect.
- *
- * In most cases the auto-detected values should work fine,
- * so hopefully you don't need to mess with this section.
- *
- ******************************************************************/
-
-/*
- * Canonical name and httpd port of the server on which this
- * PhpWiki resides.
- */
-//define('SERVER_NAME', 'some.host.com');
-//define('SERVER_PORT', 80);
-
-/*
- * Absolute URL (from the server root) of the PhpWiki
- * script.
- */
-//define('SCRIPT_NAME', '/some/where/index.php');
-
-/*
- * Absolute URL (from the server root) of the directory
- * in which relative URL's for images and other support files
- * are interpreted.
- */
-//define('DATA_PATH', '/some/where');
-
-/*
- * Define to 'true' to use PATH_INFO to pass the pagename's.
- * e.g. http://www.some.where/index.php/HomePage instead
- * of http://www.some.where/index.php?pagename=HomePage
- * FIXME: more docs (maybe in README).
- */
-//define('USE_PATH_INFO', false);
-
-/*
- * VIRTUAL_PATH is the canonical URL path under which your
- * your wiki appears.  Normally this is the same as
- * dirname(SCRIPT_NAME), however using, e.g. apaches mod_actions
- * (or mod_rewrite), you can make it something different.
- *
- * If you do this, you should set VIRTUAL_PATH here.
- *
- * E.g. your phpwiki might be installed at at /scripts/phpwiki/index.php,
- * but  * you've made it accessible through eg. /wiki/HomePage.
- *
- * One way to do this is to create a directory named 'wiki' in your
- * server root.  The directory contains only one file: an .htaccess
- * file which reads something like:
- *
- *    Action x-phpwiki-page /scripts/phpwiki/index.php
- *    SetHandler x-phpwiki-page
- *    DirectoryIndex /scripts/phpwiki/index.php
- *
- * In that case you should set VIRTUAL_PATH to '/wiki'.
- *
- * (VIRTUAL_PATH is only used if USE_PATH_INFO is true.)
- */
-//define('VIRTUAL_PATH', '/SomeWiki');
-
-
-////////////////////////////////////////////////////////////////
-// Okay... fire up the code:
-////////////////////////////////////////////////////////////////
+include "etc/main.conf.php";
+include "etc/db.conf.php";
+include "etc/layout.conf.php";
+include "etc/misc.conf.php";

 include "lib/main.php";

@@ -304,5 +11,5 @@
 // Local Variables:
 // mode: php
 // c-file-style: "ellemtel"
-// End:
+// End:
 ?>

Re: [Phpwiki-talk] gettext problems

[Sergio A. K. <ser...@ho...>]

----- Original Message -----
From: "Jon Åslund" <d9...@na...>


On Sun, Jun 03, 2001 at 09:36:58PM -0300, Sergio A. Kessler wrote:
> > anyone using other locale than english with the php rpms from RedHat 7.1
?
>
> No, sorry! It probably won't work with PhpWiki 1.2.0. Someone with
> better knowledge than me can fill in why (like Jan :), but it has been
> fixed and if you download the latest alpha version you can probably
> get it to run. Just did to make sure I was right, and I was. :)
>
>  ftp://phpwiki.sourceforge.net/pub/phpwiki/phpwiki.nightly.tar.gz
>
> Although there may be some other unfinished things in it, like for an
> example that ugly default style sheet (changing to sans serif for
> WikiLinks, baaah :).

I get it to work, but now I get the spanish text AND the english text
on the home page, like:

AgregarPaginas
from plain file ./locale/es/pgsrc/AgregarPaginas is identical to current
version 1 - skipped
AddingPages
Skipping

of course this is not what I want...
anyways, I started to look at the code, wow, well, it is not the
most elegant code I've seen...

the first thing that come to my mind is to create a /etc directory
to store there config files, the current method of storing config
info in index.php is b0rked (and a complete mess)

I'm willing to contribute a patch if this is of interest to
mantainers, just tell me.

/sergio

Re: [Phpwiki-talk] gettext problems

[Jon <d9...@na...>]

On Sun, Jun 03, 2001 at 09:36:58PM -0300, Sergio A. Kessler wrote:
> hi all,
>=20
> I'm having problems with the locale, I cannot get spanish...
>=20
> of course I've edited the lib/config.php {$LANG =3D "es"},=20
> and according with phpinfo() I have gettext support and is active
>=20
> anyone using other locale than english with the php rpms from RedHat 7.=
1 ?

No, sorry! It probably won't work with PhpWiki 1.2.0. Someone with
better knowledge than me can fill in why (like Jan :), but it has been
fixed and if you download the latest alpha version you can probably
get it to run. Just did to make sure I was right, and I was. :)

 ftp://phpwiki.sourceforge.net/pub/phpwiki/phpwiki.nightly.tar.gz

Although there may be some other unfinished things in it, like for an
example that ugly default style sheet (changing to sans serif for
WikiLinks, baaah :).

--=20
___\ Jon =C5slund

[Phpwiki-talk] gettext problems

[Sergio A. K. <ser...@ho...>]

hi all,

I'm having problems with the locale, I cannot get spanish...

of course I've edited the lib/config.php {$LANG = "es"}, 
and according with phpinfo() I have gettext support and is active

anyone using other locale than english with the php rpms from RedHat 7.1 ?

TIA,
/sergio

Re: [Phpwiki-talk] [dutch] translation update

[Jeff D. <da...@da...>]

>Well, I would like a new stable version instead. :) Can't we just
>feature freeze soon or are there many halfimplemented things in the
>main branch that need improvements?

The answer is "b) there are many halfimplemented things".  Mostly the
new database backend (which will allow multiple archived versions
of each page, and hopefully tie in to the quest for user authentication
abilities.)  I'm supposed to be working on that.  I'll see if I can =

produce something soon.  (Probably a couple of weeks.)


That said, the "alpha" branch does seem to be becoming popular.
Even if more big changes are anticipated, perhaps it's time for
a 1.3.1 release?  (Again with the understanding that those who
want real stability should stick with the 1.2.x branch.)


And: is it time for 1.2.1?  There have been a bunch of bug fixes since 1.=
2.
OTOH, things maybe worth waiting for (before 1.2.1) (?):
 * Marco has promised a few typo fixes for his Italian translations.
 * Should we fix the case-(in)sensitivity in page name bug(s) in the
   stable branch, or just leave it?  (SF bug # 233898).



>If you are on a PHP_SAFE_MODE system, do PhpWiki work like it's
>supposed to? I guess you can't mess much with environment variables at
>all.

Yes, now that you (and Jan) mention it, that is a problem.
Oh well.  Maybe things are best left as they (now are).
(With perhaps a little cleanup regarding LC_CTIME.)

>Yes. Have a test script that you can run to check if everything works
>ok.

Yes.  Adding some general regression and/or unit tests might be a good th=
ing
to think about (for everything, not just the setlocale() issues).  A lot
of work though....

Jeff

Re: [Phpwiki-talk] [dutch] translation update

[Jon <d9...@na...>]

On Thu, May 31, 2001 at 11:07:37AM -0700, Jeff Dairiki wrote:

> Thank you for the fixes.  I've checked them in to the CVS main branch.
> (I have not back-ported any of your translation fixes to the stable
> branch of the CVS --- should they be?)

Well, I would like a new stable version instead. :) Can't we just
feature freeze soon or are there many halfimplemented things in the
main branch that need improvements?

I will soon update the Swedish translation to be up to date with the
main branch. I've just used CVS for a project in school so I know how
to use it and I can probably check in the update myself, although I'm
always scared to destroy something. :)

> My changes (which worked on the systems I have access to)
> were an attempt to keep the localization config information in system
> environment variables.  This is, I think, a good idea, since it's the
> normal way to do things.  (On some systems, the environment variables
> might already be set correctly, and require no adjustment by the
> phpwiki administrator.  Who knows?)

If you are on a PHP_SAFE_MODE system, do PhpWiki work like it's
supposed to? I guess you can't mess much with environment variables at
all.

> That said --- getting the locale stuff to work seems to be highly syste=
m
> dependent.  What works seems depends on:
>=20
>   * PHP version and configuration
>   * OS type/version
>   * libc type/version
>   * who knows what else?

The power of three? (yes, I just watched The Charmed Ones :)

> "We" should probably make a concerted effort to come up with a language
> selection scheme which works reliably on as wide a range of systems as
> possible.  (Perhaps we need to construct a robust test program and/or
> start a page on the wiki for test reports of what does and does not wor=
k.)

Yes. Have a test script that you can run to check if everything works
ok.

--=20
___\ Jon =C5slund

Re: [Phpwiki-talk] [dutch] translation update

[Jan N. <ja...@gn...>]

Jeff Dairiki <da...@da...> writes:

> Thank you for the fixes.  I've checked them in to the CVS main branch.

Ok, thanks, I'll have  a look.

> (I have not back-ported any of your translation fixes to the stable
> branch of the CVS --- should they be?)

Nah, not worth the effort imo.

> It's the "alpha" branch.   The system is working as it should:  Someone makes
> changes (that work for him, on the systems he has access to), and others tell
> him if it's broken.

Yes, that's what I guessed.  It seems indeed that php has problems to.
I find it strange that there's no mention in the weekly updates; but I
must confess that I haven't checked or looked for a php bugs list or
bugzilla or something.

> "We" should probably make a concerted effort to come up with a language
> selection scheme which works reliably on as wide a range of systems as
> possible.  (Perhaps we need to construct a robust test program and/or
> start a page on the wiki for test reports of what does and does not work.)

That's a good idea.  There's another small thing, when php runs in
safe mode, you can't putenv (), there must be a solution for that too.

Greetings,
Jan.

-- 
Jan Nieuwenhuizen <ja...@gn...> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org

Re: [Phpwiki-talk] [dutch] translation update

[Jeff D. <da...@da...>]

Hi Jan,

Thank you for the fixes.  I've checked them in to the CVS main branch.
(I have not back-ported any of your translation fixes to the stable
branch of the CVS --- should they be?)

(I've massaged a couple of your gettext()ification a bit.  You might
want to take a look to see that you still like them.)

>Here's a Dutch translation update, together with internationalisation
>fixes, so that gettext () actually works again.  Please don't change
>the setlocale ()/putenv ("=3D$LANG") stuff without checking with the
>translators, as php4's gettext implementation is shaky and apparently
>not really portable.

It's the "alpha" branch.   The system is working as it should:  Someone m=
akes
changes (that work for him, on the systems he has access to), and others =
tell
him if it's broken.

My changes (which worked on the systems I have access to)
were an attempt to keep the localization config information in system
environment variables.  This is, I think, a good idea, since it's the
normal way to do things.  (On some systems, the environment variables
might already be set correctly, and require no adjustment by the
phpwiki administrator.  Who knows?)

That said --- getting the locale stuff to work seems to be highly system
dependent.  What works seems depends on:

  * PHP version and configuration
  * OS type/version
  * libc type/version
  * who knows what else?

"We" should probably make a concerted effort to come up with a language
selection scheme which works reliably on as wide a range of systems as
possible.  (Perhaps we need to construct a robust test program and/or
start a page on the wiki for test reports of what does and does not work.=
)

Jeff

[Phpwiki-talk] [dutch] translation update

[Jan N. <ja...@gn...>]

Hi List,

Here's a Dutch translation update, together with internationalisation
fixes, so that gettext () actually works again.  Please don't change
the setlocale ()/putenv ("=3D$LANG") stuff without checking with the
translators, as php4's gettext implementation is shaky and apparently
not really portable.

You should rerun ./locale/translate.sh, as I've excluded most
automatically generated stuff from the patch.

Greetings,
Jan.

diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/index.php ./index.php
--- ../wiki-29mei/index.php	Sat Apr  7 02:34:30 2001
+++ ./index.php	Tue May 29 11:52:47 2001
@@ -101,8 +101,8 @@
    'server'   =3D> 'localhost',
    'port'     =3D> '',
    'socket'   =3D> '',
-   'user'     =3D> 'guest',
-   'password' =3D> ''
+   'user'     =3D> 'wiki',
+   'password' =3D> 'wiki'
 );
=20
=20
@@ -120,9 +120,10 @@
 // Note that on some systems, apprently using these short forms for
 // the locale won't work.  On my home system 'LANG=3Dde' 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=3DC');
+// as a valid locale before gettext() will work, i.e., use 'de_DE',
+// 'nl_NL'.
+$LANG=3D'C';
+//$LANG=3D'nl_NL';
=20
 // Setting the LANG environment variable (accomplished above) may or
 // may not be sufficient to cause PhpWiki to produce dates in your
@@ -208,7 +209,7 @@
 $AllowedProtocols =3D "http|https|mailto|ftp|news|gopher";
=20
 // URLs ending with the following extension should be inlined as images
-$InlineImages =3D "png|jpg|gif";
+$InlineImages =3D "png|jpg";
=20
 // Perl regexp for WikiNames ("bumpy words")
 // (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/lib/config.php ./lib/config.php
--- ../wiki-29mei/lib/config.php	Sat Apr  7 02:34:30 2001
+++ ./lib/config.php	Tue May 29 11:26:28 2001
@@ -22,12 +22,6 @@
 // constants for flags in $pagehash
 define("FLAG_PAGE_LOCKED", 1);
=20
-//////////////////////////////////////////////////////////////////
-//
-// Set up localization
-//
-setlocale('LC_ALL', "");
-  =20
 // Search PHP's include_path to find file or directory.
 function FindFile ($file, $missing_okay =3D false)
 {
@@ -106,6 +100,9 @@
 }
 else
 {
+   // Setup localisation
+   setlocale(LC_ALL, "$LANG");
+   putenv("LC_ALL=3D$LANG");
    bindtextdomain ("phpwiki", FindFile("locale"));
    textdomain ("phpwiki");
 }
@@ -130,8 +127,8 @@
 //
 // FIXME: Not all environments may support en_US?  We should probably
 // have a list of locales to try.
-if (setlocale('LC_CTYPE', 0) =3D=3D 'C')
-   setlocale('LC_CTYPE', 'en_US.iso-8859-1');
+if (setlocale(LC_CTYPE, 0) =3D=3D 'C')
+   setlocale(LC_CTYPE, 'en_US.iso-8859-1');
=20
 /** string pcre_fix_posix_classes (string $regexp)
  *
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/lib/loadsave.php ./lib/loadsave.php
--- ../wiki-29mei/lib/loadsave.php	Sat Apr  7 02:34:30 2001
+++ ./lib/loadsave.php	Tue May 29 11:25:58 2001
@@ -12,8 +12,9 @@
 function EndLoadDump()
 {
    // FIXME: This is a hack
-   echo Element('p', QElement('b', gettext("Complete.")));
-   echo Element('p', "Return to " . LinkExistingWikiWord($GLOBALS['pagen=
ame']));
+   echo Element('p', QElement('b', gettext ("Complete.")));
+   echo Element('p', gettext ("Return to ") . LinkExistingWikiWord(gette=
xt ($GLOBALS['pagename'])));
+   // echo Element('p', "Return to " . LinkExistingWikiWord($GLOBALS['pa=
gename']));
    echo "</body></html>\n";
 }
=20
@@ -259,17 +260,20 @@
    {
       usort($parts, 'SortByPageVersion');
       for (reset($parts); $page =3D current($parts); next($parts))
-	 SavePage($dbi, $page, $defaults, "MIME file $filename", $basename);
+	 SavePage($dbi, $page, $defaults,=20
+	 	  gettext ("MIME file") . " $filename", $basename);
    }
    else if ( ($page =3D ParseSerializedPage($text)) )
    {
-      SavePage($dbi, $page, $defaults, "Serialized file $filename", $bas=
ename);
+      SavePage($dbi, $page, $defaults,=20
+               gettext ("Serialized file") . " $filename", $basename);
    }
    else
    {
       // Assume plain text file.
       $page['content'] =3D preg_split('/[ \t\r]*\n/', chop($text));
-      SavePage($dbi, $page, $defaults, "plain file $filename", $basename=
);
+      SavePage($dbi, $page, $defaults,=20
+               gettext ("plain file") . " $filename", $basename);
    }
 }
=20
@@ -357,7 +361,7 @@
 {
    StartLoadDump("Loading '$source'");
    echo "<dl>\n";
-   LoadAny($dbi, $source, false, array(gettext('RecentChanges')));
+   LoadAny($dbi, $source, false, array(gettext("RecentChanges")));
    echo "</dl>\n";
    EndLoadDump();
 }
@@ -367,12 +371,12 @@
    global $GenericPages, $LANG, $user;
=20
    //FIXME: This is a hack
-   $user->userid =3D 'The PhpWiki programming team';
+   $user->userid =3D gettext("The PhpWiki programming team");
   =20
-   StartLoadDump('Loading up virgin wiki');
+   StartLoadDump(gettext("Loading up virgin wiki"));
    echo "<dl>\n";
=20
-   $ignore =3D array(gettext('RecentChanges'));
+   $ignore =3D array(gettext("RecentChanges"));
=20
    LoadAny($dbi, FindLocalizedFile(WIKI_PGSRC), false, $ignore);
    if ($LANG !=3D "C")
@@ -403,7 +407,7 @@
    echo "<dl>\n";
   =20
    if (IsZipFile($fd))
-      LoadZip($dbi, $fd, false, array(gettext('RecentChanges')));
+      LoadZip($dbi, $fd, false, array(gettext("RecentChanges")));
    else
       Loadfile($dbi, $name, fread($fd, MAX_UPLOAD_SIZE));
=20
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/lib/stdlib.php ./lib/stdlib.php
--- ../wiki-29mei/lib/stdlib.php	Sat Apr  7 02:34:30 2001
+++ ./lib/stdlib.php	Tue May 29 09:57:49 2001
@@ -642,7 +642,7 @@
=20
    // add the updated page's name to the array
    if($isnewpage) {
-      $newpage[$k++] =3D "* [$pagename] (new) ..... $userid\r";
+      $newpage[$k++] =3D "* [$pagename] " . gettext("(new)") . " ..... $=
userid\r";
    } else {
       $diffurl =3D "phpwiki:" . rawurlencode($pagename) . "?action=3Ddif=
f";
       $newpage[$k++] =3D "* [$pagename] ([diff|$diffurl]) ..... $userid\=
r";
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/lib/userauth.php ./lib/userauth.php
--- ../wiki-29mei/lib/userauth.php	Wed Mar 14 20:45:12 2001
+++ ./lib/userauth.php	Tue May 29 11:34:37 2001
@@ -78,7 +78,8 @@
=20
    function must_be_admin ($action =3D "do that") {
       if (! $this->is_admin())
-	 ExitWiki("You must be logged in as an administrator to $action.");
+      	 // ouch -- ``to $action'' will only translate well to English
+	 ExitWiki(gettext ("You must be logged in as an administrator to $actio=
n."));
    }
=20
=20
@@ -143,8 +144,7 @@
    function _demand_http_authentication () {
       if (!defined('ADMIN_USER') || !defined('ADMIN_PASSWD')
 	  || ADMIN_USER =3D=3D '' || ADMIN_PASSWD =3D=3D'') {
-	 return "<p><b>You must set the administrator account and password " .
-	    "before you can log in.</b></p>\n";
+	 return "<p><b>" . gettext ("You must set the administrator account and=
 password before you can log in.") . "</b></p>\n";
       }
=20
       // Request password
Binary files ../wiki-29mei/locale/nl/LC_MESSAGES/phpwiki.mo and ./locale/=
nl/LC_MESSAGES/phpwiki.mo differ
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/pgsrc/GebruikersVoorkeuren ./locale/nl/pgsrc/GebruikersVo=
orkeuren
--- ../wiki-29mei/locale/nl/pgsrc/GebruikersVoorkeuren	Thu Jan  1 01:00:0=
0 1970
+++ ./locale/nl/pgsrc/GebruikersVoorkeuren	Tue May 29 11:48:19 2001
@@ -0,0 +1,14 @@
+Mime-Version: 1.0
+Content-Type: application/x-phpwiki;
+  pagename=3DGebruikersVoorkeuren;
+  flags=3DPAGE_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 ma=
ken).
+
+! !InvoerVeld Afmetingen.
+
+[Zet Breedte | phpwiki:?action=3Dsetprefs&edit_area_width=3D3()]
+[Zet Hoogte | phpwiki:?action=3Dsetprefs&edit_area_height=3D3()]
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/pgsrc/HoeWikiTeGebruiken ./locale/nl/pgsrc/HoeWikiTeGebru=
iken
--- ../wiki-29mei/locale/nl/pgsrc/HoeWikiTeGebruiken	Sat Apr  7 19:13:28 =
2001
+++ ./locale/nl/pgsrc/HoeWikiTeGebruiken	Wed May 23 17:09:32 2001
@@ -7,11 +7,13 @@
 de bron tekst van deze pagina.  Dat is wat zinvoller.
 * 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 __vette tekst__ door aan weerszijden twee underscores te gebr=
uiken.
+* 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 schul=
d van Bill Gates.  Maar je kunt het kleine knopje indrukken, genaamd Vert=
aal Spaties Naar Tabs.  Je kunt een stel spaties tiepen die Wiki dan herk=
ent als ware ze een tab.
+* 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 s=
patie:
=20
  dit is een gedicht
@@ -27,12 +29,28 @@
=20
 * Je maakt een horizontale lijn met vier of meer streepjes zoals hier:
 ----
-* Om hyperkoppelingen te maken hoef je slechts de woorden met hoofdlette=
rs en aan elkaar te schrijven.  Laten we zeggen dat je een pagina wilt ma=
ken over die Jan Nieuwenhuizen eet wormen.  Het enige dat je hoeft te doe=
n is elk woord met een hoofdletter beginen en ze aan elkaar schrijven: Ja=
nNieuwenhuizenEetWormen.  Als de pagina nog niet bestaat, verschijnt er e=
en vraagteken achter de koppeling, die je uitnodigt om de pagina aan te m=
aken: DezePaginaMagNietBestaan.  (Verpest dit voorbeeld nou alsjeblieft n=
iet 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 hak=
en zoals hier: [http://www.jouwgastheer.jouwdomein/plaatjes/figuur.png]. =
 URLs naar plaatjes die niet tussen vierkante haken staan, verschijnen al=
s een gewone koppeling naar het plaatje.
-* Nu ben je klaar om te beginnen met PaginasToevoegen.
+* 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.
=20
 ----
 Een WikiWikiWeb is bedoeld om snel en gemakkelijk te kunnen veranderen. =
 Het
 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
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/pgsrc/MeerOverTechnieken ./locale/nl/pgsrc/MeerOverTechni=
eken
--- ../wiki-29mei/locale/nl/pgsrc/MeerOverTechnieken	Sat Apr  7 19:13:28 =
2001
+++ ./locale/nl/pgsrc/MeerOverTechnieken	Wed May 23 16:03:20 2001
@@ -1,16 +1,29 @@
-PhpWiki is geschreven in de server-zijde scripttaal PHP, die verkrijgbaa=
r is op http://www.php.net/.  PHP lijkt kwa syntax op C en Perl en functi=
oneert goed vergelijkbaar met ASP, EmbPerl of JSP.
+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.
=20
-PhpWiki bestaat uit een tal bestanden met een mengsel van PHP en HTML.  =
De webpagina's waaruit het WikiWikiWeb gebaseerd op PHP bestaat, komen ui=
t een data base, waarin ook backups van vorige versies worden bewaard.
+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.
=20
-Steeds wanneer een gebruiker de site bezoekt, wordt de gevraagde pagina =
uit de data base gehaald en weergegeven.  De gebruiker vraagt enkel altij=
d het bestand index.php op, dat dan beslist welke andere php bestanden wo=
rden ingevoegd.
+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.
=20
-Koppelingen naar pagina's in de Wiki worden automaties gemaakt: PhpWiki.=
  Dit zou best wel eens het aantrekkelijkste onderdeel van een Wiki kunne=
n zijn, de mogelijkheid van pagina's toevoegen, enkel door het maken van =
een koppeling.  Het op een na aantrekkelijkst is het gemak waarmee extern=
e URL's gekoppeld kunnen worden:
+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:
=20
 # http://www.lilypond.org/
 # ftp://ftp.nl.debian.org/
 # news://news.mozilla.org/
=20
-Gecombineerd met een enkele naamruimte en eenvoudige opmaak, vertoont ee=
n Wiki vele karakteristieken van WabiSabi.
+Gecombineerd met een enkele naamruimte en eenvoudige opmaak, vertoont
+een Wiki vele karakteristieken van WabiSabi.
=20
 PhpWiki wordt uitgebracht onder de GNU Algemene Openbare Licentie ([GNU =
General Public License | http://www.gnu.org/copyleft/gpl.html]).
=20
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/pgsrc/PaginasToevoegen ./locale/nl/pgsrc/PaginasToevoegen
--- ../wiki-29mei/locale/nl/pgsrc/PaginasToevoegen	Sat Mar  3 20:43:14 20=
01
+++ ./locale/nl/pgsrc/PaginasToevoegen	Wed May 23 17:13:50 2001
@@ -1,6 +1,6 @@
 Voor het toevoegen van een nieuwe pagina aan Wiki, hoef je alleen maar e=
en
 zinvolle titel de bedenken, de woorden met een hoofdletter te beginnen, =
en
-ZeAanElkaarTeSchrijvenZoalsDit.  Wiki herkent dit automagies als een
+ZeAanElkaarTeSchrijvenZoalsDit.  Wiki herkent dit automagisch als een
 koppeling.
=20
 Daarna kun je verder gaan en HetVraagtekenAanKlikken vlak na je nieuwe
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/pgsrc/PhpWiki ./locale/nl/pgsrc/PhpWiki
--- ../wiki-29mei/locale/nl/pgsrc/PhpWiki	Thu Jan  1 01:00:00 1970
+++ ./locale/nl/pgsrc/PhpWiki	Wed May 23 16:17:30 2001
@@ -0,0 +1,5 @@
+Je gebruikt PhpWiki nu, op dit moment.  Ongelooflijk, nietwaar?
+
+Bezoek onze thuispagina op http://phpwiki.sourceforge.net/ en zie PhpWik=
i
+in actie op http://phpwiki.sourceforge.net/phpwiki/.
+
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/pgsrc/PhpWikiBeheer ./locale/nl/pgsrc/PhpWikiBeheer
--- ../wiki-29mei/locale/nl/pgsrc/PhpWikiBeheer	Thu Jan  1 01:00:00 1970
+++ ./locale/nl/pgsrc/PhpWikiBeheer	Wed May 23 16:45:44 2001
@@ -0,0 +1,114 @@
+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=3DPhpWikiBeheer;
+  flags=3DPAGE_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=3Dlogin]__
+
+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=3Dzip]__ bevat enkel de meest recent=
e versies van elke pagina, terwijl deze __[ZIP Stort | phpwiki:?action=3D=
zip&include=3Dall]__ 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=3Ddumpserial&directory=3D(/tmp/wikist=
ort) ]
+
+De meest recente versie van elke pagina wordt naar de directory geschrev=
en,
+een pagina be bestand.  Je server moet schrijfpermissies naar die direct=
ory
+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 (cli=
ent)
+machine.
+
+[ Upload | phpwiki:?action=3Dupload&file=3D50()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=3Dloadfile&source=3D50(/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 th=
e
+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.
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/pgsrc/ThuisPagina ./locale/nl/pgsrc/ThuisPagina
--- ../wiki-29mei/locale/nl/pgsrc/ThuisPagina	Thu Jan  1 01:00:00 1970
+++ ./locale/nl/pgsrc/ThuisPagina	Wed May 23 16:00:45 2001
@@ -0,0 +1,7 @@
+* 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 verande=
ringen.
+* Ontdek welke pagina's het MeestBezocht worden.
+* Lees de UitgaveNoten.
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/pgsrc/ToverPhpWikiURLs ./locale/nl/pgsrc/ToverPhpWikiURLs
--- ../wiki-29mei/locale/nl/pgsrc/ToverPhpWikiURLs	Thu Jan  1 01:00:00 19=
70
+++ ./locale/nl/pgsrc/ToverPhpWikiURLs	Wed May 23 17:07:08 2001
@@ -0,0 +1,91 @@
+Mime-Version: 1.0 (Produced by PhpWiki 1.1.x)
+Content-Type: application/x-phpwiki;
+  pagename=3DToverPhpWikiURLs;
+  flags=3DPAGE_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=3D''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=3Dedit ]
+zal een koppeling maken die je direct naar het wijzigen van de ZandBak b=
rengt,
+aldus:
+[ Verander de ZandBak | phpwiki:ZandBak?action=3Dedit ].
+
+Andere mogelijkheden:
+* [ Diff de ZandBak | phpwiki:ZandBak?action=3Ddiff ],
+* [ Sluit de ThuisPagina af | phpwiki:ThuisPagina?action=3Dlock ],
+* [ Krijg een Volledige Zip Stort | phpwiki:?action=3Dzip&include=3Dall =
],
+* [ Paginatitels die 'wiki' bevatten | phpwiki:?action=3Dsearch&searchte=
rm=3Dwiki ],
+
+!! Tover Formulieren schrijven in Wiki Pagina's
+
+Als een van de ''vraag-argen'' een waarde heeft als
+  ''arg''__=3D__''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 invoervel=
d,
+terwijld ''opt-verstek-waarde'' de verstekwaarde voor de invoer specific=
eert.
+Als ''tekst'' wordt opgegeven in de koppelijng, dan wordt een submit-kno=
p
+met dat etiket opgenomen in het formulier, zoniet wordt de submit knop
+achterwege gelaten.
+
+Voorbeelden:
+
+  [[ Volledige Zoektocht | phpwiki:?action=3Dsearch&searchtype=3Dfull&se=
archterm=3D() ]=20
+geeft
+[ Volledige Zoektocht | phpwiki:?action=3Dsearch&searchtype=3Dfull&searc=
hterm=3D() ]=20
+
+Terwijl
+  [[ phpwiki:?action=3Dsearch&searchterm=3D12() ]
+oplevert
+[ phpwiki:?action=3Dsearch&searchterm=3D12() ]
+
+Andere voorbeelden:
+[ Blader Pagina | phpwiki:?action=3Dbrowse&pagename=3D() ]
+
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/pgsrc/UitgaveNoten ./locale/nl/pgsrc/UitgaveNoten
--- ../wiki-29mei/locale/nl/pgsrc/UitgaveNoten	Sun Oct 22 21:52:02 2000
+++ ./locale/nl/pgsrc/UitgaveNoten	Wed May 23 16:01:15 2001
@@ -1,3 +1 @@
-Zie ook ReleaseNotes.
-
-
+Zie ReleaseNotes.
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/pgsrc/VoorPagina ./locale/nl/pgsrc/VoorPagina
--- ../wiki-29mei/locale/nl/pgsrc/VoorPagina	Thu Oct 19 23:36:50 2000
+++ ./locale/nl/pgsrc/VoorPagina	Thu Jan  1 01:00:00 1970
@@ -1,9 +0,0 @@
-*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 verander=
ingen.
-*Ontdek welke pagina's het MeestBezocht worden.
-*Lees de UitgaveNoten
-
-
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/pgsrc/WabiSabi ./locale/nl/pgsrc/WabiSabi
--- ../wiki-29mei/locale/nl/pgsrc/WabiSabi	Sat Apr  7 19:13:28 2001
+++ ./locale/nl/pgsrc/WabiSabi	Wed May 23 17:13:35 2001
@@ -1,4 +1,4 @@
-Omdat wabi-sabi een alomvattend japans wereldbeeld of estheties systeem
+Omdat wabi-sabi een alomvattend japans wereldbeeld of esthetisch systeem
 vertegenwoordigt, is het lastig exact te beschrijven in westerse begripp=
en.
 Volgens Leonard Koren is wabi-sabi het meest pakkende en karakteristieke
 kenmerk van wat wij beschouwen als traditionele japanse schoonheid en he=
t
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/pgsrc/ZoekPagina ./locale/nl/pgsrc/ZoekPagina
--- ../wiki-29mei/locale/nl/pgsrc/ZoekPagina	Sat Apr  7 19:13:28 2001
+++ ./locale/nl/pgsrc/ZoekPagina	Wed May 23 17:13:18 2001
@@ -1,7 +1,7 @@
 Hier zijn een paar goede plaatsen om te beginnen met  bladeren.
=20
 * HoeWikiTeGebruiken maakt snel wegwijs in Wiki.
-* RecenteVeranderingen worden automaties bijgehouden.
+* RecenteVeranderingen worden automatisch bijgehouden.
 * MeerOverTechnieken van het bladeren en veranderen van deze server.
=20
=20
@@ -13,6 +13,10 @@
 Gebruik deze voor het doorzoeken van alle tekst.  Dit kan een paar secon=
den duren.  De resultaten tonen alle regels op een pagina die een oplossi=
ng bevatten.
=20
 %%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.
=20
=20
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/templates/browse.html ./locale/nl/templates/browse.html
--- ../wiki-29mei/locale/nl/templates/browse.html	Sat Apr  7 19:13:28 200=
1
+++ ./locale/nl/templates/browse.html	Tue May 29 11:05:24 2001
@@ -10,20 +10,20 @@
 <title>###SPLIT_PAGE###</title>
 <link rel=3D"stylesheet" title=3D"phpwiki" href=3D"###CSS_URL###" type=3D=
"text/css">
 </head>
-
 <body bgcolor=3Divory text=3Dblack alink=3Dred link=3Ddarkblue vlink=3Dd=
arkmagenta>
-<h1><a class=3D"wikilink" href=3D"###BROWSE###VoorPagina"><img src=3D"##=
#LOGO###" border=3D0 alt=3D"[phpwiki]" align=3Dmiddle width=3D50 height=3D=
50></a>
+<h1><a class=3D"wikilink" href=3D"###BROWSE###ThuisPagina"><img src=3D"#=
##LOGO###" border=3D0 alt=3D"[phpwiki]" align=3Dmiddle width=3D50 height=3D=
50></a>
 <a class=3D'wikiaction'
   href=3D"###ACTION###search&amp;searchtype=3Dfull&amp;searchterm=3D###P=
AGEURL###"
 ><span class=3D'wikiword'>###PAGE###</span></a></h1>
 ###IF:!ANONYMOUS###
-<p>You are logged in as <em>###USERID###</em>.
+<p>Je bent ingelogd als <em>###USERID###</em>.
 [<a class=3D"wikiaction" href=3D"###ACTION###logout">Log Out</a>]</p>
 ###IF:ADMIN###
-###IF LOCK###[<a class=3D"wikiadmin" href=3D"###ACTION###unlock">Unlock =
page</a>]
-###IF !LOCK###[<a class=3D"wikiadmin" href=3D"###ACTION###lock">Lock pag=
e</a>]
+###IF LOCK###[<a class=3D"wikiadmin" href=3D"###ACTION###unlock">Sluit
+pagina af</a>]
+###IF !LOCK###[<a class=3D"wikiadmin" href=3D"###ACTION###lock">Open pag=
ina</a>]
 - -=20
-[<a class=3D"wikiadmin" href=3D"###ACTION###remove">Remove page</a>]
+[<a class=3D"wikiadmin" href=3D"###ACTION###remove">Verwijder pagina</a>=
]
 ###ENDIF:ADMIN###
 <hr noshade>
 ###ENDIF:!ANONYMOUS###
@@ -38,7 +38,7 @@
 ###IF LOCK###Page locked
 ###IF !LOCK###<a class=3D"wikiaction" href=3D"###ACTION###edit">Verander=
Tekst</a>
 ###ENDIF:!ADMIN###
-van deze pagina (laatste verandering ###LASTMODIFIED###
+van deze pagina (meest recente verandering ###LASTMODIFIED###
 [<a class=3D"wikiaction" href=3D"###ACTION###info">info</a>]
 [<a class=3D"wikiaction" href=3D"###ACTION###diff">diff</a>])
 <br>
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/templates/editpage.html ./locale/nl/templates/editpage.ht=
ml
--- ../wiki-29mei/locale/nl/templates/editpage.html	Sat Apr  7 19:13:28 2=
001
+++ ./locale/nl/templates/editpage.html	Wed May 23 17:03:42 2001
@@ -13,7 +13,7 @@
=20
 <body bgcolor=3Divory text=3Dblack alink=3Dred link=3Ddarkblue vlink=3Dd=
arkmagenta>
 <form class=3D"wikiaction" method=3D"POST" action=3D"###BROWSE_PAGE###">
-<h1><a class=3D"wikilink" href=3D"###BROWSE###VoorPagina"><img src=3D"##=
#LOGO###" border=3D0 alt=3D"[phpwiki]" width=3D50 height=3D50></a>
+<h1><a class=3D"wikilink" href=3D"###BROWSE###ThuisPagina"><img src=3D"#=
##LOGO###" border=3D0 alt=3D"[phpwiki]" width=3D50 height=3D50></a>
 Verander <span=3D"wikiword">###PAGE###</span>
 <input type=3D"submit" value=3D" Bewaar "></h1>
=20
@@ -23,13 +23,15 @@
           wrap=3D"virtual">###CONTENT###</textarea>
 <br>
 ###IF:MINOR_EDIT_CHECKBOX###
-  ###MINOR_EDIT_CHECKBOX### This is a minor change, don't archive old ve=
rsion.
+  ###MINOR_EDIT_CHECKBOX### Dit is een kleine verandering, archiveer oud=
e versie niet.
   <br>
 ###ENDIF:MINOR_EDIT_CHECKBOX###
 <input type=3D"checkbox" name=3D"convert" value=3D"tabs" >
 Ik kan geen tabs tiepen.=20
 <a class=3D"wikilink" href=3D"###BROWSE###VertaalSpatiesNaarTabs"><span =
class=3D"wikiword">VertaalSpatiesNaarTabs</span></a>
 voor mij als ik bewaar.
+<p>Je kunt de afmetingen van het invoerveld veranderen.
+Zie <a class=3D"wikilink" href=3D"###BROWSE###GebruikersVoorkeuren"><spa=
n class=3D"wikiword">GebruikersVoorkeuren</span></a>.</p>
 <p><a class=3D"wikilink" href=3D"###BROWSE###GoedeStijl"><span class=3D"=
wikiword">GoedeStijl</span></a> tips for
 veranderen.
=20
@@ -41,7 +43,7 @@
 <br><b>Lijsten:</b> * voor punt lijsten, # voor genummerde lijsten, ''; =
Term : Definitie'' voor definitie lijsten.
 <br><b>Verwijzingen:</b> KapitaliseerEnSchrijfAanElkaar of gebruik vierk=
ante 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>Vermijden van koppelingen:</b> Vermijdt kopplingen met "!": !Kopp=
elNiet, noem koppelingen met [[naam | URL].
 <br><b>Allerlei:</b>"!", "!!", "!!!" maak koppen,
 "%%%" maak regelbreuk, "- - - -" maak horizontale lijn
 <br>meer op
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/nl/templates/message.html ./locale/nl/templates/message.html
--- ../wiki-29mei/locale/nl/templates/message.html	Sat Apr  7 19:13:28 20=
01
+++ ./locale/nl/templates/message.html	Wed May 23 15:55:31 2001
@@ -12,7 +12,7 @@
 </head>
=20
 <body bgcolor=3Dlinen text=3Dblack alink=3Dred link=3Ddarkblue vlink=3Dd=
arkmagenta>
-<h1><a class=3D"wikilink" href=3D"###BROWSE###VoorPagina"><img src=3D"##=
#LOGO###" border=3D0 alt=3D"[phpwiki]" width=3D50 height=3D50></a>
+<h1><a class=3D"wikilink" href=3D"###BROWSE###ThuisPagina"><img src=3D"#=
##LOGO###" border=3D0 alt=3D"[phpwiki]" width=3D50 height=3D50></a>
 ###PAGE###</h1>
=20
 ###CONTENT###
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/po/nl.po ./locale/po/nl.po
--- ../wiki-29mei/locale/po/nl.po	Mon May 21 19:25:37 2001
+++ ./locale/po/nl.po	Tue May 29 11:36:37 2001
@@ -10,223 +10,250 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: phpwiki 1.1.7\n"
-"POT-Creation-Date: 2001-05-21 09:36-0700\n"
+"POT-Creation-Date: 2001-05-29 11:36+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3D8859-1\n"
+"Content-Type: text/plain; charset=3Diso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Date: 1998-05-26 11:26:28+0200\n"
 "From:  <ja...@gn...>\n"
=20
-#: ../lib/diff.php:714
+#: lib/diff.php:714
 #, c-format
 msgid "WikiDiff::apply: line count mismatch: %s !=3D %s"
 msgstr ""
=20
-#: ../lib/diff.php:774
+#: lib/diff.php:774
 msgid "WikiDiff::_check: failed"
 msgstr ""
=20
-#: ../lib/diff.php:784
+#: lib/diff.php:784
 msgid "WikiDiff::_check: edit sequence is non-optimal"
 msgstr ""
=20
-#: ../lib/diff.php:788
+#: lib/diff.php:788
 #, c-format
 msgid "WikiDiff Okay: LCS =3D %s"
 msgstr ""
=20
-#: ../lib/diff.php:1037 ../lib/loadsave.php:173
+#: lib/diff.php:1037 lib/loadsave.php:174
 #, c-format
 msgid "version %s"
 msgstr "versie %s"
=20
-#: ../lib/diff.php:1039
+#: lib/diff.php:1039
 #, c-format
 msgid "last modified on %s"
-msgstr "laatste verandering op %s"
+msgstr "meest recente verandering op %s"
=20
-#: ../lib/diff.php:1042
+#: lib/diff.php:1042
 #, c-format
 msgid "by %s"
 msgstr "door %s"
=20
-#: ../lib/diff.php:1045
+#: lib/diff.php:1045
 msgid "None"
 msgstr "Geen"
=20
-#: ../lib/diff.php:1056
+#: lib/diff.php:1056
 msgid "Current page:"
 msgstr "Huidige pagina:"
=20
-#: ../lib/diff.php:1057
+#: lib/diff.php:1057
 msgid "Archived page:"
 msgstr "Gearchiveerde pagina:"
=20
-#: ../lib/diff.php:1065
+#: lib/diff.php:1065
 msgid "Versions are identical"
 msgstr "Versies zijn identiek"
=20
-#: ../lib/diff.php:1074
+#: lib/diff.php:1074
 #, c-format
 msgid "Diff of %s."
 msgstr "Diff van %s."
=20
-#: ../lib/display.php:15 ../lib/editpage.php:46
+#: lib/display.php:15 lib/editpage.php:46
 #, c-format
 msgid "Describe %s here."
 msgstr "Beschrijf %s hier."
=20
-#: ../lib/editpage.php:10
+#: lib/editpage.php:10
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie van %s"
=20
-#: ../lib/editpage.php:21 ../lib/savepage.php:52
+#: lib/editpage.php:21 lib/savepage.php:52
 msgid "This page has been locked by the administrator and cannot be edit=
ed."
 msgstr ""
 "Deze pagina is afgesloten door de beheerder en kan niet veranderd worde=
n."
=20
-#: ../lib/editpage.php:23 ../lib/savepage.php:32 ../lib/savepage.php:53
+#: lib/editpage.php:23 lib/savepage.php:32 lib/savepage.php:53
 msgid "Sorry for the inconvenience."
 msgstr "Excuses voor het ongemak."
=20
-#: ../lib/editpage.php:26 ../lib/savepage.php:55
+#: lib/editpage.php:26 lib/savepage.php:55
 #, c-format
 msgid "Problem while editing %s"
 msgstr "Probleem tijdens veranderen %s"
=20
-#: ../lib/fullsearch.php:11 ../lib/search.php:11
+#: lib/fullsearch.php:11 lib/search.php:11
 #, c-format
 msgid "Searching for \"%s\" ....."
 msgstr "Zoeken naar \"%s\" ..."
=20
-#: ../lib/fullsearch.php:43
+#: lib/fullsearch.php:43
 #, c-format
 msgid "%d matches found in %d pages."
 msgstr "%d keer gevonden in %d pagina's."
=20
-#: ../lib/fullsearch.php:47
+#: lib/fullsearch.php:47
 msgid "Full Text Search Results"
 msgstr "Volledige tekst zoek resultaten"
=20
-#: ../lib/loadsave.php:15
+#: lib/loadsave.php:15
 msgid "Complete."
-msgstr ""
+msgstr "Klaar."
+
+#: lib/loadsave.php:16
+msgid "Return to "
+msgstr "Terug naar "
=20
-#: ../lib/loadsave.php:99 ../lib/main.php:158
+#: lib/loadsave.php:100 lib/main.php:158
 msgid "You must specify a directory to dump to"
-msgstr ""
+msgstr "Je moet een directory specificeren om in te storten"
=20
-#: ../lib/loadsave.php:175
+#: lib/loadsave.php:176
 #, c-format
 msgid "from %s"
-msgstr ""
+msgstr "van %s"
=20
-#: ../lib/loadsave.php:185
+#: lib/loadsave.php:186
 #, c-format
 msgid "is identical to current version %d"
-msgstr ""
+msgstr "is gelijk aaan huidige versie %d"
=20
-#: ../lib/loadsave.php:190
+#: lib/loadsave.php:191
 msgid "- skipped"
-msgstr ""
+msgstr "- overgeslagen"
=20
-#: ../lib/loadsave.php:211
+#: lib/loadsave.php:212
 msgid "- saved"
-msgstr ""
+msgstr "- bewaard"
=20
-#: ../lib/loadsave.php:213
-#, fuzzy, c-format
+#: lib/loadsave.php:214
+#, c-format
 msgid "as version %d"
-msgstr "versie %s"
+msgstr "als versie %d"
+
+#: lib/loadsave.php:264
+msgid "MIME file"
+msgstr "MIME bestand"
+
+#: lib/loadsave.php:269
+msgid "Serialized file"
+msgstr "Geserialiseerd bestand"
+
+#: lib/loadsave.php:276
+msgid "plain file"
+msgstr "plat bestand"
=20
-#: ../lib/main.php:41 ../lib/main.php:99 ../lib/main.php:101
+#: lib/loadsave.php:364 lib/loadsave.php:379 lib/loadsave.php:410
+#: lib/stdlib.php:595 lib/stdlib.php:664
+msgid "RecentChanges"
+msgstr "RecenteVeranderingen"
+
+#: lib/loadsave.php:374
+msgid "The PhpWiki programming team"
+msgstr "Het PhpWiki programmeerteam"
+
+#: lib/loadsave.php:376
+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 "VoorPagina"
+msgstr "ThuisPagina"
=20
-#: ../lib/main.php:112
+#: lib/main.php:112
 msgid "Action $action is disabled in this wiki."
-msgstr ""
+msgstr "Actie $action is niet beschikbaar in deze wiki."
=20
-#: ../lib/main.php:166
+#: lib/main.php:166
 msgid "You must specify a source to read from"
-msgstr ""
+msgstr "Je moet een bron specificeren om van te lezen."
=20
-#: ../lib/msql.php:38 ../lib/mysql.php:47
+#: lib/msql.php:38 lib/mysql.php:47
 msgid "Cannot establish connection to database, giving up."
 msgstr "Kan verbinding naar data base niet tot stand brengen, geef op."
=20
-#: ../lib/msql.php:40 ../lib/msql.php:47
+#: lib/msql.php:40 lib/msql.php:47
 #, c-format
 msgid "Error message: %s"
 msgstr "Foutboodschap: %s"
=20
-#: ../lib/msql.php:44 ../lib/mysql.php:53
+#: lib/msql.php:44 lib/mysql.php:53
 #, c-format
 msgid "Cannot open database %s, giving up."
 msgstr "Kan data base %s niet openen, geef op."
=20
-#: ../lib/msql.php:220 ../lib/msql.php:296
+#: lib/msql.php:220 lib/msql.php:296
 #, c-format
 msgid "Insert/update failed: %s"
 msgstr "Insert/update gefaald: %s"
=20
-#: ../lib/msql.php:231 ../lib/msql.php:306
+#: lib/msql.php:231 lib/msql.php:306
 #, c-format
 msgid "Delete on %s failed: %s"
 msgstr "Delete op %s gefaald: %s"
=20
-#: ../lib/msql.php:247 ../lib/msql.php:322
+#: lib/msql.php:247 lib/msql.php:322
 #, c-format
 msgid "Insert into %s failed: %s"
 msgstr "Insert in %s gefaald: %s"
=20
-#: ../lib/mysql.php:49 ../lib/mysql.php:55 ../lib/mysql.php:134
-#: ../lib/mysql.php:174
+#: lib/mysql.php:49 lib/mysql.php:55 lib/mysql.php:134 lib/mysql.php:174
 #, c-format
 msgid "MySQL error: %s"
 msgstr "MySQL fout: %s"
=20
-#: ../lib/mysql.php:132
+#: lib/mysql.php:132
 #, c-format
 msgid "Error writing page '%s'"
 msgstr "Fout bij schrijven pagina `%s'"
=20
-#: ../lib/mysql.php:172
+#: lib/mysql.php:172
 #, c-format
 msgid "Cannot delete '%s' from table '%s'"
 msgstr "Kan '%s' niet verwijderen uit tabel '%s'"
=20
-#: ../lib/pageinfo.php:14
+#: lib/pageinfo.php:14
 #, c-format
 msgid "Page name '%s' is not in the database"
 msgstr "Pagina naam `%s' staat niet in de data base"
=20
-#: ../lib/pageinfo.php:48
-#, fuzzy
+#: lib/pageinfo.php:48
 msgid "Show the page source"
-msgstr "Toon de bron tekst en de koppelingen van de pagina"
+msgstr "Toon de pagina bron tekst"
=20
-#: ../lib/pageinfo.php:54
+#: lib/pageinfo.php:54
 msgid "Current version"
 msgstr "Actuele versie:"
=20
-#: ../lib/pageinfo.php:57
+#: lib/pageinfo.php:57
 msgid "Archived version"
 msgstr "Gearchiveerde versie:"
=20
-#: ../lib/pageinfo.php:61
+#: lib/pageinfo.php:61
 msgid "PageInfo"
 msgstr "PaginaInfo"
=20
-#: ../lib/prepend.php:59
+#: lib/prepend.php:59
 msgid "WikiFatalError"
 msgstr "WikiFataleFout"
=20
-#: ../lib/savepage.php:18
+#: lib/savepage.php:18
 msgid ""
 "PhpWiki is unable to save your changes, because another user edited and=
 "
 "saved the page while you were editing the page too. If saving proceeded=
 now "
@@ -237,25 +264,25 @@
 "was.  Als bewaren nu doorgang zou vinden, zouden de veranderingen van\n=
"
 "de vorige auteur verloren gaan."
=20
-#: ../lib/savepage.php:20
+#: lib/savepage.php:20
 msgid "In order to recover from this situation follow these steps:"
 msgstr "Om uit deze benarde situatie te geraken, volg je deze stappen:"
=20
-#: ../lib/savepage.php:22
+#: lib/savepage.php:22
 msgid "Use your browser's <b>Back</b> button to go back to the edit page=
."
 msgstr ""
 "Gebruik de <b>Terug</b> knop van je bladeraar om terug te gaan naar de =
"
 "verander tekst pagina."
=20
-#: ../lib/savepage.php:24
+#: lib/savepage.php:24
 msgid ""
 "Copy your changes to the clipboard or to another temporary place (e.g. =
text "
 "editor)."
 msgstr ""
-"Kopi=EBer je veranderingen naar het klipbord of een andere tijdelijke p=
laats "
+"Kopier je veranderingen naar het klipbord of een andere tijdelijke plaa=
ts "
 "(bijv. een tekst editor)."
=20
-#: ../lib/savepage.php:26
+#: lib/savepage.php:26
 msgid ""
 "<b>Reload</b> the page. You should now see the most current version of =
the "
 "page. Your changes are no longer there."
@@ -263,7 +290,7 @@
 "<b>Reload</b> de pagina.  Je zou nu de meest recente versie van de pagi=
na "
 "moeten zien.  Jouw veranderingen staan er nu niet meer."
=20
-#: ../lib/savepage.php:28
+#: lib/savepage.php:28
 msgid ""
 "Make changes to the file again. Paste your additions from the clipboard=
 (or "
 "text editor)."
@@ -271,137 +298,119 @@
 "Breng je veranderingen aan de pagina opnieuw aan.  Plak je toevoeginen =
van "
 "het klipbord (of tekst editor)."
=20
-#: ../lib/savepage.php:30
+#: lib/savepage.php:30
 msgid "Press <b>Save</b> again."
 msgstr "Druk opnieuw op <b>Bewaar</b>."
=20
-#: ../lib/savepage.php:36
+#: lib/savepage.php:36
 #, c-format
 msgid "Problem while updating %s"
 msgstr "Probleem tijdens veranderen van %s"
=20
-#: ../lib/savepage.php:78
+#: lib/savepage.php:78
 #, c-format
 msgid "Thank you for editing %s."
 msgstr "Bedankt voor het veranderen van %s."
=20
-#: ../lib/savepage.php:97
+#: lib/savepage.php:97
 msgid "Your careful attention to detail is much appreciated."
 msgstr "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd."
=20
-#: ../lib/search.php:27
+#: lib/search.php:27
 #, c-format
 msgid "%d pages match your query."
-msgstr ""
+msgstr "%d pagina's voldoen aan je vraag."
=20
-#: ../lib/search.php:30
-#, fuzzy
+#: lib/search.php:30
 msgid "Title Search Results"
-msgstr "Volledige tekst zoek resultaten"
+msgstr "Titel zoek resultaten"
=20
-#: ../lib/stdlib.php:427
+#: lib/stdlib.php:427
 #, c-format
 msgid "%d best incoming links:"
 msgstr "%d beste inkomende koppelingen:"
=20
-#: ../lib/stdlib.php:437
+#: lib/stdlib.php:437
 #, c-format
 msgid "%d best outgoing links:"
 msgstr "%d beste uitgaande koppelingen:"
=20
-#: ../lib/stdlib.php:448
+#: lib/stdlib.php:448
 #, c-format
 msgid "%d most popular nearby:"
 msgstr "%d meest gevraagde in de buurt:"
=20
-#: ../lib/stdlib.php:595 ../lib/stdlib.php:664
-msgid "RecentChanges"
-msgstr "RecenteVeranderingen"
-
-#: ../lib/stdlib.php:611
+#: lib/stdlib.php:611
 msgid "The most recently changed pages are listed below."
 msgstr "De meest recent veranderde pagina's staan hieronder:"
=20
-#: ../lib/stdlib.php:613
+#: lib/stdlib.php:613
 msgid "(first day for this Wiki)"
 msgstr "(eerste dag voor deze Wiki)"
=20
-#: ../lib/stdlib.php:615
+#: lib/stdlib.php:615
 msgid "Quick title search:"
 msgstr "Zoek snel een pagina op:"
=20
-#: ../lib/transform.php:114
-#, fuzzy
+#: lib/stdlib.php:645
+msgid "(new)"
+msgstr "(nieuw)"
+
+#: lib/transform.php:114
 msgid "Lists nested too deep in SetHTMLOutputMode"
-msgstr "Stack grenzen overschreden in SetHTMLOutputMode"
+msgstr "Lijsten nesten te diep in SetHTMLOutputMode"
=20
-#: ../lib/transform.php:461 ../lib/transform.php:473
+#: lib/transform.php:461 lib/transform.php:473
 msgid "Search"
 msgstr "Zoek"
=20
-#: ../lib/userauth.php:158
+#: lib/userauth.php:82
+msgid "You must be logged in as an administrator to $action."
+msgstr "Je moet ingelogd zijn als beheerder om te $action."
+
+#: lib/userauth.php:147
+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 k=
an "
+"loggen."
+
+#: lib/userauth.php:158
 msgid "You entered an invalid login or password."
 msgstr "Je hebt een ongeldige gebruikersnaam of wachtwoord ingevoerd."
=20
-#: ../lib/ziplib.php:657
+#: lib/ziplib.php:657
 #, c-format
 msgid "[%d] See [%s]"
-msgstr ""
+msgstr "[%d] Zie [%s]"
=20
-#: ../lib/ziplib.php:665
+#: lib/ziplib.php:665
 msgid "!References"
-msgstr ""
+msgstr "!Referenties"
=20
-#: ../admin/removepage.php:6
+#: admin/removepage.php:6
 msgid "Function not yet implemented."
-msgstr "Functie nog niet ge=EFmplementeerd."
+msgstr "Functie nog niet gemplementeerd."
=20
-#: ../admin/removepage.php:10
+#: admin/removepage.php:10
 #, c-format
 msgid "You are about to remove '%s' permanently!"
 msgstr "Je staat op het punt '%s' voorgoed te verwijderen!"
=20
-#: ../admin/removepage.php:13
-#, fuzzy, c-format
+#: admin/removepage.php:13
+#, c-format
 msgid "Click <a href=3D\"%s\">here</a> to remove the page now."
-msgstr "Klik %shier%s om de pagina nu te verwijderen."
+msgstr "Klik <a href=3D\"%s\">hier</a> om de pagina nu te verwijderen."
=20
-#: ../admin/removepage.php:17
+#: admin/removepage.php:17
 msgid "Otherwise press the \"Back\" button of your browser."
 msgstr "Druk anders op de \"Terug\" knop van je bladeraar."
=20
-#: ../admin/removepage.php:22
+#: admin/removepage.php:22
 #, c-format
 msgid "Removed page '%s' succesfully."
 msgstr "Pagina '%s' verwijderd."
=20
-#: ../admin/removepage.php:26
+#: admin/removepage.php:26
 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"
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/locale/po/phpwiki.pot ./locale/po/phpwiki.pot
--- ../wiki-29mei/locale/po/phpwiki.pot	Mon May 21 19:26:11 2001
+++ ./locale/po/phpwiki.pot	Tue May 29 11:36:36 2001
@@ -6,353 +6,390 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-05-21 09:36-0700\n"
+"POT-Creation-Date: 2001-05-29 11:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=3DCHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8-bit\n"
=20
-#: ../lib/diff.php:714
+#: lib/diff.php:714
 #, c-format
 msgid "WikiDiff::apply: line count mismatch: %s !=3D %s"
 msgstr ""
=20
-#: ../lib/diff.php:774
+#: lib/diff.php:774
 msgid "WikiDiff::_check: failed"
 msgstr ""
=20
-#: ../lib/diff.php:784
+#: lib/diff.php:784
 msgid "WikiDiff::_check: edit sequence is non-optimal"
 msgstr ""
=20
-#: ../lib/diff.php:788
+#: lib/diff.php:788
 #, c-format
 msgid "WikiDiff Okay: LCS =3D %s"
 msgstr ""
=20
-#: ../lib/diff.php:1037 ../lib/loadsave.php:173
+#: lib/diff.php:1037 lib/loadsave.php:174
 #, c-format
 msgid "version %s"
 msgstr ""
=20
-#: ../lib/diff.php:1039
+#: lib/diff.php:1039
 #, c-format
 msgid "last modified on %s"
 msgstr ""
=20
-#: ../lib/diff.php:1042
+#: lib/diff.php:1042
 #, c-format
 msgid "by %s"
 msgstr ""
=20
-#: ../lib/diff.php:1045
+#: lib/diff.php:1045
 msgid "None"
 msgstr ""
=20
-#: ../lib/diff.php:1056
+#: lib/diff.php:1056
 msgid "Current page:"
 msgstr ""
=20
-#: ../lib/diff.php:1057
+#: lib/diff.php:1057
 msgid "Archived page:"
 msgstr ""
=20
-#: ../lib/diff.php:1065
+#: lib/diff.php:1065
 msgid "Versions are identical"
 msgstr ""
=20
-#: ../lib/diff.php:1074
+#: lib/diff.php:1074
 #, c-format
 msgid "Diff of %s."
 msgstr ""
=20
-#: ../lib/display.php:15 ../lib/editpage.php:46
+#: lib/display.php:15 lib/editpage.php:46
 #, c-format
 msgid "Describe %s here."
 msgstr ""
=20
-#: ../lib/editpage.php:10
+#: lib/editpage.php:10
 #, c-format
 msgid "Copy of %s"
 msgstr ""
=20
-#: ../lib/editpage.php:21 ../lib/savepage.php:52
+#: lib/editpage.php:21 lib/savepage.php:52
 msgid "This page has been locked by the administrator and cannot be edit=
ed."
 msgstr ""
=20
-#: ../lib/editpage.php:23 ../lib/savepage.php:32 ../lib/savepage.php:53
+#: lib/editpage.php:23 lib/savepage.php:32 lib/savepage.php:53
 msgid "Sorry for the inconvenience."
 msgstr ""
=20
-#: ../lib/editpage.php:26 ../lib/savepage.php:55
+#: lib/editpage.php:26 lib/savepage.php:55
 #, c-format
 msgid "Problem while editing %s"
 msgstr ""
=20
-#: ../lib/fullsearch.php:11 ../lib/search.php:11
+#: lib/fullsearch.php:11 lib/search.php:11
 #, c-format
 msgid "Searching for \"%s\" ....."
 msgstr ""
=20
-#: ../lib/fullsearch.php:43
+#: lib/fullsearch.php:43
 #, c-format
 msgid "%d matches found in %d pages."
 msgstr ""
=20
-#: ../lib/fullsearch.php:47
+#: lib/fullsearch.php:47
 msgid "Full Text Search Results"
 msgstr ""
=20
-#: ../lib/loadsave.php:15
+#: lib/loadsave.php:15
 msgid "Complete."
 msgstr ""
=20
-#: ../lib/loadsave.php:99 ../lib/main.php:158
+#: lib/loadsave.php:16
+msgid "Return to "
+msgstr ""
+
+#: lib/loadsave.php:100 lib/main.php:158
 msgid "You must specify a directory to dump to"
 msgstr ""
=20
-#: ../lib/loadsave.php:175
+#: lib/loadsave.php:176
 #, c-format
 msgid "from %s"
 msgstr ""
=20
-#: ../lib/loadsave.php:185
+#: lib/loadsave.php:186
 #, c-format
 msgid "is identical to current version %d"
 msgstr ""
=20
-#: ../lib/loadsave.php:190
+#: lib/loadsave.php:191
 msgid "- skipped"
 msgstr ""
=20
-#: ../lib/loadsave.php:211
+#: lib/loadsave.php:212
 msgid "- saved"
 msgstr ""
=20
-#: ../lib/loadsave.php:213
+#: lib/loadsave.php:214
 #, c-format
 msgid "as version %d"
 msgstr ""
=20
-#: ../lib/main.php:41 ../lib/main.php:99 ../lib/main.php:101
+#: lib/loadsave.php:264
+msgid "MIME file"
+msgstr ""
+
+#: lib/loadsave.php:269
+msgid "Serialized file"
+msgstr ""
+
+#: lib/loadsave.php:276
+msgid "plain file"
+msgstr ""
+
+#: lib/loadsave.php:364 lib/loadsave.php:379 lib/loadsave.php:410
+#: lib/stdlib.php:595 lib/stdlib.php:664
+msgid "RecentChanges"
+msgstr ""
+
+#: lib/loadsave.php:374
+msgid "The PhpWiki programming team"
+msgstr ""
+
+#: lib/loadsave.php:376
+msgid "Loading up virgin wiki"
+msgstr ""
+
+#: lib/main.php:41 lib/main.php:99 lib/main.php:101
 msgid "HomePage"
 msgstr ""
=20
-#: ../lib/main.php:112
+#: lib/main.php:112
 msgid "Action $action is disabled in this wiki."
 msgstr ""
=20
-#: ../lib/main.php:166
+#: lib/main.php:166
 msgid "You must specify a source to read from"
 msgstr ""
=20
-#: ../lib/msql.php:38 ../lib/mysql.php:47
+#: lib/msql.php:38 lib/mysql.php:47
 msgid "Cannot establish connection to database, giving up."
 msgstr ""
=20
-#: ../lib/msql.php:40 ../lib/msql.php:47
+#: lib/msql.php:40 lib/msql.php:47
 #, c-format
 msgid "Error message: %s"
 msgstr ""
=20
-#: ../lib/msql.php:44 ../lib/mysql.php:53
+#: lib/msql.php:44 lib/mysql.php:53
 #, c-format
 msgid "Cannot open database %s, giving up."
 msgstr ""
=20
-#: ../lib/msql.php:220 ../lib/msql.php:296
+#: lib/msql.php:220 lib/msql.php:296
 #, c-format
 msgid "Insert/update failed: %s"
 msgstr ""
=20
-#: ../lib/msql.php:231 ../lib/msql.php:306
+#: lib/msql.php:231 lib/msql.php:306
 #, c-format
 msgid "Delete on %s failed: %s"
 msgstr ""
=20
-#: ../lib/msql.php:247 ../lib/msql.php:322
+#: lib/msql.php:247 lib/msql.php:322
 #, c-format
 msgid "Insert into %s failed: %s"
 msgstr ""
=20
-#: ../lib/mysql.php:49 ../lib/mysql.php:55 ../lib/mysql.php:134
-#: ../lib/mysql.php:174
+#: lib/mysql.php:49 lib/mysql.php:55 lib/mysql.php:134 lib/mysql.php:174
 #, c-format
 msgid "MySQL error: %s"
 msgstr ""
=20
-#: ../lib/mysql.php:132
+#: lib/mysql.php:132
 #, c-format
 msgid "Error writing page '%s'"
 msgstr ""
=20
-#: ../lib/mysql.php:172
+#: lib/mysql.php:172
 #, c-format
 msgid "Cannot delete '%s' from table '%s'"
 msgstr ""
=20
-#: ../lib/pageinfo.php:14
+#: lib/pageinfo.php:14
 #, c-format
 msgid "Page name '%s' is not in the database"
 msgstr ""
=20
-#: ../lib/pageinfo.php:48
+#: lib/pageinfo.php:48
 msgid "Show the page source"
 msgstr ""
=20
-#: ../lib/pageinfo.php:54
+#: lib/pageinfo.php:54
 msgid "Current version"
 msgstr ""
=20
-#: ../lib/pageinfo.php:57
+#: lib/pageinfo.php:57
 msgid "Archived version"
 msgstr ""
=20
-#: ../lib/pageinfo.php:61
+#: lib/pageinfo.php:61
 msgid "PageInfo"
 msgstr ""
=20
-#: ../lib/prepend.php:59
+#: lib/prepend.php:59
 msgid "WikiFatalError"
 msgstr ""
=20
-#: ../lib/savepage.php:18
+#: lib/savepage.php:18
 msgid ""
 "PhpWiki is unable to save your changes, because another user edited and=
 "
 "saved the page while you were editing the page too. If saving proceeded=
 now "
 "changes from the previous author would be lost."
 msgstr ""
=20
-#: ../lib/savepage.php:20
+#: lib/savepage.php:20
 msgid "In order to recover from this situation follow these steps:"
 msgstr ""
=20
-#: ../lib/savepage.php:22
+#: lib/savepage.php:22
 msgid "Use your browser's <b>Back</b> button to go back to the edit page=
."
 msgstr ""
=20
-#: ../lib/savepage.php:24
+#: lib/savepage.php:24
 msgid ""
 "Copy your changes to the clipboard or to another temporary place (e.g. =
text "
 "editor)."
 msgstr ""
=20
-#: ../lib/savepage.php:26
+#: lib/savepage.php:26
 msgid ""
 "<b>Reload</b> the page. You should now see the most current version of =
the "
 "page. Your changes are no longer there."
 msgstr ""
=20
-#: ../lib/savepage.php:28
+#: lib/savepage.php:28
 msgid ""
 "Make changes to the file again. Paste your additions from the clipboard=
 (or "
 "text editor)."
 msgstr ""
=20
-#: ../lib/savepage.php:30
+#: lib/savepage.php:30
 msgid "Press <b>Save</b> again."
 msgstr ""
=20
-#: ../lib/savepage.php:36
+#: lib/savepage.php:36
 #, c-format
 msgid "Problem while updating %s"
 msgstr ""
=20
-#: ../lib/savepage.php:78
+#: lib/savepage.php:78
 #, c-format
 msgid "Thank you for editing %s."
 msgstr ""
=20
-#: ../lib/savepage.php:97
+#: lib/savepage.php:97
 msgid "Your careful attention to detail is much appreciated."
 msgstr ""
=20
-#: ../lib/search.php:27
+#: lib/search.php:27
 #, c-format
 msgid "%d pages match your query."
 msgstr ""
=20
-#: ../lib/search.php:30
+#: lib/search.php:30
 msgid "Title Search Results"
 msgstr ""
=20
-#: ../lib/stdlib.php:427
+#: lib/stdlib.php:427
 #, c-format
 msgid "%d best incoming links:"
 msgstr ""
=20
-#: ../lib/stdlib.php:437
+#: lib/stdlib.php:437
 #, c-format
 msgid "%d best outgoing links:"
 msgstr ""
=20
-#: ../lib/stdlib.php:448
+#: lib/stdlib.php:448
 #, c-format
 msgid "%d most popular nearby:"
 msgstr ""
=20
-#: ../lib/stdlib.php:595 ../lib/stdlib.php:664
-msgid "RecentChanges"
-msgstr ""
-
-#: ../lib/stdlib.php:611
+#: lib/stdlib.php:611
 msgid "The most recently changed pages are listed below."
 msgstr ""
=20
-#: ../lib/stdlib.php:613
+#: lib/stdlib.php:613
 msgid "(first day for this Wiki)"
 msgstr ""
=20
-#: ../lib/stdlib.php:615
+#: lib/stdlib.php:615
 msgid "Quick title search:"
 msgstr ""
=20
-#: ../lib/transform.php:114
+#: lib/stdlib.php:645
+msgid "(new)"
+msgstr ""
+
+#: lib/transform.php:114
 msgid "Lists nested too deep in SetHTMLOutputMode"
 msgstr ""
=20
-#: ../lib/transform.php:461 ../lib/transform.php:473
+#: lib/transform.php:461 lib/transform.php:473
 msgid "Search"
 msgstr ""
=20
-#: ../lib/userauth.php:158
+#: lib/userauth.php:82
+msgid "You must be logged in as an administrator to $action."
+msgstr ""
+
+#: lib/userauth.php:147
+msgid ""
+"You must set the administrator account and password before you can log =
in."
+msgstr ""
+
+#: lib/userauth.php:158
 msgid "You entered an invalid login or password."
 msgstr ""
=20
-#: ../lib/ziplib.php:657
+#: lib/ziplib.php:657
 #, c-format
 msgid "[%d] See [%s]"
 msgstr ""
=20
-#: ../lib/ziplib.php:665
+#: lib/ziplib.php:665
 msgid "!References"
 msgstr ""
=20
-#: ../admin/removepage.php:6
+#: admin/removepage.php:6
 msgid "Function not yet implemented."
 msgstr ""
=20
-#: ../admin/removepage.php:10
+#: admin/removepage.php:10
 #, c-format
 msgid "You are about to remove '%s' permanently!"
 msgstr ""
=20
-#: ../admin/removepage.php:13
+#: admin/removepage.php:13
 #, c-format
 msgid "Click <a href=3D\"%s\">here</a> to remove the page now."
 msgstr ""
=20
-#: ../admin/removepage.php:17
+#: admin/removepage.php:17
 msgid "Otherwise press the \"Back\" button of your browser."
 msgstr ""
=20
-#: ../admin/removepage.php:22
+#: admin/removepage.php:22
 #, c-format
 msgid "Removed page '%s' succesfully."
 msgstr ""
=20
-#: ../admin/removepage.php:26
+#: admin/removepage.php:26
 msgid "Remove page"
 msgstr ""
diff -urN --exclude=3D*~ --exclude=3Dphpwiki.php --exclude=3DEntries --ex=
clude=3DEntries.Log --exclude=3Dnew --exclude=3Dindex.php.appel ../wiki-2=
9mmei/offline/index.html ./offline/index.html
--- ../wiki-29mei/offline/index.html	Thu Jan  1 01:00:00 1970
+++ ./offline/index.html	Sat Dec 16 13:12:24 2000
@@ -0,0 +1,15 @@
+<html>
+<title>poor wiki</title>
+<body bgcolor=3D#fff0f0>
+
+<h2>Sorry..</h2>
+The wiki is temporarily offline, but you can visit the=20
+<a href=3Dhttp://www.cs.uu.nl/~hanwen/lily-devel/wiki/FrontPage.html>sta=
tic pages
+</a>.
+
+<p>
+
+<hr>
+Jan Nieuwenhuizen <a href=3Dmailto:ja...@gn...>ja...@gn...</a>
+</body>
+</html>
diff -urN --exclude=3D*~ --exclude...
 
[truncated message content]

Re: [Phpwiki-talk] mp3

[Reini U. <ru...@xa...>]

On Thu, 24 May 2001, Steve Wainstead wrote:
> Everyone knows the only albums worth owning are Sabbath's first four ;-)

well, the two early bootlegs (paris, bagdad) are also not that bad.
=20
> On Wed, 23 May 2001, Jaroslaw Prokoptchuk wrote:
> > Hi! It's Jaroslaw from Ukraine.
> > from  http://alunos.uevora.pt/~l14370/filez/bootlegs/Black_Sabbath.txt
> > i download file, and see your bootleg/rare/b-side collection.
> >
> > Black Sabbath:
> >
> >  Black Sabbath -  War Pigs (Live in Paris'70)(bootleg) =BF1970
> >  Black Sabbath -  Bagdad (Live USA'74) (bootleg) =BF1974
> >
> >  Black Sabbath =BF1970
> >  Paranoid =BF1970
> >  Master Of Reality =BF1971
> >  Black Sabbath Volume 4 =BF1972
> >  Sabbath Bloody Sabbath =BF1973

imho this also.
--
reini

Re: [Phpwiki-talk] mp3

[Steve W. <sw...@pa...>]

Everyone knows the only albums worth owning are Sabbath's first four ;-)

~swain

On Wed, 23 May 2001, Jaroslaw Prokoptchuk wrote:

> Hi! It's Jaroslaw from Ukraine.
>
> from  http://alunos.uevora.pt/~l14370/filez/bootlegs/Black_Sabbath.txt
> i download file, and see your bootleg/rare/b-side collection.
> I want dowload some mpz from U. I have own ftp server. My list:
>
> Ozzy Osbourne
>  Blizzard of Ozz =BF 1980
>  Diary of a Madman =BF 1981
>  Speak of the Devil =BF 1982 (live CD)
>  Bark at the Moon =BF 1983
>  The Ultimate Sin =BF 1986
>  Tribute to Randy Rhoads =BF 1987
>  No Rest for the Wicked =BF 1988
>  Just say Ozzy =BF 1990 (live CD)
>  No More Tears =BF 1991
>  Live&Loud =BF 1993 (live 2CD)
>  Ozzmosis =BF 1995
>  Greatest Hits - The Ozzman Cometh =BF 1997
>
>      Bonus tracks
> Aimee
> Bark At The Moon (Demo)
> Blue Suede Shoes (Black Sabbath'69)
> Behind The Wall of Sleep (demo)
> Bombers (Can open Bomb Bays) (wit Bill Ward)
> Born to be Wild
> Buried Alive (with Rick Wakeman)
> Can It Be (Black Sabbath live)
> Changes (remake without live audience)
> Close My Eyes Forever (with Lita Ford)
> Don't Blame Me
> Fire In The Sky (rare live 1988)
> For Heavens Sake (with Iommi & Wu-Tang Clan)
> Hero
> I in't no nice Guy (with Motorhead)
> I Just Want You (Live On David Letterman 6-14-96)
> Jack's Land
> Led Clones (with Garry Moore )
> Livihg With The Enemy
> Miracle Man (Video Version)
> Mrs. J (Zakk Wylde Demo)
> No Bone Movies (Demo)
> Nowhere To Run
> One Up B-Side
> Party With The Animals
> Perry Mason (from Ozzfest 98)
> Picture of Matchstick Man (with Type'O'Negative)
> Purple Haze
> Rock And Roll Rebel (Alt Lyrics, live)
> Shake your Head
> Shok The Monkey (with WasNotWas, Kim Basinger supporting vocals)
> Sometimes I'm Happy & Jam (Black Sabbath live)
> Stayin Alive
> Urpney Song (from cartoon)
> The Liar
> Therapy! (with Ifection Grooves)
> The Rebel (The Longest 'Earth' Clip That Exists)
> This Means War (with Busta Rhymes)
> Vertical Man (with Ringo Starr)
> Voodoo Dancer
> Walk On Water
> Who's Fooling Who (from Iommi'2000)
> Whole World's Falling Down
> Won't Be Coming Home (S.I.N. Demo)
> Yakety Yak Take it Back (comercial)
> You Look At Me Look At You
> You Said It All
>
>  Ozzy Osbourne - Live At Montreal =BF1981 (BOOTLEG)
>  Ozzy Osbourne - Ozzmium =BF1981 (BOOTLEG)
>  Ozzy Osbourne - Live At Minneapolis =BF1982 (BOOTLEG)
>  Ozzy Osbourne - Live At Kalamazoo =BF1982 (BOOTLEG)
>  Ozzy Osbourne - Ozzy Bites Salt Lake City =BF1984 (BOOTLEG)
>  Ozzy Osbourne - Parnoid Man =BF1986 (BOOTLEG)
>  Ozzy Osbourne - Tears Of Sinner =BF1992 (BOOTLEG)
>  Ozzy Osbourne - Ozzy Bloody Ozzy =BF1995 (BOOTLEG)
>  Ozzy Osbourne - Phoenix Rising =BF1996 (BOOTLEG)
>
>  Madman Legend - Tribute To Ozzy Osbourne  =BF1995
>  Nativity In Black 2 - A tribute to black Sabbath =BF2000
>  Nativity In Black - A tribute to Black Sabbath =BF1994
>  Hell Rules - A tribute to Black Sabbath =BF2000
>
> Black Sabbath:
>
>  Black Sabbath -  War Pigs (Live in Paris'70)(bootleg) =BF1970
>  Black Sabbath -  Bagdad (Live USA'74) (bootleg) =BF1974
>
>  Black Sabbath =BF1970
>  Paranoid =BF1970
>  Master Of Reality =BF1971
>  Black Sabbath Volume 4 =BF1972
>  Sabbath Bloody Sabbath =BF1973
>  Sabotage =BF1973
>  Tehnical Ecstasy =BF1976
>  Never Say Die =BF1978
>  Live at Last =BF1980 (Remastered)
>  Reunion =BF1998 (live, 2CD)
>
> Other:
>
> Motorhead:
> 1979 - Bomber
> 1979 - On Parole
> 1979 - Overkill
> 1980 - Ace of Spades
> 1981 - No sleep til Hammersmith
> 1982 - Iron Fist
> 1983 - Another Perfect Day
> 1986 - Orgasmatron
> 1987 - Rock'n'Roll
> 1991 - 1916
> 1992 - March or Die
> 1993 - Bastards
> 1995 - Sacrifice
> 1996 - Overnight Sensation
> 1998 - Snake Bite Love
> 2000 - We Are Motorhead
>
> Iron Maiden :
> 1980 - Iron Maiden
> 1981 - Killers
> 1982 - The number of the beast
> 1983 - Piece of mind
> 1984 - Powerslave
> 1986 - Somewhere in time
> 1988 - Seventh son of the seventh son
> 1990 - No prayer for the dying
> 1992 - Fear of the Dark"
> 1995 - The X Factor
> 1996 - Best Of The Beast
> 1998 - Virtual XI
>
> 1994 Live at Donington (2 CD)
> Bootleg - High Vaultage Vol. 2
> Bootleg - Monster Of Rock  (1992)
> Bootleg - Soundhouse tapes and more
> Bootleg - Wasted Tapes
>
> PANTERA:
> 5 Minutes Alone (Single)
> Planet Caravan (Atlantic Rec.) (Single)
> Planet Caravan (Time Warner Rec.) (Single)
> I'm Broken (Single)
> Mouth For War (Single)
> Walk (Single)
>
> Cowboys From Hell (1990)
> Vulgar Display Of Power (1992)
> Far Beyond Driven (1994)
> The Great Southern Trendkill (1996)
> Official Live - 101 Proof (1997)
> Reinventing The Steel (2000)
> Other Live Recordings (25 song, bootleg)
>
> Alice Cooper - Brutal Planet
> Sepultura - Chaos AD (with 4 fonus track)
>             Roots of Sepultura 2CD (with bonus CD)
> Celtic Frost - Morbid Tales/Emperors Return
>                To Mega Therion
>                Into The Pandemonium
>                Cold Lake
>                Vanity-Nemesis
>                Idol Of Chagrin
> Crematory - Act Seven
>             Awake
>             Transmigration
> My Dying Bride - The Angel and The Dark River
>
>
>
> _______________________________________________
> Phpwiki-talk mailing list
> Php...@li...
> http://lists.sourceforge.net/lists/listinfo/phpwiki-talk
>

---
                  http://www.panix.com/~swain/
"Without music to decorate it, time is just a bunch of boring
production deadlines or dates by which bills must be paid."
                     -- Frank Zappa

[Phpwiki-talk] mp3

[Jaroslaw P. <ko...@re...>]

Hi! It's Jaroslaw from Ukraine.

from  http://alunos.uevora.pt/~l14370/filez/bootlegs/Black_Sabbath.txt
i download file, and see your bootleg/rare/b-side collection.
I want dowload some mpz from U. I have own ftp server. My list:

Ozzy Osbourne
 Blizzard of Ozz © 1980
 Diary of a Madman © 1981
 Speak of the Devil © 1982 (live CD)
 Bark at the Moon © 1983
 The Ultimate Sin © 1986
 Tribute to Randy Rhoads © 1987
 No Rest for the Wicked © 1988
 Just say Ozzy © 1990 (live CD)
 No More Tears © 1991
 Live&Loud © 1993 (live 2CD)
 Ozzmosis © 1995
 Greatest Hits - The Ozzman Cometh © 1997

     Bonus tracks
Aimee
Bark At The Moon (Demo)
Blue Suede Shoes (Black Sabbath'69)
Behind The Wall of Sleep (demo)
Bombers (Can open Bomb Bays) (wit Bill Ward)
Born to be Wild
Buried Alive (with Rick Wakeman)
Can It Be (Black Sabbath live)
Changes (remake without live audience)
Close My Eyes Forever (with Lita Ford)
Don't Blame Me
Fire In The Sky (rare live 1988)
For Heavens Sake (with Iommi & Wu-Tang Clan)
Hero
I in't no nice Guy (with Motorhead)
I Just Want You (Live On David Letterman 6-14-96)
Jack's Land
Led Clones (with Garry Moore )
Livihg With The Enemy
Miracle Man (Video Version)
Mrs. J (Zakk Wylde Demo)
No Bone Movies (Demo)
Nowhere To Run
One Up B-Side
Party With The Animals
Perry Mason (from Ozzfest 98)
Picture of Matchstick Man (with Type'O'Negative)
Purple Haze
Rock And Roll Rebel (Alt Lyrics, live)
Shake your Head
Shok The Monkey (with WasNotWas, Kim Basinger supporting vocals)
Sometimes I'm Happy & Jam (Black Sabbath live)
Stayin Alive
Urpney Song (from cartoon)
The Liar
Therapy! (with Ifection Grooves)
The Rebel (The Longest 'Earth' Clip That Exists)
This Means War (with Busta Rhymes)
Vertical Man (with Ringo Starr)
Voodoo Dancer
Walk On Water
Who's Fooling Who (from Iommi'2000)
Whole World's Falling Down
Won't Be Coming Home (S.I.N. Demo)
Yakety Yak Take it Back (comercial)
You Look At Me Look At You
You Said It All

 Ozzy Osbourne - Live At Montreal ©1981 (BOOTLEG)
 Ozzy Osbourne - Ozzmium ©1981 (BOOTLEG)
 Ozzy Osbourne - Live At Minneapolis ©1982 (BOOTLEG)
 Ozzy Osbourne - Live At Kalamazoo ©1982 (BOOTLEG)
 Ozzy Osbourne - Ozzy Bites Salt Lake City ©1984 (BOOTLEG)
 Ozzy Osbourne - Parnoid Man ©1986 (BOOTLEG)
 Ozzy Osbourne - Tears Of Sinner ©1992 (BOOTLEG)
 Ozzy Osbourne - Ozzy Bloody Ozzy ©1995 (BOOTLEG)
 Ozzy Osbourne - Phoenix Rising ©1996 (BOOTLEG)

 Madman Legend - Tribute To Ozzy Osbourne  ©1995
 Nativity In Black 2 - A tribute to black Sabbath ©2000
 Nativity In Black - A tribute to Black Sabbath ©1994
 Hell Rules - A tribute to Black Sabbath ©2000

Black Sabbath:

 Black Sabbath -  War Pigs (Live in Paris'70)(bootleg) ©1970
 Black Sabbath -  Bagdad (Live USA'74) (bootleg) ©1974

 Black Sabbath ©1970
 Paranoid ©1970
 Master Of Reality ©1971
 Black Sabbath Volume 4 ©1972
 Sabbath Bloody Sabbath ©1973
 Sabotage ©1973
 Tehnical Ecstasy ©1976
 Never Say Die ©1978
 Live at Last ©1980 (Remastered)
 Reunion ©1998 (live, 2CD)

Other:

Motorhead:
1979 - Bomber
1979 - On Parole
1979 - Overkill
1980 - Ace of Spades
1981 - No sleep til Hammersmith
1982 - Iron Fist
1983 - Another Perfect Day
1986 - Orgasmatron
1987 - Rock'n'Roll
1991 - 1916
1992 - March or Die
1993 - Bastards
1995 - Sacrifice
1996 - Overnight Sensation
1998 - Snake Bite Love
2000 - We Are Motorhead

Iron Maiden :
1980 - Iron Maiden
1981 - Killers
1982 - The number of the beast
1983 - Piece of mind
1984 - Powerslave
1986 - Somewhere in time
1988 - Seventh son of the seventh son
1990 - No prayer for the dying
1992 - Fear of the Dark"
1995 - The X Factor
1996 - Best Of The Beast
1998 - Virtual XI

1994 Live at Donington (2 CD)
Bootleg - High Vaultage Vol. 2
Bootleg - Monster Of Rock  (1992)
Bootleg - Soundhouse tapes and more
Bootleg - Wasted Tapes

PANTERA:
5 Minutes Alone (Single)
Planet Caravan (Atlantic Rec.) (Single)
Planet Caravan (Time Warner Rec.) (Single)
I'm Broken (Single)
Mouth For War (Single)
Walk (Single)

Cowboys From Hell (1990)
Vulgar Display Of Power (1992)
Far Beyond Driven (1994)
The Great Southern Trendkill (1996)
Official Live - 101 Proof (1997)
Reinventing The Steel (2000)
Other Live Recordings (25 song, bootleg)

Alice Cooper - Brutal Planet
Sepultura - Chaos AD (with 4 fonus track)
            Roots of Sepultura 2CD (with bonus CD)
Celtic Frost - Morbid Tales/Emperors Return
               To Mega Therion
               Into The Pandemonium
               Cold Lake
               Vanity-Nemesis
               Idol Of Chagrin
Crematory - Act Seven
            Awake
            Transmigration
My Dying Bride - The Angel and The Dark River

Re: [Phpwiki-talk] New to all of this.

[Steve W. <sw...@pa...>]

Hello again all,

I've got a very unstable Earthlink connection for now and I'm catching up
on the last three weeks of the project.

To answer your question, Richard, the project moves in fits from time to
time... we'll have a month or three of slow activity, and then a big burst
and a new release, followed by spending time doing support.

Since I am on a sort of working holiday until September I expect to be
putting a lot of time in the project through August, once I get DSL from
Bell South (expected later this week).

To get involved, just start submitting patches to the talk list; we'll go
from there.

cheers
~swain

On Thu, 10 May 2001, Reini Urban wrote:

> I'm doing quite a lot, but not submitting to CVS.
> Jeff did the last hacks, but made a break.
> Steve told us to start somewhen this month...
>
> Richard Kavanagh schrieb:
> > The question is how "active" is this group ?. There seems to be little
> > activity on soureforge (forum, tasks etc) and the CVS has not been
> > touched for quite a while (as far as I can see),
> --
> Reini Urban
> http://xarch.tu-graz.ac.at/home/rurban/
>
> _______________________________________________
> Phpwiki-talk mailing list
> Php...@li...
> http://lists.sourceforge.net/lists/listinfo/phpwiki-talk
>

---
                  http://www.panix.com/~swain/
"Without music to decorate it, time is just a bunch of boring
production deadlines or dates by which bills must be paid."
                     -- Frank Zappa

Re: [Phpwiki-talk] modify a name of a page

[Steve W. <sw...@pa...>]

Hi Didier,

Under 1.2, the only way to change the name of the page is doing it in the
database.

The normal thing to do in any Wiki, not just PhpWiki, is to create the new
page and move all the contents to it... it's a pain in the neck but works.

~swain

On Mon, 14 May 2001, Didier Bretin wrote:

> Hello,
>
>   Is there a way to change the name of a page ? Do I need to do this operation
> in the database ?
>
> Thanks.
> --
>             .------------------------------------------------.
>     .^.     | Didier Bretin, France | db...@in...    |
>     /V\     |-----------------------| www.informactis.com    |
>    // \\    |                       `------------------------|
>   /(   )\   | Visit: http://www.fnh.org/                     |
>    ^^-^^    `------------------------------------------------'
>
> _______________________________________________
> Phpwiki-talk mailing list
> Php...@li...
> http://lists.sourceforge.net/lists/listinfo/phpwiki-talk
>

---
                  http://www.panix.com/~swain/
"Without music to decorate it, time is just a bunch of boring
production deadlines or dates by which bills must be paid."
                     -- Frank Zappa

Re: [Phpwiki-talk] italian translation of wiki

[Marco M. <kp...@ad...>]

> Great, Marco!
> (I.e.: send it to me.)

ok, I'll send you the tarballed subdir. the test page is at
http://ada2.unipv.it/~kpanic anyway

-- 
                                                                 .''`.
                                                                : :' :
Everything is gonna be alright                                  `. `'
                                                                  `-
                                                            Debian GNU/Linux
                                                                 Powered