jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajaqu...@apache.org
Subject svn commit: r822983 - in /incubator/jspwiki/trunk/src/WebContent: WEB-INF/classes/ WEB-INF/classes/templates/ templates/default/editors/
Date Thu, 08 Oct 2009 01:10:46 GMT
Author: ajaquith
Date: Thu Oct  8 01:10:45 2009
New Revision: 822983

URL: http://svn.apache.org/viewvc?rev=822983&view=rev
Log:
Plain editor and related bundle messages slightly refactored to make the JSP markup more concise
and logical. Certain JavaScript hooks are broken; I'll need to work with Dirk to fix this.

Modified:
    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
    incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp

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=822983&r1=822982&r2=822983&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties Thu Oct
 8 01:10:45 2009
@@ -280,8 +280,6 @@
 newgroup.name=Name
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 common.nopage=This page does not exist.  Why don’t you go and {0}?
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.
-org.apache.wiki.action.ViewActionBean.delete=Rename page
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.deleteattachment.submit.
 org.apache.wiki.action.ViewActionBean.deleteAttachment=Delete attachment
 version.invalid=Version {1} does not exist.
@@ -298,8 +296,6 @@
 edit.restoring=You are about to restore version {2}. Click on “Save”
to restore.  You may also edit the page before restoring it.
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.sneakpreview.
 livePreview=Live preview
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.
-changenote=Change note
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.name.
 author=Your <span class='accesskey'>n</span>ame
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.save.submit.
@@ -343,3 +339,9 @@
 ldap.showConfig=Configure LDAP...
 #Formerly named install.jsp.basics.page.storage.label.. Formerly named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
 properties.priha.priha_provider_defaultProvider_directory=Page storage
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.
+org.apache.wiki.action.ViewActionBean.rename=Rename page
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.. Formerly named changenote.
+changeNote=Change note
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.find.submit.
+org.apache.wiki.action.EditActionBean.findAndReplace=Replace

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=822983&r1=822982&r2=822983&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
Oct  8 01:10:45 2009
@@ -284,8 +284,6 @@
 newgroup.name=Name
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 common.nopage=Diese Seite existiert nicht. {0} sie doch einfach!
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.
-org.apache.wiki.action.ViewActionBean.delete=Seite umbenennen
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.deleteattachment.submit.
 org.apache.wiki.action.ViewActionBean.deleteAttachment=Lösche Anhang
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
attach.add.submit.
@@ -300,8 +298,6 @@
 edit.restoring=Soll die Version {2} wiederhergestellt werden? Falls ja, klicke auf 'Speichern'!
Die Seite kann auch vorher noch bearbeitet werden.
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.sneakpreview.
 livePreview=Schnellvorschau
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.
-changenote=Kommentar:
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.name.
 author=Dein <span class='accesskey'>N</span>ame
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.save.submit.
@@ -322,6 +318,12 @@
 logDirectory=Log-Dateien
 #Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.. Formerly
named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
 properties.priha.priha_provider_defaultProvider_directory=Seitenspeicherung
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.
+org.apache.wiki.action.ViewActionBean.rename=Seite umbenennen
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.. Formerly named changenote.
+changeNote=Kommentar:
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.find.submit.
+org.apache.wiki.action.EditActionBean.findAndReplace=Ersetzen!
 # 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=822983&r1=822982&r2=822983&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
Oct  8 01:10:45 2009
@@ -189,8 +189,6 @@
 newgroup.name=Nombre
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 common.nopage=Esta página no existe. &#191;Por qué no vas y {0}?
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.
-org.apache.wiki.action.ViewActionBean.delete=Renombrar página
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.deleteattachment.submit.
 org.apache.wiki.action.ViewActionBean.deleteAttachment=Borrar adjunto
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
attach.add.submit.
@@ -205,8 +203,6 @@
 edit.restoring=Estás apunto de restaurar la versión {2}.  Haz click en &#8220;Guardar&#8221;
para restaurarla.  También puedes editar la página antes de hacerlo.
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.sneakpreview.
 livePreview=Vista rápida de la edición
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.
-changenote=Nota de Cambio
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.name.
 author=Tu <span class='accesskey'>n</span>ombre
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.save.submit.
@@ -227,3 +223,9 @@
 logDirectory=Ficheros de log
 #Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.. Formerly
named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
 properties.priha.priha_provider_defaultProvider_directory=Almacenamiento de páginas
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.
+org.apache.wiki.action.ViewActionBean.rename=Renombrar página
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.. Formerly named changenote.
+changeNote=Nota de Cambio
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.find.submit.
+org.apache.wiki.action.EditActionBean.findAndReplace=Reemplazar

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=822983&r1=822982&r2=822983&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
Oct  8 01:10:45 2009
@@ -178,8 +178,6 @@
 newgroup.name=Ryhmän nimi
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 common.nopage=Tätä sivua ei ole luotu.  Mikset siis {0}?
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.
-org.apache.wiki.action.ViewActionBean.delete=Vaihda sivun nimeä
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.deleteattachment.submit.
 org.apache.wiki.action.ViewActionBean.deleteAttachment=Poista liitetiedosto
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
attach.add.submit.
@@ -194,8 +192,6 @@
 edit.restoring=Olet palauttamassa versiota {2}.  Paina &quot;Tallenna&quot; palauttaaksesi.
Voit myös muokata sivua ennen kuin tallennat.
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.sneakpreview.
 livePreview=Pikaesikatselu
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.
-changenote=Päivitystieto
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.name.
 author=Nimesi
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.save.submit.
@@ -216,3 +212,9 @@
 logDirectory=Lokitiedostot
 #Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.. Formerly
named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
 properties.priha.priha_provider_defaultProvider_directory=Tallennushakemisto
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.
+org.apache.wiki.action.ViewActionBean.rename=Vaihda sivun nimeä
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.. Formerly named changenote.
+changeNote=Päivitystieto
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.find.submit.
+org.apache.wiki.action.EditActionBean.findAndReplace=Korvaa

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=822983&r1=822982&r2=822983&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
Oct  8 01:10:45 2009
@@ -190,8 +190,6 @@
 newgroup.name=Nom
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 common.nopage=La page n''existe pas. Pourquoi ne pas {0} ?
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.
-org.apache.wiki.action.ViewActionBean.delete=Renommer la page
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.deleteattachment.submit.
 org.apache.wiki.action.ViewActionBean.deleteAttachment=Supprimer attachement
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
attach.add.submit.
@@ -206,8 +204,6 @@
 edit.restoring=Vous êtes sur le point de restaurer la version {2}. Cliquez sur \u201cEnregistrer\u201d
pour restaurer. Vous pouvez aussi éditer la page avant de la restaurer.
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.sneakpreview.
 livePreview=Aperçu rapide
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.
-changenote=Note de changement
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.name.
 author=Votre <span class='accesskey'>n</span>om
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.save.submit.
@@ -228,4 +224,10 @@
 logDirectory=Fichiers de journalisation
 #Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.. Formerly
named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
 properties.priha.priha_provider_defaultProvider_directory=Stockage des pages
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.
+org.apache.wiki.action.ViewActionBean.rename=Renommer la page
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.. Formerly named changenote.
+changeNote=Note de changement
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.find.submit.
+org.apache.wiki.action.EditActionBean.findAndReplace=Remplacer
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.save.title.

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=822983&r1=822982&r2=822983&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
Oct  8 01:10:45 2009
@@ -188,8 +188,6 @@
 newgroup.name=Nome
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 common.nopage=Questa pagina non esiste ancora. Perch&egrave; non la {0}?
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.
-org.apache.wiki.action.ViewActionBean.delete=Rinomina la pagina
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.deleteattachment.submit.
 org.apache.wiki.action.ViewActionBean.deleteAttachment=Elimina l&#8217;allegato
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
attach.add.submit.
@@ -204,8 +202,6 @@
 edit.restoring=Stai per ripristinare la versione {2}. Click su &#8220;Salva&#8221;
per ripristinare.  Puoi anche modificare la pagina prima di ripristinarla.
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.sneakpreview.
 livePreview=Anteprima
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.
-changenote=Nota alla revisione
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.name.
 author=Il tuo <span class='accesskey'>n</span>ome
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.save.submit.
@@ -226,4 +222,10 @@
 logDirectory=File di Log
 #Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.. Formerly
named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
 properties.priha.priha_provider_defaultProvider_directory=Memorizzazione delle pagine
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.
+org.apache.wiki.action.ViewActionBean.rename=Rinomina la pagina
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.. Formerly named changenote.
+changeNote=Nota alla revisione
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.find.submit.
+org.apache.wiki.action.EditActionBean.findAndReplace=Sostituisci
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.save.title.

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=822983&r1=822982&r2=822983&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
Oct  8 01:10:45 2009
@@ -186,8 +186,6 @@
 newgroup.name=Naam
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 common.nopage=Deze pagina bestaat niet.  Klik hier om deze nieuwe pagina {0}.
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.
-org.apache.wiki.action.ViewActionBean.delete=Pagina Hernoemen
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.deleteattachment.submit.
 org.apache.wiki.action.ViewActionBean.deleteAttachment=Verwijder bijlage
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
attach.add.submit.
@@ -237,8 +235,6 @@
 edit.restoring=De actie herstelt versie {2} van deze pagina. Klik op &#8220;Bewaar&#8221;
om te herstellen. U kan de pagina ook nog bewerken indien U dat wenst.
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.sneakpreview.
 livePreview=Sneak Preview
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.
-changenote=Opmerking
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.name.
 author=Uw <span class='accesskey'>n</span>aam
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.save.submit.
@@ -259,3 +255,9 @@
 logDirectory=Log files
 #Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.. Formerly
named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
 properties.priha.priha_provider_defaultProvider_directory=Pagina opslag
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.
+org.apache.wiki.action.ViewActionBean.rename=Pagina Hernoemen
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.. Formerly named changenote.
+changeNote=Opmerking
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.find.submit.
+org.apache.wiki.action.EditActionBean.findAndReplace=Vervang

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=822983&r1=822982&r2=822983&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 Oct  8 01:10:45 2009
@@ -168,3 +168,5 @@
 logDirectory=Arquivos de log
 #Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.. Formerly
named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
 properties.priha.priha_provider_defaultProvider_directory=Armazenamento de página
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.find.submit.
+org.apache.wiki.action.EditActionBean.findAndReplace=Replace

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=822983&r1=822982&r2=822983&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
Oct  8 01:10:45 2009
@@ -194,8 +194,6 @@
 newgroup.name=\u0418\u043c\u044f
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 common.nopage=\u042d\u0442\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u043d\u0435
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.  \u041f\u043e\u0447\u0435\u043c\u0443
\u0431\u044b \u0432\u0430\u043c \u0435\u0435 \u043d\u0435 \u0441\u043e\u0437\u0434\u0430\u0442\u044c
{0}?
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.
-org.apache.wiki.action.ViewActionBean.delete=\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.deleteattachment.submit.
 org.apache.wiki.action.ViewActionBean.deleteAttachment=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
\u043f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u0435
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
attach.add.submit.
@@ -210,8 +208,6 @@
 edit.restoring=\u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0430\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0432\u0435\u0440\u0441\u0438\u044e  {2}. \u0414\u043b\u044f \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f
\u0432\u044b\u0431\u043e\u0440\u0430 \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 &#8220;\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c&#8221;.
\u0422\u0430\u043a\u0436\u0435 \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0441\u043f\u0435\u0440\u0432\u0430
\u0435\u0451 \u043e\u0442\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c.

 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.sneakpreview.
 livePreview=\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439
\u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.
-changenote=\u0418\u0437\u043c\u0438\u043d\u0435\u043d\u0438\u044f
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.name.
 author=\u0412\u0430\u0448\u0435 <span class='accesskey'>\u0438</span>\u043c\u044f
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.save.submit.
@@ -232,3 +228,9 @@
 logDirectory=\u0416\u0443\u0440\u043d\u0430\u043b \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439
(\u043b\u043e\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435)
 #Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.. Formerly
named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
 properties.priha.priha_provider_defaultProvider_directory=\u0425\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435
\u0441\u0442\u0440\u0430\u043d\u0438\u0446 
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.
+org.apache.wiki.action.ViewActionBean.rename=\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.. Formerly named changenote.
+changeNote=\u0418\u0437\u043c\u0438\u043d\u0435\u043d\u0438\u044f
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.find.submit.
+org.apache.wiki.action.EditActionBean.findAndReplace=\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c

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=822983&r1=822982&r2=822983&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 Oct  8 01:10:45 2009
@@ -281,8 +281,6 @@
 newgroup.name=\u540d\u5b57
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 common.nopage=\u8be5\u9875\u4e0d\u5b58\u5728\u3002\u4e3a\u4ec0\u4e48\u4e0d{0}\uff1f
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.
-org.apache.wiki.action.ViewActionBean.delete=\u91cd\u547d\u540d\u9875\u9762
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.deleteattachment.submit.
 org.apache.wiki.action.ViewActionBean.deleteAttachment=\u5220\u9664\u9644\u4ef6
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
attach.add.submit.
@@ -297,8 +295,6 @@
 edit.restoring=\u5c06\u6062\u590d\u7248\u672c {2}\u3002\u5355\u51fb\u201c\u4fdd\u5b58\u201d\u6765\u8fdb\u884c\u6062\u590d\u3002\u4e5f\u53ef\u4ee5\u5728\u6062\u590d\u9875\u9762\u524d\u8fdb\u884c\u7f16\u8f91\u3002
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.sneakpreview.
 livePreview=\u62a2\u5148\u9884\u89c8
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.
-changenote=\u66f4\u6539\u6ce8\u91ca
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.name.
 author=\u60a8\u7684\u540d\u79f0(<span class='accesskey'>N</span>)
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.save.submit.
@@ -319,4 +315,10 @@
 logDirectory=\u65e5\u5fd7\u6587\u4ef6
 #Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.. Formerly
named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
 properties.priha.priha_provider_defaultProvider_directory=\u9875\u9762\u5b58\u50a8
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.
+org.apache.wiki.action.ViewActionBean.rename=\u91cd\u547d\u540d\u9875\u9762
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.changenote.. Formerly named changenote.
+changeNote=\u66f4\u6539\u6ce8\u91ca
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.find.submit.
+org.apache.wiki.action.EditActionBean.findAndReplace=\u66ff\u6362
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
editor.plain.save.title.

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=822983&r1=822982&r2=822983&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
Oct  8 01:10:45 2009
@@ -393,7 +393,6 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}: {1}
-editor.plain.email=Homepage or e<span class='accesskey'>m</span>ail
 editor.plain.save.title=Save [ s ]
 editor.plain.preview.title=Preview [ v ]
 editor.plain.cancel.title=Cancel editing. Your changes will be lost. [ q ]
@@ -410,7 +409,6 @@
 editor.plain.matchcase=Match Case
 editor.plain.regexp=RegExp
 editor.plain.global=Replace all
-editor.plain.find.submit=Replace
 editor.plain.redo.submit=Redo
 editor.plain.undo.submit=Undo
 editor.plain.redo.title=Redo last Undo

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=822983&r1=822982&r2=822983&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 Oct  8 01:10:45 2009
@@ -411,7 +411,6 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}: {1}
-editor.plain.email=Homepage oder E-<span class='accesskey'>M</span>ail
 editor.plain.save.title=Speichern [ s ]
 editor.plain.preview.title=Vorschau [ v ]
 editor.plain.cancel.title=Bearbeiten abbrechen. Deine Änderungen gehen dabei verloren. [
q ]
@@ -422,7 +421,6 @@
 editor.plain.matchcase=Groß-/Kleinschreibung beachten
 editor.plain.regexp=Reguläre Ausdrücke
 editor.plain.global=Alle ersetzen
-editor.plain.find.submit=Ersetzen!
 editor.plain.redo.submit=Wiederherstellen
 editor.plain.undo.submit=Rückgängig
 editor.plain.redo.title=Wiederherstellen des letzten Rücksetzens

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=822983&r1=822982&r2=822983&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 Oct  8 01:10:45 2009
@@ -389,7 +389,6 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}: {1}
-editor.plain.email=Página personal o e-<span class='accesskey'>m</span>ail
 editor.plain.save.title=Guardar [ s ]
 editor.plain.preview.title=Previsualizar [ v ]
 editor.plain.cancel.title=Cancelar la edición. Tus cambios se perderán. [ q ]
@@ -400,7 +399,6 @@
 editor.plain.matchcase=Sensible a mayúsculas/minúsculas
 editor.plain.regexp=ExpReg
 editor.plain.global=Reemplazar todas
-editor.plain.find.submit=Reemplazar
 editor.plain.redo.submit=Rehacer
 editor.plain.undo.submit=Deshacer
 editor.plain.redo.title=Rehacer último reemplazo

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=822983&r1=822982&r2=822983&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 Oct  8 01:10:45 2009
@@ -380,7 +380,6 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}: {1}
-editor.plain.email=Kotisivu tai sähköposti
 editor.plain.save.title=Tallenna [s]
 editor.plain.preview.title=Esikatsele [v]
 editor.plain.cancel.title=Peruuta muokkaus.  Muutokset menetetään. [ q ]
@@ -390,7 +389,6 @@
 editor.plain.matchcase=ABC=abc
 editor.plain.regexp=Regexp
 editor.plain.global=Korvaa kaikki
-editor.plain.find.submit=Korvaa
 editor.plain.redo.submit=Tee sittenkin
 editor.plain.redo.title=Tee uudelleen edellinen peruminen
 editor.plain.undo.submit=Peru

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=822983&r1=822982&r2=822983&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 Oct  8 01:10:45 2009
@@ -392,7 +392,6 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0} : {1}
-editor.plain.email=Page d'accueil ou adresse e-<span class='accesskey'>m</span>ail
 editor.plain.save.title=Enregistrer [ s ]
 editor.plain.preview.title=Aperçu [ p ]
 editor.plain.cancel.title=Abandonner l'édition. Vos modifications seront perdues. [ q ]
@@ -403,7 +402,6 @@
 editor.plain.matchcase=Sensible à la casse
 editor.plain.regexp=RegExp
 editor.plain.global=Remplacer tout
-editor.plain.find.submit=Remplacer
 editor.plain.redo.submit=Refaire
 editor.plain.undo.submit=Défaire
 editor.plain.redo.title=Refaire la dernière opération annulée

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=822983&r1=822982&r2=822983&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 Oct  8 01:10:45 2009
@@ -386,7 +386,6 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}: {1}
-editor.plain.email=Homepage o e<span class='accesskey'>m</span>ail
 editor.plain.save.title=Salva [ s ]
 editor.plain.preview.title=Anteprima [ v ]
 editor.plain.cancel.title=Annulla. Le modifiche saranno perdute. [ q ]
@@ -397,7 +396,6 @@
 editor.plain.matchcase=Controlla maiuscole
 editor.plain.regexp=RegExp
 editor.plain.global=Sostituisci tutto
-editor.plain.find.submit=Sostituisci
 editor.plain.redo.submit=Redo
 editor.plain.undo.submit=Undo
 editor.plain.redo.title=Redo l'ultimo Undo

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=822983&r1=822982&r2=822983&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 Oct  8 01:10:45 2009
@@ -388,7 +388,6 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}: {1}
-editor.plain.email=Homepagina of e<span class='accesskey'>m</span>ail
 editor.plain.save.title=Bewaar [ e ]
 editor.plain.preview.title=Preview [ v ]
 editor.plain.cancel.title=Annuleer. Uw wijzigingen worden niet bewaard. [ q ]
@@ -399,7 +398,6 @@
 editor.plain.matchcase=Match Case
 editor.plain.regexp=RegExp
 editor.plain.global=Vervang alle
-editor.plain.find.submit=Vervang
 editor.plain.redo.submit=Opnieuw
 editor.plain.undo.submit=Herstel
 editor.plain.redo.title=Voer laaste herstelactie opnieuw uit

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=822983&r1=822982&r2=822983&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 Oct  8 01:10:45 2009
@@ -425,7 +425,6 @@
 
 editor.plain.name=Your <span class='accesskey'>n</span>ame
 editor.plain.remember=Remember me?
-editor.plain.email=Homepage or e<span class='accesskey'>m</span>ail
 editor.plain.save.submit=Save
 editor.plain.save.title=Save [ s ]
 editor.plain.preview.submit=Preview
@@ -440,7 +439,6 @@
 editor.plain.matchcase=Match Case
 editor.plain.regexp=RegExp
 editor.plain.global=Replace all
-editor.plain.find.submit=Replace
 editor.plain.redo.submit=Redo
 editor.plain.undo.submit=Undo
 editor.plain.redo.title=Redo last Undo

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=822983&r1=822982&r2=822983&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 Oct  8 01:10:45 2009
@@ -393,7 +393,6 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}: {1}
-editor.plain.email=\u0414\u043e\u043c. \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u0438\u043b\u0438
or e<span class='accesskey'>\u043c</span>\u0435\u0439\u043b
 editor.plain.save.title=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c [ s ]
 editor.plain.preview.title=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 [ v ]
 editor.plain.cancel.title=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435.
\u0412\u0430\u0448\u0438 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0431\u0443\u0434\u0443\u0442
\u043f\u043e\u0442\u0435\u0440\u044f\u043d\u044b. [ q ]
@@ -404,7 +403,6 @@
 editor.plain.matchcase=\u0421\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u044f
 editor.plain.regexp=\u0420\u0430\u0437\u043b\u0438\u0447\u0430\u0442\u044c \u0440\u0435\u0433\u0438\u0441\u0442\u0440
 editor.plain.global=\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0441\u0451
-editor.plain.find.submit=\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c
 editor.plain.redo.submit=\u041f\u0435\u0440\u0435\u0439\u0442\u0438
 editor.plain.undo.submit=\u0412\u0435\u0440\u043d\u0443\u0442\u0441\u044f
 editor.plain.redo.title=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u043c\u0443

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=822983&r1=822982&r2=822983&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 Oct  8 01:10:45 2009
@@ -393,7 +393,6 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}\uff1a{1}
-editor.plain.email=\u4e3b\u9875\u6216\u7535\u5b50\u90ae\u4ef6(<span class='accesskey'>M</span>)
 editor.plain.save.title=\u4fdd\u5b58 [ s ]
 editor.plain.preview.title=\u9884\u89c8 [ v ]
 editor.plain.cancel.title=\u53d6\u6d88\u7f16\u8f91\u3002\u60a8\u6240\u505a\u7684\u66f4\u6539\u5c06\u4e22\u5931\u3002[
q ]
@@ -404,7 +403,6 @@
 editor.plain.matchcase=\u5339\u914d\u5927\u5c0f\u5199
 editor.plain.regexp=\u6b63\u5219\u8868\u8fbe\u5f0f
 editor.plain.global=\u5168\u90e8\u66ff\u6362
-editor.plain.find.submit=\u66ff\u6362
 editor.plain.redo.submit=\u91cd\u505a
 editor.plain.undo.submit=\u64a4\u9500
 editor.plain.redo.title=\u91cd\u505a\u4e0a\u6b21\u64a4\u9500

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp?rev=822983&r1=822982&r2=822983&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp Thu Oct  8
01:10:45 2009
@@ -69,24 +69,24 @@
     <table>
       <tr>
         <td>
-          <s:label for="changenote" name="changenote" />
+          <s:label for="changeNote" />
         </td>
         <td>
-          <s:text name="changenote" id="changenote" size="50" maxlength="80" />
+          <s:text name="changeNote" size="50" maxlength="80" />
         </td>
       </tr>
 
       <wiki:CheckRequestContext context="comment">
       <tr>
-        <td><s:label for="author" accesskey="n" name="author" /></td>
-        <td><s:text id="author" name="author" />
-            <s:checkbox id="remember" name="remember" />
-            <s:label for="remember" name="remember" />
+        <td><s:label for="author" accesskey="n" /></td>
+        <td><s:text name="author" />
+            <s:checkbox name="remember" />
+            <s:label for="remember" />
         </td>
       </tr>
       <tr>
-        <td><s:label for="link" accesskey="m" name="editor.plain.email" /></td>
-        <td><s:text id="link" name="link" size="24" /></td>
+        <td><s:label for="email" accesskey="m" /></td>
+        <td><s:text name="email" size="24" /></td>
       </tr>
       </wiki:CheckRequestContext>
 
@@ -96,11 +96,9 @@
     <div id="toolbar" class="line">
 
     <div id="configDialog" style="display:none;">
-      <label for="tabcompletion" title="<fmt:message key='editor.plain.tabcompletion.title'/>">
-      <input type="checkbox" name="tabcompletion" id="tabcompletion" /><fmt:message
key="editor.plain.tabcompletion"/></label>
+      <s:checkbox name="options.tabCompletion" id="tabCompletion" /><fmt:message
key="editor.plain.tabcompletion"/>
       <br />
-      <label for="smartpairs" title="<fmt:message key='editor.plain.smartpairs.title'/>">
-      <input type="checkbox" name="smartpairs" id="smartpairs" /><fmt:message key="editor.plain.smartpairs"/></label>
+      <s:checkbox name="options.smartPairs" id="smartPairs" /><fmt:message key="editor.plain.smartpairs"/>
     </div>
 
     <fieldset class="unit">
@@ -159,26 +157,17 @@
 
       <a href="#" class="tool tHORZ" title="<fmt:message key='editor.plain.tbHORZ.title'/>">tile-horz</a>
       <a href="#" class="tool tVERT" title="<fmt:message key='editor.plain.tbVERT.title'/>">tile-vert</a>
-      <label for="autopreview" title="<fmt:message key='editor.plain.livepreview.title'/>">
-      <input type="checkbox" name="autopreview" id="autopreview" <%=TextUtil.isPositive((String)session.getAttribute("autopreview"))
? "checked='checked'" : ""%> />On</label>
-
+      <label for="options.livePreview" title="<fmt:message key='editor.plain.livepreview.title'/>">
+      <s:checkbox name="options.livePreview" />On
     </fieldset>
 
     <div id="findDialog" style="display:none;clear:both;">
-      <%--<label for="tbFIND" ><fmt:message key="editor.plain.find"/>--%>
       <input type="text" name="tbFIND" id="tbFIND" size="16" value="find"/>
-      <%--</label>--%>
-      <label for="tbMatchCASE"><input type="checkbox" name="tbMatchCASE" id="tbMatchCASE"
/>
-        <fmt:message key="editor.plain.matchcase"/></label>
-    	<label for="tbREGEXP" ><input type="checkbox" name="tbREGEXP" id="tbREGEXP"
/>
-    	  <fmt:message key="editor.plain.regexp"/></label>
-
-      <%--<label for="tbREPLACE" ><fmt:message key="editor.plain.replace"/>--%>
-        <input type="text" name="tbREPLACE" id="tbREPLACE" size="16" />
-      <%--</label>--%>
-      <a class="btn" id="doreplace"><span><span><fmt:message key='editor.plain.find.submit'
/></span></span></a>
-    	<label for="tbGLOBAL"><input type="checkbox" name="tbGLOBAL" id="tbGLOBAL"
checked="checked" />
-    	  <fmt:message key="editor.plain.global"/></label>
+      <s:checkbox name="options.findMatchCase" /><fmt:message key="editor.plain.matchcase"/>
+      <s:checkbox name="options.findRegex" /><fmt:message key="editor.plain.regexp"/>
+      <input type="text" name="tbREPLACE" id="tbREPLACE" size="16" />
+      <s:button class="btn" id="doreplace" name="findAndReplace" />
+      s:checkbox name="options.findGlobal" /><fmt:message key="editor.plain.global"/>
     </div>
 
     </div><%-- end of the toolbar --%>



Mime
View raw message