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

[phpwiki-checkins] CVS: phpwiki INSTALL,1.12,1.13

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

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

Modified Files:
	INSTALL 
Log Message:
reminder to include a note about "lib/FileFinder.php:82: Fatal[256]: DB.php: file not found"

Index: INSTALL
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/INSTALL,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** INSTALL	2001/12/01 21:55:57	1.12
--- INSTALL	2002/01/03 07:11:29	1.13
***************
*** 7,10 ****
--- 7,17 ----
  too. See http://pear.php.net/ for more information.
  
+ (note about
+  // You shouldn't have to change this unless you see a WikiFatalError:
+ //   lib/FileFinder.php:82: Fatal[256]: DB.php: file not found
+ //
+ #ini_set('include_path', '.:/where/you/installed/phpwiki');
+ goes here)
+ 
  You need the Perl regular expressions package compiled in; this is the
  default for PHP, so you probably have it. (If you don't you'll see an

[phpwiki-checkins] CVS: phpwiki index.php,1.48,1.49

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

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

Modified Files:
	index.php 
Log Message:
Reverted WikiName constant to undefined, since this is checked in config.php. Minor changes to some comments.

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** index.php	2002/01/03 00:09:15	1.48
--- index.php	2002/01/03 05:10:33	1.49
***************
*** 52,56 ****
  // This is used to generate a keywords meta tag in the HTML templates,
  // and during RSS generation for the <title> of the RSS channel.
! define('WIKI_NAME', 'PhpWiki');
  
  // If set, we will perform reverse dns lookups to try to convert the users
--- 52,56 ----
  // This is used to generate a keywords meta tag in the HTML templates,
  // and during RSS generation for the <title> of the RSS channel.
! //define('WIKI_NAME', 'PhpWiki');
  
  // If set, we will perform reverse dns lookups to try to convert the users
***************
*** 202,206 ****
  // Keep up to 8 major edits, but keep them no longer than a month.
  $ExpireParams['major'] = array('max_age' => 32,
!                                'keep'	   => 8);
  // Keep up to 4 minor edits, but keep them no longer than a week.
  $ExpireParams['minor'] = array('max_age' => 7,
--- 202,206 ----
  // Keep up to 8 major edits, but keep them no longer than a month.
  $ExpireParams['major'] = array('max_age' => 32,
!                                'keep'    => 8);
  // Keep up to 4 minor edits, but keep them no longer than a week.
  $ExpireParams['minor'] = array('max_age' => 7,
***************
*** 236,242 ****
  define("CHARSET", "iso-8859-1");
  
! // Select your language/locale - default language "C": English
! // other languages available: Dutch "nl", Spanish "es", German "de",
! // Swedish "sv", and Italian, "it".
  //
  // If you set $LANG to the empty string, your systems default
--- 236,247 ----
  define("CHARSET", "iso-8859-1");
  
! // Select your language/locale - default language is "C" for English.
! // Other languages available:
! // English "C"  (English    - HomePage)
! // Dutch   "nl" (Nederlands - ThuisPagina)
! // Spanish "es" (Español    - PáginaPrincipal)
! // German  "de" (Deutsch    - StartSeite)
! // Swedish "sv" (Svenska    - Framsida)
! // Italian "it" (Italiano   - PaginaPrincipale)
  //
  // If you set $LANG to the empty string, your systems default
***************
*** 279,282 ****
--- 284,289 ----
  // you should make sure that it's companion 'phpwiki-heavy.css'
  // is installed in the same directory that the base style file is.
+ // FIXME: These default CSS key names could use localization, but
+ // gettext() is not available at this point yet 
  $CSS_URLS = array(
      'PhpWiki' => "phpwiki.css",

[phpwiki-checkins] CVS: phpwiki/themes/MacOSX/locale/en/buttons Diff.png,NONE,1.1 FindPage.png,NONE,1.1 GoodStyle.png,NONE,1.1 RemovePage.png,NONE,1.1

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

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX/locale/en/buttons
In directory usw-pr-cvs1:/tmp/cvs-serv21656

Added Files:
	Diff.png FindPage.png GoodStyle.png RemovePage.png 
Log Message:
some button images for MacOSX theme


--- NEW FILE ---
‰PNG


DpA÷‹FØ¡ôôtÕå	q¼	£²±ÒS¬Ð,T%öÑÑѓ“,###åååccc¹¹¹ÝÝÝýýý½½½2`
WuW‘$Ƕpú€ÌÌL;BZÝA¯K8ÍÍÍÁo{{›hííí­®®ÞÜÜÄ׍_¡h&''‰g^^^SSSmmmaaa|·¶¶FI-..Š…
Fý/--p²†Ñ\oi:¾ÊÊÊ***ª««ÛÛÛ)/…”ñåH¯üBFdU´¡»nCüÐ)í­-rOñʪþÌÖ	LVV–Ú©}ÑiuõgÙ¿Õ&×%fÓú•F
Úá•QÁn\·¶ÿ„ö·üØ96Ó]–bØÏó˜Óì.ׇ:™MÓl%;û;æ:‚Œc
vô“{yy™f~N¡@…YOi‚?N~|<ÄKS8)I×èpðMú}C=2RYKYlÀ\ý¾yýöcÄ
tuuµµµ577þHaPÀÜ×o¿gsWÓA˜àÈYä"¤°?(`.èÒhÑÉñŸügpEþoÿOý

Y®>Kžý
--- NEW FILE ---
‰PNG


-J¯¨"A5n­*fª£ó;ûëYÝÎ٧әɠå{XYûÛßÙ{ýÿë»­}L­:y¯ÉŸ_†X=|ÓW.”¸˜4
þÐDìLÝZ,K=¾Ñ„	—V-|
Ä…ÑGEE‘qN:uᅍ7Ëè)ɄKnÉge©¤?8ƒ0²:õ’
MMMP.ç|ÎpMšÛÔ?¶Oá̯>s¼´É¿ž̵µµ´¯««c‘Ì	j°
Ë*X”d
@)4\‚¼X‚¹ÕwÔ3Ê/àê#ç\J±j;ù¾úÜôºIðç&2݁½à¢ÒCxaSqaÑG¡Kº&GªÑUù.èÚ&Þ×ח¨!¯³‘tÒ½ÂÅÞÒ'|àräº<¢õ‹Ê
ñB‘;´Åˆ|×"uá9Ÿz…UÀjõ]«ý{çÞ½{8@wü©Wø‘¤àuû÷ÎVÛwpèÙµkEkñâő‘‘ßu_
A
^P·oµý?‚
†¸GüpÊê¾:0‚¼ n±ý?ÒÖl¼ÿú¿™ÉôõÿÔvù
--- NEW FILE ---
‰PNG


Š Ø (¸.ì7ï0w.o³èf#Ώ—ûλsßyß=í½±•iRjÈßµ¢‰0Ñ)9l†©¿‘y¶Z±Ùìv»¿¿ÿO†0àÔ¥ŒŠŠŠÒÓÓããã<wêÔ©³gÏþnÈ^Rô<>@
°


X€"N])gûðá®xíÚ5¸
/µJqq±~”A
Ñ>€€8 ¸\ùì˗/\¨S§Ž^#tQJÓÕ[¯Žp@(p9¤pBQ …9JƒŸ[¤p¸Ø¥ùáEµð8…ƒ]̀”©‘Ù™ÙÙY™™ii©D5Îøë	ïK_µ]TIIIç+
p”ßØWšœHŽºÙ!!¡õë×,(È/)qmén&Ç<}úôúõë—,Y²uëV
6ÁÇü*ê;vìxîÜ99¥–mÛ¶mùòå{÷î}÷î]×Y¹rå´iÓþõ¾êñ¥+ïÈ”gdÀ’Ù”‰Çggg“ÿ8>}úÔèéü¹ÎF=yò„V…ízöìåÜÜÜqãÆ-[¶¸]ºtyÿþýƍ©8~ÿYÔó<|ø022òå˗¡¡¡”³”””D
ÿàÁƒ÷ïß/+ã)¼Ü0àýæĉìÙóرcru×®] £P–°ÎôéÓ»wïNŒÏ›7¸±4ØŽµ—5kÖo‡Q£F&OžÌ ^½z
4€nsMœ8‘š€¡.Ô‹÷qd¦®Äz¼€Áž={0jÔ(xæ̙,ÑóH#FŒ@?{ölœHô8,\†à$Ö7oޜò‚[áά#ÞÄo90iÒ$
Jï¦Nª›ôàÁ\cؤN:±%ćjJ•]
(

€€8ž˜ÊÜÿc¢$×ZR³Æ@
°
--- NEW FILE ---
‰PNG


]ÐòØ]í(E	€`&H¹¯ÌÄßgϞùùù(PÀËNS¤¬»Ù®¯ŒÀ)`Áë|çýû÷ðæyO4K-O=vó­¾"`‚°Î=Pv<nØ	Á($Vèµ òõõýYÉb÷”S3Å
0¤Î@,ˆ…2I†%¹3—K”(ñ—Òœ9s(»söÿ¹][€)|³KNg(¢5kÖø)Qá¥ñãÇS.UªÆÕ«W›³B¤H_~W:t軪¶[ô5ílAÒ¥7J¯¾lû–x‘+YKmý@q[}P/FÁJ<õ²Ó‚ ôèÑ1cÆÔ¨Q#>>Þ¶Ú×Ô͛7G}ìر­[·öëׯe˖綯‰ÉÕ±»é2s/F(¹N¬V›6m"##Oœ8Q­Zµ+V˜¥«ó¥í[f{ºÝ	ÓÖè®)×Ê3fÌزeË®]»®_¿~àÀOû¡ ›ïº2t¸«'…'OžpÕQX»°ùiö*^¼¸îkZZ®T³fM¸/Y²DŒGŽiР
íãY•+Wž5kÖ£GºtéR±bž}ûêñìÛ·¯I“&ëÖ­»råJ,wîÜ©]»6¾T ç|ñâ¯LŸ>Ýßß¿jÕª0uíR™2e؎ðk¦aàÀ5ª^½z=H³¤Âµk×:uêT¥J•V­ZMž<¹sçÎb'ڄ……Ñl­ZµöîÝëšEŽk úJãƍ6);®J÷ïß_»v-{÷î-–yóæq²<~ü8ÍÙ³gs2÷Û·oϝ;wùòå.Œˆˆèի׈#ˆ˜ƒhCK—.ÑHÿþý/_¾L#3gΌ‰‰)_¾|Ù²e7oÞ,oØ°‘-Z”Eƒ‡<x+Á^æ^±û/Z´ˆB‹-2Á©9á×´i('å[l6,A¢
_Ԟ4xð`¦çüùóLá”)S²»¦½»êäɓ\%8ä%NŠ»á³ hݺµׯ_'Þ»w¿ÐáÇ3:áp¬ZµŠ¨×p;qâD^Á‰*UªÄ±°G•,Y§&ßl×®À{÷îÝyd¨°°nÝ:æ†2.äO´ÉTé^õìÙ‡¥KK—.å–®]»²Îòåː˜˜ˆåÔ©S|tȐ!|‘G¸³¼K·™¶¦M›^½z•¾±†ðŒÜ óÉ%⼊8jÔ(|dÛ¶m1”û<þ|Ϟ=ì9ܒp›Ñ	ŸB…
™“'Š]ûÂÝ»wëÔ©£§Ì: 2iÒ$¦šä¡AAA†bÁÒÁñ)“<ñH¿8ÂѦ†š˜ùóçñY5oÞÜPр+Â2"šåJŠE›6lÈ+*TÈ…M Ð
Ûv÷3ËË%eÑúQ¸páŋ+Àꥎ•8Eǎ¡£nißÝwK—.}îÜ9m¿páCMF‡pdœš`*ƒg}0©1™6l˜n­qãÆxqþüùł¿UvïÞM5_ڇW>!=yúô©hV&I÷¿Y³fæ»´"¶<s(eX^‘©DÅáe:ÈcgH>|8®¦°8{ö¬á<µ`k²Ôן¶ØCCCq¢èèh,IIIh,R?,ì7
Q›  õûôéCO LD’MÌ4þ¬~‚hP°`AºSöìx´l<QQQ\çCØ˕+Ç¢Äip^ÚáXÇú0÷Ó°K|mk²æqjÇã*»œÞ„‚Y,'ìS§NÅ×Ø(¨?vìXR…¶mÛÖ«W/ ÀŸªÛ—vtw-ír°G9’õÛ¾}{ Ê
à­àà ¼‡Âˤ?¤½ƒ


!ß ,à§ú¯ã–~âøȆÊ1Ol	عÒyK±bňﾾ¾RÙ²e,D9‚Õ¯xúôi±Kûr˲R6PvfŒ-•€‰%Dâ_Lirr2Çm#3i³œ;°ËŸ•_g*—eÜJ\&¯ïò
/Ò½ÜÔg/^äšcû\ʤqÒ¸¹	~·nÝÌõIɋ,íH÷x˜`¤MRv&ñ7H-?oê¿
¥)نìoß¾å$JÊiiotýïÝ>aÂŽWìldÁl!Ä¥Û\„(ƒ‘Ù²"&Ìݺu¦žü•Óò³©¥ðcÛccc§M›F8"]aÝä¾ÐÁŒÀibL;wî$ÓÆ?zôy7A#!!
¤€Í@üòå˸¸8Îøù·îᏠ0¤€u"NÏüíŽó{(ü[÷ðû

[phpwiki-checkins] CVS: phpwiki/themes/MacOSX/locale/en/buttons - New directory

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

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX/locale/en/buttons
In directory usw-pr-cvs1:/tmp/cvs-serv21330/buttons

Log Message:
Directory /cvsroot/phpwiki/phpwiki/themes/MacOSX/locale/en/buttons added to the repository

[phpwiki-checkins] CVS: phpwiki/themes/MacOSX/locale/en - New directory

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

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX/locale/en
In directory usw-pr-cvs1:/tmp/cvs-serv21143/en

Log Message:
Directory /cvsroot/phpwiki/phpwiki/themes/MacOSX/locale/en added to the repository

[phpwiki-checkins] CVS: phpwiki/themes/MacOSX/locale - New directory

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

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX/locale
In directory usw-pr-cvs1:/tmp/cvs-serv20958/locale

Log Message:
Directory /cvsroot/phpwiki/phpwiki/themes/MacOSX/locale added to the repository

[phpwiki-checkins] CVS: phpwiki/themes/MacOSX LockPage.png,NONE,1.1 UnlockPage.png,NONE,1.1 PageLocked.png,NONE,1.1

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

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX
In directory usw-pr-cvs1:/tmp/cvs-serv20690

Added Files:
	LockPage.png UnlockPage.png PageLocked.png 
Log Message:
button images for MacOSX theme

--- NEW FILE ---
‰PNG


ä+ª…ç4Å
c깄龺\Ñܞš&U&Fôƒ‘cüdl3~=ۚ#§9gÉWeJºmí˜Ñ°¨—Ÿˆ%Í1«9“RW‹ø‹ÿ“0íEþ;ý
--- NEW FILE ---
‰PNG


j

ä
!Ž•òe_æ-;ÇÞÝÚX1ÒóíÝì¼·;;··&ŠZLÃy&__C§$cŒ1ÁH3¦ÿiÍ5¦¹›¨Ë˜c¬0¾0VŸKŒ…>û—tìªæZÑÜnX£É0Öïoêõº4
…f³Ùa¿Ä\^^zàb¼×Ü­¥,¦S±ÀX«T**¸ÕjyívÛG§Ó	´M„ý
hsõú~4…+¸M;œyÈ5ìïïÓÑÑåóy´ñ>[Œ£WÓqœÇ…UNbÑ]îúúšŽ)—ËÑòò²Úx_ØL®°pÂÖÙ&
»¸¸ ³³3:99ñ3pxx¨îËå2-..ZÅm|aۈa777´½½M¥RIUìÎÎN /Ö±X,R*•òcÍâ(Üo¦"|~~NÙÙYJ§_Q2‘ðÿÔþò`ZªšDDxIu6š
Վë5ëñ¬:6MN¦Õóam(ay5FFFhzjŠE&)˜q­^Sï)R;(½}…ÍtHQ€(+ð>L§§¿¨RùÍUzß:¨èTÊõ«7,n+°G«DòšÍ̼¦·óóÔåY’A_&“ñ_°9ˆ¡„M1¹b¯ÝÜü¦ö_[:ÇÇÇ)Á‡ÌˆßÜùÂ1‘TCÁ¦0
--- NEW FILE ---
‰PNG


[phpwiki-checkins] CVS: phpwiki/themes/Hawaiian/pictures random.php,1.3,1.4

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

Update of /cvsroot/phpwiki/phpwiki/themes/Hawaiian/pictures
In directory usw-pr-cvs1:/tmp/cvs-serv17871

Modified Files:
	random.php 
Log Message:
random image array is read in from dir instead of hard coded. For the Hawaiian theme, random image is not used by default (but still are performance issues)

Index: random.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Hawaiian/pictures/random.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** random.php	2002/01/02 00:38:27	1.3
--- random.php	2002/01/03 04:28:28	1.4
***************
*** 3,25 ****
  rcs_id('$Id$');
  
! // mt_srand ((double) microtime() * 1000000 / pi()); #not random enough
! // Hmm is this random enough?
! // see http://download.php.net/manual/en/function.srand.php
! 
! 
! $RandomPictures = array(
!     "BeachPalmDusk.jpg",
!     "Coastline.jpg",
!     "HawaiiMauiFromSpace.jpg",
!     "LavaTwilight.jpg",
!     "LoihiSeamount.jpg",
!     "SteamVolcanoDusk.jpg",
!     "SubmersiblePiscesV.jpg",
!     "SwimmingPoolWater.jpg",
!     "Waterfall.jpg",
!     "WhaleRainbow.jpg"
! );
  
! if (isset($RandomPictures)) {
      function my_srand($seed = '') {
          static $wascalled = FALSE;
--- 3,71 ----
  rcs_id('$Id$');
  
! // FIXME: This whole file could be refactored and turned in a
! //        RandomImage plugin.
! //
! //        Performace issues? $SignatureImg does not appear on
! //        every page but index.php is loaded every time
! //        index.php -> themeinfo.php -> random.php
! //
  
! /*
! $RandomPictures = array("BeachPalmDusk.jpg", "Coastline.jpg",
!     "HawaiiMauiFromSpace.jpg", "LavaTwilight.jpg",
!     "LoihiSeamount.jpg", "SteamVolcanoDusk.jpg",
!     "SubmersiblePiscesV.jpg", "SwimmingPoolWater.jpg",
!     "Waterfall.jpg", "WhaleRainbow.jpg");
! */
! 
! // Mac users take note:
! //
! // This function relies on all the image files having filename
! // suffixes, even if the web server uses a "MAGIC files" capability
! // (to automatically assign a mime-type based on the the first few
! // bytes of the file).
! //
! // This code is a variation of function LoadDir in lib/loadsave.php
! // See http://www.php.net/manual/en/function.readdir.php 
! 
! function imagelist($dirname) {
!     if (empty($dirname)) {
!         //ignore quietly
!         //trigger_error(("dirname is empty"), E_USER_NOTICE);
!         //$imagelist = "";
!     } else {
!         $handle = opendir($dir = $dirname);
!         if (empty($handle)) {
!             // FIXME: gettext doesn't work in index.php or themeinfo.php
!             trigger_error(sprintf(("Unable to open directory '%s' for reading"),
!                                   $dir), E_USER_NOTICE);
!             //$imagelist = "";
!         } else {
!             $imagelist = array();
!             while ($fn = readdir($handle)) {
! 
!                 if ($fn[0] == '.' || filetype("$dir/$fn") != 'file')
!                     continue;
!                 // FIXME: Use $InlineImages instead of just ".jpg" hardcoded.
!                 if (substr($fn,-4) == ".jpg")
!                     array_push($imagelist, "$fn");
! 
!             }
!             closedir($handle);
!         }
!     }
!     return $imagelist;
! }
! 
! // FIXME: Will this need to be changed to work on WindowsOS?
! $RandomPictures = imagelist( getcwd() ."/" ."themes/$theme/pictures/" );
! 
! if (!empty($RandomPictures)) {
! 
!     // mt_srand ((double) microtime() * 1000000 / pi())
!     //
!     // Not random enough... Hmm is this random enough? See
!     // http://download.php.net/manual/en/function.srand.php
! 
      function my_srand($seed = '') {
          static $wascalled = FALSE;
***************
*** 32,36 ****
  
      my_srand();
!     $SignatureImg = "themes/$theme/pictures/" . $RandomPictures[mt_rand(0,count($RandomPictures)-1)];
  }
  
--- 78,88 ----
  
      my_srand();
! 
!     // For testing the randomization out, just use $logo instead
!     // of #Signature
! 
! //    $logo = "themes/$theme/pictures/"
!     $SignatureImg = "themes/$theme/pictures/"
!                  . $RandomPictures[mt_rand(0,count($RandomPictures)-1)];
  }
  

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

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

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

Modified Files:
	Toolbar.php 
Log Message:
Beginning migration of "toolbar" php logic from xhtml templates into Toolbar.php. (No changes to actual templates yet, much work sill needs to be done.)

Index: Toolbar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Toolbar.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Toolbar.php	2001/12/27 19:25:48	1.1
--- Toolbar.php	2002/01/03 02:17:11	1.2
***************
*** 86,89 ****
--- 86,272 ----
  }
  
+ function separator() {
+ /*
+     $toolbar_style = "text";
+     select ( $toolbar_style ) {
+     case "text" :
+         $separator = " | ";
+         break;
+     case "list" :
+         $separator = ", ";
+         break;
+     case "image" :
+         $separator = "<img alt=\" | \" src=\"" .DATA_URL( '$placeholder' ) ."\" />";
+         break;
+     }
+     return $separator;
+ */
+     // just using a hardcoded separator for now
+     return " | ";
+ }
+ 
+ 
+ // There is still some work to do before these functions
+ // can be used as ${tokens} in the xhtml templates:
+ //
+ // Plugins and [pagename] need to be dealt with.
+ //
+ // Which variables are to be passed to the functions is not finalised yet.
+ //
+ // The raw html should also be replaced with calls to
+ // Element() and/or QElement()
+ 
+ 
+ //BrowsePage stuff
+ function toolbar_Warning_IsCurrent($IS_CURRENT, $BROWSE, $PAGEURL) {
+     $html = "";
+     if (! $IS_CURRENT) {
+         $html .= "<p><strong>" ._("Note:") ."</strong> " ._("You are viewing an old revision of this page.");
+         $html .= "<a href=\"" .${BROWSE} .${PAGEURL} ."\">" ._("View the current version") ."</a>.</p>";
+ 	$html .= "<hr class=\"ignore\" noshade=\"noshade\" />";
+     }
+     return $html;
+ }
+ 
+ function toolbar_Info_LastModified($IS_CURRENT, $LASTMODIFIED, $VERSION) {
+     $html = "";
+     if ($IS_CURRENT) {
+        $html .= sprintf(_("Last edited on %s."),$LASTMODIFIED);
+     } else {
+        $html .= sprintf(_("Version %s, saved on %s."),$VERSION,$LASTMODIFIED);
+     }
+     return $html;
+ }
+ 
+ function toolabr_action_PageActions($page, $user, $IS_CURRENT, $ACTION, $VERSION) {
+     $html = "";
+     if ($page->get('locked') && !$user->is_admin()) {
+         $html .= _("Page locked");
+     } else {
+ 	if ($IS_CURRENT) {
+             $html .= "<a class=\"wikiaction\" href=\"" .${ACTION} ."edit\">" ._("Edit") ."</a>";
+         } else {
+             $html .= "<a class=\"wikiaction\" href=\"" .${ACTION} ."edit&amp;version=" .${VERSION};
+             $html .= ">" ._("Edit old revision") ."</a>";
+         }
+     }
+     if ($user->is_admin()) {
+ 	if ($page->get('locked')) {
+             $html .= separator() ."<a class=\"wikiadmin\" href=\"" .${ACTION} ."unlock\">" ._("Unlock page") ."</a>";
+         } else {
+             $html .= separator() ."<a class=\"wikiadmin\" href=\"" .{$ACTION} ."lock\">" ._("Lock page") ."</a>";
+         }
+         $html .= separator() ."<a class=\"wikiadmin\" href=\"" .{$ACTION} ."remove\">" ._("Remove page") ."</a>";
+     }
+     $html .= separator() ."<?plugin-link PageHistory page=\"[pagename]\"";
+     if ($IS_CURRENT) {
+         $html .= separator() ."<a class=\"wikiaction\" href=\"" .${ACTION} ."diff&amp;previous=major\">" ._("Diff") ."</a>";
+     } else {
+         $html .= separator() ."<a class=\"wikiaction\""; 
+         $html .= "href=\"" .${ACTION} ."diff&amp;version=" .${VERSION} ."&amp;previous=major\">" ._("Diff") ."</a>";
+     }
+         $html .= 
+     $html .= separator() .LinkExistingWikiWord(_("BackLinks"));
+ 
+     return $html;
+ }
+ 
+ function toolbar_action_SearchActions($page, $CHARSET) {
+     $html = "";
+     $html .= "<form action=\"" .WikiURL(_("TitleSearch")) ."\" method=\"get\" accept-charset=\"" .${CHARSET} ."\">";
+     $html .= LinkExistingWikiWord(_("RecentChanges"));
+     $html .= separator() .LinkExistingWikiWord(_("FindPage"));
+     $html .= separator() ."<span><input type=\"hidden\" name=\"auto_redirect\" value=\"1\" />";
+     $html .= "<input type=\"text\"  name=\"s\" size=\"12\"";
+     $html .= " title=" ._("Quick Search");
+     $html .= " onmouseover=\"window.status='" ._("Quick Search") ."'; return true;";
+     $html .= " onmouseout=\"window.status=''; return true;\" /></span>";
+     $html .= separator() ."<?plugin-link LikePages page=\"[pagename]\" ?>";
+     $html .= "</form>";
+     return $html;
+ }
+ 
+ function toolbar_User_UserSignInOut($user, $USERID, $ACTION) {
+     $html = "";
+     if ($user->is_authenticated()) {
+         $html .= sprintf(_("You are signed in as %s"), LinkWikiWord($USERID));
+         $html .= separator() ."<a class=\"wikiaction\" href=\"" .${ACTION} ."logout\">" ._("SignOut") ."</a>";
+     } else {
+         $html .= "<a class=\"wikiaction\" href=\"" .${ACTION} ."login\">" ._("SignIn") ."</a>";
+     }
+     return $html;
+ }
+ 
+ function toolbar_action_Logo($BROWSE, $WIKI_NAME, $LOGO) {
+     $html = "";
+     $html .= "<div>";
+     $html .= "<a class=\"wikilink\" href=\"" .${BROWSE} ._("HomePage") ."\">";
+     $html .= "<img alt=\"" .${WIKI_NAME} .":" ._("HomePage");
+     $html .= " src=\"" .${LOGO} ."\"";
+     $html .= " border=\"0\" ."\" align=\"right\" />";
+     $html .= "</a></div>"
+     return $html;
+ }
+ 
+ function toolbar_action_Navigation() {
+     $html = "";
+     $html .= _("RecentChanges");
+ //    $html .= separator() ._("RandomPage");
+ //    $html .= separator() ._("WantedPages");
+ //    $html .= separator() ._("SandBox");
+     return $html;
+ }
+ 
+ 
+ //EditPage stuff
+ 
+ function toolbar_Warning_Preview($PREVIEW_CONTENT) {
+     $html = "";
+     if (!empty($PREVIEW_CONTENT)) {
+         $html .= "<p><strong>" ._("Preview only!  Changes not saved.") ."</strong></p>";
+         $html .= "<div class="wikitext">" .${PREVIEW_CONTENT} ."</div>";
+         $html .= "<hr class=\"ignore\" noshade />";
+     }
+     return $html;
+ }
+ 
+ function toolbar_Warning_OldRevision() {
+     $html = "";
+     if (!$IS_CURRENT) {
+         $html .= "<p><strong>" ._("Warning: You are editing an old revision.");
+         $html .= " " ._("Saving this page will overwrite the current version.") ."</strong></p>";
+         $html .= "<hr class=\"ignore\" noshade />";
+     }
+     return $html;
+ }
+ 
+ function toolbar_User_AuthorSignInOut() {
+     $html = "";
+     if ($user->is_authenticated()) {
+         $html .= sprintf(_("You are signed in as %s."), LinkWikiWord($USERID));
+     } else {
+         $html .= sprintf(_("Author will be logged as %s."),"<em>${USERID}</em>");
+         $html .= separator() ."<a class=\"wikiaction\" href=\"" .${ACTION} ."login\">";
+         $html .= _("SignIn") ."<small>*</small></a>";
+         $html .= "<br><small>*backup and reload after signing in</small>";
+     }
+     return $html;
+ }
+ 
+ function toolbar_Info_EditTips() {
+     $html = "";
+     $html .= sprintf(_("You can change the size of the editing area in %s."), LinkExistingWikiWord(_("UserPreferences")));
+     $html .= sprintf(_("See %s tips for editing."),LinkExistingWikiWord(_("GoodStyle")));
+     return $html;
+ }
+ 
+ function toolbar_Info_EditHelp() {
+     $html = "";
+     $html .= "<div class=\"wiki-edithelp\">";
+     $html .= "<?plugin IncludePage page=" ._("TextFormattingRules") ."section=" ._("Synopsis") ."quiet=1?>";
+     $html .= "</div>";
+     return $html;
+ }
+ 
  // Local Variables:
  // mode: php
***************
*** 94,102 ****
  // End:   
  ?>
- 
- 
- 
- 
- 
- 
- 
--- 277,278 ----

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

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

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

Modified Files:
	Template.php 
Log Message:
removed comment about CSS_URL from BASE_URL (no longer applicable, the new CSS_URL function uses DATA_URL instead of the BASE_URL kludge)

Index: Template.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Template.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Template.php	2002/01/03 00:09:18	1.9
--- Template.php	2002/01/03 00:32:33	1.10
***************
*** 290,294 ****
  			// FIXME:
                          //WikiURL($GLOBALS['pagename'], false, 'absolute_url')
-                         //added this for phpwiki-printer.css
                          BaseURL()
                          );
--- 290,293 ----

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.63,1.64 Template.php,1.8,1.9

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

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

Modified Files:
	stdlib.php Template.php 
Log Message:
CSS now stored in an array, and <link rel="stylesheet"> headers are dynamically generated. - Simplifies xhtml templates. - Easier to add new alternate stylesheets in index.php without using themes. - Any stylesheets defined by a theme now works together with any default stylesheets (i.e. phpwiki.css, phpwiki-printer.css, phpwiki-modern.css) instead of completely replacing them.

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** stdlib.php	2001/12/28 09:53:24	1.63
--- stdlib.php	2002/01/03 00:09:18	1.64
***************
*** 54,57 ****
--- 54,69 ----
  }
  
+ function CSS_URL($CSS_URLS, $CSS_DEFAULT) {
+     $html = "";
+     foreach  ($CSS_URLS as $key => $val) {
+         if ($CSS_DEFAULT == $key) {
+             $html .= "<link rel=\"stylesheet\" title=\"".htmlspecialchars($key)."\" href=\"". DataURL(htmlspecialchars($val))."\" type=\"text/css\" />\n";
+         } else {
+             $html .= "<link rel=\"alternate stylesheet\" title=\"".htmlspecialchars($key)."\" href=\"". DataURL(htmlspecialchars($val))."\" type=\"text/css\" />\n";
+         }
+     }
+     return $html;
+ }
+ 
  define('NO_END_TAG_PAT',
         '/^' . join('|', array('area', 'base', 'basefont',

Index: Template.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Template.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Template.php	2001/12/30 06:10:45	1.8
--- Template.php	2002/01/03 00:09:18	1.9
***************
*** 273,281 ****
  
      function setGlobalTokens () {
!         global $user, $logo, $CSS_URL, $RCS_IDS;
          
          // FIXME: This a a bit of dangerous hackage.
          $this->qreplace('BROWSE', WikiURL(''));
!         $this->qreplace('CSS_URL', DataURL($CSS_URL));
          $this->qreplace('WIKI_NAME', WIKI_NAME);
  
--- 273,281 ----
  
      function setGlobalTokens () {
!         global $user, $logo, $CSS_URLS, $CSS_DEFAULT, $RCS_IDS;
          
          // FIXME: This a a bit of dangerous hackage.
          $this->qreplace('BROWSE', WikiURL(''));
!         $this->replace('CSS', CSS_URL($CSS_URLS, $CSS_DEFAULT));
          $this->qreplace('WIKI_NAME', WIKI_NAME);
  

[phpwiki-checkins] CVS: phpwiki/templates browse.html,1.36,1.37 editpage.html,1.35,1.36 message.html,1.19,1.20

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

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

Modified Files:
	browse.html editpage.html message.html 
Log Message:
CSS now stored in an array, and <link rel="stylesheet"> headers are dynamically generated. - Simplifies xhtml templates. - Easier to add new alternate stylesheets in index.php without using themes. - Any stylesheets defined by a theme now works together with any default stylesheets (i.e. phpwiki.css, phpwiki-printer.css, phpwiki-modern.css) instead of completely replacing them.

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** browse.html	2002/01/02 06:35:01	1.36
--- browse.html	2002/01/03 00:09:18	1.37
***************
*** 15,25 ****
  <!-- <meta name="robots" content="index,follow" /> -->
  <base href="${BASE_URL}" />
  <title>${WIKI_NAME}: ${SPLIT_PAGE}</title>
  
  <!--
  -->
- <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" />
- <link rel="alternate stylesheet" title="printer" href="${BASE_URL}phpwiki-printer.css" type="text/css" />
- 
  </head>
  <body>
--- 15,23 ----
  <!-- <meta name="robots" content="index,follow" /> -->
  <base href="${BASE_URL}" />
+ ${CSS}
  <title>${WIKI_NAME}: ${SPLIT_PAGE}</title>
  
  <!--
  -->
  </head>
  <body>

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** editpage.html	2001/12/30 06:10:55	1.35
--- editpage.html	2002/01/03 00:09:18	1.36
***************
*** 11,17 ****
  <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" />
! <link rel="alternate stylesheet" title="printer" href="${BASE_URL}phpwiki-printer.css" type="text/css" />
! 
  <title>${WIKI_NAME} - <?php printf(_("Edit: %s"),"${SPLIT_PAGE}"); ?></title>
  </head>
--- 11,15 ----
  <meta http-equiv="Content-Type" content="text/html; charset=${CHARSET}" />
  <meta name="robots" content="noindex,nofollow" />
! ${CSS}
  <title>${WIKI_NAME} - <?php printf(_("Edit: %s"),"${SPLIT_PAGE}"); ?></title>
  </head>

Index: message.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/message.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** message.html	2001/12/30 06:11:00	1.19
--- message.html	2002/01/03 00:09:18	1.20
***************
*** 11,17 ****
  <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" />
! <link rel="alternate stylesheet" title="printer" href="${BASE_URL}phpwiki-printer.css" type="text/css" />
! 
  <title>${WIKI_NAME}: ${TITLE}</title>
  </head>
--- 11,15 ----
  <meta http-equiv="Content-Type" content="text/html; charset=${CHARSET}" />
  <meta name="robots" content="noindex,nofollow" />
! ${CSS}
  <title>${WIKI_NAME}: ${TITLE}</title>
  </head>

[phpwiki-checkins] CVS: phpwiki/themes/Hawaiian themeinfo.php,1.2,1.3

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

Update of /cvsroot/phpwiki/phpwiki/themes/Hawaiian
In directory usw-pr-cvs1:/tmp/cvs-serv25839

Modified Files:
	themeinfo.php 
Log Message:
CSS now stored in an array, and <link rel="stylesheet"> headers are dynamically generated. - Simplifies xhtml templates. - Easier to add new alternate stylesheets in index.php without using themes. - Any stylesheets defined by a theme now works together with any default stylesheets (i.e. phpwiki.css, phpwiki-printer.css, phpwiki-modern.css) instead of completely replacing them.

Index: themeinfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Hawaiian/themeinfo.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** themeinfo.php	2002/01/01 21:41:32	1.2
--- themeinfo.php	2002/01/03 00:09:18	1.3
***************
*** 11,20 ****
  // To deactivate themes, comment out all the $theme=lines in index.php.
  
- // CSS location
- //
  // CSS file defines fonts, colors and background images for this style.
  // The companion '*-heavy.css' file isn't defined, it's just expected to
  // be in the same directory that the base style is in.
! $CSS_URL = "themes/$theme/Hawaiian.css";
  
  // Logo image appears on every page and links to the HomePage.
--- 11,22 ----
  // To deactivate themes, comment out all the $theme=lines in index.php.
  
  // CSS file defines fonts, colors and background images for this style.
  // The companion '*-heavy.css' file isn't defined, it's just expected to
  // be in the same directory that the base style is in.
! 
! $CSS_DEFAULT = "Hawaiian";
! 
! $CSS_URLS = array_merge($CSS_URLS, array( "$CSS_DEFAULT" => "themes/$theme/${CSS_DEFAULT}.css" ) );
! 
  
  // Logo image appears on every page and links to the HomePage.

[phpwiki-checkins] CVS: phpwiki/themes/default themeinfo.php,1.6,1.7

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

Update of /cvsroot/phpwiki/phpwiki/themes/default
In directory usw-pr-cvs1:/tmp/cvs-serv25835

Modified Files:
	themeinfo.php 
Log Message:
CSS now stored in an array, and <link rel="stylesheet"> headers are dynamically generated. - Simplifies xhtml templates. - Easier to add new alternate stylesheets in index.php without using themes. - Any stylesheets defined by a theme now works together with any default stylesheets (i.e. phpwiki.css, phpwiki-printer.css, phpwiki-modern.css) instead of completely replacing them.

Index: themeinfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/themeinfo.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** themeinfo.php	2002/01/01 07:36:15	1.6
--- themeinfo.php	2002/01/03 00:09:18	1.7
***************
*** 13,22 ****
  // To deactivate themes, comment out all the $theme=lines in index.php.
  
- // CSS location
- //
  // CSS file defines fonts, colors and background images for this style.
  // The companion '*-heavy.css' file isn't defined, it's just expected to
  // be in the same directory that the base style is in.
! $CSS_URL = "themes/$theme/phpwiki.css";
  
  // Logo image appears on every page and links to the HomePage.
--- 13,22 ----
  // To deactivate themes, comment out all the $theme=lines in index.php.
  
  // CSS file defines fonts, colors and background images for this style.
  // The companion '*-heavy.css' file isn't defined, it's just expected to
  // be in the same directory that the base style is in.
! $CSS_DEFAULT = "default";
! 
! $CSS_URLS = array_merge($CSS_URLS, array( "$CSS_DEFAULT" => "themes/$theme/${CSS_DEFAULT}.css" ) );
  
  // Logo image appears on every page and links to the HomePage.

[phpwiki-checkins] CVS: phpwiki/themes/MacOSX themeinfo.php,1.1,1.2

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

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX
In directory usw-pr-cvs1:/tmp/cvs-serv25834

Modified Files:
	themeinfo.php 
Log Message:
CSS now stored in an array, and <link rel="stylesheet"> headers are dynamically generated. - Simplifies xhtml templates. - Easier to add new alternate stylesheets in index.php without using themes. - Any stylesheets defined by a theme now works together with any default stylesheets (i.e. phpwiki.css, phpwiki-printer.css, phpwiki-modern.css) instead of completely replacing them.

Index: themeinfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/MacOSX/themeinfo.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** themeinfo.php	2002/01/02 01:28:57	1.1
--- themeinfo.php	2002/01/03 00:09:18	1.2
***************
*** 17,26 ****
  // To deactivate themes, comment out all the $theme=lines in index.php.
  
- // CSS location
- //
  // CSS file defines fonts, colors and background images for this style.
  // The companion '*-heavy.css' file isn't defined, it's just expected to
  // be in the same directory that the base style is in.
! //$CSS_URL = "themes/$theme/phpwiki.css";
  
  // Logo image appears on every page and links to the HomePage.
--- 17,26 ----
  // To deactivate themes, comment out all the $theme=lines in index.php.
  
  // CSS file defines fonts, colors and background images for this style.
  // The companion '*-heavy.css' file isn't defined, it's just expected to
  // be in the same directory that the base style is in.
! $CSS_DEFAULT = "MacOSX";
! 
! $CSS_URLS = array_merge($CSS_URLS, array( "$CSS_DEFAULT" => "themes/$theme/${CSS_DEFAULT}.css" ) );
  
  // Logo image appears on every page and links to the HomePage.

[phpwiki-checkins] CVS: phpwiki/themes/WikiTrek themeinfo.php,1.5,1.6

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

Update of /cvsroot/phpwiki/phpwiki/themes/WikiTrek
In directory usw-pr-cvs1:/tmp/cvs-serv25831

Modified Files:
	themeinfo.php 
Log Message:
CSS now stored in an array, and <link rel="stylesheet"> headers are dynamically generated. - Simplifies xhtml templates. - Easier to add new alternate stylesheets in index.php without using themes. - Any stylesheets defined by a theme now works together with any default stylesheets (i.e. phpwiki.css, phpwiki-printer.css, phpwiki-modern.css) instead of completely replacing them.

Index: themeinfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/WikiTrek/themeinfo.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** themeinfo.php	2002/01/01 07:36:15	1.5
--- themeinfo.php	2002/01/03 00:09:17	1.6
***************
*** 29,38 ****
  // To deactivate themes, comment out all the $theme=lines in index.php.
  
- // CSS location
- //
  // CSS file defines fonts, colors and background images for this style.
  // The companion '*-heavy.css' file isn't defined, it's just expected to
  // be in the same directory that the base style is in.
! $CSS_URL = "themes/$theme/WikiTrek.css";
  
  // Logo image appears on every page and links to the HomePage.
--- 29,38 ----
  // To deactivate themes, comment out all the $theme=lines in index.php.
  
  // CSS file defines fonts, colors and background images for this style.
  // The companion '*-heavy.css' file isn't defined, it's just expected to
  // be in the same directory that the base style is in.
! $CSS_DEFAULT = "WikiTrek";
! 
! $CSS_URLS = array_merge($CSS_URLS, array( "$CSS_DEFAULT" => "themes/$theme/${CSS_DEFAULT}.css" ) );
  
  // Logo image appears on every page and links to the HomePage.

[phpwiki-checkins] CVS: phpwiki index.php,1.47,1.48

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

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

Modified Files:
	index.php 
Log Message:
CSS now stored in an array, and <link rel="stylesheet"> headers are dynamically generated. - Simplifies xhtml templates. - Easier to add new alternate stylesheets in index.php without using themes. - Any stylesheets defined by a theme now works together with any default stylesheets (i.e. phpwiki.css, phpwiki-printer.css, phpwiki-modern.css) instead of completely replacing them.

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** index.php	2002/01/02 01:28:16	1.47
--- index.php	2002/01/03 00:09:15	1.48
***************
*** 279,283 ****
  // you should make sure that it's companion 'phpwiki-heavy.css'
  // is installed in the same directory that the base style file is.
! $CSS_URL = "phpwiki.css";
  
  // logo image (path relative to index.php)
--- 279,289 ----
  // you should make sure that it's companion 'phpwiki-heavy.css'
  // is installed in the same directory that the base style file is.
! $CSS_URLS = array(
!     'PhpWiki' => "phpwiki.css",
!     'Printer' => "phpwiki-printer.css",
!     'Modern'  => "phpwiki-modern.css"
! );
! 
! $CSS_DEFAULT = "PhpWiki";
  
  // logo image (path relative to index.php)

[phpwiki-checkins] CVS: phpwiki/locale/po de.po,1.35,1.36 es.po,1.28,1.29 nl.po,1.28,1.29 phpwiki.pot,1.29,1.30 sv.po,1.23,1.24

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

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

Modified Files:
	de.po es.po nl.po phpwiki.pot sv.po 
Log Message:
regenerated files to update line numbers due to changes in browse.html

Index: de.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/de.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** de.po	2001/12/31 18:28:31	1.35
--- de.po	2002/01/02 21:46:56	1.36
***************
*** 6,10 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.8\n"
! "POT-Creation-Date: 2001-12-31 10:54-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: 2002-01-02 16:21-0500\n"
  "PO-Revision-Date: 2000-10-31 02:23+0200\n"
  "Last-Translator: Carsten Klapp <car...@ma...>, Arno Hollosi "
***************
*** 27,82 ****
  msgstr "Schaue die aktuellste Version"
  
! #: ../templates/browse.html:50
  #, c-format
  msgid "Last edited on %s."
  msgstr "Zuletzt am %s verändert."
  
! #: ../templates/browse.html:52
  #, c-format
  msgid "Version %s, saved on %s."
  msgstr "Version %s. zuletzt am %s gespeichert."
  
- #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
- #: ../lib/plugin/RecentChanges.php:264 ../lib/plugin/RecentChanges.php:309
- #: ../templates/browse.html:56
- msgid "RecentChanges"
- msgstr "FrischeSeiten"
- 
  #: ../templates/browse.html:57
- msgid "FindPage"
- msgstr "SeiteFinden"
- 
- #: ../templates/browse.html:60
- msgid "Quick Search"
- msgstr "Schnelle Suche"
- 
- #: ../templates/browse.html:70
  msgid "Page locked"
  msgstr "Seite gesperrt"
  
! #: ../templates/browse.html:73
  msgid "Edit"
  msgstr "Editieren"
  
! #: ../templates/browse.html:76
  msgid "Edit old revision"
  msgstr "Alte Revision editieren"
  
! #: ../templates/browse.html:81
  msgid "Unlock page"
  msgstr "Seite freigeben"
  
! #: ../templates/browse.html:83
  msgid "Lock page"
  msgstr "Seite sperren"
  
! #: ../lib/removepage.php:20 ../templates/browse.html:85
  msgid "Remove page"
  msgstr "Seite löschen"
  
! #: ../templates/browse.html:89 ../templates/browse.html:92
  msgid "Diff"
  msgstr "Diff"
  
  #: ../templates/browse.html:97
  #, c-format
--- 27,82 ----
  msgstr "Schaue die aktuellste Version"
  
! #: ../templates/browse.html:42
  #, c-format
  msgid "Last edited on %s."
  msgstr "Zuletzt am %s verändert."
  
! #: ../templates/browse.html:44
  #, c-format
  msgid "Version %s, saved on %s."
  msgstr "Version %s. zuletzt am %s gespeichert."
  
  #: ../templates/browse.html:57
  msgid "Page locked"
  msgstr "Seite gesperrt"
  
! #: ../templates/browse.html:60
  msgid "Edit"
  msgstr "Editieren"
  
! #: ../templates/browse.html:63
  msgid "Edit old revision"
  msgstr "Alte Revision editieren"
  
! #: ../templates/browse.html:68
  msgid "Unlock page"
  msgstr "Seite freigeben"
  
! #: ../templates/browse.html:70
  msgid "Lock page"
  msgstr "Seite sperren"
  
! #: ../lib/removepage.php:20 ../templates/browse.html:72
  msgid "Remove page"
  msgstr "Seite löschen"
  
! #: ../templates/browse.html:76 ../templates/browse.html:79
  msgid "Diff"
  msgstr "Diff"
  
+ #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
+ #: ../lib/plugin/RecentChanges.php:264 ../lib/plugin/RecentChanges.php:309
+ #: ../templates/browse.html:83
+ msgid "RecentChanges"
+ msgstr "FrischeSeiten"
+ 
+ #: ../templates/browse.html:84
+ msgid "FindPage"
+ msgstr "SeiteFinden"
+ 
+ #: ../templates/browse.html:87
+ msgid "Quick Search"
+ msgstr "Schnelle Suche"
+ 
  #: ../templates/browse.html:97
  #, c-format
***************
*** 92,106 ****
  msgstr "AnMelden"
  
! #: ../templates/browse.html:117
  msgid "PHP Warnings"
  msgstr "PHP Warnungen"
  
! #: ../lib/plugin/_BackendInfo.php:10 ../templates/browse.html:123
! #: ../templates/browse.html:124
  msgid "DebugInfo"
  msgstr "DebugInfo"
  
! #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:128
! #: ../templates/browse.html:129
  msgid "ViewMarkup"
  msgstr ""
--- 92,106 ----
  msgstr "AnMelden"
  
! #: ../templates/browse.html:120
  msgid "PHP Warnings"
  msgstr "PHP Warnungen"
  
! #: ../lib/plugin/_BackendInfo.php:10 ../templates/browse.html:126
! #: ../templates/browse.html:127
  msgid "DebugInfo"
  msgstr "DebugInfo"
  
! #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:131
! #: ../templates/browse.html:132
  msgid "ViewMarkup"
  msgstr ""

Index: es.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/es.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** es.po	2002/01/01 22:05:18	1.28
--- es.po	2002/01/02 21:46:56	1.29
***************
*** 13,17 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.2.0\n"
! "POT-Creation-Date: 2002-01-01 04:11-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: 2002-01-02 16:21-0500\n"
  "PO-Revision-Date: 2000-02-01 00:50-0500\n"
  "Last-Translator: Pablo Roca <pr...@cl...>\n"
***************
*** 37,94 ****
  msgstr "Versión archivada:"
  
! #: ../templates/browse.html:50
  #, fuzzy, c-format
  msgid "Last edited on %s."
  msgstr "Editada por última vez"
  
! #: ../templates/browse.html:52
  #, c-format
  msgid "Version %s, saved on %s."
  msgstr ""
  
- # lib/stdlib.php:384 lib/stdlib.php:445
- #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
- #: ../lib/plugin/RecentChanges.php:264 ../lib/plugin/RecentChanges.php:309
- #: ../templates/browse.html:56
- msgid "RecentChanges"
- msgstr "CambiosRecientes"
- 
  #: ../templates/browse.html:57
- msgid "FindPage"
- msgstr "BuscarPágina"
- 
- #: ../templates/browse.html:60
- #, fuzzy
- msgid "Quick Search"
- msgstr "Busqueda rápida de páginas:"
- 
- #: ../templates/browse.html:70
  msgid "Page locked"
  msgstr "Página bloqueada"
  
! #: ../templates/browse.html:73
  msgid "Edit"
  msgstr "Editar"
  
! #: ../templates/browse.html:76
  msgid "Edit old revision"
  msgstr ""
  
! #: ../templates/browse.html:81
  msgid "Unlock page"
  msgstr "Desbloquear página"
  
! #: ../templates/browse.html:83
  msgid "Lock page"
  msgstr "Bloquear página"
  
! #: ../lib/removepage.php:20 ../templates/browse.html:85
  msgid "Remove page"
  msgstr "Borrar página"
  
! #: ../templates/browse.html:89 ../templates/browse.html:92
  msgid "Diff"
  msgstr ""
  
  #: ../templates/browse.html:97
  #, c-format
--- 37,94 ----
  msgstr "Versión archivada:"
  
! #: ../templates/browse.html:42
  #, fuzzy, c-format
  msgid "Last edited on %s."
  msgstr "Editada por última vez"
  
! #: ../templates/browse.html:44
  #, c-format
  msgid "Version %s, saved on %s."
  msgstr ""
  
  #: ../templates/browse.html:57
  msgid "Page locked"
  msgstr "Página bloqueada"
  
! #: ../templates/browse.html:60
  msgid "Edit"
  msgstr "Editar"
  
! #: ../templates/browse.html:63
  msgid "Edit old revision"
  msgstr ""
  
! #: ../templates/browse.html:68
  msgid "Unlock page"
  msgstr "Desbloquear página"
  
! #: ../templates/browse.html:70
  msgid "Lock page"
  msgstr "Bloquear página"
  
! #: ../lib/removepage.php:20 ../templates/browse.html:72
  msgid "Remove page"
  msgstr "Borrar página"
  
! #: ../templates/browse.html:76 ../templates/browse.html:79
  msgid "Diff"
  msgstr ""
  
+ # lib/stdlib.php:384 lib/stdlib.php:445
+ #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
+ #: ../lib/plugin/RecentChanges.php:264 ../lib/plugin/RecentChanges.php:309
+ #: ../templates/browse.html:83
+ msgid "RecentChanges"
+ msgstr "CambiosRecientes"
+ 
+ #: ../templates/browse.html:84
+ msgid "FindPage"
+ msgstr "BuscarPágina"
+ 
+ #: ../templates/browse.html:87
+ #, fuzzy
+ msgid "Quick Search"
+ msgstr "Busqueda rápida de páginas:"
+ 
  #: ../templates/browse.html:97
  #, c-format
***************
*** 104,118 ****
  msgstr ""
  
! #: ../templates/browse.html:117
  msgid "PHP Warnings"
  msgstr ""
  
! #: ../lib/plugin/_BackendInfo.php:10 ../templates/browse.html:123
! #: ../templates/browse.html:124
  msgid "DebugInfo"
  msgstr ""
  
! #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:128
! #: ../templates/browse.html:129
  msgid "ViewMarkup"
  msgstr ""
--- 104,118 ----
  msgstr ""
  
! #: ../templates/browse.html:120
  msgid "PHP Warnings"
  msgstr ""
  
! #: ../lib/plugin/_BackendInfo.php:10 ../templates/browse.html:126
! #: ../templates/browse.html:127
  msgid "DebugInfo"
  msgstr ""
  
! #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:131
! #: ../templates/browse.html:132
  msgid "ViewMarkup"
  msgstr ""

Index: nl.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/nl.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** nl.po	2001/12/31 18:28:31	1.28
--- nl.po	2002/01/02 21:46:56	1.29
***************
*** 11,15 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.7\n"
! "POT-Creation-Date: 2001-12-31 10:54-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: 2002-01-02 16:21-0500\n"
  "PO-Revision-Date: 2000-09-30 02:23+0200\n"
  "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
***************
*** 35,93 ****
  msgstr "is gelijk aaan huidige versie"
  
! #: ../templates/browse.html:50
  #, fuzzy, c-format
  msgid "Last edited on %s."
  msgstr "meest recente verandering op %s"
  
! #: ../templates/browse.html:52
  #, c-format
  msgid "Version %s, saved on %s."
  msgstr ""
  
- #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
- #: ../lib/plugin/RecentChanges.php:264 ../lib/plugin/RecentChanges.php:309
- #: ../templates/browse.html:56
- msgid "RecentChanges"
- msgstr "RecenteVeranderingen"
- 
  #: ../templates/browse.html:57
- msgid "FindPage"
- msgstr "ZoekPagina"
- 
- #: ../templates/browse.html:60
- #, fuzzy
- msgid "Quick Search"
- msgstr "Zoek snel een pagina op:"
- 
- #: ../templates/browse.html:70
  msgid "Page locked"
  msgstr "Sidan är låst"
  
! #: ../templates/browse.html:73
  msgid "Edit"
  msgstr "Verander"
  
! #: ../templates/browse.html:76
  msgid "Edit old revision"
  msgstr ""
  
! #: ../templates/browse.html:81
  #, fuzzy
  msgid "Unlock page"
  msgstr "Sluit pagina af"
  
! #: ../templates/browse.html:83
  #, fuzzy
  msgid "Lock page"
  msgstr "Open pagina"
  
! #: ../lib/removepage.php:20 ../templates/browse.html:85
  msgid "Remove page"
  msgstr "Verwijder pagina"
  
! #: ../templates/browse.html:89 ../templates/browse.html:92
  msgid "Diff"
  msgstr "Diff"
  
  #: ../templates/browse.html:97
  #, c-format
--- 35,93 ----
  msgstr "is gelijk aaan huidige versie"
  
! #: ../templates/browse.html:42
  #, fuzzy, c-format
  msgid "Last edited on %s."
  msgstr "meest recente verandering op %s"
  
! #: ../templates/browse.html:44
  #, c-format
  msgid "Version %s, saved on %s."
  msgstr ""
  
  #: ../templates/browse.html:57
  msgid "Page locked"
  msgstr "Sidan är låst"
  
! #: ../templates/browse.html:60
  msgid "Edit"
  msgstr "Verander"
  
! #: ../templates/browse.html:63
  msgid "Edit old revision"
  msgstr ""
  
! #: ../templates/browse.html:68
  #, fuzzy
  msgid "Unlock page"
  msgstr "Sluit pagina af"
  
! #: ../templates/browse.html:70
  #, fuzzy
  msgid "Lock page"
  msgstr "Open pagina"
  
! #: ../lib/removepage.php:20 ../templates/browse.html:72
  msgid "Remove page"
  msgstr "Verwijder pagina"
  
! #: ../templates/browse.html:76 ../templates/browse.html:79
  msgid "Diff"
  msgstr "Diff"
  
+ #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
+ #: ../lib/plugin/RecentChanges.php:264 ../lib/plugin/RecentChanges.php:309
+ #: ../templates/browse.html:83
+ msgid "RecentChanges"
+ msgstr "RecenteVeranderingen"
+ 
+ #: ../templates/browse.html:84
+ msgid "FindPage"
+ msgstr "ZoekPagina"
+ 
+ #: ../templates/browse.html:87
+ #, fuzzy
+ msgid "Quick Search"
+ msgstr "Zoek snel een pagina op:"
+ 
  #: ../templates/browse.html:97
  #, c-format
***************
*** 103,117 ****
  msgstr ""
  
! #: ../templates/browse.html:117
  msgid "PHP Warnings"
  msgstr ""
  
! #: ../lib/plugin/_BackendInfo.php:10 ../templates/browse.html:123
! #: ../templates/browse.html:124
  msgid "DebugInfo"
  msgstr ""
  
! #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:128
! #: ../templates/browse.html:129
  msgid "ViewMarkup"
  msgstr ""
--- 103,117 ----
  msgstr ""
  
! #: ../templates/browse.html:120
  msgid "PHP Warnings"
  msgstr ""
  
! #: ../lib/plugin/_BackendInfo.php:10 ../templates/browse.html:126
! #: ../templates/browse.html:127
  msgid "DebugInfo"
  msgstr ""
  
! #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:131
! #: ../templates/browse.html:132
  msgid "ViewMarkup"
  msgstr ""

Index: phpwiki.pot
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/phpwiki.pot,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** phpwiki.pot	2002/01/01 09:34:58	1.29
--- phpwiki.pot	2002/01/02 21:46:56	1.30
***************
*** 7,11 ****
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
! "POT-Creation-Date: 2002-01-01 04:11-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: 2002-01-02 16:21-0500\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
***************
*** 27,82 ****
  msgstr ""
  
! #: ../templates/browse.html:50
  #, c-format
  msgid "Last edited on %s."
  msgstr ""
  
! #: ../templates/browse.html:52
  #, c-format
  msgid "Version %s, saved on %s."
  msgstr ""
  
- #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
- #: ../lib/plugin/RecentChanges.php:264 ../lib/plugin/RecentChanges.php:309
- #: ../templates/browse.html:56
- msgid "RecentChanges"
- msgstr ""
- 
  #: ../templates/browse.html:57
- msgid "FindPage"
- msgstr ""
- 
- #: ../templates/browse.html:60
- msgid "Quick Search"
- msgstr ""
- 
- #: ../templates/browse.html:70
  msgid "Page locked"
  msgstr ""
  
! #: ../templates/browse.html:73
  msgid "Edit"
  msgstr ""
  
! #: ../templates/browse.html:76
  msgid "Edit old revision"
  msgstr ""
  
! #: ../templates/browse.html:81
  msgid "Unlock page"
  msgstr ""
  
! #: ../templates/browse.html:83
  msgid "Lock page"
  msgstr ""
  
! #: ../lib/removepage.php:20 ../templates/browse.html:85
  msgid "Remove page"
  msgstr ""
  
! #: ../templates/browse.html:89 ../templates/browse.html:92
  msgid "Diff"
  msgstr ""
  
  #: ../templates/browse.html:97
  #, c-format
--- 27,82 ----
  msgstr ""
  
! #: ../templates/browse.html:42
  #, c-format
  msgid "Last edited on %s."
  msgstr ""
  
! #: ../templates/browse.html:44
  #, c-format
  msgid "Version %s, saved on %s."
  msgstr ""
  
  #: ../templates/browse.html:57
  msgid "Page locked"
  msgstr ""
  
! #: ../templates/browse.html:60
  msgid "Edit"
  msgstr ""
  
! #: ../templates/browse.html:63
  msgid "Edit old revision"
  msgstr ""
  
! #: ../templates/browse.html:68
  msgid "Unlock page"
  msgstr ""
  
! #: ../templates/browse.html:70
  msgid "Lock page"
  msgstr ""
  
! #: ../lib/removepage.php:20 ../templates/browse.html:72
  msgid "Remove page"
  msgstr ""
  
! #: ../templates/browse.html:76 ../templates/browse.html:79
  msgid "Diff"
  msgstr ""
  
+ #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
+ #: ../lib/plugin/RecentChanges.php:264 ../lib/plugin/RecentChanges.php:309
+ #: ../templates/browse.html:83
+ msgid "RecentChanges"
+ msgstr ""
+ 
+ #: ../templates/browse.html:84
+ msgid "FindPage"
+ msgstr ""
+ 
+ #: ../templates/browse.html:87
+ msgid "Quick Search"
+ msgstr ""
+ 
  #: ../templates/browse.html:97
  #, c-format
***************
*** 92,106 ****
  msgstr ""
  
! #: ../templates/browse.html:117
  msgid "PHP Warnings"
  msgstr ""
  
! #: ../lib/plugin/_BackendInfo.php:10 ../templates/browse.html:123
! #: ../templates/browse.html:124
  msgid "DebugInfo"
  msgstr ""
  
! #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:128
! #: ../templates/browse.html:129
  msgid "ViewMarkup"
  msgstr ""
--- 92,106 ----
  msgstr ""
  
! #: ../templates/browse.html:120
  msgid "PHP Warnings"
  msgstr ""
  
! #: ../lib/plugin/_BackendInfo.php:10 ../templates/browse.html:126
! #: ../templates/browse.html:127
  msgid "DebugInfo"
  msgstr ""
  
! #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:131
! #: ../templates/browse.html:132
  msgid "ViewMarkup"
  msgstr ""

Index: sv.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/sv.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** sv.po	2001/12/31 18:28:31	1.23
--- sv.po	2002/01/02 21:46:56	1.24
***************
*** 7,11 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.9\n"
! "POT-Creation-Date: 2001-12-31 10:54-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: 2002-01-02 16:21-0500\n"
  "PO-Revision-Date: 2001-01-27 01:58+0200\n"
  "Last-Translator: Jon Åslund <jo...@he...>\n"
***************
*** 29,85 ****
  msgstr "Arkiverad version"
  
! #: ../templates/browse.html:50
  #, fuzzy, c-format
  msgid "Last edited on %s."
  msgstr "senast ändrad %s"
  
! #: ../templates/browse.html:52
  #, c-format
  msgid "Version %s, saved on %s."
  msgstr ""
  
- #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
- #: ../lib/plugin/RecentChanges.php:264 ../lib/plugin/RecentChanges.php:309
- #: ../templates/browse.html:56
- msgid "RecentChanges"
- msgstr "SenasteÄndringar"
- 
  #: ../templates/browse.html:57
- msgid "FindPage"
- msgstr "SökEfterSida"
- 
- #: ../templates/browse.html:60
- #, fuzzy
- msgid "Quick Search"
- msgstr "Snabb titelsökning:"
- 
- #: ../templates/browse.html:70
  msgid "Page locked"
  msgstr "Sidan är låst"
  
! #: ../templates/browse.html:73
  msgid "Edit"
  msgstr "Redigera"
  
! #: ../templates/browse.html:76
  msgid "Edit old revision"
  msgstr ""
  
! #: ../templates/browse.html:81
  msgid "Unlock page"
  msgstr "Lås upp sida"
  
! #: ../templates/browse.html:83
  msgid "Lock page"
  msgstr "Lås sida"
  
! #: ../lib/removepage.php:20 ../templates/browse.html:85
  msgid "Remove page"
  msgstr "Ta bort sida"
  
! #: ../templates/browse.html:89 ../templates/browse.html:92
  msgid "Diff"
  msgstr "Diff"
  
  #: ../templates/browse.html:97
  #, c-format
--- 29,85 ----
  msgstr "Arkiverad version"
  
! #: ../templates/browse.html:42
  #, fuzzy, c-format
  msgid "Last edited on %s."
  msgstr "senast ändrad %s"
  
! #: ../templates/browse.html:44
  #, c-format
  msgid "Version %s, saved on %s."
  msgstr ""
  
  #: ../templates/browse.html:57
  msgid "Page locked"
  msgstr "Sidan är låst"
  
! #: ../templates/browse.html:60
  msgid "Edit"
  msgstr "Redigera"
  
! #: ../templates/browse.html:63
  msgid "Edit old revision"
  msgstr ""
  
! #: ../templates/browse.html:68
  msgid "Unlock page"
  msgstr "Lås upp sida"
  
! #: ../templates/browse.html:70
  msgid "Lock page"
  msgstr "Lås sida"
  
! #: ../lib/removepage.php:20 ../templates/browse.html:72
  msgid "Remove page"
  msgstr "Ta bort sida"
  
! #: ../templates/browse.html:76 ../templates/browse.html:79
  msgid "Diff"
  msgstr "Diff"
  
+ #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
+ #: ../lib/plugin/RecentChanges.php:264 ../lib/plugin/RecentChanges.php:309
+ #: ../templates/browse.html:83
+ msgid "RecentChanges"
+ msgstr "SenasteÄndringar"
+ 
+ #: ../templates/browse.html:84
+ msgid "FindPage"
+ msgstr "SökEfterSida"
+ 
+ #: ../templates/browse.html:87
+ #, fuzzy
+ msgid "Quick Search"
+ msgstr "Snabb titelsökning:"
+ 
  #: ../templates/browse.html:97
  #, c-format
***************
*** 95,109 ****
  msgstr ""
  
! #: ../templates/browse.html:117
  msgid "PHP Warnings"
  msgstr ""
  
! #: ../lib/plugin/_BackendInfo.php:10 ../templates/browse.html:123
! #: ../templates/browse.html:124
  msgid "DebugInfo"
  msgstr ""
  
! #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:128
! #: ../templates/browse.html:129
  msgid "ViewMarkup"
  msgstr ""
--- 95,109 ----
  msgstr ""
  
! #: ../templates/browse.html:120
  msgid "PHP Warnings"
  msgstr ""
  
! #: ../lib/plugin/_BackendInfo.php:10 ../templates/browse.html:126
! #: ../templates/browse.html:127
  msgid "DebugInfo"
  msgstr ""
  
! #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:131
! #: ../templates/browse.html:132
  msgid "ViewMarkup"
  msgstr ""

[phpwiki-checkins] CVS: phpwiki/locale/de/LC_MESSAGES phpwiki.mo,1.25,1.26

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

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

Modified Files:
	phpwiki.mo 
Log Message:
regenerated files to update line numbers due to changes in browse.html

Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
Binary files /tmp/cvsdGcBEK and /tmp/cvsKnxq4k differ

[phpwiki-checkins] CVS: phpwiki/locale/po it.po,1.18,1.19

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

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

Modified Files:
	it.po 
Log Message:
Marked RecentChanges #, fuzzy. Conflict between CambiamentiRecenti used in pgsrc vs. ModificheRecenti used in it.po

Index: it.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/it.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** it.po	2002/01/01 22:05:18	1.18
--- it.po	2002/01/02 21:22:52	1.19
***************
*** 7,11 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.2.0\n"
! "POT-Creation-Date: 2001-12-31 10:54-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: 2002-01-02 16:21-0500\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: Marco Milanesi <kp...@ad...>\n"
***************
*** 29,87 ****
  msgstr "Versione archiviata"
  
! #: ../templates/browse.html:50
  #, fuzzy, c-format
  msgid "Last edited on %s."
  msgstr "Ultima modifica: %s"
  
! #: ../templates/browse.html:52
  #, c-format
  msgid "Version %s, saved on %s."
  msgstr ""
  
- #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
- #: ../lib/plugin/RecentChanges.php:264 ../lib/plugin/RecentChanges.php:309
- #: ../templates/browse.html:56
- msgid "RecentChanges"
- msgstr "ModificheRecenti"
- 
  #: ../templates/browse.html:57
- msgid "FindPage"
- msgstr "TrovaPagina"
- 
- #: ../templates/browse.html:60
- #, fuzzy
- msgid "Quick Search"
- msgstr "Ricerca"
- 
- #: ../templates/browse.html:70
  msgid "Page locked"
  msgstr "Pagina bloccata"
  
! #: ../templates/browse.html:73
  #, fuzzy
  msgid "Edit"
  msgstr "ModificaIlTesto"
  
! #: ../templates/browse.html:76
  msgid "Edit old revision"
  msgstr ""
  
! #: ../templates/browse.html:81
  msgid "Unlock page"
  msgstr "Sblocca la pagina"
  
! #: ../templates/browse.html:83
  msgid "Lock page"
  msgstr "Blocca la pagina"
  
! #: ../lib/removepage.php:20 ../templates/browse.html:85
  msgid "Remove page"
  msgstr "Rimuovi la pagina"
  
! #: ../templates/browse.html:89 ../templates/browse.html:92
  #, fuzzy
  msgid "Diff"
  msgstr "Differenza di %s"
  
  #: ../templates/browse.html:97
  #, c-format
--- 29,88 ----
  msgstr "Versione archiviata"
  
! #: ../templates/browse.html:42
  #, fuzzy, c-format
  msgid "Last edited on %s."
  msgstr "Ultima modifica: %s"
  
! #: ../templates/browse.html:44
  #, c-format
  msgid "Version %s, saved on %s."
  msgstr ""
  
  #: ../templates/browse.html:57
  msgid "Page locked"
  msgstr "Pagina bloccata"
  
! #: ../templates/browse.html:60
  #, fuzzy
  msgid "Edit"
  msgstr "ModificaIlTesto"
  
! #: ../templates/browse.html:63
  msgid "Edit old revision"
  msgstr ""
  
! #: ../templates/browse.html:68
  msgid "Unlock page"
  msgstr "Sblocca la pagina"
  
! #: ../templates/browse.html:70
  msgid "Lock page"
  msgstr "Blocca la pagina"
  
! #: ../lib/removepage.php:20 ../templates/browse.html:72
  msgid "Remove page"
  msgstr "Rimuovi la pagina"
  
! #: ../templates/browse.html:76 ../templates/browse.html:79
  #, fuzzy
  msgid "Diff"
  msgstr "Differenza di %s"
  
+ #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
+ #: ../lib/plugin/RecentChanges.php:264 ../lib/plugin/RecentChanges.php:309
+ #: ../templates/browse.html:83
+ #, fuzzy
+ msgid "RecentChanges"
+ msgstr "CambiamentiRecenti o ModificheRecenti?"
+ 
+ #: ../templates/browse.html:84
+ msgid "FindPage"
+ msgstr "TrovaPagina"
+ 
+ #: ../templates/browse.html:87
+ #, fuzzy
+ msgid "Quick Search"
+ msgstr "Ricerca"
+ 
  #: ../templates/browse.html:97
  #, c-format
***************
*** 97,111 ****
  msgstr ""
  
! #: ../templates/browse.html:117
  msgid "PHP Warnings"
  msgstr ""
  
! #: ../lib/plugin/_BackendInfo.php:10 ../templates/browse.html:123
! #: ../templates/browse.html:124
  msgid "DebugInfo"
  msgstr ""
  
! #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:128
! #: ../templates/browse.html:129
  msgid "ViewMarkup"
  msgstr ""
--- 98,112 ----
  msgstr ""
  
! #: ../templates/browse.html:120
  msgid "PHP Warnings"
  msgstr ""
  
! #: ../lib/plugin/_BackendInfo.php:10 ../templates/browse.html:126
! #: ../templates/browse.html:127
  msgid "DebugInfo"
  msgstr ""
  
! #: ../lib/plugin/ViewMarkup.php:12 ../templates/browse.html:131
! #: ../templates/browse.html:132
  msgid "ViewMarkup"
  msgstr ""

[phpwiki-checkins] CVS: phpwiki/locale/it/LC_MESSAGES phpwiki.mo,1.6,1.7 phpwiki.php,1.6,1.7

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

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

Modified Files:
	phpwiki.mo phpwiki.php 
Log Message:
Marked RecentChanges #, fuzzy. Conflict between CambiamentiRecenti used in pgsrc vs. ModificheRecenti used in it.po

Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/it/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
Binary files /tmp/cvsdZp3ox and /tmp/cvsgadYGU differ

Index: phpwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/it/LC_MESSAGES/phpwiki.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** phpwiki.php	2002/01/01 22:24:41	1.6
--- phpwiki.php	2002/01/02 21:22:52	1.7
***************
*** 45,50 ****
  $locale["Problem while updating %s"] =
     "Problemi durante l'aggiornamento %s";
- $locale["RecentChanges"] =
-    "ModificheRecenti";
  $locale["Remove page"] =
     "Rimuovi la pagina";
--- 45,48 ----

[phpwiki-checkins] CVS: phpwiki/templates browse.html,1.35,1.36

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

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

Modified Files:
	browse.html 
Log Message:
fixed date not showing up with printer stylesheet in mozilla... for real this time

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** browse.html	2002/01/02 03:50:33	1.35
--- browse.html	2002/01/02 06:35:01	1.36
***************
*** 38,42 ****
  <div class="wikitext">${CONTENT}</div>
  <hr class="ignore" noshade="noshade" />
! <form action='<?php echo WikiURL(_("TitleSearch")); ?>' method="get" accept-charset="${CHARSET}">
      <?php if ($IS_CURRENT) { ?>
         <?php printf(_("Last edited on %s."),"${LASTMODIFIED}"); ?>
--- 38,42 ----
  <div class="wikitext">${CONTENT}</div>
  <hr class="ignore" noshade="noshade" />
! 
      <?php if ($IS_CURRENT) { ?>
         <?php printf(_("Last edited on %s."),"${LASTMODIFIED}"); ?>
***************
*** 44,47 ****
--- 44,48 ----
         <?php printf(_("Version %s, saved on %s."),"${VERSION}","${LASTMODIFIED}"); ?>
      <?php } ?>
+ <form action='<?php echo WikiURL(_("TitleSearch")); ?>' method="get" accept-charset="${CHARSET}">
  <hr color="black" class="toolbar" />
  <!-- I would like not to have to use these tables, and managed to

[phpwiki-checkins] CVS: phpwiki/themes/Hawaiian flower.png,1.1,1.2

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

Update of /cvsroot/phpwiki/phpwiki/themes/Hawaiian
In directory usw-pr-cvs1:/tmp/cvs-serv8592

Modified Files:
	flower.png 
Log Message:
image now uses alpha mask instead of transparency index

Index: flower.png
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Hawaiian/flower.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsNsTiJ6 and /tmp/cvsuzZek3 differ

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

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

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

Modified Files:
	browse.html 
Log Message:
Moved modification date out of table, so it is visible in phpwiki-printer.css with Mozilla/Amaya. Moved page actions up to fill the blank, and SignIn left under the page actions.

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** browse.html	2001/12/30 06:10:50	1.34
--- browse.html	2002/01/02 03:50:33	1.35
***************
*** 39,50 ****
  <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
-      CSSs float:left; and float:right;.  However float:right; seems
-      to cause MSIE4.01/NT to hang. 
-      So, we use tables...  -->
- <table summary="Toolbar 1: Page date and page search options." class="toolbar" width="100%"
-        cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
-   <td>
      <?php if ($IS_CURRENT) { ?>
         <?php printf(_("Last edited on %s."),"${LASTMODIFIED}"); ?>
--- 39,42 ----
***************
*** 52,68 ****
         <?php printf(_("Version %s, saved on %s."),"${VERSION}","${LASTMODIFIED}"); ?>
      <?php } ?>
!   </td>
!   <td align="right">
!   <?php echo LinkExistingWikiWord(_("RecentChanges")) ?> 
!   | <?php echo LinkExistingWikiWord(_("FindPage")) ?> 
!   | <span><input type="hidden" name="auto_redirect" value="1" />
!     <input type="text"  name="s" size="12"
!            title=_("Quick Search")
!            onmouseover="window.status='$_("Quick Search")'; return true;"
!            onmouseout="window.status=''; return true;" /></span>
!   | <?plugin-link LikePages page="[pagename]" ?>
!   </td>
! </tr></table>
! <table summary="Toolbar 2: Page actions and sign in." class="toolbar" width="100%"
         cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
    <td>
--- 44,54 ----
         <?php printf(_("Version %s, saved on %s."),"${VERSION}","${LASTMODIFIED}"); ?>
      <?php } ?>
! <hr color="black" class="toolbar" />
! <!-- I would like not to have to use these tables, and managed to
!      get this stuff to work more or less correctly using
!      CSSs float:left; and float:right;.  However float:right; seems
!      to cause MSIE4.01/NT to hang. 
!      So, we use tables...  -->
! <table summary="Toolbar 1: Page actions and search for pages." class="toolbar" width="100%"
         cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
    <td>
***************
*** 94,97 ****
--- 80,96 ----
    </td>
    <td align="right">
+   <?php echo LinkExistingWikiWord(_("RecentChanges")) ?> 
+   | <?php echo LinkExistingWikiWord(_("FindPage")) ?> 
+   | <span><input type="hidden" name="auto_redirect" value="1" />
+     <input type="text"  name="s" size="12"
+            title=_("Quick Search")
+            onmouseover="window.status='$_("Quick Search")'; return true;"
+            onmouseout="window.status=''; return true;" /></span>
+   | <?plugin-link LikePages page="[pagename]" ?>
+   </td>
+ </tr></table>
+ <table summary="Toolbar 2: Sign in." class="toolbar" width="100%"
+        cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
+   <td>
      <?php if ($user->is_authenticated()) { ?>
        <?php printf(_("You are signed in as %s"), LinkWikiWord($USERID)); ?>
***************
*** 101,104 ****
--- 100,106 ----
      <?php } ?>
    </td>
+ 
+   <td align="right">
+   </td>
  </tr></table>
  
***************
*** 118,123 ****
  		 . $errmsgs);
  ?>
! <div class="toolbar">
!   <!-- For debugging only, really: -->
    <?plugin-link _BackendInfo 
                  linktext=_("DebugInfo")
--- 120,125 ----
  		 . $errmsgs);
  ?>
! <table summary="For debugging only, really." class="toolbar" width="100%"
!        cellpadding="0" cellspacing="0" border="0"><tr><td>
    <?plugin-link _BackendInfo 
                  linktext=_("DebugInfo")
***************
*** 129,133 ****
                  targetpage=_("ViewMarkup")
                  page=[pagename] ?>
! </div>
  </form>
  </body>
--- 131,135 ----
                  targetpage=_("ViewMarkup")
                  page=[pagename] ?>
! </td><tr></table>
  </form>
  </body>

[phpwiki-checkins] CVS: phpwiki phpwiki-printer.css,1.2,1.3

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

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

Modified Files:
	phpwiki-printer.css 
Log Message:
Moved modification date out of table, so it is visible in phpwiki-printer.css with Mozilla/Amaya. Moved page actions up to fill the blank, and SignIn left under the page actions.

Index: phpwiki-printer.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/phpwiki-printer.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** phpwiki-printer.css	2001/12/27 18:11:39	1.2
--- phpwiki-printer.css	2002/01/02 03:50:33	1.3
***************
*** 49,52 ****
--- 49,58 ----
  }
  
+ .toolbar HR {
+         visibility : hidden;
+         color :      white;
+         background : white;
+ }
+ 
  /**
   * Hide wiki links in the toolbar for browsers which ignore visibility