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

[phpwiki-checkins] CVS: phpwiki/doc INSTALL.MacOSX,1.10,1.11

[Carsten K. <car...@us...>]

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

Modified Files:
	INSTALL.MacOSX 
Log Message:
minor reformatting with emacs

Index: INSTALL.MacOSX
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/doc/INSTALL.MacOSX,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** INSTALL.MacOSX	2001/12/31 00:38:02	1.10
--- INSTALL.MacOSX	2001/12/31 01:46:04	1.11
***************
*** 1,2 ****
--- 1,3 ----
+ 
  Using PhpWiki 1.3 with Mac OS X / Darwin
  
***************
*** 26,36 ****
  don't rely on PB's text colors too much, it doesn't always properly
  handle coloring for \"escaped quotes\" which are frequently called for
! in PHP when generating HTML code. \\" <--(kludge for broken syntax coloring)
  
  Instructions for using Project Builder with PhpWiki can be found at
  the bottom of this document.
  
  Database
  --------
  A suitable database for PhpWiki is not included with Mac OS X 10.1. If
  you decide to use one of the more popular (and free) database packages
--- 27,40 ----
  don't rely on PB's text colors too much, it doesn't always properly
  handle coloring for \"escaped quotes\" which are frequently called for
! in PHP when generating HTML code.
! \\" <--(kludge for broken syntax coloring)
  
  Instructions for using Project Builder with PhpWiki can be found at
  the bottom of this document.
  
+ 
  Database
  --------
+ 
  A suitable database for PhpWiki is not included with Mac OS X 10.1. If
  you decide to use one of the more popular (and free) database packages
***************
*** 47,50 ****
--- 51,55 ----
  Apache PHP Module
  -----------------
+ 
  The default PHP module for Apache as supplied by Apple does work with
  PhpWiki but is missing support for the zlib and GD libraries. Wiki
***************
*** 76,79 ****
--- 81,85 ----
  Obtaining and Installing mySQL and libphp4.so
  ---------------------------------------------
+ 
  Mark Liyanage has graciously provided precompiled Mac OS X versions of
  mySQL, an updated PHP module for Apache and some installation
***************
*** 81,85 ****
  want to compile these programs for yourself.
  
!     <http://www.entropy.ch/software/macosx/>
  
  Note that whether you use the built-in PHP module or another PHP
--- 87,91 ----
  want to compile these programs for yourself.
  
!    <http://www.entropy.ch/software/macosx/>
  
  Note that whether you use the built-in PHP module or another PHP
***************
*** 91,122 ****
  can be used with Mac OS X are listed at:
  
!     <http://versiontracker.com/macosx/>
  
  
  PHP 4.1 and Mac OS X
  --------------------
  The version of PHP 4.1 from Mark Liyanage's web site requires an
  updated PEAR library. PhpWiki seems to work anyway but it will produce
! warnings about a depreciated user function with each page load. Move
! the current contents of '/System/Library/PHP' into a backup folder,
! such as '/System/Library/PHP/PEAR-4.0.6'. Take the contents of the
! 'pear' folder from the official PHP 4.1 tarball (php-4.1.0.tar.gz) and
! move it into '/System/Library/PHP'. A precompiled PHP 4.1 module for
! Apache and the PearDB support files are also available at:
  
!     <http://homepage.mac.com/carstenklapp/>
  
  
  PhpWiki Configuration Notes
  ---------------------------
  Move the phpwiki folder into the directory used by the web server. In
  Mac OS X 10.1 this folder will be "/Library/WebServer/Documents"
! (unless you previously changed it to somewhere else in the
! configuration file "/private/etc/httpd/httpd.conf").
  
  Follow the generalized installation instructions described in INSTALL
! but with the changes below.
  
- 
  1. The Mac OS X Apache web server runs as user "www" and this works
     fine with PhpWiki so long as "Everyone" has at least read-only
--- 97,133 ----
  can be used with Mac OS X are listed at:
  
!    <http://versiontracker.com/macosx/>
  
  
  PHP 4.1 and Mac OS X
  --------------------
+ 
  The version of PHP 4.1 from Mark Liyanage's web site requires an
  updated PEAR library. PhpWiki seems to work anyway but it will produce
! warnings about a depreciated user function with each page load.
! 
! 1. Move the current contents of '/System/Library/PHP' into a backup
!    folder, such as '/System/Library/PHP/PEAR-4.0.6'.
  
! 2. Take the contents of the 'pear' folder from the official PHP 4.1
!    tarball (php-4.1.0.tar.gz) and move it into '/System/Library/PHP'.
  
+ A precompiled PHP 4.1 module for Apache and the PearDB support files
+ are also available at:
  
+    <http://homepage.mac.com/carstenklapp/>
+ 
+ 
  PhpWiki Configuration Notes
  ---------------------------
+ 
  Move the phpwiki folder into the directory used by the web server. In
  Mac OS X 10.1 this folder will be "/Library/WebServer/Documents"
! (unless you previously changed it to somewhere else in the config file
! "/private/etc/httpd/httpd.conf").
  
  Follow the generalized installation instructions described in INSTALL
! but with the changes to sections 1 and 2 listed below.
  
  1. The Mac OS X Apache web server runs as user "www" and this works
     fine with PhpWiki so long as "Everyone" has at least read-only
***************
*** 135,139 ****
     order to use "nice" URLs with PhpWiki such as:
  
!     http://somehost/wiki?GoodStyle
  
  Open the terminal and type in the following to edit the web server
--- 146,150 ----
     order to use "nice" URLs with PhpWiki such as:
  
!    http://somehost/wiki?GoodStyle
  
  Open the terminal and type in the following to edit the web server
***************
*** 172,177 ****
  sudo apachectl graceful
  
! Next, edit the following lines in part five of index.php to match
! the following:
  
  define('DATA_PATH', '/wiki');
--- 183,188 ----
  sudo apachectl graceful
  
! Next, edit the following lines in part five of index.php to match the
! following:
  
  define('DATA_PATH', '/wiki');
***************
*** 198,207 ****
  
  Using Apple's Project Builder with PhpWiki
! ------------------------------------------ A PB project file is
! available on the SourceForge CVS server to allow you to easily edit
! PhpWiki's source code using Apple's Project Builder. If you have not
! yet updated to PB 1.1.1 (Dec 2001 DevTools) it is highly recommended
! you do so because the PhpWiki source are written in ISO-8859-1, and
! some of the bug fixes are pertinent to file encoding.
  
  PB 1.1 has some bugs which makes it impossible to select the correct
--- 209,220 ----
  
  Using Apple's Project Builder with PhpWiki
! ------------------------------------------
! 
! A PB project file is available on the SourceForge CVS server to allow
! you to easily edit PhpWiki's source code using Apple's Project
! Builder. If you have not yet updated to PB 1.1.1 (Dec 2001 DevTools)
! it is highly recommended you do so because the PhpWiki source are
! written in ISO-8859-1, and some of the bug fixes are pertinent to file
! encoding.
  
  PB 1.1 has some bugs which makes it impossible to select the correct
***************
*** 222,230 ****
  contains your "phpwiki" folder.
  
  Project Builder 1.1.1 can be used with Sourceforge's CVS but there is
! a little bit of work to get it set up the first time.  The following
  instructions were based on a tip from macosxhints.com.
  
  Preparation:
  Checkout phpwiki with the cvs command line tools. Make sure that your
  ssh keys have been uploaded to your account at Sourceforge and that
--- 235,248 ----
  contains your "phpwiki" folder.
  
+ 
+ How to use SSH with Project Builder
+ -----------------------------------
+ 
  Project Builder 1.1.1 can be used with Sourceforge's CVS but there is
! a little bit of work to get it set up the first time. The following
  instructions were based on a tip from macosxhints.com.
  
  Preparation:
+ 
  Checkout phpwiki with the cvs command line tools. Make sure that your
  ssh keys have been uploaded to your account at Sourceforge and that
***************
*** 232,235 ****
--- 250,254 ----
  
  Instructions:
+ 
  1. Download and install "keychain" from:
  
***************
*** 239,244 ****
  easily have one long-running ssh-agent process per system, rather than
  per login session. This dramatically reduces the number of times you
! need to enter your passphrase from once per new login session to once
! every time your local machine is rebooted.
  
  2. Add the following to your .cshrc file (if you use the default tcsh
--- 258,263 ----
  easily have one long-running ssh-agent process per system, rather than
  per login session. This dramatically reduces the number of times you
! need to enter your passphrase, from once per new terminal window
! session to once every time your local machine is rebooted.
  
  2. Add the following to your .cshrc file (if you use the default tcsh
***************
*** 255,258 ****
--- 274,278 ----
  (bash users would substitute the following lines in the above script
  for their .bashrc file:)
+ 
  CVS_RSH=ssh; EXPORT CVS_RSH
  source ~/.ssh-agent-${HOSTNAME}
***************
*** 260,281 ****
  
  3. Close the terminal window then open a new one. Keychain will
!    activate ssh-agent which will ask for your ssh key password. It keeps
!    running in the background and won't ask for your password again until
!    you log out or restart.
  
  4. From now on, YOU MUST open Project Builder from the Terminal shell
!    for it's CVS to work with SSH. This is why We created a command alias
!    in .cshrc to launch Project Builder. If it is already running because
!    you double-clicked the PB icon, quit it, then launch it from the terminal
!    by typing pb. Once PB is running you can safely double-click a
!    project file to open it.
  
  Using the above method, ProjectBuilder will successfully connect to
! the Sourceforge CVS with SSH. Any other server which requires ssh
! instead of rsh should work too.
  
  
  Emacs Users: You can add custom Alt-key bindings to Project Builder
! for some common Emacs stuff:  *Note the wrapped url!
  http://developer.apple.com/techpubs/macosx/Cocoa/TasksAndConcepts/
  ProgrammingTopics/TextDisplay/Tasks/TextDefaultsAndBindings.html
--- 280,313 ----
  
  3. Close the terminal window then open a new one. Keychain will
!    activate ssh-agent which will ask for your ssh key password. It
!    keeps running in the background and won't ask for your password
!    again until you log out or restart.
  
  4. From now on, YOU MUST open Project Builder from the Terminal shell
!    for it's CVS to work with SSH. This is why We created a command
!    alias in .cshrc to launch Project Builder. If it is already running
!    because you double-clicked the PB icon, quit it, then launch it
!    from the terminal by typing pb. Once PB is running you can safely
!    double-click a project file to open it.
  
  Using the above method, ProjectBuilder will successfully connect to
! the Sourceforge CVS with SSH. Any other server which requires cvs
! connections via ssh instead of rsh should work too.
! 
! Note: Renaming /usr/bin/rsh and replacing it with ssh doesn't seem to
!       work; Project Builder simply MUST be launched from the command line
!       for it to work at all with ssh.
! 
! Hopefully SSH support will be improved in the future. Send an email
! to: mac...@gr... to let the team know that
! full support for SSH in Project Builder is important.
  
  
+ Emacs Key Bindings for Project Builder
+ --------------------------------------
+ 
  Emacs Users: You can add custom Alt-key bindings to Project Builder
! for some common Emacs stuff: *Note the wrapped url!
! 
  http://developer.apple.com/techpubs/macosx/Cocoa/TasksAndConcepts/
  ProgrammingTopics/TextDisplay/Tasks/TextDefaultsAndBindings.html
***************
*** 289,294 ****
  
  $Id$
- 
- 
- 
- 
--- 321,322 ----

[phpwiki-checkins] CVS: phpwiki.pbproj project.pbxproj,1.6,1.7

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki.pbproj
In directory usw-pr-cvs1:/tmp/cvs-serv4052

Modified Files:
	project.pbxproj 
Log Message:



Index: project.pbxproj
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki.pbproj/project.pbxproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** project.pbxproj	2001/12/28 03:50:28	1.6
--- project.pbxproj	2001/12/31 01:03:46	1.7
***************
*** 42,45 ****
--- 42,46 ----
  		F57D140501D070600165507D = {
  			children = (
+ 				F5A58AD801DFEE3A0165507D,
  				F57D43CA01DB11970165507D,
  			);
***************
*** 77,83 ****
  			children = (
  				F57D43CC01DB11970165507D,
- 				F57D43CD01DB11970165507D,
  				F57D43CE01DB11970165507D,
- 				F57D43D801DB11970165507D,
  				F57D43D901DB11970165507D,
  				F57D43E401DB11970165507D,
--- 78,82 ----
***************
*** 111,122 ****
  			refType = 2;
  		};
- 		F57D43CD01DB11970165507D = {
- 			children = (
- 			);
- 			isa = PBXGroup;
- 			name = admin;
- 			path = phpwiki/admin;
- 			refType = 2;
- 		};
  		F57D43CE01DB11970165507D = {
  			children = (
--- 110,113 ----
***************
*** 199,210 ****
  			refType = 4;
  		};
- 		F57D43D801DB11970165507D = {
- 			children = (
- 			);
- 			isa = PBXGroup;
- 			name = docs;
- 			path = phpwiki/docs;
- 			refType = 2;
- 		};
  		F57D43D901DB11970165507D = {
  			children = (
--- 190,193 ----
***************
*** 2585,2588 ****
--- 2568,2586 ----
  			path = phpwiki/UPGRADING;
  			refType = 2;
+ 		};
+ 		F5A58AD801DFEE3A0165507D = {
+ 			children = (
+ 				F5A58AD901DFEE3A0165507D,
+ 			);
+ 			isa = PBXGroup;
+ 			path = phpwiki.pbproj;
+ 			refType = 4;
+ 		};
+ 		F5A58AD901DFEE3A0165507D = {
+ 			fileEncoding = 4;
+ 			isa = PBXFileReference;
+ 			lineEnding = 0;
+ 			path = project.pbxproj;
+ 			refType = 4;
  		};
  		F5E8126401DBD8AE0165507D = {

[phpwiki-checkins] CVS: phpwiki phpwiki-modern-heavy.css,1.1,1.2

[Carsten K. <car...@us...>]

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

Modified Files:
	phpwiki-modern-heavy.css 
Log Message:
added $Id line

Index: phpwiki-modern-heavy.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/phpwiki-modern-heavy.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** phpwiki-modern-heavy.css	2001/12/26 18:12:25	1.1
--- phpwiki-modern-heavy.css	2001/12/31 00:49:01	1.2
***************
*** 0 ****
--- 1,7 ----
+ /* 
+  * $Id$
+  *
+  * phpwiki-modern-heavy.css
+  *
+  * This is stuff which should be in phpwiki-modern.css, but which breaks NS4.
+  */

[phpwiki-checkins] CVS: phpwiki/doc INSTALL.MacOSX,1.9,1.10

[Carsten K. <car...@us...>]

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

Modified Files:
	INSTALL.MacOSX 
Log Message:
Project Builder will work with Sourceforge using keychain and ssh-agent!

Index: INSTALL.MacOSX
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/doc/INSTALL.MacOSX,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** INSTALL.MacOSX	2001/12/30 23:38:34	1.9
--- INSTALL.MacOSX	2001/12/31 00:38:02	1.10
***************
*** 26,30 ****
  don't rely on PB's text colors too much, it doesn't always properly
  handle coloring for \"escaped quotes\" which are frequently called for
! in PHP when generating HTML code.
  
  Instructions for using Project Builder with PhpWiki can be found at
--- 26,30 ----
  don't rely on PB's text colors too much, it doesn't always properly
  handle coloring for \"escaped quotes\" which are frequently called for
! in PHP when generating HTML code. \\" <--(kludge for broken syntax coloring)
  
  Instructions for using Project Builder with PhpWiki can be found at
***************
*** 198,221 ****
  
  Using Apple's Project Builder with PhpWiki
! ------------------------------------------
! A PB project file is available on the SourceForge CVS server to allow
! you to easily edit PhpWiki's source code using Apple's Project
! Builder. If you have not yet updated to PB 1.1.1 (Dec 2001 DevTools)
! it is highly recommended you do so because the PhpWiki source are
! written in ISO-8859-1, and some of the bug fixes are pertinent to file
! encoding.
! 
! PB has some bugs which makes it impossible (in PB 1.1) or difficult
! (in PB 1.1.1) to select the correct character encoding in the GUI for
! any pre-existing source code files. By using this project file you
! will find the PhpWiki source files are already preset to use the
! correct ISO-8859-1 (Western Latin-1) encoding.
! 
! The Build target settings have also been preconfigured to
! automatically build a "legacy Makefile", by invoking
! '/usr/bin/gnumake' in the folder'./phpwiki/locale'. When you update
! and save one of the language translation files found in
! './phpwiki/locale/po/', you can simply click the build button in the
! toolbar to run make, which in turn calls another script and xgettext.
  
  To download the phpwiki.pbxproj bundle, use CVS to checkout the module
--- 198,220 ----
  
  Using Apple's Project Builder with PhpWiki
! ------------------------------------------ A PB project file is
! available on the SourceForge CVS server to allow you to easily edit
! PhpWiki's source code using Apple's Project Builder. If you have not
! yet updated to PB 1.1.1 (Dec 2001 DevTools) it is highly recommended
! you do so because the PhpWiki source are written in ISO-8859-1, and
! some of the bug fixes are pertinent to file encoding.
! 
! PB 1.1 has some bugs which makes it impossible to select the correct
! character encoding in the GUI for any pre-existing source code
! files. By using this project file you will find the PhpWiki source
! files are already preset to use the correct ISO-8859-1 (Western
! Latin-1) encoding.
! 
! Also by using this file, if you are updating or adding a tranlastion
! to the './phpwiki/locale/po/' files, you do not have to run 'make'
! from the terminal window. The Build target settings have been
! preconfigured to automatically build the project with a "legacy
! Makefile", by invoking '/usr/bin/gnumake' in the folder
! './phpwiki/locale'. Just click the build button in the toolbar.
  
  To download the phpwiki.pbxproj bundle, use CVS to checkout the module
***************
*** 223,231 ****
  contains your "phpwiki" folder.
  
! Note that as of this writing (PB 1.1.1), you can only use Project
! Builder's CVS facilities in Anonymous mode with the SourceForge CVS
! server. (Technical explanation: PB tries to use rsh instead of ssh as
! is required for SourceForge).
  
  Emacs Users: You can add custom Alt-key bindings to Project Builder
  for some common Emacs stuff:  *Note the wrapped url!
--- 222,279 ----
  contains your "phpwiki" folder.
  
! Project Builder 1.1.1 can be used with Sourceforge's CVS but there is
! a little bit of work to get it set up the first time.  The following
! instructions were based on a tip from macosxhints.com.
! 
! Preparation:
! Checkout phpwiki with the cvs command line tools. Make sure that your
! ssh keys have been uploaded to your account at Sourceforge and that
! you can sucessfully ssh into phpwiki.sourceforge.net.
! 
! Instructions:
! 1. Download and install "keychain" from:
! 
!    <http://www.gentoo.org/projects/keychain.html>.
! 
! The Keychain script acts as a front-end to ssh-agent, allowing you to
! easily have one long-running ssh-agent process per system, rather than
! per login session. This dramatically reduces the number of times you
! need to enter your passphrase from once per new login session to once
! every time your local machine is rebooted.
! 
! 2. Add the following to your .cshrc file (if you use the default tcsh
!    shell or csh).
! 
! setenv CVS_RSH 'ssh'
! # Keychain is an OpenSSH key manager
! # This will add my SSH1 and SSH2 key
! /usr/bin/keychain ~/.ssh/id_rsa ~/.ssh/id_dsa
! source ~/.ssh-agent-csh-${HOST}
! # Alias to servers via SSH
! alias sshsf 'ssh mys...@ph...'
! 
! (bash users would substitute the following lines in the above script
! for their .bashrc file:)
! CVS_RSH=ssh; EXPORT CVS_RSH
! source ~/.ssh-agent-${HOSTNAME}
! alias sshsf='ssh mys...@ph...'
! 
! 3. Close the terminal window then open a new one. Keychain will
!    activate ssh-agent which will ask for your ssh key password. It keeps
!    running in the background and won't ask for your password again until
!    you log out or restart.
! 
! 4. From now on, YOU MUST open Project Builder from the Terminal shell
!    for it's CVS to work with SSH. This is why We created a command alias
!    in .cshrc to launch Project Builder. If it is already running because
!    you double-clicked the PB icon, quit it, then launch it from the terminal
!    by typing pb. Once PB is running you can safely double-click a
!    project file to open it.
! 
! Using the above method, ProjectBuilder will successfully connect to
! the Sourceforge CVS with SSH. Any other server which requires ssh
! instead of rsh should work too.
  
+ 
  Emacs Users: You can add custom Alt-key bindings to Project Builder
  for some common Emacs stuff:  *Note the wrapped url!
***************
*** 241,242 ****
--- 289,294 ----
  
  $Id$
+ 
+ 
+ 
+ 

[phpwiki-checkins] CVS: phpwiki/doc INSTALL.MacOSX,1.8,1.9

[Carsten K. <car...@us...>]

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

Modified Files:
	INSTALL.MacOSX 
Log Message:
PB can use some emacs key bindings

Index: INSTALL.MacOSX
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/doc/INSTALL.MacOSX,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** INSTALL.MacOSX	2001/12/27 18:11:24	1.8
--- INSTALL.MacOSX	2001/12/30 23:38:34	1.9
***************
*** 228,231 ****
--- 228,236 ----
  is required for SourceForge).
  
+ Emacs Users: You can add custom Alt-key bindings to Project Builder
+ for some common Emacs stuff:  *Note the wrapped url!
+ http://developer.apple.com/techpubs/macosx/Cocoa/TasksAndConcepts/
+ ProgrammingTopics/TextDisplay/Tasks/TextDefaultsAndBindings.html
+ 
  
  If you have problems after all of this, try contacting the

[phpwiki-checkins] CVS: phpwiki/templates message.html,1.18,1.19

[Carsten K. <car...@us...>]

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

Modified Files:
	message.html 
Log Message:
Added accept-charset attribute to form elements. New constant CHARSET replaces hard-coded iso-8859-1 in xhtml templates, to simplify testing PhpWiki with new languages.

Index: message.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/message.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** message.html	2001/12/26 10:45:50	1.18
--- message.html	2001/12/30 06:11:00	1.19
***************
*** 1,3 ****
! <?php echo "<?xml version='1.0' encoding='ISO-8859-1'?>\n"; ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
--- 1,3 ----
! <?php echo "<?xml version='1.0' encoding='${CHARSET}'?>\n"; ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
***************
*** 9,13 ****
  -->
  <base href="${BASE_URL}" />
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
  <meta name="robots" content="noindex,nofollow" />
  <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" />
--- 9,13 ----
  -->
  <base href="${BASE_URL}" />
! <meta http-equiv="Content-Type" content="text/html; charset=${CHARSET}" />
  <meta name="robots" content="noindex,nofollow" />
  <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" />

[phpwiki-checkins] CVS: phpwiki/templates editpage.html,1.34,1.35

[Carsten K. <car...@us...>]

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

Modified Files:
	editpage.html 
Log Message:
Added accept-charset attribute to form elements. New constant CHARSET replaces hard-coded iso-8859-1 in xhtml templates, to simplify testing PhpWiki with new languages.

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** editpage.html	2001/12/27 01:19:44	1.34
--- editpage.html	2001/12/30 06:10:55	1.35
***************
*** 1,3 ****
! <?php echo "<?xml version='1.0' encoding='ISO-8859-1'?>\n"; ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
--- 1,3 ----
! <?php echo "<?xml version='1.0' encoding='${CHARSET}'?>\n"; ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
***************
*** 9,13 ****
  -->
  <base href="${BASE_URL}" />
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
  <meta name="robots" content="noindex,nofollow" />
  <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" />
--- 9,13 ----
  -->
  <base href="${BASE_URL}" />
! <meta http-equiv="Content-Type" content="text/html; charset=${CHARSET}" />
  <meta name="robots" content="noindex,nofollow" />
  <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" />
***************
*** 45,49 ****
   */ ?>
  
! <form method="post" action="${BROWSE}EditPage">
  <textarea class="wikiedit"
            name="content"
--- 45,49 ----
   */ ?>
  
! <form method="post" action="${BROWSE}EditPage" accept-charset="${CHARSET}">
  <textarea class="wikiedit"
            name="content"

[phpwiki-checkins] CVS: phpwiki/templates browse.html,1.33,1.34

[Carsten K. <car...@us...>]

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

Modified Files:
	browse.html 
Log Message:
Added accept-charset attribute to form elements. New constant CHARSET replaces hard-coded iso-8859-1 in xhtml templates, to simplify testing PhpWiki with new languages.

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** browse.html	2001/12/28 03:42:41	1.33
--- browse.html	2001/12/30 06:10:50	1.34
***************
*** 1,3 ****
! <?php echo "<?xml version='1.0' encoding='ISO-8859-1'?>\n"; ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
--- 1,3 ----
! <?php echo "<?xml version='1.0' encoding='${CHARSET}'?>\n"; ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
***************
*** 12,16 ****
    <meta name="description" content="${PAGE_DESCRIPTION}" />
  <?php } ?>
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
  <!-- <meta name="robots" content="index,follow" /> -->
  <base href="${BASE_URL}" />
--- 12,16 ----
    <meta name="description" content="${PAGE_DESCRIPTION}" />
  <?php } ?>
! <meta http-equiv="Content-Type" content="text/html; charset=${CHARSET}" />
  <!-- <meta name="robots" content="index,follow" /> -->
  <base href="${BASE_URL}" />
***************
*** 38,42 ****
  <div class="wikitext">${CONTENT}</div>
  <hr class="ignore" noshade="noshade" />
! <form action='<?php echo WikiURL(_("TitleSearch")); ?>' method="get">
  <!-- I would like not to have to use these tables, and managed to
       get this stuff to work more or less correctly using
--- 38,42 ----
  <div class="wikitext">${CONTENT}</div>
  <hr class="ignore" noshade="noshade" />
! <form action='<?php echo WikiURL(_("TitleSearch")); ?>' method="get" accept-charset="${CHARSET}">
  <!-- I would like not to have to use these tables, and managed to
       get this stuff to work more or less correctly using

[phpwiki-checkins] CVS: phpwiki/lib Template.php,1.7,1.8

[Carsten K. <car...@us...>]

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

Modified Files:
	Template.php 
Log Message:
Added accept-charset attribute to form elements. New constant CHARSET replaces hard-coded iso-8859-1 in xhtml templates, to simplify testing PhpWiki with new languages.

Index: Template.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Template.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Template.php	2001/12/26 14:00:32	1.7
--- Template.php	2001/12/30 06:10:45	1.8
***************
*** 216,219 ****
--- 216,220 ----
          $pagename = $page->getName();
  	$this->replace('page', $page);
+         $this->qreplace('CHARSET', CHARSET);
          $this->qreplace('PAGE', $pagename);
          $this->qreplace('PAGEURL', rawurlencode($pagename));

[phpwiki-checkins] CVS: phpwiki index.php,1.45,1.46

[Carsten K. <car...@us...>]

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

Modified Files:
	index.php 
Log Message:
Added accept-charset attribute to form elements. New constant CHARSET replaces hard-coded iso-8859-1 in xhtml templates, to simplify testing PhpWiki with new languages.

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** index.php	2001/12/29 18:22:26	1.45
--- index.php	2001/12/30 06:10:39	1.46
***************
*** 223,226 ****
--- 223,239 ----
  /////////////////////////////////////////////////////////////////////
  
+ // Select a valid charset name to be inserted into the xml/html pages.
+ // For more info see: <http://www.iana.org/assignments/character-sets>.
+ // Note that PhpWiki has been extensively tested only with the latin1
+ // (iso-8859-1) character set.
+ // If you change the default from iso-8859-1 PhpWiki may not work
+ // properly and it will require code modifications. However, character
+ // sets similar to iso-8859-1 may work with little or no modification
+ // depending on your setup. The database must also support the same
+ // charset, and of course the same is true for the web browser.
+ // (Some work is in progress hopefully to allow more flexibility in
+ // this area in the future).
+ define("CHARSET", "iso-8859-1");
+ 
  // Select your language/locale - default language "C": English
  // other languages available: Dutch "nl", Spanish "es", German "de",

[phpwiki-checkins] CVS: phpwiki index.php,1.44,1.45

[Carsten K. <car...@us...>]

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

Modified Files:
	index.php 
Log Message:
added ssh to $AllowedProtocols

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** index.php	2001/12/27 01:34:38	1.44
--- index.php	2001/12/29 18:22:26	1.45
***************
*** 360,364 ****
  // 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|nntp|gopher";
  
  // URLs ending with the following extension should be inlined as images
--- 360,364 ----
  // 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|nntp|ssh|gopher";
  
  // URLs ending with the following extension should be inlined as images

[phpwiki-checkins] CVS: phpwiki/lib interwiki.map,1.8,1.9

[Carsten K. <car...@us...>]

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

Modified Files:
	interwiki.map 
Log Message:
[PhpWikiAlpha:]
[PhpWikiCvs:]
[Thesaurus:]

Index: interwiki.map
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.map,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** interwiki.map	2001/12/28 09:43:21	1.8
--- interwiki.map	2001/12/29 18:18:46	1.9
***************
*** 45,48 ****
--- 45,50 ----
  php-lookup http://www.php.net/manual-lookup.php?pattern=
  PhpWiki http://phpwiki.sourceforge.net/phpwiki/index.php?
+ PhpWikiAlpha http://phpwiki.sourceforge.net/alpha/
+ PhpWikiCvs http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/phpwiki/phpwiki/
  Pikie http://pikie.darktech.org/cgi/pikie?
  PolitizenWiki http://www.politizen.com/wiki.asp?
***************
*** 57,60 ****
--- 59,63 ----
  StrikiWiki http://ch.twi.tudelft.nl/~mostert/striki/teststriki.pl?
  Tavi http://tavi.sourceforge.net/index.php?
+ Thesaurus http://www.thesaurus.com/cgi-bin/search?config=roget&words=
  Thinki http://www.thinkware.se/cgi-bin/thinki.cgi/
  TWiki http://twiki.sourceforge.net/cgi-bin/view/

[phpwiki-checkins] Re: CVS: phpwiki LICENSE,1.1.1.1,1.2

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

The FSF recommends we put the short license thing in all our source
files.. another rainy day project...

~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-checkins] CVS: phpwiki/locale/po de.po,1.32,1.33

[Carsten K. <car...@us...>]

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

Modified Files:
	de.po 
Log Message:
some new strings added, and a few more translated

Index: de.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/de.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** de.po	2001/12/27 22:15:33	1.32
--- de.po	2001/12/28 11:23:12	1.33
***************
*** 6,10 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.8\n"
! "POT-Creation-Date: 2001-12-27 16:45-0500\n"
  "PO-Revision-Date: 2000-10-31 02:23+0200\n"
  "Last-Translator: Carsten Klapp <car...@ma...>, Arno Hollosi "
--- 6,10 ----
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.8\n"
! "POT-Creation-Date: 2001-12-28 06:12-0500\n"
  "PO-Revision-Date: 2000-10-31 02:23+0200\n"
  "Last-Translator: Carsten Klapp <car...@ma...>, Arno Hollosi "
***************
*** 101,104 ****
--- 101,109 ----
  msgstr "DebugInfo"
  
+ #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:128
+ #: ../templates/browse.html:129
+ msgid "ViewMarkup"
+ msgstr ""
+ 
  #: ../templates/editpage.html:16 ../templates/editpage.html:25
  #: ../templates/editpage.html:26
***************
*** 378,382 ****
  #, c-format
  msgid "The %d most recent %s during the past %.1f days are listed below."
! msgstr "Die %d Jüngste %s innerhalb %.1f Tagen sind unten auflistet."
  
  #: ../lib/plugin/RecentChanges.php:143
--- 383,387 ----
  #, c-format
  msgid "The %d most recent %s during the past %.1f days are listed below."
! msgstr "Die %d Jüngste %s innerhalb von %.1f Tagen sind unten auflistet."
  
  #: ../lib/plugin/RecentChanges.php:143
***************
*** 388,392 ****
  #, c-format
  msgid "The most recent %s during the past %.1f days are listed below."
! msgstr "Die Jüngste %s innerhalb %.1f Tagen sind unten auflistet."
  
  #: ../lib/plugin/RecentChanges.php:151
--- 393,397 ----
  #, c-format
  msgid "The most recent %s during the past %.1f days are listed below."
! msgstr "Die Jüngste %s innerhalb von %.1f Tagen sind unten auflistet."
  
  #: ../lib/plugin/RecentChanges.php:151
***************
*** 422,425 ****
--- 427,475 ----
  msgstr "Titel-Suchresultate nach »%s«"
  
+ #: ../lib/plugin/UserPage.php:35
+ #, c-format
+ msgid "Your sysadmin has disallowed use of the %s plugin!"
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:41
+ msgid "You should be logged in now."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:47
+ #, c-format
+ msgid "Before you can edit %s, you need to sign in."
+ msgstr "Bevor du %s editieren kannst, du mußt dich anmelden."
+ 
+ #: ../lib/plugin/UserPage.php:50
+ msgid "The name you use to sign in must be in WikiWord format."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:55
+ msgid "examples include: TomJefferson, AlexHamilton"
+ msgstr "Beispiele: HerrMustermann, UweUte"
+ 
+ #: ../lib/plugin/UserPage.php:63
+ msgid "Please re-enter your name in this form."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:71
+ msgid ""
+ "Please enter your name as WordsStrungTogether (e.g. John Smith as JohnSmith)."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:73
+ msgid "Sign in:"
+ msgstr "Melde dich an:"
+ 
+ #: ../lib/plugin/ViewMarkup.php:16
+ #, c-format
+ msgid "View WikiMarkup for page '%s'."
+ msgstr ""
+ 
+ #: ../lib/plugin/ViewMarkup.php:42
+ #, c-format
+ msgid "Revealing WikiMarkup for page '%s':"
+ msgstr ""
+ 
  #: ../lib/plugin/_BackendInfo.php:14
  #, c-format
***************
*** 458,465 ****
  msgstr "Datei »%s« konnte nich geöffnet werden um es auszuschreiben"
  
  #: ../lib/WikiDB.php:837
  #, c-format
! msgid "Describe [%s] here."
! msgstr "Beschreibe [%s] hier."
  
  #: ../lib/WikiUser.php:97
--- 508,552 ----
  msgstr "Datei »%s« konnte nich geöffnet werden um es auszuschreiben"
  
+ #: ../lib/DbaDatabase.php:46 ../lib/ziplib.php:35 ../lib/ziplib.php:38
+ #: ../lib/ziplib.php:43 ../lib/ziplib.php:45 ../lib/ziplib.php:47
+ #: ../lib/ziplib.php:56 ../lib/ziplib.php:59 ../lib/ziplib.php:62
+ #: ../lib/ziplib.php:67
+ #, c-format
+ msgid "%s failed"
+ msgstr "%s hat verfehlt"
+ 
+ #: ../lib/ErrorManager.php:138
+ msgid "error while handling error:"
+ msgstr "Fehler während die Fehlerbehandlung von:"
+ 
+ #: ../lib/FileFinder.php:82
+ #, c-format
+ msgid "%s: file not found"
+ msgstr "%s Datei nicht gefunden"
+ 
+ #: ../lib/WikiDB.php:353
+ #, c-format
+ msgid "Attempt to delete most recent revision of '%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:401
+ #, c-format
+ msgid "Attempt to merge most recent revision of '%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:488
+ #, c-format
+ msgid "%s: Date of new revision is %s"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:513
+ #, c-format
+ msgid "Optimizing %s"
+ msgstr "%s wird optimiert"
+ 
  #: ../lib/WikiDB.php:837
  #, c-format
! msgid "Describe %s here."
! msgstr "Beschreibe %s hier."
  
  #: ../lib/WikiUser.php:97
***************
*** 473,478 ****
  
  #: ../lib/WikiUser.php:100
! msgid "You must be logged in as an administrator"
! msgstr "Du mußt dich als eine Systemverwalter AnMelden"
  
  #: ../lib/WikiUser.php:180
--- 560,566 ----
  
  #: ../lib/WikiUser.php:100
! #, c-format
! msgid "You must be logged in as an administrator %s"
! msgstr "Du mußt dich als eine Systemverwalter anmelden %s"
  
  #: ../lib/WikiUser.php:180
***************
*** 481,485 ****
  msgstr ""
  "Du mußt der Systemverwalter-Account mit Passwort zuerst schützen bevor du "
! "dich AnMelden kannst."
  
  #: ../lib/WikiUser.php:191
--- 569,573 ----
  msgstr ""
  "Du mußt der Systemverwalter-Account mit Passwort zuerst schützen bevor du "
! "dich anmelden kannst."
  
  #: ../lib/WikiUser.php:191
***************
*** 489,493 ****
  #: ../lib/WikiUser.php:194
  msgid "You can log in using any valid WikiWord as a user ID."
! msgstr "Du kannst mit jedes gultiges WikiWort als Benutzername AnMelden."
  
  #: ../lib/WikiUser.php:195
--- 577,581 ----
  #: ../lib/WikiUser.php:194
  msgid "You can log in using any valid WikiWord as a user ID."
! msgstr "Du kannst mit irgendeines gültiges WikiWort als Benutzername anmelden."
  
  #: ../lib/WikiUser.php:195
***************
*** 497,504 ****
  "natürlich nicht für den Systemverwalter.)"
  
  #: ../lib/diff.php:172
! #, fuzzy, c-format
  msgid "version %s"
! msgstr "Version %d."
  
  #: ../lib/diff.php:175
--- 585,596 ----
  "natürlich nicht für den Systemverwalter.)"
  
+ #: ../lib/config.php:271
+ msgid "An unnamed PhpWiki"
+ msgstr "Ein unbenantes PhpWiki"
+ 
  #: ../lib/diff.php:172
! #, c-format
  msgid "version %s"
! msgstr "Version %s."
  
  #: ../lib/diff.php:175
***************
*** 681,685 ****
  #, c-format
  msgid "Bad file type: %s"
! msgstr "Filetyp von %s ungültig"
  
  #: ../lib/loadsave.php:414
--- 773,777 ----
  #, c-format
  msgid "Bad file type: %s"
! msgstr "Ungültiger Filetyp: %s"
  
  #: ../lib/loadsave.php:414
***************
*** 710,713 ****
--- 802,814 ----
  msgstr "In dieses Wikis wurde die Tatigkeit »%s« nicht erlauben."
  
+ #: ../lib/main.php:185
+ msgid "lock or unlock pages"
+ msgstr "Seiten zu sperren oder freigeben"
+ 
+ #: ../lib/main.php:219
+ #, c-format
+ msgid "Bad action: '%s'"
+ msgstr "Ungültiges Tätigkeit: »%s«"
+ 
  #: ../lib/prepend.php:31
  msgid "WikiFatalError"
***************
*** 817,821 ****
  msgstr "Deine besondere Aufmerksamkeit für Details wird sehr geschätzt."
  
! #: ../lib/stdlib.php:134
  msgid "BAD URL -- remove all of <, >, \""
  msgstr "URL Formfehler -- aller Zeichen <, >, \" wegnehmen"
--- 918,926 ----
  msgstr "Deine besondere Aufmerksamkeit für Details wird sehr geschätzt."
  
! #: ../lib/savepage.php:162
! msgid "Warning!"
! msgstr "Warnung!"
! 
! #: ../lib/stdlib.php:134 ../lib/stdlib.php:199
  msgid "BAD URL -- remove all of <, >, \""
  msgstr "URL Formfehler -- aller Zeichen <, >, \" wegnehmen"
***************
*** 849,856 ****
--- 954,1012 ----
  msgstr "Es tut mir leid.  Version %d. von %s war nicht in meine Datenbank."
  
+ #: ../lib/stdlib.php:684
+ #, c-format
+ msgid "Can't mix '%s' with '%s' type format strings"
+ msgstr ""
+ 
+ #: ../lib/stdlib.php:692
+ #, c-format
+ msgid "%s: argument index out of range"
+ msgstr "%s: Index des Arguments außer Reichweite"
+ 
  #: ../lib/transform.php:108
  msgid "Lists nested too deep in SetHTMLOutputMode"
  msgstr "Interner Fehler: Stackgrenze in SetHTMLOutputMode überschritten."
  
+ #: ../lib/ziplib.php:161 ../lib/ziplib.php:163 ../lib/ziplib.php:165
+ #: ../lib/ziplib.php:563 ../lib/ziplib.php:659
+ #, c-format
+ msgid "Bad %s"
+ msgstr "Ungültige %s"
+ 
+ #: ../lib/ziplib.php:183
+ msgid "Can't inflate data: zlib support not enabled in this PHP"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:361
+ #, c-format
+ msgid "Can't open zip file '%s' for reading"
+ msgstr "Konnte zip Datei »%s« nich öffnen zum lesen"
+ 
+ #: ../lib/ziplib.php:367
+ msgid "Unexpected EOF in zip file"
+ msgstr "Unerwartetes Dateiende in zip Datei"
+ 
+ #: ../lib/ziplib.php:391
+ #, c-format
+ msgid "Bad header type: %s"
+ msgstr "Ungültiger Dateikopf form: %s "
+ 
+ #: ../lib/ziplib.php:395
+ msgid "Encryption and/or zip patches not supported."
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:397
+ msgid "Postponed CRC not yet supported."
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:416
+ #, c-format
+ msgid "Compression method %s unsupported"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:419
+ msgid "Uncompressed size mismatch"
+ msgstr "Größe des Dekomprimierte Datei stimmt nicht"
+ 
  #: ../lib/ziplib.php:622
  #, c-format
***************
*** 859,864 ****
  
  #: ../lib/ziplib.php:630
! msgid "!References"
! msgstr "!Fußnoten"
  
  #: ../lib/ziplib.php:651
--- 1015,1020 ----
  
  #: ../lib/ziplib.php:630
! msgid "References"
! msgstr "Fußnoten"
  
  #: ../lib/ziplib.php:651
***************
*** 867,875 ****
  msgstr "Könnte %s nicht analysieren"
  
- #: ../lib/ziplib.php:659
- #, c-format
- msgid "Bad %s"
- msgstr "Ungültige %s"
- 
  #: ../lib/ziplib.php:704
  #, c-format
--- 1023,1026 ----
***************
*** 975,979 ****
  #: ../lib/WikiDB/backend/cvs.php:782
  msgid "Unable to obtain read lock."
! msgstr ""
  
  #: ../lib/WikiDB/backend/cvs.php:789
--- 1126,1130 ----
  #: ../lib/WikiDB/backend/cvs.php:782
  msgid "Unable to obtain read lock."
! msgstr "Konnte Dateischloß nicht beschaffen zum lesen."
  
  #: ../lib/WikiDB/backend/cvs.php:789
***************
*** 984,988 ****
  #: ../lib/WikiDB/backend/cvs.php:808
  msgid "Timeout while obtaining lock."
! msgstr ""
  
  #: ../lib/WikiDB/backend/cvs.php:817
--- 1135,1139 ----
  #: ../lib/WikiDB/backend/cvs.php:808
  msgid "Timeout while obtaining lock."
! msgstr "Zeitüberschreitung während Dateischloß beschaffen"
  
  #: ../lib/WikiDB/backend/cvs.php:817
***************
*** 1022,1031 ****
  #, c-format
  msgid "Bad key in linktable: %s"
! msgstr "%s: Ungültiges Datenschlüssel in Links-Tabelle"
  
  #: ../lib/WikiDB/backend/dbaBase.php:352
  #, c-format
  msgid "Bad key %s in table"
! msgstr "Datenschlüssel %s in Tabelle ist Ungültig"
  
  #: ../lib/WikiDB/backend/dbaBase.php:360
--- 1173,1182 ----
  #, c-format
  msgid "Bad key in linktable: %s"
! msgstr "Ungültiger Datenschlüssel in Links-Tabelle: %s"
  
  #: ../lib/WikiDB/backend/dbaBase.php:352
  #, c-format
  msgid "Bad key %s in table"
! msgstr "Ungültiger Datenschlüssel %s in Tabelle"
  
  #: ../lib/WikiDB/backend/dbaBase.php:360

[phpwiki-checkins] CVS: phpwiki/locale/de/LC_MESSAGES phpwiki.php,1.32,1.33

[Carsten K. <car...@us...>]

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

Modified Files:
	phpwiki.php 
Log Message:
some new strings added, and a few more translated

Index: phpwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES/phpwiki.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** phpwiki.php	2001/12/27 22:15:28	1.32
--- phpwiki.php	2001/12/28 11:23:06	1.33
***************
*** 1,6 ****
  <?php
  
- $locale["!References"] =
-    "!Fußnoten";
  $locale["%d best incoming links:"] =
     "Die %d besten hereinkommenden Links:";
--- 1,4 ----
***************
*** 11,18 ****
--- 9,22 ----
  $locale["%s bytes written"] =
     "%s Bytes geschrieben";
+ $locale["%s failed"] =
+    "%s hat verfehlt";
  $locale["%s(%d): no such revision"] =
     "Es gibt keine Revision als %s(%d)";
  $locale["%s: Can't open dba database"] =
     "%s: Konnte dba Datenbank nich öffnen.";
+ $locale["%s: argument index out of range"] =
+    "%s: Index des Arguments außer Reichweite";
+ $locale["%s: file not found"] =
+    "%s Datei nicht gefunden";
  $locale["(Any password will work, except, of course for the admin user.)"] =
     "(Irgende Wörter können als Passwort angenommen werden sowieso, aber natürlich nicht für den Systemverwalter.)";
***************
*** 35,38 ****
--- 39,44 ----
  $locale["All %s are listed below."] =
     "Alle %s sind unten auflistet.";
+ $locale["An unnamed PhpWiki"] =
+    "Ein unbenantes PhpWiki";
  $locale["Argument %s was not array"] =
     "Argument %s war nicht array";
***************
*** 47,60 ****
  $locale["Bad Version"] =
     "Version nicht vorliegend";
  $locale["Bad file type: %s"] =
!    "Filetyp von %s ungültig";
  $locale["Bad key %s in table"] =
!    "Datenschlüssel %s in Tabelle ist Ungültig";
  $locale["Bad key in linktable: %s"] =
!    "%s: Ungültiges Datenschlüssel in Links-Tabelle";
  $locale["Calendar"] =
     "Kalender";
  $locale["Can't connect to database: %s"] =
     "Kann Verbindung zu Datenbank nicht aufbauen: %s";
  $locale["Can't parse %s"] =
     "Könnte %s nicht analysieren";
--- 53,74 ----
  $locale["Bad Version"] =
     "Version nicht vorliegend";
+ $locale["Bad action: '%s'"] =
+    "Ungültiges Tätigkeit: »%s«";
  $locale["Bad file type: %s"] =
!    "Ungültiger Filetyp: %s";
! $locale["Bad header type: %s"] =
!    "Ungültiger Dateikopf form: %s ";
  $locale["Bad key %s in table"] =
!    "Ungültiger Datenschlüssel %s in Tabelle";
  $locale["Bad key in linktable: %s"] =
!    "Ungültiger Datenschlüssel in Links-Tabelle: %s";
! $locale["Before you can edit %s, you need to sign in."] =
!    "Bevor du %s editieren kannst, du mußt dich anmelden.";
  $locale["Calendar"] =
     "Kalender";
  $locale["Can't connect to database: %s"] =
     "Kann Verbindung zu Datenbank nicht aufbauen: %s";
+ $locale["Can't open zip file '%s' for reading"] =
+    "Konnte zip Datei »%s« nich öffnen zum lesen";
  $locale["Can't parse %s"] =
     "Könnte %s nicht analysieren";
***************
*** 91,96 ****
  $locale["Deleted."] =
     "Gelöscht.";
! $locale["Describe [%s] here."] =
!    "Beschreibe [%s] hier.";
  $locale["Diff"] =
     "Diff";
--- 105,110 ----
  $locale["Deleted."] =
     "Gelöscht.";
! $locale["Describe %s here."] =
!    "Beschreibe %s hier.";
  $locale["Diff"] =
     "Diff";
***************
*** 201,204 ****
--- 215,220 ----
  $locale["Older page:"] =
     "Altere Seite:";
+ $locale["Optimizing %s"] =
+    "%s wird optimiert";
  $locale["Other diffs:"] =
     "Andere Differenzen:";
***************
*** 249,252 ****
--- 265,270 ----
  $locale["RecentEdits"] =
     "GeringeÄnderungen";
+ $locale["References"] =
+    "Fußnoten";
  $locale["Remove page"] =
     "Seite löschen";
***************
*** 267,270 ****
--- 285,290 ----
  $locale["Serialized file %s"] =
     "Seriell-Datei %s";
+ $locale["Sign in:"] =
+    "Melde dich an:";
  $locale["SignIn"] =
     "AnMelden";
***************
*** 288,292 ****
     "Die %d Jüngste %s sind unten auflistet.";
  $locale["The %d most recent %s during the past %.1f days are listed below."] =
!    "Die %d Jüngste %s innerhalb %.1f Tagen sind unten auflistet.";
  $locale["The %s most popular pages of this wiki:"] =
     "Die %s meistbesuchten Seiten dieses Wikis:";
--- 308,312 ----
     "Die %d Jüngste %s sind unten auflistet.";
  $locale["The %d most recent %s during the past %.1f days are listed below."] =
!    "Die %d Jüngste %s innerhalb von %.1f Tagen sind unten auflistet.";
  $locale["The %s most popular pages of this wiki:"] =
     "Die %s meistbesuchten Seiten dieses Wikis:";
***************
*** 294,298 ****
     "Die Team-PhpWiki Programmierer";
  $locale["The most recent %s during the past %.1f days are listed below."] =
!    "Die Jüngste %s innerhalb %.1f Tagen sind unten auflistet.";
  $locale["These pages link to %s:"] =
     "Diese Seiten sind in Verbindung mit %s:";
--- 314,318 ----
     "Die Team-PhpWiki Programmierer";
  $locale["The most recent %s during the past %.1f days are listed below."] =
!    "Die Jüngste %s innerhalb von %.1f Tagen sind unten auflistet.";
  $locale["These pages link to %s:"] =
     "Diese Seiten sind in Verbindung mit %s:";
***************
*** 303,306 ****
--- 323,328 ----
  $locale["This page has been locked by the administrator and cannot be edited."] =
     "Diese Seite wurde vom Systemverwalter gesperrt und kann nicht editiert werden.";
+ $locale["Timeout while obtaining lock."] =
+    "Zeitüberschreitung während Dateischloß beschaffen";
  $locale["Title Search"] =
     "Titelsuche";
***************
*** 311,318 ****
--- 333,346 ----
  $locale["To cancel press the \"Back\" button of your browser."] =
     "Anderenfalls benütze die »Zurück« Funktion deines Browsers.";
+ $locale["Unable to obtain read lock."] =
+    "Konnte Dateischloß nicht beschaffen zum lesen.";
  $locale["Unable to open file"] =
     "Datei könnte nicht geöffnet werden.";
  $locale["Unable to open file '%s' for reading"] =
     "Konnte der Datei »%s« nich öffnen um einzuspeichern";
+ $locale["Uncompressed size mismatch"] =
+    "Größe des Dekomprimierte Datei stimmt nicht";
+ $locale["Unexpected EOF in zip file"] =
+    "Unerwartetes Dateiende in zip Datei";
  $locale["Unknown %s"] =
     "Unbekannte %s";
***************
*** 337,340 ****
--- 365,370 ----
  $locale["WARNING: database still locked"] =
     "WARNUNG: Datenbank ist gesperrt";
+ $locale["Warning!"] =
+    "Warnung!";
  $locale["Warning: You are editing an old revision."] =
     "Warnung: Du editierst eine alte Revision.";
***************
*** 352,364 ****
     "Du kannst die Größe des Texteingabefensters in %s ändern.";
  $locale["You can log in using any valid WikiWord as a user ID."] =
!    "Du kannst mit jedes gultiges WikiWort als Benutzername AnMelden.";
  $locale["You entered an invalid login or password."] =
     "Du hast ein ungültiges Login oder Passwort eingegeben.";
  $locale["You have not made any changes."] =
     "Du hast keine Änderungen gemacht.";
! $locale["You must be logged in as an administrator"] =
!    "Du mußt dich als eine Systemverwalter AnMelden";
  $locale["You must set the administrator account and password before you can log in."] =
!    "Du mußt der Systemverwalter-Account mit Passwort zuerst schützen bevor du dich AnMelden kannst.";
  $locale["You must specify a directory to dump to"] =
     "Du mußt ein Sicherungsdateiverzeichnis spezifizieren.";
--- 382,394 ----
     "Du kannst die Größe des Texteingabefensters in %s ändern.";
  $locale["You can log in using any valid WikiWord as a user ID."] =
!    "Du kannst mit irgendeines gültiges WikiWort als Benutzername anmelden.";
  $locale["You entered an invalid login or password."] =
     "Du hast ein ungültiges Login oder Passwort eingegeben.";
  $locale["You have not made any changes."] =
     "Du hast keine Änderungen gemacht.";
! $locale["You must be logged in as an administrator %s"] =
!    "Du mußt dich als eine Systemverwalter anmelden %s";
  $locale["You must set the administrator account and password before you can log in."] =
!    "Du mußt der Systemverwalter-Account mit Passwort zuerst schützen bevor du dich anmelden kannst.";
  $locale["You must specify a directory to dump to"] =
     "Du mußt ein Sicherungsdateiverzeichnis spezifizieren.";
***************
*** 379,382 ****
--- 409,416 ----
  $locale["edits"] =
     "Änderungen";
+ $locale["error while handling error:"] =
+    "Fehler während die Fehlerbehandlung von:";
+ $locale["examples include: TomJefferson, AlexHamilton"] =
+    "Beispiele: HerrMustermann, UweUte";
  $locale["fatal database error"] =
     "fataler Datenbank Fehler";
***************
*** 393,396 ****
--- 427,432 ----
  $locale["link entry missing for backlink %s"] =
     "Es fehlt einer Link Datensatz für das BackLink %s";
+ $locale["lock or unlock pages"] =
+    "Seiten zu sperren oder freigeben";
  $locale["major edits"] =
     "Hauptänderungen";
***************
*** 427,430 ****
--- 463,468 ----
  $locale["version %d"] =
     "Version %d.";
+ $locale["version %s"] =
+    "Version %s.";
  
  ;?>

[phpwiki-checkins] CVS: phpwiki/locale/de/LC_MESSAGES phpwiki.mo,1.21,1.22

[Carsten K. <car...@us...>]

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

Modified Files:
	phpwiki.mo 
Log Message:
some new strings added, and a few more translated

Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
Binary files /tmp/cvskquNgt and /tmp/cvsMRnKcM differ

[phpwiki-checkins] CVS: phpwiki/locale/po sv.po,1.16,1.17

[Carsten K. <car...@us...>]

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

Modified Files:
	sv.po 
Log Message:
regenerated po files due to recent gettext()ification

Index: sv.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/sv.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** sv.po	2001/12/27 08:06:12	1.16
--- sv.po	2001/12/28 11:19:21	1.17
***************
*** 7,11 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.9\n"
! "POT-Creation-Date: 2001-12-27 00:19-0500\n"
  "PO-Revision-Date: 2001-01-27 01:58+0200\n"
  "Last-Translator: Jon Åslund <jo...@he...>\n"
--- 7,11 ----
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.9\n"
! "POT-Creation-Date: 2001-12-28 06:12-0500\n"
  "PO-Revision-Date: 2001-01-27 01:58+0200\n"
  "Last-Translator: Jon Åslund <jo...@he...>\n"
***************
*** 107,110 ****
--- 107,115 ----
  msgstr ""
  
+ #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:128
+ #: ../templates/browse.html:129
+ msgid "ViewMarkup"
+ msgstr ""
+ 
  #: ../templates/editpage.html:16 ../templates/editpage.html:25
  #: ../templates/editpage.html:26
***************
*** 431,434 ****
--- 436,484 ----
  msgstr ""
  
+ #: ../lib/plugin/UserPage.php:35
+ #, c-format
+ msgid "Your sysadmin has disallowed use of the %s plugin!"
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:41
+ msgid "You should be logged in now."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:47
+ #, c-format
+ msgid "Before you can edit %s, you need to sign in."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:50
+ msgid "The name you use to sign in must be in WikiWord format."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:55
+ msgid "examples include: TomJefferson, AlexHamilton"
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:63
+ msgid "Please re-enter your name in this form."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:71
+ msgid ""
+ "Please enter your name as WordsStrungTogether (e.g. John Smith as JohnSmith)."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:73
+ msgid "Sign in:"
+ msgstr ""
+ 
+ #: ../lib/plugin/ViewMarkup.php:16
+ #, c-format
+ msgid "View WikiMarkup for page '%s'."
+ msgstr ""
+ 
+ #: ../lib/plugin/ViewMarkup.php:42
+ #, c-format
+ msgid "Revealing WikiMarkup for page '%s':"
+ msgstr ""
+ 
  #: ../lib/plugin/_BackendInfo.php:14
  #, c-format
***************
*** 467,473 ****
  msgstr ""
  
  #: ../lib/WikiDB.php:837
  #, fuzzy, c-format
! msgid "Describe [%s] here."
  msgstr "Beskriv %s här."
  
--- 517,560 ----
  msgstr ""
  
+ #: ../lib/DbaDatabase.php:46 ../lib/ziplib.php:35 ../lib/ziplib.php:38
+ #: ../lib/ziplib.php:43 ../lib/ziplib.php:45 ../lib/ziplib.php:47
+ #: ../lib/ziplib.php:56 ../lib/ziplib.php:59 ../lib/ziplib.php:62
+ #: ../lib/ziplib.php:67
+ #, c-format
+ msgid "%s failed"
+ msgstr ""
+ 
+ #: ../lib/ErrorManager.php:138
+ msgid "error while handling error:"
+ msgstr ""
+ 
+ #: ../lib/FileFinder.php:82
+ #, c-format
+ msgid "%s: file not found"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:353
+ #, c-format
+ msgid "Attempt to delete most recent revision of '%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:401
+ #, c-format
+ msgid "Attempt to merge most recent revision of '%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:488
+ #, c-format
+ msgid "%s: Date of new revision is %s"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:513
+ #, c-format
+ msgid "Optimizing %s"
+ msgstr ""
+ 
  #: ../lib/WikiDB.php:837
  #, fuzzy, c-format
! msgid "Describe %s here."
  msgstr "Beskriv %s här."
  
***************
*** 482,486 ****
  
  #: ../lib/WikiUser.php:100
! msgid "You must be logged in as an administrator"
  msgstr ""
  
--- 569,574 ----
  
  #: ../lib/WikiUser.php:100
! #, c-format
! msgid "You must be logged in as an administrator %s"
  msgstr ""
  
***************
*** 502,505 ****
--- 590,597 ----
  msgstr ""
  
+ #: ../lib/config.php:271
+ msgid "An unnamed PhpWiki"
+ msgstr ""
+ 
  #: ../lib/diff.php:172
  #, fuzzy, c-format
***************
*** 717,720 ****
--- 809,822 ----
  msgstr ""
  
+ #: ../lib/main.php:185
+ #, fuzzy
+ msgid "lock or unlock pages"
+ msgstr "Ta bort sida"
+ 
+ #: ../lib/main.php:219
+ #, c-format
+ msgid "Bad action: '%s'"
+ msgstr ""
+ 
  #: ../lib/prepend.php:31
  msgid "WikiFatalError"
***************
*** 823,828 ****
  msgid "Your careful attention to detail is much appreciated."
  msgstr "Din omstänksamhet för detaljer är mycket uppskattad."
  
! #: ../lib/stdlib.php:134
  msgid "BAD URL -- remove all of <, >, \""
  msgstr ""
--- 925,934 ----
  msgid "Your careful attention to detail is much appreciated."
  msgstr "Din omstänksamhet för detaljer är mycket uppskattad."
+ 
+ #: ../lib/savepage.php:162
+ msgid "Warning!"
+ msgstr ""
  
! #: ../lib/stdlib.php:134 ../lib/stdlib.php:199
  msgid "BAD URL -- remove all of <, >, \""
  msgstr ""
***************
*** 857,860 ****
--- 963,976 ----
  msgstr ""
  
+ #: ../lib/stdlib.php:684
+ #, c-format
+ msgid "Can't mix '%s' with '%s' type format strings"
+ msgstr ""
+ 
+ #: ../lib/stdlib.php:692
+ #, c-format
+ msgid "%s: argument index out of range"
+ msgstr ""
+ 
  #: ../lib/transform.php:108
  #, fuzzy
***************
*** 862,865 ****
--- 978,1022 ----
  msgstr "Stackgräns överskriden i SetHTMLOutputMode"
  
+ #: ../lib/ziplib.php:161 ../lib/ziplib.php:163 ../lib/ziplib.php:165
+ #: ../lib/ziplib.php:563 ../lib/ziplib.php:659
+ #, c-format
+ msgid "Bad %s"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:183
+ msgid "Can't inflate data: zlib support not enabled in this PHP"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:361
+ #, c-format
+ msgid "Can't open zip file '%s' for reading"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:367
+ msgid "Unexpected EOF in zip file"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:391
+ #, c-format
+ msgid "Bad header type: %s"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:395
+ msgid "Encryption and/or zip patches not supported."
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:397
+ msgid "Postponed CRC not yet supported."
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:416
+ #, c-format
+ msgid "Compression method %s unsupported"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:419
+ msgid "Uncompressed size mismatch"
+ msgstr ""
+ 
  #: ../lib/ziplib.php:622
  #, c-format
***************
*** 868,872 ****
  
  #: ../lib/ziplib.php:630
! msgid "!References"
  msgstr ""
  
--- 1025,1029 ----
  
  #: ../lib/ziplib.php:630
! msgid "References"
  msgstr ""
  
***************
*** 874,882 ****
  #, c-format
  msgid "Can't parse %s"
- msgstr ""
- 
- #: ../lib/ziplib.php:659
- #, c-format
- msgid "Bad %s"
  msgstr ""
  
--- 1031,1034 ----

[phpwiki-checkins] CVS: phpwiki/locale/po phpwiki.pot,1.25,1.26

[Carsten K. <car...@us...>]

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

Modified Files:
	phpwiki.pot 
Log Message:
regenerated po files due to recent gettext()ification

Index: phpwiki.pot
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/phpwiki.pot,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** phpwiki.pot	2001/12/27 08:06:06	1.25
--- phpwiki.pot	2001/12/28 11:19:16	1.26
***************
*** 7,11 ****
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
! "POT-Creation-Date: 2001-12-27 00:19-0500\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--- 7,11 ----
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
! "POT-Creation-Date: 2001-12-28 06:12-0500\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
***************
*** 101,104 ****
--- 101,109 ----
  msgstr ""
  
+ #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:128
+ #: ../templates/browse.html:129
+ msgid "ViewMarkup"
+ msgstr ""
+ 
  #: ../templates/editpage.html:16 ../templates/editpage.html:25
  #: ../templates/editpage.html:26
***************
*** 420,423 ****
--- 425,473 ----
  msgstr ""
  
+ #: ../lib/plugin/UserPage.php:35
+ #, c-format
+ msgid "Your sysadmin has disallowed use of the %s plugin!"
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:41
+ msgid "You should be logged in now."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:47
+ #, c-format
+ msgid "Before you can edit %s, you need to sign in."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:50
+ msgid "The name you use to sign in must be in WikiWord format."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:55
+ msgid "examples include: TomJefferson, AlexHamilton"
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:63
+ msgid "Please re-enter your name in this form."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:71
+ msgid ""
+ "Please enter your name as WordsStrungTogether (e.g. John Smith as JohnSmith)."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:73
+ msgid "Sign in:"
+ msgstr ""
+ 
+ #: ../lib/plugin/ViewMarkup.php:16
+ #, c-format
+ msgid "View WikiMarkup for page '%s'."
+ msgstr ""
+ 
+ #: ../lib/plugin/ViewMarkup.php:42
+ #, c-format
+ msgid "Revealing WikiMarkup for page '%s':"
+ msgstr ""
+ 
  #: ../lib/plugin/_BackendInfo.php:14
  #, c-format
***************
*** 456,462 ****
  msgstr ""
  
  #: ../lib/WikiDB.php:837
  #, c-format
! msgid "Describe [%s] here."
  msgstr ""
  
--- 506,549 ----
  msgstr ""
  
+ #: ../lib/DbaDatabase.php:46 ../lib/ziplib.php:35 ../lib/ziplib.php:38
+ #: ../lib/ziplib.php:43 ../lib/ziplib.php:45 ../lib/ziplib.php:47
+ #: ../lib/ziplib.php:56 ../lib/ziplib.php:59 ../lib/ziplib.php:62
+ #: ../lib/ziplib.php:67
+ #, c-format
+ msgid "%s failed"
+ msgstr ""
+ 
+ #: ../lib/ErrorManager.php:138
+ msgid "error while handling error:"
+ msgstr ""
+ 
+ #: ../lib/FileFinder.php:82
+ #, c-format
+ msgid "%s: file not found"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:353
+ #, c-format
+ msgid "Attempt to delete most recent revision of '%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:401
+ #, c-format
+ msgid "Attempt to merge most recent revision of '%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:488
+ #, c-format
+ msgid "%s: Date of new revision is %s"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:513
+ #, c-format
+ msgid "Optimizing %s"
+ msgstr ""
+ 
  #: ../lib/WikiDB.php:837
  #, c-format
! msgid "Describe %s here."
  msgstr ""
  
***************
*** 471,475 ****
  
  #: ../lib/WikiUser.php:100
! msgid "You must be logged in as an administrator"
  msgstr ""
  
--- 558,563 ----
  
  #: ../lib/WikiUser.php:100
! #, c-format
! msgid "You must be logged in as an administrator %s"
  msgstr ""
  
***************
*** 491,494 ****
--- 579,586 ----
  msgstr ""
  
+ #: ../lib/config.php:271
+ msgid "An unnamed PhpWiki"
+ msgstr ""
+ 
  #: ../lib/diff.php:172
  #, c-format
***************
*** 702,705 ****
--- 794,806 ----
  msgstr ""
  
+ #: ../lib/main.php:185
+ msgid "lock or unlock pages"
+ msgstr ""
+ 
+ #: ../lib/main.php:219
+ #, c-format
+ msgid "Bad action: '%s'"
+ msgstr ""
+ 
  #: ../lib/prepend.php:31
  msgid "WikiFatalError"
***************
*** 796,801 ****
  msgid "Your careful attention to detail is much appreciated."
  msgstr ""
  
! #: ../lib/stdlib.php:134
  msgid "BAD URL -- remove all of <, >, \""
  msgstr ""
--- 897,906 ----
  msgid "Your careful attention to detail is much appreciated."
  msgstr ""
+ 
+ #: ../lib/savepage.php:162
+ msgid "Warning!"
+ msgstr ""
  
! #: ../lib/stdlib.php:134 ../lib/stdlib.php:199
  msgid "BAD URL -- remove all of <, >, \""
  msgstr ""
***************
*** 829,836 ****
--- 934,992 ----
  msgstr ""
  
+ #: ../lib/stdlib.php:684
+ #, c-format
+ msgid "Can't mix '%s' with '%s' type format strings"
+ msgstr ""
+ 
+ #: ../lib/stdlib.php:692
+ #, c-format
+ msgid "%s: argument index out of range"
+ msgstr ""
+ 
  #: ../lib/transform.php:108
  msgid "Lists nested too deep in SetHTMLOutputMode"
  msgstr ""
  
+ #: ../lib/ziplib.php:161 ../lib/ziplib.php:163 ../lib/ziplib.php:165
+ #: ../lib/ziplib.php:563 ../lib/ziplib.php:659
+ #, c-format
+ msgid "Bad %s"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:183
+ msgid "Can't inflate data: zlib support not enabled in this PHP"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:361
+ #, c-format
+ msgid "Can't open zip file '%s' for reading"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:367
+ msgid "Unexpected EOF in zip file"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:391
+ #, c-format
+ msgid "Bad header type: %s"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:395
+ msgid "Encryption and/or zip patches not supported."
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:397
+ msgid "Postponed CRC not yet supported."
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:416
+ #, c-format
+ msgid "Compression method %s unsupported"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:419
+ msgid "Uncompressed size mismatch"
+ msgstr ""
+ 
  #: ../lib/ziplib.php:622
  #, c-format
***************
*** 839,843 ****
  
  #: ../lib/ziplib.php:630
! msgid "!References"
  msgstr ""
  
--- 995,999 ----
  
  #: ../lib/ziplib.php:630
! msgid "References"
  msgstr ""
  
***************
*** 845,853 ****
  #, c-format
  msgid "Can't parse %s"
- msgstr ""
- 
- #: ../lib/ziplib.php:659
- #, c-format
- msgid "Bad %s"
  msgstr ""
  
--- 1001,1004 ----

[phpwiki-checkins] CVS: phpwiki/locale/po nl.po,1.24,1.25

[Carsten K. <car...@us...>]

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

Modified Files:
	nl.po 
Log Message:
regenerated po files due to recent gettext()ification

Index: nl.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/nl.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** nl.po	2001/12/27 08:06:01	1.24
--- nl.po	2001/12/28 11:19:11	1.25
***************
*** 11,15 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.7\n"
! "POT-Creation-Date: 2001-12-27 00:19-0500\n"
  "PO-Revision-Date: 2000-09-30 02:23+0200\n"
  "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
--- 11,15 ----
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.7\n"
! "POT-Creation-Date: 2001-12-28 06:12-0500\n"
  "PO-Revision-Date: 2000-09-30 02:23+0200\n"
  "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
***************
*** 113,116 ****
--- 113,121 ----
  msgstr ""
  
+ #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:128
+ #: ../templates/browse.html:129
+ msgid "ViewMarkup"
+ msgstr ""
+ 
  #: ../templates/editpage.html:16 ../templates/editpage.html:25
  #: ../templates/editpage.html:26
***************
*** 438,441 ****
--- 443,491 ----
  msgstr ""
  
+ #: ../lib/plugin/UserPage.php:35
+ #, c-format
+ msgid "Your sysadmin has disallowed use of the %s plugin!"
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:41
+ msgid "You should be logged in now."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:47
+ #, c-format
+ msgid "Before you can edit %s, you need to sign in."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:50
+ msgid "The name you use to sign in must be in WikiWord format."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:55
+ msgid "examples include: TomJefferson, AlexHamilton"
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:63
+ msgid "Please re-enter your name in this form."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:71
+ msgid ""
+ "Please enter your name as WordsStrungTogether (e.g. John Smith as JohnSmith)."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:73
+ msgid "Sign in:"
+ msgstr ""
+ 
+ #: ../lib/plugin/ViewMarkup.php:16
+ #, c-format
+ msgid "View WikiMarkup for page '%s'."
+ msgstr ""
+ 
+ #: ../lib/plugin/ViewMarkup.php:42
+ #, c-format
+ msgid "Revealing WikiMarkup for page '%s':"
+ msgstr ""
+ 
  #: ../lib/plugin/_BackendInfo.php:14
  #, c-format
***************
*** 474,480 ****
  msgstr ""
  
  #: ../lib/WikiDB.php:837
  #, fuzzy, c-format
! msgid "Describe [%s] here."
  msgstr "Beschrijf %s hier."
  
--- 524,567 ----
  msgstr ""
  
+ #: ../lib/DbaDatabase.php:46 ../lib/ziplib.php:35 ../lib/ziplib.php:38
+ #: ../lib/ziplib.php:43 ../lib/ziplib.php:45 ../lib/ziplib.php:47
+ #: ../lib/ziplib.php:56 ../lib/ziplib.php:59 ../lib/ziplib.php:62
+ #: ../lib/ziplib.php:67
+ #, c-format
+ msgid "%s failed"
+ msgstr ""
+ 
+ #: ../lib/ErrorManager.php:138
+ msgid "error while handling error:"
+ msgstr ""
+ 
+ #: ../lib/FileFinder.php:82
+ #, c-format
+ msgid "%s: file not found"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:353
+ #, c-format
+ msgid "Attempt to delete most recent revision of '%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:401
+ #, c-format
+ msgid "Attempt to merge most recent revision of '%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:488
+ #, c-format
+ msgid "%s: Date of new revision is %s"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:513
+ #, c-format
+ msgid "Optimizing %s"
+ msgstr ""
+ 
  #: ../lib/WikiDB.php:837
  #, fuzzy, c-format
! msgid "Describe %s here."
  msgstr "Beschrijf %s hier."
  
***************
*** 489,494 ****
  
  #: ../lib/WikiUser.php:100
! #, fuzzy
! msgid "You must be logged in as an administrator"
  msgstr "Je moet ingelogd zijn als beheerder om te $action."
  
--- 576,581 ----
  
  #: ../lib/WikiUser.php:100
! #, fuzzy, c-format
! msgid "You must be logged in as an administrator %s"
  msgstr "Je moet ingelogd zijn als beheerder om te $action."
  
***************
*** 512,515 ****
--- 599,606 ----
  msgstr ""
  
+ #: ../lib/config.php:271
+ msgid "An unnamed PhpWiki"
+ msgstr ""
+ 
  #: ../lib/diff.php:172
  #, fuzzy, c-format
***************
*** 727,730 ****
--- 818,831 ----
  msgstr "Actie $action is niet beschikbaar in deze wiki."
  
+ #: ../lib/main.php:185
+ #, fuzzy
+ msgid "lock or unlock pages"
+ msgstr "Verwijder pagina"
+ 
+ #: ../lib/main.php:219
+ #, c-format
+ msgid "Bad action: '%s'"
+ msgstr ""
+ 
  #: ../lib/prepend.php:31
  msgid "WikiFatalError"
***************
*** 834,839 ****
  msgid "Your careful attention to detail is much appreciated."
  msgstr "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd."
  
! #: ../lib/stdlib.php:134
  msgid "BAD URL -- remove all of <, >, \""
  msgstr ""
--- 935,944 ----
  msgid "Your careful attention to detail is much appreciated."
  msgstr "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd."
+ 
+ #: ../lib/savepage.php:162
+ msgid "Warning!"
+ msgstr ""
  
! #: ../lib/stdlib.php:134 ../lib/stdlib.php:199
  msgid "BAD URL -- remove all of <, >, \""
  msgstr ""
***************
*** 868,875 ****
--- 973,1031 ----
  msgstr ""
  
+ #: ../lib/stdlib.php:684
+ #, c-format
+ msgid "Can't mix '%s' with '%s' type format strings"
+ msgstr ""
+ 
+ #: ../lib/stdlib.php:692
+ #, c-format
+ msgid "%s: argument index out of range"
+ msgstr ""
+ 
  #: ../lib/transform.php:108
  msgid "Lists nested too deep in SetHTMLOutputMode"
  msgstr "Lijsten nesten te diep in SetHTMLOutputMode"
  
+ #: ../lib/ziplib.php:161 ../lib/ziplib.php:163 ../lib/ziplib.php:165
+ #: ../lib/ziplib.php:563 ../lib/ziplib.php:659
+ #, c-format
+ msgid "Bad %s"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:183
+ msgid "Can't inflate data: zlib support not enabled in this PHP"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:361
+ #, c-format
+ msgid "Can't open zip file '%s' for reading"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:367
+ msgid "Unexpected EOF in zip file"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:391
+ #, c-format
+ msgid "Bad header type: %s"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:395
+ msgid "Encryption and/or zip patches not supported."
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:397
+ msgid "Postponed CRC not yet supported."
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:416
+ #, c-format
+ msgid "Compression method %s unsupported"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:419
+ msgid "Uncompressed size mismatch"
+ msgstr ""
+ 
  #: ../lib/ziplib.php:622
  #, c-format
***************
*** 878,882 ****
  
  #: ../lib/ziplib.php:630
! msgid "!References"
  msgstr "!Referenties"
  
--- 1034,1039 ----
  
  #: ../lib/ziplib.php:630
! #, fuzzy
! msgid "References"
  msgstr "!Referenties"
  
***************
*** 884,892 ****
  #, c-format
  msgid "Can't parse %s"
- msgstr ""
- 
- #: ../lib/ziplib.php:659
- #, c-format
- msgid "Bad %s"
  msgstr ""
  
--- 1041,1044 ----

[phpwiki-checkins] CVS: phpwiki/locale/po it.po,1.13,1.14

[Carsten K. <car...@us...>]

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

Modified Files:
	it.po 
Log Message:
regenerated po files due to recent gettext()ification

Index: it.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/it.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** it.po	2001/12/27 08:05:56	1.13
--- it.po	2001/12/28 11:19:07	1.14
***************
*** 7,11 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.2.0\n"
! "POT-Creation-Date: 2001-12-27 00:19-0500\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: Marco Milanesi <kp...@ad...>\n"
--- 7,11 ----
  msgstr ""
  "Project-Id-Version: phpwiki 1.2.0\n"
! "POT-Creation-Date: 2001-12-28 06:12-0500\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: Marco Milanesi <kp...@ad...>\n"
***************
*** 108,111 ****
--- 108,116 ----
  msgstr ""
  
+ #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:128
+ #: ../templates/browse.html:129
+ msgid "ViewMarkup"
+ msgstr ""
+ 
  #: ../templates/editpage.html:16 ../templates/editpage.html:25
  #: ../templates/editpage.html:26
***************
*** 434,437 ****
--- 439,487 ----
  msgstr ""
  
+ #: ../lib/plugin/UserPage.php:35
+ #, c-format
+ msgid "Your sysadmin has disallowed use of the %s plugin!"
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:41
+ msgid "You should be logged in now."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:47
+ #, c-format
+ msgid "Before you can edit %s, you need to sign in."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:50
+ msgid "The name you use to sign in must be in WikiWord format."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:55
+ msgid "examples include: TomJefferson, AlexHamilton"
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:63
+ msgid "Please re-enter your name in this form."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:71
+ msgid ""
+ "Please enter your name as WordsStrungTogether (e.g. John Smith as JohnSmith)."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:73
+ msgid "Sign in:"
+ msgstr ""
+ 
+ #: ../lib/plugin/ViewMarkup.php:16
+ #, c-format
+ msgid "View WikiMarkup for page '%s'."
+ msgstr ""
+ 
+ #: ../lib/plugin/ViewMarkup.php:42
+ #, c-format
+ msgid "Revealing WikiMarkup for page '%s':"
+ msgstr ""
+ 
  #: ../lib/plugin/_BackendInfo.php:14
  #, c-format
***************
*** 470,476 ****
  msgstr ""
  
  #: ../lib/WikiDB.php:837
  #, fuzzy, c-format
! msgid "Describe [%s] here."
  msgstr "Descrivi %s qui"
  
--- 520,563 ----
  msgstr ""
  
+ #: ../lib/DbaDatabase.php:46 ../lib/ziplib.php:35 ../lib/ziplib.php:38
+ #: ../lib/ziplib.php:43 ../lib/ziplib.php:45 ../lib/ziplib.php:47
+ #: ../lib/ziplib.php:56 ../lib/ziplib.php:59 ../lib/ziplib.php:62
+ #: ../lib/ziplib.php:67
+ #, c-format
+ msgid "%s failed"
+ msgstr ""
+ 
+ #: ../lib/ErrorManager.php:138
+ msgid "error while handling error:"
+ msgstr ""
+ 
+ #: ../lib/FileFinder.php:82
+ #, c-format
+ msgid "%s: file not found"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:353
+ #, c-format
+ msgid "Attempt to delete most recent revision of '%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:401
+ #, c-format
+ msgid "Attempt to merge most recent revision of '%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:488
+ #, c-format
+ msgid "%s: Date of new revision is %s"
+ msgstr ""
+ 
+ #: ../lib/WikiDB.php:513
+ #, c-format
+ msgid "Optimizing %s"
+ msgstr ""
+ 
  #: ../lib/WikiDB.php:837
  #, fuzzy, c-format
! msgid "Describe %s here."
  msgstr "Descrivi %s qui"
  
***************
*** 485,489 ****
  
  #: ../lib/WikiUser.php:100
! msgid "You must be logged in as an administrator"
  msgstr ""
  
--- 572,577 ----
  
  #: ../lib/WikiUser.php:100
! #, c-format
! msgid "You must be logged in as an administrator %s"
  msgstr ""
  
***************
*** 505,508 ****
--- 593,600 ----
  msgstr ""
  
+ #: ../lib/config.php:271
+ msgid "An unnamed PhpWiki"
+ msgstr ""
+ 
  #: ../lib/diff.php:172
  #, fuzzy, c-format
***************
*** 722,725 ****
--- 814,827 ----
  msgstr ""
  
+ #: ../lib/main.php:185
+ #, fuzzy
+ msgid "lock or unlock pages"
+ msgstr "Rimuovi la pagina"
+ 
+ #: ../lib/main.php:219
+ #, c-format
+ msgid "Bad action: '%s'"
+ msgstr ""
+ 
  #: ../lib/prepend.php:31
  msgid "WikiFatalError"
***************
*** 828,833 ****
  msgid "Your careful attention to detail is much appreciated."
  msgstr "La tua cura verso il dettaglio &egrave; molto apprezzata."
  
! #: ../lib/stdlib.php:134
  msgid "BAD URL -- remove all of <, >, \""
  msgstr ""
--- 930,939 ----
  msgid "Your careful attention to detail is much appreciated."
  msgstr "La tua cura verso il dettaglio &egrave; molto apprezzata."
+ 
+ #: ../lib/savepage.php:162
+ msgid "Warning!"
+ msgstr ""
  
! #: ../lib/stdlib.php:134 ../lib/stdlib.php:199
  msgid "BAD URL -- remove all of <, >, \""
  msgstr ""
***************
*** 862,869 ****
--- 968,1026 ----
  msgstr ""
  
+ #: ../lib/stdlib.php:684
+ #, c-format
+ msgid "Can't mix '%s' with '%s' type format strings"
+ msgstr ""
+ 
+ #: ../lib/stdlib.php:692
+ #, c-format
+ msgid "%s: argument index out of range"
+ msgstr ""
+ 
  #: ../lib/transform.php:108
  msgid "Lists nested too deep in SetHTMLOutputMode"
  msgstr ""
  
+ #: ../lib/ziplib.php:161 ../lib/ziplib.php:163 ../lib/ziplib.php:165
+ #: ../lib/ziplib.php:563 ../lib/ziplib.php:659
+ #, c-format
+ msgid "Bad %s"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:183
+ msgid "Can't inflate data: zlib support not enabled in this PHP"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:361
+ #, c-format
+ msgid "Can't open zip file '%s' for reading"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:367
+ msgid "Unexpected EOF in zip file"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:391
+ #, c-format
+ msgid "Bad header type: %s"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:395
+ msgid "Encryption and/or zip patches not supported."
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:397
+ msgid "Postponed CRC not yet supported."
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:416
+ #, c-format
+ msgid "Compression method %s unsupported"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:419
+ msgid "Uncompressed size mismatch"
+ msgstr ""
+ 
  #: ../lib/ziplib.php:622
  #, c-format
***************
*** 872,876 ****
  
  #: ../lib/ziplib.php:630
! msgid "!References"
  msgstr ""
  
--- 1029,1033 ----
  
  #: ../lib/ziplib.php:630
! msgid "References"
  msgstr ""
  
***************
*** 878,886 ****
  #, c-format
  msgid "Can't parse %s"
- msgstr ""
- 
- #: ../lib/ziplib.php:659
- #, c-format
- msgid "Bad %s"
  msgstr ""
  
--- 1035,1038 ----

[phpwiki-checkins] CVS: phpwiki/locale/po es.po,1.21,1.22

[Carsten K. <car...@us...>]

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

Modified Files:
	es.po 
Log Message:
regenerated po files due to recent gettext()ification

Index: es.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/es.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** es.po	2001/12/27 08:05:50	1.21
--- es.po	2001/12/28 11:19:02	1.22
***************
*** 13,17 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.2.0\n"
! "POT-Creation-Date: 2001-12-27 00:19-0500\n"
  "PO-Revision-Date: 2000-02-01 00:50-0500\n"
  "Last-Translator: Pablo Roca <pr...@cl...>\n"
--- 13,17 ----
  msgstr ""
  "Project-Id-Version: phpwiki 1.2.0\n"
! "POT-Creation-Date: 2001-12-28 06:12-0500\n"
  "PO-Revision-Date: 2000-02-01 00:50-0500\n"
  "Last-Translator: Pablo Roca <pr...@cl...>\n"
***************
*** 113,116 ****
--- 113,121 ----
  msgstr ""
  
+ #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:128
+ #: ../templates/browse.html:129
+ msgid "ViewMarkup"
+ msgstr ""
+ 
  #: ../templates/editpage.html:16 ../templates/editpage.html:25
  #: ../templates/editpage.html:26
***************
*** 443,446 ****
--- 448,496 ----
  msgstr ""
  
+ #: ../lib/plugin/UserPage.php:35
+ #, c-format
+ msgid "Your sysadmin has disallowed use of the %s plugin!"
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:41
+ msgid "You should be logged in now."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:47
+ #, c-format
+ msgid "Before you can edit %s, you need to sign in."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:50
+ msgid "The name you use to sign in must be in WikiWord format."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:55
+ msgid "examples include: TomJefferson, AlexHamilton"
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:63
+ msgid "Please re-enter your name in this form."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:71
+ msgid ""
+ "Please enter your name as WordsStrungTogether (e.g. John Smith as JohnSmith)."
+ msgstr ""
+ 
+ #: ../lib/plugin/UserPage.php:73
+ msgid "Sign in:"
+ msgstr ""
+ 
+ #: ../lib/plugin/ViewMarkup.php:16
+ #, c-format
+ msgid "View WikiMarkup for page '%s'."
+ msgstr ""
+ 
+ #: ../lib/plugin/ViewMarkup.php:42
+ #, c-format
+ msgid "Revealing WikiMarkup for page '%s':"
+ msgstr ""
+ 
  #: ../lib/plugin/_BackendInfo.php:14
  #, c-format
***************
*** 479,485 ****
  msgstr ""
  
! #: ../lib/WikiDB.php:837
  #, c-format
! msgid "Describe [%s] here."
  msgstr "Describe [%s] aquí."
  
--- 529,572 ----
  msgstr ""
  
! #: ../lib/DbaDatabase.php:46 ../lib/ziplib.php:35 ../lib/ziplib.php:38
! #: ../lib/ziplib.php:43 ../lib/ziplib.php:45 ../lib/ziplib.php:47
! #: ../lib/ziplib.php:56 ../lib/ziplib.php:59 ../lib/ziplib.php:62
! #: ../lib/ziplib.php:67
! #, c-format
! msgid "%s failed"
! msgstr ""
! 
! #: ../lib/ErrorManager.php:138
! msgid "error while handling error:"
! msgstr ""
! 
! #: ../lib/FileFinder.php:82
! #, c-format
! msgid "%s: file not found"
! msgstr ""
! 
! #: ../lib/WikiDB.php:353
  #, c-format
! msgid "Attempt to delete most recent revision of '%s'"
! msgstr ""
! 
! #: ../lib/WikiDB.php:401
! #, c-format
! msgid "Attempt to merge most recent revision of '%s'"
! msgstr ""
! 
! #: ../lib/WikiDB.php:488
! #, c-format
! msgid "%s: Date of new revision is %s"
! msgstr ""
! 
! #: ../lib/WikiDB.php:513
! #, c-format
! msgid "Optimizing %s"
! msgstr ""
! 
! #: ../lib/WikiDB.php:837
! #, fuzzy, c-format
! msgid "Describe %s here."
  msgstr "Describe [%s] aquí."
  
***************
*** 494,498 ****
  
  #: ../lib/WikiUser.php:100
! msgid "You must be logged in as an administrator"
  msgstr ""
  
--- 581,586 ----
  
  #: ../lib/WikiUser.php:100
! #, c-format
! msgid "You must be logged in as an administrator %s"
  msgstr ""
  
***************
*** 514,517 ****
--- 602,609 ----
  msgstr ""
  
+ #: ../lib/config.php:271
+ msgid "An unnamed PhpWiki"
+ msgstr ""
+ 
  #: ../lib/diff.php:172
  #, fuzzy, c-format
***************
*** 730,733 ****
--- 822,835 ----
  msgstr ""
  
+ #: ../lib/main.php:185
+ #, fuzzy
+ msgid "lock or unlock pages"
+ msgstr "Desbloquear página"
+ 
+ #: ../lib/main.php:219
+ #, c-format
+ msgid "Bad action: '%s'"
+ msgstr ""
+ 
  #: ../lib/prepend.php:31
  msgid "WikiFatalError"
***************
*** 834,839 ****
  msgid "Your careful attention to detail is much appreciated."
  msgstr "Se agradece una cuidadosa atención a los detalles."
  
! #: ../lib/stdlib.php:134
  msgid "BAD URL -- remove all of <, >, \""
  msgstr ""
--- 936,945 ----
  msgid "Your careful attention to detail is much appreciated."
  msgstr "Se agradece una cuidadosa atención a los detalles."
+ 
+ #: ../lib/savepage.php:162
+ msgid "Warning!"
+ msgstr ""
  
! #: ../lib/stdlib.php:134 ../lib/stdlib.php:199
  msgid "BAD URL -- remove all of <, >, \""
  msgstr ""
***************
*** 867,870 ****
--- 973,986 ----
  msgstr ""
  
+ #: ../lib/stdlib.php:684
+ #, c-format
+ msgid "Can't mix '%s' with '%s' type format strings"
+ msgstr ""
+ 
+ #: ../lib/stdlib.php:692
+ #, c-format
+ msgid "%s: argument index out of range"
+ msgstr ""
+ 
  #: ../lib/transform.php:108
  #, fuzzy
***************
*** 872,875 ****
--- 988,1032 ----
  msgstr "Límites de la pila excedidos en SetHTMLOutputMode"
  
+ #: ../lib/ziplib.php:161 ../lib/ziplib.php:163 ../lib/ziplib.php:165
+ #: ../lib/ziplib.php:563 ../lib/ziplib.php:659
+ #, fuzzy, c-format
+ msgid "Bad %s"
+ msgstr "Editar"
+ 
+ #: ../lib/ziplib.php:183
+ msgid "Can't inflate data: zlib support not enabled in this PHP"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:361
+ #, c-format
+ msgid "Can't open zip file '%s' for reading"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:367
+ msgid "Unexpected EOF in zip file"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:391
+ #, c-format
+ msgid "Bad header type: %s"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:395
+ msgid "Encryption and/or zip patches not supported."
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:397
+ msgid "Postponed CRC not yet supported."
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:416
+ #, c-format
+ msgid "Compression method %s unsupported"
+ msgstr ""
+ 
+ #: ../lib/ziplib.php:419
+ msgid "Uncompressed size mismatch"
+ msgstr ""
+ 
  #: ../lib/ziplib.php:622
  #, c-format
***************
*** 878,883 ****
  
  #: ../lib/ziplib.php:630
! msgid "!References"
! msgstr ""
  
  #: ../lib/ziplib.php:651
--- 1035,1041 ----
  
  #: ../lib/ziplib.php:630
! #, fuzzy
! msgid "References"
! msgstr "Referencias:"
  
  #: ../lib/ziplib.php:651
***************
*** 886,894 ****
  msgstr ""
  
- #: ../lib/ziplib.php:659
- #, fuzzy, c-format
- msgid "Bad %s"
- msgstr "Editar"
- 
  #: ../lib/ziplib.php:704
  #, c-format
--- 1044,1047 ----
***************
*** 1117,1123 ****
  #~ msgid "for definition lists"
  #~ msgstr "para listas de definiciones"
- 
- #~ msgid "References:"
- #~ msgstr "Referencias:"
  
  #~ msgid ""
--- 1270,1273 ----

[phpwiki-checkins] CVS: phpwiki/lib/plugin UserPage.php,1.2,1.3

[Carsten K. <car...@us...>]

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

Modified Files:
	UserPage.php 
Log Message:
some html converted to element(), and gettext()-ified strings

Index: UserPage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/UserPage.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** UserPage.php	2001/12/21 00:50:51	1.2
--- UserPage.php	2001/12/28 11:12:21	1.3
***************
*** 32,37 ****
          extract($this->getArgs($argstr, $request));
          
!         if (! ALLOW_BOGO_LOGIN) 
!             return '<p> Your sysadmin has disallowed use of this plugin!';
              
          if ($uname && preg_match('/\A' . $WikiNameRegexp . '\z/', $uname)) {
--- 32,37 ----
          extract($this->getArgs($argstr, $request));
          
!         if (! ALLOW_BOGO_LOGIN)
!             return Element('p',sprintf(_("Your sysadmin has disallowed use of the %s plugin!"),"UserPage"));
              
          if ($uname && preg_match('/\A' . $WikiNameRegexp . '\z/', $uname)) {
***************
*** 39,43 ****
              if ($edit) $request->redirect(WikiURL($edit, array('action' => 'edit')));
              if ($browse) $request->redirect(WikiURL($browse));
!             return '<p> You should be logged in now.';
  
          } else {  // not logged in yet
--- 39,43 ----
              if ($edit) $request->redirect(WikiURL($edit, array('action' => 'edit')));
              if ($browse) $request->redirect(WikiURL($browse));
!             return Element('p',_("You should be logged in now."));
  
          } else {  // not logged in yet
***************
*** 45,61 ****
              if ($edit) {
                  $p = LinkWikiWord($edit);
!                 $text .= "<p> Before you can edit $p, you need to sign in.";
              }
              if ($uname && ! preg_match('/\A' . $WikiNameRegexp . '\z/', $uname)) {
!                 $wwf = LinkWikiWord('WikiWord');
!                 $text .= "<p> The name you use to sign in must be in $wwf format.";
!                 $text .= " examples include: <ul><li>TomJefferson<li>AlexHamilton";
!                 $text .= "<li>YoYoMa</ul>";
!                 $text .= "<p> Please re-enter your name in this form:";
              } else {
!                 $wst = LinkWikiWord('WordsStrungTogether');
!                 $text .= "<p> Please enter your name as $wst (e.g. John Smith as JohnSmith).";
              }
!             $text .= '<p><form>Sign in: <input type="text" name="uname">';
              foreach (array('edit', 'browse') as $k) 
                  if ($$k) {
--- 45,75 ----
              if ($edit) {
                  $p = LinkWikiWord($edit);
!                 $text .= Element('p',sprintf(_("Before you can edit %s, you need to sign in."),$p));
              }
              if ($uname && ! preg_match('/\A' . $WikiNameRegexp . '\z/', $uname)) {
!                 $text .= Element('p',_("The name you use to sign in must be in WikiWord format."));
! 
!                 // this 'list explosion' simply provides an
!                 // uncluttered _() string for the language translator
!                 // it could use some refactoring
!                 list($wne,$example_names) = explode(':', _("examples include: TomJefferson, AlexHamilton"));
!                 list($ea,$eb) = explode(",",$example_names);
!                 $text .= " $wne: <ul><li>$ea<li>$eb";
! 
!                 // Note: Don't _() the "YoYoMa", see:
!                 // <http://bsuvc.bsu.edu/~jdbrocklesby/yoyoma.htm>
!                 $text .= '<li>YoYoMa</ul>';
! 
!                 $text .= Element('p',_("Please re-enter your name in this form."));
              } else {
! 
!                 // temporary comment: in this case it may assist the
!                 // translator for grammar sake to see the complete
!                 // sentence without variable substitution ($wst,$wwf)
!                 // $wst = LinkWikiWord("WordsStrungTogether");
! 
!                 $text .= Element('p',_("Please enter your name as WordsStrungTogether (e.g. John Smith as JohnSmith)."));
              }
!             $text .= '<p><form>' ._("Sign in:"). ' <input type="text" name="uname">';
              foreach (array('edit', 'browse') as $k) 
                  if ($$k) {

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

[Carsten K. <car...@us...>]

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

Modified Files:
	ViewMarkup.php 
Log Message:
minor rewording

Index: ViewMarkup.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/ViewMarkup.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ViewMarkup.php	2001/12/28 03:42:31	1.1
--- ViewMarkup.php	2001/12/28 09:55:12	1.2
***************
*** 14,18 ****
  
      function getDescription () {
!         return sprintf(_("View WikiMarkup for '%s'."),'[pagename]');
      }
      
--- 14,18 ----
  
      function getDescription () {
!         return sprintf(_("View WikiMarkup for page '%s'."),'[pagename]');
      }
      

[phpwiki-checkins] CVS: phpwiki/lib ziplib.php,1.12,1.13

[Carsten K. <car...@us...>]

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

Modified Files:
	ziplib.php 
Log Message:
Found more strings needing gettext _() and sprintf. Error strings containing function names now use sprintf. Some debugging strings intentionally left alone.

Index: ziplib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ziplib.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** ziplib.php	2001/12/19 12:08:04	1.12
--- ziplib.php	2001/12/28 09:53:34	1.13
***************
*** 33,49 ****
    $filename = gzip_tempnam();
    if (!($fp = gzopen($filename, "wb")))
!       ExitWiki("gzopen failed");
    gzwrite($fp, $data, strlen($data));
    if (!gzclose($fp))
!       ExitWiki("gzclose failed");
      
    $size = filesize($filename);
  
    if (!($fp = fopen($filename, "rb")))
!       ExitWiki("fopen failed");
    if (!($z = fread($fp, $size)) || strlen($z) != $size)
!       ExitWiki("fread failed");
    if (!fclose($fp))
!       ExitWiki("fclose failed");
  
    unlink($filename);
--- 33,49 ----
    $filename = gzip_tempnam();
    if (!($fp = gzopen($filename, "wb")))
!       ExitWiki(sprintf(_("%s failed"),'gzopen'));
    gzwrite($fp, $data, strlen($data));
    if (!gzclose($fp))
!       ExitWiki(sprintf(_("%s failed"),'gzclose'));
      
    $size = filesize($filename);
  
    if (!($fp = fopen($filename, "rb")))
!       ExitWiki(sprintf(_("%s failed"),'fopen'));
    if (!($z = fread($fp, $size)) || strlen($z) != $size)
!       ExitWiki(sprintf(_("%s failed"),'fread'));
    if (!fclose($fp))
!       ExitWiki(sprintf(_("%s failed"),'fclose'));
  
    unlink($filename);
***************
*** 54,69 ****
    $filename = gzip_tempnam();
    if (!($fp = fopen($filename, "wb")))
!       ExitWiki("fopen failed");
    fwrite($fp, $data, strlen($data));
    if (!fclose($fp))
!       ExitWiki("fclose failed");
  
    if (!($fp = gzopen($filename, "rb")))
!       ExitWiki("gzopen failed");
    $unz = '';
    while ($buf = gzread($fp, 4096))
        $unz .= $buf;
    if (!gzclose($fp))
!       ExitWiki("gzclose failed");
  
    unlink($filename);
--- 54,69 ----
    $filename = gzip_tempnam();
    if (!($fp = fopen($filename, "wb")))
!       ExitWiki(sprintf(_("%s failed"),'fopen'));
    fwrite($fp, $data, strlen($data));
    if (!fclose($fp))
!       ExitWiki(sprintf(_("%s failed"),'fclose'));
  
    if (!($fp = gzopen($filename, "rb")))
!       ExitWiki(sprintf(_("%s failed"),'gzopen'));
    $unz = '';
    while ($buf = gzread($fp, 4096))
        $unz .= $buf;
    if (!gzclose($fp))
!       ExitWiki(sprintf(_("%s failed"),'gzclose'));
  
    unlink($filename);
***************
*** 159,167 ****
    
    if ($magic != GZIP_MAGIC)
!       ExitWiki("Bad gzip magic");
    if ($comp_type != GZIP_DEFLATE)
!       ExitWiki("Bad gzip comp type");
    if (($flags & 0x3e) != 0)
!       ExitWiki(sprintf("Bad flags (0x%02x)", $flags));
  
    $gz_header_len = 10;
--- 159,167 ----
    
    if ($magic != GZIP_MAGIC)
!       ExitWiki(sprintf(_("Bad %s"),"gzip magic"));
    if ($comp_type != GZIP_DEFLATE)
!       ExitWiki(sprintf(_("Bad %s"),"gzip comp type"));
    if (($flags & 0x3e) != 0)
!       ExitWiki(sprintf(_("Bad %s"),sprintf("flags (0x%02x)", $flags)));
  
    $gz_header_len = 10;
***************
*** 181,185 ****
  {
    if (!function_exists('gzopen'))
!       ExitWiki("Can't inflate data: zlib support not enabled in this PHP");
  
    // Reconstruct gzip header and ungzip the data.
--- 181,185 ----
  {
    if (!function_exists('gzopen'))
!       ExitWiki(_("Can't inflate data: zlib support not enabled in this PHP"));
  
    // Reconstruct gzip header and ungzip the data.
***************
*** 359,363 ****
  	$this->fp = $zipfile;	// File already open
      else if (!($this->fp = fopen($zipfile, "rb")))
! 	ExitWiki("Can't open zip file '$zipfile' for reading");
    }
  
--- 359,363 ----
  	$this->fp = $zipfile;	// File already open
      else if (!($this->fp = fopen($zipfile, "rb")))
! 	ExitWiki(sprintf(_("Can't open zip file '%s' for reading"),$zipfile));
    }
  
***************
*** 365,369 ****
      $chunk = fread($this->fp, $nbytes);
      if (strlen($chunk) != $nbytes)
! 	ExitWiki("Unexpected EOF in zip file");
      return $chunk;
    }
--- 365,369 ----
      $chunk = fread($this->fp, $nbytes);
      if (strlen($chunk) != $nbytes)
! 	ExitWiki(_("Unexpected EOF in zip file"));
      return $chunk;
    }
***************
*** 389,399 ****
        {
  	if ($magic != ZIP_CENTHEAD_MAGIC)
! 	    ExitWiki("Bad header type: " . htmlspecialchars($magic)); // FIXME: better message?
  	return $this->done();
        }
      if (($flags & 0x21) != 0)
! 	ExitWiki("Encryption and/or zip patches not supported.");
      if (($flags & 0x08) != 0)
! 	ExitWiki("Postponed CRC not yet supported."); // FIXME: ???
  
      $filename = $this->_read($filename_len);
--- 389,399 ----
        {
  	if ($magic != ZIP_CENTHEAD_MAGIC)
! 	    ExitWiki(sprintf(_("Bad header type: %s"),htmlspecialchars($magic))); // FIXME: better message?
  	return $this->done();
        }
      if (($flags & 0x21) != 0)
! 	ExitWiki(_("Encryption and/or zip patches not supported."));
      if (($flags & 0x08) != 0)
! 	ExitWiki(_("Postponed CRC not yet supported.")); // FIXME: ???
  
      $filename = $this->_read($filename_len);
***************
*** 414,421 ****
        }
      else
! 	ExitWiki("Compression method $comp_method unsupported");
  
      if (strlen($data) != $uncomp_size)
! 	ExitWiki(sprintf("Uncompressed size mismatch %d != %d",
  		    strlen($data), $uncomp_size));
  
--- 414,421 ----
        }
      else
! 	ExitWiki(sprintf(_("Compression method %s unsupported"),$comp_method));
  
      if (strlen($data) != $uncomp_size)
! 	ExitWiki(sprintf(_("Uncompressed size mismatch")."%d != %d",
  		    strlen($data), $uncomp_size));
  
***************
*** 561,565 ****
  		  . '\s*(' . MIME_TOKEN_REGEXP . ')\s*:x',
  		  $string, $match))
!       ExitWiki ("Bad MIME content-type");
  
    $type = strtolower($match[1]);
--- 561,565 ----
  		  . '\s*(' . MIME_TOKEN_REGEXP . ')\s*:x',
  		  $string, $match))
!       ExitWiki(sprintf(_("Bad %s"),'MIME content-type'));
  
    $type = strtolower($match[1]);
***************
*** 579,583 ****
        
        $param[strtolower($match[1])] = $val;
! 	   
        $string = substr($string, strlen($match[0]));
      }
--- 579,583 ----
        
        $param[strtolower($match[1])] = $val;
!         
        $string = substr($string, strlen($match[0]));
      }
***************
*** 620,624 ****
      {
        if (preg_match('/^ref([1-9][0-9]*)$/', $p, $m))
! 	  $footnotes[$m[1]] = sprintf(gettext ("[%d] See [%s]"),
  				      $m[1], rawurldecode($reference));
      }
--- 620,624 ----
      {
        if (preg_match('/^ref([1-9][0-9]*)$/', $p, $m))
! 	  $footnotes[$m[1]] = sprintf(_("[%d] See [%s]"),
  				      $m[1], rawurldecode($reference));
      }
***************
*** 628,632 ****
        ksort($footnotes);
        return "-----\n"
! 	  . gettext ("!References") . "\n"
  	  . join("\n%%%\n", $footnotes) . "\n";
      }
--- 628,632 ----
        ksort($footnotes);
        return "-----\n"
! 	  . "!" ._("References") . "\n"
  	  . join("\n%%%\n", $footnotes) . "\n";
      }

[phpwiki-checkins] CVS: phpwiki/lib WikiDB.php,1.2,1.3

[Carsten K. <car...@us...>]

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

Modified Files:
	WikiDB.php 
Log Message:
Found more strings needing gettext _() and sprintf. Error strings containing function names now use sprintf. Some debugging strings intentionally left alone.

Index: WikiDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** WikiDB.php	2001/10/29 17:58:37	1.2
--- WikiDB.php	2001/12/28 09:53:29	1.3
***************
*** 351,355 ****
          if ($latestversion && $version == $latestversion) {
              $backend->unlock();
!             trigger_error("Attempt to delete most recent revision of '$pagename'",
                            E_USER_ERROR);
              return;
--- 351,355 ----
          if ($latestversion && $version == $latestversion) {
              $backend->unlock();
!             trigger_error(sprintf(_("Attempt to delete most recent revision of '%s'"),$pagename),
                            E_USER_ERROR);
              return;
***************
*** 399,403 ****
          if ($latestversion && $version == $latestversion) {
              $backend->unlock();
!             trigger_error("Attempt to merge most recent revision of '$pagename'",
                            E_USER_ERROR);
              return;
--- 399,403 ----
          if ($latestversion && $version == $latestversion) {
              $backend->unlock();
!             trigger_error(sprintf(_("Attempt to merge most recent revision of '%s'"),$pagename),
                            E_USER_ERROR);
              return;
***************
*** 486,490 ****
              $pdata = $cache->get_versiondata($pagename, $latestversion);
              if ($data['mtime'] < $pdata['mtime']) {
!                 trigger_error("$pagename: Date of new revision non-monotonic",
                                E_USER_NOTICE);
                  $data['orig_mtime'] = $data['mtime'];
--- 486,490 ----
              $pdata = $cache->get_versiondata($pagename, $latestversion);
              if ($data['mtime'] < $pdata['mtime']) {
!                 trigger_error(sprintf(_("%s: Date of new revision is %s"),$pagename,"'non-monotonic'"),
                                E_USER_NOTICE);
                  $data['orig_mtime'] = $data['mtime'];
***************
*** 511,515 ****
          // to control when to optimize.
          if (time() % 50 == 0) {
!             trigger_error('"Optimizing" backend', E_USER_NOTICE);
              $backend->optimize();
          }
--- 511,515 ----
          // to control when to optimize.
          if (time() % 50 == 0) {
!             trigger_error(sprintf(_("Optimizing %s"),'backend'), E_USER_NOTICE);
              $backend->optimize();
          }
***************
*** 835,840 ****
          if (empty($data['%content'])) {
              // Replace empty content with default value.
!             return sprintf(gettext("Describe [%s] here."),
!                            $this->_pagename);
          }
  
--- 835,840 ----
          if (empty($data['%content'])) {
              // Replace empty content with default value.
!             return sprintf(_("Describe %s here."),
!                            "[". $this->_pagename ."]");
          }