phpwiki-checkins Mailing List for PhpWiki

Brought to you by: carstenklapp, dairiki, rurban, vargenau, wainstead

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

You can subscribe to this list here.

2000	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (43)	_Nov (73)	_Dec (10)
2001	_Jan (34)	_Feb (110)	_Mar (24)	_Apr (44)	_May (37)	_Jun (22)	_Jul (20)	_Aug (28)	_Sep (50)	_Oct (11)	_Nov (132)	_Dec (595)
2002	_Jan (1099)	_Feb (579)	_Mar (63)	_Apr	_May	_Jun	_Jul	_Aug (125)	_Sep (101)	_Oct (25)	_Nov (34)	_Dec (47)
2003	_Jan (82)	_Feb (182)	_Mar (71)	_Apr (3)	_May (1)	_Jun (3)	_Jul	_Aug	_Sep (14)	_Oct (6)	_Nov (124)	_Dec (68)
2004	_Jan (64)	_Feb (191)	_Mar (199)	_Apr (298)	_May (252)	_Jun (426)	_Jul (134)	_Aug (13)	_Sep (96)	_Oct (75)	_Nov (232)	_Dec (171)
2005	_Jan (205)	_Feb (165)	_Mar (8)	_Apr (74)	_May (21)	_Jun (19)	_Jul (37)	_Aug (69)	_Sep (141)	_Oct (118)	_Nov (31)	_Dec (7)
2006	_Jan (5)	_Feb (10)	_Mar (35)	_Apr (24)	_May (34)	_Jun (29)	_Jul (5)	_Aug (38)	_Sep (30)	_Oct (37)	_Nov (30)	_Dec (86)
2007	_Jan (414)	_Feb (40)	_Mar (18)	_Apr (10)	_May (66)	_Jun (60)	_Jul (105)	_Aug (55)	_Sep (64)	_Oct (7)	_Nov (11)	_Dec (5)
2008	_Jan (26)	_Feb (28)	_Mar (79)	_Apr (34)	_May (61)	_Jun (24)	_Jul (29)	_Aug (160)	_Sep (62)	_Oct (70)	_Nov (32)	_Dec (14)
2009	_Jan (140)	_Feb (135)	_Mar (153)	_Apr (53)	_May (24)	_Jun (138)	_Jul (90)	_Aug (46)	_Sep (72)	_Oct (84)	_Nov (32)	_Dec (4)
2010	_Jan (13)	_Feb (7)	_Mar (14)	_Apr (55)	_May (89)	_Jun (131)	_Jul (41)	_Aug (38)	_Sep (42)	_Oct (11)	_Nov (27)	_Dec (54)
2011	_Jan (127)	_Feb (16)	_Mar (71)	_Apr (52)	_May (32)	_Jun (31)	_Jul (4)	_Aug	_Sep (45)	_Oct (26)	_Nov (36)	_Dec (10)
2012	_Jan (23)	_Feb (6)	_Mar (13)	_Apr (18)	_May (1)	_Jun (4)	_Jul (3)	_Aug (12)	_Sep (57)	_Oct (96)	_Nov (163)	_Dec (124)
2013	_Jan (11)	_Feb (17)	_Mar (7)	_Apr (48)	_May (15)	_Jun (29)	_Jul (12)	_Aug	_Sep (9)	_Oct	_Nov	_Dec (3)
2014	_Jan (4)	_Feb (1)	_Mar (2)	_Apr (1)	_May (8)	_Jun (90)	_Jul (104)	_Aug (12)	_Sep (81)	_Oct (139)	_Nov (111)	_Dec (64)
2015	_Jan (46)	_Feb (74)	_Mar (56)	_Apr (61)	_May (3)	_Jun (7)	_Jul (11)	_Aug (5)	_Sep (15)	_Oct (1)	_Nov (1)	_Dec (15)
2016	_Jan (25)	_Feb (33)	_Mar (24)	_Apr (4)	_May (24)	_Jun (3)	_Jul (75)	_Aug	_Sep (2)	_Oct (38)	_Nov (4)	_Dec (18)
2017	_Jan (8)	_Feb (1)	_Mar (1)	_Apr	_May (14)	_Jun	_Jul (5)	_Aug (9)	_Sep	_Oct (23)	_Nov	_Dec
2018	_Jan	_Feb	_Mar	_Apr	_May	_Jun (2)	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2019	_Jan	_Feb	_Mar (9)	_Apr (60)	_May (1)	_Jun	_Jul (13)	_Aug	_Sep (11)	_Oct	_Nov	_Dec
2020	_Jan	_Feb	_Mar (15)	_Apr (4)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec (47)
2021	_Jan (24)	_Feb (33)	_Mar (1)	_Apr	_May (1)	_Jun (64)	_Jul (71)	_Aug (114)	_Sep (82)	_Oct (32)	_Nov (76)	_Dec (86)
2022	_Jan (162)	_Feb (41)	_Mar (11)	_Apr (9)	_May	_Jun	_Jul (1)	_Aug (2)	_Sep	_Oct	_Nov	_Dec (7)
2023	_Jan	_Feb (1)	_Mar (2)	_Apr	_May	_Jun	_Jul (25)	_Aug	_Sep	_Oct	_Nov (7)	_Dec
2024	_Jan (7)	_Feb (3)	_Mar (3)	_Apr (1)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2025	_Jan	_Feb (90)	_Mar (19)	_Apr	_May (6)	_Jun	_Jul (1)	_Aug	_Sep	_Oct	_Nov	_Dec

S	M	T	W	T	F	S
1	2	3	4	5	6	7
8	9	10	11	12	13	14 (4)
15 (11)	16	17 (14)	18	19	20	21
22	23	24	25	26	27	28 (3)
29 (5)	30 (3)	31 (7)

Flat | Threaded

1 2 > >> (Page 1 of 2)

[phpwiki-checkins] CVS: phpwiki/lib/plugin PhpWeather.php,1.6,1.7

From: Carsten K. <car...@us...> - 2002年12月31日 20:53:44

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv4146
Modified Files:
	PhpWeather.php 
Log Message:
Bugfixes: Fixed menu language selection (incorrect parameters to
$w->get_languages_select() & form input 'language' instead of 'lang').
Index: PhpWeather.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/PhpWeather.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -2 -b -p -d -r1.6 -r1.7
--- PhpWeather.php	29 Dec 2002 03:16:42 -0000	1.6
+++ PhpWeather.php	31 Dec 2002 20:53:40 -0000	1.7
@@ -12,7 +12,7 @@ rcs_id('$Id PhpWeather.php 2002年08月26日 15
 * <?plugin PhpWeather menu=true ?>
 * <?plugin PhpWeather icao=KJFK ?>
- * <?plugin PhpWeather lang=en ?>
+ * <?plugin PhpWeather language=en ?>
 * <?plugin PhpWeather units=only_metric ?>
- * <?plugin PhpWeather icao||=CYYZ lang||=en menu=true ?>
+ * <?plugin PhpWeather icao||=CYYZ cc||=CA language||=en menu=true ?>
 *
 * If you want a menu, and you also want to change the default station
@@ -50,5 +50,5 @@ extends WikiPlugin
 return array('icao' => 'EKAH',
 'cc' => 'DK',
- 'lang' => 'en',
+ 'language' => 'en',
 'menu' => false,
 'units' => 'both_metric');
@@ -84,12 +84,12 @@ extends WikiPlugin
 
 /* We check and correct the language if necessary: */
- //if (!in_array($lang, array_keys($w->get_languages('text')))) {
- if (!in_array($lang, array_keys(get_languages('text')))) {
+ //if (!in_array($language, array_keys($w->get_languages('text')))) {
+ if (!in_array($language, array_keys(get_languages('text')))) {
 trigger_error(sprintf(_("%s does not know about the language '%s', using 'en' instead."),
- $this->getName(), $lang), E_USER_NOTICE);
- $lang = 'en';
+ $this->getName(), $language), E_USER_NOTICE);
+ $language = 'en';
 }
 
- $class = "pw_text_$lang";
+ $class = "pw_text_$language";
 require_once(PHPWEATHER_BASE_DIR . "/output/$class.php");
 
@@ -133,6 +133,6 @@ extends WikiPlugin
 /* We want to save the language: */
 $p1->pushContent(HTML::input(array('type' => 'hidden',
- 'name' => 'lang',
- 'value' => $lang)));
+ 'name' => 'language',
+ 'value' => $language)));
 /* And also the ICAO: */
 $p1->pushContent(HTML::input(array('type' => 'hidden',
@@ -157,7 +157,7 @@ extends WikiPlugin
 
 $p2->pushContent(new RawXml(get_stations_select($w, $cc, $icao)));
- $p2->pushContent(new RawXml(get_languages_select($w, $lang)));
+ $p2->pushContent(new RawXml(get_languages_select($language)));
 $p2->pushContent(HTML::input(array('type' => 'submit',
- 'value' => 'Submit location')));
+ 'value' => _("Submit location"))));
 
 $html->pushContent(HTML::form($form_arg, $p2));
@@ -170,4 +170,12 @@ extends WikiPlugin
 }
 };
+
+/**
+ $Log$
+ Revision 1.7 2002年12月31日 20:53:40 carstenklapp
+ Bugfixes: Fixed menu language selection (incorrect parameters to
+ $w->get_languages_select() & form input 'language' instead of 'lang').
+
+ */
 
 // For emacs users

[phpwiki-checkins] CVS: phpwiki/themes/Portland/templates actionbar.tmpl,1.17,1.18

From: Carsten K. <car...@us...> - 2002年12月31日 20:05:54

Update of /cvsroot/phpwiki/phpwiki/themes/Portland/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv4614
Modified Files:
	actionbar.tmpl 
Log Message:
Updated "Info" button to "PageInfo" (two-word action-pages in effect again)
Index: actionbar.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Portland/templates/actionbar.tmpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -2 -b -p -d -r1.17 -r1.18
--- actionbar.tmpl	18 Sep 2002 19:29:43 -0000	1.17
+++ actionbar.tmpl	31 Dec 2002 20:05:49 -0000	1.18
@@ -17,5 +17,5 @@
 ><?= $Theme->getLastModifiedMessage($revision) ?></a>
 	<?=$Sep?><?= Button("PageHistory", _("PageHistory")) ?>
- <?=$Sep?><?= Button("info") ?>
+ <?=$Sep?><?= Button("PageInfo", _("PageInfo")) ?>
 <?php if (defined('DEBUG') || $user->isAdmin()) { ?>
 	<?=$Sep?><?= Button("DebugInfo", _("DebugInfo")) ?> <!-- For debugging only, really -->

[phpwiki-checkins] CVS: phpwiki/themes/default phpwiki-heavy.css,1.1,1.2 phpwiki.css,1.3,1.4

From: Carsten K. <car...@us...> - 2002年12月31日 20:01:25

Update of /cvsroot/phpwiki/phpwiki/themes/default
In directory sc8-pr-cvs1:/tmp/cvs-serv1731
Modified Files:
	phpwiki-heavy.css phpwiki.css 
Log Message:
Cosmetic: Tweaked button padding to better accomodate text descenders; avoid overlapping or touching buttons when the toolbar is wrapped (small browser window); prevent wrap of white-space in buttons (e.g. Sign In).
Index: phpwiki-heavy.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/phpwiki-heavy.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -2 -b -p -d -r1.1 -r1.2
--- phpwiki-heavy.css	6 Mar 2002 02:21:16 -0000	1.1
+++ phpwiki-heavy.css	31 Dec 2002 20:01:15 -0000	1.2
@@ -78,6 +78,6 @@ input.wikiaction, input.wikiadmin, input
 border-bottom: 1px solid #494f5d;
 border-right: 1px solid #494f5d;
- padding-top: 0.2ex;
- padding-bottom: 0.1ex;
+ padding-top: 0.15ex;
+ padding-bottom: 0.25ex;
 padding-left: .5em;
 padding-right: .5em;
@@ -86,4 +86,5 @@ input.wikiaction, input.wikiadmin, input
 /* Prevent buttons from overlapping when the toolbar is wrapped. */
 a.wikiaction, a.wikiadmin { line-height: 2.6ex; }
+div#navbuttons, div#signin, div#actionbuttons { line-height: 3.0ex; }
 
 /* QuestionMark */
Index: phpwiki.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/phpwiki.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -2 -b -p -d -r1.3 -r1.4
--- phpwiki.css	23 Aug 2002 18:29:33 -0000	1.3
+++ phpwiki.css	31 Dec 2002 20:01:16 -0000	1.4
@@ -116,4 +116,6 @@ a.wikiaction, a.wikiadmin, a.wiki-rc-act
 text-decoration: none;
 font-family: Arial, Helvetica, sans-serif;
+ /* don't wrap text buttons */
+ white-space: nowrap;
 }

[phpwiki-checkins] CVS: phpwiki/themes/default/templates info.tmpl,1.10,1.11

From: Carsten K. <car...@us...> - 2002年12月31日 19:56:40

Update of /cvsroot/phpwiki/phpwiki/themes/default/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv31108
Modified Files:
	info.tmpl 
Log Message:
Removed redundant buttons "PageHistory" "diff" "DebugInfo" (already in actionbar.tmpl)
Index: info.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/info.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -2 -b -p -d -r1.10 -r1.11
--- info.tmpl	15 Dec 2002 01:30:47 -0000	1.10
+++ info.tmpl	31 Dec 2002 19:56:33 -0000	1.11
@@ -128,8 +128,2 @@ $Sep = $Theme->getButtonSeparator();
 </tr>
 </table>
-
-<?= Button("PageHistory", _("PageHistory")) ?>
-<?=$Sep?><?= Button("diff") ?> 
-<?php if (defined('DEBUG') || $user->isAdmin()) { ?>
-	<?=$Sep?><?= Button("DebugInfo", _("DebugInfo")) ?> <!-- For debugging only, really -->
-<?php } ?>

[phpwiki-checkins] CVS: phpwiki/themes/default/templates top.tmpl,1.20,1.21

From: Carsten K. <car...@us...> - 2002年12月31日 19:54:12

Update of /cvsroot/phpwiki/phpwiki/themes/default/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv29598
Modified Files:
	top.tmpl 
Log Message:
Cosmetic: move logo up one line to fix collision with body
Index: top.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/top.tmpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -2 -b -p -d -r1.20 -r1.21
--- top.tmpl	15 Dec 2002 01:30:47 -0000	1.20
+++ top.tmpl	31 Dec 2002 19:54:07 -0000	1.21
@@ -6,7 +6,4 @@ global $HIDE_TOOLBARS;
 if (!$HIDE_TOOLBARS) {
 ?>
-<!-- The top navigation/search bar -->
-<?= Template('navbar') ?>
-<?php } ?>
 <!-- The logo -->
 <div align="right" id="logo"><a class="wikilink" 
@@ -16,4 +13,7 @@ if (!$HIDE_TOOLBARS) {
 align="right" /></a></div>
 
+<!-- The top navigation/search bar -->
+<?= Template('navbar') ?>
+<?php } ?>
 <!-- Page title -->
 <h1><?= $HEADER ?></h1>

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

From: Steve W. <wai...@us...> - 2002年12月31日 02:32:32

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv13740
Modified Files:
	DbaDatabase.php 
Log Message:
Added an if() to test for the existence of the dba_ library. Give the user
an error message. This needs some improvement so the user gets more info,
but it's a start... and an improvement over the basic PHP error.
Index: DbaDatabase.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/DbaDatabase.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -2 -b -p -d -r1.4 -r1.5
--- DbaDatabase.php	24 Jan 2002 06:50:45 -0000	1.4
+++ DbaDatabase.php	31 Dec 2002 02:32:28 -0000	1.5
@@ -30,4 +30,10 @@ class DbaDatabase
 $this->_dba_open_error = false;
 $ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_dba_open_error_handler'));
+
+ // oops, you don't have DBM support.
+ if (!function_exists("dba_open")) {
+ echo "You don't seem to have DBM file support compiled into PHP.";
+ }
+
 while (($dbh = dba_open($this->_file, $mode, $this->_handler)) < 1) {
 if (--$watchdog <= 0)

[phpwiki-checkins] CVS: phpwiki index.php,1.98,1.99

From: Steve W. <wai...@us...> - 2002年12月31日 01:13:17

Update of /cvsroot/phpwiki/phpwiki
In directory sc8-pr-cvs1:/tmp/cvs-serv12317
Modified Files:
	index.php 
Log Message:
Updated the version number
Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -2 -b -p -d -r1.98 -r1.99
--- index.php	12 Oct 2002 19:11:42 -0000	1.98
+++ index.php	31 Dec 2002 01:13:14 -0000	1.99
@@ -80,5 +80,5 @@ define ('DEBUG', 1);
 // Part Null: Don't touch this!
 
-define ('PHPWIKI_VERSION', '1.3.4pre');
+define ('PHPWIKI_VERSION', '1.3.4');
 require "lib/prepend.php";
 rcs_id('$Id$');

[phpwiki-checkins] CVS: phpwiki/lib/plugin HelloWorld.php,1.10,1.11 PluginManager.php,1.1,1.2

From: Carsten K. <car...@us...> - 2002年12月30日 23:49:38

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv15743
Modified Files:
	HelloWorld.php PluginManager.php 
Log Message:
Added plugin version function.
Index: HelloWorld.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/HelloWorld.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -2 -b -p -d -r1.10 -r1.11
--- HelloWorld.php	30 Jan 2002 23:41:54 -0000	1.10
+++ HelloWorld.php	30 Dec 2002 23:49:35 -0000	1.11
@@ -18,5 +18,5 @@ class WikiPlugin_HelloWorld
 extends WikiPlugin
 {
- // Four required functions in a WikiPlugin.
+ // Five required functions in a WikiPlugin.
 
 function getName () {
@@ -28,4 +28,10 @@ extends WikiPlugin
 
 }
+
+ function getVersion() {
+ return preg_replace("/[Revision: $]/", '',
+ "\$Revision$");
+ }
+
 // Establish default values for each of this plugin's arguments.
 function getDefaultArguments() {
Index: PluginManager.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/PluginManager.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -2 -b -p -d -r1.1 -r1.2
--- PluginManager.php	30 Dec 2002 11:52:20 -0000	1.1
+++ PluginManager.php	30 Dec 2002 23:49:35 -0000	1.2
@@ -15,4 +15,9 @@ extends WikiPlugin
 }
 
+ function getVersion() {
+ return preg_replace("/[Revision: $]/", '',
+ "\$Revision$");
+ }
+
 function getDefaultArguments() {
 return array();
@@ -41,9 +46,14 @@ extends WikiPlugin
 foreach($plugins as $pname) {
 $pname = str_replace(".php", "", $pname);
- $ppname = $pname . "Plugin";
 $temppluginclass = "<? plugin " . /*"WikiPlugin_" .*/ $pname . " ?>";
 $w = new WikiPluginLoader;
 $p = $w->getPlugin($pname);
 $desc = $p->getDescription();
+ if (method_exists($p, 'getVersion')) {
+ $ver = $p->getVersion();
+ }
+ else {
+ $ver = "--";
+ }
 
 $pnamelink = $pname;
@@ -52,4 +62,5 @@ extends WikiPlugin
 $pnamelink = WikiLink($pname);
 
+ $ppname = $pname . "Plugin";
 if (preg_match("/^$WikiNameRegexp\$/", $ppname) && $dbi->isWikiPage($ppname))
 $plink = WikiLink($ppname);
@@ -65,17 +76,15 @@ extends WikiPlugin
 $class = ($group % 2) ? 'oddrow' : 'evenrow';
 
- if ($plink) {
 $tr = HTML::tr(array('class' => $class));
- $tr->pushContent(HTML::td($plink), HTML::td($desc));
+ if ($plink) {
+ $tr->pushContent(HTML::td($plink), HTML::td($ver), HTML::td($desc));
 $tr2 = HTML::tr(array('class' => $class));
- $tr2->pushContent(HTML::td($pnamelink), HTML::td(" "));
+ $tr2->pushContent(HTML::td($pnamelink), HTML::td(" "), HTML::td(" "));
 $plink = false;
 $table->pushContent($tr, $tr2);
 $row_no++;
-
 }
 else {
- $tr = HTML::tr(array('class' => $class));
- $tr->pushContent(HTML::td($pnamelink), HTML::td($desc));
+ $tr->pushContent(HTML::td($pnamelink), HTML::td($ver), HTML::td($desc));
 $table->pushContent($tr);
 }
@@ -86,5 +95,4 @@ extends WikiPlugin
 
 return $h;
-
 }
 };

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

From: Carsten K. <car...@us...> - 2002年12月30日 21:13:38

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv10417
Modified Files:
	TexToPng.php 
Log Message:
Gettext-ify description & small bugfix.
Index: TexToPng.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/TexToPng.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- TexToPng.php	20 Aug 2002 18:26:12 -0000	1.2
+++ TexToPng.php	30 Dec 2002 21:13:34 -0000	1.3
@@ -80,6 +80,5 @@ class WikiPlugin_TexToPng extends WikiPl
 
 function getDescription() {
- return 'Converts TeX to an image. May be used to embed' 
- . ' formulas in PhpWiki.';
+ return _("Converts TeX to an image. May be used to embed formulas in PhpWiki.");
 }
 
@@ -246,5 +245,5 @@ class WikiPlugin_TexToPng extends WikiPl
 $this->execute("$dvipsbin -o".$tempfiles.'.ps '.$tempfiles.'.dvi') && 
 $this->execute("$pstoimgbin $options"
- ' -out '.$tempfiles.'.png '.
+ .' -out '.$tempfiles.'.png '.
 $tempfiles.'.ps' ) &&
 file_exists( $tempfiles.'.png' );

[phpwiki-checkins] CVS: phpwiki/lib/plugin PluginManager.php,NONE,1.1

From: Carsten K. <car...@us...> - 2002年12月30日 11:52:23

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv30256
Added Files:
	PluginManager.php 
Log Message:
New plugin: Lists available plugins with page links & descriptions.
--- NEW FILE: PluginManager.php ---
<?php // -*-php-*-
rcs_id('$Id: PluginManager.php,v 1.1 2002年12月30日 11:52:20 carstenklapp Exp $');
/**
 */
class WikiPlugin_PluginManager
extends WikiPlugin
{
 function getName () {
 return _("PluginManager");
 }
 function getDescription () {
 return _("Overview of the available PhpWikiPlugins");
 }
 function getDefaultArguments() {
 return array();
 }
 function run($dbi, $argstr, $request) {
 //extract($this->getArgs($argstr, $request));
	$msg = HTML::p("PluginManager provides the WikiAdmin the list of PhpWikiPlugin~s on this wiki.");
 if (! $request->_user->isadmin()) {
 return $msg; // early return
 }
 $pd = new fileSet(PHPWIKI_DIR . '/lib/plugin', '*.php');
 $plugins = $pd->getFiles();
 $h = HTML();
 $h->pushContent($msg);
 $h->pushContent(HTML::h2(_("Plugins")));
 $row_no = 0;
 $table = HTML::table(array('class' => "pagelist"));
 global $WikiNameRegexp;
 foreach($plugins as $pname) {
 $pname = str_replace(".php", "", $pname);
 $ppname = $pname . "Plugin";
 $temppluginclass = "<? plugin " . /*"WikiPlugin_" .*/ $pname . " ?>";
 $w = new WikiPluginLoader;
 $p = $w->getPlugin($pname);
 $desc = $p->getDescription();
 $pnamelink = $pname;
 $plink = false;
 if (preg_match("/^$WikiNameRegexp\$/", $pname) && $dbi->isWikiPage($pname))
 $pnamelink = WikiLink($pname);
 if (preg_match("/^$WikiNameRegexp\$/", $ppname) && $dbi->isWikiPage($ppname))
 $plink = WikiLink($ppname);
 else {
 // exclude actionpages and plugins starting with _ from page list
 if ( !preg_match("/^_/", $pname) && !(@$request->isActionPage($pname))) //FIXME
 $plink = WikiLink($ppname, 'unknown');
 else
 $plink = false;
 }
 $row_no++;
 $group = (int)($row_no / 2); //_group_rows
 $class = ($group % 2) ? 'oddrow' : 'evenrow';
 if ($plink) {
 $tr = HTML::tr(array('class' => $class));
 $tr->pushContent(HTML::td($plink), HTML::td($desc));
 $tr2 = HTML::tr(array('class' => $class));
 $tr2->pushContent(HTML::td($pnamelink), HTML::td(" "));
 $plink = false;
 $table->pushContent($tr, $tr2);
 $row_no++;
 }
 else {
 $tr = HTML::tr(array('class' => $class));
 $tr->pushContent(HTML::td($pnamelink), HTML::td($desc));
 $table->pushContent($tr);
 }
 }
 $h->pushContent($table);
 //$h->pushContent(HTML::h2(_("Disabled Plugins")));
 return $h;
 }
};
// Local Variables:
// mode: php
// tab-width: 8
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
?>

[phpwiki-checkins] CVS: phpwiki/lib/plugin PhpWeather.php,1.5,1.6

From: Carsten K. <car...@us...> - 2002年12月29日 03:16:45

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv18242
Modified Files:
	PhpWeather.php 
Log Message:
Improved error message when PHP Weather is not yet installed or configured.
Index: PhpWeather.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/PhpWeather.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -2 -b -p -d -r1.5 -r1.6
--- PhpWeather.php	28 Dec 2002 01:32:01 -0000	1.5
+++ PhpWeather.php	29 Dec 2002 03:16:42 -0000	1.6
@@ -29,5 +29,8 @@ $WEATHER = $_SERVER['DOCUMENT_ROOT'] . '
 if(! @include_once($WEATHER)) {
 if(!in_array($WEATHER, get_included_files()) ) {
- trigger_error(sprintf(_("Could not open file %s."), "'$WEATHER'"));
+ $error = sprintf(_("Could not open file %s."), "'$WEATHER'") . " ";
+ $error .= sprintf(_("Make sure %s is installed and properly configured."),
+ 'PHP Weather');
+ trigger_error($error);
 }
 }

[phpwiki-checkins] CVS: phpwiki/pgsrc ExternalSearchPlugin,NONE,1.1 ExternalSearch,1.2,NONE

From: Carsten K. <car...@us...> - 2002年12月29日 03:00:42

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory sc8-pr-cvs1:/tmp/cvs-serv15467
Added Files:
	ExternalSearchPlugin 
Removed Files:
	ExternalSearch 
Log Message:
Added usage info & arguments, renamed from ExternalSearch to ExternalSearchPlugin.
--- NEW FILE: ExternalSearchPlugin ---
Date: 2002年12月28日 21:58:00 -0500
Mime-Version: 1.0 (Produced by PhpWiki 1.3.4pre)
X-Rcs-Id: $Id: ExternalSearchPlugin,v 1.1 2002年12月29日 03:00:39 carstenklapp Exp $
Content-Type: application/x-phpwiki;
 pagename=ExternalSearchPlugin;
 flags=PAGE_LOCKED;
 pgsrc_version="2 $Revision: 1.1 $";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
!! Synopsis
The ExternalSearchPlugin creates a form to query InterWiki~s or other
internet sites.
!! Typical Usage
<verbatim>
<?plugin ExternalSearch
 url="InterWiki or URL"
 name="button text"
?>
</verbatim>
!! Arguments
__url__:
Specify a wiki from the InterWikiMap or a url. Any text entered by the
user will be appended to the search url. The string placeholder
'__=%s=__' can be used to insert a search query into the url rather
than appending it.
__name__:
Text to display in the submit button. For InterWiki sites the default
is the wiki name, for other urls the default is the text "External
Search".
__formsize__:
Specify the input area size. (default: 30 characters)
__debug__:
Don't really redirect to the external site, just print out the url
that would be redirected to.
!! Examples
Perform a full-text search on MeatBall wiki:
<?plugin ExternalSearch
 url="http://www.usemod.com/cgi-bin/mb.pl?search="
 name="MeatBall Search"
?>
Search the PHP web site for a function name:
<?plugin ExternalSearch url=php-lookup name="PHP Lookup" ?>
Enter the name of a PHP function to view the documentation page:%%%
<?plugin ExternalSearch url=php-function ?>
Enter any existing page name on PhpWiki to jump to that page:
<?plugin ExternalSearch url=PhpWiki ?>
----
PhpWikiDocumentation CategoryPlugin
--- ExternalSearch DELETED ---

[phpwiki-checkins] CVS: phpwiki/lib interwiki.map,1.13,1.14

From: Carsten K. <car...@us...> - 2002年12月29日 02:55:54

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv14719
Modified Files:
	interwiki.map 
Log Message:
updated php.net
Index: interwiki.map
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.map,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -2 -b -p -d -r1.13 -r1.14
--- interwiki.map	1 Nov 2002 19:15:17 -0000	1.13
+++ interwiki.map	29 Dec 2002 02:55:51 -0000	1.14
@@ -68,5 +68,5 @@ OrgPatterns http://www.bell-labs.com/cgi
 PangalacticOrg http://www.pangalactic.org/Wiki/
 PersonalTelco http://www.personaltelco.net/index.cgi/
-php-function http://www.php.net/manual/en/function.%s.php
+php-function http://www.php.net/%s
 php-lookup http://www.php.net/manual-lookup.php?pattern=
 PhpWiki http://phpwiki.sourceforge.net/phpwiki/index.php?

[phpwiki-checkins] CVS: phpwiki/lib editpage.php,1.49,1.50

From: Carsten K. <car...@us...> - 2002年12月29日 02:51:35

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv13841
Modified Files:
	editpage.php 
Log Message:
Martin Geisler's fix for new markup checkbox (page reverting to old markup when edited).
Index: editpage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -2 -b -p -d -r1.49 -r1.50
--- editpage.php	17 Dec 2002 18:32:48 -0000	1.49
+++ editpage.php	29 Dec 2002 02:51:31 -0000	1.50
@@ -353,6 +353,6 @@ class PageEditor
 return false; // FIXME: some kind of warning?
 
- $is_new_markup = !empty($posted['markup']) && $posted['markup'] == 'new';
- $meta['markup'] = $is_new_markup ? 2.0: false;
+ $is_old_markup = !empty($posted['markup']) && $posted['markup'] == 'old';
+ $meta['markup'] = $is_old_markup ? false : 2.0;
 $meta['summary'] = trim(substr($posted['summary'], 0, 256));
 $meta['locked'] = !empty($posted['locked']);

[phpwiki-checkins] CVS: phpwiki/pgsrc AddingPages,1.9,1.10 AllPages,1.7,1.8 AllUsers,1.2,1.3 BackLinks,1.6,1.7 CalendarPlugin,1.5,1.6 CategoryCategory,1.2,1.3 CategoryHomePages,1.2,1.3 DebugInfo,1.5,1.6 FullRecentChanges,1.6,1.7 GoodStyle,1.6,1.7 HomePage,1.9,1.10 HowToUseWiki,1.10,1.11 InterWiki,1.7,1.8 InterWikiMap,1.8,1.9 LikePages,1.8,1.9 LinkIcons,1.9,1.10 MoreAboutMechanics,1.9,1.10 MostPopular,1.8,1.9 NewMarkupTestPage,1.5,1.6 OldStyleTablePlugin,1.2,1.3 OldTextFormattingRules,1.1,1.2 PageHistory,1.5,1.6 PhpHighlightPlugin,1.1,1.2 PhpWeatherPlugin,1.2,1.3 PhpWiki,1.5,1.6 PhpWikiAdministration%2FRemove,1.2,1.3 RandomPage,1.3,1.4 RecentChanges,1.30,1.31 RecentEdits,1.12,1.13 RecentVisitors,1.9,1.10 ReleaseNotes,1.14,1.15 SandBox,1.4,1.5 SteveWainstead,1.10,1.11 TextFormattingRules,1.29,1.30 TranscludePlugin,1.2,1.3 UserPreferences,1.7,1.8 WabiSabi,1.8,1.9 WikiPlugin,1.7,1.8 WikiWikiWeb,1.6,1.7

From: Carsten K. <car...@us...> - 2002年12月29日 00:32:37

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory sc8-pr-cvs1:/tmp/cvs-serv15322
Modified Files:
	AddingPages AllPages AllUsers BackLinks CalendarPlugin 
	CategoryCategory CategoryHomePages DebugInfo FullRecentChanges 
	GoodStyle HomePage HowToUseWiki InterWiki InterWikiMap 
	LikePages LinkIcons MoreAboutMechanics MostPopular 
	NewMarkupTestPage OldStyleTablePlugin OldTextFormattingRules 
	PageHistory PhpHighlightPlugin PhpWeatherPlugin PhpWiki 
	PhpWikiAdministration%2FRemove RandomPage RecentChanges 
	RecentEdits RecentVisitors ReleaseNotes SandBox SteveWainstead 
	TextFormattingRules TranscludePlugin UserPreferences WabiSabi 
	WikiPlugin WikiWikiWeb 
Log Message:
added rcs ids and pgsrc_version to remaining pages
Index: AddingPages
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/AddingPages,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -2 -b -p -d -r1.9 -r1.10
--- AddingPages	25 Nov 2002 19:44:00 -0000	1.9
+++ AddingPages	29 Dec 2002 00:32:34 -0000	1.10
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=AddingPages;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: AllPages
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/AllPages,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -2 -b -p -d -r1.7 -r1.8
--- AllPages	25 Nov 2002 19:44:01 -0000	1.7
+++ AllPages	29 Dec 2002 00:32:34 -0000	1.8
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=AllPages;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 markup=2;
Index: AllUsers
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/AllUsers,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- AllUsers	25 Nov 2002 19:44:01 -0000	1.2
+++ AllUsers	29 Dec 2002 00:32:34 -0000	1.3
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=AllUsers;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: BackLinks
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/BackLinks,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -2 -b -p -d -r1.6 -r1.7
--- BackLinks	25 Nov 2002 19:44:01 -0000	1.6
+++ BackLinks	29 Dec 2002 00:32:34 -0000	1.7
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=BackLinks;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 markup=2;
Index: CalendarPlugin
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/CalendarPlugin,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -2 -b -p -d -r1.5 -r1.6
--- CalendarPlugin	25 Nov 2002 19:44:01 -0000	1.5
+++ CalendarPlugin	29 Dec 2002 00:32:34 -0000	1.6
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=CalendarPlugin;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: CategoryCategory
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/CategoryCategory,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- CategoryCategory	25 Nov 2002 19:44:01 -0000	1.2
+++ CategoryCategory	29 Dec 2002 00:32:34 -0000	1.3
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=CategoryCategory;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: CategoryHomePages
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/CategoryHomePages,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- CategoryHomePages	25 Nov 2002 19:44:01 -0000	1.2
+++ CategoryHomePages	29 Dec 2002 00:32:34 -0000	1.3
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=CategoryHomePages;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: DebugInfo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/DebugInfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -2 -b -p -d -r1.5 -r1.6
--- DebugInfo	25 Nov 2002 19:44:01 -0000	1.5
+++ DebugInfo	29 Dec 2002 00:32:34 -0000	1.6
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=DebugInfo;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 markup=2;
Index: FullRecentChanges
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/FullRecentChanges,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -2 -b -p -d -r1.6 -r1.7
--- FullRecentChanges	25 Nov 2002 19:44:01 -0000	1.6
+++ FullRecentChanges	29 Dec 2002 00:32:34 -0000	1.7
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=FullRecentChanges;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 markup=2;
Index: GoodStyle
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/GoodStyle,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -2 -b -p -d -r1.6 -r1.7
--- GoodStyle	25 Nov 2002 19:44:01 -0000	1.6
+++ GoodStyle	29 Dec 2002 00:32:34 -0000	1.7
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=GoodStyle;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: HomePage
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/HomePage,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -2 -b -p -d -r1.9 -r1.10
--- HomePage	25 Nov 2002 19:44:01 -0000	1.9
+++ HomePage	29 Dec 2002 00:32:34 -0000	1.10
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=HomePage;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: HowToUseWiki
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/HowToUseWiki,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -2 -b -p -d -r1.10 -r1.11
--- HowToUseWiki	25 Nov 2002 19:44:01 -0000	1.10
+++ HowToUseWiki	29 Dec 2002 00:32:34 -0000	1.11
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=HowToUseWiki;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: InterWiki
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/InterWiki,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -2 -b -p -d -r1.7 -r1.8
--- InterWiki	25 Nov 2002 19:44:01 -0000	1.7
+++ InterWiki	29 Dec 2002 00:32:34 -0000	1.8
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=InterWiki;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: InterWikiMap
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/InterWikiMap,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -2 -b -p -d -r1.8 -r1.9
--- InterWikiMap	25 Nov 2002 19:44:01 -0000	1.8
+++ InterWikiMap	29 Dec 2002 00:32:34 -0000	1.9
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=InterWikiMap;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 markup=2;
Index: LikePages
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/LikePages,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -2 -b -p -d -r1.8 -r1.9
--- LikePages	25 Nov 2002 19:44:01 -0000	1.8
+++ LikePages	29 Dec 2002 00:32:34 -0000	1.9
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=LikePages;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 markup=2;
Index: LinkIcons
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/LinkIcons,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -2 -b -p -d -r1.9 -r1.10
--- LinkIcons	25 Nov 2002 19:44:01 -0000	1.9
+++ LinkIcons	29 Dec 2002 00:32:34 -0000	1.10
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=LinkIcons;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: MoreAboutMechanics
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/MoreAboutMechanics,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -2 -b -p -d -r1.9 -r1.10
--- MoreAboutMechanics	25 Nov 2002 19:44:01 -0000	1.9
+++ MoreAboutMechanics	29 Dec 2002 00:32:34 -0000	1.10
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=MoreAboutMechanics;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: MostPopular
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/MostPopular,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -2 -b -p -d -r1.8 -r1.9
--- MostPopular	25 Nov 2002 19:44:01 -0000	1.8
+++ MostPopular	29 Dec 2002 00:32:34 -0000	1.9
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=MostPopular;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 markup=2;
Index: NewMarkupTestPage
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/NewMarkupTestPage,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -2 -b -p -d -r1.5 -r1.6
--- NewMarkupTestPage	25 Nov 2002 19:44:01 -0000	1.5
+++ NewMarkupTestPage	29 Dec 2002 00:32:34 -0000	1.6
@@ -4,9 +4,7 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=NewMarkupTestPage;
- author=JeffDairiki;
- version=1;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
- author_id=JeffDairiki;
 charset=iso-8859-1
 Content-Transfer-Encoding: binary
Index: OldStyleTablePlugin
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/OldStyleTablePlugin,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- OldStyleTablePlugin	25 Nov 2002 19:44:02 -0000	1.2
+++ OldStyleTablePlugin	29 Dec 2002 00:32:34 -0000	1.3
@@ -1,13 +1,10 @@
 Date: 2002年9月17日 12:48:59 -0700
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.4pre)
+X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=OldStyleTablePlugin;
 flags="";
- author=JeffDairiki;
- version=1;
- lastmodified=1032292139;
- author_id=192.168.1.10;
+ pgsrc_version="2 $Revision$";
 markup=2;
- hits=0;
 charset=iso-8859-1
 Content-Transfer-Encoding: binary
Index: OldTextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/OldTextFormattingRules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -2 -b -p -d -r1.1 -r1.2
--- OldTextFormattingRules	17 Dec 2002 18:32:50 -0000	1.1
+++ OldTextFormattingRules	29 Dec 2002 00:32:34 -0000	1.2
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=OldTextFormattingRules;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 charset=iso-8859-1
Index: PageHistory
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/PageHistory,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -2 -b -p -d -r1.5 -r1.6
--- PageHistory	25 Nov 2002 19:44:02 -0000	1.5
+++ PageHistory	29 Dec 2002 00:32:34 -0000	1.6
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=PageHistory;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 markup=2;
Index: PhpHighlightPlugin
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/PhpHighlightPlugin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -2 -b -p -d -r1.1 -r1.2
--- PhpHighlightPlugin	25 Nov 2002 19:44:02 -0000	1.1
+++ PhpHighlightPlugin	29 Dec 2002 00:32:34 -0000	1.2
@@ -1,13 +1,10 @@
 Date: 2002年11月23日 01:21:01 +0100
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.4pre)
+X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=PhpHighlightPlugin;
 flags="";
- author=MartinGeisler;
- version=1;
- lastmodified=1038010861;
- author_id=MartinGeisler;
+ pgsrc_version="2 $Revision$";
 markup=2;
- hits=2;
 charset=iso-8859-1
 Content-Transfer-Encoding: binary
Index: PhpWeatherPlugin
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/PhpWeatherPlugin,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- PhpWeatherPlugin	17 Dec 2002 18:16:57 -0000	1.2
+++ PhpWeatherPlugin	29 Dec 2002 00:32:34 -0000	1.3
@@ -1,6 +1,8 @@
 Date: 2002年11月25日 12:23:00 +0800
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.4pre)
+X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=PhpWeatherPlugin;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: PhpWiki
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/PhpWiki,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -2 -b -p -d -r1.5 -r1.6
--- PhpWiki	25 Nov 2002 19:44:02 -0000	1.5
+++ PhpWiki	29 Dec 2002 00:32:34 -0000	1.6
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=PhpWiki;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: PhpWikiAdministration%2FRemove
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/PhpWikiAdministration%2FRemove,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- PhpWikiAdministration%2FRemove	22 Aug 2002 23:28:32 -0000	1.2
+++ PhpWikiAdministration%2FRemove	29 Dec 2002 00:32:34 -0000	1.3
@@ -1,8 +1,9 @@
 Date: 2002年8月20日 22:53:22 +0100
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.3)
+X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=PhpWikiAdministration%2FRemove;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
- version=1;
 markup=2;
 charset=iso-8859-1
Index: RandomPage
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/RandomPage,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -2 -b -p -d -r1.3 -r1.4
--- RandomPage	25 Nov 2002 19:44:02 -0000	1.3
+++ RandomPage	29 Dec 2002 00:32:34 -0000	1.4
@@ -1,6 +1,8 @@
 Date: 2002年1月30日 18:00:02 -0500
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
+X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=RandomPage;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 markup=2;
Index: RecentChanges
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/RecentChanges,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -2 -b -p -d -r1.30 -r1.31
--- RecentChanges	25 Nov 2002 19:44:02 -0000	1.30
+++ RecentChanges	29 Dec 2002 00:32:34 -0000	1.31
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=RecentChanges;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 markup=2;
Index: RecentEdits
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/RecentEdits,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -2 -b -p -d -r1.12 -r1.13
--- RecentEdits	25 Nov 2002 19:44:02 -0000	1.12
+++ RecentEdits	29 Dec 2002 00:32:34 -0000	1.13
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=RecentEdits;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 markup=2;
Index: RecentVisitors
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/RecentVisitors,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -2 -b -p -d -r1.9 -r1.10
--- RecentVisitors	25 Nov 2002 19:44:02 -0000	1.9
+++ RecentVisitors	29 Dec 2002 00:32:34 -0000	1.10
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=RecentVisitors;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: ReleaseNotes
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/ReleaseNotes,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -2 -b -p -d -r1.14 -r1.15
--- ReleaseNotes	25 Nov 2002 19:44:02 -0000	1.14
+++ ReleaseNotes	29 Dec 2002 00:32:34 -0000	1.15
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 markup=2;
Index: SandBox
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/SandBox,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -2 -b -p -d -r1.4 -r1.5
--- SandBox	25 Nov 2002 19:44:02 -0000	1.4
+++ SandBox	29 Dec 2002 00:32:34 -0000	1.5
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=SandBox;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: SteveWainstead
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/SteveWainstead,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -2 -b -p -d -r1.10 -r1.11
--- SteveWainstead	25 Nov 2002 19:44:02 -0000	1.10
+++ SteveWainstead	29 Dec 2002 00:32:34 -0000	1.11
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=SteveWainstead;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -2 -b -p -d -r1.29 -r1.30
--- TextFormattingRules	25 Nov 2002 19:44:03 -0000	1.29
+++ TextFormattingRules	29 Dec 2002 00:32:34 -0000	1.30
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=TextFormattingRules;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 markup=2;
Index: TranscludePlugin
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TranscludePlugin,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- TranscludePlugin	25 Nov 2002 19:44:03 -0000	1.2
+++ TranscludePlugin	29 Dec 2002 00:32:34 -0000	1.3
@@ -1,13 +1,10 @@
 Date: 2002年9月17日 13:03:19 -0700
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.4pre)
+X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=TranscludePlugin;
+ pgsrc_version="2 $Revision$";
 flags="";
- author=JeffDairiki;
- version=1;
- lastmodified=1032292999;
- author_id=192.168.1.10;
 markup=2;
- hits=0;
 charset=iso-8859-1
 Content-Transfer-Encoding: binary
Index: UserPreferences
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/UserPreferences,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -2 -b -p -d -r1.7 -r1.8
--- UserPreferences	25 Nov 2002 19:44:03 -0000	1.7
+++ UserPreferences	29 Dec 2002 00:32:34 -0000	1.8
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=UserPreferences;
+ pgsrc_version="2 $Revision$";
 flags=PAGE_LOCKED;
 markup=2;
Index: WabiSabi
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/WabiSabi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -2 -b -p -d -r1.8 -r1.9
--- WabiSabi	25 Nov 2002 19:44:03 -0000	1.8
+++ WabiSabi	29 Dec 2002 00:32:34 -0000	1.9
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=WabiSabi;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: WikiPlugin
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/WikiPlugin,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -2 -b -p -d -r1.7 -r1.8
--- WikiPlugin	25 Nov 2002 19:44:03 -0000	1.7
+++ WikiPlugin	29 Dec 2002 00:32:34 -0000	1.8
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=WikiPlugin;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;
Index: WikiWikiWeb
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/WikiWikiWeb,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -2 -b -p -d -r1.6 -r1.7
--- WikiWikiWeb	25 Nov 2002 19:44:03 -0000	1.6
+++ WikiWikiWeb	29 Dec 2002 00:32:34 -0000	1.7
@@ -4,4 +4,5 @@ X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
 pagename=WikiWikiWeb;
+ pgsrc_version="2 $Revision$";
 flags="";
 markup=2;

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

From: Steve W. <wai...@us...> - 2002年12月28日 22:15:37

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv17661
Modified Files:
	RawHtml.php 
Log Message:
version tag was broken
Index: RawHtml.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RawHtml.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -2 -b -p -d -r1.3 -r1.4
--- RawHtml.php	29 Oct 2002 01:12:24 -0000	1.3
+++ RawHtml.php	28 Dec 2002 22:15:34 -0000	1.4
@@ -1,4 +1,4 @@
 <?php // -*-php-*-
-rcs_id('$Id:');
+rcs_id('$Id$');
 
 // Define ENABLE_RAW_HTML to true to enable the RawHtml plugin.

[phpwiki-checkins] CVS: phpwiki/pgsrc PgsrcTranslation,1.11,1.12

From: Steve W. <wai...@us...> - 2002年12月28日 22:04:48

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory sc8-pr-cvs1:/tmp/cvs-serv14816
Modified Files:
	PgsrcTranslation 
Log Message:
Added a sentence describing what the user is looking at.
Index: PgsrcTranslation
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/PgsrcTranslation,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -2 -b -p -d -r1.11 -r1.12
--- PgsrcTranslation	25 Nov 2002 19:44:02 -0000	1.11
+++ PgsrcTranslation	28 Dec 2002 22:04:45 -0000	1.12
@@ -14,4 +14,6 @@ __Note:__ This page is much more impress
 actually link.
 
+__What you are looking at:__ This table shows all the default pages that ship with PhpWiki and what languages they have been translated to.
+
 !! Translated Page Name Matrix
 ''Action Pages'' |

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

From: Carsten K. <car...@us...> - 2002年12月28日 01:32:04

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv10783
Modified Files:
	PhpWeather.php 
Log Message:
Plugin now traps the include error when phpweather.php is not installed. Tested with cvs version of PhpWeather.
Index: PhpWeather.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/PhpWeather.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -2 -b -p -d -r1.4 -r1.5
--- PhpWeather.php	25 Nov 2002 20:28:04 -0000	1.4
+++ PhpWeather.php	28 Dec 2002 01:32:01 -0000	1.5
@@ -26,7 +26,10 @@ rcs_id('$Id PhpWeather.php 2002年08月26日 15
 // We require the base class from PHP Weather, adjust this to match
 // the location of PhpWeather on your server:
-require_once($_SERVER['DOCUMENT_ROOT'] . '/phpweather/phpweather.php');
-require_once(PHPWEATHER_BASE_DIR . '/output/pw_images.php');
-require_once(PHPWEATHER_BASE_DIR . '/pw_utilities.php');
+$WEATHER = $_SERVER['DOCUMENT_ROOT'] . '/phpweather/phpweather.php';
+if(! @include_once($WEATHER)) {
+ if(!in_array($WEATHER, get_included_files()) ) {
+ trigger_error(sprintf(_("Could not open file %s."), "'$WEATHER'"));
+ }
+}
 
 class WikiPlugin_PhpWeather
@@ -50,4 +53,12 @@ extends WikiPlugin
 
 function run($dbi, $argstr, $request) {
+ // When 'phpweather/phpweather.php' is not installed then
+ // PHPWEATHER_BASE_DIR will be undefined
+ if (!defined('PHPWEATHER_BASE_DIR'))
+ return fmt("Plugin %s failed.", $this->getName()); //early return
+
+ require_once(PHPWEATHER_BASE_DIR . '/output/pw_images.php');
+ require_once(PHPWEATHER_BASE_DIR . '/pw_utilities.php');
+
 extract($this->getArgs($argstr, $request));
 $html = HTML();
@@ -70,5 +81,6 @@ extends WikiPlugin
 
 /* We check and correct the language if necessary: */
- if (!in_array($lang, array_keys($w->get_languages('text')))) {
+ //if (!in_array($lang, array_keys($w->get_languages('text')))) {
+ if (!in_array($lang, array_keys(get_languages('text')))) {
 trigger_error(sprintf(_("%s does not know about the language '%s', using 'en' instead."),
 $this->getName(), $lang), E_USER_NOTICE);

[phpwiki-checkins] CVS: phpwiki/locale/po phpwiki.pot,1.61,1.62

From: Carsten K. <car...@us...> - 2002年12月17日 21:12:16

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory sc8-pr-cvs1:/tmp/cvs-serv10175
Modified Files:
	phpwiki.pot 
Log Message:
added translator's comments about French punctuation
Index: phpwiki.pot
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/phpwiki.pot,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -2 -b -p -d -r1.61 -r1.62
--- phpwiki.pot	17 Dec 2002 18:34:47 -0000	1.61
+++ phpwiki.pot	17 Dec 2002 21:12:12 -0000	1.62
@@ -396,4 +396,6 @@ msgid "Diff: %s"
 msgstr ""
 
+# This entry is important for French punctuation rules which stipulate
+# a space before each colon.
 #: ../lib/display.php:59 ../lib/plugin/PageGroup.php:62
 #: ../lib/plugin/PageGroup.php:128 ../lib/plugin/PageGroup.php:136

[phpwiki-checkins] CVS: phpwiki/locale/po de.po,1.79,1.80 es.po,1.53,1.54 fr.po,1.26,1.27 it.po,1.42,1.43 nl.po,1.52,1.53 phpwiki.pot,1.60,1.61 sv.po,1.47,1.48

From: Geoffrey T. D. <da...@us...> - 2002年12月17日 18:35:29

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory sc8-pr-cvs1:/tmp/cvs-serv11769/locale/po
Modified Files:
	de.po es.po fr.po it.po nl.po phpwiki.pot sv.po 
Log Message:
Hack up French and German translations for "Use old markup".
Index: de.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/de.po,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -2 -b -p -d -r1.79 -r1.80
--- de.po	15 Dec 2002 02:34:53 -0000	1.79
+++ de.po	17 Dec 2002 18:34:29 -0000	1.80
@@ -7,5 +7,5 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.4pre\n"
-"POT-Creation-Date: 2002年12月14日 21:32-0500\n"
+"POT-Creation-Date: 2002年12月17日 10:29-0800\n"
 "PO-Revision-Date: 2000年10月31日 02:23+0200\n"
 "Last-Translator: Carsten Klapp <car...@ma...>, Reini Urban <rurban@x-"
@@ -157,18 +157,18 @@ msgid "Edit: %s"
 msgstr "Editiere: %s"
 
-#: ../lib/Theme.php:739 ../themes/default/templates/actionbar.tmpl:6
+#: ../lib/Theme.php:738 ../themes/default/templates/actionbar.tmpl:6
 msgid "Edit"
 msgstr "Editieren"
 
-#: ../lib/Theme.php:740
+#: ../lib/Theme.php:739
 msgid "Diff"
 msgstr "Diff"
 
-#: ../lib/Theme.php:741 ../themes/default/templates/signin.tmpl:6
+#: ../lib/Theme.php:740 ../themes/default/templates/signin.tmpl:6
 #: ../themes/default/templates/signin.tmpl:30
 msgid "Sign Out"
 msgstr "Abmelden"
 
-#: ../lib/Theme.php:742 ../lib/WikiUser.php:163
+#: ../lib/Theme.php:741 ../lib/WikiUser.php:163
 #: ../themes/default/templates/login.tmpl:44
 #: ../themes/default/templates/signin.tmpl:52
@@ -177,17 +177,17 @@ msgid "Sign In"
 msgstr "Anmelden"
 
-#: ../lib/Theme.php:743 ../themes/MacOSX/themeinfo.php:112
+#: ../lib/Theme.php:742 ../themes/MacOSX/themeinfo.php:111
 msgid "Lock Page"
 msgstr "Seite Sperren"
 
-#: ../lib/Theme.php:744 ../themes/MacOSX/themeinfo.php:113
+#: ../lib/Theme.php:743 ../themes/MacOSX/themeinfo.php:112
 msgid "Unlock Page"
 msgstr "Seite Freigeben"
 
-#: ../lib/Theme.php:745
+#: ../lib/Theme.php:744
 msgid "Remove Page"
 msgstr "Seite Löschen"
 
-#: ../lib/Theme.php:788
+#: ../lib/Theme.php:787
 #, c-format
 msgid "Redefinition of %s: %s"
@@ -444,5 +444,5 @@ msgid "Saved: %s"
 msgstr "Gespeichert: %s"
 
-#: ../lib/editpage.php:231 ../themes/MacOSX/themeinfo.php:114
+#: ../lib/editpage.php:231 ../themes/MacOSX/themeinfo.php:113
 msgid "Page Locked"
 msgstr "Seite Gesperrt"
@@ -506,9 +506,9 @@ msgstr ""
 "angezeigt."
 
-#: ../lib/editpage.php:321
+#: ../lib/editpage.php:323
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../lib/editpage.php:324
+#: ../lib/editpage.php:326
 msgid "Save"
 msgstr "Speichern"
@@ -1701,5 +1701,5 @@ msgid "UserPreferences"
 msgstr "BenutzerEinstellungen"
 
-#: ../lib/plugin/UserPreferences.php:50
+#: ../lib/plugin/UserPreferences.php:48
 msgid ""
 "Error: The page with the UserPreferences plugin must be valid WikiWord or a "
@@ -1711,9 +1711,9 @@ msgstr ""
 "Benutzerhomepage. Leider, die Einstellungen können nicht gespeichert werden."
 
-#: ../lib/plugin/UserPreferences.php:64
+#: ../lib/plugin/UserPreferences.php:62
 msgid "No changes."
 msgstr "Keine Änderungen."
 
-#: ../lib/plugin/UserPreferences.php:66
+#: ../lib/plugin/UserPreferences.php:64
 #, fuzzy, c-format
 msgid "%d UserPreferences fields successfully updated."
@@ -2123,6 +2123,7 @@ msgstr "Justiere"
 #: ../themes/Portland/templates/editpage.tmpl:75
 #: ../themes/default/templates/editpage.tmpl:78
-msgid "Use new markup"
-msgstr "Verwende neues Wiki Quelltextformat"
+#, fuzzy
+msgid "Use old markup"
+msgstr "Verwende alten Wiki Quelltextformat"
 
 #: ../themes/Portland/templates/editpage.tmpl:80
@@ -2131,24 +2132,36 @@ msgid "Preview only! Changes not saved.
 msgstr "Nur die Vorschau! Änderungen nicht gespeichert."
 
-#: ../themes/Portland/templates/editpage.tmpl:85
-#: ../themes/default/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:103
+#: ../themes/Portland/templates/editpage.tmpl:108
+#: ../themes/default/templates/editpage.tmpl:120
+#: ../themes/default/templates/editpage.tmpl:125
 #, c-format
 msgid "See %s tips for editing."
 msgstr "Siehe %s Tips fürs Editieren."
 
-#: ../themes/Portland/templates/editpage.tmpl:85
-#: ../themes/default/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:103
+#: ../themes/Portland/templates/editpage.tmpl:108
+#: ../themes/default/templates/editpage.tmpl:120
+#: ../themes/default/templates/editpage.tmpl:125
 msgid "GoodStyle"
 msgstr "GuterStil"
 
-#: ../themes/Portland/templates/editpage.tmpl:87
-#: ../themes/default/templates/editpage.tmpl:105
-msgid "TextFormattingRules"
+#: ../themes/Portland/templates/editpage.tmpl:104
+#: ../themes/default/templates/editpage.tmpl:121
+#, fuzzy
+msgid "OldTextFormattingRules"
 msgstr "TextFormatierungsRegeln"
 
-#: ../themes/Portland/templates/editpage.tmpl:87
-#: ../themes/default/templates/editpage.tmpl:105
+#: ../themes/Portland/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:109
+#: ../themes/default/templates/editpage.tmpl:121
+#: ../themes/default/templates/editpage.tmpl:126
 msgid "Synopsis"
 msgstr "Übersicht"
+
+#: ../themes/Portland/templates/editpage.tmpl:109
+#: ../themes/default/templates/editpage.tmpl:126
+msgid "TextFormattingRules"
+msgstr "TextFormatierungsRegeln"
 
 #: ../themes/Portland/templates/navbar.tmpl:8
Index: es.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/es.po,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -2 -b -p -d -r1.53 -r1.54
--- es.po	15 Dec 2002 02:34:53 -0000	1.53
+++ es.po	17 Dec 2002 18:34:34 -0000	1.54
@@ -10,5 +10,5 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.4pre\n"
-"POT-Creation-Date: 2002年12月14日 21:32-0500\n"
+"POT-Creation-Date: 2002年12月17日 10:29-0800\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
@@ -165,19 +165,19 @@ msgid "Edit: %s"
 msgstr "Editar: %s"
 
-#: ../lib/Theme.php:739 ../themes/default/templates/actionbar.tmpl:6
+#: ../lib/Theme.php:738 ../themes/default/templates/actionbar.tmpl:6
 msgid "Edit"
 msgstr "Editar"
 
-#: ../lib/Theme.php:740
+#: ../lib/Theme.php:739
 #, fuzzy
 msgid "Diff"
 msgstr "Diferencia de: %s"
 
-#: ../lib/Theme.php:741 ../themes/default/templates/signin.tmpl:6
+#: ../lib/Theme.php:740 ../themes/default/templates/signin.tmpl:6
 #: ../themes/default/templates/signin.tmpl:30
 msgid "Sign Out"
 msgstr ""
 
-#: ../lib/Theme.php:742 ../lib/WikiUser.php:163
+#: ../lib/Theme.php:741 ../lib/WikiUser.php:163
 #: ../themes/default/templates/login.tmpl:44
 #: ../themes/default/templates/signin.tmpl:52
@@ -186,17 +186,17 @@ msgid "Sign In"
 msgstr ""
 
-#: ../lib/Theme.php:743 ../themes/MacOSX/themeinfo.php:112
+#: ../lib/Theme.php:742 ../themes/MacOSX/themeinfo.php:111
 msgid "Lock Page"
 msgstr "Bloquear Página"
 
-#: ../lib/Theme.php:744 ../themes/MacOSX/themeinfo.php:113
+#: ../lib/Theme.php:743 ../themes/MacOSX/themeinfo.php:112
 msgid "Unlock Page"
 msgstr "Desbloquear Página"
 
-#: ../lib/Theme.php:745
+#: ../lib/Theme.php:744
 msgid "Remove Page"
 msgstr "Borrar Página"
 
-#: ../lib/Theme.php:788
+#: ../lib/Theme.php:787
 #, fuzzy, c-format
 msgid "Redefinition of %s: %s"
@@ -461,5 +461,5 @@ msgid "Saved: %s"
 msgstr "Guardar"
 
-#: ../lib/editpage.php:231 ../themes/MacOSX/themeinfo.php:114
+#: ../lib/editpage.php:231 ../themes/MacOSX/themeinfo.php:113
 msgid "Page Locked"
 msgstr "Página Bloqueada"
@@ -513,9 +513,9 @@ msgid ""
 msgstr ""
 
-#: ../lib/editpage.php:321
+#: ../lib/editpage.php:323
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: ../lib/editpage.php:324
+#: ../lib/editpage.php:326
 msgid "Save"
 msgstr "Guardar"
@@ -1741,5 +1741,5 @@ msgid "UserPreferences"
 msgstr "Preferencias"
 
-#: ../lib/plugin/UserPreferences.php:50
+#: ../lib/plugin/UserPreferences.php:48
 msgid ""
 "Error: The page with the UserPreferences plugin must be valid WikiWord or a "
@@ -1749,10 +1749,10 @@ msgstr ""
 
 # lib/pageinfo.php:21
-#: ../lib/plugin/UserPreferences.php:64
+#: ../lib/plugin/UserPreferences.php:62
 #, fuzzy
 msgid "No changes."
 msgstr "Mostrar el código fuente de la página y referencias"
 
-#: ../lib/plugin/UserPreferences.php:66
+#: ../lib/plugin/UserPreferences.php:64
 #, c-format
 msgid "%d UserPreferences fields successfully updated."
@@ -2170,5 +2170,5 @@ msgstr ""
 #: ../themes/Portland/templates/editpage.tmpl:75
 #: ../themes/default/templates/editpage.tmpl:78
-msgid "Use new markup"
+msgid "Use old markup"
 msgstr ""
 
@@ -2178,24 +2178,36 @@ msgid "Preview only! Changes not saved.
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:85
-#: ../themes/default/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:103
+#: ../themes/Portland/templates/editpage.tmpl:108
+#: ../themes/default/templates/editpage.tmpl:120
+#: ../themes/default/templates/editpage.tmpl:125
 #, c-format
 msgid "See %s tips for editing."
 msgstr "%s tips para editar."
 
-#: ../themes/Portland/templates/editpage.tmpl:85
-#: ../themes/default/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:103
+#: ../themes/Portland/templates/editpage.tmpl:108
+#: ../themes/default/templates/editpage.tmpl:120
+#: ../themes/default/templates/editpage.tmpl:125
 msgid "GoodStyle"
 msgstr "BuenEstilo"
 
-#: ../themes/Portland/templates/editpage.tmpl:87
-#: ../themes/default/templates/editpage.tmpl:105
-msgid "TextFormattingRules"
+#: ../themes/Portland/templates/editpage.tmpl:104
+#: ../themes/default/templates/editpage.tmpl:121
+#, fuzzy
+msgid "OldTextFormattingRules"
 msgstr "ReglasDeFormatoDeTexto"
 
-#: ../themes/Portland/templates/editpage.tmpl:87
-#: ../themes/default/templates/editpage.tmpl:105
+#: ../themes/Portland/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:109
+#: ../themes/default/templates/editpage.tmpl:121
+#: ../themes/default/templates/editpage.tmpl:126
 msgid "Synopsis"
 msgstr "Sinopsis"
+
+#: ../themes/Portland/templates/editpage.tmpl:109
+#: ../themes/default/templates/editpage.tmpl:126
+msgid "TextFormattingRules"
+msgstr "ReglasDeFormatoDeTexto"
 
 #: ../themes/Portland/templates/navbar.tmpl:8
Index: fr.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/fr.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -2 -b -p -d -r1.26 -r1.27
--- fr.po	15 Dec 2002 02:34:53 -0000	1.26
+++ fr.po	17 Dec 2002 18:34:39 -0000	1.27
@@ -6,5 +6,5 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.4pre\n"
-"POT-Creation-Date: 2002年12月14日 21:32-0500\n"
+"POT-Creation-Date: 2002年12月17日 10:29-0800\n"
 "PO-Revision-Date: 2002年02月22日 18:34+01:00\n"
 "Last-Translator: Roland Trique <rol...@fr...>, Stéphane Gourichon "
@@ -165,18 +165,18 @@ msgid "Edit: %s"
 msgstr "Éditer : %s"
 
-#: ../lib/Theme.php:739 ../themes/default/templates/actionbar.tmpl:6
+#: ../lib/Theme.php:738 ../themes/default/templates/actionbar.tmpl:6
 msgid "Edit"
 msgstr "Éditer"
 
-#: ../lib/Theme.php:740
+#: ../lib/Theme.php:739
 msgid "Diff"
 msgstr "Diff"
 
-#: ../lib/Theme.php:741 ../themes/default/templates/signin.tmpl:6
+#: ../lib/Theme.php:740 ../themes/default/templates/signin.tmpl:6
 #: ../themes/default/templates/signin.tmpl:30
 msgid "Sign Out"
 msgstr "Déconnexion"
 
-#: ../lib/Theme.php:742 ../lib/WikiUser.php:163
+#: ../lib/Theme.php:741 ../lib/WikiUser.php:163
 #: ../themes/default/templates/login.tmpl:44
 #: ../themes/default/templates/signin.tmpl:52
@@ -185,18 +185,18 @@ msgid "Sign In"
 msgstr "Connexion"
 
-#: ../lib/Theme.php:743 ../themes/MacOSX/themeinfo.php:112
+#: ../lib/Theme.php:742 ../themes/MacOSX/themeinfo.php:111
 msgid "Lock Page"
 msgstr "Verrouiller la Page"
 
-#: ../lib/Theme.php:744 ../themes/MacOSX/themeinfo.php:113
+#: ../lib/Theme.php:743 ../themes/MacOSX/themeinfo.php:112
 msgid "Unlock Page"
 msgstr "Déverrouiller la Page"
 
 # admin.php:57 admin.php:65
-#: ../lib/Theme.php:745
+#: ../lib/Theme.php:744
 msgid "Remove Page"
 msgstr "Supprimer la Page"
 
-#: ../lib/Theme.php:788
+#: ../lib/Theme.php:787
 #, c-format
 msgid "Redefinition of %s: %s"
@@ -466,5 +466,5 @@ msgid "Saved: %s"
 msgstr "Enregistrée : %s"
 
-#: ../lib/editpage.php:231 ../themes/MacOSX/themeinfo.php:114
+#: ../lib/editpage.php:231 ../themes/MacOSX/themeinfo.php:113
 msgid "Page Locked"
 msgstr "Page Verrouillée"
@@ -530,9 +530,9 @@ msgstr ""
 "l'autre auteur ont été combinées. Le résultat est affiché ci-dessous."
 
-#: ../lib/editpage.php:321
+#: ../lib/editpage.php:323
 msgid "Preview"
 msgstr "Prévisualiser"
 
-#: ../lib/editpage.php:324
+#: ../lib/editpage.php:326
 msgid "Save"
 msgstr "Enregistrer"
@@ -1786,5 +1786,5 @@ msgid "UserPreferences"
 msgstr "PréférencesUtilisateurs"
 
-#: ../lib/plugin/UserPreferences.php:50
+#: ../lib/plugin/UserPreferences.php:48
 msgid ""
 "Error: The page with the UserPreferences plugin must be valid WikiWord or a "
@@ -1793,10 +1793,10 @@ msgid ""
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:64
+#: ../lib/plugin/UserPreferences.php:62
 #, fuzzy
 msgid "No changes."
 msgstr "Historique des changements."
 
-#: ../lib/plugin/UserPreferences.php:66
+#: ../lib/plugin/UserPreferences.php:64
 #, c-format
 msgid "%d UserPreferences fields successfully updated."
@@ -2229,6 +2229,7 @@ msgstr "Ajuster"
 #: ../themes/Portland/templates/editpage.tmpl:75
 #: ../themes/default/templates/editpage.tmpl:78
-msgid "Use new markup"
-msgstr "Utiliser le nouveau marquage"
+#, fuzzy
+msgid "Use old markup"
+msgstr "Utiliser le vieux marquage"
 
 #: ../themes/Portland/templates/editpage.tmpl:80
@@ -2237,24 +2238,36 @@ msgid "Preview only! Changes not saved.
 msgstr "Prévisualisation uniquement ! Modifications non enregistrées."
 
-#: ../themes/Portland/templates/editpage.tmpl:85
-#: ../themes/default/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:103
+#: ../themes/Portland/templates/editpage.tmpl:108
+#: ../themes/default/templates/editpage.tmpl:120
+#: ../themes/default/templates/editpage.tmpl:125
 #, c-format
 msgid "See %s tips for editing."
 msgstr "Voir les conseils pour éditer les pages dans %s."
 
-#: ../themes/Portland/templates/editpage.tmpl:85
-#: ../themes/default/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:103
+#: ../themes/Portland/templates/editpage.tmpl:108
+#: ../themes/default/templates/editpage.tmpl:120
+#: ../themes/default/templates/editpage.tmpl:125
 msgid "GoodStyle"
 msgstr "StyleCorrect"
 
-#: ../themes/Portland/templates/editpage.tmpl:87
-#: ../themes/default/templates/editpage.tmpl:105
-msgid "TextFormattingRules"
+#: ../themes/Portland/templates/editpage.tmpl:104
+#: ../themes/default/templates/editpage.tmpl:121
+#, fuzzy
+msgid "OldTextFormattingRules"
 msgstr "RèglesDeFormatageDesTextes"
 
-#: ../themes/Portland/templates/editpage.tmpl:87
-#: ../themes/default/templates/editpage.tmpl:105
+#: ../themes/Portland/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:109
+#: ../themes/default/templates/editpage.tmpl:121
+#: ../themes/default/templates/editpage.tmpl:126
 msgid "Synopsis"
 msgstr "Vue d'ensemble"
+
+#: ../themes/Portland/templates/editpage.tmpl:109
+#: ../themes/default/templates/editpage.tmpl:126
+msgid "TextFormattingRules"
+msgstr "RèglesDeFormatageDesTextes"
 
 # lib/display.php:14
Index: it.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/it.po,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -2 -b -p -d -r1.42 -r1.43
--- it.po	15 Dec 2002 02:34:53 -0000	1.42
+++ it.po	17 Dec 2002 18:34:42 -0000	1.43
@@ -6,5 +6,5 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.4pre\n"
-"POT-Creation-Date: 2002年12月14日 21:32-0500\n"
+"POT-Creation-Date: 2002年12月17日 10:29-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Marco Milanesi <kp...@ad...>\n"
@@ -161,18 +161,18 @@ msgid "Edit: %s"
 msgstr "Modifica: %s"
 
-#: ../lib/Theme.php:739 ../themes/default/templates/actionbar.tmpl:6
+#: ../lib/Theme.php:738 ../themes/default/templates/actionbar.tmpl:6
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../lib/Theme.php:740
+#: ../lib/Theme.php:739
 msgid "Diff"
 msgstr "Diff"
 
-#: ../lib/Theme.php:741 ../themes/default/templates/signin.tmpl:6
+#: ../lib/Theme.php:740 ../themes/default/templates/signin.tmpl:6
 #: ../themes/default/templates/signin.tmpl:30
 msgid "Sign Out"
 msgstr ""
 
-#: ../lib/Theme.php:742 ../lib/WikiUser.php:163
+#: ../lib/Theme.php:741 ../lib/WikiUser.php:163
 #: ../themes/default/templates/login.tmpl:44
 #: ../themes/default/templates/signin.tmpl:52
@@ -181,17 +181,17 @@ msgid "Sign In"
 msgstr ""
 
-#: ../lib/Theme.php:743 ../themes/MacOSX/themeinfo.php:112
+#: ../lib/Theme.php:742 ../themes/MacOSX/themeinfo.php:111
 msgid "Lock Page"
 msgstr "Blocca la Pagina"
 
-#: ../lib/Theme.php:744 ../themes/MacOSX/themeinfo.php:113
+#: ../lib/Theme.php:743 ../themes/MacOSX/themeinfo.php:112
 msgid "Unlock Page"
 msgstr "Sblocca la Pagina"
 
-#: ../lib/Theme.php:745
+#: ../lib/Theme.php:744
 msgid "Remove Page"
 msgstr "Rimuovi la Pagina"
 
-#: ../lib/Theme.php:788
+#: ../lib/Theme.php:787
 #, c-format
 msgid "Redefinition of %s: %s"
@@ -451,5 +451,5 @@ msgid "Saved: %s"
 msgstr "Salvata: %s"
 
-#: ../lib/editpage.php:231 ../themes/MacOSX/themeinfo.php:114
+#: ../lib/editpage.php:231 ../themes/MacOSX/themeinfo.php:113
 msgid "Page Locked"
 msgstr "Pagina Bloccata"
@@ -504,10 +504,10 @@ msgid ""
 msgstr ""
 
-#: ../lib/editpage.php:321
+#: ../lib/editpage.php:323
 #, fuzzy
 msgid "Preview"
 msgstr "Precedente"
 
-#: ../lib/editpage.php:324
+#: ../lib/editpage.php:326
 msgid "Save"
 msgstr "Registra"
@@ -1734,5 +1734,5 @@ msgid "UserPreferences"
 msgstr "Preferenze"
 
-#: ../lib/plugin/UserPreferences.php:50
+#: ../lib/plugin/UserPreferences.php:48
 msgid ""
 "Error: The page with the UserPreferences plugin must be valid WikiWord or a "
@@ -1741,10 +1741,10 @@ msgid ""
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:64
+#: ../lib/plugin/UserPreferences.php:62
 #, fuzzy
 msgid "No changes."
 msgstr "Mostra il sorgente della pagina e le sue referenze"
 
-#: ../lib/plugin/UserPreferences.php:66
+#: ../lib/plugin/UserPreferences.php:64
 #, c-format
 msgid "%d UserPreferences fields successfully updated."
@@ -2160,5 +2160,5 @@ msgstr ""
 #: ../themes/Portland/templates/editpage.tmpl:75
 #: ../themes/default/templates/editpage.tmpl:78
-msgid "Use new markup"
+msgid "Use old markup"
 msgstr ""
 
@@ -2168,24 +2168,36 @@ msgid "Preview only! Changes not saved.
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:85
-#: ../themes/default/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:103
+#: ../themes/Portland/templates/editpage.tmpl:108
+#: ../themes/default/templates/editpage.tmpl:120
+#: ../themes/default/templates/editpage.tmpl:125
 #, c-format
 msgid "See %s tips for editing."
 msgstr "Vedere %s consigli per le modifiche."
 
-#: ../themes/Portland/templates/editpage.tmpl:85
-#: ../themes/default/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:103
+#: ../themes/Portland/templates/editpage.tmpl:108
+#: ../themes/default/templates/editpage.tmpl:120
+#: ../themes/default/templates/editpage.tmpl:125
 msgid "GoodStyle"
 msgstr "BuonStile"
 
-#: ../themes/Portland/templates/editpage.tmpl:87
-#: ../themes/default/templates/editpage.tmpl:105
-msgid "TextFormattingRules"
+#: ../themes/Portland/templates/editpage.tmpl:104
+#: ../themes/default/templates/editpage.tmpl:121
+#, fuzzy
+msgid "OldTextFormattingRules"
 msgstr "RegoleDiFormattazioneDelTesto"
 
-#: ../themes/Portland/templates/editpage.tmpl:87
-#: ../themes/default/templates/editpage.tmpl:105
+#: ../themes/Portland/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:109
+#: ../themes/default/templates/editpage.tmpl:121
+#: ../themes/default/templates/editpage.tmpl:126
 msgid "Synopsis"
 msgstr "Sinossi"
+
+#: ../themes/Portland/templates/editpage.tmpl:109
+#: ../themes/default/templates/editpage.tmpl:126
+msgid "TextFormattingRules"
+msgstr "RegoleDiFormattazioneDelTesto"
 
 #: ../themes/Portland/templates/navbar.tmpl:8
Index: nl.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/nl.po,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -2 -b -p -d -r1.52 -r1.53
--- nl.po	15 Dec 2002 02:34:53 -0000	1.52
+++ nl.po	17 Dec 2002 18:34:45 -0000	1.53
@@ -8,5 +8,5 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.4pre\n"
-"POT-Creation-Date: 2002年12月14日 21:32-0500\n"
+"POT-Creation-Date: 2002年12月17日 10:29-0800\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
@@ -163,18 +163,18 @@ msgid "Edit: %s"
 msgstr "Verander: %s"
 
-#: ../lib/Theme.php:739 ../themes/default/templates/actionbar.tmpl:6
+#: ../lib/Theme.php:738 ../themes/default/templates/actionbar.tmpl:6
 msgid "Edit"
 msgstr "Verander"
 
-#: ../lib/Theme.php:740
+#: ../lib/Theme.php:739
 msgid "Diff"
 msgstr "Diff"
 
-#: ../lib/Theme.php:741 ../themes/default/templates/signin.tmpl:6
+#: ../lib/Theme.php:740 ../themes/default/templates/signin.tmpl:6
 #: ../themes/default/templates/signin.tmpl:30
 msgid "Sign Out"
 msgstr ""
 
-#: ../lib/Theme.php:742 ../lib/WikiUser.php:163
+#: ../lib/Theme.php:741 ../lib/WikiUser.php:163
 #: ../themes/default/templates/login.tmpl:44
 #: ../themes/default/templates/signin.tmpl:52
@@ -183,17 +183,17 @@ msgid "Sign In"
 msgstr ""
 
-#: ../lib/Theme.php:743 ../themes/MacOSX/themeinfo.php:112
+#: ../lib/Theme.php:742 ../themes/MacOSX/themeinfo.php:111
 msgid "Lock Page"
 msgstr "Open Pagina"
 
-#: ../lib/Theme.php:744 ../themes/MacOSX/themeinfo.php:113
+#: ../lib/Theme.php:743 ../themes/MacOSX/themeinfo.php:112
 msgid "Unlock Page"
 msgstr "Sluit Pagina Af"
 
-#: ../lib/Theme.php:745
+#: ../lib/Theme.php:744
 msgid "Remove Page"
 msgstr "Verwijder Pagina"
 
-#: ../lib/Theme.php:788
+#: ../lib/Theme.php:787
 #, c-format
 msgid "Redefinition of %s: %s"
@@ -456,5 +456,5 @@ msgid "Saved: %s"
 msgstr "Bewaard: %s"
 
-#: ../lib/editpage.php:231 ../themes/MacOSX/themeinfo.php:114
+#: ../lib/editpage.php:231 ../themes/MacOSX/themeinfo.php:113
 msgid "Page Locked"
 msgstr "Sidan är Låst"
@@ -510,9 +510,9 @@ msgid ""
 msgstr ""
 
-#: ../lib/editpage.php:321
+#: ../lib/editpage.php:323
 msgid "Preview"
 msgstr "Voorvertonig"
 
-#: ../lib/editpage.php:324
+#: ../lib/editpage.php:326
 msgid "Save"
 msgstr "Bewaar"
@@ -1729,5 +1729,5 @@ msgid "UserPreferences"
 msgstr "GebruikersVoorkeuren"
 
-#: ../lib/plugin/UserPreferences.php:50
+#: ../lib/plugin/UserPreferences.php:48
 msgid ""
 "Error: The page with the UserPreferences plugin must be valid WikiWord or a "
@@ -1736,9 +1736,9 @@ msgid ""
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:64
+#: ../lib/plugin/UserPreferences.php:62
 msgid "No changes."
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:66
+#: ../lib/plugin/UserPreferences.php:64
 #, c-format
 msgid "%d UserPreferences fields successfully updated."
@@ -2154,5 +2154,5 @@ msgstr "Zet"
 #: ../themes/Portland/templates/editpage.tmpl:75
 #: ../themes/default/templates/editpage.tmpl:78
-msgid "Use new markup"
+msgid "Use old markup"
 msgstr ""
 
@@ -2162,24 +2162,36 @@ msgid "Preview only! Changes not saved.
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:85
-#: ../themes/default/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:103
+#: ../themes/Portland/templates/editpage.tmpl:108
+#: ../themes/default/templates/editpage.tmpl:120
+#: ../themes/default/templates/editpage.tmpl:125
 #, c-format
 msgid "See %s tips for editing."
 msgstr "%s tips for veranderen."
 
-#: ../themes/Portland/templates/editpage.tmpl:85
-#: ../themes/default/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:103
+#: ../themes/Portland/templates/editpage.tmpl:108
+#: ../themes/default/templates/editpage.tmpl:120
+#: ../themes/default/templates/editpage.tmpl:125
 msgid "GoodStyle"
 msgstr "GoedeStijl"
 
-#: ../themes/Portland/templates/editpage.tmpl:87
-#: ../themes/default/templates/editpage.tmpl:105
-msgid "TextFormattingRules"
+#: ../themes/Portland/templates/editpage.tmpl:104
+#: ../themes/default/templates/editpage.tmpl:121
+#, fuzzy
+msgid "OldTextFormattingRules"
 msgstr "TekstFormatteringsRegels"
 
-#: ../themes/Portland/templates/editpage.tmpl:87
-#: ../themes/default/templates/editpage.tmpl:105
+#: ../themes/Portland/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:109
+#: ../themes/default/templates/editpage.tmpl:121
+#: ../themes/default/templates/editpage.tmpl:126
 msgid "Synopsis"
 msgstr ""
+
+#: ../themes/Portland/templates/editpage.tmpl:109
+#: ../themes/default/templates/editpage.tmpl:126
+msgid "TextFormattingRules"
+msgstr "TekstFormatteringsRegels"
 
 #: ../themes/Portland/templates/navbar.tmpl:8
Index: phpwiki.pot
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/phpwiki.pot,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -2 -b -p -d -r1.60 -r1.61
--- phpwiki.pot	15 Dec 2002 02:34:53 -0000	1.60
+++ phpwiki.pot	17 Dec 2002 18:34:47 -0000	1.61
@@ -6,5 +6,5 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.4pre\n"
-"POT-Creation-Date: 2002年12月14日 21:32-0500\n"
+"POT-Creation-Date: 2002年12月17日 10:29-0800\n"
 "PO-Revision-Date: 2002年12月14日 17:51-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -155,18 +155,18 @@ msgid "Edit: %s"
 msgstr ""
 
-#: ../lib/Theme.php:739 ../themes/default/templates/actionbar.tmpl:6
+#: ../lib/Theme.php:738 ../themes/default/templates/actionbar.tmpl:6
 msgid "Edit"
 msgstr ""
 
-#: ../lib/Theme.php:740
+#: ../lib/Theme.php:739
 msgid "Diff"
 msgstr ""
 
-#: ../lib/Theme.php:741 ../themes/default/templates/signin.tmpl:6
+#: ../lib/Theme.php:740 ../themes/default/templates/signin.tmpl:6
 #: ../themes/default/templates/signin.tmpl:30
 msgid "Sign Out"
 msgstr ""
 
-#: ../lib/Theme.php:742 ../lib/WikiUser.php:163
+#: ../lib/Theme.php:741 ../lib/WikiUser.php:163
 #: ../themes/default/templates/login.tmpl:44
 #: ../themes/default/templates/signin.tmpl:52
@@ -175,17 +175,17 @@ msgid "Sign In"
 msgstr ""
 
-#: ../lib/Theme.php:743 ../themes/MacOSX/themeinfo.php:112
+#: ../lib/Theme.php:742 ../themes/MacOSX/themeinfo.php:111
 msgid "Lock Page"
 msgstr ""
 
-#: ../lib/Theme.php:744 ../themes/MacOSX/themeinfo.php:113
+#: ../lib/Theme.php:743 ../themes/MacOSX/themeinfo.php:112
 msgid "Unlock Page"
 msgstr ""
 
-#: ../lib/Theme.php:745
+#: ../lib/Theme.php:744
 msgid "Remove Page"
 msgstr ""
 
-#: ../lib/Theme.php:788
+#: ../lib/Theme.php:787
 #, c-format
 msgid "Redefinition of %s: %s"
@@ -439,5 +439,5 @@ msgid "Saved: %s"
 msgstr ""
 
-#: ../lib/editpage.php:231 ../themes/MacOSX/themeinfo.php:114
+#: ../lib/editpage.php:231 ../themes/MacOSX/themeinfo.php:113
 msgid "Page Locked"
 msgstr ""
@@ -488,9 +488,9 @@ msgid ""
 msgstr ""
 
-#: ../lib/editpage.php:321
+#: ../lib/editpage.php:323
 msgid "Preview"
 msgstr ""
 
-#: ../lib/editpage.php:324
+#: ../lib/editpage.php:326
 msgid "Save"
 msgstr ""
@@ -1666,5 +1666,5 @@ msgid "UserPreferences"
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:50
+#: ../lib/plugin/UserPreferences.php:48
 msgid ""
 "Error: The page with the UserPreferences plugin must be valid WikiWord or a "
@@ -1673,9 +1673,9 @@ msgid ""
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:64
+#: ../lib/plugin/UserPreferences.php:62
 msgid "No changes."
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:66
+#: ../lib/plugin/UserPreferences.php:64
 #, c-format
 msgid "%d UserPreferences fields successfully updated."
@@ -2075,5 +2075,5 @@ msgstr ""
 #: ../themes/Portland/templates/editpage.tmpl:75
 #: ../themes/default/templates/editpage.tmpl:78
-msgid "Use new markup"
+msgid "Use old markup"
 msgstr ""
 
@@ -2083,23 +2083,34 @@ msgid "Preview only! Changes not saved.
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:85
-#: ../themes/default/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:103
+#: ../themes/Portland/templates/editpage.tmpl:108
+#: ../themes/default/templates/editpage.tmpl:120
+#: ../themes/default/templates/editpage.tmpl:125
 #, c-format
 msgid "See %s tips for editing."
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:85
-#: ../themes/default/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:103
+#: ../themes/Portland/templates/editpage.tmpl:108
+#: ../themes/default/templates/editpage.tmpl:120
+#: ../themes/default/templates/editpage.tmpl:125
 msgid "GoodStyle"
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:87
-#: ../themes/default/templates/editpage.tmpl:105
-msgid "TextFormattingRules"
+#: ../themes/Portland/templates/editpage.tmpl:104
+#: ../themes/default/templates/editpage.tmpl:121
+msgid "OldTextFormattingRules"
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:87
-#: ../themes/default/templates/editpage.tmpl:105
+#: ../themes/Portland/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:109
+#: ../themes/default/templates/editpage.tmpl:121
+#: ../themes/default/templates/editpage.tmpl:126
 msgid "Synopsis"
+msgstr ""
+
+#: ../themes/Portland/templates/editpage.tmpl:109
+#: ../themes/default/templates/editpage.tmpl:126
+msgid "TextFormattingRules"
 msgstr ""
 
Index: sv.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/sv.po,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -2 -b -p -d -r1.47 -r1.48
--- sv.po	15 Dec 2002 02:34:53 -0000	1.47
+++ sv.po	17 Dec 2002 18:34:49 -0000	1.48
@@ -7,5 +7,5 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.4pre\n"
-"POT-Creation-Date: 2002年12月14日 21:32-0500\n"
+"POT-Creation-Date: 2002年12月17日 10:29-0800\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
@@ -159,13 +159,13 @@ msgid "Edit: %s"
 msgstr "Redigera: %s"
 
-#: ../lib/Theme.php:739 ../themes/default/templates/actionbar.tmpl:6
+#: ../lib/Theme.php:738 ../themes/default/templates/actionbar.tmpl:6
 msgid "Edit"
 msgstr "Redigera"
 
-#: ../lib/Theme.php:740
+#: ../lib/Theme.php:739
 msgid "Diff"
 msgstr "Diff"
 
-#: ../lib/Theme.php:741 ../themes/default/templates/signin.tmpl:6
+#: ../lib/Theme.php:740 ../themes/default/templates/signin.tmpl:6
 #: ../themes/default/templates/signin.tmpl:30
 #, fuzzy
@@ -173,5 +173,5 @@ msgid "Sign Out"
 msgstr "Logga ut"
 
-#: ../lib/Theme.php:742 ../lib/WikiUser.php:163
+#: ../lib/Theme.php:741 ../lib/WikiUser.php:163
 #: ../themes/default/templates/login.tmpl:44
 #: ../themes/default/templates/signin.tmpl:52
@@ -181,17 +181,17 @@ msgid "Sign In"
 msgstr "Anslut"
 
-#: ../lib/Theme.php:743 ../themes/MacOSX/themeinfo.php:112
+#: ../lib/Theme.php:742 ../themes/MacOSX/themeinfo.php:111
 msgid "Lock Page"
 msgstr "Lås Sida"
 
-#: ../lib/Theme.php:744 ../themes/MacOSX/themeinfo.php:113
+#: ../lib/Theme.php:743 ../themes/MacOSX/themeinfo.php:112
 msgid "Unlock Page"
 msgstr "Lås upp Sida"
 
-#: ../lib/Theme.php:745
+#: ../lib/Theme.php:744
 msgid "Remove Page"
 msgstr "Ta bort sida"
 
-#: ../lib/Theme.php:788
+#: ../lib/Theme.php:787
 #, c-format
 msgid "Redefinition of %s: %s"
@@ -452,5 +452,5 @@ msgid "Saved: %s"
 msgstr "Sparade: %s"
 
-#: ../lib/editpage.php:231 ../themes/MacOSX/themeinfo.php:114
+#: ../lib/editpage.php:231 ../themes/MacOSX/themeinfo.php:113
 msgid "Page Locked"
 msgstr "Sidan är Låst"
@@ -505,9 +505,9 @@ msgid ""
 msgstr ""
 
-#: ../lib/editpage.php:321
+#: ../lib/editpage.php:323
 msgid "Preview"
 msgstr "Översikt"
 
-#: ../lib/editpage.php:324
+#: ../lib/editpage.php:326
 msgid "Save"
 msgstr "Spara"
@@ -1730,5 +1730,5 @@ msgid "UserPreferences"
 msgstr "Inställningar"
 
-#: ../lib/plugin/UserPreferences.php:50
+#: ../lib/plugin/UserPreferences.php:48
 msgid ""
 "Error: The page with the UserPreferences plugin must be valid WikiWord or a "
@@ -1737,10 +1737,10 @@ msgid ""
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:64
+#: ../lib/plugin/UserPreferences.php:62
 #, fuzzy
 msgid "No changes."
 msgstr "Visa källkoden och referenser för sidan"
 
-#: ../lib/plugin/UserPreferences.php:66
+#: ../lib/plugin/UserPreferences.php:64
 #, c-format
 msgid "%d UserPreferences fields successfully updated."
@@ -2157,5 +2157,5 @@ msgstr "Justera"
 #: ../themes/Portland/templates/editpage.tmpl:75
 #: ../themes/default/templates/editpage.tmpl:78
-msgid "Use new markup"
+msgid "Use old markup"
 msgstr ""
 
@@ -2165,24 +2165,36 @@ msgid "Preview only! Changes not saved.
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:85
-#: ../themes/default/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:103
+#: ../themes/Portland/templates/editpage.tmpl:108
+#: ../themes/default/templates/editpage.tmpl:120
+#: ../themes/default/templates/editpage.tmpl:125
 #, c-format
 msgid "See %s tips for editing."
 msgstr "%s: Redigeringstips."
 
-#: ../themes/Portland/templates/editpage.tmpl:85
-#: ../themes/default/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:103
+#: ../themes/Portland/templates/editpage.tmpl:108
+#: ../themes/default/templates/editpage.tmpl:120
+#: ../themes/default/templates/editpage.tmpl:125
 msgid "GoodStyle"
 msgstr "BraStil"
 
-#: ../themes/Portland/templates/editpage.tmpl:87
-#: ../themes/default/templates/editpage.tmpl:105
-msgid "TextFormattingRules"
+#: ../themes/Portland/templates/editpage.tmpl:104
+#: ../themes/default/templates/editpage.tmpl:121
+#, fuzzy
+msgid "OldTextFormattingRules"
 msgstr "Textformateringsregler"
 
-#: ../themes/Portland/templates/editpage.tmpl:87
-#: ../themes/default/templates/editpage.tmpl:105
+#: ../themes/Portland/templates/editpage.tmpl:104
+#: ../themes/Portland/templates/editpage.tmpl:109
+#: ../themes/default/templates/editpage.tmpl:121
+#: ../themes/default/templates/editpage.tmpl:126
 msgid "Synopsis"
 msgstr "Översikt"
+
+#: ../themes/Portland/templates/editpage.tmpl:109
+#: ../themes/default/templates/editpage.tmpl:126
+msgid "TextFormattingRules"
+msgstr "Textformateringsregler"
 
 #: ../themes/Portland/templates/navbar.tmpl:8

[phpwiki-checkins] CVS: phpwiki/locale/sv/LC_MESSAGES phpwiki.mo,1.26,1.27

From: Geoffrey T. D. <da...@us...> - 2002年12月17日 18:35:27

Update of /cvsroot/phpwiki/phpwiki/locale/sv/LC_MESSAGES
In directory sc8-pr-cvs1:/tmp/cvs-serv11769/locale/sv/LC_MESSAGES
Modified Files:
	phpwiki.mo 
Log Message:
Hack up French and German translations for "Use old markup".
Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/sv/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -2 -b -p -d -r1.26 -r1.27
Binary files /tmp/cvs7X42Ag and /tmp/cvsujaUWm differ

[phpwiki-checkins] CVS: phpwiki/locale/es/LC_MESSAGES phpwiki.mo,1.30,1.31

From: Geoffrey T. D. <da...@us...> - 2002年12月17日 18:35:26

Update of /cvsroot/phpwiki/phpwiki/locale/es/LC_MESSAGES
In directory sc8-pr-cvs1:/tmp/cvs-serv11769/locale/es/LC_MESSAGES
Modified Files:
	phpwiki.mo 
Log Message:
Hack up French and German translations for "Use old markup".
Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -2 -b -p -d -r1.30 -r1.31
Binary files /tmp/cvsSe8zUq and /tmp/cvssNRTLM differ

[phpwiki-checkins] CVS: phpwiki/locale/de/LC_MESSAGES phpwiki.mo,1.61,1.62 phpwiki.php,1.67,1.68

From: Geoffrey T. D. <da...@us...> - 2002年12月17日 18:35:26

Update of /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES
In directory sc8-pr-cvs1:/tmp/cvs-serv11769/locale/de/LC_MESSAGES
Modified Files:
	phpwiki.mo phpwiki.php 
Log Message:
Hack up French and German translations for "Use old markup".
Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -2 -b -p -d -r1.61 -r1.62
Binary files /tmp/cvsHr6LeF and /tmp/cvsw0IJ8d differ
Index: phpwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES/phpwiki.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -2 -b -p -d -r1.67 -r1.68
--- phpwiki.php	15 Dec 2002 02:34:04 -0000	1.67
+++ phpwiki.php	17 Dec 2002 18:34:18 -0000	1.68
@@ -635,6 +635,4 @@ $locale["Uploading %s"] =
 $locale["Uploading zip dumps"] =
 "Das Hochladen der ZIP-Speicherauszüge zu diesem Wiki";
-$locale["Use new markup"] =
- "Verwende neues Wiki Quelltextformat";
 $locale["User statistics"] =
 "Benutzer Statistiken";

[phpwiki-checkins] CVS: phpwiki/locale/nl/LC_MESSAGES phpwiki.mo,1.38,1.39

From: Geoffrey T. D. <da...@us...> - 2002年12月17日 18:35:02

Update of /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES
In directory sc8-pr-cvs1:/tmp/cvs-serv11769/locale/nl/LC_MESSAGES
Modified Files:
	phpwiki.mo 
Log Message:
Hack up French and German translations for "Use old markup".
Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -2 -b -p -d -r1.38 -r1.39
Binary files /tmp/cvsFyyhrs and /tmp/cvs6O5QDK differ

[phpwiki-checkins] CVS: phpwiki/locale/it/LC_MESSAGES phpwiki.mo,1.24,1.25

From: Geoffrey T. D. <da...@us...> - 2002年12月17日 18:35:00

Update of /cvsroot/phpwiki/phpwiki/locale/it/LC_MESSAGES
In directory sc8-pr-cvs1:/tmp/cvs-serv11769/locale/it/LC_MESSAGES
Modified Files:
	phpwiki.mo 
Log Message:
Hack up French and German translations for "Use old markup".
Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/it/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -2 -b -p -d -r1.24 -r1.25
Binary files /tmp/cvsSNhkMi and /tmp/cvsmakKkr differ

Flat | Threaded

1 2 > >> (Page 1 of 2)

Thanks for helping keep SourceForge clean.