You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2009/09/26 20:21:04 UTC
svn commit: r819189 - in /incubator/jspwiki/trunk: ./
src/WebContent/WEB-INF/classes/templates/ src/WebContent/WEB-INF/lib/
src/java/org/apache/wiki/ src/java/org/apache/wiki/tags/
src/java/org/apache/wiki/ui/stripes/
Author: metskem
Date: Sat Sep 26 18:21:03 2009
New Revision: 819189
URL: http://svn.apache.org/viewvc?rev=819189&view=rev
Log:
3.0.0-svn-159
* added a few missing i18n keys (English and Dutch)
* removed invalid char from WikiPageFormatter causing compile warnings
* typo in CheckVersionTag
* upgrade priha 0.1.32 => 0.3.2
Added:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/priha-0.3.2.jar (with props)
Removed:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/priha-0.1.32.jar
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckVersionTag.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageFormatter.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=819189&r1=819188&r2=819189&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Sep 26 18:21:03 2009
@@ -1,3 +1,15 @@
+2009-09-26 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-159
+
+ * added a few missing i18n keys (English and Dutch)
+
+ * removed invalid char from WikiPageFormatter causing compile warnings
+
+ * typo in CheckVersionTag
+
+ * upgrade priha 0.1.32 => 0.3.2
+
2009-09-26 Dirk Frederickx <br...@apache.org>
* 3.0.0-svn-158 - upgrade mootools library
Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties?rev=819189&r1=819188&r2=819189&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties Sat Sep 26 18:21:03 2009
@@ -430,21 +430,28 @@
editor.plain.tbH3.title=h3 - Insert heading3
editor.plain.tbHR.title=hr - Insert horizontal ruler
editor.plain.tbBR.title=br - Insert line break
+editor.plain.tbCHAR.title=ch - Insert special character
editor.plain.tbPRE.title=pre - Insert preformatted block
editor.plain.tbDL.title=dl - Insert definition list
editor.plain.tbB.title=bold
editor.plain.tbI.title=italic
editor.plain.tbMONO.title=mono - monospace
+editor.plain.tbCSS.title=css - apply CSS style
+editor.plain.tbFONT.title=choose font
+editor.plain.tbCOLOR.title=choose color
editor.plain.tbSUP.title=sup - superscript
editor.plain.tbSUB.title=sub - subscript
editor.plain.tbSTRIKE.title=strike - strikethrough
editor.plain.tbTOC.title=toc - Insert table of contents
+editor.plain.tbPLUGIN.title=plugin - Insert Plugin
editor.plain.tbTAB.title=tab - Insert tabbed section
editor.plain.tbTABLE.title=table - Insert table
+editor.plain.tbACL.title=acl- Insert Acces Control List
editor.plain.tbIMG.title=img - Insert image
editor.plain.tbCODE.title=code - Insert code block
editor.plain.tbQUOTE.title=quote - Insert quoted block
editor.plain.tbSIGN.title=sign - Insert your signature
+editor.plain.tbVERT.title=preview - under or right side
editor.preview.edit.submit=Keep editing
editor.preview.edit.title=Continue to edit the current page [ e ]
editor.preview.save.submit=Save
Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties?rev=819189&r1=819188&r2=819189&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties Sat Sep 26 18:21:03 2009
@@ -418,21 +418,28 @@
editor.plain.tbH3.title=h3 - Voeg paragraaf niveau 3 in
editor.plain.tbHR.title=hr - Voeg horizonale lijn in
editor.plain.tbBR.title=br - Start nieuwe lijn
+editor.plain.tbCHAR.title=ch - Voeg speciaal character in
editor.plain.tbPRE.title=pre - Voeg tekstblok in zonder formattering
editor.plain.tbDL.title=dl - Voeg definitie lijst toe
editor.plain.tbB.title=vet
editor.plain.tbI.title=schuin
editor.plain.tbMONO.title=mono - monospace
+editor.plain.tbCSS.title=css - toepassen CSS stijl
+editor.plain.tbFONT.title=kies lettertype
+editor.plain.tbCOLOR.title=kies kleur
editor.plain.tbSUP.title=sup - superscript
editor.plain.tbSUB.title=sub - subscript
editor.plain.tbSTRIKE.title=strike - doorhalen
editor.plain.tbTOC.title=toc - Voeg inhoudsopgave in
+editor.plain.tbPLUGIN.title=plugin - Voeg Plugin in
editor.plain.tbTAB.title=tab - Voeg tabblad sectie in
editor.plain.tbTABLE.title=table - Voeg tabel in
+editor.plain.tbACL.title=acl- Voeg Acces Control List in
editor.plain.tbIMG.title=img - Voeg afbeelding in
editor.plain.tbCODE.title=code - Voeg code blok in
editor.plain.tbQUOTE.title=quote - Voeg quote blok in
editor.plain.tbSIGN.title=sign - Voeg handtekening in
+editor.plain.tbVERT.title=preview - onder of rechts
editor.preview.edit.submit=Verder gaan
editor.preview.edit.title=Verder gaan met het wijzigen van deze pagina [ e ]
editor.preview.save.submit=Bewaar
Added: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/priha-0.3.2.jar
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/priha-0.3.2.jar?rev=819189&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/priha-0.3.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=819189&r1=819188&r2=819189&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sat Sep 26 18:21:03 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "158";
+ public static final String BUILD = "159";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckVersionTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckVersionTag.java?rev=819189&r1=819188&r2=819189&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckVersionTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckVersionTag.java Sat Sep 26 18:21:03 2009
@@ -35,7 +35,7 @@
* <LI><b>latest</b> - Include body, if the page is the latest version.</li>
* <LI><b>notlatest</b> - Include body, if the page is NOT the latest version.</li>
* <li><b>first</b> - Include body, if page is the first version (version 1)</li>
- * <li><b>notfirst</b> - Include bodt, if page is NOT the first version (version 1)</li>
+ * <li><b>notfirst</b> - Include body, if page is NOT the first version (version 1)</li>
* </UL>
* If the page does not exist, body content is never included.
*
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageFormatter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageFormatter.java?rev=819189&r1=819188&r2=819189&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageFormatter.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageFormatter.java Sat Sep 26 18:21:03 2009
@@ -24,7 +24,7 @@
* <li>if the WikiPage is null, returns the empty string</li>
* <li>if the WikiPage belongs to the default space, the path name without
* space is returned</li>
- * <li>otherwise, the full path name, including the space, is returned</li>
+ * <li>otherwise, the full path name, including the space, is returned</li>
* </ul>
*/
public String format( WikiPage input )