You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2010/02/04 06:17:21 UTC

svn commit: r906368 - in /incubator/jspwiki/trunk: ./ src/WebContent/WEB-INF/classes/ src/WebContent/WEB-INF/classes/templates/

Author: ajaquith
Date: Thu Feb  4 05:17:20 2010
New Revision: 906368

URL: http://svn.apache.org/viewvc?rev=906368&view=rev
Log:
[JSPWIKI-578] Eliminated the remaining top-level JSPs except for Error.jsp. Minor tweaks to the templates/default directory; the layout JSP and related JSPs are in their own layout/ subdirectory.

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_pt_BR.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_pt_BR.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Feb  4 05:17:20 2010
@@ -1,3 +1,12 @@
+2010-02-04 Andrew Jaquith <ajaquith AT apache DOT org>
+
+        * 3.0.0-svn-204
+
+        * [JSPWIKI-578] Eliminated the remaining top-level JSPs
+        except for Error.jsp. Minor tweaks to the
+        templates/default directory; the layout JSP and
+        related JSPs are in their own layout/subdirectory.
+
 2010-02-02 Andrew Jaquith <ajaquith AT apache DOT org>
 
         * 3.0.0-svn-202

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties Thu Feb  4 05:17:20 2010
@@ -382,3 +382,17 @@
 org.apache.wiki.action.RenameActionBean.rename=Rename page
 #Formerly login.lostpw.submit. Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=Reset password
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
+org.apache.wiki.action.SearchActionBean.go=Go
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
+org.apache.wiki.action.SearchActionBean.search=Find
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.
+SearchScope.ALL=Search everywhere
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.authors.
+SearchScope.AUTHORS=Authors
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.content.
+SearchScope.CONTENTS=Page contents
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.attach.
+SearchScope.ATTACHMENTS=Attachments
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.pagename.. Formerly named SearchScope.PAGE_NAME.
+SearchScope.PAGE_NAMES=Page names

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties Thu Feb  4 05:17:20 2010
@@ -349,6 +349,20 @@
 org.apache.wiki.action.RenameActionBean.rename=Seite umbenennen
 #Formerly login.lostpw.submit. Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=Passwort zurücksetzen
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
+org.apache.wiki.action.SearchActionBean.go=Los!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
+org.apache.wiki.action.SearchActionBean.search=Finde!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.
+SearchScope.ALL=Suche überall
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.authors.
+SearchScope.AUTHORS=Autoren
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.content.
+SearchScope.CONTENTS=Inhalt der Seite
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.attach.
+SearchScope.ATTACHMENTS=Anhänge
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.pagename.. Formerly named SearchScope.PAGE_NAME.
+SearchScope.PAGE_NAMES=Name der Seite
 # Outdated or superfluous properties since 3.0.0
 
 # folgende Properties sind in der aktuellen 'default en' Datei nicht enthalten

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties Thu Feb  4 05:17:20 2010
@@ -351,3 +351,17 @@
 org.apache.wiki.action.RenameActionBean.rename=Renombrar página
 #Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=&#161;Resetear contraseña!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
+org.apache.wiki.action.SearchActionBean.go=&#161;Ir!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
+org.apache.wiki.action.SearchActionBean.search=&#161;Buscar!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.
+SearchScope.ALL=Buscar en todos lados
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.authors.
+SearchScope.AUTHORS=Autores
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.content.
+SearchScope.CONTENTS=Contenido de las Páginas
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.attach.
+SearchScope.ATTACHMENTS=Adjuntos
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.pagename.. Formerly named SearchScope.PAGE_NAME.
+SearchScope.PAGE_NAMES=Nombre de las Páginas

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties Thu Feb  4 05:17:20 2010
@@ -242,3 +242,17 @@
 org.apache.wiki.action.RenameActionBean.rename=Vaihda sivun nimeä
 #Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=Lähetä uusi salasana!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
+org.apache.wiki.action.SearchActionBean.go=Mene!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
+org.apache.wiki.action.SearchActionBean.search=Etsi!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.
+SearchScope.ALL=Etsi kaikkialta
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.authors.
+SearchScope.AUTHORS=Vain muokkaajat
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.content.
+SearchScope.CONTENTS=Vain sivujen sisältö
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.attach.
+SearchScope.ATTACHMENTS=Vain liitteet
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.pagename.. Formerly named SearchScope.PAGE_NAME.
+SearchScope.PAGE_NAMES=Vain sivujen nimet

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties Thu Feb  4 05:17:20 2010
@@ -257,3 +257,17 @@
 org.apache.wiki.action.RenameActionBean.rename=Renommer la page
 #Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=Réinitialiser le mot de passe !
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
+org.apache.wiki.action.SearchActionBean.go=Ouvrir le meilleur résultat !
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
+org.apache.wiki.action.SearchActionBean.search=Trouver !
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.
+SearchScope.ALL=Rechercher sur tout
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.authors.
+SearchScope.AUTHORS=Auteur
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.content.
+SearchScope.CONTENTS=Contenu de la page
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.attach.
+SearchScope.ATTACHMENTS=Attachements
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.pagename.. Formerly named SearchScope.PAGE_NAME.
+SearchScope.PAGE_NAMES=Nom de page

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties Thu Feb  4 05:17:20 2010
@@ -255,3 +255,17 @@
 org.apache.wiki.action.RenameActionBean.rename=Rinomina la pagina
 #Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=Cambia la password !
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
+org.apache.wiki.action.SearchActionBean.go=Vai!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
+org.apache.wiki.action.SearchActionBean.search=Cerca!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.
+SearchScope.ALL=Cerca ovunque
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.authors.
+SearchScope.AUTHORS=Autori
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.content.
+SearchScope.CONTENTS=Contenuto della pagina
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.attach.
+SearchScope.ATTACHMENTS=Allegati
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.pagename.. Formerly named SearchScope.PAGE_NAME.
+SearchScope.PAGE_NAMES=Nomi delle pagine

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties Thu Feb  4 05:17:20 2010
@@ -311,3 +311,17 @@
 org.apache.wiki.action.RenameActionBean.rename=Pagina Hernoemen
 #Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=Genereer een nieuw wachtwoord !
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
+org.apache.wiki.action.SearchActionBean.go=Ga!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
+org.apache.wiki.action.SearchActionBean.search=Zoek!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.
+SearchScope.ALL=Zoek criteria
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.authors.
+SearchScope.AUTHORS=Auteurs
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.content.
+SearchScope.CONTENTS=Pagina inhoud
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.attach.
+SearchScope.ATTACHMENTS=Bijlagen
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.pagename.. Formerly named SearchScope.PAGE_NAME.
+SearchScope.PAGE_NAMES=Pagina naam

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_pt_BR.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_pt_BR.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_pt_BR.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_pt_BR.properties Thu Feb  4 05:17:20 2010
@@ -195,3 +195,17 @@
 org.apache.wiki.content.inspect.AsirraCaptcha.adoptMe=Me adote
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named info.delete.submit.
 org.apache.wiki.action.DeleteActionBean.delete=Delete entire page
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
+org.apache.wiki.action.SearchActionBean.go=Go!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
+org.apache.wiki.action.SearchActionBean.search=Find!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.
+SearchScope.ALL=Search Everywhere
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.authors.
+SearchScope.AUTHORS=Authors
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.content.
+SearchScope.CONTENTS=Page Content
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.attach.
+SearchScope.ATTACHMENTS=Attachments
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.pagename.. Formerly named SearchScope.PAGE_NAME.
+SearchScope.PAGE_NAMES=Page Names

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties Thu Feb  4 05:17:20 2010
@@ -260,3 +260,17 @@
 org.apache.wiki.action.RenameActionBean.rename=\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443
 #Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c !
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
+org.apache.wiki.action.SearchActionBean.go=\u041f\u043e\u0435\u0445\u0430\u043b\u0438!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
+org.apache.wiki.action.SearchActionBean.search=\u041d\u0430\u0439\u0442\u0438!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.
+SearchScope.ALL=\u041f\u043e\u0438\u0441\u043a \u0432\u0435\u0437\u0434\u0435
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.authors.
+SearchScope.AUTHORS=\u0410\u0432\u0442\u043e\u0440\u044b
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.content.
+SearchScope.CONTENTS=\u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.attach.
+SearchScope.ATTACHMENTS=\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u044f
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.pagename.. Formerly named SearchScope.PAGE_NAME.
+SearchScope.PAGE_NAMES=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties Thu Feb  4 05:17:20 2010
@@ -347,3 +347,17 @@
 org.apache.wiki.action.RenameActionBean.rename=\u91cd\u547d\u540d\u9875\u9762
 #Formerly login.lostpw.submit. Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=\u91cd\u8bbe\u5bc6\u7801
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
+org.apache.wiki.action.SearchActionBean.go=\u8f6c\u5230\uff01
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
+org.apache.wiki.action.SearchActionBean.search=\u67e5\u627e\uff01
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.
+SearchScope.ALL=\u641c\u7d22\u6240\u6709\u6587\u6863
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.authors.
+SearchScope.AUTHORS=\u4f5c\u8005
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.content.
+SearchScope.CONTENTS=\u9875\u9762\u5185\u5bb9
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.attach.
+SearchScope.ATTACHMENTS=\u9644\u4ef6
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.pagename.. Formerly named SearchScope.PAGE_NAME.
+SearchScope.PAGE_NAMES=\u9875\u9762\u540d\u79f0

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=906368&r1=906367&r2=906368&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 Thu Feb  4 05:17:20 2010
@@ -103,14 +103,7 @@
 find.getprevious=Get previous {0} results
 find.getnext=Get next {0} results
 find.externalsearch=Try this same search on :
-find.submit.find=Find!
-find.submit.go=Go!
 find.details=Show details
-find.scope.all=Search Everywhere
-find.scope.authors=Authors
-find.scope.pagename=Page Names
-find.scope.content=Page Content
-find.scope.attach=Attachments
 # GroupContent.jsp
 
 group.tab=View group

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties Thu Feb  4 05:17:20 2010
@@ -119,14 +119,7 @@
 find.getprevious=vorherige {0} Ergebnisse
 find.getnext=nächste {0} Ergebnisse
 find.externalsearch=Stelle dieselbe Suchanfrage bei:
-find.submit.find=Finde!
-find.submit.go=Los!
 find.details=Zeige Details
-find.scope.all=Suche überall
-find.scope.authors=Autoren
-find.scope.pagename=Name der Seite
-find.scope.content=Inhalt der Seite
-find.scope.attach=Anhänge
 # GroupContent.jsp
 # if anything is changed here, it's likely that it's got to be changed in the sections
 # NewGroupContent.jsp, EditGroup.jsp and GroupTab.jsp, too.

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties Thu Feb  4 05:17:20 2010
@@ -102,14 +102,7 @@
 find.getprevious=Ir a los {0} resultados anteriores
 find.getnext=Ir a los próximos {0} resultados
 find.externalsearch=Prueba esta misma búsqueda en:
-find.submit.find=&#161;Buscar!
-find.submit.go=&#161;Ir!
 find.details=Ver detalles
-find.scope.all=Buscar en todos lados
-find.scope.authors=Autores
-find.scope.pagename=Nombre de las Páginas
-find.scope.content=Contenido de las Páginas
-find.scope.attach=Adjuntos
 # GroupContent.jsp
 
 group.tab=Ver Grupo

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties Thu Feb  4 05:17:20 2010
@@ -101,14 +101,7 @@
 find.getprevious=Hae edelliset {0} tulosta
 find.getnext=Hae seuraavat {0} tulosta
 find.externalsearch=Kokeile tätä samaa hakua muista palveluista :
-find.submit.find=Etsi!
-find.submit.go=Mene!
 find.details=Näytä yksityiskohdat
-find.scope.all=Etsi kaikkialta
-find.scope.authors=Vain muokkaajat
-find.scope.pagename=Vain sivujen nimet
-find.scope.content=Vain sivujen sisältö
-find.scope.attach=Vain liitteet
 # GroupContent.jsp
 
 group.tab=Näytä ryhmä

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties Thu Feb  4 05:17:20 2010
@@ -107,14 +107,7 @@
 find.getprevious=Aller aux {0} résultats précédents
 find.getnext=Aller aux {0} résultats suivants
 find.externalsearch=Essayez la même recherche sur :
-find.submit.find=Trouver !
-find.submit.go=Ouvrir le meilleur résultat !
 find.details=Montrer les détails
-find.scope.all=Rechercher sur tout
-find.scope.authors=Auteur
-find.scope.pagename=Nom de page
-find.scope.content=Contenu de la page
-find.scope.attach=Attachements
 # GroupContent.jsp
 
 group.tab=Voir le groupe

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties Thu Feb  4 05:17:20 2010
@@ -103,14 +103,7 @@
 find.getprevious=I precedenti {0} risultati
 find.getnext=I successivi {0} risultati
 find.externalsearch=Prova questa stessa ricerca su :
-find.submit.find=Cerca!
-find.submit.go=Vai!
 find.details=Mostra dettagli
-find.scope.all=Cerca ovunque
-find.scope.authors=Autori
-find.scope.pagename=Nomi delle pagine
-find.scope.content=Contenuto della pagina
-find.scope.attach=Allegati
 # GroupContent.jsp
 
 group.tab=Vedi il Gruppo

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=906368&r1=906367&r2=906368&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 Thu Feb  4 05:17:20 2010
@@ -104,14 +104,7 @@
 find.getprevious=Toon vorige {0} resultaten
 find.getnext=Toon volgende {0} resultaten
 find.externalsearch=Zoek ook op :
-find.submit.find=Zoek!
-find.submit.go=Ga!
 find.details=Toon details
-find.scope.all=Zoek criteria
-find.scope.authors=Auteurs
-find.scope.pagename=Pagina naam
-find.scope.content=Pagina inhoud
-find.scope.attach=Bijlagen
 # GroupContent.jsp
 
 group.tab=Toon Groep

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_pt_BR.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_pt_BR.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_pt_BR.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_pt_BR.properties Thu Feb  4 05:17:20 2010
@@ -109,14 +109,7 @@
 find.getprevious=Get previous {0} results
 find.getnext=Get next {0} results
 find.externalsearch=Try this same search on :
-find.submit.find=Find!
-find.submit.go=Go!
 find.details=Show details
-find.scope.all=Search Everywhere
-find.scope.authors=Authors
-find.scope.pagename=Page Names
-find.scope.content=Page Content
-find.scope.attach=Attachments
 # GroupContent.jsp
 
 group.tab=View Group

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties Thu Feb  4 05:17:20 2010
@@ -102,14 +102,7 @@
 find.getprevious=\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u043f\u0440\u0435\u044b\u0434\u0443\u0449\u0438\u0435 {0} \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u044b
 find.getnext=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u043c {0} \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430\u043c
 find.externalsearch=\u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u043f\u043e\u0438\u0441\u043a\u0430\u0442\u044c :
-find.submit.find=\u041d\u0430\u0439\u0442\u0438!
-find.submit.go=\u041f\u043e\u0435\u0445\u0430\u043b\u0438!
 find.details=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0434\u0435\u0442\u0430\u043b\u0438
-find.scope.all=\u041f\u043e\u0438\u0441\u043a \u0432\u0435\u0437\u0434\u0435
-find.scope.authors=\u0410\u0432\u0442\u043e\u0440\u044b
-find.scope.pagename=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446
-find.scope.content=\u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b
-find.scope.attach=\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u044f
 # GroupContent.jsp
 
 group.tab=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0433\u0440\u0443\u043f\u043f\u044b

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties?rev=906368&r1=906367&r2=906368&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties Thu Feb  4 05:17:20 2010
@@ -103,14 +103,7 @@
 find.getprevious=\u83b7\u5f97\u524d {0} \u4e2a\u7ed3\u679c
 find.getnext=\u83b7\u5f97\u540e {0} \u4e2a\u7ed3\u679c
 find.externalsearch=\u5c1d\u8bd5\u5728\u4ee5\u4e0b\u5730\u65b9\u8fdb\u884c\u76f8\u540c\u7684\u641c\u7d22\uff1a
-find.submit.find=\u67e5\u627e\uff01
-find.submit.go=\u8f6c\u5230\uff01
 find.details=\u663e\u793a\u8be6\u7ec6\u4fe1\u606f
-find.scope.all=\u641c\u7d22\u6240\u6709\u6587\u6863
-find.scope.authors=\u4f5c\u8005
-find.scope.pagename=\u9875\u9762\u540d\u79f0
-find.scope.content=\u9875\u9762\u5185\u5bb9
-find.scope.attach=\u9644\u4ef6
 # GroupContent.jsp
 
 group.tab=\u67e5\u770b\u7ec4