Menu
▾
▴
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
|
|
From: <var...@us...> - 2011-03-07 09:47:40
|
Revision: 7965
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7965&view=rev
Author: vargenau
Date: 2011-03-07 09:47:31 +0000 (Mon, 07 Mar 2011)
Log Message:
-----------
No tabs
Modified Paths:
--------------
trunk/themes/Crao/crao.css
trunk/themes/MonoBook/IE60Fixes.css
trunk/themes/MonoBook/IE70Fixes.css
trunk/themes/MonoBook/commonPrint.css
trunk/themes/MonoBook/main.css
trunk/themes/MonoBook/rtl.css
trunk/themes/MonoBook/wikiprintable.css
trunk/themes/Sidebar/sidebar.css
trunk/themes/Wordpress/Wordpress.css
trunk/themes/default/highlight.css
trunk/themes/default/phpwiki-modern.css
trunk/themes/default/phpwiki.css
Modified: trunk/themes/Crao/crao.css
===================================================================
--- trunk/themes/Crao/crao.css 2011-03-05 17:05:30 UTC (rev 7964)
+++ trunk/themes/Crao/crao.css 2011-03-07 09:47:31 UTC (rev 7965)
@@ -34,32 +34,32 @@
empty-cells: show;
}
a:link, a {/* MODIFY-TXT */
- color: #33c;
- text-decoration: underline;
- background-color: transparent;
+ color: #33c;
+ text-decoration: underline;
+ background-color: transparent;
}
a:visited {/* MODIFY-TXT */
- color: #33c;
- text-decoration: underline;
- background-color: transparent;
+ color: #33c;
+ text-decoration: underline;
+ background-color: transparent;
}
a:hover {/* MODIFY-TXT */
- color: #03f;
- text-decoration:underline;
- background-color: transparent;
+ color: #03f;
+ text-decoration:underline;
+ background-color: transparent;
}
a.wiki, a.wikiadmin, a.named-wiki {
}
-hr {
- background-color: #ccc;/* MODIFY-color */
- height: 1px;
- border: 1px solid #ccc; /* MODIFY-color */
+hr {
+ background-color: #ccc;/* MODIFY-color */
+ height: 1px;
+ border: 1px solid #ccc; /* MODIFY-color */
}
div.wikitext pre { font-family: monospace; }
-p {
- font-size: 1em;
- margin: 0em;
- margin-bottom: 1em;
+p {
+ font-size: 1em;
+ margin: 0em;
+ margin-bottom: 1em;
}
@@ -69,31 +69,31 @@
******************************
*/
ul{
- position: relative;
- padding : 0px;
- margin: 0em;
- font-family: Helvetica, Verdana, Arial, sans-serif;
- font-size: 100%;
- line-height: 120%;
- list-style: inside;
- background-color: transparent;
+ position: relative;
+ padding : 0px;
+ margin: 0em;
+ font-family: Helvetica, Verdana, Arial, sans-serif;
+ font-size: 100%;
+ line-height: 120%;
+ list-style: inside;
+ background-color: transparent;
}
ul ul{
- position: relative;
- font-family: Helvetica, Verdana, Arial, sans-serif;
- font-size: 100%;
- margin-left: 2em;
+ position: relative;
+ font-family: Helvetica, Verdana, Arial, sans-serif;
+ font-size: 100%;
+ margin-left: 2em;
}
li.rc-major {
- list-style: none;
- display: block;
- background-color: #fff;/* MODIFY-color */
- margin: 6px 0px;
- border: 1px #666 dashed;/* MODIFY-color */
- padding:0.5ex;
+ list-style: none;
+ display: block;
+ background-color: #fff;/* MODIFY-color */
+ margin: 6px 0px;
+ border: 1px #666 dashed;/* MODIFY-color */
+ padding:0.5ex;
}
-
+
li.evenrow{
border: 0px;
padding:1ex;
@@ -130,50 +130,48 @@
}
p.wiki-rc-action
{
- text-align: center;
- vertical-align: middle;
- padding: 5px 5px 5px 5px;
- border: 1px #000 solid;
- background-color: transparent;
+ text-align: center;
+ vertical-align: middle;
+ padding: 5px 5px 5px 5px;
+ border: 1px #000 solid;
+ background-color: transparent;
}
p a.wiki-rc-action
{
- display: inline;
- padding:0px 10px;
- font-weight: bold;
- background-color: transparent;
+ display: inline;
+ padding:0px 10px;
+ font-weight: bold;
+ background-color: transparent;
}
-
-
/*
******************************
*****HEADER
******************************
*/
#header {
- background-color: #333;/* MODIFY-color */
+ background-color: #333;/* MODIFY-color */
}
#logo {/* MODIFY-TXT */
- color: #ccc;
- display: inline;
- margin-top: 0px;
- margin-left: 0px;
- height: 50px;
- width:auto;
- background-color: transparent;
- font: bolder 67px/50px Verdana, Arial, Helvetica, sans-serif;
+ color: #ccc;
+ display: inline;
+ margin-top: 0px;
+ margin-left: 0px;
+ height: 50px;
+ width:auto;
+ background-color: transparent;
+ font: bolder 67px/50px Verdana, Arial, Helvetica, sans-serif;
letter-spacing: -0.1em;
/* font-variant: condensed; */
}
#logo img {
- border: 0px;
+ border: 0px;
}
#logo a {
- color: #ccc;
- font: bolder 67px/50px Arial, Verdana, Helvetica, sans-serif;
- text-decoration: none;
+ color: #ccc;
+ font: bolder 67px/50px Arial, Verdana, Helvetica, sans-serif;
+ text-decoration: none;
}
/*
@@ -186,43 +184,43 @@
div.ie-actionbuttons {
position: relative/*absolute*/;
/*max-width: 30%;*/ height: 22px;
- right: 0; bottom: 0;
- margin: 0px;
+ right: 0; bottom: 0;
+ margin: 0px;
background: transparent url(images/BG.png) no-repeat top right;
- text-align: right;
- vertical-align: bottom;
- padding-left: 2em;
- padding-right: 1em;
- padding-top: 0.5ex;
- padding-bottom: 0.5ex;
- border: 0px none;
+ text-align: right;
+ vertical-align: bottom;
+ padding-left: 2em;
+ padding-right: 1em;
+ padding-top: 0.5ex;
+ padding-bottom: 0.5ex;
+ border: 0px none;
}
/* body>div#actionbuttons { position: fixed; } */
#actionbuttons {
- position: fixed;
-/* position: absolute; */
- max-width: 30%; height: 22px;
- right: 0px; bottom: 0px;
- margin: 0px;
- background: transparent url(images/BG.png) top left;/* MODIFY-IMG */
- vertical-align: bottom;
- padding-left: 2em;
- padding-right: 1em;
- padding-top: 0.5ex;
- padding-bottom: 0.5ex;
- border: 0px none;
+ position: fixed;
+/* position: absolute; */
+ max-width: 30%; height: 22px;
+ right: 0px; bottom: 0px;
+ margin: 0px;
+ background: transparent url(images/BG.png) top left;/* MODIFY-IMG */
+ vertical-align: bottom;
+ padding-left: 2em;
+ padding-right: 1em;
+ padding-top: 0.5ex;
+ padding-bottom: 0.5ex;
+ border: 0px none;
}
#actionbuttons div { }
#actionbuttons a, #actionbuttons a:link {
- position: relative;
- display: inline;
- text-align: right;
- width: 100%;
- margin-bottom: 0.5em;
- margin-top: auto;
- background-color:transparent;
- border: 0px;
+ position: relative;
+ display: inline;
+ text-align: right;
+ width: 100%;
+ margin-bottom: 0.5em;
+ margin-top: auto;
+ background-color:transparent;
+ border: 0px;
}
/*
@@ -230,45 +228,45 @@
*****CONTENT-ZONE
******************************
*/
-#content {
- margin-top: 0px;
- margin-left:7%;
- margin-right: 7%;
- margin-bottom:7%;
- background-color: #f2f2f2;/* MODIFY-color */
- border: 1px #999 solid;/* MODIFY-color */
- padding-left: 2em;
- padding-right: 15px;
- padding-top: 15px;
- padding-bottom: 0.5ex;
+#content {
+ margin-top: 0px;
+ margin-left:7%;
+ margin-right: 7%;
+ margin-bottom:7%;
+ background-color: #f2f2f2;/* MODIFY-color */
+ border: 1px #999 solid;/* MODIFY-color */
+ padding-left: 2em;
+ padding-right: 15px;
+ padding-top: 15px;
+ padding-bottom: 0.5ex;
}
/* titre */
div.boxtitrehead {}
div.boxtitrehead a.backlinks {}
div.wikitext {
- font-size: 1em;
- line-height: 130%;
- text-align: left;
+ font-size: 1em;
+ line-height: 130%;
+ text-align: left;
}
blockquote.mail-style-quote {
- border-left: #FF9933;/* MODIFY-color */
- margin: 0em;
- margin-bottom: 1em;
- border: 1px solid #FF9933;/* MODIFY-color */
- padding: 0.5em;
+ border-left: #FF9933;/* MODIFY-color */
+ margin: 0em;
+ margin-bottom: 1em;
+ border: 1px solid #FF9933;/* MODIFY-color */
+ padding: 0.5em;
}
.mail-style-quote blockquote.mail-style-quote {
- margin-left: 0.3em;
- margin-bottom : 0em;
- background: transparent;
- border-style: none;
- border-left: 2px solid #FF9933;/* MODIFY-color */
- padding: 0em;
- padding-left: 0.5em;
+ margin-left: 0.3em;
+ margin-bottom : 0em;
+ background: transparent;
+ border-style: none;
+ border-left: 2px solid #FF9933;/* MODIFY-color */
+ padding: 0em;
+ padding-left: 0.5em;
}
blockquote p {
- margin-top: 0.5ex;
- margin-bottom: 0.5ex;
+ margin-top: 0.5ex;
+ margin-bottom: 0.5ex;
}
/*
@@ -298,16 +296,16 @@
}
#navbuttons {
- display: inline;
+ display: inline;
}
#navbuttons img{
- margin:5px 0px 5px 10px;
+ margin:5px 0px 5px 10px;
}
#navbuttons a:link, #navbuttons a{/* MODIFY-TXT */
- font-weight: bold;
- padding-left: 1ex;
- padding-right: 1ex;
- color:#333;
+ font-weight: bold;
+ padding-left: 1ex;
+ padding-right: 1ex;
+ color:#333;
}
#navbuttons a:visited{}
#navbuttons a:hover{}
@@ -318,36 +316,36 @@
******************************
*/
#signin{/* MODIFY-TXT */
- width: auto;
- text-align: right;
- padding-right: 10px;
- background-color:transparent;
- color:#ccc;
- font-size:12px;
+ width: auto;
+ text-align: right;
+ padding-right: 10px;
+ background-color:transparent;
+ color:#ccc;
+ font-size:12px;
}
#signin form{/* MODIFY-TXT */
- text-align: center;
- padding: 1px;
- margin: 0px;
- display: inline;
-}
+ text-align: center;
+ padding: 1px;
+ margin: 0px;
+ display: inline;
+}
#signin input{/* MODIFY-TXT */
- padding: 0px;
- padding-left: 3px;
- margin: 0px;
- font-family: Verdana, Arial, Helvetica, sans-serif ;
- color:#333;
- font-size: 12px;
+ padding: 0px;
+ padding-left: 3px;
+ margin: 0px;
+ font-family: Verdana, Arial, Helvetica, sans-serif ;
+ color:#333;
+ font-size: 12px;
}
#signin input.wikisignin{
- padding: 0px;
- margin: 0px;
- border: 0px none;
+ padding: 0px;
+ margin: 0px;
+ border: 0px none;
}
#signin a.wiki{/* MODIFY-TXT */
- color:#FFF;
- background-color: transparent;
+ color:#FFF;
+ background-color: transparent;
}
/*
@@ -356,29 +354,29 @@
******************************
*/
#search {
- font-size: 12px;
- margin: 5px 10px 5px 10px;
- /*padding-right: 10px;*/
- float: right;
+ font-size: 12px;
+ margin: 5px 10px 5px 10px;
+ /*padding-right: 10px;*/
+ float: right;
}
#search form{
- text-align: center;
- padding: 1px;
- margin: 0px;
- display: inline;
+ text-align: center;
+ padding: 1px;
+ margin: 0px;
+ display: inline;
}
#search input{
- padding: 0px;
- padding-left: 3px;
- margin: 0px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- color: #333;
- font-size: 12px;
+ padding: 0px;
+ padding-left: 3px;
+ margin: 0px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ color: #333;
+ font-size: 12px;
}
#search input.wikiaction{
- padding: 0px;
- margin: 0px;
- border: 0px none;
+ padding: 0px;
+ margin: 0px;
+ border: 0px none;
}
.search-context { background: white; font-style: oblique; }
.search-term {
@@ -395,7 +393,7 @@
display: none;
z-index: 100;
background-color: white;
- border: 1px solid #d0d0d0;
+ border: 1px solid #d0d0d0;
font-size: 9px;
overflow: hidden;
}
@@ -404,9 +402,9 @@
}
#LSResult .evenrow {
background-color: #f0f0f0;
-}
+}
#LSREsult .oddrow {
-}
+}
.LSEnd {
text-align: right;
}
@@ -415,7 +413,7 @@
}
.LSRow {
padding: 1px;
-}
+}
ul.LSRes {
margin: 0px;
padding: 0px;
@@ -427,16 +425,6 @@
/*
******************************
- *****NEWS
- ******************************
- */
-#news{
-}
-
-
-
-/*
- ******************************
*****MOZ-SIDEBAR
******************************
*/
@@ -450,8 +438,6 @@
body.sidebar { padding-left: 1em; }
body.sidebar h2 { margin-top: 0; }
-
-
/*
******************************
*****WIKI-FORM
@@ -473,8 +459,6 @@
/* Add space between the input field and following buttons, but not after the last button. */
div.wikiaction input[type=text], div.wikiadmin input[type=text], form.wikiadmin input[type=file] { margin-right: 0.5em; }
-
-
/*
******************************
*****LINK-ICON
@@ -485,22 +469,19 @@
img.linkicon { vertical-align: middle; }
img.rssicon { vertical-align: baseline; }
-
-
/*
******************************
*****ADMIN-ACTION
******************************
*/
a.wikiaction, a.wikiadmin, a.wiki-rc-action, a.wikiunsafe {
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
+ text-decoration: none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
}
-
.wikiunsafe {
- color: #000;
- background-color: #f2f2f2;/* MODIFY-color */
+ color: #000;
+ background-color: #f2f2f2;/* MODIFY-color */
}
input.wikiadmin {color: #000; background-color: #fff; }
@@ -513,30 +494,30 @@
/* Unknown links */
.wikiunknown, .named-wikiunknown {
- font-weight: normal;
- font-size: 100%;
- background-color: transparent;
+ font-weight: normal;
+ font-size: 100%;
+ background-color: transparent;
}
/* QuestionMark #600 */
.wikiunknown a, .named-wikiunknown a {
- color: #FFFFFF;
- background-color: #000000;/* MODIFY-color */
- text-decoration: none;
- font-weight: normal;
- font-size: 1em;
- padding: 1px;
- padding-top: 0px;
- padding-bottom: 0px;
- border-top: 1px solid #000000;
- border-bottom: 1px solid #000000;
- margin-right: 2px;
+ color: #FFFFFF;
+ background-color: #000000;/* MODIFY-color */
+ text-decoration: none;
+ font-weight: normal;
+ font-size: 1em;
+ padding: 1px;
+ padding-top: 0px;
+ padding-bottom: 0px;
+ border-top: 1px solid #000000;
+ border-bottom: 1px solid #000000;
+ margin-right: 2px;
}
/* Backlinks */
.backlinks {
- text-decoration: underline;
- background-color: transparent;
- color: #006;
+ text-decoration: underline;
+ background-color: transparent;
+ color: #006;
}
@@ -546,8 +527,6 @@
.interwiki, i.interwiki .wikipage, em .interwiki .wikipage { font-style: oblique; }
.interwiki .wikipage, i .interwiki, em .interwiki { font-style: normal; }
-
-
/*
******************************
*****HEADING
@@ -556,34 +535,33 @@
h1, h2, h3, h4, h5, h6 { font-family: Arial, Helvetica, sans-serif; }
h1 { /* MODIFY-TXT */
- margin-top: 10px;
- background-color: transparent;
- color: #555;
+ margin-top: 10px;
+ background-color: transparent;
+ color: #555;
}
h1 a.backlinks{ /* MODIFY-TXT */
- color: #777;
- text-decoration:none;
+ color: #777;
+ text-decoration:none;
}
h1 a.wiki{ /* MODIFY-TXT */
- color: #777;
- text-decoration:none;
+ color: #777;
+ text-decoration:none;
}
h1 a.pagetitle{ /* MODIFY-TXT */
- color: #555;
- text-decoration:none;
+ color: #555;
+ text-decoration:none;
}
h1 a:hover{ /* MODIFY-TXT */
- color: #888;
- text-decoration:underline;
+ color: #888;
+ text-decoration:underline;
}
h4, h5, h6 { /* MODIFY-TXT */
- margin-bottom: 0px;
- background-color: transparent;
- color: #111;
- }
+ margin-bottom: 0px;
+ background-color: transparent;
+ color: #111;
+}
-
/*
******************************
*****RSS
@@ -593,54 +571,52 @@
/* rss feed */
div.rss {
- background-color: #fff;
- color:#000;
- border: 2px solid #ddd;
+ background-color: #fff;
+ color:#000;
+ border: 2px solid #ddd;
}
div.feed {
- font-size: 1.4em;
- padding: 0.5em;
+ font-size: 1.4em;
+ padding: 0.5em;
}
.chandesc {
- font-size: 0.9em;
+ font-size: 0.9em;
}
div.rssitem {
- display: block;
- background-color: #fff;
- color:#000;
- border-top: 1px solid #ddd;
- padding: 0em 0.5em;
-
+ display: block;
+ background-color: #fff;
+ color:#000;
+ border-top: 1px solid #ddd;
+ padding: 0em 0.5em;
+
}
div.itemname {
- display: block;
- border: 0px;
- margin-top: 0.5em;
+ display: block;
+ border: 0px;
+ margin-top: 0.5em;
}
div.itemdesc {
- font-size: 1em;
- margin-bottom: 0.5em;
+ font-size: 1em;
+ margin-bottom: 0.5em;
}
-
-
/*
******************************
*****TABLES
******************************
*/
table, td { font-family: Verdana, Arial, Helvetica, sans-serif; }
-caption {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- width: auto;
+caption {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ width: auto;
}
.pagelist {
- background-color: white;/* MODIFY-color */
- border:1px #333 dashed;/* MODIFY-color */
+ background-color: white;/* MODIFY-color */
+ border:1px #333 dashed;/* MODIFY-color */
}
.pagelist thead, .pagelist thead u {}
@@ -673,32 +649,32 @@
}
.wikilink{
- display:block;
+ display:block;
}
#revision{
- font-size:10px;
- text-align:right;
- background-color: #f2f2f2;/* MODIFY-color */
- /* "paper" borders */
- padding-left: 2em;
- padding-right: 1em;
- padding-top: 0.5ex;
- padding-bottom: 0.5ex;
- clear: both;
+ font-size:10px;
+ text-align:right;
+ background-color: #f2f2f2;/* MODIFY-color */
+ /* "paper" borders */
+ padding-left: 2em;
+ padding-right: 1em;
+ padding-top: 0.5ex;
+ padding-bottom: 0.5ex;
+ clear: both;
}
.editdate {
- font-family: Arial, Helvetica, sans-serif;
- margin: 0;
- padding: 0;
- padding-top: 0.25ex;
+ font-family: Arial, Helvetica, sans-serif;
+ margin: 0;
+ padding: 0;
+ padding-top: 0.25ex;
}
#xhtml-validator
{
- font-size: small;
- text-align: center;
- margin-top: 1em;
+ font-size: small;
+ text-align: center;
+ margin-top: 1em;
}
@@ -708,112 +684,112 @@
******************************
*/
form { margin: 0; }
-input, textarea {
- margin: 0.1em;
- background-color: #FFF;
- vertical-align: middle;
- font-size: 1em;
+input, textarea {
+ margin: 0.1em;
+ background-color: #FFF;
+ vertical-align: middle;
+ font-size: 1em;
}
input.wikisignin{
- border: 0px none;
- background-color:#FFF;
+ border: 0px none;
+ background-color:#FFF;
}
input.wikiaction{
- border: 1px solid black;
- background-color:#D7FA8C;
+ border: 1px solid black;
+ background-color:#D7FA8C;
}
input.numeric { text-align: center; }
/* Make the textarea the full page width */
textarea.wikiedit {
- width: 90%;
- margin: 0.5ex;
- padding: 2px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
+ width: 90%;
+ margin: 0.5ex;
+ padding: 2px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
}
#editarea-size {
- margin-top: 1ex;
- margin-bottom: -1ex;
- text-align: right;
- font-size: smaller;
- border: 1px none;
+ margin-top: 1ex;
+ margin-bottom: -1ex;
+ text-align: right;
+ font-size: smaller;
+ border: 1px none;
}
#editarea-size legend{
- text-align: right;
- font-size: smaller;
- border: 1px solid #CCC;
- background-color: #ccc;
+ text-align: right;
+ font-size: smaller;
+ border: 1px solid #CCC;
+ background-color: #ccc;
}
.editarea legend{
- font-family: Verdana, Helvetica, Arial, sans-serif;
- font-size: 1em;
- line-height: 1em;
- padding: 0.2em;
- border: 1px solid #333;
- background-color: #eee;
+ font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-size: 1em;
+ line-height: 1em;
+ padding: 0.2em;
+ border: 1px solid #333;
+ background-color: #eee;
}
fieldset.editarea {
- margin : 1ex;
- margin-top: 1em;
- text-align: center;
- padding : 10px;
- border: 1px solid #333;
- background-color: #E8E8E5;
+ margin : 1ex;
+ margin-top: 1em;
+ text-align: center;
+ padding : 10px;
+ border: 1px solid #333;
+ background-color: #E8E8E5;
}
fieldset.toolbar {
- margin : 1ex;
- margin-top: 0em;
- text-align: center;
- padding : 3px;
- border: 1px solid #FFF;
- background-color: #FFF;
+ margin : 1ex;
+ margin-top: 0em;
+ text-align: center;
+ padding : 3px;
+ border: 1px solid #FFF;
+ background-color: #FFF;
}
/* IncludePage plugin ================================================= */
.transclusion-title {
- text-align: right;
- font-style: oblique;
- font-size: smaller;
- text-decoration: underline;
- margin-bottom: 0.25ex;
- margin-right: 0.25em;
-}
+ text-align: right;
+ font-style: oblique;
+ font-size: smaller;
+ text-decoration: underline;
+ margin-bottom: 0.25ex;
+ margin-right: 0.25em;
+}
.transclusion, .wiki-edithelp {
- font-size: smaller;
+ font-size: smaller;
}
.transclusion {
- border: 1px solid gray;/* MODIFY-color */
- padding-left: 0.8em;
- padding-right: 0.8em;
- padding-top: 0px;
- padding-bottom: 0px;
- margin-left: 0.25em;
- margin-right: 0.25em;
- margin-bottom: 0.1ex;
+ border: 1px solid gray;/* MODIFY-color */
+ padding-left: 0.8em;
+ padding-right: 0.8em;
+ padding-top: 0px;
+ padding-bottom: 0px;
+ margin-left: 0.25em;
+ margin-right: 0.25em;
+ margin-bottom: 0.1ex;
}
.wiki-edithelp {
- background-color: white;
- border: medium solid #fff8dc; /* MODIFY-color */
- padding-left: 0.5em;
- padding-right: 0.5em;
- padding-top: 0.75ex;
- padding-bottom: 0.75ex;
- margin-left: 0;
- margin-right: 0;
- margin-top: 1ex;
- margin-bottom: 1ex;
+ background-color: white;
+ border: medium solid #fff8dc; /* MODIFY-color */
+ padding-left: 0.5em;
+ padding-right: 0.5em;
+ padding-top: 0.75ex;
+ padding-bottom: 0.75ex;
+ margin-left: 0;
+ margin-right: 0;
+ margin-top: 1ex;
+ margin-bottom: 1ex;
}
.wiki-edithelp .wiki {
- /* color: #5454ff;*/
+ /* color: #5454ff;*/
}
.wiki-edithelp p {
- font-family: Verdana, Helvetica, Arial, sans-serif;
- padding-left: 0.5em;
- padding-right: 0.5em;
- padding-top: 0.5ex;
- padding-bottom: 0.5ex;
- margin: 0;
+ font-family: Verdana, Helvetica, Arial, sans-serif;
+ padding-left: 0.5em;
+ padding-right: 0.5em;
+ padding-top: 0.5ex;
+ padding-bottom: 0.5ex;
+ margin: 0;
}
@@ -825,33 +801,33 @@
*/
table.cal {
- float:right;
- font-size:10px;
- border: 1px solid #333;
- background-color: #ccc;/* MODIFY-color */
- margin: 10px;
- padding: 1px;
- /* For Mozilla */
- empty-cells: hide;}
+ float:right;
+ font-size:10px;
+ border: 1px solid #333;
+ background-color: #ccc;/* MODIFY-color */
+ margin: 10px;
+ padding: 1px;
+ /* For Mozilla */
+ empty-cells: hide;}
/* cells */
table.cal td {
- text-align: right;
-}
+ text-align: right;
+}
/* Month-name header */
table.cal-header { /* MODIFY-TXT */
-font-size: larger;
+font-size: larger;
background-color: #333;/* MODIFY-color */
color: #f2f2f2;}
table.cal-header tr, table.cal-header td { text-align: center; }
.cal-arrow {/* MODIFY-TXT */
- font-weight: bold;
- text-decoration: none;
- color: #fff;
+ font-weight: bold;
+ text-decoration: none;
+ color: #fff;
}
a.cal-arrow {/* MODIFY-TXT */
- color:#fff;
+ color:#fff;
}
/* Day-names header */
@@ -859,88 +835,86 @@
.cal-dayname td {
text-align: center;
- font-size: smaller;
- text-decoration: none;
- background-color: #f2f2f2;/* MODIFY-color */
+ font-size: smaller;
+ text-decoration: none;
+ background-color: #f2f2f2;/* MODIFY-color */
}
/* Individual days */
-a.cal-hide {
- font-size: 9px;
+a.cal-hide {
+ font-size: 9px;
text-decoration: none; }
/* Today */
/* cell */
table.cal td.cal-today {
- margin: 1px;
- border: 1px solid #333;/* MODIFY-color */
- color: #000;
- background-color: #f2f2f2;/* MODIFY-color */
+ margin: 1px;
+ border: 1px solid #333;/* MODIFY-color */
+ color: #000;
+ background-color: #f2f2f2;/* MODIFY-color */
}
/* text */
-table.cal td.cal-day a.cal-day {font-size: 9px;
+table.cal td.cal-day a.cal-day {font-size: 9px;
text-decoration: underline; }
-
-
/*
******************************
*****DIFF
******************************
*/
-.diff .block div { position: relative; padding-left: 1.5em; }
+.diff .block div { position: relative; padding-left: 1.5em; }
.diff .prefix { position: absolute; left: 0.5em; top: 0; }
/* main box */
.diff {
color: #000;
- background-color: transparent;
- border: 1px solid black;
+ background-color: transparent;
+ border: 1px solid black;
}
.diff .block {
color: #000;
- background-color: #ccc;
- padding-left: 1em;
+ background-color: #ccc;
+ padding-left: 1em;
}
/* individual blocks */
.diff .context {
color: #000;
- background-color: transparent;
- border: none;
+ background-color: transparent;
+ border: none;
}
/* + - line prefix */
.diff .block tt {
- font-weight: normal;
- font-family: monospace;
- color: black;
- background-color: transparent;
- margin-left: 0;
- border: none;
+ font-weight: normal;
+ font-family: monospace;
+ color: black;
+ background-color: transparent;
+ margin-left: 0;
+ border: none;
}
/* changed words */
.diff del, .diff ins {
- font-weight: bold;
- text-decoration: none;
+ font-weight: bold;
+ text-decoration: none;
}
/* blocks containing deleted or added words */
.diff .original, .diff .deleted,
.diff .final, .diff .added {
color: #000;
- background-color: white;
+ background-color: white;
}
/* blocks containing deleted words */
.diff .original, .diff .deleted {
color: #000;
- background-color: #fcc;
- border: none;
+ background-color: #fcc;
+ border: none;
}
/* blocks containing added words */
.diff .final, .diff .added {
color: #000;
- background-color: #cfc;
- border: none;
+ background-color: #cfc;
+ border: none;
}
/* deleted words */
@@ -948,8 +922,6 @@
/* added words */
.diff ins {color: #000; background-color: #9f9; }
-
-
/*
******************************
*****INFO-HISTORY
@@ -957,28 +929,24 @@
*/
td.pageinfo { font-weight: bold; }
.pageinfo-minoredit, .pageinfo-authorid {
- font-size: smaller;
- font-style: oblique;
+ font-size: smaller;
+ font-style: oblique;
}
-
-
/*
******************************
*****HINTS
******************************
*/
.hint {
- color: black;
- background-color: #eeeeee;
- font-size: smaller;
- margin-left: 5em;
- /* padding: -0.5em 0 -0.5em; */
- border: thin solid #aaaaaa;
+ color: black;
+ background-color: #eeeeee;
+ font-size: smaller;
+ margin-left: 5em;
+ /* padding: -0.5em 0 -0.5em; */
+ border: thin solid #aaaaaa;
}
-
-
/*
******************************
*****CLEAR
@@ -986,53 +954,48 @@
*/
#clear
- {
- clear : both;
- margin : 0px;
- margin-top : -7px;
- padding : 2px;
- text-align : center;
- color : #000;
- background-color : #FFF;
- border : solid 0px;
+ {
+ clear : both;
+ margin : 0px;
+ margin-top : -7px;
+ padding : 2px;
+ text-align : center;
+ color : #000;
+ background-color : #FFF;
+ border : solid 0px;
}
/* reset post NN4 */
/*/*/
#clear
- {
- margin-top : 0px;
+ {
+ margin-top : 0px;
}
-/* */
-
-
/*
******************************
*****IMG-HACK
******************************
*/
img.inlineimage{
- border: 0px;
- vertical-align: middle;
- margin : 0px 5px 0px 5px;
+ border: 0px;
+ vertical-align: middle;
+ margin : 0px 5px 0px 5px;
}
em > img.inlineimage{
- float: left;
- border: 0px;
- vertical-align: middle;
- margin : 5px 15px 15px 0px;
+ float: left;
+ border: 0px;
+ vertical-align: middle;
+ margin : 5px 15px 15px 0px;
}
-
+
strong > img.inlineimage{
- float: right;
- border: 0px;
- vertical-align: middle;
- margin : 5px 0px 15px 15px;
+ float: right;
+ border: 0px;
+ vertical-align: middle;
+ margin : 5px 0px 15px 15px;
}
-
-
/*
******************************
*****WIKI-BLOG
@@ -1040,12 +1003,11 @@
*/
h2.wikiblog-heading {
- font-size: 2em;
- padding-bottom: 0.5em;
- border-bottom: 2px solid gray;/* MODIFY-color */
+ font-size: 2em;
+ padding-bottom: 0.5em;
+ border-bottom: 2px solid gray;/* MODIFY-color */
}
-
/*
******************************
*****OTHER
@@ -1056,26 +1018,26 @@
.printer { display: none; }
.error {
- color: black;
- background-color: #eee;
- margin-top: 1em;
- margin-bottom: 1em;
- padding-left: 0.8em;
- padding-right: 0.8em;
- padding-top: 0.8ex;
- padding-bottom: 0;
- border: medium solid red;
- clear: both;
+ color: black;
+ background-color: #eee;
+ margin-top: 1em;
+ margin-bottom: 1em;
+ padding-left: 0.8em;
+ padding-right: 0.8em;
+ padding-top: 0.8ex;
+ padding-bottom: 0;
+ border: medium solid red;
+ clear: both;
}
/* Debug */
.debug {
- color: black;
- background-color: transparent;
- font-family: monospace;
- font-size: smaller;
- margin: 1ex 0;
- padding: 0.5ex 0.5em;
+ color: black;
+ background-color: transparent;
+ font-family: monospace;
+ font-size: smaller;
+ margin: 1ex 0;
+ padding: 0.5ex 0.5em;
}
/*
@@ -1127,5 +1089,3 @@
* indent-tabs-mode: nil
* End:
*/
-
-
Modified: trunk/themes/MonoBook/IE60Fixes.css
===================================================================
--- trunk/themes/MonoBook/IE60Fixes.css 2011-03-05 17:05:30 UTC (rev 7964)
+++ trunk/themes/MonoBook/IE60Fixes.css 2011-03-07 09:47:31 UTC (rev 7965)
@@ -1,95 +1,93 @@
/**
* $Id$
- */
+ */
/* 6.0 - only fixes */
-/* content area */
+/* content area */
/* workaround for various ie float bugs */
-#column-content {
- float: none;
- margin-left: 0;
- height: 1%;
+#column-content {
+ float: none;
+ margin-left: 0;
+ height: 1%;
}
#column-content #content {
- margin-left: 12.2em;
- margin-top: 3em;
- height: 1%;
+ margin-left: 12.2em;
+ margin-top: 3em;
+ height: 1%;
}
#column-one {
- position: absolute;
- z-index: 4;
- top: 0;
- left: 0;
+ position: absolute;
+ z-index: 4;
+ top: 0;
+ left: 0;
}
#footer {
- margin-left: 13.6em;
- border-left: 1px solid #fabd23;
+ margin-left: 13.6em;
+ border-left: 1px solid #fabd23;
}
body { font-size: 80%;}
-tt {
- font-size: 110%;
-}
+tt { font-size: 110%; }
/* the tabs */
#p-cactions {
- z-index: 3;
+ z-index: 3;
}
#p-cactions li {
- padding-bottom: 0 !important;
- border: none;
- background-color: transparent;
- cursor: default;
- float: none !important;
+ padding-bottom: 0 !important;
+ border: none;
+ background-color: transparent;
+ cursor: default;
+ float: none !important;
}
#p-cactions li a {
- display: inline-block !important;
- vertical-align: top;
- padding-bottom: 0;
- border: solid #aaa;
- border-width: 1px 1px 0;
+ display: inline-block !important;
+ vertical-align: top;
+ padding-bottom: 0;
+ border: solid #aaa;
+ border-width: 1px 1px 0;
}
#p-cactions li.selected a {
- border-color: #fabd23;
- padding-bottom: 0.17em !important;
+ border-color: #fabd23;
+ padding-bottom: 0.17em !important;
}
#p-cactions li a:hover {
- padding-bottom: 0.17em;
+ padding-bottom: 0.17em;
}
#p-navigation a {
- display: inline-block;
- width: 100%;
+ display: inline-block;
+ width: 100%;
}
#portal-personaltools {
- padding-bottom: 0.1em;
+ padding-bottom: 0.1em;
}
#bodyContent a.external {
- background: url(images/external.png) center right no-repeat;
- padding-right: 13px;
+ background: url(images/external.png) center right no-repeat;
+ padding-right: 13px;
}
/* show the hand */
#p-logo a,
#p-logo a:hover {
- cursor: pointer;
+ cursor: pointer;
}
div.visualClear {
- width:100%;
- line-height: 0;
+ width:100%;
+ line-height: 0;
}
textarea {
- width: 96%;
+ width: 96%;
}
div.editsection,
#catlinks,
div.tright,
div.tleft {
- position: relative;
+ position: relative;
}
-/*{ border:1px solid Red !important;}*/
+
span.rateit {
text-decoration: none;
font-family: Arial, Helvetica, sans-serif;
@@ -98,9 +96,3 @@
div#rateit-widget-top {
top: 38px;
}
-/*
-div#rateit-widget-top {
- top: 15px;
- right: 90px;
-}
-*/
Modified: trunk/themes/MonoBook/IE70Fixes.css
===================================================================
--- trunk/themes/MonoBook/IE70Fixes.css 2011-03-05 17:05:30 UTC (rev 7964)
+++ trunk/themes/MonoBook/IE70Fixes.css 2011-03-07 09:47:31 UTC (rev 7965)
@@ -1,81 +1,71 @@
/**
* $Id$
- */
+ */
/* 7.0 - only fixes */
-/* content area */
+/* content area */
/* workaround for various ie float bugs */
/* This bit is needed to make links clickable... WTF */
#column-content #content {
- margin-left: 12.2em;
- margin-top: 3em;
- height: 1%;
+ margin-left: 12.2em;
+ margin-top: 3em;
+ height: 1%;
}
.rtl #column-one {
- /* For some reason it tries to inherit the padding-top into every div,
- * and I can't figure out how to get it back off.
- */
- padding-top: 0;
+ /* For some reason it tries to inherit the padding-top into every div,
+ * and I can't figure out how to get it back off.
+ */
+ padding-top: 0;
}
.rtl #column-one #p-navigation {
- margin-top: 160px;
+ margin-top: 160px;
}
/* the tabs */
#p-cactions {
- z-index: 3;
+ z-index: 3;
}
#p-cactions li {
- padding-bottom: 0 !important;
- border: none;
- background-color: transparent;
- cursor: default;
- float: none !important;
+ padding-bottom: 0 !important;
+ border: none;
+ background-color: transparent;
+ cursor: default;
+ float: none !important;
}
#p-cactions li a {
- display: inline-block !important;
- vertical-align: top;
- padding-bottom: 0;
- border: solid #aaa;
- border-width: 1px 1px 0;
+ display: inline-block !important;
+ vertical-align: top;
+ padding-bottom: 0;
+ border: solid #aaa;
+ border-width: 1px 1px 0;
}
#p-cactions li.selected a {
- border-color: #fabd23;
- padding-bottom: 0.17em !important;
+ border-color: #fabd23;
+ padding-bottom: 0.17em !important;
}
#p-cactions li a:hover {
- padding-bottom: 0.17em !important;
+ padding-bottom: 0.17em !important;
}
#p-navigation a {
- display: inline-block;
- width: 100%;
+ display: inline-block;
+ width: 100%;
}
#portal-personaltools {
- padding-bottom: 0.1em;
+ padding-bottom: 0.1em;
}
textarea {
- width: 96%;
+ width: 96%;
}
tt {
- font-size: 110%;
+ font-size: 110%;
}
-/*
-div.editsection,
-#catlinks,
-div.tright,
-div.tleft {
- position: relative;
-}
-*/
-
-
#footer li {
- /* Work around bug with inline <li> tags with right margins and nowrap */
- margin-right: 0;
+ /* Work around bug with inline <li> tags with right margins and nowrap */
+ margin-right: 0;
}
Modified: trunk/themes/MonoBook/commonPrint.css
===================================================================
--- trunk/themes/MonoBook/commonPrint.css 2011-03-05 17:05:30 UTC (rev 7964)
+++ trunk/themes/MonoBook/commonPrint.css 2011-03-07 09:47:31 UTC (rev 7965)
@@ -1,6 +1,6 @@
/**
* $Id$
- */
+ */
/*
** Mediawiki Print style sheet for CSS2-capable browsers.
@@ -10,10 +10,10 @@
** Copyright Alexander Limi
*/
-@page {
- size: A4 portrait;
+@page {
+ size: A4 portrait;
margin: 17mm 10mm 17mm 10mm;
-}
+}
h1 {
string-set: header content();
@@ -24,7 +24,7 @@
content: "Phpwiki";
}
@top-right {
- content: string(header);
+ content: string(header);
}
@bottom-left {
content: "Page " counter(page) " of " counter(pages);
@@ -33,7 +33,7 @@
@page :right {
@top-left {
- content: string(header);
+ content: string(header);
}
@top-right {
content: "Phpwiki";
@@ -52,7 +52,7 @@
}
}
-h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
+h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
/* Do not cut tables with class "nobreak" */
@@ -65,20 +65,19 @@
a.new{ color:#ba0000; text-decoration:none; }
.toc,
-#toc {
- /*border:1px solid #2f6fab;*/
+#toc {
border:1px solid #aaaaaa;
background-color:#f9f9f9;
padding:5px;
}
.tocindent {
- margin-left: 2em;
+ margin-left: 2em;
}
.tocline {
- margin-bottom: 0px;
+ margin-bottom: 0px;
}
.toctoggle, .editsection {
- font-size: smaller;
+ font-size: smaller;
}
div.toclist a::after {
@@ -86,22 +85,22 @@
}
/* images */
-div.floatright {
- float: right;
+div.floatright {
+ float: right;
margin: 0;
position:relative;
border: 0.5em solid White;
border-width: 0.5em 0 0.8em 1.4em;
}
-div.floatright p { font-style: italic;}
-div.floatleft {
- float: left;
+div.floatright p { font-style: italic;}
+div.floatleft {
+ float: left;
margin: 0.3em 0.5em 0.5em 0;
position:relative;
border: 0.5em solid White;
border-width: 0.5em 1.4em 0.8em 0;
}
-div.floatleft p { font-style: italic; }
+div.floatleft p { font-style: italic; }
/* thumbnails */
div.thumb {
margin-bottom: 0.5em;
@@ -136,10 +135,10 @@
/* table standards */
table.rimage {
- float:right;
- width:1pt;
+ float:right;
+ width:1pt;
position:relative;
- margin-left:1em;
+ margin-left:1em;
margin-bottom:1em;
text-align:center;
}
@@ -174,7 +173,7 @@
display: none;
}
-ul {
+ul {
list-style-type: square;
}
@@ -197,7 +196,7 @@
p, .documentDescription {
margin: 1em 0 ! important;
- line-height: 1.2em;
+ line-height: 1.2em;
}
pre {
@@ -225,7 +224,7 @@
text-decoration: underline;
}
/*
-#content a:link:after,
+#content a:link:after,
#content a:visited:after {
content: " ( " attr(href) " ) ";
}*/
@@ -245,20 +244,20 @@
}
/* MSIE/Win doesn't understand 'inherit' */
a, a.external, a.new, a.stub {
- color: black ! important;
- text-decoration: none ! important;
+ color: black ! important;
+ text-decoration: none ! important;
}
/* Continue ... */
a, a.external, a.new, a.stub {
- color: inherit ! important;
- text-decoration: inherit ! important;
+ color: inherit ! important;
+ text-decoration: inherit ! important;
}
/* Show some stuff */
.urlexpansion {
- display: inline ! important;
+ display: inline ! important;
}
div.townBox {
@@ -274,7 +273,7 @@
}
div.townBox dl {
padding: 0;
- margin: 0 0 0.3em 0;
+ margin: 0 0 0.3em 0;
font-size: 96%;
}
div.townBox dl dt {
Modified: trunk/themes/MonoBook/main.css
===================================================================
--- trunk/themes/MonoBook/main.css 2011-03-05 17:05:30 UTC (rev 7964)
+++ trunk/themes/MonoBook/main.css 2011-03-07 09:47:31 UTC (rev 7965)
@@ -1,6 +1,6 @@
/**
* $Id$
- */
+ */
/*
** MediaWiki 'monobook' style sheet for CSS2-capable browsers.
@@ -11,34 +11,34 @@
** and the Plone 2.0 styles, see http://plone.org/ (Alexander Limi, Joe Geldart & Tom Croucher,
** Michael Zeltner and Geir Bækholt)
** All you guys rock :)
-** Added phpwiki integration: Reini Urban, based on the phpwiki.css
+** Added phpwiki integration: Reini Urban, based on the phpwiki.css
** by Jeff Dairiki
*/
#column-content {
- width: 100%;
- float: right;
- margin: 0 0 .6em -12.2em;
- padding: 0;
- height: 1%;
+ width: 100%;
+ float: right;
+ margin: 0 0 .6em -12.2em;
+ padding: 0;
+ height: 1%;
}
#content {
- position: relative;
- z-index: 2;
- margin: 2.8em 0 0 12.2em;
- padding: 0 1em 1.5em 1em;
- background: white;
- color: black;
- border: 1px solid #aaa;
- border-right: none;
- line-height: 1.5em;
+ position: relative;
+ z-index: 2;
+ margin: 2.8em 0 0 12.2em;
+ padding: 0 1em 1.5em 1em;
+ background: white;
+ color: black;
+ border: 1px solid #aaa;
+ border-right: none;
+ line-height: 1.5em;
}
#column-one {
- position: absolute;
- /*z-index: 3;*/
- padding-top: 160px;
- top: 0;
- left: 0;
+ position: absolute;
+ /*z-index: 3;*/
+ padding-top: 160px;
+ top: 0;
+ left: 0;
}
/* the left column width is specified in class .portlet */
@@ -49,76 +49,76 @@
*/
body {
- font: small sans-serif;
- background: #f9f9f9 url("images/headbg.jpg") 0 0 no-repeat;
- color: black;
- margin: 0;
- padding: 0;
+ font: small sans-serif;
+ background: #f9f9f9 url("images/headbg.jpg") 0 0 no-repeat;
+ color: black;
+ margin: 0;
+ padding: 0;
}
/* scale back up to a sane default */
#globalWrapper {
- font-size: 127%;
- width: 100%;
- margin: 0;
- padding: 0;
+ font-size: 127%;
+ width: 100%;
+ margin: 0;
+ padding: 0;
}
.visualClear {
- clear: both;
+ clear: both;
}
/* general styles */
table {
- font-size: 100%;
- color: black;
+ font-size: 100%;
+ color: black;
}
a {
- text-decoration: none;
- color: #002bb8;
- background: none;
+ text-decoration: none;
+ color: #002bb8;
+ background: none;
}
a:visited {
- color: #5a3696;
+ color: #5a3696;
}
a:active {
- color: #faa700;
+ color: #faa700;
}
a:hover {
- text-decoration: underline;
+ text-decoration: underline;
}
a.stub {
- color: #772233;
+ color: #772233;
}
img {
- border: 0;
- vertical-align: middle;
+ border: 0;
+ vertical-align: middle;
}
p {
- margin: .4em 0 .5em 0;
- line-height: 1.5em;
+ margin: .4em 0 .5em 0;
+ line-height: 1.5em;
}
p img {
- margin: 0;
+ margin: 0;
}
hr {
- height: 1px;
- color: #aaa;
- background-color: #aaa;
- border: 0;
- margin: .2em 0 .2em 0;
+ height: 1px;
+ color: #aaa;
+ background-color: #aaa;
+ border: 0;
+ margin: .2em 0 .2em 0;
}
h1, h2, h3, h4, h5, h6 {
- color: black;
- background: none;
- font-weight: bold;
- font-family: Tahoma, sans-serif;
- margin: 0;
- padding-top: 0.5em;
- padding-bottom: 0.17em;
- border-bottom: 1px solid #aaa;
+ color: black;
+ background: none;
+ font-weight: bold;
+ font-family: Tahoma, sans-serif;
+ margin: 0;
+ padding-top: 0.5em;
+ padding-bottom: 0.17em;
+ border-bottom: 1px solid #aaa;
}
h1 { font-size: 188%; }
h2 { font-size: 150%; }
@@ -126,97 +126,97 @@
h4 { font-size: 116%; }
h5 { font-size: 100%; }
h6 { font-size: 80%; }
-h4, h5, h6 {
- border-bottom: none;
- font-weight: normal;
+h4, h5, h6 {
+ border-bottom: none;
+ font-weight: normal;
}
/* Because in some cases there is a <p> in nested lists */
li p { margin:0; }
-ul {
- line-height: 1.5em;
- list-style-type: square;
- margin: 0.3em 0 0 1.5em;
- padding:0;
- list-style-image: url("images/bullet.png");
+ul {
+ line-height: 1.5em;
+ list-style-type: square;
+ margin: 0.3em 0 0 1.5em;
+ padding:0;
+ list-style-image: url("images/bullet.png");
}
ol {
- line-height: 1.5em;
- margin: 0.3em 0 0 3.2em;
- padding:0;
- list-style-image: none;
+ line-height: 1.5em;
+ margin: 0.3em 0 0 3.2em;
+ padding:0;
+ list-style-image: none;
}
-li { margin-bottom: 0.1em; }
-dt {
- font-weight: bold;
- margin-bottom: .1em;
+li { margin-bottom: 0.1em; }
+dt {
+ font-weight: bold;
+ margin-bottom: .1em;
}
dl {
- margin-top: .2em;
- margin-bottom: .5em;
+ margin-top: .2em;
+ margin-bottom: .5em;
}
dd {
- line-height: 1.5em;
- margin-left: 2em;
- margin-bottom: .1em;
+ line-height: 1.5em;
+ margin-left: 2em;
+ margin-bottom: .1em;
}
fieldset {
- border: 1px solid #2f6fab;
- margin: 1em 0 1em 0;
- padding: 0 1em 1em 1em;
- line-height: 1.5em;
+ border: 1px solid #2f6fab;
+ margin: 1em 0 1em 0;
+ padding: 0 1em 1em 1em;
+ line-height: 1.5em;
}
legend {
- /*background: white;*/
- padding: 0.5em;
- font-size: 95%;
+ /*background: white;*/
+ padding: 0.5em;
+ font-size: 95%;
}
form {
- border: none;
- margin: 0;
+ border: none;
+ margin: 0;
}
textarea {
- width: 100%;
- padding: .1em;
+ width: 100%;
+ padding: .1em;
}
input.historysubmit {
- padding: 0 0.3em 0.3em 0.3em !important;
- font-size: 94%;
- cursor: pointer;
- height: 1.7em !important;
- margin-left: 1.6em;
+ padding: 0 0.3em 0.3em 0.3em !important;
+ font-size: 94%;
+ cursor: pointer;
+ height: 1.7em !important;
+ margin-left: 1.6em;
}
select {
- vertical-align: top;
+ vertical-align: top;
}
abbr, acronym, .explain {
- border-bottom: 1px dotted black;
- color: black;
- background: none;
- cursor: help;
+ border-bottom: 1px dotted black;
+ color: black;
+ background: none;
+ cursor: help;
}
q {
- font-family: Times, "Times New Roman", serif;
- font-style: italic;
+ font-family: Times, "Times New Roman", serif;
+ font-style: italic;
}
/* disabled for now
blockquote {
- font-family: Times, "Times New Roman", serif;
- font-style: italic;
+ font-family: Times, "Times New Roman", serif;
+ font-style: italic;
}*/
code {
- background-color: #f9f9f9;
+ background-color: #f9f9f9;
}
pre {
- padding: 1em;
- border: 1px dashed #2f6fab;
- color: black;
- background-color: #f9f9f9;
- line-height: 1.1em;
+ padding: 1em;
+ border: 1px dashed #2f6fab;
+ color: black;
+ background-color: #f9f9f9;
+ line-height: 1.1em;
}
/*
@@ -225,108 +225,108 @@
#siteSub { display: none; }
#jump-to-nav {
- display: none;
+ display: none;
}
#contentSub {
- font-size: 84%;
- line-height: 1.2em;
- margin: 0 0 1.4em 1em;
- color: #7d7d7d;
- width: auto;
+ font-size: 84%;
+ line-height: 1.2em;
+ margin: 0 0 1.4em 1em;
+ color: #7d7d7d;
+ width: auto;
}
span.subpages { display: block; }
/* Some space under the headers in the content area */
#bodyContent h1, #bodyContent h2 {
- margin-bottom: .6em;
+ margin-bottom: .6em;
}
#bodyContent h3, #bodyContent h4, #bodyContent h5 {
- margin-bottom: .3em;
+ margin-bottom: .3em;
}
.firstHeading { margin-bottom:0.1em; }
/* user notification thing */
.usermessage {
- background-color: #ffce7b;
- border: 1px solid #ffa500;
- color: black;
- font-weight: bold;
- margin: 2em 0 1em;
- padding: .5em 1em;
- vertical-align: middle;
+ background-color: #ffce7b;
+ border: 1px solid #ffa500;
+ color: black;
+ font-weight: bold;
+ margin: 2em 0 1em;
+ padding: .5em 1em;
+ vertical-align: middle;
}
#siteNotice {
- text-align: center;
- font-size: 95%;
- padding: 0 .9em;
+ text-align: center;
+ font-size: 95%;
+ padding: 0 .9em;
}
#siteNotice p {
- margin: 0;
- padding: 0;
+ margin: 0;
+ padding: 0;
}
.errorbox, .successbox {
- font-size: larger;
- border: 2px solid;
- padding: .5em 1em;
- float: left;
- margin-bottom: 2em;
- color: #000;
+ font-size: larger;
+ border: 2px solid;
+ padding: .5em 1em;
+ float: left;
+ margin-bottom: 2em;
+ color: #000;
}
.errorbox {
- border-color: red;
- background-color: #fff2f2;
+ border-color: red;
+ background-color: #fff2f2;
}
.successbox {
- border-color: green;
- background-color: #dfd;
+ border-color: green;
+ background-color: #dfd;
}
.errorbox h2, .successbox h2 {
- font-size: 1em;
- font-weight: bold;
- display: inline;
- margin: 0 .5em 0 0;
- border: none;
+ font-size: 1em;
+ font-weight: bold;
+ display: inline;
+ margin: 0 .5em 0 0;
+ border: none;
}
#catlinks {
- border: 1px solid #aaa;
- background-color: #f9f9f9;
- padding: 5px;
- margin-top: 1em;
- clear: both;
+ border: 1px solid #aaa;
+ background-color: #f9f9f9;
+ padding: 5px;
+ margin-top: 1em;
+ clear: both;
}
/* currently unused, intended to be used by a metadata box
in the bottom-right corner of the content area */
.documentDescription {
- /* The summary text describing the document */
- font-weight: bold;
- display: block;
- margin: 1em 0;
- line-height: 1.5em;
+ /* The summary text describing the document */
+ font-weight: bold;
+ display: block;
+ margin: 1em 0;
+ line-height: 1.5em;
}
.documentByLine {
- text-align: right;
- font-size: 90%;
- clear: both;
- font-weight: normal;
- color: #76797c;
+ text-align: right;
+ font-size: 90%;
+ clear: both;
+ font-weight: normal;
+ color: #76797c;
}
/* emulate center */
.center {
- width: 100%;
- text-align: center;
+ width: 100%;
+ text-align: center;
}
*.center * {
- margin-left: auto;
- margin-right: auto;
+ margin-left: auto;
+ margin-right: auto;
}
/* small for tables and similar */
.small, .small * {
- font-size: 94%;
+ font-size: 94%;
}
table.small {
- font-size: 100%;
+ font-size: 100%;
}
/*
@@ -334,140 +334,140 @@
*/
#toc,
.toc {
- width: 200px;
- border: 1px solid #aaa;
- background-color: #f9f9f9;
- padding: 5px;
- font-size: 95%;
- float: right;
- clear: right;
+ width: 200px;
+ border: 1px solid #aaa;
+ background-color: #f9f9f9;
+ padding: 5px;
+ font-size: 95%;
+ float: right;
+ clear: right;
}
#toc #toctitle,
.toc .toctitle,
.toc #toctitle {
- display: inline;
- border: none;
- padding: 0;
- font-size: 110%;
- font-weight: bold;
+ display: inline;
+ border: none;
+ padding: 0;
+ font-size: 110%;
+ font-weight: bold;
}
.toc .toclist,
.toc #toclist {
- width: auto;
- border: none;
+ width: auto;
+ border: none;
}
#toc #toctitle,
.toc #toctitle,
#toc .toctitle,
.toc .toctitle {
- text-align: center;
+ text-align: center;
}
-#toc p,
-.toc p {
+#toc p,
+.toc p {
margin: 0;
}
#toc ul,
.toc ul {
- width: auto;
- border: none;
- line-height: 1.5em;
- list-style-type: square;
- list-style-image: url("images/bullet.png");
- font-size: 95%;
- margin-left: 5px;
- padding-left: 5px;
+ width: auto;
+ border: none;
+ line-height: 1.5em;
+ list-style-type: square;
+ list-style-image: url("images/bullet.png");
+ font-size: 95%;
+ margin-left: 5px;
+ padding-left: 5px;
}
#toc ul ul,
.toc ul ul {
- margin: 0 0 0 2em;
+ margin: 0 0 0 2em;
}
#toc .toctoggle,
.toc .toctoggle {
- font-size: 94%;
+ font-size: 94%;
}
.mw-warning {
- border: 1px solid #aaa;
- background-color: #f9f9f9;
- padding: 5px;
- font-size: 95%;
+ border: 1px solid #aaa;
+ background-color: #f9f9f9;
+ padding: 5px;
+ font-size: 95%;
}
.mw-warning {
- margin-left: 50px;
- margin-right: 50px;
- text-align: center;
+ margin-left: 50px;
+ margin-right: 50px;
+ text-align: center;
}
/* images */
div.floatright, table.floatright {
- clear: right;
- float: right;
- position: relative;
- margin: 0 0 .5em .5em;
- border: 0;
+ clear: right;
+ float: right;
+ position: relative;
+ margin: 0 0 .5em .5em;
+ border: 0;
}
div.floatright p { font-style: italic; }
div.floatleft, table.floatleft {
- float: left;
- position: relative;
- margin: 0 .5em .5em 0;
- border: 0;
+ float: left;
+ position: relative;
+ margin: 0 .5em .5em 0;
+ border: 0;
}
div.floatleft p { font-style: italic; }
/* thumbnails */
div.thumb {
- margin-bottom: .5em;
- border-style: solid;
- border-color: white;
- width: auto;
+ margin-bottom: .5em;
+ border-style: solid;
+ border-color: white;
+ width: auto;
}
div.thumb div {
- border: 1px solid #ccc;
- padding: 3px !important;
- background-color: #f9f9f9;
- font-size: 94%;
- text-align: center;
- overflow: hidden;
+ border: 1px solid #ccc;
+ padding: 3px !important;
+ background-color: #f9f9f9;
+ font-size: 94%;
+ text-align: center;
+ overflow: hidden;
}
div.thumb div a img {
- border: 1px solid #ccc;
+ border: 1px solid #ccc;
}
div.thumb div div.thumbcaption {
- border: none;
- text-align: left;
- line-height: 1.4em;
- padding: .3em 0 .1em 0;
+ border: none;
+ text-align: left;
+ line-height: 1.4em;
+ padding: .3em 0 .1em 0;
}
div.magnify {
- float: right;
- border: none !important;
- background: none !important;
+ float: right;
+ border: none !important;
+ background: none !important;
}
div.magnify a, div.magnify img {
- display: block;
- border: none !important;
- background: none !important;
+ display: block;
+ border: none !important;
+ background: none !important;
}
div.tright {
- clear: right;
- float: right;
- border-width: .5em 0 .8em 1.4em;
+ clear: right;
+ float: right;
+ border-width: .5em 0 .8em 1.4em;
}
div.tleft {
- float: left;
- margin-right: .5em;
- border-width: .5em 1.4em .8em 0;
+ float: left;
+ margin-right: .5em;
+ border-width: .5em 1.4em .8em 0;
}
.hiddenStructure {
- display: none;
- speak: none;
+ display: none;
+ speak: none;
}
img.tex {
- vertical-align: middle;
+ vertical-align: middle;
}
span.texhtml {
- font-family: serif;
+ font-family: serif;
}
/*
@@ -480,104 +480,104 @@
*/
/* table standards */
table.rimage {
- float: right;
- position: relative;
- margin-left: 1em;
- margin-bottom: 1em;
- text-align: center;
+ float: right;
+ position: relative;
+ margin-left: 1em;
+ margin-bottom: 1em;
+ text-align: center;
}
.toccolours {
- border: 1px solid #aaa;
- background-color: #f9f9f9;
- padding: 5px;
- font-size: 95%;
+ border: 1px solid #aaa;
+ background-color: #f9f9f9;
+ padding: 5px;
+ font-size: 95%;
}
div.townBox {
- position: relative;
- float: right;
- background: white;
- margin-left: 1em;
- border: 1px solid gray;
- padding: .3em;
- width: 200px;
- overflow: hidden;
- clear: right;
+ position: relative;
+ float: right;
+ background: white;
+ margin-left: 1em;
+ border: 1px solid gray;
+ padding: .3em;
+ width: 200px;
+ overflow: hidden;
+ clear: right;
}
div.townBox dl {
- padding: 0;
- margin: 0 0 .3em;
- font-size: 96%;
+ padding: 0;
+ margin: 0 0 .3em;
+ font-size: 96%;
}
div.townBox dl dt {
- background: none;
- margin: .4em 0 0;
+ background: none;
+ margin: .4em 0 0;
}
div.townBox dl dd {
- margin: .1em 0 0 1.1em;
- background-color: #f3f3f3;
+ margin: .1em 0 0 1.1em;
+ background-color: #f3f3f3;
}
/*
** edit views etc
*/
.special li {
- line-height: 1.4em;
- margin: 0;
- padding: 0;
+ line-height: 1.4em;
+ margin: 0;
+ padding: 0;
}
/*
** RecentChanges
*/
-.pageinfo-majoredit {
- font-weight: normal; /*bold;*/
+.pageinfo-majoredit {
+ font-weight: normal; /*bold;*/
}
.wiki-summary {
- font-size: 94%;
- font-style: italic;
+ font-size: 94%;
+ font-style: italic;
}
/* Page history styling */
/* the auto-generated edit comments */
.autocomment {
- color: gray;
+ color: gray;
}
#pagehistory span.user {
- margin-left: 1.4em;
- margin-right: .4em;
+ margin-left: 1.4em;
+ margin-right: .4em;
}
#pagehistory span.minor {
- font-weight: bold;
+ font-weight: bold;
}
#pagehistory li {
- border: 1px solid white;
+ border: 1px solid white;
}
#pagehistory li.selected {
- background-color: #f9f9f9;
- border: 1px dashed #aaa;
+ background-color: #f9f9f9;
+ border: 1px dashed #aaa;
}
/*
** Diff rendering (unused)
*/
table.diff, td.diff-otitle, td.diff-ntitle {
- background-color: white;
+ background-color: white;
}
td.diff-addedline {
- background: #cfc;
- font-size: smaller;
+ background: #cfc;
+ font-size: smaller;
}
td.diff-deletedline {
- background: #ffa;
- font-size: smaller;
+ background: #ffa;
+ font-size: smaller;
}
td.diff-context {
- background: #eee;
- font-size: smaller;
+ background: #eee;
+ font-size: smaller;
}
span.diffchange {
- color: red;
- font-weight: bold;
+ color: red;
+ font-weight: bold;
}
/**
@@ -585,74 +585,74 @@
*/
/* main box */
.diff {
- margin-top: 1ex;
- margin-bottom: 0.5ex;
- background: white;
- color: black;
- border-top: 1px solid #494f5d;
- border-left: 1px solid #494f5d;
- border-bottom: 1px solid #c6d2de;
- border-right: 1px solid #c6d2de;
- padding-top: 1px;
- padding-bottom: 1px;
- padding-left: .125em;
- padding-right: .125em;
- padding: 0;
- clear: both;
+ margin-top: 1ex;
+ margin-bottom: 0.5ex;
+ background: white;
+ color: black;
+ border-top: 1px solid #494f5d;
+ border-left: 1px solid #494f5d;
+ border-bottom: 1px solid #c6d2de;
+ border-right: 1px solid #c6d2de;
+ padding-top: 1px;
+ padding-bottom: 1px;
+ padding-left: .125em;
+ padding-right: .125em;
+ padding: 0;
+ clear: both;
}
.diff .block {
- background: #ddd;
- padding-left: 1em;
+ background: #ddd;
+ padding-left: 1em;
}
/* individual blocks */
.diff .context {
- background: white;
- border: none;
+ background: white;
+ border: none;
}
/* entire difftextblock */
.difftext {
- margin-top: 0;
- margin-bottom: 0;
- background: white;
- border-top: 1px #e8e6df solid;
- border-left: 1px #e8e6df solid;
- border-bottom: 1px #d2d2d2 solid;
- border-right: 1px #b2b2b2 solid;
- padding-left: 0em;
- padding-right: 0em;
- padding-top: 0ex;
- padding-bottom: 0ex;
- clear: both;
+ margin-top: 0;
+ margin-bottom: 0;
+ background: white;
+ border-top: 1px #e8e6df solid;
+ border-left: 1px #e8e6df solid;
+ border-bottom: 1px #d2d2d2 solid;
+ border-right: 1px #b2b2b2 solid;
+ padding-left: 0em;
+ padding-right: 0em;
+ padding-top: 0ex;
+ padding-bottom: 0ex;
+ clear: both;
}
/* + - line prefix */
.diff .block tt {
- font-weight: normal;
- font-family: monospace;
- color: black;
- margin-left: 0;
- border: none;
+ font-weight: normal;
+ font-family: monospace;
+ color: black;
+ margin-left: 0;
+ border: none;
}
/* changed words */
.diff del, .diff ins {
- font-weight: bold;
- text-decoration: none;
+ font-weight: bold;
+ text-decoration: none;
}
/* blocks containing deleted or added words */
.diff .original, .diff .deleted,
.diff .final, .diff .added {
- background: white;
+ background: white;
}
/* blocks containing deleted words */
.diff .original, .diff .deleted {
- background: #fcc;
- border: none;
+ background: #fcc;
+ border: none;
}
/* blocks containing added words */
.diff .final, .diff .added {
- background: #cfc;
- border: none;
+ background: #cfc;
+ border: none;
}
/* deleted words */
@@ -665,8 +665,8 @@
*/
td.pageinfo { font-weight: bold; }
.pageinfo-minoredit, .pageinfo-authorid {
- font-size: smaller;
- font-style: oblique;
+ font-size: smaller;
+ font-style: oblique;
}
/* RssFeed */
@@ -680,34 +680,34 @@
* Calendar plugin
*/
table.cal {
- border: 1px outset gray;
- background: white;
- margin: 0.5ex 0.5em;
- padding: 1px;
- /* For Mozilla */
- empty-cells: hide;
-}
+ border: 1px outset gray;
+ background: white;
+ margin: 0.5ex 0.5em;
+ padding: 1px;
+ /* For Mozilla */
+ empty-cells: hide;
+}
/* cells */
table.cal td {
- background: white;
- text-align: right;
-}
+ background: white;
+ text-align: right;
+}
/* Month-name header */
table.cal-header { font-size: larger; }
table.cal-header tr, table.cal-header td { text-align: center; }
.cal-arrow {
- font-weight: bold;
- text-decoration: none;
+ font-weight: bold;
+ text-decoration: none;
}
/* Day-names header */
table.cal tbody tr .cal-dayname { }
.cal-dayname td {
- text-align: center;
- font-size: smaller;
- text-decoration: underline;
+ text-align: center;
+ font-size: smaller;
+ text-decoration: underline;
}
/* Individual days */
@@ -716,60 +716,60 @@
/* Today */
/* cell */
table.cal td.cal-today {
- margin: 1px;
- border: 1px solid gray;
+ margin: 1px;
+ border: 1px solid gray;
}
/* text */
table.cal td.cal-today a.cal-hide { }
-/*
+/*
** keep the whitespace in front of the ^=, hides rule from konqueror
-** this is css3, the validator doesn't like it when validating as css2
+** this is css3, the validator doesn't like it when validating as css2
*/
#bodyContent a.external,
#bodyContent a[href ^="gopher://"] {
- background: url("images/url.png") center right no-repeat;
- padding-right: 13px;
+ background: url("images/url.png") center right no-repeat;
+ padding-right: 13px;
}
#bodyContent a[href ^="https://"],
.link-https {
- background: url("images/lock_icon.png") center right no-repeat;
- padding-right: 16px;
+ background: url("images/lock_icon.png") center right no-repeat;
+ padding-right: 16px;
}
#bodyContent a[href ^="mailto:"],
.link-mailto {
- background: url("images/mail_icon.png") center right no-repeat;
- padding-right: 18px;
+ background: url("images/mail_icon.png") center right no-repeat;
+ padding-right: 18px;
}
#bodyContent a[href ^="news://"] {
- background: url("images/news_icon.png") center right no-repeat;
- padding-right: 18px;
+ background: url("images/news_icon.png") center right no-repeat;
+ padding-right: 18px;
}
#bodyContent a[href ^="ftp://"],
.link-ftp {
- background: url("images/file_icon.png") center right no-repeat;
- padding-right: 18px;
+ background: url("images/file_icon.png") center right no-repeat;
+ padding-right: 18px;
}
#bodyContent a[href ^="irc://"],
.link-irc {
- background: url("images/discussionitem_icon.png") center right no-repeat;
- padding-right: 18px;
+ background: url("images/discussionitem_icon.png") center right no-repeat;
+ padding-right: 18px;
}
/* disabl...
[truncated message content] |
|
From: <var...@us...> - 2011-03-05 17:05:39
|
Revision: 7964
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7964&view=rev
Author: vargenau
Date: 2011-03-05 17:05:30 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
No tabs
Modified Paths:
--------------
trunk/lib/AccessLog.php
trunk/lib/ArchiveCleaner.php
trunk/lib/AtomParser.php
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/Captcha.php
trunk/lib/DbSession.php
trunk/lib/DbaDatabase.php
trunk/lib/DbaListSet.php
trunk/lib/DbaPartition.php
trunk/lib/EditToolbar.php
trunk/lib/ErrorManager.php
trunk/lib/ExternalReferrer.php
trunk/lib/FileFinder.php
trunk/lib/Google.php
trunk/lib/HtmlElement.php
trunk/lib/HtmlElement5.php
trunk/lib/HtmlParser.php
trunk/lib/HttpClient.php
trunk/lib/InlineParser.php
trunk/lib/MailNotify.php
trunk/lib/PageList.php
trunk/lib/PagePerm.php
trunk/lib/PageType.php
trunk/lib/RSSWriter091.php
trunk/lib/Request.php
trunk/lib/RssParser.php
trunk/lib/RssWriter.php
trunk/lib/RssWriter2.php
trunk/lib/SemanticWeb.php
trunk/lib/SpamBlocklist.php
trunk/lib/Template.php
trunk/lib/TextSearchQuery.php
trunk/lib/Units.php
trunk/lib/WikiCallback.php
trunk/lib/WikiDB.php
trunk/lib/WikiGroup.php
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser.php
trunk/lib/WikiUserNew.php
trunk/lib/WysiwygEdit.php
trunk/lib/XmlElement.php
trunk/lib/XmlParser.php
trunk/lib/XmlRpcClient.php
trunk/lib/XmlRpcServer.php
trunk/lib/config.php
trunk/lib/diff3.php
trunk/lib/difflib.php
trunk/lib/display.php
trunk/lib/editpage.php
trunk/lib/fortune.php
trunk/lib/fpdf.php
trunk/lib/gif.php
trunk/lib/imagecache.php
trunk/lib/imdb.php
trunk/lib/install.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/pdf.php
trunk/lib/prepend.php
trunk/lib/spam_babycart.php
trunk/lib/stdlib.php
trunk/lib/upgrade.php
trunk/lib/ziplib.php
trunk/tests/CompatInfo.php
trunk/tests/unit_test_backend_cvs.php
trunk/uploads/index.php
Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/AccessLog.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -57,7 +57,7 @@
if (!$request->_dbi->isSQL()) {
trigger_error("Unsupported database backend for ACCESS_LOG_SQL.\nNeed DATABASE_TYPE=SQL or ADODB or PDO");
} else {
- global $DBParams;
+ global $DBParams;
//$this->_dbi =& $request->_dbi;
$this->logtable = (!empty($DBParams['prefix']) ? $DBParams['prefix'] : '')."accesslog";
}
@@ -126,8 +126,8 @@
if ($this->logtable) {
// mysql specific only:
return $this->read_sql("request_host=".$this->_dbi->quote($host)
- ." AND time_stamp > ". (time()-$since_minutes*60)
- ." ORDER BY time_stamp DESC");
+ ." AND time_stamp > ". (time()-$since_minutes*60)
+ ." ORDER BY time_stamp DESC");
} else {
$iter = new WikiDB_Array_generic_iter();
$logs =& $iter->_array;
@@ -160,7 +160,7 @@
$entry = new Request_AccessLogEntry($this);
$re = '/^(\S+)\s(\S+)\s(\S+)\s\[(.+?)\] "([^"]+)" (\d+) (\d+) "([^"]*)" "([^"]*)"$/';
if (preg_match($re, $s, $m)) {
- list(,$entry->host, $entry->ident, $entry->user, $entry->time,
+ list(,$entry->host, $entry->ident, $entry->user, $entry->time,
$entry->request, $entry->status, $entry->size,
$entry->referer, $entry->user_agent) = $m;
}
@@ -176,8 +176,8 @@
return $this->sqliter->next();
}
function _read_sql_query($where='') {
- global $request;
- $dbh =& $request->_dbi;
+ global $request;
+ $dbh =& $request->_dbi;
$log_tbl =& $this->logtable;
return $dbh->genericSqlIter("SELECT *,request_uri as request,request_time as time,remote_user as user,"
."remote_host as host,agent as user_agent"
@@ -187,8 +187,8 @@
/* done in request->finish() before the db is closed */
function write_sql() {
- global $request;
- $dbh =& $request->_dbi;
+ global $request;
+ $dbh =& $request->_dbi;
if (isset($this->entries) and $dbh and $dbh->isOpen())
foreach ($this->entries as $entry) {
$entry->write_sql();
@@ -236,7 +236,7 @@
$this->logfile = $accesslog->logfile;
$this->time = time();
$this->status = 200; // see setStatus()
- $this->size = 0; // see setSize()
+ $this->size = 0; // see setSize()
}
/**
@@ -350,7 +350,7 @@
/* This is better been done by apache mod_log_sql */
/* If ACCESS_LOG_SQL & 2 we do write it by our own */
function write_sql() {
- global $request;
+ global $request;
$dbh =& $request->_dbi;
if ($dbh and $dbh->isOpen() and $this->_accesslog->logtable) {
@@ -365,7 +365,7 @@
if (!empty($args['pref']['passwd2'])) $args['pref']['passwd2'] = '<not displayed>';
$this->request_args = substr(serialize($args),0,254); // if VARCHAR(255) is used.
} else {
- $this->request_args = $request->get('QUERY_STRING');
+ $this->request_args = $request->get('QUERY_STRING');
}
$this->request_method = $request->get('REQUEST_METHOD');
$this->request_uri = $request->get('REQUEST_URI');
Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/ArchiveCleaner.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -1,19 +1,19 @@
-<?php
+<?php
// $Id$
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
*
* This file is part of PhpWiki.
- *
+ *
* PhpWiki is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* PhpWiki is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with PhpWiki; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -24,7 +24,7 @@
function ArchiveCleaner ($expire_params) {
$this->expire_params = $expire_params;
}
-
+
function isMergeable($revision) {
if ( ! $revision->get('is_minor_edit') )
return false;
@@ -43,20 +43,20 @@
while ($page = $iter->next())
$this->cleanPageRevisions($page);
}
-
+
function cleanPageRevisions($page) {
$INFINITY = 0x7fffffff;
$expire = &$this->expire_params;
foreach (array('major', 'minor', 'author') as $class)
$counter[$class] = new ArchiveCleaner_Counter($expire[$class]);
- // shortcut to keep all
- if (($counter['minor']->min_keep == $INFINITY)
+ // shortcut to keep all
+ if (($counter['minor']->min_keep == $INFINITY)
and ($counter['major']->min_keep == $INFINITY))
return;
$authors_seen = array();
-
+
$current = $page->getCurrentRevision(false);
for ( $revision = $page->getRevisionBefore($current,false);
@@ -117,11 +117,11 @@
if ($this->min_age > $this->max_age)
$this->min_age = $this->max_age;
-
+
$this->now = time();
$this->count = 0;
$this->previous_supplanted = false;
-
+
}
function computeAge($revision) {
@@ -148,14 +148,14 @@
$this->previous_supplanted = $supplanted;
return ($this->now - $supplanted) / (24 * 3600);
}
-
+
function keep($revision) {
- $INFINITY = 0x7fffffff;
- if ($this->min_keep == $INFINITY)
- return true;
+ $INFINITY = 0x7fffffff;
+ if ($this->min_keep == $INFINITY)
+ return true;
$count = ++$this->count;
$age = $this->computeAge($revision);
-
+
if ($count > $this->max_keep)
return false;
if ($age <= $this->min_age || $count <= $this->min_keep)
@@ -170,5 +170,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/AtomParser.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -23,7 +23,7 @@
* This class is a poor-man Atom parser, it does no validation of the feed.
* The content of an entry ("payload") is not parsed but rather returned "as-is",
* as its format can be text, html or xhtml.
- *
+ *
* @author: Sébastien Le Callonnec
*/
require_once('lib/XmlParser.php');
@@ -44,7 +44,7 @@
var $icon = '';
var $rights = '';
var $logo = '';
-
+
var $categories = array();
var $authors = array();
@@ -64,7 +64,7 @@
var $id = '';
var $links = array();
var $summary = '';
-
+
var $inside_content = false;
var $content = '';
@@ -165,7 +165,7 @@
function cdata($parser, $data) {
global $current_tag, $current_attrs;
-
+
if ($this->inside_content) {
$this->content .= $data;
} else {
@@ -244,7 +244,7 @@
return trim($element);
}
}
-
+
function serialize_tag($tag_name, $attributes) {
$tag = "<" . $tag_name;
foreach ($attributes as $k => $v) {
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/BlockParser.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -93,11 +93,11 @@
* @return object A RegexpSet_match object, or false if no match.
*/
function match ($text) {
- if (!is_string($text)) return false;
+ if (!is_string($text)) return false;
if (! preg_match($this->_re, $text, $m)) {
return false;
}
-
+
$match = new AnchoredRegexpSet_match;
$match->postmatch = substr($text, strlen($m[0]));
$match->match = $m[1];
@@ -136,7 +136,7 @@
if (! preg_match($pat, $text, $m)) {
return false;
}
-
+
$match = new AnchoredRegexpSet_match;
$match->postmatch = substr($text, strlen($m[0]));
$match->match = $m[1];
@@ -146,11 +146,11 @@
}
-
+
class BlockParser_Input {
function BlockParser_Input ($text) {
-
+
// Expand leading tabs.
// FIXME: do this better.
//
@@ -182,14 +182,14 @@
}
return $this->_atSpace;
}
-
+
function currentLine () {
if ($this->_pos >= count($this->_lines)) {
return false;
}
return $this->_lines[$this->_pos];
}
-
+
function nextLine () {
$this->_atSpace = $this->_lines[$this->_pos++] === '';
if ($this->_pos >= count($this->_lines)) {
@@ -202,7 +202,7 @@
$this->_atSpace = ($this->_lines[$this->_pos] === '');
$this->_pos++;
}
-
+
function getPos () {
return array($this->_pos, $this->_atSpace);
}
@@ -225,7 +225,7 @@
else
return "<EOF>";
}
-
+
function _debug ($tab, $msg) {
//return ;
$where = $this->where();
@@ -233,7 +233,7 @@
printXML(HTML::div("$tab $msg: at: '",
HTML::tt($where),
"'"));
- flush();
+ flush();
}
}
@@ -271,7 +271,7 @@
else
return $this->_atSpace;
}
-
+
function currentLine () {
return $this->_line;
}
@@ -296,7 +296,7 @@
function advance () {
$this->nextLine();
}
-
+
function getPos () {
return array($this->_line, $this->_atSpace, $this->_input->getPos());
}
@@ -306,7 +306,7 @@
$this->_atSpace = $pos[1];
$this->_input->setPos($pos[2]);
}
-
+
function getPrefix () {
assert ($this->_line !== false);
$line = $this->_input->currentLine();
@@ -322,8 +322,8 @@
return $this->_input->where();
}
}
-
+
class Block_HtmlElement extends HtmlElement
{
function Block_HtmlElement($tag /*, ... */) {
@@ -335,7 +335,7 @@
}
class ParsedBlock extends Block_HtmlElement {
-
+
function ParsedBlock (&$input, $tag = 'div', $attr = false) {
$this->Block_HtmlElement($tag, $attr);
$this->_initBlockTypes();
@@ -362,22 +362,22 @@
// FIXME: hackish. This should only be called once.
function _initBlockTypes () {
- // better static or global?
- static $_regexpset, $_block_types;
+ // better static or global?
+ static $_regexpset, $_block_types;
- if (!is_object($_regexpset)) {
+ if (!is_object($_regexpset)) {
// nowiki_wikicreole must be before template_plugin
- $Block_types = array
- ('nowiki_wikicreole', 'template_plugin', 'placeholder', 'oldlists', 'list', 'dl',
+ $Block_types = array
+ ('nowiki_wikicreole', 'template_plugin', 'placeholder', 'oldlists', 'list', 'dl',
'table_dl', 'table_wikicreole', 'table_mediawiki',
'blockquote', 'heading', 'heading_wikicreole', 'hr', 'pre',
'email_blockquote', 'wikicreole_indented',
- 'plugin', 'plugin_wikicreole', 'p');
+ 'plugin', 'plugin_wikicreole', 'p');
// insert it before p!
if (ENABLE_MARKUP_DIVSPAN) {
- array_pop($Block_types);
- $Block_types[] = 'divspan';
- $Block_types[] = 'p';
+ array_pop($Block_types);
+ $Block_types[] = 'divspan';
+ $Block_types[] = 'p';
}
foreach ($Block_types as $type) {
$class = "Block_$type";
@@ -389,7 +389,7 @@
$_regexpset = $this->_regexpset;
$_block_types = $this->_block_types;
unset($Block_types);
- } else {
+ } else {
$this->_regexpset = $_regexpset;
$this->_block_types = $_block_types;
}
@@ -409,9 +409,9 @@
$block = clone($this->_block_types[$m->regexp_ind]);
if (DEBUG & _DEBUG_PARSER)
$input->_debug('>', get_class($block));
-
+
if ($block->_match($input, $m)) {
- //$block->_text = $line;
+ //$block->_text = $line;
if (DEBUG & _DEBUG_PARSER)
$input->_debug('<', get_class($block));
$tight_bottom = ! $input->skipSpace();
@@ -500,12 +500,12 @@
'blockquote');
return true;
}
-
+
function merge ($nextBlock) {
if (get_class($nextBlock) == get_class($this)) {
assert ($nextBlock->_depth < $this->_depth);
$nextBlock->_element->unshiftContent($this->_element);
- if (!empty($this->_tight_top))
+ if (!empty($this->_tight_top))
$nextBlock->_tight_top = $this->_tight_top;
return $nextBlock;
}
@@ -535,7 +535,7 @@
if (preg_match('/[*#+-o]/', $input->getPrefix())) {
return false;
}
-
+
$prefix = $m->match;
$indent = sprintf("\\ {%d}", strlen($prefix));
@@ -619,13 +619,13 @@
{
var $nrows;
var $ncols;
-
+
function Block_table_dl_defn ($term, $defn) {
$this->XmlContent();
if (!is_array($defn))
$defn = $defn->getContent();
- $this->_next_tight_top = false; // value irrelevant - gets fixed later
+ $this->_next_tight_top = false; // value irrelevant - gets fixed later
$this->_ncols = $this->_ComputeNcols($defn);
$this->_nrows = 0;
@@ -645,9 +645,9 @@
function setTightness($tight_top, $tight_bot) {
$this->_tight_top = $tight_top;
- $this->_tight_bot = $tight_bot;
+ $this->_tight_bot = $tight_bot;
}
-
+
function _addToRow ($item) {
if (empty($this->_accum)) {
$this->_accum = HTML::td();
@@ -663,7 +663,7 @@
$row->setTightness($this->_next_tight_top, $tight_bottom);
$this->_next_tight_top = $tight_bottom;
-
+
$this->pushContent($row);
$this->_accum = false;
$this->_nrows++;
@@ -675,7 +675,7 @@
return;
$this->_flushRow($table_rows[0]->_tight_top);
-
+
foreach ($table_rows as $subdef) {
$this->pushContent($subdef);
$this->_nrows += $subdef->nrows();
@@ -690,7 +690,7 @@
else
$first_row->unshiftContent($th);
}
-
+
function _ComputeNcols ($defn) {
$ncols = 2;
foreach ($defn as $item) {
@@ -722,17 +722,17 @@
}
function & firstTR() {
- $first = &$this->_content[0];
- if (isa($first, 'Block_table_dl_defn'))
- return $first->firstTR();
- return $first;
+ $first = &$this->_content[0];
+ if (isa($first, 'Block_table_dl_defn'))
+ return $first->firstTR();
+ return $first;
}
function & lastTR() {
- $last = &$this->_content[$this->_nrows - 1];
- if (isa($last, 'Block_table_dl_defn'))
- return $last->lastTR();
- return $last;
+ $last = &$this->_content[$this->_nrows - 1];
+ if (isa($last, 'Block_table_dl_defn'))
+ return $last->lastTR();
+ return $last;
}
function setWidth ($ncols) {
@@ -774,7 +774,7 @@
function _setTightness($top, $bot) {
$this->_content[0]->setTightness($top, $bot);
}
-
+
function finish () {
$defs = &$this->_content;
@@ -782,7 +782,7 @@
$ncols = 0;
foreach ($defs as $defn)
$ncols = max($ncols, $defn->ncols());
-
+
foreach ($defs as $key => $defn)
$defs[$key]->setWidth($ncols);
@@ -807,8 +807,8 @@
if (!preg_match('/[*#;]*$/A', $input->getPrefix())) {
return false;
}
-
+
$prefix = $m->match;
$oldindent = '[*#;](?=[#*]|;.*:.*\S)';
$newindent = sprintf('\\ {%d}', strlen($prefix));
@@ -873,7 +873,7 @@
*/
echo 'count($this->_content): ', count($this->_content),"\n";
echo "\$this->_content[0]: "; var_dump ($this->_content[0]);
-
+
for ($i=1; $i < min(5, count($this->_content)); $i++) {
$c =& $this->_content[$i];
echo '$this->_content[',$i,"]: \n";
@@ -918,26 +918,26 @@
}
}
$input->advance();
-
- if ($m->match == '<nowiki>')
- $text = join("<br>\n", $text);
- else
+
+ if ($m->match == '<nowiki>')
+ $text = join("<br>\n", $text);
+ else
$text = join("\n", $text);
-
+
// FIXME: no <img>, <big>, <small>, <sup>, or <sub>'s allowed
// in a <pre>.
if ($m->match == '<pre>') {
$text = TransformInline($text);
}
- if ($m->match == '<noinclude>') {
- $text = TransformText($text);
- $this->_element = new Block_HtmlElement('div', false, $text);
- } else if ($m->match == '<nowiki>') {
+ if ($m->match == '<noinclude>') {
+ $text = TransformText($text);
+ $this->_element = new Block_HtmlElement('div', false, $text);
+ } else if ($m->match == '<nowiki>') {
$text = TransformInlineNowiki($text);
- $this->_element = new Block_HtmlElement('p', false, $text);
- } else {
+ $this->_element = new Block_HtmlElement('p', false, $text);
+ } else {
$this->_element = new Block_HtmlElement('pre', false, $text);
- }
+ }
return true;
}
}
@@ -1019,7 +1019,7 @@
}
$input->advance();
- $this->_element = new Cached_PluginInvocation($pi);
+ $this->_element = new Cached_PluginInvocation($pi);
return true;
}
}
@@ -1207,7 +1207,7 @@
{
var $_attr = array('class' => 'mail-style-quote');
var $_re = '>\ ?';
-
+
function _match (&$input, $m) {
//$indent = str_replace(' ', '\\ ', $m->match) . '|>$';
$indent = $this->_re;
@@ -1244,14 +1244,14 @@
class Block_heading extends BlockMarkup
{
var $_re = '!{1,3}';
-
+
function _match (&$input, $m) {
$tag = "h" . (5 - strlen($m->match));
$text = TransformInline(trim($m->postmatch));
$input->advance();
$this->_element = new Block_HtmlElement($tag, false, $text);
-
+
return true;
}
}
@@ -1259,7 +1259,7 @@
class Block_heading_wikicreole extends BlockMarkup
{
var $_re = '={2,6}';
-
+
function _match (&$input, $m) {
$tag = "h" . strlen($m->match);
// Remove spaces
@@ -1270,7 +1270,7 @@
$input->advance();
$this->_element = new Block_HtmlElement($tag, false, $text);
-
+
return true;
}
}
@@ -1315,12 +1315,12 @@
var $_re = '<(?im)(?: div|span)(?:[^>]*)?>';
function _match (&$input, $m) {
- if (substr($m->match,1,4) == 'span') {
- $tag = 'span';
- } else {
- $tag = 'div';
- }
- // without last >
+ if (substr($m->match,1,4) == 'span') {
+ $tag = 'span';
+ } else {
+ $tag = 'div';
+ }
+ // without last >
$argstr = substr(trim(substr($m->match,strlen($tag)+1)),0,-1);
$pos = $input->getPos();
$pi = $content = $m->postmatch;
@@ -1339,22 +1339,22 @@
$input->advance();
if (strstr($content, "\n"))
$content = TransformText($content);
- else
+ else
$content = TransformInline($content);
if (!$argstr)
$args = false;
else {
$args = array();
while (preg_match("/(\w+)=(.+)/", $argstr, $m)) {
- $k = $m[1]; $v = $m[2];
- if (preg_match("/^\"(.+?)\"(.*)$/", $v, $m)) {
- $v = $m[1];
- $argstr = $m[2];
- } else {
- preg_match("/^(\s+)(.*)$/", $v, $m);
- $v = $m[1];
- $argstr = $m[2];
- }
+ $k = $m[1]; $v = $m[2];
+ if (preg_match("/^\"(.+?)\"(.*)$/", $v, $m)) {
+ $v = $m[1];
+ $argstr = $m[2];
+ } else {
+ preg_match("/^(\s+)(.*)$/", $v, $m);
+ $v = $m[1];
+ $argstr = $m[2];
+ }
if (trim($k) and trim($v)) $args[$k] = $v;
}
}
@@ -1382,7 +1382,7 @@
}
// WikiCreole
/*if (!empty($markup) && $markup == 3) {
- $text = ConvertFromCreole($text);
+ $text = ConvertFromCreole($text);
}*/
// Expand leading tabs.
$text = expand_tabs($text);
@@ -1413,5 +1413,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/CachedMarkup.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -27,12 +27,12 @@
function CacheableMarkup($content, $basepage) {
$this->_basepage = $basepage;
- $this->_buf = '';
- $this->_content = array();
- $this->_append($content);
- if ($this->_buf != '')
- $this->_content[] = $this->_buf;
- unset($this->_buf);
+ $this->_buf = '';
+ $this->_content = array();
+ $this->_append($content);
+ if ($this->_buf != '')
+ $this->_content[] = $this->_buf;
+ unset($this->_buf);
}
function pack() {
@@ -88,15 +88,15 @@
E_USER_WARNING);
return false;
}
-
+
/** Get names of wikipages linked to.
*
* @return array of hashes { linkto=>pagename, relation=>pagename }
*/
function getWikiPageLinks() {
- $links = array();
- foreach ($this->_content as $item) {
- if (!isa($item, 'Cached_DynamicContent'))
+ $links = array();
+ foreach ($this->_content as $item) {
+ if (!isa($item, 'Cached_DynamicContent'))
continue;
if (!($item_links = $item->getWikiPageLinks($this->_basepage)))
continue;
@@ -104,8 +104,8 @@
}
// array_unique has a bug with hashes!
// set_links checks for duplicates, array_merge does not
- //return array_unique($links);
- return $links;
+ //return array_unique($links);
+ return $links;
}
/** Get link info.
@@ -116,63 +116,63 @@
* Returns an array of hashes.
*/
function getLinkInfo() {
- $link = array();
- foreach ($this->_content as $link) {
- if (! isa($link, 'Cached_Link'))
- continue;
- $info = $link->getLinkInfo($this->_basepage);
- $links[$info->href] = $info;
- }
- return array_values($links);
+ $link = array();
+ foreach ($this->_content as $link) {
+ if (! isa($link, 'Cached_Link'))
+ continue;
+ $info = $link->getLinkInfo($this->_basepage);
+ $links[$info->href] = $info;
}
+ return array_values($links);
+ }
function _append($item) {
- if (is_array($item)) {
- foreach ($item as $subitem)
- $this->_append($subitem);
- }
- elseif (!is_object($item)) {
- $this->_buf .= $this->_quote((string) $item);
- }
- elseif (isa($item, 'Cached_DynamicContent')) {
- if ($this->_buf) {
- $this->_content[] = $this->_buf;
- $this->_buf = '';
- }
- $this->_content[] = $item;
- }
- elseif (isa($item, 'XmlElement')) {
- if ($item->isEmpty()) {
- $this->_buf .= $item->emptyTag();
- }
- else {
- $this->_buf .= $item->startTag();
- foreach ($item->getContent() as $subitem)
- $this->_append($subitem);
- $this->_buf .= "</$item->_tag>";
+ if (is_array($item)) {
+ foreach ($item as $subitem)
+ $this->_append($subitem);
+ }
+ elseif (!is_object($item)) {
+ $this->_buf .= $this->_quote((string) $item);
+ }
+ elseif (isa($item, 'Cached_DynamicContent')) {
+ if ($this->_buf) {
+ $this->_content[] = $this->_buf;
+ $this->_buf = '';
+ }
+ $this->_content[] = $item;
+ }
+ elseif (isa($item, 'XmlElement')) {
+ if ($item->isEmpty()) {
+ $this->_buf .= $item->emptyTag();
+ }
+ else {
+ $this->_buf .= $item->startTag();
+ foreach ($item->getContent() as $subitem)
+ $this->_append($subitem);
+ $this->_buf .= "</$item->_tag>";
if (!$this->getDescription() and $item->getTag() == 'p') {
// performance: when is this really needed?
$this->_glean_description($item->asString());
}
- }
- if (!$item->isInlineElement())
- $this->_buf .= "\n";
- }
- elseif (isa($item, 'XmlContent')) {
- foreach ($item->getContent() as $item)
- $this->_append($item);
- }
- elseif (method_exists($item, 'asXML')) {
- $this->_buf .= $item->asXML();
- }
- elseif (method_exists($item, 'asString')) {
- $this->_buf .= $this->_quote($item->asString());
- }
- else {
- $this->_buf .= sprintf("==Object(%s)==", get_class($item));
- }
+ }
+ if (!$item->isInlineElement())
+ $this->_buf .= "\n";
}
+ elseif (isa($item, 'XmlContent')) {
+ foreach ($item->getContent() as $item)
+ $this->_append($item);
+ }
+ elseif (method_exists($item, 'asXML')) {
+ $this->_buf .= $item->asXML();
+ }
+ elseif (method_exists($item, 'asString')) {
+ $this->_buf .= $this->_quote($item->asString());
+ }
+ else {
+ $this->_buf .= sprintf("==Object(%s)==", get_class($item));
+ }
+ }
function _glean_description($text) {
static $two_sentences;
@@ -181,7 +181,7 @@
. ".*"
. "[.?!][\")]*\s*[\"(]*([[:upper:])]|$)";
}
-
+
if (!isset($this->_description) and preg_match("/$two_sentences/sx", $text))
$this->_description = preg_replace("/\s*\n\s*/", " ", trim($text));
}
@@ -204,12 +204,12 @@
function getDescription () {
return isset($this->_description) ? $this->_description : '';
}
-
+
function asXML () {
- $xml = '';
+ $xml = '';
$basepage = $this->_basepage;
-
- foreach ($this->_content as $item) {
+
+ foreach ($this->_content as $item) {
if (is_string($item)) {
$xml .= $item;
}
@@ -224,15 +224,15 @@
else {
$xml .= $item->asXML();
}
- }
- return $xml;
}
+ return $xml;
+ }
function printXML () {
$basepage = $this->_basepage;
// _content might be changed from a plugin (CreateToc)
- for ($i=0; $i < count($this->_content); $i++) {
- $item = $this->_content[$i];
+ for ($i=0; $i < count($this->_content); $i++) {
+ $item = $this->_content[$i];
if (is_string($item)) {
print $item;
}
@@ -240,8 +240,8 @@
check_php_version(5)
? 'Cached_DynamicContent'
: 'cached_dynamiccontent'))
- { // give the content the chance to know about itself or even
- // to change itself
+ { // give the content the chance to know about itself or even
+ // to change itself
$val = $item->expand($basepage, $this);
if ($val) $val->printXML();
else trigger_error('empty item ' . print_r($item, true));
@@ -249,8 +249,8 @@
else {
$item->printXML();
}
- }
}
+ }
}
/**
@@ -262,7 +262,7 @@
class Cached_DynamicContent {
function cache(&$cache) {
- $cache[] = $this;
+ $cache[] = $this;
}
function expand($basepage, &$obj) {
@@ -276,18 +276,18 @@
class XmlRpc_LinkInfo {
function XmlRpc_LinkInfo($page, $type, $href, $relation = '') {
- $this->page = $page;
- $this->type = $type;
- $this->href = $href;
- $this->relation = $relation;
- //$this->pageref = str_replace("/RPC2.php", "/index.php", $href);
+ $this->page = $page;
+ $this->type = $type;
+ $this->href = $href;
+ $this->relation = $relation;
+ //$this->pageref = str_replace("/RPC2.php", "/index.php", $href);
}
}
class Cached_Link extends Cached_DynamicContent {
function isInlineElement() {
- return true;
+ return true;
}
/** Get link info (for XML-RPC support)
@@ -296,17 +296,17 @@
* (See http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=WikiRPCInterface)
*/
function getLinkInfo($basepage) {
- return new XmlRpc_LinkInfo($this->_getName($basepage),
+ return new XmlRpc_LinkInfo($this->_getName($basepage),
$this->_getType(),
$this->_getURL($basepage),
$this->_getRelation($basepage));
}
-
+
function _getURL($basepage) {
- return $this->_url;
+ return $this->_url;
}
function __getRelation($basepage) {
- return $this->_relation;
+ return $this->_relation;
}
}
/*
@@ -315,55 +315,55 @@
*/
class Cached_InlinedImage extends Cached_DynamicContent {
function isInlineElement() {
- return true;
+ return true;
}
function _getURL($basepage) {
- return $this->_url;
+ return $this->_url;
}
// TODO: fix interwiki inline links in case of static dumps
function expand($basepage, &$markup) {
- global $WikiTheme;
- $this->_basepage = $basepage;
- $label = isset($this->_label) ? $this->_label : false;
- if ($WikiTheme->DUMP_MODE) {
+ global $WikiTheme;
+ $this->_basepage = $basepage;
+ $label = isset($this->_label) ? $this->_label : false;
+ if ($WikiTheme->DUMP_MODE) {
// In case of static dumps we need to check if we should
// inline the image or not: external: keep link, internal: copy locally
- return LinkImage($label);
- } else {
- return LinkImage($label);
- }
+ return LinkImage($label);
+ } else {
+ return LinkImage($label);
}
+ }
}
class Cached_WikiLink extends Cached_Link {
function Cached_WikiLink ($page, $label = false, $anchor = false) {
- $this->_page = $page;
- /* ":DontStoreLink" */
- if (substr($this->_page,0,1) == ':') {
- $this->_page = substr($this->_page,1);
- $this->_nolink = true;
- }
+ $this->_page = $page;
+ /* ":DontStoreLink" */
+ if (substr($this->_page,0,1) == ':') {
+ $this->_page = substr($this->_page,1);
+ $this->_nolink = true;
+ }
if ($anchor)
$this->_anchor = $anchor;
if ($label and $label != $page)
$this->_label = $label;
- $this->_basepage = false;
+ $this->_basepage = false;
}
function _getType() {
return 'internal';
}
-
+
function getPagename($basepage) {
$page = new WikiPageName($this->_page, $basepage);
- if ($page->isValid()) return $page->name;
- else return false;
+ if ($page->isValid()) return $page->name;
+ else return false;
}
function getWikiPageLinks($basepage) {
if ($basepage == '') return false;
- if (isset($this->_nolink)) return false;
+ if (isset($this->_nolink)) return false;
if ($link = $this->getPagename($basepage))
return array(array('linkto' => $link));
else
@@ -371,41 +371,41 @@
}
function _getName($basepage) {
- return $this->getPagename($basepage);
+ return $this->getPagename($basepage);
}
function _getURL($basepage) {
- return WikiURL($this->getPagename($basepage));
- //return WikiURL($this->getPagename($basepage), false, 'abs_url');
+ return WikiURL($this->getPagename($basepage));
+ //return WikiURL($this->getPagename($basepage), false, 'abs_url');
}
function expand($basepage, &$markup) {
- global $WikiTheme;
- $this->_basepage = $basepage;
- $label = isset($this->_label) ? $this->_label : false;
- $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
+ global $WikiTheme;
+ $this->_basepage = $basepage;
+ $label = isset($this->_label) ? $this->_label : false;
+ $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
$page = new WikiPageName($this->_page, $basepage, $anchor);
- if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
- if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
- return HTML($label ? $label : $page->getName());
- }
+ if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
+ if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+ return HTML($label ? $label : $page->getName());
+ }
if ($page->isValid()) return WikiLink($page, 'auto', $label);
- else return HTML($label);
+ else return HTML($label);
}
function asXML() {
- global $WikiTheme;
- $label = isset($this->_label) ? $this->_label : false;
- $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
- //TODO: need basepage for subpages like /Remove (within CreateTOC)
+ global $WikiTheme;
+ $label = isset($this->_label) ? $this->_label : false;
+ $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
+ //TODO: need basepage for subpages like /Remove (within CreateTOC)
$page = new WikiPageName($this->_page, $this->_basepage, $anchor);
- if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
- if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
- return $label ? $label : $page->getName();
- }
- $link = WikiLink($page, 'auto', $label);
- return $link->asXML();
+ if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+ if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+ return $label ? $label : $page->getName();
}
+ $link = WikiLink($page, 'auto', $label);
+ return $link->asXML();
+ }
function asString() {
if (isset($this->_label))
@@ -417,54 +417,54 @@
class Cached_WikiLinkIfKnown extends Cached_WikiLink
{
function Cached_WikiLinkIfKnown ($moniker) {
- $this->_page = $moniker;
+ $this->_page = $moniker;
}
function expand($basepage, &$markup) {
- global $WikiTheme;
- if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
- if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
- return HTML($label ? $label : $page->getName());
- }
+ global $WikiTheme;
+ if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+ if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+ return HTML($label ? $label : $page->getName());
+ }
return WikiLink($this->_page, 'if_known');
}
-}
+}
class Cached_SpellCheck extends Cached_WikiLink
{
function Cached_SpellCheck ($word, $suggs) {
- $this->_page = $word;
- $this->suggestions = $suggs;
+ $this->_page = $word;
+ $this->suggestions = $suggs;
}
function expand($basepage, &$markup) {
$link = HTML::a(array('class' => 'spell-wrong',
- 'title' => 'SpellCheck: '.join(', ', $this->suggestions),
- 'name' => $this->_page),
- $this->_page);
+ 'title' => 'SpellCheck: '.join(', ', $this->suggestions),
+ 'name' => $this->_page),
+ $this->_page);
return $link;
}
-}
-
+}
+
class Cached_PhpwikiURL extends Cached_DynamicContent
{
function Cached_PhpwikiURL ($url, $label) {
- $this->_url = $url;
+ $this->_url = $url;
if ($label)
$this->_label = $label;
}
function isInlineElement() {
- return true;
+ return true;
}
function expand($basepage, &$markup) {
- global $WikiTheme;
+ global $WikiTheme;
$label = isset($this->_label) ? $this->_label : false;
- if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
- if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
- return HTML($label ? $label : $page->getName());
- }
+ if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+ if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+ return HTML($label ? $label : $page->getName());
+ }
return LinkPhpwikiURL($this->_url, $label, $basepage);
}
@@ -479,7 +479,7 @@
return $this->_label;
return $this->_url;
}
-}
+}
/*
* Relations (::) are named links to pages.
@@ -494,21 +494,21 @@
class Cached_SemanticLink extends Cached_WikiLink {
function Cached_SemanticLink ($url, $label=false) {
- $this->_url = $url;
+ $this->_url = $url;
if ($label && $label != $url)
$this->_label = $label;
$this->_expandurl($this->_url);
}
function isInlineElement() {
- return true;
+ return true;
}
function getPagename($basepage) {
- if (!isset($this->_page)) return false;
- $page = new WikiPageName($this->_page, $basepage);
- if ($page->isValid()) return $page->name;
- else return false;
+ if (!isset($this->_page)) return false;
+ $page = new WikiPageName($this->_page, $basepage);
+ if ($page->isValid()) return $page->name;
+ else return false;
}
/* Add relation to the link table.
@@ -516,14 +516,14 @@
*/
function getWikiPageLinks($basepage) {
if ($basepage == '') return false;
- if (!isset($this->_page) and isset($this->_attribute)) {
+ if (!isset($this->_page) and isset($this->_attribute)) {
// An attribute: we store it in the basepage now, to fill the cache for page->save
// TODO: side-effect free query
$page = $GLOBALS['request']->getPage($basepage);
$page->setAttribute($this->_relation, $this->_attribute);
$this->_page = $basepage;
return array(array('linkto' => '', 'relation' => $this->_relation));
- }
+ }
if ($link = $this->getPagename($basepage))
return array(array('linkto' => $link, 'relation' => $this->_relation));
else
@@ -535,67 +535,67 @@
if (!preg_match('/^ ([^:]+) (:[:=]) (.+) $/x', $url, $m)) {
return HTML::span(array('class' => 'error'), _("BAD semantic relation link"));
}
- $this->_relation = urldecode($m[1]);
+ $this->_relation = urldecode($m[1]);
$is_attribute = ($m[2] == ':=');
if ($is_attribute) {
$this->_attribute = urldecode($m[3]);
- // since this stored in the markup cache, we are extra sensible
- // not to store false empty stuff.
- $units = new Units();
+ // since this stored in the markup cache, we are extra sensible
+ // not to store false empty stuff.
+ $units = new Units();
if (!DISABLE_UNITS and !$units->errcode)
- {
- $this->_attribute_base = $units->Definition($this->_attribute);
- $this->_unit = $units->baseunit($this->_attribute);
- }
+ {
+ $this->_attribute_base = $units->Definition($this->_attribute);
+ $this->_unit = $units->baseunit($this->_attribute);
+ }
} else {
- $this->_page = urldecode($m[3]);
+ $this->_page = urldecode($m[3]);
}
- return $m;
+ return $m;
}
function _expand($url, $label = false) {
- global $WikiTheme;
- $m = $this->_expandurl($url);
+ global $WikiTheme;
+ $m = $this->_expandurl($url);
$class = 'wiki';
// do not link to the attribute value, but to the attribute
$is_attribute = ($m[2] == ':=');
- if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
- if (isset($this->_page) and !in_array($this->_page, $WikiTheme->VALID_LINKS))
- return HTML($label ? $label : ($is_attribute ? $this->_relation : $this->_page));
- }
- if ($is_attribute)
- $title = isset($this->_attribute_base)
- ? sprintf(_("Attribute %s, base value: %s"), $this->_relation, $this->_attribute_base)
- : sprintf(_("Attribute %s, value: %s"), $this->_relation, $this->_attribute);
+ if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+ if (isset($this->_page) and !in_array($this->_page, $WikiTheme->VALID_LINKS))
+ return HTML($label ? $label : ($is_attribute ? $this->_relation : $this->_page));
+ }
+ if ($is_attribute)
+ $title = isset($this->_attribute_base)
+ ? sprintf(_("Attribute %s, base value: %s"), $this->_relation, $this->_attribute_base)
+ : sprintf(_("Attribute %s, value: %s"), $this->_relation, $this->_attribute);
if ($label) {
return HTML::span
- (
- HTML::a(array('href' => WikiURL($is_attribute ? $this->_relation : $this->_page),
- 'class' => "wiki ".($is_attribute ? "attribute" : "relation"),
- 'title' => $is_attribute
- ? $title
- : sprintf(_("Relation %s to page %s"), $this->_relation, $this->_page)),
- $label)
- );
+ (
+ HTML::a(array('href' => WikiURL($is_attribute ? $this->_relation : $this->_page),
+ 'class' => "wiki ".($is_attribute ? "attribute" : "relation"),
+ 'title' => $is_attribute
+ ? $title
+ : sprintf(_("Relation %s to page %s"), $this->_relation, $this->_page)),
+ $label)
+ );
} elseif ($is_attribute) {
return HTML::span
- (
- HTML::a(array('href' => WikiURL($this->_relation),
- 'class' => "wiki attribute",
- 'title' => $title),
- $url)
- );
+ (
+ HTML::a(array('href' => WikiURL($this->_relation),
+ 'class' => "wiki attribute",
+ 'title' => $title),
+ $url)
+ );
} else {
return HTML::span
- (
- HTML::a(array('href' => WikiURL($this->_relation),
- 'class' => "wiki relation"),
- $this->_relation),
- HTML::span(array('class'=>'relation-symbol'), $m[2]),
- HTML::a(array('href' => WikiURL($this->_page),
- 'class' => "wiki"),
- $this->_page)
- );
+ (
+ HTML::a(array('href' => WikiURL($this->_relation),
+ 'class' => "wiki relation"),
+ $this->_relation),
+ HTML::span(array('class'=>'relation-symbol'), $m[2]),
+ HTML::a(array('href' => WikiURL($this->_page),
+ 'class' => "wiki"),
+ $this->_page)
+ );
}
}
@@ -623,8 +623,8 @@
class Cached_SearchHighlight extends Cached_DynamicContent
{
function Cached_SearchHighlight ($word, $engine) {
- $this->_word = $word;
- $this->engine = $engine;
+ $this->_word = $word;
+ $this->engine = $engine;
}
function expand($basepage, &$markup) {
@@ -632,12 +632,12 @@
'title' => _("Found by ") . $this->engine),
$this->_word);
}
-}
-
+}
+
class Cached_ExternalLink extends Cached_Link {
function Cached_ExternalLink($url, $label=false) {
- $this->_url = $url;
+ $this->_url = $url;
if ($label && $label != $url)
$this->_label = $label;
}
@@ -645,17 +645,17 @@
function _getType() {
return 'external';
}
-
+
function _getName($basepage) {
- $label = isset($this->_label) ? $this->_label : false;
- return ($label and is_string($label)) ? $label : $this->_url;
+ $label = isset($this->_label) ? $this->_label : false;
+ return ($label and is_string($label)) ? $label : $this->_url;
}
function expand($basepage, &$markup) {
global $request;
- $label = isset($this->_label) ? $this->_label : false;
- $link = LinkURL($this->_url, $label);
+ $label = isset($this->_label) ? $this->_label : false;
+ $link = LinkURL($this->_url, $label);
if (GOOGLE_LINKS_NOFOLLOW) {
// Ignores nofollow when the user who saved the page was authenticated.
@@ -675,26 +675,26 @@
}
class Cached_InterwikiLink extends Cached_ExternalLink {
-
+
function Cached_InterwikiLink($link, $label=false) {
- $this->_link = $link;
+ $this->_link = $link;
if ($label)
$this->_label = $label;
}
function getPagename($basepage) {
list ($moniker, $page) = explode (":", $this->_link, 2);
- $page = new WikiPageName($page, $basepage);
- if ($page->isValid()) return $page->name;
- else return false;
+ $page = new WikiPageName($page, $basepage);
+ if ($page->isValid()) return $page->name;
+ else return false;
}
function getWikiPageLinks($basepage) {
if ($basepage == '') return false;
- /* ":DontStoreLink" */
- if (substr($this->_link,0,1) == ':') return false;
- /* store only links to valid pagenames */
- $dbi = $GLOBALS['request']->getDbh();
+ /* ":DontStoreLink" */
+ if (substr($this->_link,0,1) == ':') return false;
+ /* store only links to valid pagenames */
+ $dbi = $GLOBALS['request']->getDbh();
if ($link = $this->getPagename($basepage) and $dbi->isWikiPage($link)) {
return array(array('linkto' => $link));
} else {
@@ -703,31 +703,31 @@
}
function _getName($basepage) {
- $label = isset($this->_label) ? $this->_label : false;
- return ($label and is_string($label)) ? $label : $this->_link;
+ $label = isset($this->_label) ? $this->_label : false;
+ return ($label and is_string($label)) ? $label : $this->_link;
}
-
+
/* there may be internal interwiki links also */
function _getType() {
return $this->getPagename(false) ? 'internal' : 'external';
}
function _getURL($basepage) {
- $link = $this->expand($basepage, $this);
- return $link->getAttr('href');
+ $link = $this->expand($basepage, $this);
+ return $link->getAttr('href');
}
function expand($basepage, &$markup) {
- global $WikiTheme;
- $intermap = getInterwikiMap();
- $label = isset($this->_label) ? $this->_label : false;
- //FIXME: check Upload: inlined images
- if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
- if (!in_array($this->_link, $WikiTheme->VALID_LINKS))
- return HTML($label ? $label : $this->_link);
- }
- return $intermap->link($this->_link, $label);
+ global $WikiTheme;
+ $intermap = getInterwikiMap();
+ $label = isset($this->_label) ? $this->_label : false;
+ //FIXME: check Upload: inlined images
+ if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
+ if (!in_array($this->_link, $WikiTheme->VALID_LINKS))
+ return HTML($label ? $label : $this->_link);
}
+ return $intermap->link($this->_link, $label);
+ }
function asString() {
if (isset($this->_label))
@@ -742,9 +742,9 @@
class Cached_UserLink extends Cached_WikiLink {
function expand($basepage, &$markup) {
$label = isset($this->_label) ? $this->_label : false;
- $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
+ $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
$page = new WikiPageName($this->_page, $basepage, $anchor);
- $link = WikiLink($page, 'auto', $label);
+ $link = WikiLink($page, 'auto', $label);
// $link = HTML::a(array('href' => $PageName));
$link->setContent(PossiblyGlueIconToText('wikiuser', $this->_page));
$link->setAttr('class', 'wikiuser');
@@ -760,8 +760,8 @@
class Cached_PluginInvocation extends Cached_DynamicContent {
function Cached_PluginInvocation ($pi) {
- $this->_pi = $pi;
- $loader = $this->_getLoader();
+ $this->_pi = $pi;
+ $loader = $this->_getLoader();
if (is_array($plugin_cmdline = $loader->parsePI($pi)) and $plugin_cmdline[1]) {
$this->pi_name = $plugin_cmdline[0]; // plugin, plugin-form, plugin-list
$this->name = $plugin_cmdline[1]->getName();
@@ -771,9 +771,9 @@
function setTightness($top, $bottom) {
}
-
+
function isInlineElement() {
- return false;
+ return false;
}
function expand($basepage, &$markup) {
@@ -795,9 +795,9 @@
function & _getLoader() {
static $loader = false;
- if (!$loader) {
+ if (!$loader) {
include_once('lib/WikiPlugin.php');
- $loader = new WikiPluginLoader;
+ $loader = new WikiPluginLoader;
}
return $loader;
}
@@ -809,5 +809,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/Captcha.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -11,7 +11,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This File is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -35,20 +35,20 @@
function captchaword() {
if ( ! $this->request->getSessionVar('captchaword')) {
- $this->request->setSessionVar('captchaword', $this->get_word());
- }
+ $this->request->setSessionVar('captchaword', $this->get_word());
+ }
return $this->request->getSessionVar('captchaword');
}
function Failed () {
if ($this->request->getSessionVar('captcha_ok') == true)
return false;
-
+
if ( ! array_key_exists ( 'captcha_input', $this->meta )
or ($this->request->getSessionVar('captchaword')
and ($this->request->getSessionVar('captchaword') != $this->meta['captcha_input'])))
return true;
-
+
$this->request->setSessionVar('captcha_ok', true);
return false;
}
@@ -70,9 +70,9 @@
return $el;
}
- function get_word () {
+ function get_word () {
if (USE_CAPTCHA_RANDOM_WORD)
- return get_dictionary_word();
+ return get_dictionary_word();
else
return rand_ascii_readable($this->length); // lib/stdlib.php
}
@@ -99,10 +99,10 @@
// Draw the Spiral
function spiral( &$im, $origin_x = 100, $origin_y = 100, $r = 0, $g = 0, $b = 0 ) {
$theta = 1;
- $thetac = 6;
- $radius = 15;
- $circles = 10;
- $points = 35;
+ $thetac = 6;
+ $radius = 15;
+ $circles = 10;
+ $points = 35;
$lcolor = imagecolorallocate( $im, $r, $g, $b );
for( $i = 0; $i < ( $circles * $points ) - 1; $i++ ) {
$theta = $theta + $thetac;
@@ -121,7 +121,7 @@
function image ( $word ) {
$width =& $this->width;
$height =& $this->height;
-
+
// Create the Image
$jpg = ImageCreate($width,$height);
$bg = ImageColorAllocate($jpg,255,255,255);
@@ -134,7 +134,7 @@
$x = rand(10, 30);
$y = rand(50, $height-20); //50-60
-
+
// randomize the chars
for ($i=0; $i < strlen($word); $i++) {
$angle += rand(-5, 5);
@@ -145,8 +145,8 @@
if ( $y < 10 ) $y = 11;
elseif ( $y > $height-10 ) $y = $height-11;
$x += rand($size, $size*2);
- imagettftext($jpg, $size, $angle, $x, $y, $tx,
- realpath(findfile("lib/captcha/Vera.ttf")),
+ imagettftext($jpg, $size, $angle, $x, $y, $tx,
+ realpath(findfile("lib/captcha/Vera.ttf")),
$word[$i]);
}
@@ -159,19 +159,19 @@
imageline($jpg, 0,$height-1,$width-1,$height-1,$tx);
imageline($jpg, $width-1,0,$width-1,$height-1,$tx);
- if (function_exists("ImageJpeg")) {
- header("Content-type: image/jpeg");
- ImageJpeg($jpg);
- } elseif (function_exists("ImagePNG")) {
- header("Content-type: image/png");
- ImagePNG($jpg);
- } elseif (function_exists("ImageGIF")) {
- header("Content-type: image/gif");
- ImageGIF($jpg);
- } else {
- trigger_error("missing GD bitmap support", E_USER_WARNING);
- }
+ if (function_exists("ImageJpeg")) {
+ header("Content-type: image/jpeg");
+ ImageJpeg($jpg);
+ } elseif (function_exists("ImagePNG")) {
+ header("Content-type: image/png");
+ ImagePNG($jpg);
+ } elseif (function_exists("ImageGIF")) {
+ header("Content-type: image/gif");
+ ImageGIF($jpg);
+ } else {
+ trigger_error("missing GD bitmap support", E_USER_WARNING);
}
+ }
}
@@ -181,5 +181,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/DbSession.php
===================================================================
--- trunk/lib/DbSession.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/DbSession.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -29,7 +29,7 @@
$db_type = $dbh->getParam('dbtype');
if (isa($dbh, 'WikiDB')) {
@include_once("lib/DbSession/".$db_type.".php");
-
+
$class = "DbSession_".$db_type;
if (class_exists($class)) {
// dba has no ->_dbh, so this is used for the session link
@@ -43,7 +43,7 @@
$db_type), E_USER_WARNING);
return false;
}
-
+
function currentSessions() {
return $this->_backend->currentSessions();
}
Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/DbaDatabase.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -18,9 +18,9 @@
if (!in_array($handler, dba_handlers()))
$this->_error(
sprintf(
- _("The DBA handler %s is unsupported!")."\n".
- _("Supported handlers are: %s"),
- $handler, join(",",dba_handlers())));
+ _("The DBA handler %s is unsupported!")."\n".
+ _("Supported handlers are: %s"),
+ $handler, join(",",dba_handlers())));
}
$this->readonly = false;
if ($mode)
@@ -30,11 +30,11 @@
function set_timeout($timeout) {
$this->_timeout = $timeout;
}
-
+
function open($mode = 'w') {
if ($this->_dbh)
return; // already open.
-
+
$watchdog = $this->_timeout;
global $ErrorManager;
@@ -53,9 +53,9 @@
if ((strlen($mode) == 1)) {
// PHP 4.3.x Windows lock bug workaround: http://bugs.php.net/bug.php?id=23975
if (isWindows()) {
- $mode .= "-"; // suppress locking, or
- } elseif ($this->_handler != 'gdbm') { // gdbm does it internally
- $mode .= "d"; // else use internal locking
+ $mode .= "-"; // suppress locking, or
+ } elseif ($this->_handler != 'gdbm') { // gdbm does it internally
+ $mode .= "d"; // else use internal locking
}
}
while (($dbh = dba_open($this->_file, $mode, $this->_handler)) < 1) {
@@ -96,7 +96,7 @@
$this->readonly = true;
if (!file_exists($this->_file)) {
$ErrorManager->handleError($error);
- flush();
+ flush();
}
}
else {
@@ -116,7 +116,7 @@
function exists($key) {
return dba_exists($key, $this->_dbh);
}
-
+
function fetch($key) {
$val = dba_fetch($key, $this->_dbh);
if ($val === false)
@@ -134,7 +134,7 @@
return $this->_error("replace($key)");
}
-
+
function firstkey() {
return dba_firstkey($this->_dbh);
}
@@ -182,7 +182,7 @@
return $this->_error("optimize()");
return 1;
}
-
+
function _error($mes) {
//trigger_error("DbaDatabase: $mes", E_USER_WARNING);
//return false;
@@ -207,5 +207,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/DbaListSet.php
===================================================================
--- trunk/lib/DbaListSet.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/DbaListSet.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -52,7 +52,7 @@
list( $prev , , ) = explode(':', $this->_dbh->fetch(intval($i)), 3);
return intval($prev);
}
-
+
function exists($i) {
$i = intval($i);
return $i && $this->_dbh->exists($i);
@@ -68,7 +68,7 @@
list($prev, $next,) = explode(':', $dbh->fetch(intval($i)), 3);
$dbh->replace($i, "$prev:$next:$data");
}
-
+
function insert_before($i, $data) {
assert(intval($i));
return $this->_insert_before_nc($i, $data);
@@ -78,7 +78,7 @@
assert(intval($i));
return $this->_insert_after_nc($i, $data);
}
-
+
function append($seq, $data) {
$key = "s" . urlencode($seq);
$this->_insert_before_nc($key, $data);
@@ -88,7 +88,7 @@
$key = "s" . urlencode($seq);
$this->_insert_after_nc($key, $data);
}
-
+
function _insert_before_nc($i, &$data) {
$newkey = $this->_new_key();...
[truncated message content] |
|
From: <var...@us...> - 2011-03-04 16:43:49
|
Revision: 7963
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7963&view=rev
Author: vargenau
Date: 2011-03-04 16:43:43 +0000 (Fri, 04 Mar 2011)
Log Message:
-----------
Remove unused function
Modified Paths:
--------------
trunk/lib/stdlib.php
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2011-03-04 16:30:15 UTC (rev 7962)
+++ trunk/lib/stdlib.php 2011-03-04 16:43:43 UTC (rev 7963)
@@ -150,16 +150,6 @@
}
/**
- * Returns a name for the WIKI_ID cookie that should be unique on the host.
- * But for it to be unique you must have set a unique WIKI_NAME in your
- * configuration file.
- * @return string The name of the WIKI_ID cookie to use for this wiki.
- */
-function GetCookieName() {
- return preg_replace("/[^\d\w]/", "_", WIKI_NAME) . "_WIKI_ID";
-}
-
-/**
* Generates a valid URL for a given Wiki pagename.
* @param mixed $pagename If a string this will be the name of the Wiki page to link to.
* If a WikiDB_Page object function will extract the name to link to.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-04 16:30:21
|
Revision: 7962
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7962&view=rev
Author: vargenau
Date: 2011-03-04 16:30:15 +0000 (Fri, 04 Mar 2011)
Log Message:
-----------
Remove too optimistic comments
Modified Paths:
--------------
trunk/themes/MonoBook/themeinfo.php
Modified: trunk/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/themes/MonoBook/themeinfo.php 2011-03-04 16:21:08 UTC (rev 7961)
+++ trunk/themes/MonoBook/themeinfo.php 2011-03-04 16:30:15 UTC (rev 7962)
@@ -15,13 +15,6 @@
*
* Problems with IE: signin is at the left.
*
- * We don't (yet) support all mediawiki UI options, but we try to.
- * Besides that, maybe the mediawiki folks will see how much better phpwiki
- * will scale, esp. with a true database, not just mysql.
- * Technically phpwiki has about 2-3 years advantage and our plugins
- * cannot destroy the layout.
- * Anyway, the WikiParser perl module (and our php version) will be able to import
- * and convert back and forth.
*/
require_once('lib/WikiTheme.php');
require_once('themes/wikilens/themeinfo.php');
@@ -136,20 +129,8 @@
/*
* Link icons.
*/
- /*
- $this->setLinkIcon('http');
- $this->setLinkIcon('https');
- $this->setLinkIcon('ftp');
- $this->setLinkIcon('mailto');
- //$this->setLinkIcon('interwiki');
- */
$this->setLinkIcon('wikiuser');
- //$this->setLinkIcon('*', 'url');
- // front or after
- //$this->setLinkIconAttr('after');
- //$this->setButtonSeparator("\n | ");
-
/**
* WikiWords can automatically be split by inserting spaces between
* the words. The default is to leave WordsSmashedTogetherLikeSo.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-04 16:21:14
|
Revision: 7961
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7961&view=rev
Author: vargenau
Date: 2011-03-04 16:21:08 +0000 (Fri, 04 Mar 2011)
Log Message:
-----------
Remove unused functions
Modified Paths:
--------------
trunk/lib/WikiTheme.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2011-03-04 13:58:21 UTC (rev 7960)
+++ trunk/lib/WikiTheme.php 2011-03-04 16:21:08 UTC (rev 7961)
@@ -23,8 +23,6 @@
* and more formatting.
*/
-//require_once(dirname(__FILE__).'/HtmlElement.php');
-
/**
* Make a link to a wiki page (in this wiki).
*
@@ -699,7 +697,6 @@
//
////////////////////////////////////////////////////////////////
var $_imageAliases = array();
- var $_imageAlt = array();
/**
*
@@ -713,13 +710,6 @@
$this->_imageAliases[$alias] = $image_name;
}
- function addImageAlt ($alias, $alt_text) {
- $this->_imageAlt[$alias] = $alt_text;
- }
- function getImageAlt ($alias) {
- return $this->_imageAlt[$alias];
- }
-
function getImageURL ($image) {
$aliases = &$this->_imageAliases;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-04 13:58:29
|
Revision: 7960
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7960&view=rev
Author: vargenau
Date: 2011-03-04 13:58:21 +0000 (Fri, 04 Mar 2011)
Log Message:
-----------
No tabs
Modified Paths:
--------------
trunk/ImageTile.php
trunk/SOAP.php
trunk/configurator.php
trunk/lib/IniConfig.php
trunk/wikiadmin.php
Modified: trunk/ImageTile.php
===================================================================
--- trunk/ImageTile.php 2011-03-03 18:02:58 UTC (rev 7959)
+++ trunk/ImageTile.php 2011-03-04 13:58:21 UTC (rev 7960)
@@ -13,9 +13,9 @@
if (preg_match('/DATA_PATH/',$config[0])) {
list($key,$value) = explode('=', $config[0]);
$data_path = trim($value).'/';
- break;
- }
+ break;
}
+ }
fclose($fp);
@mkdir($data_path."uploads/thumbs",0775);
$file = $data_path."uploads/thumbs/image_" . ((float)$usec + (float)$sec);
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php 2011-03-03 18:02:58 UTC (rev 7959)
+++ trunk/SOAP.php 2011-03-04 13:58:21 UTC (rev 7960)
@@ -64,7 +64,7 @@
$request->_user = new WikiUser($request, $credentials['username']);
}
$request->_user->AuthCheck(array('userid' => $credentials['username'],
- 'passwd' => $credentials['password']));
+ 'passwd' => $credentials['password']));
if (! mayAccessPage ($access, $pagename))
$server->fault(401,'',"no permission");
}
@@ -86,12 +86,12 @@
$server->soapaction = $url; // soap_transport_http
$actions = array('getPageContent','getPageRevision','getCurrentRevision',
- 'getPageMeta','doSavePage','getAllPagenames',
- 'getBackLinks','doTitleSearch','doFullTextSearch',
- 'getRecentChanges','listLinks','listPlugins',
- 'getPluginSynopsis','callPlugin','listRelations',
- 'linkSearch'
- );
+ 'getPageMeta','doSavePage','getAllPagenames',
+ 'getBackLinks','doTitleSearch','doFullTextSearch',
+ 'getRecentChanges','listLinks','listPlugins',
+ 'getPluginSynopsis','callPlugin','listRelations',
+ 'linkSearch'
+ );
foreach ($actions as $action) {
$server->register($actions);
$server->operations[$actions]['soapaction'] = $url;
@@ -214,16 +214,16 @@
checkCredentials($server,$credentials,'view',_("RecentChanges"));
$dbi = WikiDB::open($GLOBALS['DBParams']);
$params = array('limit' => $limit, 'since' => $since,
- 'include_minor_revisions' => $include_minor);
+ 'include_minor_revisions' => $include_minor);
$page_iter = $dbi->mostRecent($params);
$pages = array();
while ($page = $page_iter->next()) {
$pages[] = array('pagename' => $page->getName(),
- 'lastModified' => $page->get('mtime'),
- 'author' => $page->get('author'),
- 'summary' => $page->get('summary'), // added with 1.3.13
- 'version' => $page->getVersion()
- );
+ 'lastModified' => $page->get('mtime'),
+ 'author' => $page->get('author'),
+ 'summary' => $page->get('summary'), // added with 1.3.13
+ 'version' => $page->getVersion()
+ );
}
return $pages;
}
@@ -236,8 +236,8 @@
$linkiterator = $page->getPageLinks();
$links = array();
while ($currentpage = $linkiterator->next()) {
- if ($currentpage->exists())
- $links[] = array('pagename' => $currentpage->getName());
+ if ($currentpage->exists())
+ $links[] = array('pagename' => $currentpage->getName());
}
return $links;
}
@@ -298,8 +298,8 @@
$pagelist = $p->run($dbi, $pluginargs, $request, $basepage);
$pages = array();
if (is_object($pagelist) and isa($pagelist, 'PageList')) {
- foreach ($pagelist->pageNames() as $name)
- $pages[] = array('pagename' => $name);
+ foreach ($pagelist->pageNames() as $name)
+ $pages[] = array('pagename' => $name);
}
return $pages;
}
@@ -322,8 +322,8 @@
$only_attributes = $option & 2 and !($option & 1);
$sorted = !($option & 4);
return $dbh->listRelations($also_attributes,
- $only_attributes,
- $sorted);
+ $only_attributes,
+ $sorted);
}
// some basic semantic search
function linkSearch($linktype, $search, $pages="*", $relation="*", $credentials=false) {
@@ -334,17 +334,17 @@
$pagequery = new TextSearchQuery($pages);
$linkquery = new TextSearchQuery($search);
if ($linktype == 'relation') {
- $relquery = new TextSearchQuery($relation);
- $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery);
+ $relquery = new TextSearchQuery($relation);
+ $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery);
} elseif ($linktype == 'attribute') { // only numeric search withh attributes!
- $relquery = new TextSearchQuery($relation);
- require_once("lib/SemanticWeb.php");
- // search: "population > 1 million and area < 200 km^2" relation="*" pages="*"
- $linkquery = new SemanticAttributeSearchQuery($search, $relation);
- $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery);
+ $relquery = new TextSearchQuery($relation);
+ require_once("lib/SemanticWeb.php");
+ // search: "population > 1 million and area < 200 km^2" relation="*" pages="*"
+ $linkquery = new SemanticAttributeSearchQuery($search, $relation);
+ $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery);
} else {
- // we already do have forward and backlinks as SOAP
- $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype);
+ // we already do have forward and backlinks as SOAP
+ $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype);
}
return $links->asArray();
}
@@ -357,5 +357,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2011-03-03 18:02:58 UTC (rev 7959)
+++ trunk/configurator.php 2011-03-04 13:58:21 UTC (rev 7960)
@@ -1,7 +1,7 @@
<?php // -*-php-*- $Id$
/*
* Copyright 2002,2003,2005,2008-2010 $ThePhpWikiProgrammingTeam
- * Copyright 2002 Martin Geisler <gim...@gi...>
+ * Copyright 2002 Martin Geisler <gim...@gi...>
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
*
* This file is part of PhpWiki.
@@ -12,19 +12,19 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* PhpWiki is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with PhpWiki; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/**
- * Starts automatically the first time by IniConfig("config/config.ini")
+ * Starts automatically the first time by IniConfig("config/config.ini")
* if it doesn't exist.
*
* DONE:
@@ -40,24 +40,24 @@
* o parse_ini_file("config-dist.ini") for the commented vars
* o check automatically for commented and optional vars
* o fix _optional, to ignore existing config.ini and only use config-default.ini values
- * o mixin class for commented
+ * o mixin class for commented
* o fix SQL quotes, AUTH_ORDER quotes and file forward slashes
* o posted values validation, extend js validation for sane DB values
* o read config-dist.ini into sections, comments, and optional/required settings
*
* A file config/config.ini will be automatically generated, if writable.
*
- * NOTE: If you have a starterscript outside PHPWIKI_DIR but no
- * config/config.ini yet (very unlikely!), you must define DATA_PATH in the
- * starterscript, otherwise the webpath to configurator is unknown, and
+ * NOTE: If you have a starterscript outside PHPWIKI_DIR but no
+ * config/config.ini yet (very unlikely!), you must define DATA_PATH in the
+ * starterscript, otherwise the webpath to configurator is unknown, and
* subsequent requests will fail. (POST to save the INI)
*/
global $HTTP_SERVER_VARS, $HTTP_POST_VARS, $tdwidth;
-if (empty($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
-if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS'];
-if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS'];
-if (empty($_POST)) $_POST =& $GLOBALS['HTTP_POST_VARS'];
+if (empty($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
+if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS'];
+if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS'];
+if (empty($_POST)) $_POST =& $GLOBALS['HTTP_POST_VARS'];
if (empty($configurator))
$configurator = "configurator.php";
@@ -66,9 +66,9 @@
$scriptname = str_replace('configurator.php', 'index.php', $_SERVER["SCRIPT_NAME"]);
if (strstr($_SERVER["SCRIPT_NAME"],"/php")) { // cgi got this different
if (defined('DATA_PATH'))
- $scriptname = DATA_PATH . "/index.php";
+ $scriptname = DATA_PATH . "/index.php";
else
- $scriptname = str_replace('configurator.php', 'index.php', $_SERVER["PHP_SELF"]);
+ $scriptname = str_replace('configurator.php', 'index.php', $_SERVER["PHP_SELF"]);
}
$tdwidth = 700;
@@ -81,22 +81,22 @@
function _http_user() {
if (!isset($_SERVER))
$_SERVER = $GLOBALS['HTTP_SERVER_VARS'];
- if (!empty($_SERVER['PHP_AUTH_USER']))
- return array($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
- if (!empty($_SERVER['REMOTE_USER']))
- return array($_SERVER['REMOTE_USER'], $_SERVER['PHP_AUTH_PW']);
+ if (!empty($_SERVER['PHP_AUTH_USER']))
+ return array($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
+ if (!empty($_SERVER['REMOTE_USER']))
+ return array($_SERVER['REMOTE_USER'], $_SERVER['PHP_AUTH_PW']);
if (!empty($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER']))
- return array($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER'],
- $GLOBALS['HTTP_ENV_VARS']['PHP_AUTH_PW']);
- if (!empty($GLOBALS['REMOTE_USER']))
- return array($GLOBALS['REMOTE_USER'], $GLOBALS['PHP_AUTH_PW']);
-
- // MsWindows IIS:
- if (!empty($_SERVER['HTTP_AUTHORIZATION'])) {
+ return array($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER'],
+ $GLOBALS['HTTP_ENV_VARS']['PHP_AUTH_PW']);
+ if (!empty($GLOBALS['REMOTE_USER']))
+ return array($GLOBALS['REMOTE_USER'], $GLOBALS['PHP_AUTH_PW']);
+
+ // MsWindows IIS:
+ if (!empty($_SERVER['HTTP_AUTHORIZATION'])) {
list($userid, $passwd) = explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
return array($userid, $passwd);
- }
- return array('','');
+ }
+ return array('','');
}
function _http_logout() {
if (!isset($_SERVER))
@@ -105,52 +105,52 @@
// better_srand(); $realm = microtime().rand();
header('WWW-Authenticate: Basic realm="'.WIKI_NAME.'"');
if (strstr(php_sapi_name(), 'apache'))
- header('HTTP/1.0 401 Unauthorized');
- else
+ header('HTTP/1.0 401 Unauthorized');
+ else
header("Status: 401 Access Denied"); //IIS and CGI need that
unset($GLOBALS['REMOTE_USER']);
unset($_SERVER['PHP_AUTH_USER']);
unset($_SERVER['PHP_AUTH_PW']);
- trigger_error("Permission denied. Require ADMIN_USER.", E_USER_ERROR);
- exit();
+ trigger_error("Permission denied. Require ADMIN_USER.", E_USER_ERROR);
+ exit();
}
}
-// If config.ini exists, we require ADMIN_USER access by faking HttpAuth.
+// If config.ini exists, we require ADMIN_USER access by faking HttpAuth.
// So nobody can see or reset the password(s).
if (file_exists($fs_config_file)) {
// Require admin user
if (!defined('ADMIN_USER') or !defined('ADMIN_PASSWD')) {
- if (!function_exists("IniConfig")) {
- include_once("lib/prepend.php");
- include_once("lib/IniConfig.php");
- }
- IniConfig($fs_config_file);
+ if (!function_exists("IniConfig")) {
+ include_once("lib/prepend.php");
+ include_once("lib/IniConfig.php");
+ }
+ IniConfig($fs_config_file);
}
if (!defined('ADMIN_USER') or ADMIN_USER == '') {
- trigger_error("Configuration problem:\nADMIN_USER not defined in \"$fs_config_file\".\n"
- . "Cannot continue: You have to fix that manually.", E_USER_ERROR);
- exit();
+ trigger_error("Configuration problem:\nADMIN_USER not defined in \"$fs_config_file\".\n"
+ . "Cannot continue: You have to fix that manually.", E_USER_ERROR);
+ exit();
}
list($admin_user, $admin_pw) = _http_user();
//$required_user = ADMIN_USER;
if (empty($admin_user) or $admin_user != ADMIN_USER)
{
- _http_logout();
+ _http_logout();
}
// check password
if (ENCRYPTED_PASSWD and function_exists('crypt')) {
- if (crypt($admin_pw, ADMIN_PASSWD) != ADMIN_PASSWD)
- _http_logout();
+ if (crypt($admin_pw, ADMIN_PASSWD) != ADMIN_PASSWD)
+ _http_logout();
} elseif ($admin_pw != ADMIN_PASSWD) {
_http_logout();
}
} else {
if (!function_exists("IniConfig")) {
include_once("lib/prepend.php");
- include_once("lib/IniConfig.php");
+ include_once("lib/IniConfig.php");
}
$def_file = (substr(PHP_OS,0,3) == 'WIN') ? 'config\\config-default.ini' : 'config/config-default.ini';
$fs_def_file = dirname(__FILE__) . (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/') . $def_file;
@@ -247,8 +247,8 @@
for (var i = 0; i < rows.length; i++) {
var tr = rows[i];
if (tr.className == 'header')
- if (!show || tr.id != show)
- toggle_group(tr.id);
+ if (!show || tr.id != show)
+ toggle_group(tr.id);
}
// Select text in textarea upon focus
@@ -258,7 +258,7 @@
area.addEventListener('focus', listener, false);
}
}
-
+
-->
</script>
</head>
@@ -282,7 +282,7 @@
* TO CHANGE THE CONFIGURATION OF YOUR PHPWIKI, DO *NOT* MODIFY THIS FILE!
* more instructions go here
*
- * Todo:
+ * Todo:
* * fix include_path
* * eval config.ini to get the actual settings.
*/
@@ -305,8 +305,8 @@
* for the html version of the descriptive text.
*
* - Double-quotes and dollar signs in the descriptive text must be
- * escaped: \" and \$. Instead of escaping double-quotes you can use
- * single (') quotes for the enclosing quotes.
+ * escaped: \" and \$. Instead of escaping double-quotes you can use
+ * single (') quotes for the enclosing quotes.
*
* - Special characters like < and > must use html entities,
* they will be converted back to characters for the final output.
@@ -316,11 +316,11 @@
$preamble = "
; This is the main configuration file for PhpWiki in INI-style format.
-; Note that certain characters are used as comment char and therefore
+; Note that certain characters are used as comment char and therefore
; these entries must be in double-quotes. Such as \":\", \";\", \",\" and \"|\"
; Take special care for DBAUTH_ sql statements. (Part 3a)
;
-; This file is divided into several parts: Each one has different configuration
+; This file is divided into several parts: Each one has different configuration
; settings you can change; in all cases the default should work on your system,
; however, we recommend you tailor things to your particular setting.
; Here undefined definitions get defined by config-default.ini settings.
@@ -341,7 +341,7 @@
if (substr(PHP_OS,0,3) == 'WIN') {
$include_path = dirname(__FILE__) . ';' . ini_get('include_path');
if (strchr(ini_get('include_path'),'/'))
- $include_path = strtr($include_path,'\\','/');
+ $include_path = strtr($include_path,'\\','/');
} else {
$include_path = dirname(__FILE__) . ':' . ini_get('include_path');
}
@@ -369,12 +369,12 @@
$properties["WYSIWYG_BACKEND"] =
new _define_selection(
-'WYSIWYG_BACKEND',
+'WYSIWYG_BACKEND',
array('Wikiwyg' => 'Wikiwyg',
'tinymce' => 'tinymce',
- 'FCKeditor' => 'FCKeditor',
- 'spaw' => 'spaw',
- 'htmlarea3' => 'htmlarea3',
+ 'FCKeditor' => 'FCKeditor',
+ 'spaw' => 'spaw',
+ 'htmlarea3' => 'htmlarea3',
'htmlarea2' => 'htmlarea2',
));
@@ -446,11 +446,11 @@
$properties["Admin Password"] =
new _define_password('ADMIN_PASSWD', ADMIN_PASSWD, "
-You must set this!
+You must set this!
For heaven's sake pick a good password.
If your version of PHP supports encrypted passwords, your password will be
-automatically encrypted within the generated config file.
+automatically encrypted within the generated config file.
Use the \"Create Random Password\" button to create a good (random) password.
ADMIN_PASSWD is ignored on HttpAuth",
@@ -469,7 +469,7 @@
'false' => "false. just record the address as given by the httpd server"));
$properties["ZIP Dump Authentication"] =
-new boolean_define_optional('ZIPDUMP_AUTH',
+new boolean_define_optional('ZIPDUMP_AUTH',
array('false' => "false. Everyone may download zip dumps",
'true' => "true. Only admin may download zip dumps"));
@@ -502,14 +502,14 @@
$properties["Access Log SQL"] =
new _define_selection(
-'ACCESS_LOG_SQL',
+'ACCESS_LOG_SQL',
array('0' => 'disabled',
'1' => 'read only',
'2' => 'read + write'));
$properties["Compress Output"] =
new boolean_define_commented_optional
-( 'COMPRESS_OUTPUT',
+( 'COMPRESS_OUTPUT',
array('' => 'undefined - GZIP compress when appropriate.',
'false' => 'Never compress output.',
'true' => 'Always try to compress output.'));
@@ -525,7 +525,7 @@
HTTP CACHE_CONTROL
This controls how PhpWiki sets the HTTP cache control
-headers (Expires: and Cache-Control:)
+headers (Expires: and Cache-Control:)
Choose one of:
<dl>
@@ -579,7 +579,7 @@
$properties["Force PHP Database Sessions"] =
new boolean_define_commented_optional
-('USE_DB_SESSION',
+('USE_DB_SESSION',
array('false' => 'Disable database sessions, use files',
'true' => 'Enable database sessions'));
@@ -663,7 +663,7 @@
<pre>
unix(/var/lib/mysql/mysql.sock)
</pre>
-here.
+here.
mysql on Windows via named pipes might need 127.0.0.1");
$properties["SQL Database Name"] =
@@ -678,7 +678,7 @@
$dsn_sqlstring = $dsn_sqltype."://{$dsn_sqluser}:{$dsn_sqlpass}@{$dsn_sqlhostorsock}/{$dsn_sqldbname}";
$properties["SQL dsn"] =
-new unchangeable_define("DATABASE_DSN",
+new unchangeable_define("DATABASE_DSN",
$dsn_sqlstring, "
Calculated from the settings above:");
@@ -698,7 +698,7 @@
$properties["DATABASE_PERSISTENT"] =
new boolean_define_commented_optional
-('DATABASE_PERSISTENT',
+('DATABASE_PERSISTENT',
array('false' => "Disabled",
'true' => "Enabled"));
@@ -724,7 +724,7 @@
'db4' => "DB4 - BerkeleyDB (Sleepycat) DB4."), "
Use 'gdbm', 'dbm', 'db2', 'db3' or 'db4' depending on your DBA handler methods supported: <br /> "
. (function_exists("dba_handlers") ? join(", ",dba_handlers()) : "")
- . "\n\nBetter not use other hacks such as inifile, flatfile or cdb");
+ . "\n\nBetter not use other hacks such as inifile, flatfile or cdb");
$properties["dba timeout"] =
new numeric_define("DATABASE_TIMEOUT", DATABASE_TIMEOUT, "
@@ -754,7 +754,7 @@
class a revision belongs in is determined by whether the author
checked the \"this is a minor revision\" checkbox when they saved the
page.
-
+
There is, additionally, a third class of revisions: author
revisions. The most recent non-mergable revision from each distinct
author is and author revision.
@@ -803,11 +803,11 @@
$properties["Major Edits: keep minimum days"] =
new numeric_define('MAJOR_MIN_KEEP', MAJOR_MIN_KEEP, "
-Default: Keep for unlimited time.
+Default: Keep for unlimited time.
Set to 0 to enable archive cleanup");
$properties["Minor Edits: keep minumum days"] =
new numeric_define('MINOR_MIN_KEEP', MINOR_MIN_KEEP, "
-Default: Keep for unlimited time.
+Default: Keep for unlimited time.
Set to 0 to enable archive cleanup");
$properties["Major Edits: how many"] =
@@ -863,42 +863,42 @@
new boolean_define_optional('ALLOW_BOGO_LOGIN',
array('true' => "true. Users may Sign In with any WikiWord, without password. (Default)",
'false' => "false. Require stricter authentication."), "
-If ALLOW_BOGO_LOGIN is false, you may not login with any wikiword username and empty password.
+If ALLOW_BOGO_LOGIN is false, you may not login with any wikiword username and empty password.
If true, users are allowed to create themselves with any WikiWord username. See below.");
$properties["Allow User Passwords"] =
new boolean_define_optional('ALLOW_USER_PASSWORDS',
array('true' => "True user authentication with password checking. (Default)",
'false' => "false. Ignore authentication settings below."), "
-If ALLOW_USER_PASSWORDS is true, the authentication settings below define where and how to
+If ALLOW_USER_PASSWORDS is true, the authentication settings below define where and how to
check against given username/passwords. For completely security disable BOGO_LOGIN and ANON_EDIT above.");
$properties["User Authentication Methods"] =
new array_define('USER_AUTH_ORDER', array("PersonalPage", "Db"), "
-Many different methods can be used to check user's passwords.
+Many different methods can be used to check user's passwords.
Try any of these in the given order:
<dl>
<dt>BogoLogin</dt>
- <dd>WikiWord username, with no *actual* password checking,
+ <dd>WikiWord username, with no *actual* password checking,
although the user will still have to enter one.</dd>
<dt>PersonalPage</dt>
- <dd>Store passwords in the users homepage metadata (simple)</dd>
+ <dd>Store passwords in the users homepage metadata (simple)</dd>
<dt>Db</dt>
- <dd>Use DBAUTH_AUTH_* (see below) with PearDB or ADODB only.</dd>
+ <dd>Use DBAUTH_AUTH_* (see below) with PearDB or ADODB only.</dd>
<dt>LDAP</dt>
- <dd>Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN.</dd>
+ <dd>Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN.</dd>
<dt>IMAP</dt>
- <dd>Authenticate against IMAP_AUTH_HOST (email account)</dd>
+ <dd>Authenticate against IMAP_AUTH_HOST (email account)</dd>
<dt>POP3</dt>
- <dd>Authenticate against POP3_AUTH_HOST (email account)</dd>
+ <dd>Authenticate against POP3_AUTH_HOST (email account)</dd>
<dt>Session</dt>
- <dd>Get username and level from a PHP session variable. (e.g. for FusionForge)</dd>
+ <dd>Get username and level from a PHP session variable. (e.g. for FusionForge)</dd>
<dt>File</dt>
- <dd>Store username:crypted-passwords in .htaccess like files.
+ <dd>Store username:crypted-passwords in .htaccess like files.
Use Apache's htpasswd to manage this file.</dd>
<dt>HttpAuth</dt>
- <dd>Use the protection by the webserver (.htaccess/.htpasswd) (experimental)
- Enforcing HTTP Auth not yet. Note that the ADMIN_USER should exist also.
+ <dd>Use the protection by the webserver (.htaccess/.htpasswd) (experimental)
+ Enforcing HTTP Auth not yet. Note that the ADMIN_USER should exist also.
Using HttpAuth disables all other methods and no userauth sessions are used.</dd>
</dl>
@@ -919,22 +919,22 @@
$properties["USER_AUTH_POLICY"] =
new _define_selection('USER_AUTH_POLICY',
array('first-only' => "first-only - use only the first method in USER_AUTH_ORDER",
- 'old' => "old - ignore USER_AUTH_ORDER (legacy)",
- 'strict' => "strict - check all methods for userid + password (recommended)",
- 'stacked' => "stacked - check all methods for userid, and if found for password"), "
+ 'old' => "old - ignore USER_AUTH_ORDER (legacy)",
+ 'strict' => "strict - check all methods for userid + password (recommended)",
+ 'stacked' => "stacked - check all methods for userid, and if found for password"), "
The following policies are available for user authentication:
<dl>
<dt>first-only</dt>
- <dd>use only the first method in USER_AUTH_ORDER</dd>
+ <dd>use only the first method in USER_AUTH_ORDER</dd>
<dt>old</dt>
- <dd>ignore USER_AUTH_ORDER and try to use all available
+ <dd>ignore USER_AUTH_ORDER and try to use all available
methods as in the previous PhpWiki releases (slow)</dd>
<dt>strict</dt>
- <dd>check if the user exists for all methods:
- on the first existing user, try the password.
+ <dd>check if the user exists for all methods:
+ on the first existing user, try the password.
dont try the other methods on failure then</dd>
<dt>stacked</dt>
- <dd>check the given user - password combination for all
+ <dd>check the given user - password combination for all
methods and return true on the first success.</dd></dl>");
$properties["ENABLE_USER_NEW"] =
@@ -971,7 +971,7 @@
<dt>FILE</dt>
<dd>Flatfile. See AUTH_GROUP_FILE below.</dd>
<dt>LDAP</dt>
- <dd>LDAP groups. See \"LDAP authentication options\" above and
+ <dd>LDAP groups. See \"LDAP authentication options\" above and
lib/WikiGroup.php. (experimental)</dd></dl>");
$properties["CATEGORY_GROUP_PAGE"] =
@@ -1112,12 +1112,12 @@
$properties["LDAP AUTH USER"] =
new _define_optional('LDAP_AUTH_USER', "CN=ldapuser,ou=Users,o=Development,dc=mycompany.com", "
-DN to initially bind to the LDAP server as. This is needed if the server doesn't
+DN to initially bind to the LDAP server as. This is needed if the server doesn't
allow anonymous queries. (Windows Active Directory Server)");
$properties["LDAP AUTH PASSWORD"] =
new _define_optional('LDAP_AUTH_PASSWORD', "secret", "
-Password to use to initially bind to the LDAP server, as the DN
+Password to use to initially bind to the LDAP server, as the DN
specified in the LDAP_AUTH_USER option (above).");
$properties["LDAP SEARCH FIELD"] =
@@ -1145,12 +1145,12 @@
$properties["LDAP Authentication"] =
new unchangeable_variable('LDAP Authentication', "
; If USER_AUTH_ORDER contains Ldap:
-;
+;
; The LDAP server to connect to. Can either be a hostname, or a complete
; URL to the server (useful if you want to use ldaps or specify a different
; port number).
;LDAP_AUTH_HOST = \"ldap://localhost:389\"
-;
+;
; The organizational or domain BASE DN: e.g. \"dc=mydomain,dc=com\".
;
; Note: ou=Users and ou=Groups are used for GroupLdap Membership
@@ -1162,11 +1162,11 @@
; and their values as NAME=value pairs separated by colons.
; LDAP_SET_OPTION = \"LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0\"
-; DN to initially bind to the LDAP server as. This is needed if the server doesn't
+; DN to initially bind to the LDAP server as. This is needed if the server doesn't
; allow anonymous queries. (Windows Active Directory Server)
; LDAP_AUTH_USER = \"CN=ldapuser,ou=Users,o=Development,dc=mycompany.com\"
-; Password to use to initially bind to the LDAP server, as the DN
+; Password to use to initially bind to the LDAP server, as the DN
; specified in the LDAP_AUTH_USER option (above).
; LDAP_AUTH_PASSWORD = secret
@@ -1196,7 +1196,7 @@
The IMAP server to check usernames from. Defaults to localhost.
Some IMAP_AUTH_HOST samples:
- localhost, localhost:143/imap/notls,
+ localhost, localhost:143/imap/notls,
localhost:993/imap/ssl/novalidate-cert (SuSE refuses non-SSL conections)");
} else { // function_exists('imap_open')
@@ -1205,9 +1205,9 @@
new unchangeable_variable('IMAP_AUTH_HOST',"
; If USER_AUTH_ORDER contains IMAP:
; The IMAP server to check usernames from. Defaults to localhost.
-;
+;
; Some IMAP_AUTH_HOST samples:
-; localhost, localhost:143/imap/notls,
+; localhost, localhost:143/imap/notls,
; localhost:993/imap/ssl/novalidate-cert (SuSE refuses non-SSL conections)
;IMAP_AUTH_HOST = localhost:143/imap/notls", "
Ignored. No IMAP support in this php. configure --with-imap");
@@ -1262,7 +1262,7 @@
'SpaceWiki' => "SpaceWiki",
'Hawaiian' => "Hawaiian",
'MonoBook' => 'MonoBook [experimental]',
- 'blog' => 'blog [experimental]',
+ 'blog' => 'blog [experimental]',
), "
THEME
@@ -1330,11 +1330,11 @@
WIKI_PGSRC is scanned for files -- one file per page.
<pre>
// Default (old) behavior:
-define('WIKI_PGSRC', 'pgsrc');
+define('WIKI_PGSRC', 'pgsrc');
// New style:
-define('WIKI_PGSRC', 'wiki.zip');
-define('WIKI_PGSRC',
- '../Logs/Hamwiki/hamwiki-20010830.zip');
+define('WIKI_PGSRC', 'wiki.zip');
+define('WIKI_PGSRC',
+ '../Logs/Hamwiki/hamwiki-20010830.zip');
</pre>");
$properties["Default Wiki Page Source"] =
@@ -1394,7 +1394,7 @@
new _define_optional('KEYWORDS', '\"Category* OR Topic*\"', "
Search term used for automatic page classification by keyword extraction.
-Any links on a page to pages whose names match this search
+Any links on a page to pages whose names match this search
will be used keywords in the keywords html meta tag. This is an aid to
classification by search engines. The value of the match is
used as the keyword.
@@ -1438,7 +1438,7 @@
$properties["DISABLE_MARKUP_WIKIWORD"] =
new boolean_define_optional('DISABLE_MARKUP_WIKIWORD');
-$properties["ENABLE_MARKUP_DIVSPAN" ] =
+$properties["ENABLE_MARKUP_DIVSPAN" ] =
new boolean_define_optional('ENABLE_MARKUP_DIVSPAN');
///////////////////
@@ -1461,9 +1461,9 @@
"onchange=\"validate_ereg('Sorry, \'%s\' is no valid port number.', '^[0-9]+$', 'SERVER_PORT', this);\"");
$properties["Server Protocol"] =
- new _define_selection_optional_commented('SERVER_PROTOCOL',
- array('http' => 'http',
- 'https' => 'https'));
+ new _define_selection_optional_commented('SERVER_PROTOCOL',
+ array('http' => 'http',
+ 'https' => 'https'));
$properties["Script Name"] =
new _define_commented_optional('SCRIPT_NAME', $scriptname);
@@ -1475,18 +1475,18 @@
new _define_commented_optional('PHPWIKI_DIR', dirname(__FILE__));
$properties["Use PATH_INFO"] =
-new _define_selection_optional_commented('USE_PATH_INFO',
- array('' => 'automatic',
- 'true' => 'use PATH_INFO',
- 'false' => 'do not use PATH_INFO'), "
-PhpWiki will try to use short urls to pages, eg
+new _define_selection_optional_commented('USE_PATH_INFO',
+ array('' => 'automatic',
+ 'true' => 'use PATH_INFO',
+ 'false' => 'do not use PATH_INFO'), "
+PhpWiki will try to use short urls to pages, eg
http://www.example.com/index.php/HomePage
-If you want to use urls like
+If you want to use urls like
http://www.example.com/index.php?pagename=HomePage
then define 'USE_PATH_INFO' as false by uncommenting the line below.
NB: If you are using Apache >= 2.0.30, then you may need to to use
the directive \"AcceptPathInfo On\" in your Apache configuration file
-(or in an appropriate <.htaccess> file) for the short urls to work:
+(or in an appropriate <.htaccess> file) for the short urls to work:
See http://httpd.apache.org/docs-2.0/mod/core.html#acceptpathinfo
See also http://phpwiki.sourceforge.net/phpwiki/PrettyWiki for more ideas
@@ -1500,7 +1500,7 @@
new _define_commented_optional('VIRTUAL_PATH', '/SomeWiki', "
VIRTUAL_PATH is the canonical URL path under which your your wiki
appears. Normally this is the same as dirname(SCRIPT_NAME), however
-using e.g. seperate starter scripts, apaches mod_actions (or mod_rewrite),
+using e.g. seperate starter scripts, apaches mod_actions (or mod_rewrite),
you can make it something different.
If you do this, you should set VIRTUAL_PATH here or in the starter scripts.
@@ -1542,7 +1542,7 @@
");
$properties["Strict Mailable Pagedumps"] =
- new boolean_define_optional('STRICT_MAILABLE_PAGEDUMPS',
+ new boolean_define_optional('STRICT_MAILABLE_PAGEDUMPS',
array('false' => "binary",
'true' => "quoted-printable"));
@@ -1556,8 +1556,8 @@
new _define_optional('HTML_DUMP_SUFFIX');
$properties["Pagename of Recent Changes"] =
- new _define_optional('RECENT_CHANGES',
- "RecentChanges");
+ new _define_optional('RECENT_CHANGES',
+ "RecentChanges");
$properties["Disable HTTP Redirects"] =
new boolean_define_commented_optional('DISABLE_HTTP_REDIRECT');
@@ -1637,14 +1637,14 @@
");
$properties["pear Cache USECACHE"] =
-new boolean_define_optional('PLUGIN_CACHED_USECACHE',
+new boolean_define_optional('PLUGIN_CACHED_USECACHE',
array('true' => 'Enabled',
- 'false' => 'Disabled'), "
+ 'false' => 'Disabled'), "
Enable or disable pear caching of plugins.");
$properties["pear Cache Database Container"] =
-new _define_selection_optional('PLUGIN_CACHED_DATABASE',
+new _define_selection_optional('PLUGIN_CACHED_DATABASE',
array('file' => 'file'), "
-Curently only file is supported.
+Curently only file is supported.
db, trifile and imgfile might be supported, but you must hack that by yourself.");
$properties["pear Cache cache directory"] =
@@ -1665,9 +1665,9 @@
new numeric_define_optional('PLUGIN_CACHED_MAXARGLEN', "1000", "
max. generated url length.");
$properties["pear Cache FORCE_SYNCMAP"] =
-new boolean_define_optional('PLUGIN_CACHED_FORCE_SYNCMAP',
+new boolean_define_optional('PLUGIN_CACHED_FORCE_SYNCMAP',
array('true' => 'Enabled',
- 'false' => 'Disabled'), "");
+ 'false' => 'Disabled'), "");
$properties["pear Cache IMGTYPES"] =
new list_define('PLUGIN_CACHED_IMGTYPES', "png|gif|gd|gd2|jpeg|wbmp|xbm|xpm", "
Handle those image types via GD handles. Check your GD supported image types.");
@@ -1682,7 +1682,7 @@
// begin class definitions
/**
- * A basic config-dist.ini configuration line in the form of a variable.
+ * A basic config-dist.ini configuration line in the form of a variable.
* (not needed anymore, we have only defines)
*
* Produces a string in the form "$name = value;"
@@ -1699,40 +1699,40 @@
function _variable($config_item_name, $default_value='', $description = '', $jscheck = '') {
$this->config_item_name = $config_item_name;
- if (!$description)
- $description = text_from_dist($config_item_name);
+ if (!$description)
+ $description = text_from_dist($config_item_name);
$this->description = $description;
- if (defined($config_item_name)
- and !preg_match("/(selection|boolean)/", get_class($this))
- and !preg_match("/^(SCRIPT_NAME|VIRTUAL_PATH|TEMP_DIR)$/", $config_item_name))
- $this->default_value = constant($config_item_name); // ignore given default value
- elseif ($config_item_name == $default_value)
- $this->default_value = '';
- else
- $this->default_value = $default_value;
- $this->jscheck = $jscheck;
+ if (defined($config_item_name)
+ and !preg_match("/(selection|boolean)/", get_class($this))
+ and !preg_match("/^(SCRIPT_NAME|VIRTUAL_PATH|TEMP_DIR)$/", $config_item_name))
+ $this->default_value = constant($config_item_name); // ignore given default value
+ elseif ($config_item_name == $default_value)
+ $this->default_value = '';
+ else
+ $this->default_value = $default_value;
+ $this->jscheck = $jscheck;
if (preg_match("/variable/i", get_class($this)))
- $this->prefix = "\$";
- elseif (preg_match("/ini_set/i", get_class($this)))
+ $this->prefix = "\$";
+ elseif (preg_match("/ini_set/i", get_class($this)))
$this->prefix = "ini_get: ";
else
- $this->prefix = "";
+ $this->prefix = "";
}
function _define($config_item_name, $default_value='', $description = '', $jscheck = '') {
- $this->_variable($config_item_name, $default_value, $description, $jscheck);
+ $this->_variable($config_item_name, $default_value, $description, $jscheck);
}
function value() {
global $HTTP_POST_VARS;
if (isset($HTTP_POST_VARS[$this->config_item_name]))
return $HTTP_POST_VARS[$this->config_item_name];
- else
+ else
return $this->default_value;
}
function _config_format($value) {
- return '';
+ return '';
$v = $this->get_config_item_name();
// handle arrays: a|b --> a['b']
if (strpos($v, '|')) {
@@ -1755,11 +1755,11 @@
function get_config_item_header() {
if (strchr($this->config_item_name,'|')) {
list($var,$param) = explode('|',$this->config_item_name);
- return "<b>" . $this->prefix . $var . "['" . $param . "']</b><br />";
+ return "<b>" . $this->prefix . $var . "['" . $param . "']</b><br />";
}
elseif ($this->config_item_name[0] != '_')
- return "<b>" . $this->prefix . $this->config_item_name . "</b><br />";
- else
+ return "<b>" . $this->prefix . $this->config_item_name . "</b><br />";
+ else
return '';
}
@@ -1784,10 +1784,10 @@
}
function get_html() {
- $size = strlen($this->default_value) > 45 ? 90 : 50;
- return $this->get_config_item_header() .
- "<input type=\"text\" size=\"$50\" name=\"" . $this->get_config_item_name() . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " .
- $this->jscheck . " />" . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+ $size = strlen($this->default_value) > 45 ? 90 : 50;
+ return $this->get_config_item_header() .
+ "<input type=\"text\" size=\"$50\" name=\"" . $this->get_config_item_name() . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " .
+ $this->jscheck . " />" . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
}
}
@@ -1798,9 +1798,9 @@
}
// function get_html() { return false; }
function get_html() {
- return $this->get_config_item_header() .
- "<em>Not editable.</em>" .
- "<pre>" . $this->default_value."</pre>";
+ return $this->get_config_item_header() .
+ "<em>Not editable.</em>" .
+ "<pre>" . $this->default_value."</pre>";
}
function _get_config_line($posted_value) {
if ($this->description)
@@ -1808,11 +1808,11 @@
return "${n}".$this->default_value;
}
function get_instructions($title) {
- global $tdwidth;
+ global $tdwidth;
$i = "<h3>" . $title . "</h3>\n " . nl2p($this->_get_description()) . "\n";
// $i .= "<em>Not editable.</em><br />\n<pre>" . $this->default_value."</pre>";
- return '<tr><td width="100%" class="unchangeable-variable-top" colspan="2">'."\n".$i."</td></tr>\n"
- . '<tr style="border-top: none;"><td class="unchangeable-variable-left" width="'.$tdwidth.'"> </td>';
+ return '<tr><td width="100%" class="unchangeable-variable-top" colspan="2">'."\n".$i."</td></tr>\n"
+ . '<tr style="border-top: none;"><td class="unchangeable-variable-left" width="'.$tdwidth.'"> </td>';
}
}
@@ -1843,25 +1843,25 @@
if (!empty($HTTP_POST_VARS[$this->config_item_name]))
return $HTTP_POST_VARS[$this->config_item_name];
else {
- list($option, $label) = each($this->default_value);
+ list($option, $label) = each($this->default_value);
return $option;
}
}
function get_html() {
- $output = $this->get_config_item_header();
+ $output = $this->get_config_item_header();
$output .= '<select name="' . $this->get_config_item_name() . "\">\n";
/* The first option is the default */
- $values = $this->default_value;
- if (defined($this->get_config_item_name()))
- $this->default_value = constant($this->get_config_item_name());
- else
- $this->default_value = null;
+ $values = $this->default_value;
+ if (defined($this->get_config_item_name()))
+ $this->default_value = constant($this->get_config_item_name());
+ else
+ $this->default_value = null;
foreach ($values as $option => $label) {
- if (!is_null($this->default_value) && $this->default_value === $option)
- $output .= " <option value=\"$option\" selected=\"selected\">$label</option>\n";
- else
- $output .= " <option value=\"$option\">$label</option>\n";
+ if (!is_null($this->default_value) && $this->default_value === $option)
+ $output .= " <option value=\"$option\" selected=\"selected\">$label</option>\n";
+ else
+ $output .= " <option value=\"$option\">$label</option>\n";
}
$output .= "</select>\n";
return $output;
@@ -1883,10 +1883,10 @@
return "${n}" . $this->_config_format($posted_value);
}
function get_html() {
- $size = strlen($this->default_value) > 45 ? 90 : 50;
- return $this->get_config_item_header()
- . "<input type=\"text\" size=\"$size\" name=\"" . htmlentities($this->get_config_item_name())
- . "\" value=\"" . htmlentities($this->default_value) . "\" {$this->jscheck} />"
+ $size = strlen($this->default_value) > 45 ? 90 : 50;
+ return $this->get_config_item_header()
+ . "<input type=\"text\" size=\"$size\" name=\"" . htmlentities($this->get_config_item_name())
+ . "\" value=\"" . htmlentities($this->default_value) . "\" {$this->jscheck} />"
. "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
}
}
@@ -1905,8 +1905,8 @@
}
}
-/**
- * We don't use _optional anymore, because INI-style config's don't need that.
+/**
+ * We don't use _optional anymore, because INI-style config's don't need that.
* IniConfig.php does the optional logic now.
* But we use _optional for config-default.ini options
*/
@@ -1919,13 +1919,13 @@
class _define_notempty
extends _define {
function get_html() {
- $s = $this->get_config_item_header()
- . "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name()
+ $s = $this->get_config_item_header()
+ . "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name()
. "\" value=\"" . $this->default_value . "\" {$this->jscheck} />";
if (empty($this->default_value))
- return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>";
- else
- return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+ return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>";
+ else
+ return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
}
}
@@ -2002,7 +2002,7 @@
extends _variable_selection { }
class _define_selection_optional_commented
-extends _define_selection_optional {
+extends _define_selection_optional {
function _get_config_line($posted_value) {
if ($this->description)
$n = "\n";
@@ -2019,11 +2019,11 @@
extends _define {
function _define_password($config_item_name, $default_value='', $description = '', $jscheck = '') {
- if ($config_item_name == $default_value) $default_value = '';
+ if ($config_item_name == $default_value) $default_value = '';
$this->_define($config_item_name, $default_value, $description, $jscheck);
if (!$jscheck)
- $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '"
- . $this->get_config_item_name() . "', this);\"";
+ $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '"
+ . $this->get_config_item_name() . "', this);\"";
}
function _get_config_line($posted_value) {
if ($this->description)
@@ -2060,10 +2060,10 @@
}
class _define_password_optional
-extends _define_password {
+extends _define_password {
function _define_password_optional($config_item_name, $default_value='', $description = '', $jscheck = '') {
- if ($config_item_name == $default_value) $default_value = '';
+ if ($config_item_name == $default_value) $default_value = '';
if (!$jscheck) $this->jscheck = " ";
$this->_define($config_item_name, $default_value, $description, $jscheck);
}
@@ -2074,20 +2074,20 @@
if ($posted_value == '') {
return "${n};" . $this->_config_format("");
} else {
- return "${n}" . $this->_config_format($posted_value);
+ return "${n}" . $this->_config_format($posted_value);
}
}
function get_html() {
- $s = $this->get_config_item_header();
- // dont re-encrypt already encrypted passwords
- $value = $this->value();
- $encrypted = !empty($GLOBALS['properties']["Encrypted Passwords"]) and
- $GLOBALS['properties']["Encrypted Passwords"]->value();
- if (empty($value))
- $encrypted = false;
+ $s = $this->get_config_item_header();
+ // dont re-encrypt already encrypted passwords
+ $value = $this->value();
+ $encrypted = !empty($GLOBALS['properties']["Encrypted Passwords"]) and
+ $GLOBALS['properties']["Encrypted Passwords"]->value();
+ if (empty($value))
+ $encrypted = false;
$s .= "<input type=\"". ($encrypted ? "text" : "password") . "\" name=\"" . $this->get_config_item_name()
. "\" value=\"" . $value . "\" {$this->jscheck} />";
- return $s;
+ return $s;
}
}
@@ -2097,35 +2097,35 @@
class _variable_password
extends _variable {
function _variable_password($config_item_name, $default_value='', $description = '', $jscheck = '') {
- if ($config_item_name == $default_value) $default_value = '';
+ if ($config_item_name == $default_value) $default_value = '';
$this->_define($config_item_name, $default_value, $description, $jscheck);
if (!$jscheck)
$this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '" . $this->get_config_item_name() . "', this);\"";
}
function get_html() {
- global $HTTP_POST_VARS, $HTTP_GET_VARS;
- $s = $this->get_config_item_header();
+ global $HTTP_POST_VARS, $HTTP_GET_VARS;
+ $s = $this->get_config_item_header();
if (isset($HTTP_POST_VARS['create']) or isset($HTTP_GET_VARS['create'])) {
- $new_password = random_good_password();
- $this->default_value = $new_password;
- $s .= "Created password: <strong>$new_password</strong><br /> <br />";
- }
- // dont re-encrypt already encrypted passwords
- $value = $this->value();
- $encrypted = !empty($GLOBALS['properties']["Encrypted Passwords"]) and
- $GLOBALS['properties']["Encrypted Passwords"]->value();
- if (empty($value))
- $encrypted = false;
+ $new_password = random_good_password();
+ $this->default_value = $new_password;
+ $s .= "Created password: <strong>$new_password</strong><br /> <br />";
+ }
+ // dont re-encrypt already encrypted passwords
+ $value = $this->value();
+ $encrypted = !empty($GLOBALS['properties']["Encrypted Passwords"]) and
+ $GLOBALS['properties']["Encrypted Passwords"]->value();
+ if (empty($value))
+ $encrypted = false;
$s .= "<input type=\"". ($encrypted ? "text" : "password") . "\" name=\"" . $this->get_config_item_name()
- . "\" value=\"" . $value . "\" {$this->jscheck} />"
+ . "\" value=\"" . $value . "\" {$this->jscheck} />"
. " <input type=\"submit\" name=\"create\" value=\"Create Random Password\" />";
- if (empty($value))
- $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>";
- elseif (strlen($this->default_value) < 4)
- $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Must be longer than 4 chars.</p>";
- else
- $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
- return $s;
+ if (empty($value))
+ $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>";
+ elseif (strlen($this->default_value) < 4)
+ $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Must be longer than 4 chars.</p>";
+ else
+ $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+ return $s;
}
}
@@ -2144,9 +2144,9 @@
$rows = max(3, count($list_values) +1);
$list_values = join("\n", $list_values);
$ta = $this->get_config_item_header();
- $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
+ $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
$ta .= $list_values . "</textarea>";
- $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+ $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
return $ta;
}
}
@@ -2165,9 +2165,9 @@
if ($list_values)
$list_values = join("\n", $list_values);
$ta = $this->get_config_item_header();
- $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
+ $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
$ta .= $list_values . "</textarea>";
- $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+ $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
return $ta;
}
}
@@ -2175,7 +2175,7 @@
class array_variable
extends _variable {
function _config_format($value) {
- return sprintf("%s = \"%s\"", $this->get_config_item_name(),
+ return sprintf("%s = \"%s\"", $this->get_config_item_name(),
is_array($value) ? join(':', $value) : $value);
}
function _get_config_line($posted_value) {
@@ -2189,15 +2189,15 @@
return "\n;" . $this->_config_format('');
}
function get_html() {
- if (is_array($this->default_value))
+ if (is_array($this->default_value))
$list_values = join("\n", $this->default_value);
- else
+ else
$list_values = $this->default_value;
$rows = max(3, count($this->default_value) +1);
$ta = $this->get_config_item_header();
$ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
$ta .= $list_values . "</textarea>";
- $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+ $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
return $ta;
}
}
@@ -2205,7 +2205,7 @@
class array_define
extends _define {
function _config_format($value) {
- return sprintf("%s = \"%s\"", $this->get_config_item_name(),
+ return sprintf("%s = \"%s\"", $this->get_config_item_name(),
is_array($value) ? join(' : ', $value) : $value);
}
function _get_config_line($posted_value) {
@@ -2219,16 +2219,16 @@
return "\n;" . $this->_config_format('');
}
function get_html () {
- if (!$this->default_value)
- $this->default_value = array();
- elseif (is_string($this->default_value))
- $this->default_value = preg_split("/[\s,:]+/", $this->default_value, -1, PREG_SPLIT_NO_EMPTY);
- $list_values = join(" : \n", $this->default_value);
+ if (!$this->default_value)
+ $this->default_value = array();
+ elseif (is_string($this->default_value))
+ $this->default_value = preg_split("/[\s,:]+/", $this->default_value, -1, PREG_SPLIT_NO_EMPTY);
+ $list_values = join(" : \n", $this->default_value);
$rows = max(3, count($this->default_value) + 1);
$ta = $this->get_config_item_header();
$ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
$ta .= $list_values . "</textarea>";
- $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+ $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
return $ta;
}
}
@@ -2241,7 +2241,7 @@
if ($v = $HTTP_POST_VARS[$this->config_item_name])
return $v;
else {
- return ini_get($this->get_config_item_name);
+ return ini_get($this->get_config_item_name);
}
}
function _config_format($value) {
@@ -2262,20 +2262,20 @@
// adds ->values property, instead of ->default_value
function boolean_define($config_item_name, $values = false, $description = '', $jscheck = '') {
$this->config_item_name = $config_item_name;
- if (!$description)
- $description = text_from_dist($config_item_name);
+ if (!$description)
+ $description = text_from_dist($config_item_name);
$this->description = $description;
- // TESTME: get boolean default value from config-default.ini
- if (defined($config_item_name))
- $this->default_value = constant($config_item_name); // ignore given default value
+ // TESTME: get boolean default value from config-default.ini
+ if (defined($config_item_name))
+ $this->default_value = constant($config_item_name); // ignore given default value
elseif (is_array($values))
- list($this->default_value,$dummy) = $values[0];
- if (!$values)
+ list($this->default_value,$dummy) = $values[0];
+ if (!$values)
$values = array('false' => "Disabled",
'true' => "Enabled");
- $this->values = $values;
- $this->jscheck = $jscheck;
- $this->prefix = "";
+ $this->values = $values;
+ $this->jscheck = $jscheck;
+ $this->prefix = "";
}
function _get_config_line($posted_value) {
if ($this->description)
@@ -2291,18 +2291,18 @@
//TODO: radiobuttons, no list
function get_html() {
$output = $this->get_config_item_header();
- $name = $this->get_config_item_name();
+ $name = $this->get_config_item_name();
$output .= '<select name="' . $name . "\" {$this->jscheck}>\n";
- $values = $this->values;
- $default_value = $this->default_value ? 'true' : 'false';
+ $values = $this->values;
+ $default_value = $this->default_value ? 'true' : 'false';
/* There can usually only be two options, there can be
* three options in the case of a boolean_define_commented_optional */
while (list($option, $label) = each($values)) {
- if (!is_null($this->default_value) and $option === $default_value)
- $output .= " <option value=\"$option\" selected=\"selected\">$label</option>\n";
- else
- $output .= " <option value=\"$option\">$label</option>\n";
- }
+ if (!is_null($this->default_value) and $option === $default_value)
+ $output .= " <option value=\"$option\" selected=\"selected\">$label</option>\n";
+ else
+ $output .= " <option value=\"$option\">$label</option>\n";
+ }
$output .= "</select>\n";
return $output;
}
@@ -2338,11 +2338,11 @@
return "\n".$SEPARATOR . str_replace("\n", "\n; ", $d) ."\n".$this->default_value;
}
function get_instructions($title) {
- $id = preg_replace("/\W/","",$this->config_item_name);
- $group_name = preg_replace("/\W/","",$title);
- $i = "<tr class=\"header\" id=\"$id\">\n<td class=\"part\" width=\"100%\" colspan=\"2\" bgcolor=\"#eeeeee\">\n";
+ $id = preg_replace("/\W/","",$this->config_item_name);
+ $group_name = preg_replace("/\W/","",$title);
+ $i = "<tr class=\"header\" id=\"$id\">\n<td class=\"part\" width=\"100%\" colspan=\"2\" bgcolor=\"#eeeeee\">\n";
$i .= "<h2>" . $title . "</h2>\n " . nl2p($this->_get_description()) ."\n";
- $i .= "<p><a href=\"javascript:toggle_group('$id')\" id=\"{$id}_text\">Hide options.</a></p>";
+ $i .= "<p><a href=\"javascript:toggle_group('$id')\" id=\"{$id}_text\">Hide options.</a></p>";
return $i ."</td>\n";
}
function get_html() {
@@ -2369,30 +2369,30 @@
function text_from_dist($var) {
static $distfile = 0;
static $f;
-
+
if (!$distfile) {
- $sep = (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/');
- $distfile = dirname(__FILE__) . $sep . "config" . $sep . "config-dist.ini";
- $f = fopen($distfile, "r");
+ $sep = (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/');
+ $distfile = dirname(__FILE__) . $sep . "config" . $sep . "config-dist.ini";
+ $f = fopen($distfile, "r");
}
if ($var == '_MAGIC_CLOSE_FILE') {
- fclose($f);
- return;
+ fclose($f);
+ return;
}
// if all vars would be in natural order as in the config-dist this would not be needed.
- fseek($f, 0);
+ fseek($f, 0);
$par = "\n";
while (!feof($f)) {
- $s = fgets($f);
- if (preg_match("/^; \w/", $s)) {
- $par .= (substr($s,2) . " ");
- } elseif (preg_match("/^;\s*$/", $s)) {
- $par .= "\n\n";
- }
- if (preg_match("/^;?".preg_quote($var)."\s*=/", $s))
- return $par;
- if (preg_match("/^\s*$/", $s)) // new paragraph
- $par = "\n";
+ $s = fgets($f);
+ if (preg_match("/^; \w/", $s)) {
+ $par .= (substr($s,2) . " ");
+ } elseif (preg_match("/^;\s*$/", $s)) {
+ $par .= "\n\n";
+ }
+ if (preg_match("/^;?".preg_quote($var)."\s*=/", $s))
+ return $par;
+ if (preg_match("/^\s*$/", $s)) // new paragraph
+ $par = "\n";
}
return '';
}
@@ -2432,13 +2432,13 @@
better_srand();
if (function_exists('mt_rand')) // mersenne twister
$length = mt_rand($minlength, $maxlength);
- else // the usually bad glibc rand()
+ else // the usually bad glibc rand()
$length = rand($minlength, $maxlength);
while ($length > 0) {
if (function_exists('mt_rand'))
- $newchar = mt_rand($start, $end);
+ $newchar = mt_rand($start, $end);
else
- $newchar = rand($start, $end);
+ $newchar = rand($start, $end);
if (! strrpos($valid_chars,$newchar) ) continue; // skip holes
$newpass .= sprintf("%c", $newchar);
$length--;
@@ -2465,7 +2465,7 @@
}
-if (!empty($HTTP_POST_VARS['action'])
+if (!empty($HTTP_POST_VARS['action'])
and $HTTP_POST_VARS['action'] == 'make_config'
and !empty($HTTP_POST_VARS['ADMIN_USER'])
and !empty($HTTP_POST_VARS['ADMIN_PASSWD'])
@@ -2508,7 +2508,7 @@
else {
$fp = false;
}
-
+
if ($fp) {
fputs($fp, utf8_encode($config));
fclose($fp);
@@ -2520,8 +2520,8 @@
}
} ...
[truncated message content] |
|
From: <var...@us...> - 2011-03-03 18:03:04
|
Revision: 7959
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7959&view=rev
Author: vargenau
Date: 2011-03-03 18:02:58 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
No tabs
Modified Paths:
--------------
trunk/lib/plugin/RateIt.php
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2011-03-03 17:52:53 UTC (rev 7958)
+++ trunk/lib/plugin/RateIt.php 2011-03-03 18:02:58 UTC (rev 7959)
@@ -177,7 +177,7 @@
} else {
header('Content-type: image/png');
echo base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAQMAAABIeJ9nAAAAA1BMVEX///'
- .'+nxBvIAAAAAXRSTlMAQObYZgAAABNJREFUeF4NwAEBAAAAgJD+r5YGAAQAAXHhfPAAAAAASUVORK5CYII=');
+ .'+nxBvIAAAAAXRSTlMAQObYZgAAABNJREFUeF4NwAEBAAAAgJD+r5YGAAQAAXHhfPAAAAAASUVORK5CYII=');
}
exit;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-03 17:53:00
|
Revision: 7958
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7958&view=rev
Author: vargenau
Date: 2011-03-03 17:52:53 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
No tabs
Modified Paths:
--------------
trunk/lib/wikilens/PageListColumns.php
Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
--- trunk/lib/wikilens/PageListColumns.php 2011-03-03 17:38:22 UTC (rev 7957)
+++ trunk/lib/wikilens/PageListColumns.php 2011-03-03 17:52:53 UTC (rev 7958)
@@ -57,7 +57,7 @@
class _PageList_Column_coagreement extends _PageList_Column_custom
{
function _PageList_Column_coagreement ($params) {
- $this->_pagelist =& $params[3];
+ $this->_pagelist =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
$this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
}
@@ -89,7 +89,7 @@
class _PageList_Column_minmisery extends _PageList_Column_custom
{
function _PageList_Column_minmisery ($params) {
- $this->_pagelist =& $params[3];
+ $this->_pagelist =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
$this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
}
@@ -104,7 +104,7 @@
$active_userId = $active_user->getId();
$dbi = $request->getDbh();
$p = MinMisery($dbi, $pagename, $this->_selectedBuddies, $active_userId);
- $imgFix = floor($p * 2) / 2;
+ $imgFix = floor($p * 2) / 2;
return HTML::img(array('src' => $WikiTheme->getImageURL("Rateit" . $imgFix)));
}
}
@@ -113,7 +113,7 @@
{
function _PageList_Column_averagerating ($params)
{
- $this->_pagelist =& $params[3];
+ $this->_pagelist =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
$this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
}
@@ -147,7 +147,7 @@
var $_dimension;
function _PageList_Column_ratingvalue ($params) {
- $this->_pagelist =& $params[3];
+ $this->_pagelist =& $params[3];
$this->_user =& $params[4];//$this->_pagelist->getOption('user');
$this->_PageList_Column($params[0], $params[1], $params[2]);
$this->_dimension = $this->_pagelist->getOption('dimension');
@@ -212,7 +212,7 @@
class _PageList_Column_ratingwidget extends _PageList_Column_custom
{
function _PageList_Column_ratingwidget ($params) {
- $this->_pagelist =& $params[3];
+ $this->_pagelist =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
$this->_dimension = $this->_pagelist->getOption('dimension');
if (!$this->_dimension) $this->_dimension = 0;
@@ -255,7 +255,7 @@
$active_user = $request->getUser();
// This needs to be a reference so things aren't recomputed for this user
$this->_active_ratings_user =& RatingsUserFactory::getUser($active_user->getId());
-
+
$this->_pagelist =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
$this->_dimension = $this->_pagelist->getOption('dimension');;
@@ -302,9 +302,9 @@
global $request;
$active_user = $request->getUser();
if (is_string($active_user)) {
- //FIXME: try to find the bug at test.php which sets request->_user and ->_group
- trigger_error("request->getUser => string: $active_user", E_USER_WARNING);
- $active_user = new MockUser($active_user,true);
+ //FIXME: try to find the bug at test.php which sets request->_user and ->_group
+ trigger_error("request->getUser => string: $active_user", E_USER_WARNING);
+ $active_user = new MockUser($active_user,true);
}
// No, I don't know exactly why, but this needs to be a reference for
// the memoization in pearson_similarity and mean_rating to work
@@ -369,25 +369,25 @@
(
'numbacklinks'
=> array('_PageList_Column_numbacklinks','custom:numbacklinks',
- _("# things"), 'center'),
- 'rating'
+ _("# things"), 'center'),
+ 'rating'
=> array('_PageList_Column_ratingwidget','custom:rating',
- _("Rate"), false),
+ _("Rate"), false),
'ratingvalue'
=> array('_PageList_Column_ratingvalue','custom:ratingvalue',
- _("Rating"), 'center'),
+ _("Rating"), 'center'),
'coagreement'
=> array('_PageList_Column_coagreement','custom:coagreement',
- _("Go?"), 'center'),
+ _("Go?"), 'center'),
'minmisery'
=> array('_PageList_Column_minmisery','custom:minmisery',
- _("MinMisery"), 'center'),
+ _("MinMisery"), 'center'),
'averagerating'
=> array('_PageList_Column_averagerating','custom:averagerating',
- _("Avg. Rating"), 'left'),
+ _("Avg. Rating"), 'left'),
'top3recs'
=> array('_PageList_Column_top3recs','custom:top3recs',
- _("Top Recommendations"), 'left'),
+ _("Top Recommendations"), 'left'),
/*'prediction'
=> array('_PageList_Column_prediction','custom:prediction',
_("Prediction"), false),*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-03 17:38:29
|
Revision: 7957
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7957&view=rev
Author: vargenau
Date: 2011-03-03 17:38:22 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
Hack to make PageList work
Modified Paths:
--------------
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2011-03-03 17:08:31 UTC (rev 7956)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2011-03-03 17:38:22 UTC (rev 7957)
@@ -319,6 +319,9 @@
else
$exclude='';
+ // Horrible hack
+ $include_empty=false;
+
if (strstr($orderby, 'mtime ')) { // multiple columns possible
if ($include_empty) {
$sql = "SELECT "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-03 17:08:43
|
Revision: 7956
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7956&view=rev
Author: vargenau
Date: 2011-03-03 17:08:31 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
Remove rcs_id
Modified Paths:
--------------
trunk/lib/DbSession/ADODB.php
trunk/lib/DbSession/PDO.php
trunk/lib/DbSession/SQL.php
trunk/lib/DbSession/dba.php
trunk/lib/WikiDB/ADODB.php
trunk/lib/WikiDB/PDO.php
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/backend/ADODB.php
trunk/lib/WikiDB/backend/ADODB_mssql.php
trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
trunk/lib/WikiDB/backend/ADODB_mysql.php
trunk/lib/WikiDB/backend/ADODB_oci8po.php
trunk/lib/WikiDB/backend/ADODB_postgres7.php
trunk/lib/WikiDB/backend/ADODB_sqlite.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PDO_mysql.php
trunk/lib/WikiDB/backend/PDO_oci8.php
trunk/lib/WikiDB/backend/PDO_pgsql.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/PearDB_mysql.php
trunk/lib/WikiDB/backend/PearDB_oci8.php
trunk/lib/WikiDB/backend/PearDB_pgsql.php
trunk/lib/WikiDB/backend/PearDB_sqlite.php
trunk/lib/WikiDB/backend/cvs.php
trunk/lib/WikiDB/backend/dba.php
trunk/lib/WikiDB/backend/dbaBase.php
trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
trunk/lib/WikiDB/backend/file.php
trunk/lib/WikiDB/backend/flatfile.php
trunk/lib/WikiDB/cvs.php
trunk/lib/WikiDB/dba.php
trunk/lib/WikiDB/file.php
trunk/lib/WikiDB/flatfile.php
trunk/lib/WikiUser/AdoDb.php
trunk/lib/WikiUser/BogoLogin.php
trunk/lib/WikiUser/Db.php
trunk/lib/WikiUser/EMailConfirm.php
trunk/lib/WikiUser/Facebook.php
trunk/lib/WikiUser/File.php
trunk/lib/WikiUser/Forbidden.php
trunk/lib/WikiUser/FusionForge.php
trunk/lib/WikiUser/HttpAuth.php
trunk/lib/WikiUser/HttpAuthUpper.php
trunk/lib/WikiUser/IMAP.php
trunk/lib/WikiUser/LDAP.php
trunk/lib/WikiUser/LdapUpper.php
trunk/lib/WikiUser/OpenID.php
trunk/lib/WikiUser/POP3.php
trunk/lib/WikiUser/PdoDb.php
trunk/lib/WikiUser/PearDb.php
trunk/lib/WikiUser/PersonalPage.php
trunk/lib/WikiUser/Session.php
trunk/lib/WysiwygEdit/FCKeditor.php
trunk/lib/WysiwygEdit/Wikiwyg.php
trunk/lib/WysiwygEdit/htmlarea2.php
trunk/lib/WysiwygEdit/htmlarea3.php
trunk/lib/WysiwygEdit/tinymce.php
trunk/lib/fpdf/chinese.php
trunk/lib/fpdf/japanese.php
trunk/lib/pear/DB/Pager.php
trunk/lib/pear/DB/ldap.php
trunk/lib/pear/PEAR.php
trunk/lib/wikilens/Buddy.php
trunk/lib/wikilens/CustomPrefs.php
trunk/lib/wikilens/PageListColumns.php
trunk/lib/wikilens/RatingsDb.php
trunk/lib/wikilens/RatingsUser.php
trunk/lib/wikilens/Utils.php
trunk/tests/unit/lib/HtmlParserTest.php
trunk/tests/unit/lib/InlineParserTest.php
trunk/tests/unit/lib/XmlRpcTest.php
trunk/themes/Crao/templates/actionbar.tmpl
trunk/themes/Crao/templates/body.tmpl
trunk/themes/Crao/templates/bottom.tmpl
trunk/themes/Crao/templates/browse.tmpl
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/Crao/templates/head.tmpl
trunk/themes/Crao/templates/htmldump.tmpl
trunk/themes/Crao/templates/navbar.tmpl
trunk/themes/Crao/templates/signin.tmpl
trunk/themes/Crao/templates/top.tmpl
trunk/themes/Crao/templates/wikiblog.tmpl
trunk/themes/Crao/themeinfo.php
trunk/themes/Hawaiian/lib/random.php
trunk/themes/Hawaiian/themeinfo.php
trunk/themes/MacOSX/lib/RecentChanges.php
trunk/themes/MacOSX/themeinfo.php
trunk/themes/MonoBook/templates/actionbar.tmpl
trunk/themes/MonoBook/templates/body.tmpl
trunk/themes/MonoBook/templates/browse-footer.tmpl
trunk/themes/MonoBook/templates/browse.tmpl
trunk/themes/MonoBook/templates/editpage.tmpl
trunk/themes/MonoBook/templates/info.tmpl
trunk/themes/MonoBook/templates/logo.tmpl
trunk/themes/MonoBook/templates/navbar.tmpl
trunk/themes/MonoBook/templates/tags.tmpl
trunk/themes/MonoBook/templates/top.tmpl
trunk/themes/MonoBook/templates/viewsource.tmpl
trunk/themes/MonoBook/themeinfo.php
trunk/themes/Portland/lib/RecentChanges.php
trunk/themes/Portland/templates/actionbar.tmpl
trunk/themes/Portland/templates/body.tmpl
trunk/themes/Portland/templates/browse.tmpl
trunk/themes/Portland/templates/debug.tmpl
trunk/themes/Portland/templates/editpage.tmpl
trunk/themes/Portland/templates/navbar.tmpl
trunk/themes/Portland/templates/viewsource.tmpl
trunk/themes/Portland/themeinfo.php
trunk/themes/Sidebar/clock.php
trunk/themes/Sidebar/hyperapplet.php
trunk/themes/Sidebar/hyperwiki.php
trunk/themes/Sidebar/templates/actionbar.tmpl
trunk/themes/Sidebar/templates/body.tmpl
trunk/themes/Sidebar/templates/calendar.tmpl
trunk/themes/Sidebar/templates/content.tmpl
trunk/themes/Sidebar/templates/debug.tmpl
trunk/themes/Sidebar/templates/dump-footer.tmpl
trunk/themes/Sidebar/templates/frame-left.tmpl
trunk/themes/Sidebar/templates/frameset.tmpl
trunk/themes/Sidebar/templates/htmldump.tmpl
trunk/themes/Sidebar/templates/logo.tmpl
trunk/themes/Sidebar/templates/navbar.tmpl
trunk/themes/Sidebar/templates/ratings.tmpl
trunk/themes/Sidebar/templates/rc.tmpl
trunk/themes/Sidebar/templates/search.tmpl
trunk/themes/Sidebar/templates/signin.tmpl
trunk/themes/Sidebar/templates/tags.tmpl
trunk/themes/Sidebar/templates/top.tmpl
trunk/themes/Sidebar/themeinfo.php
trunk/themes/SpaceWiki/lib/RecentChanges.php
trunk/themes/SpaceWiki/themeinfo.php
trunk/themes/Wordpress/lib/RecentChanges.php
trunk/themes/Wordpress/templates/actionbar.tmpl
trunk/themes/Wordpress/templates/body.tmpl
trunk/themes/Wordpress/templates/browse.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/Wordpress/templates/navbar.tmpl
trunk/themes/Wordpress/templates/signin.tmpl
trunk/themes/Wordpress/templates/viewsource.tmpl
trunk/themes/Wordpress/themeinfo.php
trunk/themes/blog/lib/RecentChanges.php
trunk/themes/blog/templates/actionbar.tmpl
trunk/themes/blog/templates/body.tmpl
trunk/themes/blog/templates/bottom.tmpl
trunk/themes/blog/templates/browse-footer.tmpl
trunk/themes/blog/templates/browse.tmpl
trunk/themes/blog/templates/debug.tmpl
trunk/themes/blog/templates/info.tmpl
trunk/themes/blog/templates/navbar.tmpl
trunk/themes/blog/templates/sidebar.tmpl
trunk/themes/blog/templates/top.tmpl
trunk/themes/blog/templates/viewsource.tmpl
trunk/themes/blog/templates/wikiblog.tmpl
trunk/themes/blog/themeinfo.php
trunk/themes/default/templates/actionbar.tmpl
trunk/themes/default/templates/addcomment.tmpl
trunk/themes/default/templates/body.tmpl
trunk/themes/default/templates/bottom.tmpl
trunk/themes/default/templates/browse-footer.tmpl
trunk/themes/default/templates/browse.tmpl
trunk/themes/default/templates/categorypage.tmpl
trunk/themes/default/templates/comment.tmpl
trunk/themes/default/templates/content.tmpl
trunk/themes/default/templates/debug.tmpl
trunk/themes/default/templates/dialog.tmpl
trunk/themes/default/templates/editpage.tmpl
trunk/themes/default/templates/forumadd.tmpl
trunk/themes/default/templates/frameset.tmpl
trunk/themes/default/templates/head.tmpl
trunk/themes/default/templates/homepage.tmpl
trunk/themes/default/templates/htmldump.tmpl
trunk/themes/default/templates/info.tmpl
trunk/themes/default/templates/login.tmpl
trunk/themes/default/templates/navbar.tmpl
trunk/themes/default/templates/nochanges.tmpl
trunk/themes/default/templates/online.tmpl
trunk/themes/default/templates/pagelink.tmpl
trunk/themes/default/templates/savepage.tmpl
trunk/themes/default/templates/signin.tmpl
trunk/themes/default/templates/top.tmpl
trunk/themes/default/templates/userprefs.tmpl
trunk/themes/default/templates/viewsource.tmpl
trunk/themes/default/templates/wikiblog.tmpl
trunk/themes/default/templates/wikiforum.tmpl
trunk/themes/default/themeinfo.php
trunk/themes/shamino_com/templates/actionbar.tmpl
trunk/themes/shamino_com/templates/browse-footer.tmpl
trunk/themes/shamino_com/templates/debug.tmpl
trunk/themes/shamino_com/templates/info.tmpl
trunk/themes/shamino_com/templates/signin.tmpl
trunk/themes/shamino_com/templates/top.tmpl
trunk/themes/shamino_com/themeinfo.php
trunk/themes/smaller/templates/actionbar.tmpl
trunk/themes/smaller/templates/info.tmpl
trunk/themes/smaller/templates/navbar.tmpl
trunk/themes/smaller/templates/signin.tmpl
trunk/themes/smaller/themeinfo.php
trunk/themes/wikilens/templates/body.tmpl
trunk/themes/wikilens/templates/categorypage.tmpl
trunk/themes/wikilens/templates/head.tmpl
trunk/themes/wikilens/templates/navbar.tmpl
trunk/themes/wikilens/templates/newuserwelcomepage.tmpl
trunk/themes/wikilens/templates/ratings.tmpl
trunk/themes/wikilens/templates/top.tmpl
trunk/themes/wikilens/themeinfo.php
Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/DbSession/ADODB.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/*
* Copyright 2005 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/DbSession/PDO.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/**
* Db sessions for PDO, based on pear DB Sessions.
Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/DbSession/SQL.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/**
* DB sessions for pear DB
Modified: trunk/lib/DbSession/dba.php
===================================================================
--- trunk/lib/DbSession/dba.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/DbSession/dba.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/** DBA Sessions
* session:
Modified: trunk/lib/WikiDB/ADODB.php
===================================================================
--- trunk/lib/WikiDB/ADODB.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/ADODB.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
require_once('lib/WikiDB.php');
Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/PDO.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
require_once('lib/WikiDB.php');
Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/SQL.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
require_once('lib/WikiDB.php');
//require_once('lib/WikiDB/backend/PearDB.php');
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/ADODB.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2002,2004,2005,2006 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend/ADODB_mssql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssql.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/ADODB_mssql.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* MS SQL extensions for the ADODB DB backend.
Modified: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* MS SQL extensions for the ADODB DB backend.
Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mysql.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/ADODB_mysql.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
require_once('lib/WikiDB/backend/ADODB.php');
Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_oci8po.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/ADODB_oci8po.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Oracle extensions for the ADODB DB backend.
Modified: trunk/lib/WikiDB/backend/ADODB_postgres7.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_postgres7.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/ADODB_postgres7.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
require_once('lib/WikiDB/backend/ADODB.php');
Modified: trunk/lib/WikiDB/backend/ADODB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_sqlite.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/ADODB_sqlite.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
require_once('lib/WikiDB/backend/ADODB.php');
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/PDO.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2005 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_mysql.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/PDO_mysql.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2005 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend/PDO_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_oci8.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/PDO_oci8.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2007 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend/PDO_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_pgsql.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/PDO_pgsql.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2005 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/PearDB.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
require_once('lib/WikiDB/backend.php');
//require_once('lib/FileFinder.php');
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2001-2009 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend/PearDB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysql.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/PearDB_mysql.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
require_once('lib/WikiDB/backend/PearDB.php');
Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_oci8.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/PearDB_oci8.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Oracle extensions for the Pear DB backend.
Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_pgsql.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/PearDB_pgsql.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
require_once('lib/ErrorManager.php');
require_once('lib/WikiDB/backend/PearDB.php');
Modified: trunk/lib/WikiDB/backend/PearDB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_sqlite.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/PearDB_sqlite.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -8,7 +8,7 @@
* sqlite -init /tmp/phpwiki-sqlite.db
* sqlite /tmp/phpwiki-sqlite.db < schemas/sqlite.sql
*/
-// rcs_id('$Id$');
+// $Id$
require_once('lib/WikiDB/backend/PearDB.php');
Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/cvs.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/**
* Backend for handling CVS repository.
*
Modified: trunk/lib/WikiDB/backend/dba.php
===================================================================
--- trunk/lib/WikiDB/backend/dba.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/dba.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
require_once('lib/WikiDB/backend/dbaBase.php');
require_once('lib/DbaDatabase.php');
Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/dbaBase.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
require_once('lib/WikiDB/backend.php');
Modified: trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* An iterator which returns all revisions of page.
Modified: trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
require_once('lib/WikiDB/backend.php');
Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2007 Reini Urban
*
Modified: trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
require_once('lib/WikiDB/backend.php');
Modified: trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
require_once('lib/WikiDB/backend.php');
Modified: trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/TextSearchIter.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/dumb/TextSearchIter.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
class WikiDB_backend_dumb_TextSearchIter
extends WikiDB_backend_iterator
Modified: trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
//require_once('lib/WikiDB/backend.php');
Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/file.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002, 2003 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/backend/flatfile.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999,2005,2006 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/cvs.php
===================================================================
--- trunk/lib/WikiDB/cvs.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/cvs.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,6 +1,6 @@
<?php
-// rcs_id( '$Id$' );
+// $Id$
require_once( 'lib/WikiDB.php' );
require_once( 'lib/WikiDB/backend/cvs.php' );
Modified: trunk/lib/WikiDB/dba.php
===================================================================
--- trunk/lib/WikiDB/dba.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/dba.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
require_once('lib/WikiDB.php');
require_once('lib/WikiDB/backend/dba.php');
Modified: trunk/lib/WikiDB/file.php
===================================================================
--- trunk/lib/WikiDB/file.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/file.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,6 +1,6 @@
<?php
-// rcs_id( '$Id$' );
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002, 2003 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/flatfile.php
===================================================================
--- trunk/lib/WikiDB/flatfile.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiDB/flatfile.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php
-// rcs_id( '$Id$' );
+// $Id$
/**
* Copyright 1999, 2005 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/AdoDb.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 ReiniUrban
*
Modified: trunk/lib/WikiUser/BogoLogin.php
===================================================================
--- trunk/lib/WikiUser/BogoLogin.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/BogoLogin.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 ReiniUrban
*
Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/Db.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 ReiniUrban
*
Modified: trunk/lib/WikiUser/EMailConfirm.php
===================================================================
--- trunk/lib/WikiUser/EMailConfirm.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/EMailConfirm.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2006 ReiniUrban
*
Modified: trunk/lib/WikiUser/Facebook.php
===================================================================
--- trunk/lib/WikiUser/Facebook.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/Facebook.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2009 Reini Urban
*
Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/File.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 ReiniUrban
*
Modified: trunk/lib/WikiUser/Forbidden.php
===================================================================
--- trunk/lib/WikiUser/Forbidden.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/Forbidden.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 ReiniUrban
*
Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/FusionForge.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2006 Alain Peyrat
*
Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/HttpAuth.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 ReiniUrban
*
Modified: trunk/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- trunk/lib/WikiUser/HttpAuthUpper.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/HttpAuthUpper.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004,2007 ReiniUrban
*
Modified: trunk/lib/WikiUser/IMAP.php
===================================================================
--- trunk/lib/WikiUser/IMAP.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/IMAP.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/WikiUser/LDAP.php
===================================================================
--- trunk/lib/WikiUser/LDAP.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/LDAP.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004,2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/WikiUser/LdapUpper.php
===================================================================
--- trunk/lib/WikiUser/LdapUpper.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/LdapUpper.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2007,2009 Reini Urban
*
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/OpenID.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2010 ReiniUrban
* Zend_OpenId_Consumer parts from Zend licensed under
Modified: trunk/lib/WikiUser/POP3.php
===================================================================
--- trunk/lib/WikiUser/POP3.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/POP3.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/PdoDb.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004, 2005 ReiniUrban
*
Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/PearDb.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 ReiniUrban
*
Modified: trunk/lib/WikiUser/PersonalPage.php
===================================================================
--- trunk/lib/WikiUser/PersonalPage.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/PersonalPage.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 ReiniUrban
*
Modified: trunk/lib/WikiUser/Session.php
===================================================================
--- trunk/lib/WikiUser/Session.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WikiUser/Session.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 ReiniUrban
*
Modified: trunk/lib/WysiwygEdit/FCKeditor.php
===================================================================
--- trunk/lib/WysiwygEdit/FCKeditor.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WysiwygEdit/FCKeditor.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/**
* FCKeditor is compatible with most internet browsers which
* include: IE 5.5+ (Windows), Firefox 1.0+, Mozilla 1.3+
Modified: trunk/lib/WysiwygEdit/Wikiwyg.php
===================================================================
--- trunk/lib/WysiwygEdit/Wikiwyg.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WysiwygEdit/Wikiwyg.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/**
* Wikiwyg is compatible with most internet browsers which
* include: IE 5.5+ (Windows), Firefox 1.0+, Mozilla 1.3+
Modified: trunk/lib/WysiwygEdit/htmlarea2.php
===================================================================
--- trunk/lib/WysiwygEdit/htmlarea2.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WysiwygEdit/htmlarea2.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/**
* requires installation into themes/default/htmlarea2/
* Output the javascript function to check for MS Internet Explorer >= 5.5 on Windows
Modified: trunk/lib/WysiwygEdit/htmlarea3.php
===================================================================
--- trunk/lib/WysiwygEdit/htmlarea3.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WysiwygEdit/htmlarea3.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/**
* requires installation into themes/default/htmlarea3/
* MSIE => 5.5, Mozilla >= 1.3
Modified: trunk/lib/WysiwygEdit/tinymce.php
===================================================================
--- trunk/lib/WysiwygEdit/tinymce.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/WysiwygEdit/tinymce.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/**
* Multiple browser support, currently Mozilla (PC, Mac and Linux),
* MSIE (PC) and FireFox (PC, Mac and Linux) and some limited Safari support.
Modified: trunk/lib/fpdf/chinese.php
===================================================================
--- trunk/lib/fpdf/chinese.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/fpdf/chinese.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
// PDF functions taken from FPDF http://www.fpdf.org
Modified: trunk/lib/fpdf/japanese.php
===================================================================
--- trunk/lib/fpdf/japanese.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/fpdf/japanese.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
// PDF functions taken from FPDF http://www.fpdf.org
Modified: trunk/lib/pear/DB/Pager.php
===================================================================
--- trunk/lib/pear/DB/Pager.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/pear/DB/Pager.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -25,8 +25,7 @@
// Based on DB_Pager 0.7 from the pear.php.net repository.
// The only modifications made have been modification of the include paths.
//
-// rcs_id('$Id$');
-// rcs_id('From Pear CVS: Id: Pager.php,v 1.3 2002/05/12 13:59:40 cox Exp');
+// From Pear CVS: Id: Pager.php,v 1.3 2002/05/12 13:59:40 cox Exp
require_once 'PEAR.php';
require_once 'DB.php';
Modified: trunk/lib/pear/DB/ldap.php
===================================================================
--- trunk/lib/pear/DB/ldap.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/pear/DB/ldap.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -28,8 +28,7 @@
// Based on DB 1.3 from the pear.php.net repository.
// The only modifications made have been modification of the include paths.
//
-// rcs_id('$Id$');
-// rcs_id('From Pear CVS: Id: ldap.php,v 1.9 2002/02/11 12:59:37 mj Exp');
+// From Pear CVS: Id: ldap.php,v 1.9 2002/02/11 12:59:37 mj Exp
require_once 'DB/common.php';
define("DB_ERROR_BIND_FAILED", -26);
Modified: trunk/lib/pear/PEAR.php
===================================================================
--- trunk/lib/pear/PEAR.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/pear/PEAR.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -18,8 +18,8 @@
// | Tomas V.V.Cox <co...@id...> |
// +----------------------------------------------------------------------+
//
-// rcs_id('$Id$');
-// rcs_id('From Pear CVS: Id: PEAR.php,v 1.59 2003/04/03 23:10:10 ssb Exp');
+// $Id$
+// From Pear CVS: Id: PEAR.php,v 1.59 2003/04/03 23:10:10 ssb Exp
//
define('PEAR_ERROR_RETURN', 1);
Modified: trunk/lib/wikilens/Buddy.php
===================================================================
--- trunk/lib/wikilens/Buddy.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/wikilens/Buddy.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
// It is anticipated that when userid support is added to phpwiki,
// this object will hold much more information (e-mail,
Modified: trunk/lib/wikilens/CustomPrefs.php
===================================================================
--- trunk/lib/wikilens/CustomPrefs.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/wikilens/CustomPrefs.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Custom UserPreferences:
Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
--- trunk/lib/wikilens/PageListColumns.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/wikilens/PageListColumns.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 Mike Cassano
Modified: trunk/lib/wikilens/RatingsDb.php
===================================================================
--- trunk/lib/wikilens/RatingsDb.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/wikilens/RatingsDb.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* @author: Dan Frankowski (wikilens group manager), Reini Urban (as plugin)
Modified: trunk/lib/wikilens/RatingsUser.php
===================================================================
--- trunk/lib/wikilens/RatingsUser.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/wikilens/RatingsUser.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/* Copyright (C) 2004 Dan Frankowski
* Copyright (C) 2010 Roger Guignard, Alcatel-Lucent
*
Modified: trunk/lib/wikilens/Utils.php
===================================================================
--- trunk/lib/wikilens/Utils.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/lib/wikilens/Utils.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 Mike Cassano
*
Modified: trunk/tests/unit/lib/HtmlParserTest.php
===================================================================
--- trunk/tests/unit/lib/HtmlParserTest.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/tests/unit/lib/HtmlParserTest.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/* Copyright (C) 2004, Reini Urban <ru...@x-...>
*/
Modified: trunk/tests/unit/lib/InlineParserTest.php
===================================================================
--- trunk/tests/unit/lib/InlineParserTest.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/tests/unit/lib/InlineParserTest.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/* Copyright (C) 2004 Dan Frankowski <dfr...@cs...>
* (C) 2006, 2007 Reini Urban <ru...@x-...>
Modified: trunk/tests/unit/lib/XmlRpcTest.php
===================================================================
--- trunk/tests/unit/lib/XmlRpcTest.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/tests/unit/lib/XmlRpcTest.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/* Copyright (C) 2007 Reini Urban
*/
Modified: trunk/themes/Crao/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/actionbar.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Crao/templates/actionbar.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
if (!$page->get('locked') || $user->isAdmin() and $revision)
$EditB = Button("edit",
$revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));
Modified: trunk/themes/Crao/templates/body.tmpl
===================================================================
--- trunk/themes/Crao/templates/body.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Crao/templates/body.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<body<?php echo $WikiTheme->getMoreAttr('body') ?>>
<div id="header"><?php // for top toolbars style sheet ?>
Modified: trunk/themes/Crao/templates/bottom.tmpl
===================================================================
--- trunk/themes/Crao/templates/bottom.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Crao/templates/bottom.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<!-- Add your Disclaimer here -->
Modified: trunk/themes/Crao/templates/browse.tmpl
===================================================================
--- trunk/themes/Crao/templates/browse.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Crao/templates/browse.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php if ($revision and !$revision->isCurrent()) { ?>
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Crao/templates/editpage.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php if (isset($PREVIEW_CONTENT)) { ?>
<p><strong><?php echo _("Preview only! Changes not saved.")?></strong>
Modified: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Crao/templates/head.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" />
Modified: trunk/themes/Crao/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Crao/templates/htmldump.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Crao/templates/htmldump.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* This template is used only for html file dumps, and is responsible
* mainly for the outer level <html> stuff and the and <head>.
Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Crao/templates/navbar.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<!-- The top navigation/search bar -->
<form action="<?php echo WikiURL(_("TitleSearch"))?>"
Modified: trunk/themes/Crao/templates/signin.tmpl
===================================================================
--- trunk/themes/Crao/templates/signin.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Crao/templates/signin.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
if (empty($FORMNAME))
$FORMNAME = 'signin';
Modified: trunk/themes/Crao/templates/top.tmpl
===================================================================
--- trunk/themes/Crao/templates/top.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Crao/templates/top.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
global $HIDE_TOOLBARS;
if (!$HIDE_TOOLBARS) {
Modified: trunk/themes/Crao/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/Crao/templates/wikiblog.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Crao/templates/wikiblog.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php
$CDATE = $WikiTheme->formatDateTime($BLOG_CTIME);
Modified: trunk/themes/Crao/themeinfo.php
===================================================================
--- trunk/themes/Crao/themeinfo.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Crao/themeinfo.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -6,7 +6,7 @@
exit;
}
-// rcs_id('$Id$');
+// $Id$
/*
* This file defines the Crao theme of PhpWiki.
Modified: trunk/themes/Hawaiian/lib/random.php
===================================================================
--- trunk/themes/Hawaiian/lib/random.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Hawaiian/lib/random.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/**
*/
class randomImage {
Modified: trunk/themes/Hawaiian/themeinfo.php
===================================================================
--- trunk/themes/Hawaiian/themeinfo.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Hawaiian/themeinfo.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -6,7 +6,7 @@
exit;
}
-// rcs_id('$Id$');
+// $Id$
/**
* WikiWiki Hawaiian theme for PhpWiki.
Modified: trunk/themes/MacOSX/lib/RecentChanges.php
===================================================================
--- trunk/themes/MacOSX/lib/RecentChanges.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/MacOSX/lib/RecentChanges.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/*
* Extensions/modifications to the stock RecentChanges (and PageHistory) format.
*/
Modified: trunk/themes/MacOSX/themeinfo.php
===================================================================
--- trunk/themes/MacOSX/themeinfo.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/MacOSX/themeinfo.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -6,7 +6,7 @@
exit;
}
-// rcs_id('$Id$');
+// $Id$
/**
* A PhpWiki theme inspired by the Aqua appearance of Mac OS X.
Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php
//$p = $WikiTheme->tooltipAccessKeyPrefix();
Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/MonoBook/templates/body.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
// Todo: set the body attr dynamically. here class="ns-2" for mozilla
?>
<body <?php echo $WikiTheme->getMoreAttr('body') ?>>
Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse-footer.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/MonoBook/templates/browse-footer.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php // <hr class="printer" noshade="noshade" /> ?>
<div class="visualClear"></div>
Modified: trunk/themes/MonoBook/templates/browse.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/MonoBook/templates/browse.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php if ($revision and !$revision->isCurrent()) { ?>
Modified: trunk/themes/MonoBook/templates/editpage.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/editpage.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/MonoBook/templates/editpage.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<div id="contentSub"></div>
<?php echo Template("default/editpage") ?>
Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/MonoBook/templates/info.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php
if (empty($revision)) $revision = $page->getCurrentRevision(false);
Modified: trunk/themes/MonoBook/templates/logo.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/logo.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/MonoBook/templates/logo.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<div class="portlet" id="p-logo"><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>"><img src="<?php echo $WikiTheme->getImageURL('logo') ?>" id="logo-img" alt="<?php echo
fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" /></a></div>
Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/MonoBook/templates/navbar.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php
// With MonoBook it is similar to Sidebar, named boxes at the left.
Modified: trunk/themes/MonoBook/templates/tags.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/tags.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/MonoBook/templates/tags.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<!-- list of most popular categories -->
<div class="portlet" id="p-tags">
Modified: trunk/themes/MonoBook/templates/top.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/top.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/MonoBook/templates/top.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<!-- Page title -->
<a id="top"></a>
Modified: trunk/themes/MonoBook/templates/viewsource.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/viewsource.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/MonoBook/templates/viewsource.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php if ($page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:")?></strong>
Modified: trunk/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/themes/MonoBook/themeinfo.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/MonoBook/themeinfo.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -6,7 +6,7 @@
exit;
}
-// rcs_id('$Id$');
+// $Id$
/**
* The new mediawiki (Wikipedia.org) default style.
* Mediawiki 'monobook' style sheet for CSS2-capable browsers.
Modified: trunk/themes/Portland/lib/RecentChanges.php
===================================================================
--- trunk/themes/Portland/lib/RecentChanges.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Portland/lib/RecentChanges.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/*
* Extensions/modifications to the stock RecentChanges (and PageHistory) format.
*/
Modified: trunk/themes/Portland/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/actionbar.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Portland/templates/actionbar.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php
if ($revision and (!$page->get('locked') || $user->isAdmin()))
Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Portland/templates/body.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<body<?php echo $WikiTheme->getMoreAttr('body') ?>>
<!-- Page title and logo -->
Modified: trunk/themes/Portland/templates/browse.tmpl
===================================================================
--- trunk/themes/Portland/templates/browse.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Portland/templates/browse.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<br class="clear-floats" />
Modified: trunk/themes/Portland/templates/debug.tmpl
===================================================================
--- trunk/themes/Portland/templates/debug.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Portland/templates/debug.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php global $RUNTIMER; ?>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Portland/templates/editpage.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php /*
* FIXME: Hack!
Modified: trunk/themes/Portland/templates/navbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/navbar.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Portland/templates/navbar.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<!-- The bottom navigation/search bar -->
Modified: trunk/themes/Portland/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Portland/templates/viewsource.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Portland/templates/viewsource.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php if ($page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:")?></strong>
Modified: trunk/themes/Portland/themeinfo.php
===================================================================
--- trunk/themes/Portland/themeinfo.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Portland/themeinfo.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -6,7 +6,7 @@
exit;
}
-// rcs_id('$Id$');
+// $Id$
/*
* This file defines an appearance ("theme") of PhpWiki similar to the Portland Pattern Repository.
Modified: trunk/themes/Sidebar/clock.php
===================================================================
--- trunk/themes/Sidebar/clock.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Sidebar/clock.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php
- // rcs_id('$Id$');
+ // $Id$
$ora = isset($GLOBALS['WikiTheme']) ? DATA_PATH . '/' . $GLOBALS['WikiTheme']->_findFile("ora.swf") : "ora.swf";
?>
<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,29,0" width="160" height="160" align="middle">
Modified: trunk/themes/Sidebar/hyperapplet.php
===================================================================
--- trunk/themes/Sidebar/hyperapplet.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Sidebar/hyperapplet.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php
- // rcs_id('$Id$');
+ // $Id$
/* Download hyperapplet.jar (or hyperwiki.jar) and GraphXML.dtd from
* http://hypergraph.sourceforge.net/download.html
* and place it into your theme directory.
Modified: trunk/themes/Sidebar/hyperwiki.php
===================================================================
--- trunk/themes/Sidebar/hyperwiki.php 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Sidebar/hyperwiki.php 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php
- // rcs_id('$Id$');
+ // $Id$
/* Download hyperwiki.jar and GraphXML.dtd from
* http://hypergraph.sourceforge.net/download.html
* and place it into your theme directory.
Modified: trunk/themes/Sidebar/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/actionbar.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Sidebar/templates/actionbar.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
$dbh = $request->getDbh();
$isAdmin = $user->isAdmin();
$pagename = $page->getName();
Modified: trunk/themes/Sidebar/templates/body.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/body.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Sidebar/templates/body.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
// Set the body attr dynamically. here class="ns-2" for Mozilla
?>
<body <?php echo $WikiTheme->getMoreAttr('body') ?>>
Modified: trunk/themes/Sidebar/templates/calendar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/calendar.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Sidebar/templates/calendar.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<div id="calendar"></div>
<?php echo JavaScript('
Modified: trunk/themes/Sidebar/templates/content.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/content.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Sidebar/templates/content.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php echo $CONTENT ?>
</body>
Modified: trunk/themes/Sidebar/templates/debug.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/debug.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Sidebar/templates/debug.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php global $RUNTIMER; ?>
<table width="%100" border="0" cellpadding="0" cellspacing="0">
Modified: trunk/themes/Sidebar/templates/dump-footer.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/dump-footer.tmpl 2011-03-03 16:41:35 UTC (rev 7955)
+++ trunk/themes/Sidebar/templates/dump-footer.tmpl 2011-03-03 17:08:31 UTC (rev 7956)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
if (empty($revision)) $revision = $page->getCurrentRevision();
?>
<hr ...
[truncated message content] |
|
From: <var...@us...> - 2011-03-03 16:41:44
|
Revision: 7955
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7955&view=rev
Author: vargenau
Date: 2011-03-03 16:41:35 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
Remove rcs_id
Modified Paths:
--------------
trunk/lib/plugin/AddComment.php
trunk/lib/plugin/AllPages.php
trunk/lib/plugin/AllUsers.php
trunk/lib/plugin/AnalyseAccessLogSql.php
trunk/lib/plugin/AppendText.php
trunk/lib/plugin/AsciiMath.php
trunk/lib/plugin/AsciiSVG.php
trunk/lib/plugin/AuthorHistory.php
trunk/lib/plugin/BackLinks.php
trunk/lib/plugin/BlogArchives.php
trunk/lib/plugin/BlogJournal.php
trunk/lib/plugin/BoxRight.php
trunk/lib/plugin/CacheTest.php
trunk/lib/plugin/Calendar.php
trunk/lib/plugin/CalendarList.php
trunk/lib/plugin/CategoryPage.php
trunk/lib/plugin/Chart.php
trunk/lib/plugin/Comment.php
trunk/lib/plugin/CreateBib.php
trunk/lib/plugin/CreatePage.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/CurrentTime.php
trunk/lib/plugin/DeadEndPages.php
trunk/lib/plugin/Diff.php
trunk/lib/plugin/DynamicIncludePage.php
trunk/lib/plugin/EditMetaData.php
trunk/lib/plugin/ExternalSearch.php
trunk/lib/plugin/FacebookLike.php
trunk/lib/plugin/FileInfo.php
trunk/lib/plugin/FoafViewer.php
trunk/lib/plugin/FullTextSearch.php
trunk/lib/plugin/FuzzyPages.php
trunk/lib/plugin/GoTo.php
trunk/lib/plugin/GoogleMaps.php
trunk/lib/plugin/GooglePlugin.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/HelloWorld.php
trunk/lib/plugin/HtmlConverter.php
trunk/lib/plugin/Imdb.php
trunk/lib/plugin/IncludePages.php
trunk/lib/plugin/IncludeSiteMap.php
trunk/lib/plugin/IncludeTree.php
trunk/lib/plugin/InterWikiSearch.php
trunk/lib/plugin/JabberPresence.php
trunk/lib/plugin/LdapSearch.php
trunk/lib/plugin/LikePages.php
trunk/lib/plugin/LinkDatabase.php
trunk/lib/plugin/LinkSearch.php
trunk/lib/plugin/ListPages.php
trunk/lib/plugin/ListRelations.php
trunk/lib/plugin/MediawikiTable.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/MostPopular.php
trunk/lib/plugin/NewPagesPerUser.php
trunk/lib/plugin/NoCache.php
trunk/lib/plugin/OldStyleTable.php
trunk/lib/plugin/OrphanedPages.php
trunk/lib/plugin/PageDump.php
trunk/lib/plugin/PageGroup.php
trunk/lib/plugin/PageHistory.php
trunk/lib/plugin/PageInfo.php
trunk/lib/plugin/PageTrail.php
trunk/lib/plugin/PasswordReset.php
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/PhpHighlight.php
trunk/lib/plugin/PhpWeather.php
trunk/lib/plugin/Ploticus.php
trunk/lib/plugin/PluginManager.php
trunk/lib/plugin/PopUp.php
trunk/lib/plugin/PopularNearby.php
trunk/lib/plugin/PopularTags.php
trunk/lib/plugin/PreferenceApp.php
trunk/lib/plugin/PrevNext.php
trunk/lib/plugin/Processing.php
trunk/lib/plugin/RandomPage.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/RawHtml.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/RecentChangesCached.php
trunk/lib/plugin/RecentComments.php
trunk/lib/plugin/RecentEdits.php
trunk/lib/plugin/RecentReferrers.php
trunk/lib/plugin/RedirectTo.php
trunk/lib/plugin/RelatedChanges.php
trunk/lib/plugin/RichTable.php
trunk/lib/plugin/RssFeed.php
trunk/lib/plugin/SearchHighlight.php
trunk/lib/plugin/SemanticRelations.php
trunk/lib/plugin/SemanticSearch.php
trunk/lib/plugin/SemanticSearchAdvanced.php
trunk/lib/plugin/SiteMap.php
trunk/lib/plugin/SpellCheck.php
trunk/lib/plugin/SqlResult.php
trunk/lib/plugin/SyncWiki.php
trunk/lib/plugin/SyntaxHighlighter.php
trunk/lib/plugin/SystemInfo.php
trunk/lib/plugin/TeX2png.php
trunk/lib/plugin/TexToPng.php
trunk/lib/plugin/TitleSearch.php
trunk/lib/plugin/TranslateText.php
trunk/lib/plugin/UpLoad.php
trunk/lib/plugin/UriResolver.php
trunk/lib/plugin/UserPreferences.php
trunk/lib/plugin/UserRatings.php
trunk/lib/plugin/Video.php
trunk/lib/plugin/VisualWiki.php
trunk/lib/plugin/WantedPages.php
trunk/lib/plugin/WantedPagesOld.php
trunk/lib/plugin/WatchPage.php
trunk/lib/plugin/WhoIsOnline.php
trunk/lib/plugin/WikiAdminChmod.php
trunk/lib/plugin/WikiAdminChown.php
trunk/lib/plugin/WikiAdminMarkup.php
trunk/lib/plugin/WikiAdminPurge.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/lib/plugin/WikiAdminSelect.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/lib/plugin/WikiAdminSetAclSimple.php
trunk/lib/plugin/WikiAdminSetExternal.php
trunk/lib/plugin/WikiAdminUtils.php
trunk/lib/plugin/WikiBlog.php
trunk/lib/plugin/WikiForm.php
trunk/lib/plugin/WikiFormRich.php
trunk/lib/plugin/WikiForum.php
trunk/lib/plugin/WikiPoll.php
trunk/lib/plugin/YouTube.php
trunk/lib/plugin/_AuthInfo.php
trunk/lib/plugin/_BackendInfo.php
trunk/lib/plugin/_GroupInfo.php
trunk/lib/plugin/_PreferencesInfo.php
trunk/lib/plugin/_Retransform.php
trunk/lib/plugin/text2png.php
Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/AddComment.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/AllPages.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/AllUsers.php
===================================================================
--- trunk/lib/plugin/AllUsers.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/AllUsers.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2002,2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/AnalyseAccessLogSql.php
===================================================================
--- trunk/lib/plugin/AnalyseAccessLogSql.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/AnalyseAccessLogSql.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2005 Charles Corrigan and $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/AppendText.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004,2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/AsciiMath.php
===================================================================
--- trunk/lib/plugin/AsciiMath.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/AsciiMath.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2005 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/AsciiSVG.php
===================================================================
--- trunk/lib/plugin/AsciiSVG.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/AsciiSVG.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/AuthorHistory.php
===================================================================
--- trunk/lib/plugin/AuthorHistory.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/AuthorHistory.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/BackLinks.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/BlogArchives.php
===================================================================
--- trunk/lib/plugin/BlogArchives.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/BlogArchives.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/BlogJournal.php
===================================================================
--- trunk/lib/plugin/BlogJournal.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/BlogJournal.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2005 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/BoxRight.php
===================================================================
--- trunk/lib/plugin/BoxRight.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/BoxRight.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2006 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/CacheTest.php
===================================================================
--- trunk/lib/plugin/CacheTest.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/CacheTest.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2002 Johannes Große
*
Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/Calendar.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/CalendarList.php
===================================================================
--- trunk/lib/plugin/CalendarList.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/CalendarList.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* * Copyright 1999-2002,2005-2007 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/plugin/CategoryPage.php
===================================================================
--- trunk/lib/plugin/CategoryPage.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/CategoryPage.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/Chart.php
===================================================================
--- trunk/lib/plugin/Chart.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/Chart.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2007 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/Comment.php
===================================================================
--- trunk/lib/plugin/Comment.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/Comment.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2003 Martin Geisler
Modified: trunk/lib/plugin/CreateBib.php
===================================================================
--- trunk/lib/plugin/CreateBib.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/CreateBib.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/CreatePage.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2004,2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/CreateToc.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004,2005 $ThePhpWikiProgrammingTeam
* Copyright 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/CurrentTime.php
===================================================================
--- trunk/lib/plugin/CurrentTime.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/CurrentTime.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
*
Modified: trunk/lib/plugin/DeadEndPages.php
===================================================================
--- trunk/lib/plugin/DeadEndPages.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/DeadEndPages.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* This file is part of PhpWiki.
*
Modified: trunk/lib/plugin/Diff.php
===================================================================
--- trunk/lib/plugin/Diff.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/Diff.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002, 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/DynamicIncludePage.php
===================================================================
--- trunk/lib/plugin/DynamicIncludePage.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/DynamicIncludePage.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2009 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/EditMetaData.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/ExternalSearch.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/FacebookLike.php
===================================================================
--- trunk/lib/plugin/FacebookLike.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/FacebookLike.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2010 Reini Urban
*
Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/FileInfo.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2005,2007 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/FoafViewer.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/FullTextSearch.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 1999-2002,2004,2005,2007,2009 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/FuzzyPages.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/GoTo.php
===================================================================
--- trunk/lib/plugin/GoTo.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/GoTo.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/GoogleMaps.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2005 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/GooglePlugin.php
===================================================================
--- trunk/lib/plugin/GooglePlugin.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/GooglePlugin.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/GraphViz.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/HelloWorld.php
===================================================================
--- trunk/lib/plugin/HelloWorld.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/HelloWorld.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/HtmlConverter.php
===================================================================
--- trunk/lib/plugin/HtmlConverter.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/HtmlConverter.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2005 Wincor Nixdorf International GmbH
*
Modified: trunk/lib/plugin/Imdb.php
===================================================================
--- trunk/lib/plugin/Imdb.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/Imdb.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/IncludePages.php
===================================================================
--- trunk/lib/plugin/IncludePages.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/IncludePages.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/IncludeSiteMap.php
===================================================================
--- trunk/lib/plugin/IncludeSiteMap.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/IncludeSiteMap.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2003,2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/IncludeTree.php
===================================================================
--- trunk/lib/plugin/IncludeTree.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/IncludeTree.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2003,2004,2009 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/InterWikiSearch.php
===================================================================
--- trunk/lib/plugin/InterWikiSearch.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/InterWikiSearch.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/JabberPresence.php
===================================================================
--- trunk/lib/plugin/JabberPresence.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/JabberPresence.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/LdapSearch.php
===================================================================
--- trunk/lib/plugin/LdapSearch.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/LdapSearch.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- // rcs_id('$Id$');
+<?php // -*-php-*- // $Id$
/**
* Copyright 2004 John Lines
* Copyright 2007 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/plugin/LikePages.php
===================================================================
--- trunk/lib/plugin/LikePages.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/LikePages.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/LinkDatabase.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2004,2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/LinkSearch.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2007 Reini Urban
*
Modified: trunk/lib/plugin/ListPages.php
===================================================================
--- trunk/lib/plugin/ListPages.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/ListPages.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/ListRelations.php
===================================================================
--- trunk/lib/plugin/ListRelations.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/ListRelations.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2006 Reini Urban
*
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/MediawikiTable.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2003 Sameer D. Sahasrabuddhe
* Copyright (C) 2005 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/ModeratedPage.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004,2005 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/MostPopular.php
===================================================================
--- trunk/lib/plugin/MostPopular.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/MostPopular.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/NewPagesPerUser.php
===================================================================
--- trunk/lib/plugin/NewPagesPerUser.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/NewPagesPerUser.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2007 AVL
*
Modified: trunk/lib/plugin/NoCache.php
===================================================================
--- trunk/lib/plugin/NoCache.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/NoCache.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/OldStyleTable.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/OrphanedPages.php
===================================================================
--- trunk/lib/plugin/OrphanedPages.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/OrphanedPages.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* This file is part of PhpWiki.
*
Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PageDump.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2003 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PageGroup.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PageHistory.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002, 2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/PageInfo.php
===================================================================
--- trunk/lib/plugin/PageInfo.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PageInfo.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/PageTrail.php
===================================================================
--- trunk/lib/plugin/PageTrail.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PageTrail.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999,2000,2001,2002,2005 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PasswordReset.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright (C) 2006 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PhotoAlbum.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2003,2004,2005,2007 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PhpHighlight.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/PhpWeather.php
===================================================================
--- trunk/lib/plugin/PhpWeather.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PhpWeather.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id PhpWeather.php 2002-08-26 15:30:13 rurban$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/Ploticus.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PluginManager.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/PopUp.php
===================================================================
--- trunk/lib/plugin/PopUp.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PopUp.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2004 Nicolas Noble <pi...@us...>
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/PopularNearby.php
===================================================================
--- trunk/lib/plugin/PopularNearby.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PopularNearby.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/PopularTags.php
===================================================================
--- trunk/lib/plugin/PopularTags.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PopularTags.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2007 Reini Urban
*
Modified: trunk/lib/plugin/PreferenceApp.php
===================================================================
--- trunk/lib/plugin/PreferenceApp.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PreferenceApp.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/PrevNext.php
===================================================================
--- trunk/lib/plugin/PrevNext.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/PrevNext.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
* Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/Processing.php
===================================================================
--- trunk/lib/plugin/Processing.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/Processing.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2009 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/RandomPage.php
===================================================================
--- trunk/lib/plugin/RandomPage.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/RandomPage.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999,2000,2001,2002,2005 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/RateIt.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004,2007,2009 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/RawHtml.php
===================================================================
--- trunk/lib/plugin/RawHtml.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/RawHtml.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/RecentChanges.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/RecentChangesCached.php
===================================================================
--- trunk/lib/plugin/RecentChangesCached.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/RecentChangesCached.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
* Copyright (C) 2002 Johannes Große |
Modified: trunk/lib/plugin/RecentComments.php
===================================================================
--- trunk/lib/plugin/RecentComments.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/RecentComments.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/RecentEdits.php
===================================================================
--- trunk/lib/plugin/RecentEdits.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/RecentEdits.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/RecentReferrers.php
===================================================================
--- trunk/lib/plugin/RecentReferrers.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/RecentReferrers.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/RedirectTo.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2002 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/RelatedChanges.php
===================================================================
--- trunk/lib/plugin/RelatedChanges.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/RelatedChanges.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/RichTable.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2003 Sameer D. Sahasrabuddhe
* Copyright (C) 2005 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/plugin/RssFeed.php
===================================================================
--- trunk/lib/plugin/RssFeed.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/RssFeed.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2003 Arnaud Fontaine
*
Modified: trunk/lib/plugin/SearchHighlight.php
===================================================================
--- trunk/lib/plugin/SearchHighlight.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/SearchHighlight.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004,2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/SemanticRelations.php
===================================================================
--- trunk/lib/plugin/SemanticRelations.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/SemanticRelations.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2005 Reini Urban
*
Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/SemanticSearch.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2007 Reini Urban
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2007 Reini Urban
*
Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/SiteMap.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/SpellCheck.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2006,2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/SqlResult.php
===================================================================
--- trunk/lib/plugin/SqlResult.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/SqlResult.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/SyncWiki.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2006 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/SyntaxHighlighter.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/SystemInfo.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright (C) 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/TeX2png.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) Copyright 2004 Pierrick Meignen
*
Modified: trunk/lib/plugin/TexToPng.php
===================================================================
--- trunk/lib/plugin/TexToPng.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/TexToPng.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
* Copyright (C) 2002 Johannes Große
Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/TitleSearch.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999,2000,2001,2002,2004,2005,2010 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/TranslateText.php
===================================================================
--- trunk/lib/plugin/TranslateText.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/TranslateText.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/UpLoad.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2003,2004,2007 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/UriResolver.php
===================================================================
--- trunk/lib/plugin/UriResolver.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/UriResolver.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/UserPreferences.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright (C) 2001,2002,2003,2004,2005 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/UserRatings.php
===================================================================
--- trunk/lib/plugin/UserRatings.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/UserRatings.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2004 Dan Frankowski
*
Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/Video.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2009 Roger Guignard and Marc-Etienne Vargenau, Alcatel-Lucent
*
Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/VisualWiki.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2002 Johannes Große (Johannes Große)
*
Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WantedPages.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2002, 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WantedPagesOld.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* This file is part of PhpWiki.
*
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WatchPage.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright (C) 2006 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/WhoIsOnline.php
===================================================================
--- trunk/lib/plugin/WhoIsOnline.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WhoIsOnline.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/WikiAdminChmod.php
===================================================================
--- trunk/lib/plugin/WikiAdminChmod.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiAdminChmod.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
* Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiAdminChown.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/WikiAdminMarkup.php
===================================================================
--- trunk/lib/plugin/WikiAdminMarkup.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiAdminMarkup.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2005 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiAdminPurge.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2002,2004 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiAdminRemove.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2002,2004 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiAdminRename.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004,2005,2007 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004,2007 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiAdminSelect.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2002 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiAdminSetAcl.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
* Copyright 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiAdminSetExternal.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2005 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiAdminUtils.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2003,2004,2006 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiBlog.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2002,2003,2007,2009 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/WikiForm.php
===================================================================
--- trunk/lib/plugin/WikiForm.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiForm.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002, 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiFormRich.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004,2006,2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/WikiForum.php
===================================================================
--- trunk/lib/plugin/WikiForum.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiForum.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/WikiPoll.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
* Copyright 2008 Marc-Etienne Vargenau, Alcatel-lucent
Modified: trunk/lib/plugin/YouTube.php
===================================================================
--- trunk/lib/plugin/YouTube.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/YouTube.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2007 Reini Urban
* Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/plugin/_AuthInfo.php
===================================================================
--- trunk/lib/plugin/_AuthInfo.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/_AuthInfo.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/_BackendInfo.php
===================================================================
--- trunk/lib/plugin/_BackendInfo.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/_BackendInfo.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999,2000,2001,2002,2006,2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/_GroupInfo.php
===================================================================
--- trunk/lib/plugin/_GroupInfo.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/_GroupInfo.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/_PreferencesInfo.php
===================================================================
--- trunk/lib/plugin/_PreferencesInfo.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/_PreferencesInfo.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/_Retransform.php
===================================================================
--- trunk/lib/plugin/_Retransform.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/_Retransform.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Copyright 2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php 2011-03-03 16:34:56 UTC (rev 7954)
+++ trunk/lib/plugin/text2png.php 2011-03-03 16:41:35 UTC (rev 7955)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-03 16:35:04
|
Revision: 7954
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7954&view=rev
Author: vargenau
Date: 2011-03-03 16:34:56 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
One $Id$ is enough
Modified Paths:
--------------
trunk/lib/spam_babycart.php
Modified: trunk/lib/spam_babycart.php
===================================================================
--- trunk/lib/spam_babycart.php 2011-03-03 16:21:48 UTC (rev 7953)
+++ trunk/lib/spam_babycart.php 2011-03-03 16:34:56 UTC (rev 7954)
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
* $Id$
* Author: Bob Apthorpe <apt...@cy...>
@@ -75,4 +74,4 @@
trigger_error("Couldn't process ".BABYCART_PATH.".\n".$error, E_USER_WARNING);
return -1; // process error
}
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-03 16:21:57
|
Revision: 7953
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7953&view=rev
Author: vargenau
Date: 2011-03-03 16:21:48 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
Remove rcs_id
Modified Paths:
--------------
trunk/lib/AccessLog.php
trunk/lib/ArchiveCleaner.php
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/Captcha.php
trunk/lib/DbSession.php
trunk/lib/DbaDatabase.php
trunk/lib/DbaListSet.php
trunk/lib/DbaPartition.php
trunk/lib/EditToolbar.php
trunk/lib/ErrorManager.php
trunk/lib/ExternalReferrer.php
trunk/lib/FileFinder.php
trunk/lib/HtmlElement.php
trunk/lib/HtmlElement5.php
trunk/lib/HtmlParser.php
trunk/lib/HttpClient.php
trunk/lib/IniConfig.php
trunk/lib/InlineParser.php
trunk/lib/MailNotify.php
trunk/lib/PageList.php
trunk/lib/PagePerm.php
trunk/lib/PageType.php
trunk/lib/RSSWriter091.php
trunk/lib/Request.php
trunk/lib/RssParser.php
trunk/lib/RssWriter.php
trunk/lib/RssWriter2.php
trunk/lib/SemanticWeb.php
trunk/lib/SpamBlocklist.php
trunk/lib/Template.php
trunk/lib/TextSearchQuery.php
trunk/lib/Units.php
trunk/lib/WikiCallback.php
trunk/lib/WikiDB.php
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser.php
trunk/lib/WikiUserNew.php
trunk/lib/WysiwygEdit.php
trunk/lib/XmlElement.php
trunk/lib/XmlParser.php
trunk/lib/config.php
trunk/lib/diff.php
trunk/lib/diff3.php
trunk/lib/difflib.php
trunk/lib/display.php
trunk/lib/editpage.php
trunk/lib/fortune.php
trunk/lib/imagecache.php
trunk/lib/imdb.php
trunk/lib/install.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/pdf.php
trunk/lib/prepend.php
trunk/lib/purgepage.php
trunk/lib/removepage.php
trunk/lib/spam_babycart.php
trunk/lib/stdlib.php
trunk/lib/upgrade.php
trunk/lib/ziplib.php
Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/AccessLog.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2005, 2007 Reini Urban
*
Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/ArchiveCleaner.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
*
* This file is part of PhpWiki.
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/BlockParser.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
* Copyright (C) 2004,2005 Reini Urban
* Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/CachedMarkup.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
* Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam
* Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/Captcha.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/**
* Session Captcha v1.0
* by Gavin M. Roy <gm...@bt...>
Modified: trunk/lib/DbSession.php
===================================================================
--- trunk/lib/DbSession.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/DbSession.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/**
* Store sessions data in Pear DB / ADODB / dba / PDO, ....
Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/DbaDatabase.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
require_once('lib/ErrorManager.php');
Modified: trunk/lib/DbaListSet.php
===================================================================
--- trunk/lib/DbaListSet.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/DbaListSet.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
class DbaListSet
{
Modified: trunk/lib/DbaPartition.php
===================================================================
--- trunk/lib/DbaPartition.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/DbaPartition.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
class DbaPartition
{
Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/EditToolbar.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/* Copyright 2004-2010 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
*
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/ErrorManager.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
if (isset($GLOBALS['ErrorManager'])) return;
Modified: trunk/lib/ExternalReferrer.php
===================================================================
--- trunk/lib/ExternalReferrer.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/ExternalReferrer.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/**
* Detect external referrers
Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/FileFinder.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
require_once(dirname(__FILE__).'/stdlib.php');
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/HtmlElement.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/**
* Code for writing the HTML subset of XML.
* @author: Jeff Dairiki
Modified: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/HtmlElement5.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/**
* Code for writing the HTML subset of XML.
* @author: Jeff Dairiki
Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/HtmlParser.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* HtmlParser Class: Conversion HTML => wikimarkup
* Requires XmlParser, XmlElement and the expat (or now the libxml) library. This is all in core.
Modified: trunk/lib/HttpClient.php
===================================================================
--- trunk/lib/HttpClient.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/HttpClient.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
Version 0.9, 6th April 2003 - Simon Willison ( http://simon.incutio.com/ )
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/IniConfig.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/**
* A configurator intended to read its config from a PHP-style INI file,
* instead of a PHP file.
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/InlineParser.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
* Copyright (C) 2004-2010 Reini Urban
* Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/MailNotify.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/* Copyright (C) 2006-2007,2009 Reini Urban
* Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent
*
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/PageList.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-//rcs_id('$Id$');
+//$Id$
/* Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam
* Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
*
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/PagePerm.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004,2007 $ThePhpWikiProgrammingTeam
* Copyright 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/PageType.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 1999,2000,2001,2002,2003,2004,2005,2006 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/RSSWriter091.php
===================================================================
--- trunk/lib/RSSWriter091.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/RSSWriter091.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -21,7 +21,7 @@
// for outputting RecentChanges in RSS 0.91 format
// ----------------------------------------------------------------------
-// rcs_id('$Id$');
+// $Id$
include_once("lib/RssWriter.php");
class RSSWriter091 extends RSSWriter
Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/Request.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2002,2004,2005,2006,2009 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/RssParser.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Simple RSSParser Class
* Based on Duncan Gough RSSParser class
Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/RssWriter.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/*
* Code for creating RSS 1.0.
*/
Modified: trunk/lib/RssWriter2.php
===================================================================
--- trunk/lib/RssWriter2.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/RssWriter2.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/*
* Code for creating RSS 2.0
* Author: Reini Urban for PhpWiki
Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/SemanticWeb.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/**
* What to do on ?format=rdf What to do on ?format=owl
*
Modified: trunk/lib/SpamBlocklist.php
===================================================================
--- trunk/lib/SpamBlocklist.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/SpamBlocklist.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/* Copyright (C) 2005 Reini Urban
*
* This file is part of PhpWiki.
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/Template.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
require_once("lib/ErrorManager.php");
Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/TextSearchQuery.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/**
* A text search query, converting queries to PCRE and SQL matchers.
*
Modified: trunk/lib/Units.php
===================================================================
--- trunk/lib/Units.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/Units.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/**
*
* Interface to man units(1), /usr/share/units.dat
Modified: trunk/lib/WikiCallback.php
===================================================================
--- trunk/lib/WikiCallback.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/WikiCallback.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* A callback
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/WikiDB.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php //rcs_id('$Id$');
+<?php //$Id$
require_once('lib/PageType.php');
/**
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/WikiPlugin.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
class WikiPlugin
{
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/WikiPluginCached.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/*
* Copyright (C) 2002 Johannes Große
* Copyright (C) 2004,2007 Reini Urban
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/WikiTheme.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/* Copyright (C) 2002,2004,2005,2006,2008,2009,2010 $ThePhpWikiProgrammingTeam
*
* This file is part of PhpWiki.
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/WikiUser.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
// It is anticipated that when userid support is added to phpwiki,
// this object will hold much more information (e-mail,
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/WikiUserNew.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-//rcs_id('$Id$');
+//$Id$
/* Copyright (C) 2004,2005,2006,2007,2009,2010 $ThePhpWikiProgrammingTeam
* Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
* Copyright (C) 2009-2010 Roger Guignard, Alcatel-Lucent
Modified: trunk/lib/WysiwygEdit.php
===================================================================
--- trunk/lib/WysiwygEdit.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/WysiwygEdit.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/**
* Baseclass for WysiwygEdit/*
*
Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/XmlElement.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/**
* Code for writing XML.
* @package Markup
Modified: trunk/lib/XmlParser.php
===================================================================
--- trunk/lib/XmlParser.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/XmlParser.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/**
* Base XmlParser Class.
* Requires the expat.so/.dll, usually enabled by default.
Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/config.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/*
* NOTE: The settings here should probably not need to be changed.
* The user-configurable settings have been moved to IniConfig.php
Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/diff.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
// diff.php
//
// PhpWiki diff output code.
Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/diff3.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
// diff3.php
//
// A class for computing three way diffs
Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/difflib.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
// difflib.php
//
Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/display.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,6 +1,6 @@
<?php
// display.php: fetch page or get default content
-// rcs_id('$Id$');
+// $Id$
require_once('lib/Template.php');
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/editpage.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
require_once('lib/Template.php');
Modified: trunk/lib/fortune.php
===================================================================
--- trunk/lib/fortune.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/fortune.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,6 +1,6 @@
<?php
-// rcs_id('PHP Fortune - Made by he...@aa.... HP: http://www.aasted.org');
-// rcs_id('$Id$');
+// PHP Fortune - Made by he...@aa.... HP: http://www.aasted.org
+// $Id$
/*
Main methods to use:
quoteFromDir($dir):
Modified: trunk/lib/imagecache.php
===================================================================
--- trunk/lib/imagecache.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/imagecache.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/*
* Copyright (C) 2002 Johannes Große
*
Modified: trunk/lib/imdb.php
===================================================================
--- trunk/lib/imdb.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/imdb.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/**
* Copyright 2004 Reini Urban
*
Modified: trunk/lib/install.php
===================================================================
--- trunk/lib/install.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/install.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/loadsave.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 1999,2000,2001,2002,2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/main.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 1999-2008 $ThePhpWikiProgrammingTeam
* Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/pdf.php
===================================================================
--- trunk/lib/pdf.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/pdf.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright (C) 2003 Olivier PLATHEY
* Copyright (C) 200? Don Sebà
Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/prepend.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -3,7 +3,7 @@
*
* Things which must be done and defined before anything else.
*/
-// rcs_id('$Id$');
+// $Id$
// see lib/stdlib.php: phpwiki_version()
define('PHPWIKI_VERSION', '1.4.0RC1');
Modified: trunk/lib/purgepage.php
===================================================================
--- trunk/lib/purgepage.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/purgepage.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
require_once('lib/Template.php');
function PurgePage (&$request) {
Modified: trunk/lib/removepage.php
===================================================================
--- trunk/lib/removepage.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/removepage.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
require_once('lib/Template.php');
function RemovePage (&$request) {
Modified: trunk/lib/spam_babycart.php
===================================================================
--- trunk/lib/spam_babycart.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/spam_babycart.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id$');
+// $Id$
/*
* $Id$
* Author: Bob Apthorpe <apt...@cy...>
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/stdlib.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/*
* Copyright 1999-2008 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/upgrade.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-// rcs_id('$Id$');
+// $Id$
/*
* Copyright 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
* Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php 2011-03-03 15:50:28 UTC (rev 7952)
+++ trunk/lib/ziplib.php 2011-03-03 16:21:48 UTC (rev 7953)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id$');
+<?php // $Id$
/**
* GZIP stuff.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-03 15:50:37
|
Revision: 7952
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7952&view=rev
Author: vargenau
Date: 2011-03-03 15:50:28 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
Regenerate locale
Modified Paths:
--------------
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.php
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php 2011-03-03 15:45:49 UTC (rev 7951)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2011-03-03 15:50:28 UTC (rev 7952)
@@ -1,7 +1,5 @@
<?php
-$locale[" %d%% (%d/%d)"] =
- " %d%% (%d/%d)";
$locale[" (syntax error for latex) "] =
" (erreur de syntaxe pour latex) ";
$locale[" (to pages linked from \"%s\")"] =
@@ -15,15 +13,23 @@
$locale[" ... first %d lines"] =
"... %d premières lignes";
$locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] =
- "De plus, essayez de conserver les dernières contributions de tous les auteurs depuis les %d derniers jours (même s'il y en a plus que %d), mais ne conservez en aucun cas plus que %d révisions par auteur.";
+ "De plus, essayez de conserver les dernières contributions de tous les auteurs depuis les %d derniers jours (même s'il y en a plus que %d), mais ne conservez en aucun cas plus que %d versions par auteur.";
$locale[" Keep the latest contributions of the last %d authors up to %d days."] =
"Garder les dernières contributions des derniers %d auteurs jusqu'à %d jours.";
$locale[" Keep up to %d minor edits, but keep them no longer than %d days."] =
"Garder jusqu'à %d édition mineures, mais pas plus que %d jours.";
+$locale[" Skipped"] =
+ "Ignoré.";
$locale[" Sorry, cannot merge."] =
" Désolé, impossible de fusionner.";
$locale[" and "] =
" et ";
+$locale[" for all pages linking to %s"] =
+ " pour les pages liées à %s.";
+$locale[" for all pages matching '%s'"] =
+ " pour les pages correspondant à %s.";
+$locale[" for pages changed by %s"] =
+ " pour les pages modifiées par %s";
$locale[" for pages owned by %s"] =
" pour les pages possédées par %s";
$locale[" is identical."] =
@@ -32,12 +38,16 @@
" remplace ";
$locale[" skipped"] =
" ignoré";
+$locale[" to "] =
+ " à ";
$locale[" was created because: "] =
- " a été créé car : ";
+ " a été créée car : ";
+$locale["# things"] =
+ "Nb d'éléments";
$locale["%4d %s\n"] =
"%4d %s\n";
$locale["%d UserPreferences fields successfully updated."] =
- "%d préférences mises à jour avec succès.";
+ "%d préférences ont été mises à jour avec succès.";
$locale["%d best incoming links: "] =
"%d meilleurs liens entrants : ";
$locale["%d best outgoing links: "] =
@@ -51,15 +61,23 @@
$locale["%d not-empty pages"] =
"%d pages non vides";
$locale["%d online users"] =
- "%d visiteurs en ligne";
+ "%d utilisateurs en ligne";
$locale["%d page(s) with more than %d hits (>%d%%)."] =
"%d pages ayant eu plus de %d visiteurs (>%d%%).";
$locale["%d pages"] =
"%d pages";
+$locale["%d pages have been changed."] =
+ "%d pages ont été modifiées.";
+$locale["%d pages have been changed:"] =
+ "%d pages ont été modifiées :";
+$locale["%d pages have been permanently purged:"] =
+ "%d pages ont été définitivement purgées :";
$locale["%d pages with less than %d hits (<%d%%)."] =
"%d pages ayant eu moins de %d visiteurs (<%d%%).";
$locale["%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."] =
- "%s %s %s est interdite sur ce wiki pour %s l'utilisateur '%s' (niveau : %s).";
+ "%s %s %s est interdite sur ce wiki pour %s l'utilisateur « %s » (niveau : %s).";
+$locale["%s KiB (%s bytes)"] =
+ "%s Kio (%s octets)";
$locale["%s already exists"] =
"%s existe déjà";
$locale["%s at %s"] =
@@ -73,7 +91,7 @@
$locale["%s days"] =
"%s jours";
$locale["%s does not appear to be a WikiPlugin."] =
- "%s ne semble pas être un plugin.";
+ "%s ne semble pas être un greffon.";
$locale["%s does not exist"] =
"%s n'existe pas";
$locale["%s does not know about the language '%s', using 'en' instead."] =
@@ -91,13 +109,15 @@
$locale["%s is not locked!"] =
"%s n'est pas verrouillé!";
$locale["%s is not writable."] =
- "%s n'est pas accessible en écriture.";
+ "%s n'est pas modifiable.";
$locale["%s is only allowed in locked pages."] =
"%s n'est autorisé que dans les pages verrouillées.";
$locale["%s not defined"] =
- "%s : non défini";
+ "%s non défini";
$locale["%s not found"] =
"%s non trouvé";
+$locale["%s not found in %s"] =
+ "%s non trouvé dans %s";
$locale["%s of this page"] =
"%s de cette page";
$locale["%s on %s:"] =
@@ -119,7 +139,7 @@
$locale["%s: Can't open dba database"] =
"%s : impossible d'ouvrir la base de données dba";
$locale["%s: Date of new revision is %s"] =
- "%s : la date de la nouvelle révision est %s";
+ "%s : la date de la nouvelle version est %s";
$locale["%s: argument index out of range"] =
"%s : index d'argument hors intervalle";
$locale["%s: error while handling error:"] =
@@ -128,20 +148,22 @@
"%s : fichier non trouvé";
$locale["%s: no such class"] =
"<%s : pas de section de ce type>";
+$locale["%s: no such revision %d."] =
+ "%s(%d) : version inexistante";
$locale["%s: not a subclass of WikiPlugin."] =
"%s n'est pas une sous classe de WikiPlugin.";
$locale["%s: not defined"] =
"%s : non défini";
+$locale["' in page name."] =
+ "' dans le nom de la page.";
$locale["'%s': Bad page name"] =
- "%s : Nom de page invalide";
-$locale["'%s': Bad page name: %s"] =
- "'%s': Nom de page invalide : : %s";
+ "'%s' : nom de page non valide";
$locale["'%s': corrupt file"] =
"'%s' : ce fichier est abîmé";
+$locale["(%d Links)"] =
+ "(%d liens)";
$locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] =
- "(Copiez vos modifications dans le presse-papier. Vous pouvez essayer d'éditer une page différente ou sauver votre texte dans un éditeur).";
-$locale["(Currently not working)"] =
- "(Non recommandé !)";
+ "(Copiez vos modifications dans le presse-papier. Vous pouvez essayer de modifier une page différente ou enregistrer votre texte à l'aide d'un éditeur).";
$locale["(Redirected from %s)"] =
"(Redirigé de %s)";
$locale["(Your preferences are stored as hidden data within this page)."] =
@@ -150,6 +172,10 @@
"(diff)";
$locale["(disable individual page permissions, enable inheritance)?"] =
"(désactive les permissions individuelles par page, activer l'héritage) ?";
+$locale["(formatted for PhpWiki developers as pgsrc template, not for backing up)"] =
+ "(format pour les développeurs, pas pour la sauvegarde)";
+$locale["(formatted for backing up: all revisions)"] =
+ "(format de sauvegarde : toutes les versions)";
$locale["(max. recursion level: %d)"] =
"(niveau maximum de récursivité: %d)";
$locale["(ugo : rwx)"] =
@@ -157,7 +183,7 @@
$locale[", Memory: %s"] =
", RAM: %s";
$locale["- saved to database as version %d"] =
- "- sauvée dans la base de données sous la version %d";
+ "- enregistrée dans la base de données sous la version %d";
$locale["- version %d saved to database as version %d"] =
"- version %d sauvée dans la base de données sous la version %d";
$locale["-???"] =
@@ -174,38 +200,42 @@
"1 jour";
$locale["1 word"] =
"1 mot";
+$locale[": "] =
+ " : ";
$locale["<%s: no such section>"] =
"<%s : pas de section de ce type>";
$locale["<<"] =
"<<";
+$locale["<< Prev"] =
+ "<< Précédent";
$locale["<empty>"] =
"<vide>";
$locale["<no matches>"] =
"<aucun résultat>";
$locale["<none>"] =
- "<aucune>";
+ "<aucun>";
$locale["<not displayed>"] =
"<non affiché>";
$locale["<system language>"] =
"< langue du système >";
-$locale["<system theme>"] =
- "<thème système>";
$locale["<unknown>"] =
- "<inconnue>";
+ "<inconnu>";
$locale[">>"] =
">>";
-$locale[">>|"] =
- ">>|";
$locale["A plugin to provide for raw HTML within wiki pages."] =
"Un Plugin pour intégrer du code HTML dans les WikiPages.";
-$locale["A required argument '%s' is missing."] =
- "Un argument requis '%s' est manquant.";
$locale["ACCESS DENIED: You must log in to upload files."] =
"ACCES REFUSE: Vous devez être connecté pour uploader.";
$locale["ACL"] =
"ACL";
+$locale["ACL changed for page '%s'"] =
+ "ACL modifié pour la page %s.";
$locale["ACL not changed for page '%s'."] =
"ACL inchangé pour la page %s.";
+$locale["ACL type:"] =
+ "Type d'ACL :";
+$locale["ACL:"] =
+ "ACL :";
$locale["ADDING"] =
"AJOUT";
$locale["ADMIN"] =
@@ -217,55 +247,67 @@
$locale["Access"] =
"Accès";
$locale["Access Rights"] =
- "Droits d'acces";
+ "Droits d'accès";
$locale["Access denied to change page '%s'."] =
"Accès refusé pour changer la page '%s'.";
+$locale["Access denied to rename page '%s'."] =
+ "Accès refusé pour renommer la page '%s'.";
$locale["Access for you is forbidden to %s."] =
"L'accès à %s vous est interdit.";
$locale["Action Page"] =
"Page d'action";
$locale["Action page"] =
"Page d'action";
-$locale["ActionPage"] =
- "Page d'action";
$locale["Add %s hours to the server's local time when reporting times."] =
"Ajouter %s heures à l'heure locale du serveur pour afficher les horodatages.";
$locale["Add %s:"] =
"Ajouter %s :";
$locale["Add Comment"] =
"Ajouter un commentaire";
+$locale["Add Entry"] =
+ "Ajouter une entrée";
$locale["Add Google links to unknown pages behind the '?', and the create action behind the pagename instead. See %s."] =
- "Ajouter un liens vers Google pour les pages inconnues derrière le '?', et l'action de création. voir %s.";
+ "Ajouter un liens vers Google pour les pages inconnues derrière le '?', et l'action de création. Voir %s.";
+$locale["Add Image or Video"] =
+ "Ajouter une image ou une vidéo";
$locale["Add Message"] =
"Ajouter un message";
$locale["Add or change a page-level metadata 'key=>value' pair. Note that you can remove a key by leaving the value-box empty."] =
"Ajouter ou changer le niveau de page 'key=>value'. Notez que vous pouvez supprimer une clé en lui attribuant une valeur nulle.";
$locale["Add this ACL"] =
- "Ajouer cette ACL";
+ "Ajouter cette ACL";
$locale["AddCategory"] =
- "AjoutezCatégorie";
+ "Ajouter une catégorie";
$locale["AddComment"] =
"AjouterDesCommentaires";
$locale["AddPageLink"] =
- "AjouterDesPagesLien";
+ "Insérer un lien";
$locale["AddPlugin"] =
- "AjoutezPlugin";
+ "Insérer un greffon";
+$locale["AddTemplate"] =
+ "Ajouter un modèle";
$locale["Adjust"] =
"Ajuster";
$locale["Admin"] =
- "Administrateur";
+ "Administration";
$locale["Admin is also online."] =
"L'administrateur est aussi en ligne.";
$locale["Administration"] =
"Administration";
$locale["Administrators"] =
- "Administrateures";
+ "Administrateurs";
+$locale["Advanced..."] =
+ "Avancée...";
+$locale["All"] =
+ "Tout";
$locale["All %s are listed below."] =
"Toutes les %s sont énumérées ci-dessous.";
$locale["All modifications"] =
"Toutes les modifications";
$locale["All pages"] =
"Toutes les pages";
+$locale["All pages in this wiki (%d total):"] =
+ "Toutes les pages de ce wiki (%d au total) :";
$locale["All pages with all links in this wiki (%d total):"] =
"Tout pages avec tous les liens dans ce wiki (%d au total) :";
$locale["All time"] =
@@ -284,12 +326,14 @@
"Protocoles autorisés";
$locale["Allows selection of multiple pages which get passed to other WikiAdmin plugins."] =
"Permet de choisir plusieurs pages qui seront passées vers d'autre plugins WikiAdmin.";
+$locale["Already logged in"] =
+ "Déjà connecté";
$locale["Also pages which have been deleted at least %s days."] =
"Même les pages qui ont été supprimées il y a au plus %s days.";
$locale["An unnamed PhpWiki"] =
"Un PhpWiki sans titre";
$locale["Anonymous Users"] =
- "Utilisateur anonyme";
+ "Utilisateurs anonymes";
$locale["Appearance"] =
"Apparence";
$locale["Append text to any page in this wiki."] =
@@ -298,10 +342,28 @@
"ApposezLeTexte";
$locale["Application name"] =
"Nom de l'application";
+$locale["Application size: %d KiB"] =
+ "Taille de l'application : %d Kio";
$locale["Apply changes"] =
"Appliquer les changements.";
+$locale["Approve"] =
+ "Approuver";
+$locale["Archives"] =
+ "Archives";
+$locale["Are you sure you want to change the owner of the selected pages?"] =
+ "Êtes-vous sûr de vouloir changer le propriétaire des pages sélectionnées ?";
+$locale["Are you sure you want to permanently change access rights to the selected files?"] =
+ "Ëtes-vous sûr de vouloir définitivement modifier l'accès aux fichiers sélectionnés ?";
$locale["Are you sure you want to permanently change the selected files?"] =
- "Supprimer la page maintenant";
+ "Êtes-vous sûr de vouloir modifier de manière permanente les fichiers sélectionnés ?";
+$locale["Are you sure you want to permanently purge the following files?"] =
+ "Êtes-vous sûr de vouloir purger définitivement les pages suivantes ?";
+$locale["Are you sure you want to remove the selected files?"] =
+ "Êtes-vous certain de vouloir supprimer les fichiers sélectionnés ?";
+$locale["Are you sure you want to rename the selected pages?"] =
+ "Êtes-vous sûr de vouloir renommer les pages sélectionnées ?";
+$locale["Are you sure you want to replace text in the selected files?"] =
+ "Etes-vous sur de vouloir rechercher et remplacer dans les fichiers sélectionnées ?";
$locale["Argument '%s' not declared by plugin."] =
"argument '%s' non déclaré par le plugin.";
$locale["Arguments"] =
@@ -310,14 +372,18 @@
"Tentative d'utilisation du répertoire '%s' à la place.";
$locale["Attribute"] =
"Attribut";
+$locale["Attribute %s, value: %s"] =
+ "Attribut %s, valeur : %s";
+$locale["Attributes"] =
+ "Attributs";
+$locale["Attributes of %s"] =
+ "Attributs de %s";
$locale["Auth Level"] =
- "Niveau de l'authentification";
+ "Niveau d'autorisation";
$locale["Auth Method"] =
"Méthode d'authentification";
-$locale["AuthInfo"] =
- "InfosAuth";
$locale["Authenticated Users"] =
- "Utilisateurs connectés";
+ "Utilisateurs authentifiés";
$locale["Authenticated as %s"] =
"Vous êtes connecté en tant que %s";
$locale["Authenticated users on this wiki (%d total):"] =
@@ -325,29 +391,29 @@
$locale["Author"] =
"Auteur";
$locale["Author history"] =
- "Historique de l'auteur";
+ "Historique des auteurs";
$locale["Author will be logged as %s."] =
"L'auteur sera enregistré sous le nom %s.";
$locale["AuthorHistory"] =
"HistoriqueAuteur";
$locale["Available plugins"] =
- "Plugins disponibles";
+ "Greffons disponibles";
$locale["Avg. Rating"] =
- "Cote moyenne";
+ "Note moyenne";
$locale["BAD URL -- remove all of <, >, \""] =
"MAUVAIS URL -- retirez tous les <, >, \"";
-$locale["BAD phpwiki: URL"] =
- "MAUVAIS phpwiki: URL";
$locale["BOGO"] =
"BOGO";
+$locale["Back"] =
+ "Retour";
$locale["Back Links"] =
- "Pages liees";
+ "Pages liées";
$locale["BackLinks"] =
"RétroLiens";
$locale["BackLinks for %s"] =
- "RétroLiens pour %s";
+ "Page liées à %s";
$locale["Bad Version"] =
- "Mauvaise Version";
+ "Mauvaise version";
$locale["Bad file type: %s"] =
"Mauvais type de fichier : %s";
$locale["Bad url in src: remove all of <, >, \""] =
@@ -359,11 +425,13 @@
$locale["Bogo Users"] =
"Utilisateurs Bogo";
$locale["Bold text"] =
- "Texte en gras";
+ "Gras";
$locale["Bold text [alt-b]"] =
- "Texte en gras";
+ "Gras [alt-b]";
$locale["Browsing pages"] =
"Navigation en cours";
+$locale["Buddies:"] =
+ "Connaissances :";
$locale["CANCEL"] =
"ANNULE";
$locale["CREATED"] =
@@ -379,17 +447,21 @@
$locale["Can't mix '%s' with '%s' type format strings"] =
"Impossible de mélanger les chaînes de type '%s' et '%s'";
$locale["Can't open the upload logfile."] =
- "Erreur: Impossible d'ouvrir le journal des fichiers déposés.";
+ "Impossible d'ouvrir le journal des fichiers déposés.";
$locale["Can't open zip file '%s' for reading"] =
"Impossible d'ouvrir le fichier zip '%s' en lecture";
$locale["Cancel"] =
"Annuler";
+$locale["Cancel your rating"] =
+ "Annuler la notation";
$locale["Cancelled"] =
"Annulé";
$locale["Cannot create directory '%s'"] =
- "Impossible de créer le répertoire '%s'";
+ "Impossible de créer le répertoire : « %s »";
$locale["Cannot open AUTH_GROUP_FILE %s"] =
"Impossible d'ouvrir AUTH_GROUP_FILE %s";
+$locale["Case exact?"] =
+ "respect de la casse";
$locale["Case insensitive?"] =
"Sensible à la casse ?";
$locale["Category"] =
@@ -404,26 +476,62 @@
"CatégoriePagesAccueil";
$locale["CategoryPage"] =
"CatégoriePages";
+$locale["Change Access Rights"] =
+ "Droits d'acces";
+$locale["Change Owner"] =
+ "Changer le propriétaire";
$locale["Change Password"] =
- "Changer le mot de passe";
+ "Modifier mon mot de passe";
$locale["Change Verification Status"] =
"Changer la vérification du statut";
$locale["Change country"] =
"Changer le pays";
+$locale["Change markup type"] =
+ "Changer le type de syntaxe";
+$locale["Change owner of page '%s' to '%s'."] =
+ "Changement de propriétaire %s à %s.";
+$locale["Change owner of selected pages"] =
+ "Changer le propriétaire des pages sélectionnées";
+$locale["Change owner of selected pages."] =
+ "Changer le propriétaire des pages sélectionnées.";
+$locale["Change owner to: "] =
+ "Changer le propriétaire par : ";
$locale["Change page attributes"] =
- "Changer les attributs de cette page";
+ "Modifier les attributs de la page";
$locale["Change pagename in all linked pages also?"] =
"Changer les noms de pages dans toutes les pages liées ?";
+$locale["Change the markup type of selected pages."] =
+ "Changer la syntaxe des pages sélectionnées.";
+$locale["Changes"] =
+ "Modifications";
+$locale["Chart"] =
+ "Diagramme";
$locale["Check any two boxes then %s."] =
"Cochez une boîte puis %s.";
$locale["Check any two boxes to compare revisions."] =
- "Cochez une des boîtes pour comparer les révisions.";
+ "Cochez deux boîtes quelconques pour comparer les versions.";
+$locale["Check for %s"] =
+ "Cases à cocher";
+$locale["Check for extra page.cached_html column"] =
+ "recherche une extra colonne page.cached_html";
+$locale["Check for new session.sess_ip column"] =
+ "recherche une nouvelle colonne session.sess_ip";
+$locale["Check for table %s"] =
+ "vérifie la table %s";
$locale["Check if you do not want to be notified of minor modifications."] =
"Cochez la case si vous ne voulez pas recevoir les modifications mineures";
$locale["Check if you do not want to be notified of your own modifications."] =
- "Cochez la case si vous ne voulez pas recevoir vos propres modifications";
+ "Cochez la case si vous ne voulez pas recevoir vos propres modifications.";
+$locale["Check menu items to display."] =
+ "Cliquez les éléments de menu à afficher";
$locale["Check to add this ACL"] =
- "Vérifier pour ajouter cette ACL";
+ "Cocher pour ajouter cette ACL";
+$locale["Check you are a member of the current project."] =
+ "Vous êtes déjà membre de ce projet.";
+$locale["Check you are in the right project."] =
+ "Vérifiez que vous êtes dans le bon projet.";
+$locale["Check you are logged in."] =
+ "Vous devez vous identifier";
$locale["Chmod"] =
"Chmod";
$locale["Chmod to permission:"] =
@@ -433,21 +541,23 @@
$locale["Click a button to get an example text"] =
"Cliquer sur un bouton pour obtenir une exemple de texte";
$locale["Click to authenticate as %s"] =
- "Cliquez pour vous conneter en tant que %s";
+ "Cliquez pour vous identifier en tant que %s";
$locale["Click to de-/select all pages"] =
"Cliquez pour (de)sélectionner toutes les pages";
$locale["Click to display"] =
"Cliquez pour afficher";
$locale["Click to display all comments"] =
- "Cliquez pour afficher tout commente";
+ "Cliquez pour afficher tous les commentaires";
$locale["Click to display to TOC"] =
"Cliquez pour afficher la table des matières";
+$locale["Click to hide the comments"] =
+ "Cliquez pour masquer les commentaires";
$locale["Click to hide/show"] =
"Cliquez pour masquer/afficher";
$locale["Click to reverse sort order"] =
- "Cliquer pour inverser l'ordre de tri";
+ "Cliquez pour inverser le tri";
$locale["Click to sort by %s"] =
- "Cliquer pour trier par %s";
+ "Cliquez pour trier par %s";
$locale["Close"] =
"Fermer";
$locale["Color"] =
@@ -455,7 +565,7 @@
$locale["Color text"] =
"Texte en couleur";
$locale["Columns: %s."] =
- "Colonnes : %s.";
+ "Colonnes : %s.";
$locale["Comment"] =
"Commentaire";
$locale["Comment modified on %s by %s"] =
@@ -467,17 +577,19 @@
$locale["Complete."] =
"Terminé.";
$locale["Conflicting Edits!"] =
- "Conflit d'éditions !";
+ "Modifications conflictuelles !";
$locale["Content"] =
"Contenu";
+$locale["Content of versions "] =
+ "Contenu des versions ";
$locale["Contents"] =
"Contenu";
$locale["ContributedTranslations"] =
"TraductionsContribuées";
-$locale["Control characters not allowed"] =
- "Caractères de contrôle, non autorisés";
$locale["Convert"] =
- "Converti";
+ "Convertir";
+$locale["Convert Tex mathematicals expressions to cached png files. This is for small text"] =
+ "Convertit des expressions mathématiques au format TeX en des fichiers png mis en cache.";
$locale["Convert text into a png image using GD."] =
"Converti le texte en une image png utilisant GD.";
$locale["Converted successfully %d pages"] =
@@ -486,8 +598,8 @@
"Pour convertir des formules TeX en image.";
$locale["Copyrights"] =
"Copyrights";
-$locale["Could not connect to LDAP host %s"] =
- "Impossible de se connecter à l'annuaire LDAP de l'hôte %s";
+$locale["Could not change owner of page '%s' to '%s'."] =
+ "Impossible de changer le propriétaire '%s' à '%s'.";
$locale["Couldn't chmod page '%s' to '%s'."] =
"Impossible de changer le mode '%s' à '%s'.";
$locale["Couldn't connect to %s"] =
@@ -497,17 +609,17 @@
$locale["Couldn't start commandline '%s'"] =
"Impossible de lancer la ligne de commande '%s'";
$locale["Count"] =
- "Compte";
+ "Nombre";
$locale["Create Page"] =
"Créer une page";
$locale["Create a Wiki page by the provided name."] =
"Créer une PageWiki avec le nom demandé.";
$locale["Create a Wiki page."] =
- "Créer cette page.";
+ "Créer une page wiki";
$locale["Create a new (sub)page"] =
"Créer une nouvelle (sous-)page";
$locale["Create: %s"] =
- "Enregistrée : %s";
+ "Créer : %s";
$locale["CreatePage"] =
"CréerUnePage";
$locale["CreateToc"] =
@@ -515,15 +627,15 @@
$locale["Created by CreatePage"] =
"Créée par CréerUnePage";
$locale["Created directory '%s' for the page dump..."] =
- "Répertoire '%s' créé pour la sauvegarde...";
+ "Répertoire « %s » créé pour la sauvegarde...";
$locale["Creating pages"] =
- "Création des pages";
+ "Créer des pages";
$locale["Creator"] =
"Créateur";
$locale["Current Language"] =
- "Langage courant";
+ "Ma langue";
$locale["Current Theme"] =
- "Thème courant";
+ "Mon thème";
$locale["Current language: '%s'"] =
"Langage actuel : %s";
$locale["Current theme: '%s'"] =
@@ -537,9 +649,7 @@
$locale["Database"] =
"Base de données";
$locale["Date Format"] =
- "Format de date";
-$locale["DeadEndPages"] =
- "PagesSansLien";
+ "Format de la date";
$locale["DebugGroupInfo"] =
"InfosDeDéboguageGroupe";
$locale["DebugInfo"] =
@@ -557,23 +667,27 @@
$locale["Define the translation for %s in %s"] =
"Définir la traduction pour %s en %s";
$locale["Del/+"] =
- "Effacer/+";
+ "Suppr/+";
$locale["Delete this ACL"] =
- "Effacer cette ACL";
+ "Supprimer cette ACL";
$locale["Deleted"] =
"Supprimé";
+$locale["Deleted %d pages with invalid names:"] =
+ "%d pages ont été supprimées à cause de leur nom invalide:";
$locale["Describe %s here."] =
"Décrire %s ici.";
$locale["Description"] =
"Description";
$locale["Dialog"] =
"Dialogue";
-$locale["Diff"] =
- "Diff";
+$locale["Didn't purge page '%s'. Access denied."] =
+ "Page '%s' non purgée. Accès refusé.";
+$locale["Didn't remove page '%s'. Access denied."] =
+ "Page '%s' non supprimée. Accès refusé.";
$locale["Diff previous Author"] =
- "Auteur précédent";
+ "Différences avec l'auteur précédent";
$locale["Diff previous Revision"] =
- "Différence avec la révision précédente";
+ "Différences avec la version précédente";
$locale["Diff: %s"] =
"Diff : %s";
$locale["Differences between %s and %s of %s."] =
@@ -584,10 +698,14 @@
"Discussion";
$locale["Display arbitrary SQL result tables"] =
"Affiche le résultat de requêtes SQL simples";
+$locale["Display as Pdf"] =
+ "Afficher en PDF";
$locale["Display differences between revisions"] =
- "Affiche les différences entre révisions";
+ "Affiche les différences entre versions";
$locale["Display general and user specific auth information."] =
"Afficher les informations générales de l'utilisateur.";
+$locale["Display video in Flash"] =
+ "Afficher une vidéo en Flash";
$locale["Displays a list of randomly chosen pages or redirects to a random page."] =
"Affiche une liste de pages prises au hasard sur ce wiki.";
$locale["Displays a set of photos listed in a text file with optional descriptions"] =
@@ -599,21 +717,27 @@
$locale["Do not send my own modifications:"] =
"Ne pas envoyer mes propres modifications :";
$locale["Do you %s want to add this page \"%s\" to your WatchList?"] =
- "Souhaitez-vous %s ajouter la page \"%s\" a votre liste de suivi ?";
+ "Voulez-vous %s ajouter la page « %s » à votre liste de suivi ?";
+$locale["Do you really want to create the page '%s'?"] =
+ "Voulez-vous réellement crééer la page '%s' ?";
$locale["Do you really want to reset all your UserPreferences?"] =
- "Voulez-vous réellement reinitialiser toutes vos préférences ?";
+ "Voulez-vous réellement réinitialiser toutes vos préférences ?";
$locale["Do you really want to reset the password of user %s?"] =
- "Voulez-vous réellement reinitialiser le mot de passe de %s ?";
+ "Voulez-vous réellement réinitialiser les mot de passe de %s ?";
$locale["Don't cache this page."] =
"Ne pas mettre en cache cette page.";
$locale["Double redirect not allowed."] =
"La double redirection interdit.";
+$locale["Download all revisions for backup"] =
+ "Télécharger toutes les versions pour sauvegarder";
+$locale["Download for Subversion"] =
+ "Télécharger pour Subversion";
$locale["Download for backup"] =
"Télécharger pour sauvegarder";
$locale["Download page contents"] =
"Télécharger le contenu de la page";
$locale["Downloading html zip dumps"] =
- "Téléchargement des sauvegardes html compressées";
+ "Téléchargement des sauvegardes HTML compressées";
$locale["Downloading zip dumps"] =
"Téléchargement des sauvegardes compressées";
$locale["Dump Pages"] =
@@ -621,7 +745,7 @@
$locale["Dump Pages as XHTML"] =
"Sauvegarde des pages au format XHTML";
$locale["Dump pages as XHTML"] =
- "Sauvegarde des pages au format XHTML";
+ "Exporter les pages en XHTML";
$locale["Dump to directory"] =
"Récupération dans le répertoire";
$locale["Dumping Pages"] =
@@ -630,12 +754,22 @@
"Récupération des pages HTML";
$locale["Dumping serial pages"] =
"Récupération des pages sérialisées";
+$locale["Dynamically include the content from another wiki page."] =
+ "Inclure dynamiquement le texte d'une autre PageWiki.";
$locale["E-Mail"] =
"Adresse électronique";
+$locale["E-Mail address confirmation"] =
+ "Vérification de l'adresse électronique";
$locale["E-mail"] =
"Adresse électronique";
$locale["E-mail Notification"] =
"Courriel de notification";
+$locale["E-mail address '%s' is not properly formatted"] =
+ "L'adresse électronique '%s' ne semble pas être correcte.";
+$locale["E-mail address '%s' is properly formatted"] =
+ "L'adresse électronique '%s' semble être correcte.";
+$locale["ERROR uploading '%s'"] =
+ "ERREUR en déposant '%s' : ";
$locale["ERROR: No email defined! You need to do this in your "] =
"ERREUR : pas d'adresse électronique definie! Vous devez le faire dans vos ";
$locale["Easy navigation buttons for %s"] =
@@ -645,17 +779,17 @@
$locale["Edit %s"] =
"Éditer %s";
$locale["Edit Area Size"] =
- "Éditez la taille de la zone";
+ "Modifier la taille de la zone";
$locale["Edit Old Revision"] =
- "Éditer l'ancienne révision";
+ "Modifier une ancienne version";
$locale["Edit aborted."] =
- "Édition annulée.";
+ "Modification annulée.";
$locale["Edit metadata for %s"] =
"Éditer les métadonnées pour %s";
$locale["Edit old revision"] =
- "Éditer l'ancienne révision";
+ "Modifier l'ancienne version";
$locale["Edit this page"] =
- "Éditer cette page";
+ "Modifier cette page";
$locale["Edit this page and all subpages"] =
"Modifier cette page et toutes ses sous-pages";
$locale["Edit: %s"] =
@@ -665,9 +799,9 @@
$locale["EditText"] =
"ÉditerLeContenu";
$locale["Edited by: %s"] =
- "Édité par : %s";
+ "Modifié par : %s";
$locale["Editing pages"] =
- "Éditions des pages";
+ "Modifier des pages";
$locale["Either %s is missing or DATABASE_TYPE != '%s'"] =
"%s est manquant ou DATABASE_TYPE != '%s'";
$locale["Elapsed time: %s s"] =
@@ -675,29 +809,37 @@
$locale["Email Verification"] =
"Vérification de l'adresse électronique";
$locale["Email not yet verified."] =
- "Email pas encore vérifié.";
+ "Adresse électronique pas encore vérifiée";
$locale["Email verified."] =
- "Adresse électronique vérifiée.";
+ "Adresse électronique vérifiée";
$locale["Embed hidden comments in WikiPages."] =
"Cacher des commentaires dans une PageWiki.";
$locale["Empty Preferences or format of UserPreferences cookie not recognised."] =
"PréférencesUtilisateurs vides, le cookie peut etre mal reconnu.";
$locale["Empty link to: %s"] =
- "Aucune correspondance de lien pour %s.";
+ "Lien vide vers : %s";
$locale["Empty pagename!"] =
- "La page n'a aucun titre !";
+ "Nom de page vide !";
+$locale["Enable DoubleClick Edit"] =
+ "Autoriser la modification par double clic";
$locale["Enable configurable polls"] =
"Permettre de faire des sondages configurables";
$locale["Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."] =
- "Entrer les pages séparées par des virgules.";
+ "Entrer les pages séparées par des virgules. Les étoiles (jokers) sont autorisées.";
$locale["Enter your UserId to sign in"] =
"Entrez votre identifiant utilisateur pour vous connecter";
+$locale["Entry on %s by %s."] =
+ "Commentaire le %s par %s.";
$locale["Enumeration"] =
"Énumération";
+$locale["Error"] =
+ "Erreur";
+$locale["Error:"] =
+ "Erreur :";
$locale["Error: Couldn't send %s to %s"] =
"Erreur : impossible d'envoyer %s à %s";
$locale["Error: Empty search string."] =
- "Erreur: chaîne vide invalide.";
+ "Erreur : la chaîne à rechercher est vide.";
$locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] =
"La page d'accueil d'un utilisateur doit être un NomWiki valide. Les préférences ne peuvent pas être enregistrées.";
$locale["Every"] =
@@ -709,35 +851,43 @@
$locale["External Links"] =
"Liens externes";
$locale["External link (remember http:// prefix)"] =
- "Lien externe (http:// prefix)";
+ "Lien externe (le préfixe http:// est obligatoire)";
$locale["ExternalSearch"] =
"RechercheExterne";
+$locale["FAIL"] =
+ "ÉCHOUÉ";
$locale["FAILED"] =
"ÉCHOUÉ";
$locale["FIXED"] =
"CORRIGÉ";
$locale["FORBIDDEN"] =
"INTERDIT";
+$locale["Failed to connect to LDAP host"] =
+ "Impossible de se connecter au serveur LDAP ";
$locale["Fatal PhpWiki Error"] =
"Erreur fatale de PhpWiki";
$locale["Favorite Categories"] =
"Catégories populaires";
+$locale["File '%s' not found."] =
+ "Fichier « %s » non trouvé.";
$locale["File successfully uploaded."] =
- "Fichier transféré avec succès.";
+ "Fichier téléchargé avec succès";
$locale["Files with extension %s are not allowed."] =
- "%s: extension interdit.";
+ "%s: extension interdite.";
$locale["Find page"] =
"Rechercher";
$locale["FindPage"] =
"ChercherUnePage";
$locale["First"] =
- "Première";
+ "Premier";
+$locale["Found by "] =
+ "Trouvé par ";
$locale["FrameInclude"] =
"InclureUnCadre";
$locale["From english to %s: "] =
"De l'Anglais au %s: ";
$locale["Full changes"] =
- "Plusieurs fois la page";
+ "Changements exhaustifs";
$locale["Full text search results for '%s'"] =
"Résultats de la recherche en texte intégral de ' %s '";
$locale["FullDump"] =
@@ -751,19 +901,23 @@
$locale["General Auth Settings"] =
"Préférences générales d'auteur";
$locale["Get an email notification at changes of the following pages:"] =
- "Recevoir un courriel de notification lors des changements des pages suivantes :";
+ "Recevoir une notification par courriel pour les modifications des pages suivantes :";
$locale["Get debugging information for %s."] =
"Obtenir des infos de déboguage pour %s.";
$locale["Get preferences information for current user %s."] =
"Obtenir des infos de préférences pour l'utilisateur %s.";
$locale["Given password ignored."] =
"Mot de passe ignoré.";
+$locale["Global user preferences (for all projects)"] =
+ "Préférences globales (pour tous les projets)";
$locale["Go"] =
"OK";
+$locale["Go to %s."] =
+ "Aller à %s";
$locale["Go to or create page."] =
- "Aller à ou créer page.";
+ "Aller à la page ou la créer.";
$locale["Go?"] =
- "Allons-y ?";
+ "Continuer?";
$locale["GoTo"] =
"AllerVers";
$locale["Google:%s"] =
@@ -777,7 +931,7 @@
$locale["Group page '%s' does not exist"] =
"Le groupe de page %s n'existe pas";
$locale["Group/User"] =
- "Groupe/Utilisateur";
+ "Groupe/utilisateur";
$locale["Guest"] =
"Invité";
$locale["Guests"] =
@@ -794,12 +948,86 @@
"BonjourLeMonde";
$locale["Help"] =
"Aide";
+$locale["Help/AddCommentPlugin"] =
+ "Aide/AjoutDesCommentaires";
+$locale["Help/AddingPages"] =
+ "Aide/AjouterDesPages";
+$locale["Help/AuthorHistoryPlugin"] =
+ "Aide/PluginHistoriqueAuteur";
+$locale["Help/CalendarListPlugin"] =
+ "Aide/PluginListeDuCalendrier";
+$locale["Help/CalendarPlugin"] =
+ "Aide/PluginCalendrier";
+$locale["Help/CommentPlugin"] =
+ "Aide/PluginCommenter";
+$locale["Help/CreateTocPlugin"] =
+ "Aide/PluginCréerUneTdm";
+$locale["Help/EditMetaDataPlugin"] =
+ "Aide/PluginÉditerMetaData";
+$locale["Help/ExternalSearchPlugin"] =
+ "Aide/PluginRechercheExterne";
+$locale["Help/FoafViewerPlugin"] =
+ "Aide/PluginFoafViewer";
+$locale["Help/FrameIncludePlugin"] =
+ "Aide/PluginInclureUnCadre";
+$locale["Help/GoodStyle"] =
+ "Aide/StyleCorrect";
+$locale["Help/HelloWorldPlugin"] =
+ "Aide/PluginBonjourLeMonde";
+$locale["Help/IncludePagePlugin"] =
+ "Aide/PluginInclureUnePage";
+$locale["Help/LinkIcons"] =
+ "Aide/IcônesLiens";
+$locale["Help/MagicPhpWikiURLs"] =
+ "Aide/URLMagiquesPhpWiki";
+$locale["Help/MoreAboutMechanics"] =
+ "Aide/DétailsTechniques";
+$locale["Help/OldStyleTablePlugin"] =
+ "Aide/PluginTableauAncienStyle";
+$locale["Help/OldTextFormattingRules"] =
+ "Aide/RèglesDeFormatageDesTextes";
+$locale["Help/PhotoAlbumPlugin"] =
+ "Aide/PluginAlbumPhotos";
+$locale["Help/PhpHighlightPlugin"] =
+ "Aide/PluginColorationPhp";
+$locale["Help/PhpWeatherPlugin"] =
+ "Aide/PluginMétéoPhp";
+$locale["Help/PhpWiki"] =
+ "Aide/PhpWiki";
+$locale["Help/PloticusPlugin"] =
+ "Aide/PluginPloticus";
+$locale["Help/RawHtmlPlugin"] =
+ "Aide/PluginHtmlPur";
+$locale["Help/RedirectToPlugin"] =
+ "Aide/PluginRedirection";
+$locale["Help/RichTablePlugin"] =
+ "Aide/PluginBeauTableau";
+$locale["Help/SystemInfoPlugin"] =
+ "Aide/PluginInfosSystème";
+$locale["Help/TextFormattingRules"] =
+ "Aide/RèglesDeFormatageDesTextes";
+$locale["Help/TranscludePlugin"] =
+ "Aide/PluginInsérer";
+$locale["Help/UnfoldSubpagesPlugin"] =
+ "Aide/PluginListeSousPages";
+$locale["Help/UpLoadPlugin"] =
+ "Aide/PluginDéposer";
+$locale["Help/WabiSabi"] =
+ "Aide/WabiSabi";
+$locale["Help/WikiBlogPlugin"] =
+ "PluginWikiBlog";
+$locale["Help/WikiPlugin"] =
+ "Aide/PluginWiki";
+$locale["Help/WikiWikiWeb"] =
+ "Aide/WikiWikiWeb";
$locale["Here you can override site-specific default values."] =
"Ici vous pouvez écraser les valeurs par défaut du site spécifié.";
$locale["Hide %s:"] =
"Cacher %s :";
$locale["Hide or show LinkIcons (if supported by the current theme). Useful for text-only browsers or slow connections."] =
"Cacher ou montrer les icônes de liens (si supportées par le thème actuel). Très utile pour les navigateurs ne supportant pas les images ou pour les connexion bas débit.";
+$locale["Hide or show LinkIcons."] =
+ "Cacher ou montrer les icônes de liens.";
$locale["History"] =
"Historique";
$locale["History of all major and minor edits by %s to page %s."] =
@@ -807,7 +1035,7 @@
$locale["History of all major and minor modifications for any page edited by %s."] =
"Historique des éditions majeures ou mineures pour n'importe quelle page éditée par %s.";
$locale["History of changes."] =
- "Historique des changements.";
+ "Historique des modifications.";
$locale["Hit statistics"] =
"Statistiques de visites";
$locale["Hits"] =
@@ -816,8 +1044,10 @@
"Visites :";
$locale["Home"] =
"Accueil";
+$locale["Home Page"] =
+ "Accueil";
$locale["Home page"] =
- "Page d'accueil";
+ "Accueil";
$locale["HomePage"] =
"PageAccueil";
$locale["HomePageAlias"] =
@@ -833,9 +1063,19 @@
$locale["I'm sorry. Version %d of %s is not in the database."] =
"Je suis désolé. La version %d de %s n'est pas dans la base de données.";
$locale["Ignore wiki formatting"] =
- "Ignorer le formatage wiki";
+ "Ignorer la syntaxe wiki";
+$locale["Illegal access to page %s: no read access"] =
+ "Accès en lecture interdit pour la page « %s ».";
+$locale["Illegal character '"] =
+ "Caractère interdit '";
+$locale["Illegal characters in external URL."] =
+ "Caractère interdit dans une URL externe.";
$locale["Illegal chars %s removed"] =
- "Illégal %s supprimées";
+ "Caractères interdits %s supprimés";
+$locale["Illegal inclusion of page %s: no read access."] =
+ "insertion récursive de la page %s ignoré";
+$locale["Illegal operator: %s"] =
+ "Caractère interdit dans le nom.";
$locale["Image loaded from cache file: %s"] =
"Image chargée depuis le fichier cache : %s";
$locale["Image saved to cache file: %s"] =
@@ -847,7 +1087,7 @@
$locale["Include an external web page within the body of a wiki page."] =
"Inclure une page externe dans le corps de la WikiPage.";
$locale["Include recursively all linked pages starting at %s"] =
- "Créer une carte du site commencer à %s";
+ "Créer une carte du site commençant à %s";
$locale["Include text from another wiki page."] =
"Inclure le texte d'une autre PageWiki.";
$locale["IncludePage"] =
@@ -858,20 +1098,30 @@
"CarteDuSite";
$locale["Included from %s"] =
"Inséré de %s";
+$locale["Included from %s (revision %d)"] =
+ "Inséré de %s (version %d)";
$locale["Included from %s:"] =
"Inséré de %s :";
$locale["Includes the content of all SubPages of the current page."] =
"Pour inclure le contenu de toutes les sous pages de la page actuelle.";
$locale["Index"] =
"Index";
-$locale["Info"] =
- "Info";
$locale["Inline images"] =
"Images intégrées";
$locale["Insert"] =
"Insérer";
+$locale["Insert Categories"] =
+ "Ajouter une catégorie";
+$locale["Insert Image or Video"] =
+ "Ajouter une image ou une vidéo";
+$locale["Insert PageLink"] =
+ "Insérer un lien";
+$locale["Insert Plugin"] =
+ "Insérer un greffon";
+$locale["Insert Template"] =
+ "Ajouter un modèle";
$locale["Insert non-formatted text here"] =
- "Insérer du texte non-formaté ici";
+ "Insérer le texte préformaté ici";
$locale["Insufficient permissions."] =
"Permissions insuffisantes.";
$locale["InterWiki"] =
@@ -883,49 +1133,55 @@
$locale["InterWikiSearch"] =
"RechercheInterWiki";
$locale["Invalid ACL"] =
- "Acl invalide";
+ "ACL invalide";
$locale["Invalid [] syntax ignored"] =
- "[] non valables, ignoré";
+ "Syntaxe [] invalide ignorée";
+$locale["Invalid argument %s"] =
+ "Argument non valable : %s";
$locale["Invalid argument: %s=%s"] =
"Argument non valable : %s=%s";
$locale["Invalid chmod string"] =
"Chaîne de caractère invalide pour le changement de mode";
$locale["Invalid color: %s"] =
- "Couleur non valable : %s";
+ "Couleur non valide : %s";
+$locale["Invalid image attribute \"%s\" %s=%s"] =
+ "Argument non valable : %s=%s";
$locale["Invalid image size"] =
- "Taille d'image non valables";
+ "Taille d'image invalide";
$locale["Invalid pagename!"] =
- "Nom de page invalide.";
+ "Nom de page invalide !";
$locale["Invalid password or userid."] =
- "Mot de passe ou identifiant d'utilisateur invalide.";
+ "Mot de passe ou utilisateur non valide :";
$locale["Invalid password."] =
- "Mauvais mot de passe.";
+ "Mot de passe invalide.";
$locale["Invalid username '%s' for LDAP Auth"] =
- "Mot de identifiant d'utilisateur '%s' pour LDAP Auth invalide.";
+ "Utilisateur non valide '%s' dans l'annuaire LDAP";
$locale["Invalid username."] =
"Identifiant d'utilisateur invalide.";
+$locale["Is External:"] =
+ "Externe ?";
$locale["Italic text"] =
- "Texte en italique";
+ "Italique";
$locale["Italic text [alt-i]"] =
- "Texte en italique";
-$locale["JabberPresence"] =
- "JabberPresence";
+ "Italique [alt-i]";
+$locale["Keep old"] =
+ "Garder l'ancien";
$locale["Keep up to %d major edits, but keep them no longer than %d days."] =
"Garder jusqu'à %d édition majeures, mais pas plus que %d jours.";
$locale["Language"] =
"Langue";
$locale["Last"] =
- "Dernière";
+ "Dernier";
$locale["Last Author"] =
"Dernier auteur";
$locale["Last Difference"] =
- "Dernie¨re difference";
+ "Dernière différence";
$locale["Last Modified"] =
"Dernière modification";
$locale["Last Summary"] =
"Dernier résumé";
$locale["Last edited %s"] =
- "Dernière modification %s";
+ "Dernière modification le %s";
$locale["Last edited on %s"] =
"Dernière modification le %s";
$locale["LatestSnapshot"] =
@@ -936,8 +1192,8 @@
"Apparences de tableaux utilisant l'ancien modèle de balisage.";
$locale["LdapSearch"] =
"LdapChercher";
-$locale["Leading %s not allowed"] =
- "Mener %s n'est pas permis";
+$locale["Left Menu"] =
+ "Menu de gauche";
$locale["Legend"] =
"Légende";
$locale["Level 1 headline"] =
@@ -950,10 +1206,14 @@
"PagesSemblables";
$locale["Line %s does not begin with a '|'."] =
"La ligne %s ne commence pas par un '|'.";
+$locale["Link"] =
+ "Lien";
$locale["Link to page"] =
- "Lien vers la page";
+ "Lien vers une page";
$locale["LinkDatabase"] =
"LiensDatabase";
+$locale["LinkSearch"] =
+ "RechercheLive";
$locale["Links"] =
"Liens";
$locale["List"] =
@@ -963,11 +1223,13 @@
$locale["List all once authenticated users."] =
"Énumérez tous les utilisateurs une fois authentifiés.";
$locale["List all page revisions edited by one user with diff links, or show a PageHistory-like list of a single page for only one user."] =
- "Affiche la liste de toutes les révisions faites par un auteur, ou montre une liste du type HistoriquePage pour une simple page uniquement pour un auteur.";
+ "Affiche la liste de toutes les versions faites par un auteur, ou montre une liste du type HistoriquePage pour une simple page uniquement pour un auteur.";
$locale["List all pages in this wiki."] =
- "Afficher la liste de toutes les pages de ce wiki.";
+ "Liste de toutes les pages de ce wiki.";
$locale["List all pages which link to %s."] =
- "Affiche toutes les pages liée à %s.";
+ "Liste des pages liées à %s.";
+$locale["List all recent changes in this wiki."] =
+ "Montrer tous les changements récents de ce wiki.";
$locale["List all recent edits in this wiki."] =
"Afficher les dernières modifications de ce wiki.";
$locale["List of pages created by [%s] (%d total):"] =
@@ -976,16 +1238,18 @@
"Liste des pages modifiées en dernier par [%s] (%d au total) :";
$locale["List of pages owned by [%s] (%d total):"] =
"Liste des pages possédées par [%s] (%d au total) :";
+$locale["List of plugins on this wiki"] =
+ "Liste des greffons de ce wiki";
+$locale["List of user-created pages (%d total):"] =
+ "Liste des pages créées par les utilisateurs (%d au total) :";
$locale["List page names which share an initial or final title word with '%s'."] =
"Affiche la liste des pages qui partagent un mot initial ou final dans leur titre avec %s.";
$locale["List pages that are explicitly given as the pages argument."] =
"Liste des pages qui sont explicitement données en argument.";
$locale["List pages which are not linked to by any other page."] =
"Liste des pages qui ne sont liées à aucune autre.";
-$locale["List the most popular pages nearby."] =
- "Énumère les pages proches des plus visitées.";
$locale["List the most popular pages."] =
- "Affiche la listes des pages les plus populaires.";
+ "Voir les pages les plus populaires.";
$locale["List this page and all subpages"] =
"Lister cette page et ses sous-pages";
$locale["ListPages"] =
@@ -999,25 +1263,25 @@
$locale["LiveSearch"] =
"RechercheLive";
$locale["Load File"] =
- "Charger le fichier";
+ "Importer un fichier";
+$locale["LoadDump"] =
+ "RécupérationDeLaPage";
$locale["Loading '%s'"] =
- "Chargement ' %s '";
+ "Chargement de « %s »";
$locale["Loading InterWikiMap from external file %s."] =
- "Chargement de la CarteInterWiki depuis le fichiers %s.";
+ "Chargement de la CarteInterWiki depuis le fichier %s.";
$locale["Loading files"] =
"Chargement des fichiers";
$locale["Loading up virgin wiki"] =
- "Chargement d'un wiki vierge";
+ "Chargement du nouveau wiki";
$locale["Lock"] =
- "Verrouillée";
+ "Verrouiller";
$locale["Lock Page"] =
"Verrouiller la page";
-$locale["Lock page to enable link"] =
- "Verrouillez la page pour permettre le lien";
$locale["Locked"] =
- "Verrouillée";
+ "Verrouillé";
$locale["Locking pages"] =
- "Verrouillage des pages";
+ "Verrouiller des pages";
$locale["Login"] =
"S'identifier";
$locale["Logout"] =
@@ -1026,28 +1290,34 @@
"fichier MIME %s";
$locale["MISSING"] =
"MANQUANT";
+$locale["Main Categories"] =
+ "Catégories principales";
$locale["Major modifications only"] =
- "Modifications majeures uniquement";
+ "Que les modifications majeures";
+$locale["Make the page external?"] =
+ "Rendre la page externe ?";
+$locale["Make the page public?"] =
+ "Rendre la page publique ?";
$locale["Make use of the Google API"] =
"Faire usage de l'API Google";
$locale["Markup"] =
- "Marquage";
+ "Syntaxe";
$locale["Markup cache purged!"] =
"Cache de marques purgé !";
$locale["Markup:"] =
- "Balises :";
+ "Syntaxe :";
$locale["Members:"] =
"Membres :";
$locale["Merge Edit"] =
- "Fusionner l'édition";
+ "Fusionner les modifications";
$locale["Merge and Edit: %s"] =
- "Fusioner et éditer : %s";
+ "Fusionner et modifier : %s";
$locale["Message"] =
"Message";
$locale["Method '%s' not implemented in this GROUP_METHOD %s"] =
"La méthode '%s' n'est pas implémentée dans ce GROUP_METHOD (%s)";
$locale["Minor"] =
- "Mineure";
+ "Mineur";
$locale["Minor Edit"] =
"Modification mineure";
$locale["Miscellaneous utility functions for the Administrator."] =
@@ -1065,19 +1335,29 @@
$locale["Modern"] =
"Moderne";
$locale["Modified"] =
- "Dernière modification";
+ "Modifié";
$locale["Modified on %s by %s"] =
"Modifié le %s par %s";
$locale["Moniker"] =
"Nom";
+$locale["More..."] =
+ "Plus...";
$locale["Most users ever online was %d at %s."] =
"Record du nombre d'utilisateur: %d le %s.";
$locale["MostPopular"] =
"LesPlusVisitées";
+$locale["My Changes"] =
+ "Mes modifications";
+$locale["My Discussion"] =
+ "Ma page de discussion";
+$locale["My Preferences"] =
+ "Mes préférences";
+$locale["My User Page"] =
+ "Ma page";
$locale["My modifications only"] =
- "Mes modifications uniquement";
+ "Que mes modifications";
$locale["My pages only"] =
- "Mes pages uniquement";
+ "Que mes pages";
$locale["Name"] =
"Nom";
$locale["Navigation"] =
@@ -1088,10 +1368,12 @@
"Nouveau sujet";
$locale["New comment."] =
"Nouveau commentaire.";
+$locale["New entry"] =
+ "Nouvelle entrée";
$locale["New page"] =
"Nouvelle page";
$locale["New pages only"] =
- "Nouvelles pages uniquement";
+ "Que les nouvelles pages";
$locale["New password"] =
"Nouveau mot de passe";
$locale["New users may use an empty password."] =
@@ -1099,13 +1381,15 @@
$locale["New watchlist: "] =
"Nouvelle liste de suivi : ";
$locale["Newer page:"] =
- "Page récente :";
+ "Page plus récente :";
$locale["Next"] =
"Suivant";
$locale["Next >>"] =
"Suivant >>";
$locale["Next Month"] =
"Mois suivant";
+$locale["No"] =
+ "Non";
$locale["No DSN alias for SqlResult.ini specified"] =
"Aucun alias DSN spécifié pour SqlResult.ini";
$locale["No DSN for alias %s in SqlResult.ini found"] =
@@ -1118,8 +1402,8 @@
"Aucun changement.";
$locale["No comments found"] =
"Aucun commentaire trouvé";
-$locale["No empty, unreferenced pages were found."] =
- "Aucune page trouvée avec un nom invalide.";
+$locale["No file selected. Please select one."] =
+ "Pas de fichier sélectionné. Merci d'en sélectionner un.";
$locale["No metadata for %s"] =
"Pas de métadonnées pour %s";
$locale["No or not enough GROUP_DB SQL statements defined"] =
@@ -1127,19 +1411,23 @@
$locale["No or unsupported GROUP_METHOD defined"] =
"Aucun GROUP_METHOD défini, ou GROUP_METHOD non supporté";
$locale["No other page links to %s yet."] =
- "Aucune page n'est ancore liée à %s.";
+ "Aucune page n'est déjà liée à %s.";
$locale["No page links to %s."] =
"Aucune page ne pointe vers %s.";
+$locale["No page specified."] =
+ "Aucune page indiquée";
$locale["No pagedata for %s"] =
"Pas de données de page pour %s";
$locale["No pagename specified"] =
- "Aucun nom de page indiqué";
+ "Pas de nom de page spécifié";
$locale["No pages changed."] =
- "Aucune page changée.";
+ "Aucune page modifiée.";
+$locale["No pages renamed."] =
+ "Aucune page n'a été renommée.";
$locale["No pages with bad names had to be deleted."] =
"Aucune page supprimées avec un nom invalide.";
$locale["No revisions found"] =
- "Révision non trouvée";
+ "Aucune version trouvée";
$locale["No uploaded file to upload?"] =
"Pas de fichier à déposer ?";
$locale["No userid"] =
@@ -1147,13 +1435,13 @@
$locale["NoCache"] =
"PasDeCache";
$locale["None"] =
- "Aucune";
+ "Aucun(e)";
$locale["Not enough questions answered!"] =
"Pas assez de réponses fournies !";
$locale["Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored."] =
"Notez que beaucoup de navigateurs ajusteront automatiquement la largeur de la zone d'édition de façon qu'elle remplisse la fenêtre. Le paramètre concernant la largeur sera ignoré dans ce cas.";
$locale["Note, that user accounts with bouncing emails will be disabled."] =
- "Notez que les comptes utilisateurs dont l'adresse électronique n'existe pas seront désactivés.";
+ "Notez que les comptes avec une adresse électronique invalide seront désactivés.";
$locale["Note:"] =
"Note :";
$locale["Note: Only if you create your personal HomePage with same the pagename as your user id, you will be able to store your UserPreferences. Otherwise not."] =
@@ -1165,23 +1453,27 @@
$locale["Okay"] =
"OK";
$locale["Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences."] =
- "L'anciene page %s sans mot de passe attribué a été mise à jour avec un mot de passe vide. Définissez un mot de passe dans vos PréférencesUtilisateurs.";
+ "L'ancienne page %s sans mot de passe attribué a été mise à jour avec un mot de passe vide. Définissez un mot de passe dans vos PréférencesUtilisateurs.";
$locale["Old and new pages"] =
"Pages anciennes et nouvelles";
$locale["OldStyleTable"] =
"TableauAncienStyle";
$locale["Older page:"] =
- "Ancienne page :";
+ "Page plus ancienne :";
$locale["One UserPreferences field successfully updated."] =
- "Une préférence mise à jour avec succès.";
+ "Une préférence a été mise à jour avec succès.";
+$locale["One page has been changed:"] =
+ "Une page a été modifiée :";
$locale["One page links to %s:"] =
"Une page pointe vers %s :";
$locale["One page would link to %s:"] =
- "Une page pointait vers %s :";
+ "Une page pointerait vers %s :";
$locale["Oops! Revision %s of %s seems to have been deleted!"] =
- "Ouille ! La révision %s de %s semble avoir été effacée !";
+ "Ouille ! La version %s de %s semble avoir été effacée !";
+$locale["Operation undone"] =
+ "Opération annulée";
$locale["Optimizing database"] =
- "Optimisation de database";
+ "Optimisation de la base de données";
$locale["Original (1.2 or 1.0)"] =
"Original (1.2 ou 1.0)";
$locale["Orphaned Pages in this wiki (%d total):"] =
@@ -1193,7 +1485,11 @@
$locale["Other version"] =
"L'autre version";
$locale["Our users created a total of %d pages."] =
- "Nos utilisateurs ont créés un total de %s pages.";
+ "Nos utilisateurs ont créé un total de %d pages.";
+$locale["Overwrite All"] =
+ "Tout écraser";
+$locale["Overwrite with new"] =
+ "Écraser avec le nouveau";
$locale["Owner"] =
"Propriétaire";
$locale["Owner: %s"] =
@@ -1206,26 +1502,34 @@
"Page";
$locale["Page %s not found."] =
"Page %s non trouvée.";
+$locale["Page '%s' already exists. Ignored."] =
+ "La page %s existe déjà. Ignorée.";
+$locale["Page '%s' does not exist"] =
+ "La page '%s' n'existe pas";
+$locale["Page '%s' does not exist."] =
+ "La page « %s » n'existe pas";
$locale["Page Content: "] =
"Contenu de la page : ";
$locale["Page Execution took %s seconds"] =
"L'exécution de la page a pris %s seconds";
$locale["Page Info"] =
- "InfosSurLaPage";
+ "Infos sur la page";
$locale["Page Locked"] =
"Page verrouillée";
$locale["Page Name"] =
"Nom de la page";
$locale["Page Trail"] =
- "Trace Page";
+ "File d'Ariane";
$locale["Page Type:"] =
- "Type de Page :";
+ "Type de page :";
$locale["Page Version:"] =
"Version de la page :";
$locale["Page change"] =
- "Modification de page";
+ "Modification de la page";
$locale["Page dump"] =
"Cliché de la page";
+$locale["Page info"] =
+ "Infos sur la page";
$locale["Page names with prefix '%s'"] =
"Noms de page ayant le préfixe ' %s '";
$locale["Page names with suffix '%s'"] =
@@ -1235,25 +1539,27 @@
$locale["Page now locked."] =
"La page est maintenant verrouillée.";
$locale["Page now not-external."] =
- "La page n'est maintenant plus externe.";
+ "La page est maintenant interne.";
$locale["Page now not-public."] =
- "La page n'est maintenant plus publique.";
+ "La page est maintenant privée.";
$locale["Page now public."] =
"La page est maintenant publique.";
$locale["Page now unlocked."] =
"La page est maintenant déverrouillée.";
$locale["Page once only"] =
- "Une seule fois la page";
+ "Une fois par page";
$locale["Page rename %s to %s"] =
- "retitrez la page de '%s' à '%s'";
+ "Page renommée de %s à %s";
$locale["Page statistics"] =
"Statistiques de page";
$locale["Page successfully updated."] =
- "Page changé avec succès.";
+ "Page mise à jour avec succès.";
$locale["PageChange Notification Error: Couldn't send %s to %s"] =
- "Erreur lors des notifications de changements de page: Impossible d'envoyer %s à %s";
+ "Erreur lors de la notification de changement de page : impossible d'envoyer %s à %s";
+$locale["PageChange Notification of %s"] =
+ "Notification de changement de la page %s";
$locale["PageChange Notification of %s sent to %s"] =
- "Les notifications de changement de la page %s ont été envoyés à %s";
+ "La notification de changement de la page %s a été envoyée à %s";
$locale["PageDump"] =
"RécupérationDeLaPage";
$locale["PageGroup"] =
@@ -1266,20 +1572,34 @@
"Historique de %s";
$locale["PageInfo"] =
"InfosSurLaPage";
+$locale["PageName|optional label"] =
+ "Page|label optionnel";
$locale["PageTrail"] =
"TracePage";
$locale["PageTrail Plugin"] =
"Pour suivre les pages à la trace";
+$locale["Pagedata size: %d KiB"] =
+ "Taille des données de la page : %d Kio";
+$locale["Pagename(s): "] =
+ "Nom de la page";
+$locale["Pages which have been deleted at least %s days are already checked."] =
+ "Les pages qui ont été supprimées il y a au plus %s jours sont déjà cochées.";
$locale["Password cannot be changed."] =
"Impossible de changer le mot de passe.";
$locale["Password updated."] =
- "Mot de passe mis à jour.";
+ "Mot de passe mis à jour";
$locale["Password was not changed."] =
- "Mot de passe inchangé.";
+ "Le mot de passe n'a pas été mis à jour";
$locale["Password:"] =
- "Mot de passe :";
+ "Mot de passe :";
+$locale["Past versions of this page."] =
+ "Versions précédentes de cette page.";
$locale["Perform searches on InterWiki sites listed in InterWikiMap."] =
"Effectuer une recherche sur les sites InterWiki contenu dans la carte InterWiki.";
+$locale["Permanently purge all selected pages."] =
+ "Purger définitivement toutes les pages sélectionnées.";
+$locale["Permanently purge selected pages"] =
+ "Purger définitivement les pages sélectionnées";
$locale["Permanently remove all selected pages."] =
"Supprimer toutes les pages sélectionnées en permanence.";
$locale["Permission"] =
@@ -1287,7 +1607,7 @@
$locale["Personal Auth Settings for '%s'"] =
"Préférences personnelles pour '%s'";
$locale["Personal language:"] =
- "Langue personnelle :";
+ "Ma langue :";
$locale["Personal theme:"] =
"Thème personnel :";
$locale["PgsrcTranslation"] =
@@ -1298,6 +1618,8 @@
"ColorationPhp";
$locale["PhpWeather"] =
"MétéoPhp";
+$locale["PhpWiki developers should manually inspect the downloaded file for nested markup before rewrapping with emacs and checking into Subversion."] =
+ "Les développeurs de PhpWiki devraient inspecter manuellement les balises des fichiers téléchargés avant de les éditer sous emacs et les publier sous Subversion.";
$locale["PhpWiki engine version"] =
"Version de PhpWiki";
$locale["PhpWikiAdministration"] =
@@ -1306,26 +1628,22 @@
"AdministrationDePhpWiki/Chmod";
$locale["PhpWikiAdministration/Chown"] =
"AdministrationDePhpWiki/Chown";
-$locale["PhpWikiAdministration/Remove"] =
- "AdministrationDePhpWiki/Supprimer";
$locale["PhpWikiAdministration/Rename"] =
"AdministrationDePhpWiki/Renommer";
...
[truncated message content] |
|
From: <var...@us...> - 2011-03-03 15:45:57
|
Revision: 7951
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7951&view=rev
Author: vargenau
Date: 2011-03-03 15:45:49 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
Big French translation upgrade
Modified Paths:
--------------
trunk/locale/po/fr.po
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2011-03-03 10:32:23 UTC (rev 7950)
+++ trunk/locale/po/fr.po 2011-03-03 15:45:49 UTC (rev 7951)
@@ -31,16 +31,16 @@
#: ../lib/CachedMarkup.php:569
#, php-format
msgid "Attribute %s, value: %s"
-msgstr ""
+msgstr "Attribut %s, valeur : %s"
#: ../lib/CachedMarkup.php:577
-#, fuzzy, php-format
+#, php-format
msgid "Relation %s to page %s"
-msgstr "Version %s, enregistrée %s"
+msgstr "Relation %s vers la page %s"
#: ../lib/CachedMarkup.php:632
msgid "Found by "
-msgstr ""
+msgstr "Trouvé par "
#: ../lib/Captcha.php:32
msgid "Typed in verification word mismatch ... are you a bot?"
@@ -70,24 +70,21 @@
msgid "Set USE_DB_SESSION to false."
msgstr "Mettre USE_DB_SESSION à false."
-# lib/diff.php:1001 lib/diff.php:1019
#: ../lib/diff.php:200 ../lib/plugin/Diff.php:66
#, php-format
msgid "version %s"
msgstr "version %s"
-# lib/diff.php:1006 lib/diff.php:1024
#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:534
#: ../lib/WikiTheme.php:536
#, php-format
msgid "by %s"
msgstr "par %s"
-# lib/diff.php:1010 lib/diff.php:1028
#: ../lib/diff.php:207 ../lib/plugin/Diff.php:71
#: ../lib/wikilens/PageListColumns.php:357
msgid "None"
-msgstr "Aucune"
+msgstr "Aucun(e)"
#: ../lib/diff.php:230 ../lib/plugin/Diff.php:94
#: ../lib/plugin/PageHistory.php:329 ../lib/plugin/PageInfo.php:54
@@ -95,31 +92,28 @@
msgid "I'm sorry, there is no such page as %s."
msgstr "Désolé, %s ne correspond à aucune page."
-# lib/diff.php:1045
#: ../lib/diff.php:233 ../lib/diff.php:342
#, php-format
msgid "Diff: %s"
msgstr "Diff : %s"
-# lib/diff.php:1001 lib/diff.php:1019
#: ../lib/diff.php:240 ../lib/diff.php:250 ../lib/plugin/Diff.php:102
#: ../lib/plugin/Diff.php:112
#, php-format
msgid "version %d"
msgstr "version %d"
-# lib/pageinfo.php:64
#: ../lib/diff.php:244 ../lib/plugin/Diff.php:106
msgid "current version"
msgstr "version actuelle"
#: ../lib/diff.php:261 ../lib/plugin/Diff.php:123
msgid "revision by previous author"
-msgstr "révision par auteur précédent"
+msgstr "version par l'auteur précédent"
#: ../lib/diff.php:267 ../lib/plugin/Diff.php:129
msgid "previous revision"
-msgstr "révision précédente"
+msgstr "version précédente"
#: ../lib/diff.php:277 ../lib/plugin/Diff.php:139
msgid "predecessor to the previous major change"
@@ -136,23 +130,23 @@
#: ../lib/diff.php:292 ../lib/plugin/Diff.php:153
msgid "Previous Major Revision"
-msgstr "Précédente Révision Principale"
+msgstr "Version majeure précédente"
#: ../lib/diff.php:293 ../lib/plugin/Diff.php:154
msgid "Previous Revision"
-msgstr "Révision Précédente"
+msgstr "Version précédente"
#: ../lib/diff.php:294 ../lib/plugin/Diff.php:155
msgid "Previous Author"
-msgstr "Auteur Précédent"
+msgstr "Auteur précédent"
#: ../lib/diff.php:310 ../lib/plugin/Diff.php:172
msgid "Newer page:"
-msgstr "Page récente :"
+msgstr "Page plus récente :"
#: ../lib/diff.php:312 ../lib/plugin/Diff.php:174
msgid "Older page:"
-msgstr "Ancienne page :"
+msgstr "Page plus ancienne :"
#: ../lib/display.php:55 ../lib/display.php:321
#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
@@ -176,7 +170,6 @@
msgid "LinkDatabase"
msgstr "LiensDatabase"
-# lib/stdlib.php:384 lib/stdlib.php:445
#: ../lib/display.php:151 ../lib/display.php:395 ../lib/loadsave.php:1575
#: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
#: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
@@ -222,7 +215,7 @@
#: ../lib/display.php:261 ../lib/display.php:268
#, php-format
msgid "BackLinks for %s"
-msgstr "RétroLiens pour %s"
+msgstr "Page liées à %s"
#: ../lib/display.php:276
#, php-format
@@ -238,24 +231,24 @@
msgid "SandBox"
msgstr "BacÀSable"
-# lib/pageinfo.php:64
#: ../lib/editpage.php:163 ../lib/editpage.php:584
msgid "Your version"
msgstr "Votre version"
-# lib/pageinfo.php:70
#: ../lib/editpage.php:163 ../lib/editpage.php:585
msgid "Other version"
msgstr "L'autre version"
#: ../lib/editpage.php:174
msgid "Some internal editing error"
-msgstr ""
+msgstr "Erreur interne pendant la modification"
#: ../lib/editpage.php:175
msgid ""
"Your are probably trying to edit/create an invalid version of this page."
-msgstr "Vous lisez une ancienne révision de cette page."
+msgstr ""
+"Vous essayez probablement de modifier ou de créer une version invalide de "
+"cette page."
#: ../lib/editpage.php:176
msgid "&version=-1 might help."
@@ -269,7 +262,7 @@
#: ../lib/editpage.php:233
#, php-format
msgid "View Source: %s"
-msgstr "Afficher la source : %s"
+msgstr "Source de : %s"
#: ../lib/editpage.php:251
msgid "Page now locked."
@@ -285,7 +278,7 @@
#: ../lib/editpage.php:260
msgid "Page now not-public."
-msgstr "La page n'est maintenant plus publique."
+msgstr "La page est maintenant privée."
#: ../lib/editpage.php:269
msgid "Page now external."
@@ -293,7 +286,7 @@
#: ../lib/editpage.php:270
msgid "Page now not-external."
-msgstr "La page n'est maintenant plus externe."
+msgstr "La page est maintenant interne."
#: ../lib/editpage.php:379
#, php-format
@@ -302,7 +295,7 @@
#: ../lib/editpage.php:433
msgid "Too many external links."
-msgstr "Trop de liens extérieurs."
+msgstr "Trop de liens externes."
#: ../lib/editpage.php:446
msgid "SpamAssassin reports: "
@@ -313,9 +306,9 @@
msgstr ""
#: ../lib/editpage.php:474
-#, fuzzy, php-format
+#, php-format
msgid "%s is listed at %s with %s"
-msgstr "%s pages pointent vers %s :"
+msgstr ""
#: ../lib/editpage.php:498
msgid "Spam Prevention"
@@ -325,12 +318,10 @@
msgid "This page edit seems to contain spam and was therefore not saved."
msgstr ""
-# lib/editpage.php:33 lib/savepage.php:32 lib/savepage.php:53
#: ../lib/editpage.php:501 ../lib/editpage.php:560
msgid "Sorry for the inconvenience."
-msgstr "Désolé pour la gène occasionnée."
+msgstr "Désolé pour la gêne occasionnée."
-# lib/diff.php:1037
#: ../lib/editpage.php:526
msgid "Versions are identical"
msgstr "Les versions sont identiques"
@@ -339,25 +330,23 @@
msgid "Page Locked"
msgstr "Page verrouillée"
-# lib/editpage.php:31 lib/savepage.php:52
#: ../lib/editpage.php:558
msgid ""
"This page has been locked by the administrator so your changes can not be "
"saved."
msgstr ""
"Cette page a été verrouillée par l'administrateur et vos changements n'ont "
-"pas pu être enregistrée."
+"pas pu être enregistrés."
-# lib/savepage.php:24
#: ../lib/editpage.php:559
msgid ""
"(Copy your changes to the clipboard. You can try editing a different page or "
"save your text in a text editor.)"
msgstr ""
-"(Copiez vos modifications dans le presse-papier. Vous pouvez essayer "
-"d'éditer une page différente ou sauver votre texte dans un éditeur)."
+"(Copiez vos modifications dans le presse-papier. Vous pouvez essayer de "
+"modifier une page différente ou enregistrer votre texte à l'aide d'un "
+"éditeur)."
-# lib/display.php:14
#: ../lib/editpage.php:568 ../lib/editpage.php:569 ../lib/main.php:800
#: ../lib/main.php:1167 ../lib/plugin/ModeratedPage.php:42
#: ../lib/plugin/ModeratedPage.php:146 ../lib/plugin/ModeratedPage.php:216
@@ -410,17 +399,17 @@
"those sections by hand before you click Save."
msgstr ""
"Certaines modifications n'ont pas pu être combinées automatiquement. "
-"Veuillez regarder les sections commençant par '%s', et se terminant par "
-"'%s'. Vous devrez éditer ces sections à la main avant cliquer sur "
+"Veuillez regarder les sections commençant par « %s », et se terminant par « "
+"%s ». Vous devrez éditer ces sections à la main avant de cliquer sur "
"Enregistrer."
#: ../lib/editpage.php:587 ../lib/editpage.php:948
msgid "Please check it through before saving."
-msgstr "Veuillez la vérifier avant de la sauver."
+msgstr "Veuillez la vérifier avant de l'enregistrer."
#: ../lib/editpage.php:598
msgid "Conflicting Edits!"
-msgstr "Conflit d'éditions !"
+msgstr "Modifications conflictuelles !"
#: ../lib/editpage.php:599
msgid ""
@@ -442,7 +431,7 @@
#: ../lib/editpage.php:669 ../lib/plugin/HtmlConverter.php:66
msgid "Convert"
-msgstr "Converti"
+msgstr "Convertir"
#: ../lib/editpage.php:698 ../lib/EditToolbar.php:211
#: ../lib/EditToolbar.php:213 ../lib/WysiwygEdit/Wikiwyg.php:79
@@ -454,20 +443,18 @@
msgid "Save"
msgstr "Enregistrer"
-# lib/stdlib.php:384 lib/stdlib.php:445
#: ../lib/editpage.php:709
-#, fuzzy
msgid "Changes"
-msgstr "DernièresModifs"
+msgstr "Modifications"
#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:161
#: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:101
msgid "Upload"
-msgstr "Déposer"
+msgstr "Téléchargé"
#: ../lib/editpage.php:716
msgid "Spell Check"
-msgstr ""
+msgstr "Vérifier l'orthographe"
#: ../lib/editpage.php:739 ../themes/Portland/templates/editpage.tmpl:39
#: ../themes/Wordpress/templates/editpage.tmpl:53
@@ -477,16 +464,16 @@
#: ../lib/editpage.php:900
msgid "Keep old"
-msgstr ""
+msgstr "Garder l'ancien"
#: ../lib/editpage.php:903
msgid "Overwrite with new"
-msgstr ""
+msgstr "Écraser avec le nouveau"
#: ../lib/editpage.php:913
#, php-format
msgid "Merge and Edit: %s"
-msgstr "Fusioner et éditer : %s"
+msgstr "Fusionner et modifier : %s"
#: ../lib/EditToolbar.php:48
msgid "Undo"
@@ -498,7 +485,7 @@
#: ../lib/EditToolbar.php:51
msgid "Operation undone"
-msgstr ""
+msgstr "Opération annulée"
#: ../lib/EditToolbar.php:52
msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"
@@ -507,17 +494,16 @@
#: ../lib/EditToolbar.php:53
#, php-format
msgid "String \"%s\" not found."
-msgstr "\"%s\" non trouvée."
+msgstr "Chaîne \"%s\" non trouvée."
#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:256
#: ../lib/EditToolbar.php:257 ../lib/plugin/WikiAdminSearchReplace.php:192
msgid "Search & Replace"
-msgstr "Recherche & Remplace"
+msgstr "Rechercher & Remplacer"
-# lib/stdlib.php:207 lib/stdlib.php:215
#: ../lib/EditToolbar.php:55
msgid "Search for"
-msgstr "Chercher"
+msgstr "Rechercher"
#: ../lib/EditToolbar.php:56
msgid "Replace with"
@@ -543,27 +529,27 @@
#: ../lib/EditToolbar.php:126
msgid "Bold text"
-msgstr "Texte en gras"
+msgstr "Gras"
#: ../lib/EditToolbar.php:127
msgid "Bold text [alt-b]"
-msgstr "Texte en gras"
+msgstr "Gras [alt-b]"
#: ../lib/EditToolbar.php:131
msgid "Italic text"
-msgstr "Texte en italique"
+msgstr "Italique"
#: ../lib/EditToolbar.php:132
msgid "Italic text [alt-i]"
-msgstr "Texte en italique"
+msgstr "Italique [alt-i]"
#: ../lib/EditToolbar.php:136
msgid "Strike-through text"
-msgstr "Texte rayé"
+msgstr "Biffé"
#: ../lib/EditToolbar.php:137
msgid "Strike"
-msgstr "Rayer"
+msgstr "Biffé"
#: ../lib/EditToolbar.php:141
msgid "Color text"
@@ -575,19 +561,19 @@
#: ../lib/EditToolbar.php:146
msgid "PageName|optional label"
-msgstr ""
+msgstr "Page|label optionnel"
#: ../lib/EditToolbar.php:147
msgid "Link to page"
-msgstr "Lien vers la page"
+msgstr "Lien vers une page"
#: ../lib/EditToolbar.php:151
msgid "http://www.example.com|optional label"
-msgstr ""
+msgstr "http://www.example.com|label facultatif"
#: ../lib/EditToolbar.php:152
msgid "External link (remember http:// prefix)"
-msgstr "Lien externe (http:// prefix)"
+msgstr "Lien externe (le préfixe http:// est obligatoire)"
#: ../lib/EditToolbar.php:156
msgid "Headline text"
@@ -599,13 +585,12 @@
#: ../lib/EditToolbar.php:161
msgid "Insert non-formatted text here"
-msgstr "Insérer du texte non-formaté ici"
+msgstr "Insérer le texte préformaté ici"
#: ../lib/EditToolbar.php:162
msgid "Ignore wiki formatting"
-msgstr "Ignorer le formatage wiki"
+msgstr "Ignorer la syntaxe wiki"
-# lib/pageinfo.php:64
#: ../lib/EditToolbar.php:167
msgid "Your signature"
msgstr "Votre signature"
@@ -643,7 +628,7 @@
#: ../lib/EditToolbar.php:201
msgid "Template Name"
-msgstr "nom du modèle"
+msgstr "Nom du modèle"
#: ../lib/EditToolbar.php:202 ../lib/plugin/PopularTags.php:57
#: ../lib/plugin/Template.php:61
@@ -656,17 +641,15 @@
#: ../lib/EditToolbar.php:248 ../lib/EditToolbar.php:249
msgid "Undo Search & Replace"
-msgstr "Annuler Rechercher & Remplacer"
+msgstr "Annuler « Rechercher & Remplacer »"
-# lib/diff.php:997
#: ../lib/EditToolbar.php:317
msgid "AddCategory"
-msgstr "AjoutezCatégorie"
+msgstr "Ajouter une catégorie"
#: ../lib/EditToolbar.php:320
-#, fuzzy
msgid "Insert Categories"
-msgstr "Catégories populaires"
+msgstr "Ajouter une catégorie"
#: ../lib/EditToolbar.php:322 ../lib/EditToolbar.php:372
#: ../lib/EditToolbar.php:402 ../lib/EditToolbar.php:440
@@ -676,40 +659,35 @@
#: ../lib/EditToolbar.php:367 ../lib/EditToolbar.php:368
msgid "AddPlugin"
-msgstr "AjoutezPlugin"
+msgstr "Insérer un greffon"
#: ../lib/EditToolbar.php:370
-#, fuzzy
msgid "Insert Plugin"
-msgstr "utiliser ce plugin"
+msgstr "Insérer un greffon"
#: ../lib/EditToolbar.php:397 ../lib/EditToolbar.php:398
msgid "AddPageLink"
-msgstr "AjouterDesPagesLien"
+msgstr "Insérer un lien"
#: ../lib/EditToolbar.php:400
-#, fuzzy
msgid "Insert PageLink"
-msgstr "AjouterDesPagesLien"
+msgstr "Insérer un lien"
#: ../lib/EditToolbar.php:435 ../lib/EditToolbar.php:436
-#, fuzzy
msgid "Add Image or Video"
-msgstr "Ajouter l'image"
+msgstr "Ajouter une image ou une vidéo"
#: ../lib/EditToolbar.php:438
-#, fuzzy
msgid "Insert Image or Video"
-msgstr "Ajouter l'image"
+msgstr "Ajouter une image ou une vidéo"
#: ../lib/EditToolbar.php:470 ../lib/EditToolbar.php:471
msgid "AddTemplate"
-msgstr ""
+msgstr "Ajouter un modèle"
#: ../lib/EditToolbar.php:473
-#, fuzzy
msgid "Insert Template"
-msgstr "Modèle"
+msgstr "Ajouter un modèle"
#: ../lib/ErrorManager.php:220
#, php-format
@@ -721,7 +699,6 @@
msgid "%s: file not found"
msgstr "%s : fichier non trouvé"
-# lib/diff.php:997
#: ../lib/IniConfig.php:991
msgid "CategoryGroup"
msgstr "CatégorieGroupes"
@@ -740,7 +717,7 @@
#: ../lib/InlineParser.php:344
msgid "Invalid [] syntax ignored"
-msgstr "[] non valables, ignoré"
+msgstr "Syntaxe [] invalide ignorée"
#: ../lib/InlineParser.php:344 ../lib/plugin/ModeratedPage.php:256
#: ../lib/plugin/ModeratedPage.php:259 ../lib/plugin/ModeratedPage.php:351
@@ -755,18 +732,17 @@
#: ../themes/default/templates/blogform.tmpl:10
#: ../themes/fusionforge/templates/blogform.tmpl:10
#: ../themes/fusionforge/themeinfo.php:35
-#, fuzzy
msgid ": "
-msgstr "%s : %s"
+msgstr " : "
#: ../lib/InlineParser.php:911
#, php-format
msgid "unknown color %s ignored"
-msgstr "%s color non valable ignoré"
+msgstr "couleur %s non valable ignorée"
#: ../lib/loadsave.php:73
msgid "ZIP files of database"
-msgstr ""
+msgstr "Récupérer dans un fichier ZIP"
#: ../lib/loadsave.php:74
msgid "Dump to directory"
@@ -778,7 +754,7 @@
#: ../lib/loadsave.php:76 ../lib/plugin/WikiForm.php:68
msgid "Load File"
-msgstr "Charger le fichier"
+msgstr "Importer un fichier"
#: ../lib/loadsave.php:77
msgid "Upgrade"
@@ -786,7 +762,7 @@
#: ../lib/loadsave.php:79
msgid "Dump pages as XHTML"
-msgstr "Sauvegarde des pages au format XHTML"
+msgstr "Exporter les pages en XHTML"
#: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1033
#: ../lib/loadsave.php:1039 ../lib/loadsave.php:1047 ../lib/main.php:1063
@@ -815,23 +791,22 @@
#: ../lib/loadsave.php:96 ../lib/MailNotify.php:287 ../lib/MailNotify.php:304
#, php-format
msgid "Edited by: %s"
-msgstr "Édité par : %s"
+msgstr "Modifié par : %s"
#: ../lib/loadsave.php:98 ../lib/loadsave.php:99
-#, fuzzy
msgid "LoadDump"
msgstr "RécupérationDeLaPage"
#: ../lib/loadsave.php:102
#, php-format
msgid "PageChange Notification of %s sent to %s"
-msgstr "Les notifications de changement de la page %s ont été envoyés à %s"
+msgstr "La notification de changement de la page %s a été envoyée à %s"
#: ../lib/loadsave.php:105
#, php-format
msgid "PageChange Notification Error: Couldn't send %s to %s"
msgstr ""
-"Erreur lors des notifications de changements de page: Impossible d'envoyer "
+"Erreur lors de la notification de changement de page : impossible d'envoyer "
"%s à %s"
#: ../lib/loadsave.php:113
@@ -841,7 +816,7 @@
#: ../lib/loadsave.php:114
#, php-format
msgid "Return to %s"
-msgstr "Retour à la %s"
+msgstr "Retourner à %s"
#: ../lib/loadsave.php:244
msgid "FullDump"
@@ -858,17 +833,17 @@
#: ../lib/loadsave.php:323 ../lib/loadsave.php:454
#, php-format
msgid "Cannot create directory '%s'"
-msgstr "Impossible de créer le répertoire '%s'"
+msgstr "Impossible de créer le répertoire : « %s »"
#: ../lib/loadsave.php:325 ../lib/loadsave.php:456
#, php-format
msgid "Created directory '%s' for the page dump..."
-msgstr "Répertoire '%s' créé pour la sauvegarde..."
+msgstr "Répertoire « %s » créé pour la sauvegarde..."
#: ../lib/loadsave.php:328 ../lib/loadsave.php:459
#, php-format
msgid "Using directory '%s'"
-msgstr "Utilisation du répertoire '%s'"
+msgstr "Utilisation du répertoire « %s »"
#: ../lib/loadsave.php:331 ../lib/loadsave.php:461
msgid "Dumping Pages"
@@ -894,14 +869,12 @@
msgid "%s bytes written"
msgstr "%s octets enregistrés"
-# lib/editpage.php:19
#: ../lib/loadsave.php:680 ../lib/loadsave.php:757 ../lib/loadsave.php:792
#: ../lib/loadsave.php:822
#, php-format
msgid "... copied to %s"
msgstr "... copié à %s"
-# lib/editpage.php:19
#: ../lib/loadsave.php:683 ../lib/loadsave.php:759 ../lib/loadsave.php:794
#: ../lib/loadsave.php:824
#, php-format
@@ -910,20 +883,19 @@
#: ../lib/loadsave.php:704
msgid "saved as "
-msgstr "enregistrée sous "
+msgstr "enregistré sous "
#: ../lib/loadsave.php:767 ../lib/loadsave.php:802 ../lib/loadsave.php:833
msgid "... not found"
msgstr "... non trouvé"
-# lib/pageinfo.php:9
#: ../lib/loadsave.php:893
msgid "Empty pagename!"
-msgstr "La page n'a aucun titre !"
+msgstr "Nom de page vide !"
#: ../lib/loadsave.php:903
msgid "Invalid pagename!"
-msgstr "Nom de page invalide."
+msgstr "Nom de page invalide !"
#: ../lib/loadsave.php:909 ../lib/loadsave.php:1556 ../lib/PageType.php:136
#: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
@@ -946,25 +918,26 @@
#: ../lib/loadsave.php:983
msgid "has edit conflicts - overwriting anyway"
-msgstr "conflits d'édition - écraser quand même "
+msgstr "conflits de modification - écraser quand même "
#: ../lib/loadsave.php:992
msgid "keep old"
-msgstr ""
+msgstr "garder l'ancien"
#: ../lib/loadsave.php:994
msgid "has edit conflicts - skipped"
-msgstr "a des conflits d'édition - ignoré"
+msgstr "a des conflits de modification - ignoré"
#: ../lib/loadsave.php:1003
#, php-format
msgid "content is identical to current version %d - no new revision created"
-msgstr "contenu est identique à la version en cours %d - pas de révision"
+msgstr ""
+"le contenu est identique à la version en cours %d - pas de nouvelle version"
#: ../lib/loadsave.php:1017
#, php-format
msgid "- saved to database as version %d"
-msgstr "- sauvée dans la base de données sous la version %d"
+msgstr "- enregistrée dans la base de données sous la version %d"
#: ../lib/loadsave.php:1023 ../lib/loadsave.php:1294
#, php-format
@@ -979,11 +952,11 @@
#: ../lib/loadsave.php:1025 ../lib/loadsave.php:1327
#, php-format
msgid "plain file %s"
-msgstr "fichier simple %s"
+msgstr "fichier brut %s"
#: ../lib/loadsave.php:1032 ../lib/plugin/SyncWiki.php:266
msgid "Merge Edit"
-msgstr "Fusionner l'édition"
+msgstr "Fusionner les modifications"
#: ../lib/loadsave.php:1038
msgid "Restore Anyway"
@@ -991,7 +964,7 @@
#: ../lib/loadsave.php:1046
msgid "Overwrite All"
-msgstr ""
+msgstr "Tout écraser"
#: ../lib/loadsave.php:1053
msgid " Sorry, cannot merge."
@@ -1006,19 +979,19 @@
#: ../themes/smaller/templates/actionbar.tmpl:31
#: ../themes/Wordpress/templates/actionbar.tmpl:60
msgid "Revert"
-msgstr "Réinitialiser"
+msgstr "Révoquer"
#: ../lib/loadsave.php:1074
msgid "missing required version argument"
-msgstr "argument de version requis manquant"
+msgstr "argument de version obligatoire manquant"
#: ../lib/loadsave.php:1082
msgid "no page content"
-msgstr "pas de sommaire de page"
+msgstr "pas de contenu dans la page"
#: ../lib/loadsave.php:1089
msgid "same version page"
-msgstr "même version de page"
+msgstr "même version de la page"
#: ../lib/loadsave.php:1096
msgid "Cancelled"
@@ -1054,16 +1027,15 @@
msgid "Cancel"
msgstr "Annuler"
-# lib/diff.php:1001 lib/diff.php:1019
#: ../lib/loadsave.php:1124
#, php-format
msgid "revert to version %d"
msgstr "revenir à la version %d"
#: ../lib/loadsave.php:1130
-#, fuzzy, php-format
+#, php-format
msgid "Revert: %s"
-msgstr "Réinitialiser"
+msgstr "Révoquer : %s"
#: ../lib/loadsave.php:1131
#, php-format
@@ -1082,7 +1054,7 @@
#: ../lib/loadsave.php:1166 ../lib/PageType.php:298
#, php-format
msgid "Loading InterWikiMap from external file %s."
-msgstr "Chargement de la CarteInterWiki depuis le fichiers %s."
+msgstr "Chargement de la CarteInterWiki depuis le fichier %s."
#: ../lib/loadsave.php:1342 ../lib/loadsave.php:1355
msgid "Skipping"
@@ -1101,11 +1073,11 @@
#: ../lib/loadsave.php:1480
#, php-format
msgid "Loading '%s'"
-msgstr "Chargement ' %s '"
+msgstr "Chargement de « %s »"
#: ../lib/loadsave.php:1512
msgid "Loading up virgin wiki"
-msgstr "Chargement d'un wiki vierge"
+msgstr "Chargement du nouveau wiki"
#: ../lib/loadsave.php:1568
msgid "No uploaded file to upload?"
@@ -1114,12 +1086,12 @@
#: ../lib/loadsave.php:1571
#, php-format
msgid "Uploading %s"
-msgstr "Dépôt de %s"
+msgstr "Téléchargement de %s"
#: ../lib/MailNotify.php:194
-#, fuzzy, php-format
+#, php-format
msgid "PageChange Notification of %s"
-msgstr "Les notifications de changement de la page %s ont été envoyés à %s"
+msgstr "Notification de changement de la page %s"
#: ../lib/MailNotify.php:228
#, php-format
@@ -1133,25 +1105,24 @@
#: ../lib/MailNotify.php:256
msgid "Page change"
-msgstr "Modification de page"
+msgstr "Modification de la page"
#: ../lib/MailNotify.php:288
-#, fuzzy, php-format
+#, php-format
msgid "Summary: %s"
-msgstr "Résumé :"
+msgstr "Résumé : %s"
#: ../lib/MailNotify.php:305
#, php-format
msgid "Page rename %s to %s"
-msgstr "retitrez la page de '%s' à '%s'"
+msgstr "Page renommée de %s à %s"
#: ../lib/MailNotify.php:342
-#, fuzzy, php-format
+#, php-format
msgid "User %s removed page %s"
-msgstr "Page enlevée %s"
+msgstr "L'utilisateur %s a supprimé la page %s"
#: ../lib/MailNotify.php:378
-#, fuzzy
msgid "E-Mail address confirmation"
msgstr "Vérification de l'adresse électronique"
@@ -1172,7 +1143,7 @@
#: ../lib/main.php:101 ../lib/WikiDB.php:1010
msgid "Optimizing database"
-msgstr "Optimisation de database"
+msgstr "Optimisation de la base de données"
#: ../lib/main.php:473
msgid "FORBIDDEN"
@@ -1219,7 +1190,8 @@
#, php-format
msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
msgstr ""
-"%s %s %s est interdite sur ce wiki pour %s l'utilisateur '%s' (niveau : %s)."
+"%s %s %s est interdite sur ce wiki pour %s l'utilisateur « %s » (niveau : "
+"%s)."
#: ../lib/main.php:533
#, php-format
@@ -1246,7 +1218,7 @@
#: ../lib/main.php:561
msgid "dump html pages"
-msgstr "récupération des pages HTML"
+msgstr "récupération des pages en HTML"
#: ../lib/main.php:562
msgid "dump serial pages"
@@ -1254,7 +1226,7 @@
#: ../lib/main.php:563
msgid "edit this page"
-msgstr "éditer cette page"
+msgstr "modifier cette page"
#: ../lib/main.php:564
msgid "rename this page"
@@ -1262,7 +1234,7 @@
#: ../lib/main.php:565
msgid "revert to a previous version of this page"
-msgstr "revenir à une précédente version de cette page."
+msgstr "revenir à une version précédente de la page"
#: ../lib/main.php:566
msgid "create this page"
@@ -1270,7 +1242,7 @@
#: ../lib/main.php:567
msgid "load files into this wiki"
-msgstr "chargement des fichiers sur ce wiki"
+msgstr "importer des fichiers dans ce wiki"
#: ../lib/main.php:568
msgid "lock this page"
@@ -1286,7 +1258,7 @@
#: ../lib/main.php:571
msgid "unlock this page"
-msgstr "déverrouiller la page"
+msgstr "déverrouiller cette page"
#: ../lib/main.php:572
msgid "upload a zip dump"
@@ -1311,16 +1283,15 @@
#: ../lib/main.php:577
msgid "download a zip dump from this wiki"
-msgstr "télécharger une sauvegarde compressée de ce wiki"
+msgstr "télécharger une sauvegarde ZIP de ce wiki"
#: ../lib/main.php:578
msgid "download a html zip dump from this wiki"
-msgstr "télécharger une sauvegarde HTML compressée de ce wiki"
+msgstr "télécharger une sauvegarde HTML ZIP de ce wiki"
#: ../lib/main.php:584
-#, fuzzy
msgid "use"
-msgstr "utilisateurs"
+msgstr ""
#: ../lib/main.php:602
msgid "Browsing pages"
@@ -1340,7 +1311,7 @@
#: ../lib/main.php:606
msgid "Editing pages"
-msgstr "Éditions des pages"
+msgstr "Modifier des pages"
#: ../lib/main.php:607
msgid "Reverting to a previous version of pages"
@@ -1348,7 +1319,7 @@
#: ../lib/main.php:608
msgid "Creating pages"
-msgstr "Création des pages"
+msgstr "Créer des pages"
#: ../lib/main.php:609
msgid "Loading files"
@@ -1356,25 +1327,24 @@
#: ../lib/main.php:610
msgid "Locking pages"
-msgstr "Verrouillage des pages"
+msgstr "Verrouiller des pages"
#: ../lib/main.php:611
msgid "Purging pages"
-msgstr "Purge des pages"
+msgstr "Purger des pages"
#: ../lib/main.php:612
msgid "Removing pages"
-msgstr "Suppression des pages"
+msgstr "Supprimer les pages"
#: ../lib/main.php:613
msgid "Unlocking pages"
-msgstr "Déverrouillage des pages"
+msgstr "Déverrouiller des pages"
#: ../lib/main.php:614
msgid "Uploading zip dumps"
msgstr "Déposer la sauvegarde compressée"
-# lib/pageinfo.php:64
#: ../lib/main.php:615
msgid "Verify the current action"
msgstr "Vérifier l'action actuelle"
@@ -1397,17 +1367,15 @@
#: ../lib/main.php:620
msgid "Downloading html zip dumps"
-msgstr "Téléchargement des sauvegardes html compressées"
+msgstr "Téléchargement des sauvegardes HTML compressées"
#: ../lib/main.php:769
-#, fuzzy
msgid "Illegal character '"
-msgstr "Illégal %s supprimées"
+msgstr "Caractère interdit '"
#: ../lib/main.php:769
-#, fuzzy
msgid "' in page name."
-msgstr "%s : Nom de page invalide"
+msgstr "' dans le nom de la page."
#: ../lib/main.php:788
#, php-format
@@ -1427,7 +1395,6 @@
msgid "%s: Bad action"
msgstr "%s : Mauvaise action"
-# lib/stdlib.php:36
#: ../lib/main.php:833
msgid "Fatal PhpWiki Error"
msgstr "Erreur fatale de PhpWiki"
@@ -1441,9 +1408,8 @@
msgstr "DéfinirAcl"
#: ../lib/main.php:1092
-#, fuzzy
msgid "SetAclSimple"
-msgstr "WikiAdminSetAcl"
+msgstr ""
#: ../lib/main.php:1096 ../lib/PagePerm.php:190
#: ../lib/plugin/WikiAdminRename.php:141 ../lib/plugin/WikiAdminRename.php:266
@@ -1463,13 +1429,11 @@
msgid "PageDump"
msgstr "RécupérationDeLaPage"
-# lib/fullsearch.php:48
#: ../lib/main.php:1123 ../lib/plugin/FullTextSearch.php:46
#: ../lib/plugin/WantedPagesOld.php:126
msgid "FullTextSearch"
msgstr "RechercheEnTexteIntégral"
-# lib/fullsearch.php:48
#: ../lib/main.php:1131 ../lib/plugin/RecentChanges.php:808
#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1485
#: ../themes/Crao/templates/navbar.tmpl:5
@@ -1488,7 +1452,7 @@
#: ../lib/main.php:1305 ../lib/main.php:1318 ../lib/Request.php:821
#, php-format
msgid "%s is not writable."
-msgstr "%s n'est pas accessible en écriture."
+msgstr "%s n'est pas modifiable."
#: ../lib/main.php:1306
msgid "The session.save_path directory"
@@ -1498,8 +1462,8 @@
#, php-format
msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
msgstr ""
-"Veuillez vous assurer que %s est disponible en écriture, ou redéfinissez-le "
-"dans config/config.ini."
+"Veuillez vous assurer que %s est modifiable, ou redéfinissez %s dans config/"
+"config.ini."
#: ../lib/main.php:1309
#, php-format
@@ -1517,28 +1481,25 @@
#: ../lib/main.php:1332
msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
-msgstr ""
+msgstr "Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 4.3.9"
-# lib/diff.php:1006 lib/diff.php:1024
#: ../lib/PageList.php:93
#, php-format
msgid "Sort by %s"
-msgstr "Trié par %s"
+msgstr "Trier par %s"
#: ../lib/PageList.php:120
-#, fuzzy
msgid "reverse"
-msgstr "Réinitialiser"
+msgstr "inverser"
#: ../lib/PageList.php:131
msgid "Click to reverse sort order"
-msgstr "Cliquer pour inverser l'ordre de tri"
+msgstr "Cliquez pour inverser le tri"
-# lib/diff.php:1006 lib/diff.php:1024
#: ../lib/PageList.php:138
#, php-format
msgid "Click to sort by %s"
-msgstr "Cliquer pour trier par %s"
+msgstr "Cliquez pour trier par %s"
#: ../lib/PageList.php:275
msgid "Click to de-/select all pages"
@@ -1569,15 +1530,14 @@
#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:241
#: ../themes/default/templates/info.tmpl:75
#: ../themes/MonoBook/templates/info.tmpl:89
-#, fuzzy
msgid "individual page permission"
-msgstr "Permission de page individuelle"
+msgstr "permission de page individuelle"
#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:243
#: ../themes/default/templates/info.tmpl:77
#: ../themes/MonoBook/templates/info.tmpl:91
msgid "default page permission"
-msgstr "Permission de page par défaut"
+msgstr "permission de page par défaut"
#: ../lib/PageList.php:658 ../lib/plugin/FullTextSearch.php:115
msgid "<no matches>"
@@ -1588,7 +1548,6 @@
msgid "Content"
msgstr "Contenu"
-# lib/diff.php:1001 lib/diff.php:1019
#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:134
#: ../lib/plugin/WikiAdminSetAcl.php:188
msgid "Permission"
@@ -1601,9 +1560,8 @@
#: ../lib/PageList.php:1180
msgid "All"
-msgstr ""
+msgstr "Tout"
-# lib/diff.php:1003 lib/diff.php:1021
#: ../lib/PageList.php:1184 ../themes/default/templates/info.tmpl:57
#: ../themes/MonoBook/templates/info.tmpl:72
msgid "Last Modified"
@@ -1625,7 +1583,6 @@
msgid "Last Summary"
msgstr "Dernier résumé"
-# lib/diff.php:1001 lib/diff.php:1019
#: ../lib/PageList.php:1193 ../lib/plugin/AuthorHistory.php:111
#: ../lib/plugin/AuthorHistory.php:154
msgid "Version"
@@ -1651,11 +1608,11 @@
#: ../themes/MonoBook/templates/info.tmpl:143
#: ../themes/Wordpress/templates/editpage.tmpl:62
msgid "Locked"
-msgstr "Verrouillée"
+msgstr "Verrouillé"
#: ../lib/PageList.php:1207
msgid "locked"
-msgstr "verrouillée"
+msgstr "verrouillé"
#: ../lib/PageList.php:1209 ../themes/fusionforge/templates/editpage.tmpl:67
msgid "External"
@@ -1671,11 +1628,11 @@
#: ../lib/PageList.php:1213
msgid "minor"
-msgstr "mineure"
+msgstr "mineur"
#: ../lib/PageList.php:1215
msgid "Markup"
-msgstr "Marquage"
+msgstr "Syntaxe"
#: ../lib/PageList.php:1384 ../lib/PageList.php:1391 ../lib/PageList.php:1397
#: ../lib/WikiDB/backend.php:549 ../lib/WikiDB/backend.php:555
@@ -1685,12 +1642,11 @@
#: ../lib/PageList.php:1506 ../lib/plugin/WantedPagesOld.php:170
#, php-format
msgid "Columns: %s."
-msgstr "Colonnes : %s."
+msgstr "Colonnes : %s."
#: ../lib/PagePerm.php:191
-#, fuzzy
msgid "SearchReplace"
-msgstr "Recherche & Remplace"
+msgstr "Rechercher & Remplacer"
#: ../lib/PagePerm.php:321
msgid "List this page and all subpages"
@@ -1714,11 +1670,11 @@
#: ../lib/PagePerm.php:326
msgid "Change page attributes"
-msgstr "Changer les attributs de cette page"
+msgstr "Modifier les attributs de la page"
#: ../lib/PagePerm.php:327
msgid "Remove this page"
-msgstr "Supprimer la page"
+msgstr "Supprimer cette page"
#: ../lib/PagePerm.php:328
msgid "Purge this page"
@@ -1735,7 +1691,7 @@
#: ../lib/PagePerm.php:585
msgid "Group/User"
-msgstr "Groupe/Utilisateur"
+msgstr "Groupe/utilisateur"
#: ../lib/PagePerm.php:586
msgid "Grant"
@@ -1743,7 +1699,7 @@
#: ../lib/PagePerm.php:587
msgid "Del/+"
-msgstr "Effacer/+"
+msgstr "Suppr/+"
#: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
#: ../lib/plugin/WikiAdminSetAcl.php:247
@@ -1752,7 +1708,7 @@
#: ../lib/PagePerm.php:609
msgid "Add this ACL"
-msgstr "Ajouer cette ACL"
+msgstr "Ajouter cette ACL"
#: ../lib/PagePerm.php:633
msgid "Allow / Deny"
@@ -1760,7 +1716,7 @@
#: ../lib/PagePerm.php:645
msgid "Delete this ACL"
-msgstr "Effacer cette ACL"
+msgstr "Supprimer cette ACL"
#: ../lib/PagePerm.php:671
msgid "add "
@@ -1768,13 +1724,12 @@
#: ../lib/PagePerm.php:675
msgid "Check to add this ACL"
-msgstr "Vérifier pour ajouter cette ACL"
+msgstr "Cocher pour ajouter cette ACL"
#: ../lib/PageType.php:142
msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
msgstr ""
-# lib/diff.php:1001 lib/diff.php:1019
#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:831
#: ../themes/default/templates/navbar.tmpl:8
#: ../themes/default/templates/navbar.tmpl:10
@@ -1810,15 +1765,15 @@
#: ../lib/plugin/AddComment.php:73 ../lib/plugin/WikiForum.php:71
msgid "No pagename specified"
-msgstr "Aucun nom de page indiqué"
+msgstr "Pas de nom de page spécifié"
#: ../lib/plugin/AddComment.php:98
msgid "Click to hide the comments"
-msgstr ""
+msgstr "Cliquez pour masquer les commentaires"
#: ../lib/plugin/AddComment.php:101
msgid "Click to display all comments"
-msgstr "Cliquez pour afficher tout commente"
+msgstr "Cliquez pour afficher tous les commentaires"
#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:482
msgid "Click to display"
@@ -1835,17 +1790,17 @@
#: ../lib/plugin/AllPages.php:38
msgid "List all pages in this wiki."
-msgstr "Afficher la liste de toutes les pages de ce wiki."
+msgstr "Liste de toutes les pages de ce wiki."
#: ../lib/plugin/AllPages.php:69
-#, fuzzy, php-format
+#, php-format
msgid "All pages in this wiki (%d total):"
-msgstr "Toutes les pages dans ce wiki ({total} au total) :"
+msgstr "Toutes les pages de ce wiki (%d au total) :"
#: ../lib/plugin/AllPages.php:75
-#, fuzzy, php-format
+#, php-format
msgid "List of user-created pages (%d total):"
-msgstr "Liste des pages créées par les utilisateurs ({total} au total) :"
+msgstr "Liste des pages créées par les utilisateurs (%d au total) :"
#: ../lib/plugin/AllPages.php:84 ../lib/plugin/LinkDatabase.php:81
#, php-format
@@ -1953,7 +1908,7 @@
#: ../lib/plugin/AnalyseAccessLogSql.php:232
msgid "hours"
-msgstr ""
+msgstr "heures"
#: ../lib/plugin/AnalyseAccessLogSql.php:233 ../lib/plugin/VisualWiki.php:498
msgid "days"
@@ -1961,7 +1916,7 @@
#: ../lib/plugin/AnalyseAccessLogSql.php:234
msgid "weeks"
-msgstr ""
+msgstr "semaines"
#: ../lib/plugin/AnalyseAccessLogSql.php:252
msgid "AnalyseAccessLogSql"
@@ -2014,12 +1969,12 @@
#: ../lib/plugin/AppendText.php:125
msgid "Page successfully updated."
-msgstr "Page changé avec succès."
+msgstr "Page mise à jour avec succès."
#: ../lib/plugin/AppendText.php:142
#, php-format
msgid "Go to %s."
-msgstr ""
+msgstr "Aller à %s"
#: ../lib/plugin/AsciiMath.php:49
msgid "AsciiMath"
@@ -2042,14 +1997,12 @@
msgstr ""
#: ../lib/plugin/AtomFeed.php:36
-#, fuzzy
msgid "Atom Aggregator Plugin"
-msgstr "Importer des ressources RSS"
+msgstr ""
-# InfosAuthentification
#: ../lib/plugin/_AuthInfo.php:35
msgid "AuthInfo"
-msgstr "InfosAuth"
+msgstr ""
#: ../lib/plugin/_AuthInfo.php:39
msgid "Display general and user specific auth information."
@@ -2082,12 +2035,12 @@
"List all page revisions edited by one user with diff links, or show a "
"PageHistory-like list of a single page for only one user."
msgstr ""
-"Affiche la liste de toutes les révisions faites par un auteur, ou montre une "
+"Affiche la liste de toutes les versions faites par un auteur, ou montre une "
"liste du type HistoriquePage pour une simple page uniquement pour un auteur."
#: ../lib/plugin/AuthorHistory.php:112 ../lib/plugin/AuthorHistory.php:155
msgid "Minor"
-msgstr "Mineure"
+msgstr "Mineur"
#: ../lib/plugin/AuthorHistory.php:113
#: ../themes/default/templates/info.tmpl:63
@@ -2107,10 +2060,9 @@
msgid "Summary"
msgstr "Résumé"
-# lib/diff.php:1003 lib/diff.php:1021
#: ../lib/plugin/AuthorHistory.php:115 ../lib/plugin/AuthorHistory.php:157
msgid "Modified"
-msgstr "Dernière modification"
+msgstr "Modifié"
#: ../lib/plugin/AuthorHistory.php:144
#, php-format
@@ -2143,7 +2095,7 @@
#: ../lib/plugin/_BackendInfo.php:53
#, php-format
msgid "Querying backend directly for '%s'"
-msgstr "Requête directe au backend pour '%s'"
+msgstr "Requête directe au backend pour « %s »"
#: ../lib/plugin/_BackendInfo.php:62
#, php-format
@@ -2157,7 +2109,7 @@
#: ../lib/plugin/BackLinks.php:33
#, php-format
msgid "List all pages which link to %s."
-msgstr "Affiche toutes les pages liée à %s."
+msgstr "Liste des pages liées à %s."
#: ../lib/plugin/BackLinks.php:67 ../lib/plugin/ListPages.php:118
#: ../lib/plugin/ListPages.php:121 ../lib/plugin/ListSubpages.php:84
@@ -2167,12 +2119,12 @@
#: ../lib/plugin/BackLinks.php:120
#, php-format
msgid "No other page links to %s yet."
-msgstr "Aucune page n'est ancore liée à %s."
+msgstr "Aucune page n'est déjà liée à %s."
#: ../lib/plugin/BackLinks.php:123
#, php-format
msgid "One page would link to %s:"
-msgstr "Une page pointait vers %s :"
+msgstr "Une page pointerait vers %s :"
#: ../lib/plugin/BackLinks.php:132
#, php-format
@@ -2195,9 +2147,8 @@
msgstr "Une page pointe vers %s :"
#: ../lib/plugin/BackLinks.php:162
-#, fuzzy
msgid "Those"
-msgstr "Fermer"
+msgstr ""
#: ../lib/plugin/BackLinks.php:161
#, php-format
@@ -2206,12 +2157,12 @@
#: ../lib/plugin/BackLinks.php:170
msgid "More..."
-msgstr ""
+msgstr "Plus..."
#: ../lib/plugin/BlogArchives.php:39 ../lib/plugin/BlogArchives.php:144
#: ../themes/blog/templates/actionbar.tmpl:11
msgid "Archives"
-msgstr ""
+msgstr "Archives"
#: ../lib/plugin/BlogArchives.php:43
msgid "List blog months links for the current or ADMIN user"
@@ -2240,9 +2191,8 @@
msgstr ""
#: ../lib/plugin/BlogJournal.php:95
-#, fuzzy
msgid "New entry"
-msgstr "Nouveau commentaire."
+msgstr "Nouvelle entrée"
#: ../lib/plugin/BlogJournal.php:97
msgid "No Blog Entries"
@@ -2284,22 +2234,20 @@
msgstr "Mois suivant"
#: ../lib/plugin/Calendar.php:127
-#, fuzzy
msgid "Wk"
-msgstr "L"
+msgstr ""
-# lib/diff.php:997
#: ../lib/plugin/CategoryPage.php:44
msgid "CategoryPage"
msgstr "CatégoriePages"
#: ../lib/plugin/CategoryPage.php:48
msgid "Create a Wiki page."
-msgstr "Créer cette page."
+msgstr "Créer une page wiki"
#: ../lib/plugin/Chart.php:50
msgid "Chart"
-msgstr ""
+msgstr "Diagramme"
#: ../lib/plugin/Chart.php:54
msgid "Render SVG charts"
@@ -2314,9 +2262,8 @@
msgstr "Cacher des commentaires dans une PageWiki."
#: ../lib/plugin/CreateBib.php:37
-#, fuzzy
msgid "CreateBib"
-msgstr "CréerUneTdm"
+msgstr ""
#: ../lib/plugin/CreateBib.php:41
msgid "Automatically create a Bibtex file from linked pages"
@@ -2337,20 +2284,17 @@
msgstr "Créer une PageWiki avec le nom demandé."
#: ../lib/plugin/CreatePage.php:66
-#, fuzzy
msgid "Cannot create page with empty name!"
-msgstr "Impossible de créer le répertoire '%s'"
+msgstr ""
-# lib/display.php:14
#: ../lib/plugin/CreatePage.php:70
-#, fuzzy
msgid "CreatePage failed"
-msgstr "CréerUnePage"
+msgstr ""
#: ../lib/plugin/CreatePage.php:72 ../lib/plugin/CreatePage.php:74
-#, fuzzy, php-format
+#, php-format
msgid "Do you really want to create the page '%s'?"
-msgstr "Voulez-vous réellement reinitialiser le mot de passe de %s ?"
+msgstr "Voulez-vous réellement crééer la page '%s' ?"
#: ../lib/plugin/CreatePage.php:79 ../lib/plugin/CreatePage.php:83
msgid "The new page you want to create will be a subpage."
@@ -2370,7 +2314,6 @@
msgid "%s already exists"
msgstr "%s existe déjà"
-# lib/display.php:14
#: ../lib/plugin/CreatePage.php:132
msgid "Created by CreatePage"
msgstr "Créée par CréerUnePage"
@@ -2384,26 +2327,25 @@
msgstr ""
#: ../lib/plugin/CreateToc.php:376 ../lib/plugin/Template.php:108
-#, fuzzy
msgid "No page specified."
-msgstr "aucune page indiquée"
+msgstr "Aucune page indiquée"
#: ../lib/plugin/CreateToc.php:387 ../lib/plugin/Template.php:129
-#, fuzzy, php-format
+#, php-format
msgid "Page '%s' does not exist."
-msgstr "Le groupe de page %s n'existe pas"
+msgstr "La page « %s » n'existe pas"
#: ../lib/plugin/CreateToc.php:392 ../lib/plugin/Diff.php:86
#: ../lib/plugin/PageDump.php:85
#, php-format
msgid "Illegal access to page %s: no read access"
-msgstr ""
+msgstr "Accès en lecture interdit pour la page « %s »."
#: ../lib/plugin/CreateToc.php:401 ../lib/plugin/IncludePage.php:104
#: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:142
-#, fuzzy, php-format
+#, php-format
msgid "%s: no such revision %d."
-msgstr "%s(%d) : révision inexistante"
+msgstr "%s(%d) : version inexistante"
#: ../lib/plugin/CreateToc.php:412
msgid "CreateToc disabled for old markup."
@@ -2421,59 +2363,53 @@
msgid "A simple plugin that displays current time and date"
msgstr ""
-# lib/display.php:14
#: ../lib/plugin/DeadEndPages.php:31
msgid "DeadEndPages"
-msgstr "PagesSansLien"
+msgstr ""
#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1041
#: ../themes/blog/themeinfo.php:67
msgid "Diff"
-msgstr "Diff"
+msgstr ""
#: ../lib/plugin/Diff.php:40
msgid "Display differences between revisions"
-msgstr "Affiche les différences entre révisions"
+msgstr "Affiche les différences entre versions"
# lib/diff.php:1001 lib/diff.php:1019
#: ../lib/plugin/Diff.php:182
-#, fuzzy
msgid "Content of versions "
-msgstr "revenir à la version %d"
+msgstr "Contenu des versions "
#: ../lib/plugin/Diff.php:183
msgid " and "
msgstr " et "
-# lib/diff.php:1037
#: ../lib/plugin/Diff.php:183
msgid " is identical."
msgstr " est identique."
-# lib/diff.php:1001 lib/diff.php:1019
#: ../lib/plugin/Diff.php:188
msgid "Version "
-msgstr "Version"
+msgstr "Version "
#: ../lib/plugin/Diff.php:189
msgid " was created because: "
-msgstr " a été créé car : "
+msgstr " a été créée car : "
#: ../lib/plugin/DynamicIncludePage.php:35
-#, fuzzy
msgid "DynamicIncludePage"
-msgstr "InclureUnePage"
+msgstr ""
#: ../lib/plugin/DynamicIncludePage.php:39
-#, fuzzy
msgid "Dynamically include the content from another wiki page."
-msgstr "Inclure le texte d'une autre PageWiki."
+msgstr "Inclure dynamiquement le texte d'une autre PageWiki."
#: ../lib/plugin/DynamicIncludePage.php:59
#: ../lib/plugin/DynamicIncludePage.php:82
-#, fuzzy, php-format
+#, php-format
msgid " %s :"
-msgstr "%s b"
+msgstr ""
#: ../lib/plugin/DynamicIncludePage.php:77
#: ../lib/plugin/DynamicIncludePage.php:78
@@ -2507,7 +2443,7 @@
#: ../lib/plugin/EditMetaData.php:144 ../lib/upgrade.php:789
msgid "Submit"
-msgstr "Valider"
+msgstr "Soumettre"
#: ../lib/plugin/EditMetaData.php:159
msgid "Requires WikiAdmin privileges to edit."
@@ -2534,9 +2470,8 @@
msgstr ""
#: ../lib/plugin/FileInfo.php:40
-#, fuzzy
msgid "FileInfo"
-msgstr "Info"
+msgstr ""
#: ../lib/plugin/FileInfo.php:44
msgid "Display file information like version, size, date... of uploaded files."
@@ -2547,12 +2482,12 @@
#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:189
#, php-format
msgid "A required argument '%s' is missing."
-msgstr "Un argument requis '%s' est manquant."
+msgstr ""
#: ../lib/plugin/FileInfo.php:76
-#, fuzzy, php-format
+#, php-format
msgid "File '%s' not found."
-msgstr "%s non trouvé"
+msgstr "Fichier « %s » non trouvé."
#: ../lib/plugin/FileInfo.php:90
msgid ""
@@ -2610,9 +2545,9 @@
"Affiche une url dans une cadre interne à la page. Un seul cadre autorisé."
#: ../lib/plugin/FrameInclude.php:88 ../lib/plugin/Template.php:123
-#, fuzzy, php-format
+#, php-format
msgid "Recursive inclusion of page %s"
-msgstr "insertion récursive de la page %s"
+msgstr "Insertion récursive de la page %s"
#: ../lib/plugin/FrameInclude.php:94
#, php-format
@@ -2620,9 +2555,9 @@
msgstr "%s ou %s paramètre manquant"
#: ../lib/plugin/FrameInclude.php:100 ../lib/plugin/Transclude.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Recursive inclusion of url %s"
-msgstr "insertion récursive de l'URL %s"
+msgstr "Insertion récursive de l'URL %s"
#: ../lib/plugin/FrameInclude.php:107 ../lib/plugin/SemanticSearch.php:287
#: ../lib/plugin/TeX2png.php:228 ../lib/plugin/text2png.php:81
@@ -2635,7 +2570,6 @@
msgid "Search the content of all pages in this wiki."
msgstr "Rechercher le contenu de toutes les pages de ce wiki."
-# lib/fullsearch.php:48
#: ../lib/plugin/FullTextSearch.php:88 ../lib/plugin/FullTextSearch.php:123
#, php-format
msgid "Full text search results for '%s'"
@@ -2652,9 +2586,9 @@
msgstr ""
#: ../lib/plugin/FullTextSearch.php:163 ../lib/plugin/WantedPages.php:171
-#, fuzzy, php-format
+#, php-format
msgid "(%d Links)"
-msgstr "Liens"
+msgstr "(%d liens)"
#: ../lib/plugin/FuzzyPages.php:39
msgid "FuzzyPages"
@@ -2668,7 +2602,7 @@
#: ../lib/plugin/FuzzyPages.php:96
#, php-format
msgid "These page titles match fuzzy with '%s'"
-msgstr "Ces titres de pages correspondent de manière floue à '%s'"
+msgstr "Ces titres de pages correspondent de manière floue à « %s »"
#: ../lib/plugin/FuzzyPages.php:101
msgid "Name"
@@ -2676,7 +2610,7 @@
#: ../lib/plugin/FuzzyPages.php:102
msgid "Score"
-msgstr "Point"
+msgstr "Score"
#: ../lib/plugin/FuzzyPages.php:136
#, php-format
@@ -2727,16 +2661,14 @@
msgid "Nothing found"
msgstr "Aucun résultat"
-# lib/pageinfo.php:10 lib/stdlib.php:239
#: ../lib/plugin/GoTo.php:37
msgid "GoTo"
msgstr "AllerVers"
#: ../lib/plugin/GoTo.php:41
msgid "Go to or create page."
-msgstr "Aller à ou créer page."
+msgstr "Aller à la page ou la créer."
-# lib/pageinfo.php:10 lib/stdlib.php:239
#: ../lib/plugin/GoTo.php:78 ../lib/plugin/WikiAdminSelect.php:130
#: ../lib/plugin/WikiAdminSelect.php:141
#: ../themes/MonoBook/templates/navbar.tmpl:33
@@ -2778,7 +2710,7 @@
#: ../lib/plugin/_GroupInfo.php:34
#, php-format
msgid "Show Group Information"
-msgstr ""
+msgstr "Information sur le groupe"
#: ../lib/plugin/HelloWorld.php:46
msgid "HelloWorld"
@@ -2819,25 +2751,25 @@
#: ../lib/plugin/IncludePage.php:85 ../lib/plugin/IncludePage.php:125
#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:164
#: ../lib/plugin/UnfoldSubpages.php:100 ../lib/plugin/UnfoldSubpages.php:130
-#, fuzzy, php-format
+#, php-format
msgid "Recursive inclusion of page %s ignored"
-msgstr "insertion récursive de la page %s ignoré"
+msgstr "Insertion récursive de la page %s ignoré"
#: ../lib/plugin/IncludePage.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Page '%s' does not exist"
-msgstr "Le groupe de page %s n'existe pas"
+msgstr "La page '%s' n'existe pas"
#: ../lib/plugin/IncludePage.php:96 ../lib/plugin/UnfoldSubpages.php:107
#: ../lib/plugin/UnfoldSubpages.php:138
-#, fuzzy, php-format
+#, php-format
msgid "Illegal inclusion of page %s: no read access"
-msgstr "insertion récursive de la page %s ignoré"
+msgstr ""
#: ../lib/plugin/IncludePage.php:154
-#, fuzzy, php-format
+#, php-format
msgid "Included from %s (revision %d)"
-msgstr "Inséré de %s"
+msgstr "Inséré de %s (version %d)"
#: ../lib/plugin/IncludePage.php:156
#, php-format
@@ -2864,17 +2796,15 @@
#: ../lib/plugin/IncludeSiteMap.php:56
#, php-format
msgid "Include recursively all linked pages starting at %s"
-msgstr "Créer une carte du site commencer à %s"
+msgstr "Créer une carte du site commençant à %s"
#: ../lib/plugin/IncludeTree.php:39
-#, fuzzy
msgid "IncludeTree"
-msgstr "InclureUnePage"
+msgstr ""
#: ../lib/plugin/IncludeTree.php:43
-#, fuzzy
msgid "Dynamic Category Tree"
-msgstr "Catégories populaires"
+msgstr ""
#: ../lib/plugin/InterWikiSearch.php:31
msgid "InterWikiSearch"
@@ -2888,9 +2818,8 @@
#: ../lib/plugin/InterWikiSearch.php:87
msgid "Wiki Name"
-msgstr "Nom Wiki"
+msgstr "Nom du wiki"
-# lib/stdlib.php:207 lib/stdlib.php:215
#: ../lib/plugin/InterWikiSearch.php:88 ../lib/plugin/RecentChanges.php:805
#: ../lib/plugin/SemanticSearchAdvanced.php:107
#: ../themes/Crao/templates/navbar.tmpl:43
@@ -2906,32 +2835,29 @@
#: ../themes/Sidebar/templates/search.tmpl:18
#: ../themes/Sidebar/templates/search.tmpl:30
msgid "Search"
-msgstr "Recherche"
+msgstr "Rechercher"
#: ../lib/plugin/JabberPresence.php:42
msgid "JabberPresence"
-msgstr "JabberPresence"
+msgstr ""
#: ../lib/plugin/JabberPresence.php:46
msgid "Simple jabber presence plugin"
msgstr ""
-# lib/stdlib.php:207 lib/stdlib.php:215
#: ../lib/plugin/LdapSearch.php:54
msgid "LdapSearch"
msgstr "LdapChercher"
#: ../lib/plugin/LdapSearch.php:57
msgid "Search an LDAP directory"
-msgstr ""
+msgstr "Chercher dans un annuaire LDAP"
#: ../lib/plugin/LdapSearch.php:76
-#, fuzzy
msgid "Missing ldap extension"
-msgstr "Permission de page individuelle absente:"
+msgstr ""
#: ../lib/plugin/LdapSearch.php:99
-#, fuzzy
msgid "Failed to connect to LDAP host"
msgstr "Impossible de se connecter au serveur LDAP "
@@ -2988,13 +2914,11 @@
msgstr "Liens"
#: ../lib/plugin/LinkDatabase.php:170
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported format argument %s"
-msgstr "Les gestionnaires supportés sont : %s"
+msgstr ""
-# lib/fullsearch.php:48
#: ../lib/plugin/LinkSearch.php:35 ../lib/plugin/LinkSearch.php:109
-#, fuzzy
msgid "LinkSearch"
msgstr "RechercheLive"
@@ -3012,13 +2936,12 @@
msgstr ""
#: ../lib/plugin/LinkSearch.php:94
-#, fuzzy
msgid "outgoing"
-msgstr "Identifiant"
+msgstr "sortant"
#: ../lib/plugin/LinkSearch.php:95
msgid "incoming"
-msgstr ""
+msgstr "entrant"
#: ../lib/plugin/LinkSearch.php:110
msgid "Search in pages for links with the matching name."
@@ -3027,9 +2950,8 @@
#: ../lib/plugin/LinkSearch.php:145
#: ../lib/plugin/SemanticSearchAdvanced.php:187
#: ../lib/plugin/SemanticSearch.php:329
-#, fuzzy
msgid "Link"
-msgstr "Liens"
+msgstr "Lien"
#: ../lib/plugin/LinkSearch.php:155
#, php-format
@@ -3046,12 +2968,11 @@
#: ../lib/plugin/ListPages.php:95
msgid "You must be logged in to view ratings."
-msgstr "Vous devez vous connecter pour voir les scores."
+msgstr "Vous devez vous identifier pour voir les évaluations."
#: ../lib/plugin/ListRelations.php:34
-#, fuzzy
msgid "ListRelations"
-msgstr "Annuler la notation"
+msgstr ""
#: ../lib/plugin/ListRelations.php:37
msgid ""
@@ -3082,13 +3003,12 @@
msgstr ""
#: ../lib/plugin/MediawikiTable.php:60
-#, fuzzy
msgid "Layout tables using a Mediawiki-like markup style."
-msgstr "Un système de marques pour faire des tableaux sophistiqués."
+msgstr ""
#: ../lib/plugin/ModeratedPage.php:45
msgid "Support moderated pages"
-msgstr "Supportés pages moderée"
+msgstr ""
#: ../lib/plugin/ModeratedPage.php:150 ../lib/plugin/ModeratedPage.php:175
#: ../lib/plugin/ModeratedPage.php:221
@@ -3136,15 +3056,15 @@
#: ../lib/plugin/ModeratedPage.php:401
msgid "Reason: "
-msgstr ""
+msgstr "Raison : "
#: ../lib/plugin/ModeratedPage.php:402
msgid "Approve"
-msgstr ""
+msgstr "Approuver"
#: ../lib/plugin/ModeratedPage.php:404
msgid "Reject"
-msgstr ""
+msgstr "Rejeter"
#: ../lib/plugin/ModeratedPage.php:432 ../lib/plugin/ModeratedPage.php:439
#, php-format
@@ -3162,7 +3082,7 @@
#: ../lib/plugin/MostPopular.php:34
msgid "List the most popular pages."
-msgstr "Affiche la listes des pages les plus populaires."
+msgstr "Voir les pages les plus populaires."
#: ../lib/plugin/MostPopular.php:60
msgid "sortby=mtime not supported with MostPopular"
@@ -3183,14 +3103,12 @@
msgstr "Pages visitées sur ce wiki, classées par ordre de popularité :"
#: ../lib/plugin/NewPagesPerUser.php:35
-#, fuzzy
msgid "NewPagesPerUser"
-msgstr "Nouvelle page."
+msgstr ""
#: ../lib/plugin/NewPagesPerUser.php:39
-#, fuzzy
msgid "List all new pages per month per user"
-msgstr "Énumérez tous les utilisateurs une fois authentifiés."
+msgstr ""
#: ../lib/plugin/NoCache.php:40
msgid "NoCache"
@@ -3213,7 +3131,6 @@
msgid "Line %s does not begin with a '|'."
msgstr "La ligne %s ne commence pas par un '|'."
-# lib/display.php:14
#: ../lib/plugin/OrphanedPages.php:34
msgid "OrphanedPages"
msgstr "PagesOrphelines"
@@ -3237,18 +3154,16 @@
msgstr "Page %s non trouvée."
#: ../lib/plugin/PageDump.php:149
-#, fuzzy
msgid "Download for Subversion"
-msgstr "Télécharger pour CVS"
+msgstr "Télécharger pour Subversion"
#: ../lib/plugin/PageDump.php:154
msgid "Download for backup"
msgstr "Télécharger pour sauvegarder"
#: ../lib/plugin/PageDump.php:160
-#, fuzzy
msgid "Download all revisions for backup"
-msgstr "Télécharger pour sauvegarder"
+msgstr "Télécharger toutes les versions pour sauvegarder"
#: ../lib/plugin/PageDump.php:163
#, php-format
@@ -3256,24 +3171,21 @@
msgstr "Prévisualisation : récupération de %s"
#: ../lib/plugin/PageDump.php:170
-#, fuzzy
msgid ""
"(formatted for PhpWiki developers as pgsrc template, not for backing up)"
msgstr "(format pour les développeurs, pas pour la sauvegarde)"
#: ../lib/plugin/PageDump.php:173 ../lib/plugin/PageDump.php:193
-#, fuzzy
msgid "Preview as normal format"
msgstr "Prévisualisation au format de sauvegarde"
#: ../lib/plugin/PageDump.php:179 ../lib/plugin/PageDump.php:206
msgid "Preview as backup format"
-msgstr "Prévisualisation au format de sauvegarde"
+msgstr ""
#: ../lib/plugin/PageDump.php:183
-#, fuzzy
msgid "(formatted for backing up: all revisions)"
-msgstr "(format de sauvegarde)"
+msgstr "(format de sauvegarde : toutes les versions)"
#: ../lib/plugin/PageDump.php:187 ../lib/plugin/PageDump.php:200
msgid "Preview as developer format"
@@ -3300,19 +3212,19 @@
"des listes indentées !"
#: ../lib/plugin/PageDump.php:215
-#, fuzzy
msgid ""
"PhpWiki developers should manually inspect the downloaded file for nested "
"markup before rewrapping with emacs and checking into Subversion."
msgstr ""
"Les développeurs de PhpWiki devraient inspecter manuellement les balises des "
-"fichiers téléchargés avant de les éditer sous emacs, et vérifier les CVS."
+"fichiers téléchargés avant de les éditer sous emacs et les publier sous "
+"Subversion."
#: ../lib/plugin/PageDump.php:223 ../lib/plugin/PasswordReset.php:130
#: ../lib/plugin/SemanticSearchAdvanced.php:142
#: ../lib/plugin/SemanticSearch.php:284
msgid "Warning:"
-msgstr "Attention:"
+msgstr "Attention :"
#: ../lib/plugin/PageGroup.php:45
msgid "PageGroup"
@@ -3343,11 +3255,11 @@
#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/PrevNext.php:60
msgid "First"
-msgstr "Première"
+msgstr "Premier"
#: ../lib/plugin/PageGroup.php:105 ../lib/plugin/PrevNext.php:63
msgid "Last"
-msgstr "Dernière"
+msgstr "Dernier"
#: ../lib/plugin/PageHistory.php:89
#, php-format
@@ -3356,15 +3268,14 @@
#: ../lib/plugin/PageHistory.php:103
msgid "No revisions found"
-msgstr "Révision non trouvée"
-
-#: ../lib/plugin/PageHistory.php:108
+msgstr "Aucune version trouvée"
+: ../lib/plugin/PageHistory.php:108
msgid "compare revisions"
-msgstr "comparer les révisions"
+msgstr "comparer les versions"
#: ../lib/plugin/PageHistory.php:113
msgid "Check any two boxes to compare revisions."
-msgstr "Cochez une des boîtes pour comparer les révisions."
+msgstr "Cochez deux boîtes quelconques pour comparer les versions."
#: ../lib/plugin/PageHistory.php:114
#, php-format
@@ -3389,7 +3300,6 @@
msgid "PageHistory"
msgstr "HistoriqueDeLaPage"
-# lib/diff.php:1001 lib/diff.php:1019
#: ../lib/plugin/PageHistory.php:173 ../lib/plugin/PageHistory.php:249
#, php-format
msgid "Version %d"
@@ -3405,18 +3315,17 @@
#: ../themes/SpaceWiki/lib/RecentChanges.php:35
#: ../themes/Wordpress/lib/RecentChanges.php:14
msgid "minor edit"
-msgstr "édition mineure"
+msgstr "modification mineure"
#: ../lib/plugin/PageHistory.php:241
msgid "History of changes."
-msgstr "Historique des changements."
+msgstr "Historique des modifications."
#: ../lib/plugin/PageHistory.php:271
#, php-format
msgid "List PageHistory for %s"
msgstr "Historique de %s"
-# lib/pageinfo.php:26 lib/pageinfo.php:75
#: ../lib/plugin/PageInfo.php:32 ../themes/Crao/templates/actionbar.tmpl:28
#: ../themes/default/templates/actionbar.tmpl:36
#: ../themes/MonoBook/templates/actionbar.tmpl:77
@@ -3441,9 +3350,8 @@
msgstr "Pour suivre les pages à la trace"
#: ../lib/plugin/PasswordReset.php:42
-#, fuzzy
msgid "PasswordReset"
-msgstr "Mot de passe :"
+msgstr ""
#: ../lib/plugin/PasswordReset.php:46
msgid ""
@@ -3451,7 +3359,6 @@
"by e-mail."
msgstr ""
-# lib/msql.php:31 lib/msql.php:37
#: ../lib/plugin/PasswordReset.php:60 ../lib/plugin/PasswordReset.php:81
#: ../themes/default/templates/wikiforum.tmpl:22
msgid "Message"
@@ -3465,7 +3372,7 @@
#: ../lib/plugin/PasswordReset.php:63 ../lib/plugin/PasswordReset.php:84
#: ../lib/plugin/PasswordReset.php:162
msgid "Error"
-msgstr ""
+msgstr "Erreur"
#: ../lib/plugin/PasswordReset.php:64
#, php-format
@@ -3478,18 +3385,17 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:85
-#, fuzzy, php-format
+#, php-format
msgid "Error sending email with password for user %s."
-msgstr "Mot de passe ou identifiant d'utilisateur invalide."
+msgstr ""
#: ../lib/plugin/PasswordReset.php:92
-#, fuzzy
msgid "Reset password of user: "
-msgstr "Mot de passe ou identifiant d'utilisateur invalide."
+msgstr ""
#: ../lib/plugin/PasswordReset.php:102 ../lib/plugin/PasswordReset.php:145
msgid "Send email"
-msgstr ""
+msgstr "Envoyer message"
#: ../lib/plugin/PasswordReset.php:131
msgid "You need to specify the userid!"
@@ -3497,7 +3403,7 @@
#: ../lib/plugin/PasswordReset.php:153
msgid "Already logged in"
-msgstr ""
+msgstr "Déjà connecté"
#: ../lib/plugin/PasswordReset.php:154
msgid "Changing passwords is done at "
@@ -3509,14 +3415,13 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:165
-#, fuzzy
msgid "You need to ask an Administrator to reset this password. See below: "
-msgstr "Vous devez être un administrateur pour utiliser ce plugin."
+msgstr ""
#: ../lib/plugin/PasswordReset.php:177
#, php-format
msgid "Do you really want to reset the password of user %s?"
-msgstr "Voulez-vous réellement reinitialiser le mot de passe de %s ?"
+msgstr "Voulez-vous réellement réinitialiser les mot de passe de %s ?"
#: ../lib/plugin/PasswordReset.php:178
msgid "An email will be sent."
@@ -3563,7 +3468,7 @@
#: ../lib/plugin/PhpHighlight.php:148
#, php-format
msgid "Invalid color: %s"
-msgstr "Couleur non valable : %s"
+msgstr "Couleur non valide : %s"
#: ../lib/plugin/PhpWeather.php:63
msgid "PhpWeather"
@@ -3591,7 +3496,7 @@
#: ../lib/plugin/PhpWeather.php:165
msgid "Submit country"
-msgstr "Valider le pays"
+msgstr ""
#: ../lib/plugin/PhpWeather.php:165
msgid "Change country"
@@ -3599,7 +3504,7 @@
#: ../lib/plugin/PhpWeather.php:184
msgid "Submit location"
-msgstr "Valider la localisation"
+msgstr "Soumettre la localisation"
#: ../lib/plugin/Ploticus.php:93
msgid "Ploticus"
@@ -3623,21 +3528,20 @@
msgstr "GestionsDesPlugins"
#: ../lib/plugin/PluginManager.php:36
-#, fuzzy
msgid "List of plugins on this wiki"
-msgstr "Afficher la liste de toutes les pages de ce wiki."
+msgstr "Liste des greffons de ce wiki"
#: ../lib/plugin/PluginManager.php:50
msgid "Plugins"
-msgstr "Plugins"
+msgstr "Greffons"
#: ../lib/plugin/PluginManager.php:59
msgid "use this plugin"
-msgstr "utiliser ce plugin"
+msgstr "utiliser ce greffon"
#: ../lib/plugin/PluginManager.php:71
msgid "Plugin"
-msgstr "Plugin"
+msgstr "Greffon"
#: ../lib/plugin/PluginManager.php:73
msgid "Arguments"
@@ -3646,23 +3550,21 @@
#: ../lib/plugin/PluginManager.php:111
#, php-format
msgid "%s does not appear to be a WikiPlugin."
-msgstr "%s ne semble pas être un plugin."
+msgstr "%s ne semble pas être un greffon."
#: ../lib/plugin/PluginManager.php:122 ../lib/plugin/PluginManager.php:124
#: ../lib/upgrade.php:205 ../themes/MonoBook/templates/navbar.tmpl:21
msgid "Help"
msgstr "Aide"
-# lib/stdlib.php:74
#: ../lib/plugin/PopularNearby.php:44
msgid "PopularNearby"
msgstr "PopulairesAlentour"
#: ../lib/plugin/PopularNearby.php:48
msgid "List the most popular pages nearby."
-msgstr "Énumère les pages proches des plus visitées."
+msgstr ""
-# lib/stdlib.php:53
#: ../lib/plugin/PopularNearby.php:68
#, php-format
msgid "...
[truncated message content] |
|
From: <var...@us...> - 2011-03-03 10:32:32
|
Revision: 7950
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7950&view=rev
Author: vargenau
Date: 2011-03-03 10:32:23 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
Switch textdomain
Modified Paths:
--------------
trunk/themes/fusionforge/themeinfo.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php 2011-03-03 09:16:52 UTC (rev 7949)
+++ trunk/themes/fusionforge/themeinfo.php 2011-03-03 10:32:23 UTC (rev 7950)
@@ -20,16 +20,23 @@
$submenu = Template('navbar');
+ $domain = textdomain(NULL);
+ textdomain('fusionforge');
+
//group is private
if (!$project->isPublic()) {
//if it's a private group, you must be a member of that group
- session_require_perm ('project_read', $group_id);
+ if (RBAC) {
+ session_require_perm('project_read', $group_id);
+ } else {
+ session_require(array('group'=>$group_id));
+ }
}
//for dead projects must be member of admin project
if (!$project->isActive()) {
//only SF group can view non-active, non-holding groups
- session_require_global_perm ('forge_admin');
+ session_require_global_perm('forge_admin');
}
$HTML->header(array('title'=> $group_public_name._(": ").htmlspecialchars($pagename),
@@ -56,13 +63,18 @@
(isset($external_msg) ? ' ' . $external_msg : ''));
}
}
+ textdomain($domain);
}
function footer() {
global $HTML;
+ $domain = textdomain(NULL);
+ textdomain('fusionforge');
+
$HTML->footer(array());
+ textdomain($domain);
}
function initGlobals() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-03 09:16:58
|
Revision: 7949
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7949&view=rev
Author: vargenau
Date: 2011-03-03 09:16:52 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
Take $LC_ALL and $LANG from Fusionforge
Modified Paths:
--------------
trunk/g
Modified: trunk/g
===================================================================
--- trunk/g 2011-03-02 17:24:25 UTC (rev 7948)
+++ trunk/g 2011-03-03 09:16:52 UTC (rev 7949)
@@ -169,7 +169,8 @@
define('EXTERNAL_LINK_TARGET', '_top');
// Override the default configuration for CONSTANTS before index.php
- $LANG='en'; $LC_ALL='en_US';
+ $LC_ALL = language_name_to_locale_code(choose_language_from_context());
+ $LANG = preg_replace('/_.*/', '', $LC_ALL);
// We use a local interwiki map file
define('INTERWIKI_MAP_FILE', 'themes/fusionforge/interwiki.map');
@@ -200,7 +201,9 @@
define('CACHE_CONTROL', "NO_CACHE");
- define('DEFAULT_LANGUAGE', "en");
+ $lg = language_name_to_locale_code(forge_get_config('default_language'));
+ $lg = preg_replace('/_.*/', '', $lg);
+ define('DEFAULT_LANGUAGE', $lg);
define('DISABLE_GETIMAGESIZE', true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-02 17:24:33
|
Revision: 7948
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7948&view=rev
Author: vargenau
Date: 2011-03-02 17:24:25 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
Update locale
Modified Paths:
--------------
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/de/LC_MESSAGES/phpwiki.php
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.php
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.php
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/it/LC_MESSAGES/phpwiki.php
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.php
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/sv/LC_MESSAGES/phpwiki.php
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.php
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php 2011-03-02 15:15:48 UTC (rev 7947)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2011-03-02 17:24:25 UTC (rev 7948)
@@ -94,8 +94,6 @@
"%s um %s:";
$locale["%s or %s parameter missing"] =
"%s oder %s Argument fehlt";
-$locale["%s pages have been changed."] =
- "%s Seiten wurden geändert.";
$locale["%s pages link to %s:"] =
"%s Seiten sind mit %s verlinkt:";
$locale["%s pages would link to %s:"] =
@@ -288,12 +286,8 @@
"Änderungen anwenden";
$locale["Approve"] =
"Akzeptieren";
-$locale["Are you sure you want to permanently change the markup type of the selected files?"] =
- "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?";
$locale["Are you sure you want to permanently change the selected files?"] =
"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?";
-$locale["Are you sure you want to permanently remove the selected files?"] =
- "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?";
$locale["Argument '%s' not declared by plugin."] =
"Argument »%s« nicht im Zusatzprogramm deklariert.";
$locale["Arguments"] =
@@ -566,10 +560,6 @@
"Lösche diese ACL";
$locale["Deleted"] =
"Gelöscht";
-$locale["Deleted %s pages with invalid names:"] =
- "%s Seiten mit ungültigen Namen gelöscht:";
-$locale["Deleted %s unreferenced pages:"] =
- "%s unverlinkte Seiten entfernt:";
$locale["Describe %s here."] =
"Beschreiben Sie %s hier.";
$locale["Description"] =
@@ -1920,8 +1910,6 @@
"Version %d.";
$locale["Version %s"] =
"Version %s.";
-$locale["Version %s, saved %s"] =
- "Version %s. %s gespeichert";
$locale["Version %s, saved on %s"] =
"Version %s. gespeichert am %s";
$locale["Versions are identical"] =
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/es/LC_MESSAGES/phpwiki.php 2011-03-02 15:15:48 UTC (rev 7947)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php 2011-03-02 17:24:25 UTC (rev 7948)
@@ -808,8 +808,6 @@
"Versión %d";
$locale["Version %s"] =
"Versión %s";
-$locale["Version %s, saved %s"] =
- "versión %s, %s ahorrado";
$locale["Version %s, saved on %s"] =
"versión %s de %s";
$locale["Versions are identical"] =
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php 2011-03-02 15:15:48 UTC (rev 7947)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2011-03-02 17:24:25 UTC (rev 7948)
@@ -104,8 +104,6 @@
"%s on %s :";
$locale["%s or %s parameter missing"] =
"%s ou %s paramètre manquant";
-$locale["%s pages have been changed."] =
- "Les pages %s ont été changées.";
$locale["%s pages link to %s:"] =
"%s pages pointent vers %s :";
$locale["%s pages would link to %s:"] =
@@ -304,8 +302,6 @@
"Appliquer les changements.";
$locale["Are you sure you want to permanently change the selected files?"] =
"Supprimer la page maintenant";
-$locale["Are you sure you want to permanently remove the selected files?"] =
- "Êtes-vous certain de vouloir supprimer définitivement les fichiers sélectionnés ?";
$locale["Argument '%s' not declared by plugin."] =
"argument '%s' non déclaré par le plugin.";
$locale["Arguments"] =
@@ -566,8 +562,6 @@
"Effacer cette ACL";
$locale["Deleted"] =
"Supprimé";
-$locale["Deleted %s pages with invalid names:"] =
- "%s pages ont été supprimées à cause de leur nom invalide:";
$locale["Describe %s here."] =
"Décrire %s ici.";
$locale["Description"] =
@@ -1956,8 +1950,6 @@
"Version %d";
$locale["Version %s"] =
"Version %s";
-$locale["Version %s, saved %s"] =
- "Version %s, enregistrée %s";
$locale["Version %s, saved on %s"] =
"Version %s, enregistrée sur %s";
$locale["Versions are identical"] =
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/it/LC_MESSAGES/phpwiki.php 2011-03-02 15:15:48 UTC (rev 7947)
+++ trunk/locale/it/LC_MESSAGES/phpwiki.php 2011-03-02 17:24:25 UTC (rev 7948)
@@ -384,8 +384,6 @@
"Versione %d";
$locale["Version %s"] =
"Versione %s";
-$locale["Version %s, saved %s"] =
- "Versione %s, salvata %s";
$locale["Version %s, saved on %s"] =
"Versione %s, salvata su %s";
$locale["Versions are identical"] =
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/nl/LC_MESSAGES/phpwiki.php 2011-03-02 15:15:48 UTC (rev 7947)
+++ trunk/locale/nl/LC_MESSAGES/phpwiki.php 2011-03-02 17:24:25 UTC (rev 7948)
@@ -168,8 +168,6 @@
"Versie";
$locale["Version %d"] =
"Versie %d";
-$locale["Version %s, saved %s"] =
- "Versie %s, bewarrd %s";
$locale["Version %s, saved on %s"] =
"Versie %s, bewarrd op %s";
$locale["Versions are identical"] =
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2011-03-02 15:15:48 UTC (rev 7947)
+++ trunk/locale/po/de.po 2011-03-02 17:24:25 UTC (rev 7948)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.15\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-01 16:16+0100\n"
+"POT-Creation-Date: 2011-03-02 18:22+0100\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -5329,14 +5329,15 @@
msgstr "Ungültiger CHMOD Befehl"
#: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
-#, php-format
-msgid "%s pages have been changed."
+#, fuzzy, php-format
+msgid "%d pages have been changed."
msgstr "%s Seiten wurden geändert."
#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
#: ../lib/plugin/WikiAdminMarkup.php:102
#: ../lib/plugin/WikiAdminSearchReplace.php:113
#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
msgid "No pages changed."
msgstr "Keine Änderungen."
@@ -5404,14 +5405,14 @@
#: ../lib/plugin/WikiAdminSearchReplace.php:106
#: ../lib/plugin/WikiAdminSetExternal.php:80
#, fuzzy
-msgid "One page has been permanently changed:"
+msgid "One page has been changed:"
msgstr "%s Seiten wurden geändert."
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
#, fuzzy, php-format
-msgid "%s pages have been permanently changed:"
+msgid "%d pages have been changed:"
msgstr "%s Seiten wurden geändert."
#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
@@ -5420,8 +5421,7 @@
#: ../lib/plugin/WikiAdminChown.php:171
#, fuzzy
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the selected pages?"
msgstr ""
"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
@@ -5470,9 +5470,8 @@
msgstr "PhpWikiSystemverwalten/Formatierung"
#: ../lib/plugin/WikiAdminMarkup.php:163
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
+#, fuzzy
+msgid "Are you sure you want to change the markup type of the selected files?"
msgstr ""
"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
@@ -5512,7 +5511,7 @@
#: ../lib/plugin/WikiAdminPurge.php:79
#, fuzzy, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
msgstr "%d Seiten wurden unwiderruflich gelöscht."
# Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
@@ -5558,8 +5557,8 @@
#: ../lib/plugin/WikiAdminRemove.php:123
#, fuzzy, php-format
-msgid "%s pages have been permanently removed:"
-msgstr "%d Seiten wurden unwiderruflich gelöscht."
+msgid "%d pages have been removed:"
+msgstr "%s Seiten wurden geändert."
# Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
# must also be renamed to match what is here.
@@ -5573,7 +5572,8 @@
msgstr "Löschen"
#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
+#, fuzzy
+msgid "Are you sure you want to remove the selected files?"
msgstr ""
"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?"
@@ -5638,8 +5638,8 @@
#: ../lib/plugin/WikiAdminRename.php:126
#, fuzzy, php-format
-msgid "%s pages have been permanently renamed:"
-msgstr "%s Seiten wurden umbenannt."
+msgid "%d pages have been renamed:"
+msgstr "%s Seiten wurden geändert."
#: ../lib/plugin/WikiAdminRename.php:132
#, fuzzy
@@ -5652,7 +5652,7 @@
#: ../lib/plugin/WikiAdminRename.php:209
#, fuzzy
-msgid "Are you sure you want to permanently rename the selected pages?"
+msgid "Are you sure you want to rename the selected pages?"
msgstr ""
"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen wollen?"
@@ -5718,8 +5718,7 @@
#: ../lib/plugin/WikiAdminSearchReplace.php:189
#, fuzzy
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected files?"
msgstr ""
"Sind Sie sicher, dass Sie alle Wörter in den angegebenen Seiten ersetzen "
"wollen?"
@@ -5956,8 +5955,8 @@
msgstr "Keine Seiten mit ungültigen Namen mußten gelöscht werden."
#: ../lib/plugin/WikiAdminUtils.php:147
-#, php-format
-msgid "Deleted %s pages with invalid names:"
+#, fuzzy, php-format
+msgid "Deleted %d pages with invalid names:"
msgstr "%s Seiten mit ungültigen Namen gelöscht:"
#: ../lib/plugin/WikiAdminUtils.php:168
@@ -5973,8 +5972,8 @@
msgstr "Keine leeren, unverlinkten Seiten gefunden."
#: ../lib/plugin/WikiAdminUtils.php:180
-#, php-format
-msgid "Deleted %s unreferenced pages:"
+#, fuzzy, php-format
+msgid "Deleted %d unreferenced pages:"
msgstr "%s unverlinkte Seiten entfernt:"
#: ../lib/plugin/WikiAdminUtils.php:183
@@ -7128,10 +7127,10 @@
msgid "%s at %s"
msgstr "%s um %s"
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:462 ../lib/WikiTheme.php:473
#, php-format
-msgid "Version %s, saved %s"
-msgstr "Version %s. %s gespeichert"
+msgid "Version %s, saved on %s"
+msgstr "Version %s. gespeichert am %s"
# (Usually a verb, never a noun; siehe nächste Reihe:
# saved=gespeichert nicht "Speicherung am.")
@@ -7140,11 +7139,6 @@
msgid "Last edited %s"
msgstr "Zuletzt geändert %s"
-#: ../lib/WikiTheme.php:473
-#, php-format
-msgid "Version %s, saved on %s"
-msgstr "Version %s. gespeichert am %s"
-
#: ../lib/WikiTheme.php:475
#, php-format
msgid "Last edited on %s"
@@ -8812,20 +8806,38 @@
msgid "User Preferences"
msgstr "BenutzerEinstellungen"
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+#, fuzzy
+msgid "User preferences for this project"
+msgstr "Einstellungen für Benutzer '%s':"
+
#: ../themes/fusionforge/templates/userprefs.tmpl:192
#: ../themes/fusionforge/templates/userprefs.tmpl:214
#, fuzzy
msgid "E-mail Notification"
msgstr "E-Mail Bestätigung"
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+#, fuzzy
+msgid "Global user preferences (for all projects)"
+msgstr "Einstellungen für Benutzer '%s':"
+
#: ../themes/fusionforge/templates/userprefs.tmpl:240
msgid "Menus"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:259
msgid "PDF"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:301
#, fuzzy
msgid "Check menu items to display."
@@ -9111,6 +9123,21 @@
msgid "Edit old revision"
msgstr "Alte Version Bearbeiten"
+#, fuzzy
+#~ msgid "%s pages have been permanently changed:"
+#~ msgstr "%s Seiten wurden geändert."
+
+#, fuzzy
+#~ msgid "%s pages have been permanently removed:"
+#~ msgstr "%d Seiten wurden unwiderruflich gelöscht."
+
+#, fuzzy
+#~ msgid "%s pages have been permanently renamed:"
+#~ msgstr "%s Seiten wurden umbenannt."
+
+#~ msgid "Version %s, saved %s"
+#~ msgstr "Version %s. %s gespeichert"
+
#~ msgid "PageGroupTest"
#~ msgstr "SeitenGruppenTest"
@@ -9357,10 +9384,6 @@
#~ msgstr "Seite '%s' auf '%s' umbenannt."
#, fuzzy
-#~ msgid "%d pages have been reverted."
-#~ msgstr "%s Seiten wurden geändert."
-
-#, fuzzy
#~ msgid "PhpWikiAdministration/MassRevert"
#~ msgstr "PhpWikiSystemverwalten/Löschen"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2011-03-02 15:15:48 UTC (rev 7947)
+++ trunk/locale/po/es.po 2011-03-02 17:24:25 UTC (rev 7948)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.11\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-01 16:16+0100\n"
+"POT-Creation-Date: 2011-03-02 18:22+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -5307,7 +5307,7 @@
#: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
#, php-format
-msgid "%s pages have been changed."
+msgid "%d pages have been changed."
msgstr ""
# lib/pageinfo.php:21
@@ -5315,6 +5315,7 @@
#: ../lib/plugin/WikiAdminMarkup.php:102
#: ../lib/plugin/WikiAdminSearchReplace.php:113
#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
msgid "No pages changed."
msgstr ""
@@ -5380,14 +5381,14 @@
#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
#: ../lib/plugin/WikiAdminSearchReplace.php:106
#: ../lib/plugin/WikiAdminSetExternal.php:80
-msgid "One page has been permanently changed:"
+msgid "One page has been changed:"
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
#, php-format
-msgid "%s pages have been permanently changed:"
+msgid "%d pages have been changed:"
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
@@ -5395,9 +5396,9 @@
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:171
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
-msgstr ""
+#, fuzzy
+msgid "Are you sure you want to change the owner of the selected pages?"
+msgstr "Guardar"
#: ../lib/plugin/WikiAdminChown.php:175
#, fuzzy
@@ -5441,9 +5442,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminMarkup.php:163
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
+msgid "Are you sure you want to change the markup type of the selected files?"
msgstr ""
#: ../lib/plugin/WikiAdminMarkup.php:167
@@ -5481,7 +5480,7 @@
#: ../lib/plugin/WikiAdminPurge.php:79
#, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
msgstr ""
#: ../lib/plugin/WikiAdminPurge.php:92
@@ -5522,7 +5521,7 @@
#: ../lib/plugin/WikiAdminRemove.php:123
#, php-format
-msgid "%s pages have been permanently removed:"
+msgid "%d pages have been removed:"
msgstr ""
#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
@@ -5535,7 +5534,7 @@
msgstr "Quite"
#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
+msgid "Are you sure you want to remove the selected files?"
msgstr ""
#: ../lib/plugin/WikiAdminRemove.php:200
@@ -5594,10 +5593,11 @@
msgid "Couldn't rename page '%s' to '%s'."
msgstr ""
+# lib/pageinfo.php:21
#: ../lib/plugin/WikiAdminRename.php:126
-#, php-format
-msgid "%s pages have been permanently renamed:"
-msgstr ""
+#, fuzzy, php-format
+msgid "%d pages have been renamed:"
+msgstr "Ningunos cambios encontrados"
# lib/pageinfo.php:21
#: ../lib/plugin/WikiAdminRename.php:132
@@ -5610,7 +5610,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:209
-msgid "Are you sure you want to permanently rename the selected pages?"
+msgid "Are you sure you want to rename the selected pages?"
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:213
@@ -5674,8 +5674,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminSearchReplace.php:189
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected files?"
msgstr ""
#: ../lib/plugin/WikiAdminSearchReplace.php:194
@@ -5896,7 +5895,7 @@
#: ../lib/plugin/WikiAdminUtils.php:147
#, php-format
-msgid "Deleted %s pages with invalid names:"
+msgid "Deleted %d pages with invalid names:"
msgstr ""
#: ../lib/plugin/WikiAdminUtils.php:168
@@ -5913,7 +5912,7 @@
#: ../lib/plugin/WikiAdminUtils.php:180
#, php-format
-msgid "Deleted %s unreferenced pages:"
+msgid "Deleted %d unreferenced pages:"
msgstr ""
#: ../lib/plugin/WikiAdminUtils.php:183
@@ -7026,21 +7025,16 @@
msgid "%s at %s"
msgstr "%s en %s"
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:462 ../lib/WikiTheme.php:473
#, php-format
-msgid "Version %s, saved %s"
-msgstr "versión %s, %s ahorrado"
+msgid "Version %s, saved on %s"
+msgstr "versión %s de %s"
#: ../lib/WikiTheme.php:464
#, php-format
msgid "Last edited %s"
msgstr "Editada por última vez %s."
-#: ../lib/WikiTheme.php:473
-#, php-format
-msgid "Version %s, saved on %s"
-msgstr "versión %s de %s"
-
#: ../lib/WikiTheme.php:475
#, php-format
msgid "Last edited on %s"
@@ -8685,20 +8679,38 @@
msgid "User Preferences"
msgstr "UsuarioPreferencias"
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+#, fuzzy
+msgid "User preferences for this project"
+msgstr "Preferencias por usuario '%s':"
+
#: ../themes/fusionforge/templates/userprefs.tmpl:192
#: ../themes/fusionforge/templates/userprefs.tmpl:214
#, fuzzy
msgid "E-mail Notification"
msgstr "Verificación Del Email"
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+#, fuzzy
+msgid "Global user preferences (for all projects)"
+msgstr "Preferencias por usuario '%s':"
+
#: ../themes/fusionforge/templates/userprefs.tmpl:240
msgid "Menus"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:259
msgid "PDF"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:301
msgid "Check menu items to display."
msgstr ""
@@ -8977,6 +8989,9 @@
msgid "Edit old revision"
msgstr "Corrija versión archivada"
+#~ msgid "Version %s, saved %s"
+#~ msgstr "versión %s, %s ahorrado"
+
#~ msgid "%s b"
#~ msgstr "%s o"
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2011-03-02 15:15:48 UTC (rev 7947)
+++ trunk/locale/po/fr.po 2011-03-02 17:24:25 UTC (rev 7948)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.11\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-01 16:16+0100\n"
+"POT-Creation-Date: 2011-03-02 18:22+0100\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -5326,14 +5326,15 @@
msgstr "Chaîne de caractère invalide pour le changement de mode"
#: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
-#, php-format
-msgid "%s pages have been changed."
+#, fuzzy, php-format
+msgid "%d pages have been changed."
msgstr "Les pages %s ont été changées."
#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
#: ../lib/plugin/WikiAdminMarkup.php:102
#: ../lib/plugin/WikiAdminSearchReplace.php:113
#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
msgid "No pages changed."
msgstr "Aucune page changée."
@@ -5401,15 +5402,15 @@
#: ../lib/plugin/WikiAdminSearchReplace.php:106
#: ../lib/plugin/WikiAdminSetExternal.php:80
#, fuzzy
-msgid "One page has been permanently changed:"
+msgid "One page has been changed:"
msgstr "%s pages ont été définitivement modifiées."
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
#, fuzzy, php-format
-msgid "%s pages have been permanently changed:"
-msgstr "%s pages ont été définitivement modifiées."
+msgid "%d pages have been changed:"
+msgstr "Les pages %s ont été changées."
#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
msgid "PhpWikiAdministration/Chown"
@@ -5417,8 +5418,7 @@
#: ../lib/plugin/WikiAdminChown.php:171
#, fuzzy
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the selected pages?"
msgstr ""
"Ëtes-vous sûr de vouloir définitivement modifier l'accès aux fichiers "
"sélectionnés ?"
@@ -5469,9 +5469,7 @@
#: ../lib/plugin/WikiAdminMarkup.php:163
#, fuzzy
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
+msgid "Are you sure you want to change the markup type of the selected files?"
msgstr ""
"Ëtes-vous sûr de vouloir définitivement modifier l'accès aux fichiers "
"sélectionnés ?"
@@ -5513,7 +5511,7 @@
#: ../lib/plugin/WikiAdminPurge.php:79
#, fuzzy, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
msgstr "%d pages ont été définitivement supprimées."
#: ../lib/plugin/WikiAdminPurge.php:92
@@ -5556,8 +5554,8 @@
#: ../lib/plugin/WikiAdminRemove.php:123
#, fuzzy, php-format
-msgid "%s pages have been permanently removed:"
-msgstr "%d pages ont été définitivement supprimées."
+msgid "%d pages have been removed:"
+msgstr "Les pages %s ont été changées."
#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
msgid "PhpWikiAdministration/Remove"
@@ -5569,7 +5567,8 @@
msgstr "Supprimer"
#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
+#, fuzzy
+msgid "Are you sure you want to remove the selected files?"
msgstr ""
"Êtes-vous certain de vouloir supprimer définitivement les fichiers "
"sélectionnés ?"
@@ -5635,8 +5634,8 @@
#: ../lib/plugin/WikiAdminRename.php:126
#, fuzzy, php-format
-msgid "%s pages have been permanently renamed:"
-msgstr "%s pages ont été définitivement renommées."
+msgid "%d pages have been renamed:"
+msgstr "Les pages %s ont été changées."
#: ../lib/plugin/WikiAdminRename.php:132
#, fuzzy
@@ -5649,7 +5648,7 @@
#: ../lib/plugin/WikiAdminRename.php:209
#, fuzzy
-msgid "Are you sure you want to permanently rename the selected pages?"
+msgid "Are you sure you want to rename the selected pages?"
msgstr "Êtes-vous certain de renommer définitivement les pages sélectionnées ?"
#: ../lib/plugin/WikiAdminRename.php:213
@@ -5714,8 +5713,7 @@
#: ../lib/plugin/WikiAdminSearchReplace.php:189
#, fuzzy
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected files?"
msgstr ""
"Etes-vous sur de vouloir rechercher et remplacer dans les fichiers "
"sélectionnées ?"
@@ -5950,8 +5948,8 @@
msgstr "Aucune page supprimées avec un nom invalide."
#: ../lib/plugin/WikiAdminUtils.php:147
-#, php-format
-msgid "Deleted %s pages with invalid names:"
+#, fuzzy, php-format
+msgid "Deleted %d pages with invalid names:"
msgstr "%s pages ont été supprimées à cause de leur nom invalide:"
#: ../lib/plugin/WikiAdminUtils.php:168
@@ -5967,9 +5965,9 @@
msgstr "Aucune page trouvée avec un nom invalide."
#: ../lib/plugin/WikiAdminUtils.php:180
-#, php-format
-msgid "Deleted %s unreferenced pages:"
-msgstr ""
+#, fuzzy, php-format
+msgid "Deleted %d unreferenced pages:"
+msgstr "Aucune page trouvée avec un nom invalide."
#: ../lib/plugin/WikiAdminUtils.php:183
#, php-format
@@ -7119,10 +7117,10 @@
msgid "%s at %s"
msgstr "%s à %s"
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:462 ../lib/WikiTheme.php:473
#, php-format
-msgid "Version %s, saved %s"
-msgstr "Version %s, enregistrée %s"
+msgid "Version %s, saved on %s"
+msgstr "Version %s, enregistrée sur %s"
# lib/diff.php:1003 lib/diff.php:1021
#: ../lib/WikiTheme.php:464
@@ -7130,11 +7128,6 @@
msgid "Last edited %s"
msgstr "Dernière modification %s"
-#: ../lib/WikiTheme.php:473
-#, php-format
-msgid "Version %s, saved on %s"
-msgstr "Version %s, enregistrée sur %s"
-
# lib/diff.php:1003 lib/diff.php:1021
#: ../lib/WikiTheme.php:475
#, php-format
@@ -8794,19 +8787,37 @@
msgid "User Preferences"
msgstr "PréférencesUtilisateurs"
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+#, fuzzy
+msgid "User preferences for this project"
+msgstr "Préférences de l'utilisateur %s"
+
#: ../themes/fusionforge/templates/userprefs.tmpl:192
#: ../themes/fusionforge/templates/userprefs.tmpl:214
msgid "E-mail Notification"
msgstr "Courriel de notification"
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+#, fuzzy
+msgid "Global user preferences (for all projects)"
+msgstr "Préférences de l'utilisateur %s"
+
#: ../themes/fusionforge/templates/userprefs.tmpl:240
msgid "Menus"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:259
msgid "PDF"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:301
#, fuzzy
msgid "Check menu items to display."
@@ -9074,6 +9085,21 @@
msgid "Edit old revision"
msgstr "Éditer l'ancienne révision"
+#, fuzzy
+#~ msgid "%s pages have been permanently changed:"
+#~ msgstr "%s pages ont été définitivement modifiées."
+
+#, fuzzy
+#~ msgid "%s pages have been permanently removed:"
+#~ msgstr "%d pages ont été définitivement supprimées."
+
+#, fuzzy
+#~ msgid "%s pages have been permanently renamed:"
+#~ msgstr "%s pages ont été définitivement renommées."
+
+#~ msgid "Version %s, saved %s"
+#~ msgstr "Version %s, enregistrée %s"
+
#~ msgid "NewMarkupTestPage"
#~ msgstr "PageTestNouvellesMarques"
@@ -9332,10 +9358,6 @@
#~ msgstr "Page '%s' renommées en '%s' avec succès."
#, fuzzy
-#~ msgid "%d pages have been reverted."
-#~ msgstr "Les pages %s ont été changées."
-
-#, fuzzy
#~ msgid "PhpWikiAdministration/MassRevert"
#~ msgstr "AdministrationDePhpWiki/Supprimer"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2011-03-02 15:15:48 UTC (rev 7947)
+++ trunk/locale/po/it.po 2011-03-02 17:24:25 UTC (rev 7948)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.4pre\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-01 16:16+0100\n"
+"POT-Creation-Date: 2011-03-02 18:22+0100\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -5169,13 +5169,14 @@
#: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
#, php-format
-msgid "%s pages have been changed."
+msgid "%d pages have been changed."
msgstr ""
#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
#: ../lib/plugin/WikiAdminMarkup.php:102
#: ../lib/plugin/WikiAdminSearchReplace.php:113
#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
msgid "No pages changed."
msgstr ""
@@ -5241,14 +5242,14 @@
#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
#: ../lib/plugin/WikiAdminSearchReplace.php:106
#: ../lib/plugin/WikiAdminSetExternal.php:80
-msgid "One page has been permanently changed:"
+msgid "One page has been changed:"
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
#, php-format
-msgid "%s pages have been permanently changed:"
+msgid "%d pages have been changed:"
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
@@ -5256,9 +5257,9 @@
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:171
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
-msgstr ""
+#, fuzzy
+msgid "Are you sure you want to change the owner of the selected pages?"
+msgstr "Il sorgente della %s"
#: ../lib/plugin/WikiAdminChown.php:175
#, fuzzy
@@ -5302,9 +5303,7 @@
msgstr "AmministrazioneDiPhpWiki/Disposizione"
#: ../lib/plugin/WikiAdminMarkup.php:163
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
+msgid "Are you sure you want to change the markup type of the selected files?"
msgstr ""
#: ../lib/plugin/WikiAdminMarkup.php:167
@@ -5342,7 +5341,7 @@
#: ../lib/plugin/WikiAdminPurge.php:79
#, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
msgstr ""
#: ../lib/plugin/WikiAdminPurge.php:92
@@ -5383,7 +5382,7 @@
#: ../lib/plugin/WikiAdminRemove.php:123
#, php-format
-msgid "%s pages have been permanently removed:"
+msgid "%d pages have been removed:"
msgstr ""
#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
@@ -5396,7 +5395,7 @@
msgstr "Cancella"
#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
+msgid "Are you sure you want to remove the selected files?"
msgstr ""
#: ../lib/plugin/WikiAdminRemove.php:200
@@ -5457,7 +5456,7 @@
#: ../lib/plugin/WikiAdminRename.php:126
#, php-format
-msgid "%s pages have been permanently renamed:"
+msgid "%d pages have been renamed:"
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:132
@@ -5469,7 +5468,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:209
-msgid "Are you sure you want to permanently rename the selected pages?"
+msgid "Are you sure you want to rename the selected pages?"
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:213
@@ -5533,8 +5532,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminSearchReplace.php:189
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected files?"
msgstr ""
#: ../lib/plugin/WikiAdminSearchReplace.php:194
@@ -5753,7 +5751,7 @@
#: ../lib/plugin/WikiAdminUtils.php:147
#, php-format
-msgid "Deleted %s pages with invalid names:"
+msgid "Deleted %d pages with invalid names:"
msgstr ""
#: ../lib/plugin/WikiAdminUtils.php:168
@@ -5770,7 +5768,7 @@
#: ../lib/plugin/WikiAdminUtils.php:180
#, php-format
-msgid "Deleted %s unreferenced pages:"
+msgid "Deleted %d unreferenced pages:"
msgstr ""
#: ../lib/plugin/WikiAdminUtils.php:183
@@ -6859,21 +6857,16 @@
msgid "%s at %s"
msgstr "%s a %s"
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:462 ../lib/WikiTheme.php:473
#, php-format
-msgid "Version %s, saved %s"
-msgstr "Versione %s, salvata %s"
+msgid "Version %s, saved on %s"
+msgstr "Versione %s, salvata su %s"
#: ../lib/WikiTheme.php:464
#, php-format
msgid "Last edited %s"
msgstr "Ultima modifica %s"
-#: ../lib/WikiTheme.php:473
-#, php-format
-msgid "Version %s, saved on %s"
-msgstr "Versione %s, salvata su %s"
-
#: ../lib/WikiTheme.php:475
#, php-format
msgid "Last edited on %s"
@@ -8470,19 +8463,37 @@
msgid "User Preferences"
msgstr "Preferenze"
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+#, fuzzy
+msgid "User preferences for this project"
+msgstr "Preferenze"
+
#: ../themes/fusionforge/templates/userprefs.tmpl:192
#: ../themes/fusionforge/templates/userprefs.tmpl:214
msgid "E-mail Notification"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+#, fuzzy
+msgid "Global user preferences (for all projects)"
+msgstr "Preferenze"
+
#: ../themes/fusionforge/templates/userprefs.tmpl:240
msgid "Menus"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:259
msgid "PDF"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:301
msgid "Check menu items to display."
msgstr ""
@@ -8751,6 +8762,9 @@
msgid "Edit old revision"
msgstr ""
+#~ msgid "Version %s, saved %s"
+#~ msgstr "Versione %s, salvata %s"
+
#~ msgid "Insert Categories (double-click)"
#~ msgstr "Inserimento Categorie (doppio-click)"
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2011-03-02 15:15:48 UTC (rev 7947)
+++ trunk/locale/po/ja.po 2011-03-02 17:24:25 UTC (rev 7948)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.11\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-01 16:16+0100\n"
+"POT-Creation-Date: 2011-03-02 18:22+0100\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5274,14 +5274,15 @@
msgstr ""
#: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
-#, php-format
-msgid "%s pages have been changed."
-msgstr ""
+#, fuzzy, php-format
+msgid "%d pages have been changed."
+msgstr "変更しませんでした。"
#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
#: ../lib/plugin/WikiAdminMarkup.php:102
#: ../lib/plugin/WikiAdminSearchReplace.php:113
#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
#, fuzzy
msgid "No pages changed."
msgstr "変更しませんでした。"
@@ -5349,24 +5350,25 @@
#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
#: ../lib/plugin/WikiAdminSearchReplace.php:106
#: ../lib/plugin/WikiAdminSetExternal.php:80
-msgid "One page has been permanently changed:"
-msgstr ""
+#, fuzzy
+msgid "One page has been changed:"
+msgstr "変更しませんでした。"
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
-#, php-format
-msgid "%s pages have been permanently changed:"
-msgstr ""
+#, fuzzy, php-format
+msgid "%d pages have been changed:"
+msgstr "変更しませんでした。"
#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
msgid "PhpWikiAdministration/Chown"
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:171
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
-msgstr ""
+#, fuzzy
+msgid "Are you sure you want to change the owner of the selected pages?"
+msgstr "選択ページを全て削除"
#: ../lib/plugin/WikiAdminChown.php:175
#, fuzzy
@@ -5412,10 +5414,9 @@
msgstr ""
#: ../lib/plugin/WikiAdminMarkup.php:163
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
-msgstr ""
+#, fuzzy
+msgid "Are you sure you want to change the markup type of the selected files?"
+msgstr "選択ページを全て削除"
#: ../lib/plugin/WikiAdminMarkup.php:167
#, fuzzy
@@ -5453,7 +5454,7 @@
#: ../lib/plugin/WikiAdminPurge.php:79
#, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
msgstr ""
#: ../lib/plugin/WikiAdminPurge.php:92
@@ -5494,7 +5495,7 @@
#: ../lib/plugin/WikiAdminRemove.php:123
#, php-format
-msgid "%s pages have been permanently removed:"
+msgid "%d pages have been removed:"
msgstr ""
#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
@@ -5508,7 +5509,7 @@
msgstr "ページ削除"
#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
+msgid "Are you sure you want to remove the selected files?"
msgstr ""
#: ../lib/plugin/WikiAdminRemove.php:200
@@ -5570,9 +5571,9 @@
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:126
-#, php-format
-msgid "%s pages have been permanently renamed:"
-msgstr ""
+#, fuzzy, php-format
+msgid "%d pages have been renamed:"
+msgstr "変更点が見つかりませんでした。"
#: ../lib/plugin/WikiAdminRename.php:132
#, fuzzy
@@ -5584,7 +5585,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:209
-msgid "Are you sure you want to permanently rename the selected pages?"
+msgid "Are you sure you want to rename the selected pages?"
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:213
@@ -5651,8 +5652,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminSearchReplace.php:189
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected files?"
msgstr ""
#: ../lib/plugin/WikiAdminSearchReplace.php:194
@@ -5875,9 +5875,9 @@
msgstr ""
#: ../lib/plugin/WikiAdminUtils.php:147
-#, php-format
-msgid "Deleted %s pages with invalid names:"
-msgstr ""
+#, fuzzy, php-format
+msgid "Deleted %d pages with invalid names:"
+msgstr "あなたの個人のテーマを選択:"
#: ../lib/plugin/WikiAdminUtils.php:168
msgid "[purged]"
@@ -5893,7 +5893,7 @@
#: ../lib/plugin/WikiAdminUtils.php:180
#, php-format
-msgid "Deleted %s unreferenced pages:"
+msgid "Deleted %d unreferenced pages:"
msgstr ""
#: ../lib/plugin/WikiAdminUtils.php:183
@@ -7015,21 +7015,16 @@
msgid "%s at %s"
msgstr ""
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:462 ../lib/WikiTheme.php:473
#, fuzzy, php-format
-msgid "Version %s, saved %s"
-msgstr "バージョン %s"
+msgid "Version %s, saved on %s"
+msgstr "バージョン %d"
#: ../lib/WikiTheme.php:464
#, fuzzy, php-format
msgid "Last edited %s"
msgstr "最終編集日時"
-#: ../lib/WikiTheme.php:473
-#, fuzzy, php-format
-msgid "Version %s, saved on %s"
-msgstr "バージョン %d"
-
#: ../lib/WikiTheme.php:475
#, fuzzy, php-format
msgid "Last edited on %s"
@@ -8653,20 +8648,38 @@
msgid "User Preferences"
msgstr "ユーザー設定"
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+#, fuzzy
+msgid "User preferences for this project"
+msgstr "ユーザー設定"
+
#: ../themes/fusionforge/templates/userprefs.tmpl:192
#: ../themes/fusionforge/templates/userprefs.tmpl:214
#, fuzzy
msgid "E-mail Notification"
msgstr "メールアドレスを確認出来ました。"
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+#, fuzzy
+msgid "Global user preferences (for all projects)"
+msgstr "ユーザー設定"
+
#: ../themes/fusionforge/templates/userprefs.tmpl:240
msgid "Menus"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:259
msgid "PDF"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:301
#, fuzzy
msgid "Check menu items to display."
@@ -8938,6 +8951,10 @@
msgstr "古いリビジョンを編集する"
#, fuzzy
+#~ msgid "Version %s, saved %s"
+#~ msgstr "バージョン %s"
+
+#, fuzzy
#~ msgid "PageGroupTest"
#~ msgstr "ページグループ"
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2011-03-02 15:15:48 UTC (rev 7947)
+++ trunk/locale/po/nl.po 2011-03-02 17:24:25 UTC (rev 7948)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.4pre\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-01 16:16+0100\n"
+"POT-Creation-Date: 2011-03-02 18:22+0100\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -5135,13 +5135,14 @@
#: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
#, php-format
-msgid "%s pages have been changed."
+msgid "%d pages have been changed."
msgstr ""
#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
#: ../lib/plugin/WikiAdminMarkup.php:102
#: ../lib/plugin/WikiAdminSearchReplace.php:113
#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
msgid "No pages changed."
msgstr ""
@@ -5207,14 +5208,14 @@
#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
#: ../lib/plugin/WikiAdminSearchReplace.php:106
#: ../lib/plugin/WikiAdminSetExternal.php:80
-msgid "One page has been permanently changed:"
+msgid "One page has been changed:"
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
#, php-format
-msgid "%s pages have been permanently changed:"
+msgid "%d pages have been changed:"
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
@@ -5223,8 +5224,7 @@
#: ../lib/plugin/WikiAdminChown.php:171
#, fuzzy
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the selected pages?"
msgstr "Verwijder pagina"
#: ../lib/plugin/WikiAdminChown.php:175
@@ -5271,9 +5271,7 @@
#: ../lib/plugin/WikiAdminMarkup.php:163
#, fuzzy
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
+msgid "Are you sure you want to change the markup type of the selected files?"
msgstr "Verwijder pagina"
#: ../lib/plugin/WikiAdminMarkup.php:167
@@ -5310,7 +5308,7 @@
#: ../lib/plugin/WikiAdminPurge.php:79
#, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
msgstr ""
#: ../lib/plugin/WikiAdminPurge.php:92
@@ -5352,7 +5350,7 @@
#: ../lib/plugin/WikiAdminRemove.php:123
#, php-format
-msgid "%s pages have been permanently removed:"
+msgid "%d pages have been removed:"
msgstr ""
#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
@@ -5365,8 +5363,9 @@
msgstr ""
#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
-msgstr ""
+#, fuzzy
+msgid "Are you sure you want to remove the selected files?"
+msgstr "Verwijder pagina"
#: ../lib/plugin/WikiAdminRemove.php:200
msgid "Remove selected pages"
@@ -5426,7 +5425,7 @@
#: ../lib/plugin/WikiAdminRename.php:126
#, php-format
-msgid "%s pages have been permanently renamed:"
+msgid "%d pages have been renamed:"
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:132
@@ -5439,7 +5438,7 @@
#: ../lib/plugin/WikiAdminRename.php:209
#, fuzzy
-msgid "Are you sure you want to permanently rename the selected pages?"
+msgid "Are you sure you want to rename the selected pages?"
msgstr "Verwijder pagina"
#: ../lib/plugin/WikiAdminRename.php:213
@@ -5504,8 +5503,7 @@
#: ../lib/plugin/WikiAdminSearchReplace.php:189
#, fuzzy
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected files?"
msgstr "Verwijder pagina"
#: ../lib/plugin/WikiAdminSearchReplace.php:194
@@ -5726,7 +5724,7 @@
#: ../lib/plugin/WikiAdminUtils.php:147
#, php-format
-msgid "Deleted %s pages with invalid names:"
+msgid "Deleted %d pages with invalid names:"
msgstr ""
#: ../lib/plugin/WikiAdminUtils.php:168
@@ -5743,7 +5741,7 @@
#: ../lib/plugin/WikiAdminUtils.php:180
#, php-format
-msgid "Deleted %s unreferenced pages:"
+msgid "Deleted %d unreferenced pages:"
msgstr ""
#: ../lib/plugin/WikiAdminUtils.php:183
@@ -6821,21 +6819,16 @@
msgid "%s at %s"
msgstr ""
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:462 ../lib/WikiTheme.php:473
#, php-format
-msgid "Version %s, saved %s"
-msgstr "Versie %s, bewarrd %s"
+msgid "Version %s, saved on %s"
+msgstr "Versie %s, bewarrd op %s"
#: ../lib/WikiTheme.php:464
#, php-format
msgid "Last edited %s"
msgstr "Meest recente verandering %s"
-#: ../lib/WikiTheme.php:473
-#, php-format
-msgid "Version %s, saved on %s"
-msgstr "Versie %s, bewarrd op %s"
-
#: ../lib/WikiTheme.php:475
#, php-format
msgid "Last edited on %s"
@@ -8433,19 +8426,37 @@
msgid "User Preferences"
msgstr "GebruikersVoorkeuren"
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+#, fuzzy
+msgid "User preferences for this project"
+msgstr "GebruikersVoorkeuren"
+
#: ../themes/fusionforge/templates/userprefs.tmpl:192
#: ../themes/fusionforge/templates/userprefs.tmpl:214
msgid "E-mail Notification"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+#, fuzzy
+msgid "Global user preferences (for all projects)"
+msgstr "GebruikersVoorkeuren"
+
#: ../themes/fusionforge/templates/userprefs.tmpl:240
msgid "Menus"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:259
msgid "PDF"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:301
msgid "Check menu items to display."
msgstr ""
@@ -8710,6 +8721,9 @@
msgid "Edit old revision"
msgstr ""
+#~ msgid "Version %s, saved %s"
+#~ msgstr "Versie %s, bewarrd %s"
+
#~ msgid "Include of '%s' failed."
#~ msgstr "Insert van '%s' gefaald."
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2011-03-02 15:15:48 UTC (rev 7947)
+++ trunk/locale/po/phpwiki.pot 2011-03-02 17:24:25 UTC (rev 7948)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0RC1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-01 16:16+0100\n"
+"POT-Creation-Date: 2011-03-02 18:22+0100\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5085,13 +5085,14 @@
#: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
#, php-format
-msgid "%s pages have been changed."
+msgid "%d pages have been changed."
msgstr ""
#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
#: ../lib/plugin/WikiAdminMarkup.php:102
#: ../lib/plugin/WikiAdminSearchReplace.php:113
#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
msgid "No pages changed."
msgstr ""
@@ -5156,14 +5157,14 @@
#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
#: ../lib/plugin/WikiAdminSearchReplace.php:106
#: ../lib/plugin/WikiAdminSetExternal.php:80
-msgid "One page has been permanently changed:"
+msgid "One page has been changed:"
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
#, php-format
-msgid "%s pages have been permanently changed:"
+msgid "%d pages have been changed:"
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
@@ -5171,8 +5172,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:171
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the selected pages?"
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:175
@@ -5215,9 +5215,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminMarkup.php:163
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
+msgid "Are you sure you want to change the markup type of the selected files?"
msgstr ""
#: ../lib/plugin/WikiAdminMarkup.php:167
@@ -5252,7 +5250,7 @@
#: ../lib/plugin/WikiAdminPurge.php:79
#, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
msgstr ""
#: ../lib/plugin/WikiAdminPurge.php:92
@@ -5291,7 +5289,7 @@
#: ../lib/plugin/WikiAdminRemove.php:123
#, php-format
-msgid "%s pages have been permanently removed:"
+msgid "%d pages have been removed:"
msgstr ""
#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
@@ -5304,7 +5302,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
+msgid "Are you sure you want to remove the selected files?"
msgstr ""
#: ../lib/plugin/WikiAdminRemove.php:200
@@ -5365,7 +5363,7 @@
#: ../lib/plugin/WikiAdminRename.php:126
#, php-format
-msgid "%s pages have been permanently renamed:"
+msgid "%d pages have been renamed:"
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:132
@@ -5377,7 +5375,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:209
-msgid "Are you sure you want to permanently rename the selected pages?"
+msgid "Are you sure you want to rename the selected pages?"
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:213
@@ -5440,8 +5438,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminSearchReplace.php:189
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected files?"
msgstr ""
#: ../lib/plugin/WikiAdminSearchReplace.php:194
@@ -5656,7 +5653,7 @@
#: ../lib/plugin/WikiAdminUtils.php:147
#, php-format
-msgid "Deleted %s pages with invalid names:"
+msgid "Deleted %d pages with invalid names:"
msgstr ""
#: ../lib/plugin/WikiAdminUtils.php:168
@@ -5673,7 +5670,7 @@
#: ../lib/plugin/WikiAdminUtils.php:180
#, php-format
-msgid "Deleted %s unreferenced pages:"
+msgid "Deleted %d unreferenced pages:"
msgstr ""
#: ../lib/plugin/WikiAdminUtils.php:183
@@ -6747,9 +6744,9 @@
msgid "%s at %s"
msgstr ""
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:462 ../lib/WikiTheme.php:473
#, php-format
-msgid "Version %s, saved %s"
+msgid "Version %s, saved on %s"
msgstr ""
#: ../lib/WikiTheme.php:464
@@ -6757,11 +6754,6 @@
msgid "Last edited %s"
msgstr ""
-#: ../lib/WikiTheme.php:473
-#, php-format
-msgid "Version %s, saved on %s"
-msgstr ""
-
#: ../lib/WikiTheme.php:475
#, php-format
msgid "Last edited on %s"
@@ -8324,19 +8316,35 @@
msgid "User Preferences"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+msgid "User preferences for this project"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:192
#: ../themes/fusionforge/templates/userprefs.tmpl:214
msgid "E-mail Notification"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+msgid "Global user preferences (for all projects)"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:240
msgid "Menus"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:259
msgid "PDF"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:301
msgid "Check menu items to display."
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2011-03-02 15:15:48 UTC (rev 7947)
+++ trunk/locale/po/sv.po 2011-03-02 17:24:25 UTC (rev 7948)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.4pre\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-01 16:16+0100\n"
+"POT-Creation-Date: 2011-03-02 18:22+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -5148,13 +5148,14 @@
#: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
#, php-format
-msgid "%s pages have been changed."
+msgid "%d pages have been changed."
msgstr ""
#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
#: ../lib/plugin/WikiAdminMarkup.php:102
#: ../lib/plugin/WikiAdminSearchReplace.php:113
#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
msgid "No pages changed."
msgstr ""
@@ -5220,14 +5221,14 @@
#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
#: ../lib/plugin/WikiAdminSearchReplace.php:106
#: ../lib/plugin/WikiAdminSetExternal.php:80
-msgid "One page has been permanently changed:"
+msgid "One page has been changed:"
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
#, php-format
-msgid "%s pages have been permanently changed:"
+msgid "%d pages have been changed:"
msgstr ""
#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
@@ -5236,8 +5237,7 @@
#: ../lib/plugin/WikiAdminChown.php:171
#, fuzzy
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the selected pages?"
msgstr "Ta bort sida nu"
#: ../lib/plugin/WikiAdminChown.php:175
@@ -5283,9 +5283,7 @@
#: ../lib/plugin/WikiAdminMarkup.php:163
#, fuzzy
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
+msgid "Are you sure you want to change the markup type of the selected files?"
msgstr "Ta bort sida nu"
#: ../lib/plugin/WikiAdminMarkup.php:167
@@ -5321,7 +5319,7 @@
#: ../lib/plugin/WikiAdminPurge.php:79
#, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
msgstr ""
#: ../lib/plugin/WikiAdminPurge.php:92
@@ -5362,7 +5360,7 @@
#: ../lib/plugin/WikiAdminRemove.php:123
#, php-format
-msgid "%s pages have been permanently removed:"
+msgid "%d pages have been removed:"
msgstr ""
#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
@@ -5375,8 +5373,9 @@
msgstr ""
#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
-msgstr ""
+#, fuzzy
+msgid "Are you sure you want to remove the selected files?"
+msgstr "Ta bort sida nu"
#: ../lib/plugin/WikiAdminRemove.php:200
msgid "Remove selected pages"
@@ -5436,7 +5435,7 @@
#: ../lib/plugin/WikiAdminRename.php:126
#, php-format
-msgid "%s pages have been permanently renamed:"
+msgid "%d pages have been renamed:"
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:132
@@ -5449,7 +5448,7 @@
#: ../lib/plugin/WikiAdminRename.php:209
#, fuzzy
-msgid "Are you sure you want to permanently rename the selected pages?"
+msgid "Are you sure you want to rename the selected pages?"
msgstr "Ta bort sida nu"
#: ../lib/plugin/WikiAdminRename.php:213
@@ -5514,8 +5513,7 @@
#: ../lib/plugin/WikiAdminSearchReplace.php:189
#, fuzzy
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected files?"
msgstr "Ta bort sida nu"
#: ../lib/plugin/WikiAdminSearchReplace.php:194
@@ -5733,7 +5731,7 @@
#: ../lib/plugin/WikiAdminUtils.php:147
#, php-format
-msgid "Deleted %s pages with invalid names:"
+msgid "Deleted %d pages with invalid names:"
msgstr ""
#: ../lib/plugin/WikiAdminUtils.php:168
@@ -5750,7 +5748,7 @@
#: ../lib/plugin/WikiAdminUtils.php:180
#, php-format
-msgid "Deleted %s unreferenced pages:"
+msgid "Deleted %d unreferenced pages:"
msgstr ""
#: ../lib/plugin/WikiAdminUtils.php:183
@@ -6828,9 +6826,9 @@
msgid "%s at %s"
msgstr "%s i %s"
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:462 ../lib/WikiTheme.php:473
#, php-format
-msgid "Version %s, saved %s"
+msgid "Version %s, saved on %s"
msgstr "Version %s, sparade %s"
#: ../lib/WikiTheme.php:464
@@ -6838,11 +6836,6 @@
msgid "Last edited %s"
msgstr "Senast ändrad %s"
-#: ../lib/WikiTheme.php:473
-#, php-format
-msgid "Version %s, saved on %s"
-msgstr "Version %s, sparade %s"
-
#: ../lib/WikiTheme.php:475
#, php-format
msgid "Last edited on %s"
@@ -8439,19 +8432,36 @@
msgid "User Preferences"
msgstr "Inställningar"
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+#, fuzzy
+msgid "User preferences for this project"
+msgstr "Inställningar"
+
#: ../themes/fusionforge/templates/userprefs.tmpl:192
#: ../themes/fusionforge/templates/userprefs.tmpl:214
msgid "E-mail Notification"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+msgid "Global user preferences (for all projects)"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:240
msgid "Menus"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:259
msgid "PDF"
msgstr ""
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
+
#: ../themes/fusionforge/templates/userprefs.tmpl:301
msgid "Check menu items to display."
msgstr ""
@@ -8717,6 +8727,9 @@
msgid "Edit old revision"
msgstr ""
+#~ msgid "Version %s, saved %s"
+#~ msgstr "Version %s, sparade %s"
+
#, fuzzy
#~ msgid "Include of '%s' failed."
#~ msgstr "Insättning för '%s' misslyckades."
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2011-03-02 15:15:48 UTC (rev 7947)
+++ trunk/locale/po/zh.po 2011-03-02 17:24:25 UTC (rev 7948)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-01 16:16+0100\n"
+"POT-Creation-Date: 2011-03-02 18:22+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -5312,14 +5312,15 @@
msgstr "錯誤的 chmod 字串"
#: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
-#, php-format
-msgid "%s pages have been changed."
+#, fuzzy, php-format
+msgid "%d pages have been changed."
msgstr "%s 頁面已經變更."
#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
#: ../lib/plugin/WikiAdminMarkup.php:102
#: ../lib/plugin/WikiAdminSearchReplace.php:113
#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
msgid "No pages changed."
msgstr "沒有頁面被變更."
@@ -5387,15 +5388,15 @@
#: ../lib/plugin/WikiAdminSearchReplace.php:106
#: ../lib/plugin/WikiAdminSetExternal.php:80
#, fuzzy
-msgid "One page has been ...
[truncated message content] |
|
From: <var...@us...> - 2011-03-02 15:15:55
|
Revision: 7947
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7947&view=rev
Author: vargenau
Date: 2011-03-02 15:15:48 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
Better use "%d" for numbers; remove unneeded "permanently"
Modified Paths:
--------------
trunk/lib/plugin/WikiAdminChmod.php
trunk/lib/plugin/WikiAdminChown.php
trunk/lib/plugin/WikiAdminMarkup.php
trunk/lib/plugin/WikiAdminPurge.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/lib/plugin/WikiAdminSetExternal.php
trunk/lib/plugin/WikiAdminUtils.php
Modified: trunk/lib/plugin/WikiAdminChmod.php
===================================================================
--- trunk/lib/plugin/WikiAdminChmod.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminChmod.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -76,15 +76,15 @@
}
}
} else {
- $ul->pushContent(HTML::li(fmt("Invalid chmod string")));
+ $ul->pushContent(HTML::li(_("Invalid chmod string")));
}
if ($count) {
$dbi->touch();
return HTML($ul,
- HTML::p(fmt("%s pages have been changed.",$count)));
+ HTML::p(fmt("%d pages have been changed.", $count)));
} else {
return HTML($ul,
- HTML::p(fmt("No pages changed.")));
+ HTML::p(_("No pages changed.")));
}
}
Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminChown.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -88,9 +88,9 @@
$dbi->touch();
$result->setAttr('class', 'feedback');
if ($count == 1) {
- $result->pushContent(HTML::p(_("One page has been permanently changed:")));
+ $result->pushContent(HTML::p(_("One page has been changed:")));
} else {
- $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count)));
+ $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
}
$result->pushContent($ul);
return $result;
@@ -168,7 +168,7 @@
$button_label = _("Yes");
$header->pushContent(
HTML::p(HTML::strong(
- _("Are you sure you want to permanently change the owner of the selected pages?"))));
+ _("Are you sure you want to change the owner of the selected pages?"))));
$header = $this->chownForm($header, $post_args);
}
else {
Modified: trunk/lib/plugin/WikiAdminMarkup.php
===================================================================
--- trunk/lib/plugin/WikiAdminMarkup.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminMarkup.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -91,9 +91,9 @@
$dbi->touch();
$result->setAttr('class', 'feedback');
if ($count == 1) {
- $result->pushContent(HTML::p(_("One page has been permanently changed:")));
+ $result->pushContent(HTML::p(_("One page has been changed:")));
} else {
- $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count)));
+ $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
}
$result->pushContent($ul);
return $result;
@@ -160,7 +160,7 @@
$button_label = _("Yes");
$header->pushContent(
HTML::p(HTML::strong(
- _("Are you sure you want to permanently change the markup type of the selected files?"))));
+ _("Are you sure you want to change the markup type of the selected files?"))));
$header = $this->chmarkupForm($header, $post_args);
}
else {
Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminPurge.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -76,7 +76,7 @@
if ($count == 1) {
$result->pushContent(HTML::p("One page has been permanently purged:"));
} else {
- $result->pushContent(HTML::p(fmt("%s pages have been permanently purged:", $count)));
+ $result->pushContent(HTML::p(fmt("%d pages have been permanently purged:", $count)));
}
$result->pushContent($ul);
return $result;
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminRemove.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -118,9 +118,9 @@
$dbi->touch();
$result->setAttr('class', 'feedback');
if ($count == 1) {
- $result->pushContent(HTML::p("One page has been permanently removed:"));
+ $result->pushContent(HTML::p("One page has been removed:"));
} else {
- $result->pushContent(HTML::p(fmt("%s pages have been permanently removed:", $count)));
+ $result->pushContent(HTML::p(fmt("%d pages have been removed:", $count)));
}
$result->pushContent($ul);
return $result;
@@ -194,7 +194,7 @@
if ($next_action == 'verify') {
$button_label = _("Yes");
$header->pushContent(HTML::p(HTML::strong(
- _("Are you sure you want to permanently remove the selected files?"))));
+ _("Are you sure you want to remove the selected files?"))));
}
else {
$button_label = _("Remove selected pages");
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminRename.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -120,10 +120,10 @@
$result->setAttr('class', 'feedback');
if ($count == 1) {
$result->pushContent(HTML::p(
- "One page has been permanently renamed:"));
+ "One page has been renamed:"));
} else {
$result->pushContent(HTML::p(
- fmt("%s pages have been permanently renamed:", $count)));
+ fmt("%d pages have been renamed:", $count)));
}
$result->pushContent($ul);
return $result;
@@ -206,7 +206,7 @@
$button_label = _("Yes");
$header->pushContent(
HTML::p(HTML::strong(
- _("Are you sure you want to permanently rename the selected pages?"))));
+ _("Are you sure you want to rename the selected pages?"))));
$header = $this->renameForm($header, $post_args, $singlepage);
} else {
if ($singlepage === true) {
Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -103,9 +103,9 @@
$dbi->touch();
$result->setAttr('class', 'feedback');
if ($count == 1) {
- $result->pushContent(HTML::p(_("One page has been permanently changed:")));
+ $result->pushContent(HTML::p(_("One page has been changed:")));
} else {
- $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count)));
+ $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
}
$result->pushContent($ul);
} else {
@@ -186,7 +186,7 @@
$button_label = _("Yes");
$header->pushContent(
HTML::p(HTML::strong(
- _("Are you sure you want to permanently replace text in the selected files?"))));
+ _("Are you sure you want to replace text in the selected files?"))));
$this->replaceForm($header, $post_args);
} else {
$button_label = _("Search & Replace");
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminSetAcl.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -120,17 +120,17 @@
}
}
} else {
- $result->pushContent(HTML::p(fmt("Invalid ACL")));
+ $result->pushContent(HTML::p(_("Invalid ACL")));
}
if ($count) {
$dbi->touch();
$result->setAttr('class', 'feedback');
if ($count > 1) {
- $result->pushContent(HTML::p(fmt("%s pages have been changed.",$count)));
+ $result->pushContent(HTML::p(fmt("%d pages have been changed.", $count)));
}
} else {
$result->setAttr('class', 'error');
- $result->pushContent(HTML::p(fmt("No pages changed.")));
+ $result->pushContent(HTML::p(_("No pages changed.")));
}
return $result;
}
Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminSetExternal.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -77,15 +77,15 @@
$dbi->touch();
$result->setAttr('class', 'feedback');
if ($count == 1) {
- $result->pushContent(HTML::p(_("One page has been permanently changed:")));
+ $result->pushContent(HTML::p(_("One page has been changed:")));
} else {
- $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count)));
+ $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
}
$result->pushContent($ul);
return $result;
} else {
$result->setAttr('class', 'error');
- $result->pushContent(HTML::p_(("No pages changed.")));
+ $result->pushContent(HTML::p(_("No pages changed.")));
return $result;
}
}
Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminUtils.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -144,7 +144,7 @@
if (!$count)
return _("No pages with bad names had to be deleted.");
else {
- return HTML(fmt("Deleted %s pages with invalid names:", $count),
+ return HTML(fmt("Deleted %d pages with invalid names:", $count),
HTML::div(array('align'=>'left'), $list));
}
}
@@ -177,7 +177,7 @@
if (!$count)
return _("No empty, unreferenced pages were found.");
else
- return HTML(fmt("Deleted %s unreferenced pages:", $count),
+ return HTML(fmt("Deleted %d unreferenced pages:", $count),
HTML::div(array('align'=>'left'), $list),
($notpurgable ?
fmt("The %d not-purgable pages/links are links in some page(s). You might want to edit them.",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-02 10:51:14
|
Revision: 7946
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7946&view=rev
Author: vargenau
Date: 2011-03-02 10:51:08 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
Let's be consistent
Modified Paths:
--------------
trunk/lib/WikiTheme.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2011-03-02 10:15:46 UTC (rev 7945)
+++ trunk/lib/WikiTheme.php 2011-03-02 10:51:08 UTC (rev 7946)
@@ -459,7 +459,7 @@
$date, $this->formatTime($mtime));
if ($show_version)
- return fmt("Version %s, saved %s", $revision->getVersion(), $date);
+ return fmt("Version %s, saved on %s", $revision->getVersion(), $date);
else
return fmt("Last edited %s", $date);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-02 10:15:53
|
Revision: 7945
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7945&view=rev
Author: vargenau
Date: 2011-03-02 10:15:46 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
Translate legends
Modified Paths:
--------------
trunk/themes/fusionforge/templates/userprefs.tmpl
Modified: trunk/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/userprefs.tmpl 2011-03-02 10:05:05 UTC (rev 7944)
+++ trunk/themes/fusionforge/templates/userprefs.tmpl 2011-03-02 10:15:46 UTC (rev 7945)
@@ -186,7 +186,7 @@
<?php } ?>
<fieldset style="margin-bottom: 1em;">
-<legend><strong>User preferences for this project</strong></legend>
+<legend><strong><?php echo _("User preferences for this project")?></strong></legend>
<table border="0" width="100%">
<tr><td colspan="3"><h3><?php echo _("E-mail Notification")?></h3></td></tr>
@@ -207,7 +207,7 @@
</fieldset>
<fieldset style="margin-bottom: 1em;">
-<legend><strong>Global user preferences (for all projects)</strong></legend>
+<legend><strong><?php echo _("Global user preferences (for all projects)")?></strong></legend>
<table border="0" width="100%">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-02 10:05:11
|
Revision: 7944
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7944&view=rev
Author: vargenau
Date: 2011-03-02 10:05:05 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
Translate legends
Modified Paths:
--------------
trunk/themes/fusionforge/templates/userprefs.tmpl
Modified: trunk/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/userprefs.tmpl 2011-03-01 15:19:58 UTC (rev 7943)
+++ trunk/themes/fusionforge/templates/userprefs.tmpl 2011-03-02 10:05:05 UTC (rev 7944)
@@ -241,7 +241,7 @@
<tr>
<td>
<fieldset>
- <legend>Top Menu</legend>
+ <legend><?php echo _("Top Menu")?></legend>
<table cellpadding="0" cellspacing="0">
<tr>
<td>
@@ -281,7 +281,7 @@
<td valign="top">
<fieldset>
- <legend>Left Menu</legend>
+ <legend><?php echo _("Left Menu")?></legend>
<table cellpadding="0" cellspacing="0">
<tr>
<td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-01 15:20:06
|
Revision: 7943
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7943&view=rev
Author: vargenau
Date: 2011-03-01 15:19:58 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
Update locale
Modified Paths:
--------------
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2011-03-01 15:16:36 UTC (rev 7942)
+++ trunk/locale/po/de.po 2011-03-01 15:19:58 UTC (rev 7943)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.15\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-27 14:09+0100\n"
+"POT-Creation-Date: 2011-03-01 16:16+0100\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -14,7 +14,7 @@
"Language-Team: German <de...@li...>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../lib/CachedMarkup.php:536
@@ -90,7 +90,7 @@
msgid "I'm sorry, there is no such page as %s."
msgstr "Leider gibt es keine solche Seite %s."
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
#, php-format
msgid "Diff: %s"
msgstr "Vergleich von: %s"
@@ -149,30 +149,6 @@
msgid "Older page:"
msgstr "Ältere Seite:"
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "Speichere Version %d zurück."
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " and "
-msgstr "hinzufügen "
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " is identical."
-msgstr "Versionen sind identisch"
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-#, fuzzy
-msgid "Version "
-msgstr "Version"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
#: ../lib/display.php:55 ../lib/display.php:321
#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
@@ -232,6 +208,9 @@
#: ../themes/blog/templates/navbar.tmpl:11
#: ../themes/Crao/templates/navbar.tmpl:18
#: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
#: ../themes/smaller/templates/navbar.tmpl:17
#: ../themes/wikilens/templates/navbar.tmpl:22
msgid "BackLinks"
@@ -2449,6 +2428,30 @@
msgid "Display differences between revisions"
msgstr "Zeilenweiser Vergleich der Versionen"
+#: ../lib/plugin/Diff.php:182
+#, fuzzy
+msgid "Content of versions "
+msgstr "Speichere Version %d zurück."
+
+#: ../lib/plugin/Diff.php:183
+#, fuzzy
+msgid " and "
+msgstr "hinzufügen "
+
+#: ../lib/plugin/Diff.php:183
+#, fuzzy
+msgid " is identical."
+msgstr "Versionen sind identisch"
+
+#: ../lib/plugin/Diff.php:188
+#, fuzzy
+msgid "Version "
+msgstr "Version"
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
#: ../lib/plugin/DynamicIncludePage.php:35
#, fuzzy
msgid "DynamicIncludePage"
@@ -2928,6 +2931,8 @@
# Or in case "Ä" doesn't work as a WikiWord, then use "VergleichbareSeiten".
#: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
#: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
#: ../themes/Portland/templates/navbar.tmpl:8
#: ../themes/smaller/templates/navbar.tmpl:16
#: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3325,7 +3330,7 @@
msgid "Contents"
msgstr "Inhalt"
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2170
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2172
#, php-format
msgid "<%s: no such section>"
msgstr "<%s: unbekannte Sektion>"
@@ -5209,6 +5214,9 @@
msgstr "WunschZettelSeiten in diesem Wiki:"
#: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
#, fuzzy
msgid "WatchPage"
msgstr "Breite"
@@ -5325,7 +5333,10 @@
msgid "%s pages have been changed."
msgstr "%s Seiten wurden geändert."
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
msgid "No pages changed."
msgstr "Keine Änderungen."
@@ -5389,6 +5400,13 @@
msgid "Could not change owner of page '%s' to '%s'."
msgstr "Konnte den Besitzer der Seite '%s' nicht in '%s' ändern."
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+#, fuzzy
+msgid "One page has been permanently changed:"
+msgstr "%s Seiten wurden geändert."
+
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
@@ -6608,11 +6626,11 @@
msgid "Unable to open directory '%s' for reading"
msgstr "Konnte Verzeichnis »%s« nicht zum Lesen öffnen"
-#: ../lib/stdlib.php:1942
+#: ../lib/stdlib.php:1944
msgid "Okay"
msgstr "OK"
-#: ../lib/stdlib.php:2127 ../lib/stdlib.php:2140
+#: ../lib/stdlib.php:2129 ../lib/stdlib.php:2142
#, php-format
msgid "... (first %s words)"
msgstr "... (erste %s Wörter)"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2011-03-01 15:16:36 UTC (rev 7942)
+++ trunk/locale/po/es.po 2011-03-01 15:19:58 UTC (rev 7943)
@@ -11,13 +11,13 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.11\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-27 14:09+0100\n"
+"POT-Creation-Date: 2011-03-01 16:16+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Date: 2001-01-12 16:10-0500\n"
"From: <pr...@cl...>\n"
@@ -98,7 +98,7 @@
msgid "I'm sorry, there is no such page as %s."
msgstr "Estoy apesadumbrado, allí no soy ninguna página tal como %s."
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
#, php-format
msgid "Diff: %s"
msgstr "Diferencia de: %s"
@@ -155,30 +155,6 @@
msgid "Older page:"
msgstr "Página más viejo:"
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "invierta a la versión %d"
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " and "
-msgstr "agregue "
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " is identical."
-msgstr "Las versiones son idénticas"
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-#, fuzzy
-msgid "Version "
-msgstr "Versión"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
#: ../lib/display.php:55 ../lib/display.php:321
#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
@@ -236,6 +212,9 @@
#: ../themes/blog/templates/navbar.tmpl:11
#: ../themes/Crao/templates/navbar.tmpl:18
#: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
#: ../themes/smaller/templates/navbar.tmpl:17
#: ../themes/wikilens/templates/navbar.tmpl:22
msgid "BackLinks"
@@ -2473,6 +2452,30 @@
msgid "Display differences between revisions"
msgstr ""
+#: ../lib/plugin/Diff.php:182
+#, fuzzy
+msgid "Content of versions "
+msgstr "invierta a la versión %d"
+
+#: ../lib/plugin/Diff.php:183
+#, fuzzy
+msgid " and "
+msgstr "agregue "
+
+#: ../lib/plugin/Diff.php:183
+#, fuzzy
+msgid " is identical."
+msgstr "Las versiones son idénticas"
+
+#: ../lib/plugin/Diff.php:188
+#, fuzzy
+msgid "Version "
+msgstr "Versión"
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
#: ../lib/plugin/DynamicIncludePage.php:35
#, fuzzy
msgid "DynamicIncludePage"
@@ -2961,6 +2964,8 @@
#: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
#: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
#: ../themes/Portland/templates/navbar.tmpl:8
#: ../themes/smaller/templates/navbar.tmpl:16
#: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3330,7 +3335,7 @@
msgid "Contents"
msgstr ""
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2170
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2172
#, php-format
msgid "<%s: no such section>"
msgstr ""
@@ -5186,6 +5191,9 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
#, fuzzy
msgid "WatchPage"
msgstr "Anchura"
@@ -5303,7 +5311,10 @@
msgstr ""
# lib/pageinfo.php:21
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
msgid "No pages changed."
msgstr ""
@@ -5366,6 +5377,12 @@
msgid "Could not change owner of page '%s' to '%s'."
msgstr ""
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+msgid "One page has been permanently changed:"
+msgstr ""
+
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
@@ -6512,11 +6529,11 @@
msgid "Unable to open directory '%s' for reading"
msgstr ""
-#: ../lib/stdlib.php:1942
+#: ../lib/stdlib.php:1944
msgid "Okay"
msgstr ""
-#: ../lib/stdlib.php:2127 ../lib/stdlib.php:2140
+#: ../lib/stdlib.php:2129 ../lib/stdlib.php:2142
#, php-format
msgid "... (first %s words)"
msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2011-03-01 15:16:36 UTC (rev 7942)
+++ trunk/locale/po/fr.po 2011-03-01 15:19:58 UTC (rev 7943)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.11\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-27 14:09+0100\n"
+"POT-Creation-Date: 2011-03-01 16:16+0100\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -14,7 +14,7 @@
"Language-Team: none\n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Date: 2001-09-22 00:00-0000\n"
"From: Pierrick Meignen <mei...@wa...>\n"
@@ -96,7 +96,7 @@
msgstr "Désolé, %s ne correspond à aucune page."
# lib/diff.php:1045
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
#, php-format
msgid "Diff: %s"
msgstr "Diff : %s"
@@ -154,30 +154,6 @@
msgid "Older page:"
msgstr "Ancienne page :"
-# lib/diff.php:1001 lib/diff.php:1019
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "revenir à la version %d"
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " and "
-msgstr " et "
-
-# lib/diff.php:1037
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " is identical."
-msgstr " est identique."
-
-# lib/diff.php:1001 lib/diff.php:1019
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-msgid "Version "
-msgstr "Version"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr " a été créé car : "
-
#: ../lib/display.php:55 ../lib/display.php:321
#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
@@ -235,6 +211,9 @@
#: ../themes/blog/templates/navbar.tmpl:11
#: ../themes/Crao/templates/navbar.tmpl:18
#: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
#: ../themes/smaller/templates/navbar.tmpl:17
#: ../themes/wikilens/templates/navbar.tmpl:22
msgid "BackLinks"
@@ -2456,6 +2435,30 @@
msgid "Display differences between revisions"
msgstr "Affiche les différences entre révisions"
+# lib/diff.php:1001 lib/diff.php:1019
+#: ../lib/plugin/Diff.php:182
+#, fuzzy
+msgid "Content of versions "
+msgstr "revenir à la version %d"
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr " et "
+
+# lib/diff.php:1037
+#: ../lib/plugin/Diff.php:183
+msgid " is identical."
+msgstr " est identique."
+
+# lib/diff.php:1001 lib/diff.php:1019
+#: ../lib/plugin/Diff.php:188
+msgid "Version "
+msgstr "Version"
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr " a été créé car : "
+
#: ../lib/plugin/DynamicIncludePage.php:35
#, fuzzy
msgid "DynamicIncludePage"
@@ -2938,6 +2941,8 @@
#: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
#: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
#: ../themes/Portland/templates/navbar.tmpl:8
#: ../themes/smaller/templates/navbar.tmpl:16
#: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3323,7 +3328,7 @@
msgid "Contents"
msgstr "Contenu"
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2170
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2172
#, php-format
msgid "<%s: no such section>"
msgstr "<%s : pas de section de ce type>"
@@ -5206,6 +5211,9 @@
msgstr "Pages recherchées dans ce wiki :"
#: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
msgid "WatchPage"
msgstr "Suivre"
@@ -5322,7 +5330,10 @@
msgid "%s pages have been changed."
msgstr "Les pages %s ont été changées."
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
msgid "No pages changed."
msgstr "Aucune page changée."
@@ -5386,6 +5397,13 @@
msgid "Could not change owner of page '%s' to '%s'."
msgstr "Impossible de changer le propriétaire '%s' à '%s'."
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+#, fuzzy
+msgid "One page has been permanently changed:"
+msgstr "%s pages ont été définitivement modifiées."
+
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
@@ -6600,11 +6618,11 @@
msgid "Unable to open directory '%s' for reading"
msgstr "Impossible d'ouvrir le répertoire '%s' en lecture"
-#: ../lib/stdlib.php:1942
+#: ../lib/stdlib.php:1944
msgid "Okay"
msgstr "OK"
-#: ../lib/stdlib.php:2127 ../lib/stdlib.php:2140
+#: ../lib/stdlib.php:2129 ../lib/stdlib.php:2142
#, php-format
msgid "... (first %s words)"
msgstr "... (%s premiers mots)"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2011-03-01 15:16:36 UTC (rev 7942)
+++ trunk/locale/po/it.po 2011-03-01 15:19:58 UTC (rev 7943)
@@ -7,13 +7,13 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.4pre\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-27 14:09+0100\n"
+"POT-Creation-Date: 2011-03-01 16:16+0100\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../lib/CachedMarkup.php:536
@@ -89,7 +89,7 @@
msgid "I'm sorry, there is no such page as %s."
msgstr ""
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
#, php-format
msgid "Diff: %s"
msgstr "Differenza di: %s"
@@ -145,29 +145,6 @@
msgid "Older page:"
msgstr ""
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "versione corrente"
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " and "
-msgstr ""
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " is identical."
-msgstr "Le versioni sono identiche"
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-#, fuzzy
-msgid "Version "
-msgstr "Versione"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
#: ../lib/display.php:55 ../lib/display.php:321
#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
@@ -224,6 +201,9 @@
#: ../themes/blog/templates/navbar.tmpl:11
#: ../themes/Crao/templates/navbar.tmpl:18
#: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
#: ../themes/smaller/templates/navbar.tmpl:17
#: ../themes/wikilens/templates/navbar.tmpl:22
msgid "BackLinks"
@@ -2408,6 +2388,29 @@
msgid "Display differences between revisions"
msgstr ""
+#: ../lib/plugin/Diff.php:182
+#, fuzzy
+msgid "Content of versions "
+msgstr "versione corrente"
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+#, fuzzy
+msgid " is identical."
+msgstr "Le versioni sono identiche"
+
+#: ../lib/plugin/Diff.php:188
+#, fuzzy
+msgid "Version "
+msgstr "Versione"
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
#: ../lib/plugin/DynamicIncludePage.php:35
#, fuzzy
msgid "DynamicIncludePage"
@@ -2877,6 +2880,8 @@
#: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
#: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
#: ../themes/Portland/templates/navbar.tmpl:8
#: ../themes/smaller/templates/navbar.tmpl:16
#: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3241,7 +3246,7 @@
msgid "Contents"
msgstr "Indice"
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2170
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2172
#, php-format
msgid "<%s: no such section>"
msgstr ""
@@ -5049,6 +5054,9 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
#, fuzzy
msgid "WatchPage"
msgstr "Larghezza"
@@ -5164,7 +5172,10 @@
msgid "%s pages have been changed."
msgstr ""
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
msgid "No pages changed."
msgstr ""
@@ -5227,6 +5238,12 @@
msgid "Could not change owner of page '%s' to '%s'."
msgstr ""
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+msgid "One page has been permanently changed:"
+msgstr ""
+
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
@@ -6358,11 +6375,11 @@
msgid "Unable to open directory '%s' for reading"
msgstr ""
-#: ../lib/stdlib.php:1942
+#: ../lib/stdlib.php:1944
msgid "Okay"
msgstr ""
-#: ../lib/stdlib.php:2127 ../lib/stdlib.php:2140
+#: ../lib/stdlib.php:2129 ../lib/stdlib.php:2142
#, php-format
msgid "... (first %s words)"
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2011-03-01 15:16:36 UTC (rev 7942)
+++ trunk/locale/po/ja.po 2011-03-01 15:19:58 UTC (rev 7943)
@@ -6,13 +6,13 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.11\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-27 14:09+0100\n"
+"POT-Creation-Date: 2011-03-01 16:16+0100\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../lib/CachedMarkup.php:536
@@ -88,7 +88,7 @@
msgid "I'm sorry, there is no such page as %s."
msgstr ""
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
#, php-format
msgid "Diff: %s"
msgstr "差分: %s"
@@ -144,28 +144,6 @@
msgid "Older page:"
msgstr ""
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "バージョン %d"
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " and "
-msgstr ""
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " is identical."
-msgstr ""
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-#, fuzzy
-msgid "Version "
-msgstr "バージョン"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
# This entry is important for French punctuation rules which stipulate
# a space before each colon.
#: ../lib/display.php:55 ../lib/display.php:321
@@ -224,6 +202,9 @@
#: ../themes/blog/templates/navbar.tmpl:11
#: ../themes/Crao/templates/navbar.tmpl:18
#: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
#: ../themes/smaller/templates/navbar.tmpl:17
#: ../themes/wikilens/templates/navbar.tmpl:22
msgid "BackLinks"
@@ -2470,6 +2451,28 @@
msgid "Display differences between revisions"
msgstr ""
+#: ../lib/plugin/Diff.php:182
+#, fuzzy
+msgid "Content of versions "
+msgstr "バージョン %d"
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+msgid " is identical."
+msgstr ""
+
+#: ../lib/plugin/Diff.php:188
+#, fuzzy
+msgid "Version "
+msgstr "バージョン"
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
#: ../lib/plugin/DynamicIncludePage.php:35
#, fuzzy
msgid "DynamicIncludePage"
@@ -2949,6 +2952,8 @@
#: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
#: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
#: ../themes/Portland/templates/navbar.tmpl:8
#: ../themes/smaller/templates/navbar.tmpl:16
#: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3321,7 +3326,7 @@
msgid "Contents"
msgstr "コンテンツ"
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2170
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2172
#, php-format
msgid "<%s: no such section>"
msgstr ""
@@ -5154,6 +5159,9 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
#, fuzzy
msgid "WatchPage"
msgstr "幅"
@@ -5270,7 +5278,10 @@
msgid "%s pages have been changed."
msgstr ""
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
#, fuzzy
msgid "No pages changed."
msgstr "変更しませんでした。"
@@ -5335,6 +5346,12 @@
msgid "Could not change owner of page '%s' to '%s'."
msgstr "'%s' の削除に成功しました。"
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+msgid "One page has been permanently changed:"
+msgstr ""
+
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
@@ -6506,11 +6523,11 @@
msgid "Unable to open directory '%s' for reading"
msgstr ""
-#: ../lib/stdlib.php:1942
+#: ../lib/stdlib.php:1944
msgid "Okay"
msgstr "おっけー"
-#: ../lib/stdlib.php:2127 ../lib/stdlib.php:2140
+#: ../lib/stdlib.php:2129 ../lib/stdlib.php:2142
#, php-format
msgid "... (first %s words)"
msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2011-03-01 15:16:36 UTC (rev 7942)
+++ trunk/locale/po/nl.po 2011-03-01 15:19:58 UTC (rev 7943)
@@ -8,13 +8,13 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.4pre\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-27 14:09+0100\n"
+"POT-Creation-Date: 2011-03-01 16:16+0100\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Date: 1998-05-26 11:26:28+0200\n"
"From: <ja...@gn...>\n"
@@ -92,7 +92,7 @@
msgid "I'm sorry, there is no such page as %s."
msgstr ""
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
#, php-format
msgid "Diff: %s"
msgstr "Diff van: %s"
@@ -148,29 +148,6 @@
msgid "Older page:"
msgstr ""
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "huidige versie"
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " and "
-msgstr ""
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " is identical."
-msgstr "Versies zijn identiek"
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-#, fuzzy
-msgid "Version "
-msgstr "Versie"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
#: ../lib/display.php:55 ../lib/display.php:321
#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
@@ -227,6 +204,9 @@
#: ../themes/blog/templates/navbar.tmpl:11
#: ../themes/Crao/templates/navbar.tmpl:18
#: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
#: ../themes/smaller/templates/navbar.tmpl:17
#: ../themes/wikilens/templates/navbar.tmpl:22
msgid "BackLinks"
@@ -2383,6 +2363,29 @@
msgid "Display differences between revisions"
msgstr ""
+#: ../lib/plugin/Diff.php:182
+#, fuzzy
+msgid "Content of versions "
+msgstr "huidige versie"
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+#, fuzzy
+msgid " is identical."
+msgstr "Versies zijn identiek"
+
+#: ../lib/plugin/Diff.php:188
+#, fuzzy
+msgid "Version "
+msgstr "Versie"
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
#: ../lib/plugin/DynamicIncludePage.php:35
msgid "DynamicIncludePage"
msgstr ""
@@ -2849,6 +2852,8 @@
#: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
#: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
#: ../themes/Portland/templates/navbar.tmpl:8
#: ../themes/smaller/templates/navbar.tmpl:16
#: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3213,7 +3218,7 @@
msgid "Contents"
msgstr ""
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2170
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2172
#, php-format
msgid "<%s: no such section>"
msgstr ""
@@ -5015,6 +5020,9 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
#, fuzzy
msgid "WatchPage"
msgstr "Breedte"
@@ -5130,7 +5138,10 @@
msgid "%s pages have been changed."
msgstr ""
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
msgid "No pages changed."
msgstr ""
@@ -5193,6 +5204,12 @@
msgid "Could not change owner of page '%s' to '%s'."
msgstr ""
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+msgid "One page has been permanently changed:"
+msgstr ""
+
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
@@ -6323,11 +6340,11 @@
msgid "Unable to open directory '%s' for reading"
msgstr ""
-#: ../lib/stdlib.php:1942
+#: ../lib/stdlib.php:1944
msgid "Okay"
msgstr ""
-#: ../lib/stdlib.php:2127 ../lib/stdlib.php:2140
+#: ../lib/stdlib.php:2129 ../lib/stdlib.php:2142
#, php-format
msgid "... (first %s words)"
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2011-03-01 15:16:36 UTC (rev 7942)
+++ trunk/locale/po/phpwiki.pot 2011-03-01 15:19:58 UTC (rev 7943)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0RC1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-27 14:09+0100\n"
+"POT-Creation-Date: 2011-03-01 16:16+0100\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -88,7 +88,7 @@
msgid "I'm sorry, there is no such page as %s."
msgstr ""
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
#, php-format
msgid "Diff: %s"
msgstr ""
@@ -144,26 +144,6 @@
msgid "Older page:"
msgstr ""
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-msgid "Content of versions "
-msgstr ""
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " and "
-msgstr ""
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " is identical."
-msgstr ""
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-msgid "Version "
-msgstr ""
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
# This entry is important for French punctuation rules which stipulate
# a space before each colon.
#: ../lib/display.php:55 ../lib/display.php:321
@@ -222,6 +202,9 @@
#: ../themes/blog/templates/navbar.tmpl:11
#: ../themes/Crao/templates/navbar.tmpl:18
#: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
#: ../themes/smaller/templates/navbar.tmpl:17
#: ../themes/wikilens/templates/navbar.tmpl:22
msgid "BackLinks"
@@ -2361,6 +2344,26 @@
msgid "Display differences between revisions"
msgstr ""
+#: ../lib/plugin/Diff.php:182
+msgid "Content of versions "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+msgid " is identical."
+msgstr ""
+
+#: ../lib/plugin/Diff.php:188
+msgid "Version "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
#: ../lib/plugin/DynamicIncludePage.php:35
msgid "DynamicIncludePage"
msgstr ""
@@ -2825,6 +2828,8 @@
#: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
#: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
#: ../themes/Portland/templates/navbar.tmpl:8
#: ../themes/smaller/templates/navbar.tmpl:16
#: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3186,7 +3191,7 @@
msgid "Contents"
msgstr ""
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2170
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2172
#, php-format
msgid "<%s: no such section>"
msgstr ""
@@ -4967,6 +4972,9 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
msgid "WatchPage"
msgstr ""
@@ -5080,7 +5088,10 @@
msgid "%s pages have been changed."
msgstr ""
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
msgid "No pages changed."
msgstr ""
@@ -5142,6 +5153,12 @@
msgid "Could not change owner of page '%s' to '%s'."
msgstr ""
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+msgid "One page has been permanently changed:"
+msgstr ""
+
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
@@ -6252,11 +6269,11 @@
msgid "Unable to open directory '%s' for reading"
msgstr ""
-#: ../lib/stdlib.php:1942
+#: ../lib/stdlib.php:1944
msgid "Okay"
msgstr ""
-#: ../lib/stdlib.php:2127 ../lib/stdlib.php:2140
+#: ../lib/stdlib.php:2129 ../lib/stdlib.php:2142
#, php-format
msgid "... (first %s words)"
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2011-03-01 15:16:36 UTC (rev 7942)
+++ trunk/locale/po/sv.po 2011-03-01 15:19:58 UTC (rev 7943)
@@ -7,13 +7,13 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.4pre\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-27 14:09+0100\n"
+"POT-Creation-Date: 2011-03-01 16:16+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../lib/CachedMarkup.php:536
@@ -89,7 +89,7 @@
msgid "I'm sorry, there is no such page as %s."
msgstr ""
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
#, php-format
msgid "Diff: %s"
msgstr "Diff av: %s"
@@ -145,29 +145,6 @@
msgid "Older page:"
msgstr ""
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "nuvarande version"
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " and "
-msgstr ""
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " is identical."
-msgstr "Versionerna är identiska"
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-#, fuzzy
-msgid "Version "
-msgstr "Version"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
#: ../lib/display.php:55 ../lib/display.php:321
#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
@@ -224,6 +201,9 @@
#: ../themes/blog/templates/navbar.tmpl:11
#: ../themes/Crao/templates/navbar.tmpl:18
#: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
#: ../themes/smaller/templates/navbar.tmpl:17
#: ../themes/wikilens/templates/navbar.tmpl:22
msgid "BackLinks"
@@ -2390,6 +2370,29 @@
msgid "Display differences between revisions"
msgstr ""
+#: ../lib/plugin/Diff.php:182
+#, fuzzy
+msgid "Content of versions "
+msgstr "nuvarande version"
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+#, fuzzy
+msgid " is identical."
+msgstr "Versionerna är identiska"
+
+#: ../lib/plugin/Diff.php:188
+#, fuzzy
+msgid "Version "
+msgstr "Version"
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
#: ../lib/plugin/DynamicIncludePage.php:35
#, fuzzy
msgid "DynamicIncludePage"
@@ -2862,6 +2865,8 @@
#: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
#: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
#: ../themes/Portland/templates/navbar.tmpl:8
#: ../themes/smaller/templates/navbar.tmpl:16
#: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3224,7 +3229,7 @@
msgid "Contents"
msgstr "Innehåll"
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2170
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2172
#, php-format
msgid "<%s: no such section>"
msgstr ""
@@ -5028,6 +5033,9 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
#, fuzzy
msgid "WatchPage"
msgstr "Bredd"
@@ -5143,7 +5151,10 @@
msgid "%s pages have been changed."
msgstr ""
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
msgid "No pages changed."
msgstr ""
@@ -5206,6 +5217,12 @@
msgid "Could not change owner of page '%s' to '%s'."
msgstr ""
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+msgid "One page has been permanently changed:"
+msgstr ""
+
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
@@ -6331,11 +6348,11 @@
msgid "Unable to open directory '%s' for reading"
msgstr ""
-#: ../lib/stdlib.php:1942
+#: ../lib/stdlib.php:1944
msgid "Okay"
msgstr ""
-#: ../lib/stdlib.php:2127 ../lib/stdlib.php:2140
+#: ../lib/stdlib.php:2129 ../lib/stdlib.php:2142
#, php-format
msgid "... (first %s words)"
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2011-03-01 15:16:36 UTC (rev 7942)
+++ trunk/locale/po/zh.po 2011-03-01 15:19:58 UTC (rev 7943)
@@ -6,13 +6,13 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.3.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-27 14:09+0100\n"
+"POT-Creation-Date: 2011-03-01 16:16+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../lib/CachedMarkup.php:536
@@ -90,7 +90,7 @@
msgid "I'm sorry, there is no such page as %s."
msgstr "抱歉,這裡沒有任何被命名為 %s 的頁面."
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
#, php-format
msgid "Diff: %s"
msgstr "差異: %s"
@@ -146,29 +146,6 @@
msgid "Older page:"
msgstr "較舊的頁面:"
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "版本 %d"
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " and "
-msgstr ""
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " is identical."
-msgstr "版本相同"
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-#, fuzzy
-msgid "Version "
-msgstr "版本"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
# This entry is important for French punctuation rules which stipulate
# a space before each colon.
#: ../lib/display.php:55 ../lib/display.php:321
@@ -228,6 +205,9 @@
#: ../themes/blog/templates/navbar.tmpl:11
#: ../themes/Crao/templates/navbar.tmpl:18
#: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
#: ../themes/smaller/templates/navbar.tmpl:17
#: ../themes/wikilens/templates/navbar.tmpl:22
msgid "BackLinks"
@@ -2466,6 +2446,29 @@
msgid "Display differences between revisions"
msgstr "顯示修訂間的差異"
+#: ../lib/plugin/Diff.php:182
+#, fuzzy
+msgid "Content of versions "
+msgstr "版本 %d"
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+#, fuzzy
+msgid " is identical."
+msgstr "版本相同"
+
+#: ../lib/plugin/Diff.php:188
+#, fuzzy
+msgid "Version "
+msgstr "版本"
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
#: ../lib/plugin/DynamicIncludePage.php:35
#, fuzzy
msgid "DynamicIncludePage"
@@ -2948,6 +2951,8 @@
#: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
#: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
#: ../themes/Portland/templates/navbar.tmpl:8
#: ../themes/smaller/templates/navbar.tmpl:16
#: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3330,7 +3335,7 @@
msgid "Contents"
msgstr "內容"
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2170
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2172
#, php-format
msgid "<%s: no such section>"
msgstr "<%s: 沒有此部份>"
@@ -5192,6 +5197,9 @@
msgstr "在此 wiki 所需要的頁面 (共 %d):"
#: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
#, fuzzy
msgid "WatchPage"
msgstr "寬度"
@@ -5308,7 +5316,10 @@
msgid "%s pages have been changed."
msgstr "%s 頁面已經變更."
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
msgid "No pages changed."
msgstr "沒有頁面被變更."
@@ -5372,6 +5383,13 @@
msgid "Could not change owner of page '%s' to '%s'."
msgstr "無法為頁面 '%s' 變更權限為 '%s'."
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+#, fuzzy
+msgid "One page has been permanently changed:"
+msgstr "%s pages 已經永久更名了."
+
#: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
#: ../lib/plugin/WikiAdminSearchReplace.php:108
#: ../lib/plugin/WikiAdminSetExternal.php:82
@@ -6569,11 +6587,11 @@
msgid "Unable to open directory '%s' for reading"
msgstr "無法開啟目錄 '%s' 進行讀取"
-#: ../lib/stdlib.php:1942
+#: ../lib/stdlib.php:1944
msgid "Okay"
msgstr "Okay"
-#: ../lib/stdlib.php:2127 ../lib/stdlib.php:2140
+#: ../lib/stdlib.php:2129 ../lib/stdlib.php:2142
#, fuzzy, php-format
msgid "... (first %s words)"
msgstr "... 頭 %d 個字"
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-01 15:16:42
|
Revision: 7942
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7942&view=rev
Author: vargenau
Date: 2011-03-01 15:16:36 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
PhpWiki-1.4.0RC1; charset=utf-8
Modified Paths:
--------------
trunk/locale/po/phpwiki.pot
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2011-03-01 15:03:53 UTC (rev 7941)
+++ trunk/locale/po/phpwiki.pot 2011-03-01 15:16:36 UTC (rev 7942)
@@ -1,10 +1,10 @@
# English PhpWiki locale
# This file is part of PhpWiki.
-# Copyright (C) Copyright 1999, 2000, 2001, 2002 ThePhpWikiProgrammingTeam.
+# Copyright (C) Copyright 1999, 2000, 2001, 2002, 2011 ThePhpWikiProgrammingTeam.
#
msgid ""
msgstr ""
-"Project-Id-Version: PhpWiki-1.3.11\n"
+"Project-Id-Version: PhpWiki-1.4.0RC1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-27 14:09+0100\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
@@ -12,7 +12,7 @@
"Language-Team: LANGUAGE <LL...@li...>\n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../lib/CachedMarkup.php:536
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-01 15:03:59
|
Revision: 7941
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7941&view=rev
Author: vargenau
Date: 2011-03-01 15:03:53 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
Source code is UTF-8
Modified Paths:
--------------
trunk/locale/Makefile
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile 2011-03-01 14:40:24 UTC (rev 7940)
+++ trunk/locale/Makefile 2011-03-01 15:03:53 UTC (rev 7941)
@@ -17,8 +17,8 @@
${POT_FILE} : # dependencies are auto-generated by 'make depend' , see below
cp -f $@ $@~
- xgettext -L PHP --from-code=iso-8859-1 -k_ -k__printf -k__sprintf -k__vsprintf -kfmt -o $@.extracted $^
- sed -e's,; charset=CHARSET,; charset=iso-8859-1,' $@.extracted
+ xgettext -L PHP --from-code=utf-8 -k_ -k__printf -k__sprintf -k__vsprintf -kfmt -o $@.extracted $^
+ sed -e's,; charset=CHARSET,; charset=utf-8,' $@.extracted
msgmerge -o $@ $@~ $@.extracted && rm -f $@.extracted
# merge in place to keep unchanged timestamps
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
286 messages has been excluded from this view by a project administrator.
