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 2009/09/08 05:43:40 UTC

svn commit: r812334 [1/2] - in /incubator/jspwiki/trunk: ./ src/WebContent/WEB-INF/classes/ src/WebContent/WEB-INF/classes/templates/ src/WebContent/admin/ src/java/org/apache/wiki/ src/java/org/apache/wiki/action/ src/java/org/apache/wiki/auth/ src/ja...

Author: ajaquith
Date: Tue Sep  8 03:43:37 2009
New Revision: 812334

URL: http://svn.apache.org/viewvc?rev=812334&view=rev
Log:
Fixing a few stray bugs, and a bit of tidying up: resource bundles, comments, method names, etc. One notable bug remains: Priha page directory move after install does NOT work.

Added:
    incubator/jspwiki/trunk/src/WebContent/admin/InstallSuccess.jsp
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
    incubator/jspwiki/trunk/src/WebContent/admin/Install.jsp
    incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/action/InstallActionBean.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/LdapConfig.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/authorize/LdapAuthorizer.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/LdapAuthorizerTest.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=812334&r1=812333&r2=812334&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Sep  8 03:43:37 2009
@@ -1,3 +1,10 @@
+2009-08-16 Andrew Jaquith <ajaquith AT apache DOT org>
+
+        * 3.0.0-svn-153
+
+        * Fixing a few stray bugs, and a bit of tidying up: resource
+        bundles, comments, method names, etc.
+        
 2009-08-15 Andrew Jaquith <ajaquith AT apache DOT org>
 
         * 3.0.0-svn-152

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=812334&r1=812333&r2=812334&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties Tue Sep  8 03:43:37 2009
@@ -319,25 +319,27 @@
 org.apache.wiki.action.InstallActionBean.testLdapRoles=Test role lookups
 Default.ACTIVE_DIRECTORY=Active Directory
 Default.OPEN_LDAP=OpenLDAP
-bindDNpassword=Password
 test.connection=Test connection
 ldap.results=Results
 org.apache.wiki.action.AdminActionBean.unlock=Unlock keychain
 #Formerly named install.jsp.basics.appname.label.
-properties.jspwiki.jspwiki_applicationName=Application Name
+properties.jspwiki.jspwiki_applicationName=Wiki name
 #Formerly named install.jsp.basics.baseurl.label.
 properties.jspwiki.jspwiki_baseURL=Base URL
-#Formerly named install.jsp.basics.page.storage.label.
-properties.jspwiki.jspwiki_fileSystemProvider_pageDir=Page storage
-#Formerly named install.jsp.adv.settings.logfile.label.
-properties.log4j.log4j_appender_FileLog_File=Log files
 #Formerly named install.jsp.adv.settings.workdir.label.
 properties.jspwiki.jspwiki_workDir=Work directory
 properties.jspwiki.ldap_config=Server type
 properties.jspwiki.ldap_connectionURL=Connection URL
 properties.jspwiki.ldap_authentication=Authentication
 properties.jspwiki.ldap_ssl=Use SSL?
-properties.jspwiki.ldap_bindDN=Bind as user
 properties.jspwiki.ldap_userBase=User base
 properties.jspwiki.ldap_roleBase=Role base
 adminPassword=Admin password
+properties.jspwiki.ldap_bindUser=Bind as user
+bindPassword=Password
+#Formerly named install.jsp.adv.settings.logfile.label.
+logDirectory=Log directory
+properties.jspwiki.jspwiki_userdatabase=User database
+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

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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -316,12 +316,12 @@
 properties.jspwiki.jspwiki_applicationName=Anwendungsname
 #Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL.
 properties.jspwiki.jspwiki_baseURL=Basis-URL
-#Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.
-properties.jspwiki.jspwiki_fileSystemProvider_pageDir=Seitenspeicherung
-#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.
-properties.log4j.log4j_appender_FileLog_File=Log-Dateien
 #Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir.
 properties.jspwiki.jspwiki_workDir=Arbeitsverzeichnis
+#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.. Formerly named properties.log4j.log4j_appender_FileLog_File.
+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
 # 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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -221,9 +221,9 @@
 properties.jspwiki.jspwiki_applicationName=Nombre de la Aplicación
 #Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL.
 properties.jspwiki.jspwiki_baseURL=URL base
-#Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.
-properties.jspwiki.jspwiki_fileSystemProvider_pageDir=Almacenamiento de páginas
-#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.
-properties.log4j.log4j_appender_FileLog_File=Ficheros de log
 #Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir.
 properties.jspwiki.jspwiki_workDir=Directorio de trabajo
+#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.. Formerly named properties.log4j.log4j_appender_FileLog_File.
+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

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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -210,9 +210,9 @@
 properties.jspwiki.jspwiki_applicationName=Sovelluksen nimi
 #Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL.
 properties.jspwiki.jspwiki_baseURL=Perus-URL
-#Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.
-properties.jspwiki.jspwiki_fileSystemProvider_pageDir=Tallennushakemisto
-#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.
-properties.log4j.log4j_appender_FileLog_File=Lokitiedostot
 #Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir.
 properties.jspwiki.jspwiki_workDir=Työhakemisto
+#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.. Formerly named properties.log4j.log4j_appender_FileLog_File.
+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

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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -222,10 +222,10 @@
 properties.jspwiki.jspwiki_applicationName=Nom de l'application
 #Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL.
 properties.jspwiki.jspwiki_baseURL=URL de base
-#Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.
-properties.jspwiki.jspwiki_fileSystemProvider_pageDir=Stockage des pages
-#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.
-properties.log4j.log4j_appender_FileLog_File=Fichiers de journalisation
 #Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir.
 properties.jspwiki.jspwiki_workDir=Répertoire de travail
+#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.. Formerly named properties.log4j.log4j_appender_FileLog_File.
+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 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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -220,10 +220,10 @@
 properties.jspwiki.jspwiki_applicationName=Nome dell' Applicazione
 #Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL.
 properties.jspwiki.jspwiki_baseURL=Base URL
-#Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.
-properties.jspwiki.jspwiki_fileSystemProvider_pageDir=Memorizzazione delle pagine
-#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.
-properties.log4j.log4j_appender_FileLog_File=File di Log
 #Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir.
 properties.jspwiki.jspwiki_workDir=Directory di lavoro
+#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.. Formerly named properties.log4j.log4j_appender_FileLog_File.
+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 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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -253,9 +253,9 @@
 properties.jspwiki.jspwiki_applicationName=Applicatie naam
 #Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL.
 properties.jspwiki.jspwiki_baseURL=Base URL
-#Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.
-properties.jspwiki.jspwiki_fileSystemProvider_pageDir=Pagina opslag
-#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.
-properties.log4j.log4j_appender_FileLog_File=Log files
 #Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir.
 properties.jspwiki.jspwiki_workDir=Work directory
+#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.. Formerly named properties.log4j.log4j_appender_FileLog_File.
+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

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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -162,9 +162,9 @@
 properties.jspwiki.jspwiki_applicationName=Nome da aplicação
 #Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL.
 properties.jspwiki.jspwiki_baseURL=URL Base
-#Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.
-properties.jspwiki.jspwiki_fileSystemProvider_pageDir=Armazenamento de página
-#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.
-properties.log4j.log4j_appender_FileLog_File=Arquivos de log
 #Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir.
 properties.jspwiki.jspwiki_workDir=Diretório de trabalho
+#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.. Formerly named properties.log4j.log4j_appender_FileLog_File.
+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

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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -226,9 +226,9 @@
 properties.jspwiki.jspwiki_applicationName=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0432\u0438\u043a\u0438
 #Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL.
 properties.jspwiki.jspwiki_baseURL=\u041f\u0443\u0442\u044c
-#Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.
-properties.jspwiki.jspwiki_fileSystemProvider_pageDir=\u0425\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446 
-#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.
-properties.log4j.log4j_appender_FileLog_File=\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.adv.settings.workdir.label.. Formerly named workDir.
 properties.jspwiki.jspwiki_workDir=\u0420\u0430\u0431\u043e\u0447\u0430\u044f \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f
+#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.. Formerly named properties.log4j.log4j_appender_FileLog_File.
+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 

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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -313,10 +313,10 @@
 properties.jspwiki.jspwiki_applicationName=\u5e94\u7528\u7a0b\u5e8f\u540d\u79f0
 #Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL.
 properties.jspwiki.jspwiki_baseURL=\u57fa\u672c URL\uff08Base URL\uff09
-#Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.
-properties.jspwiki.jspwiki_fileSystemProvider_pageDir=\u9875\u9762\u5b58\u50a8
-#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.
-properties.log4j.log4j_appender_FileLog_File=\u65e5\u5fd7\u6587\u4ef6
 #Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir.
 properties.jspwiki.jspwiki_workDir=\u5de5\u4f5c\u76ee\u5f55
+#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.. Formerly named properties.log4j.log4j_appender_FileLog_File.
+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 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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -490,45 +490,48 @@
 javascript.sectionediting.label=Section Overview
 javascript.tip.default.title=More...
 javascript.prefs.areyousure=Without clicking the Save User Preferences button, your changes will be lost. Are you sure you want to exit this page?
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.title=JSPWiki Installer
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p1=Welcome!  This little JSP page is here to help you do the first difficult stage of JSPWiki installation.  If you're seeing this page, you have already installed JSPWiki correctly inside your container.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p2=There are now some things that you should configure.  When you press Configure, the <code>jspwiki.properties</code> file from the distribution will be modified, or if it can't be found, a new one will be created.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p3=This setup system is really meant for people who just want to be up and running really quickly. If you want to integrate JSPWiki with an existing system, I would recommend that you go and edit the <code>jspwiki.properties</code> file directly.  You can find a sample config file from <code>yourwiki/WEB-INF/</code>.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.basics.title=Basics
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.adv.settings.title=Advanced Settings
-#LDAP
-install.ldap.title=LDAP Configuration
 install.ldap.desc=Select which LDAP server to use.
 ldap.bindDNpassword.desc=The DN password will be encrypted in the Keychain.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.
-applicationName.description=What should your wiki be called?  Try and make this a relatively short name.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.
-baseURL.description=Please tell JSPWiki where your wiki is located, for example "http://localhost:8080/JSPWiki/".
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.
-pageDir.description=By default, JSPWiki will use the VersioningFileProvider that stores files in a particular directory on your hard drive. If you specify a directory that does not exist, JSPWiki will create one for you. All attachments will also be put in the same directory.
 install.ldap.description=If you use LDAP for authentication, and for user and role storage, you can configure and test the connection to your LDAP server here.
 ldap.config.description=Which LDAP server to use. On this page you can select OpenLDAP or Active Directory, although you can manually edit low-level settings in jspwiki.properties for more control if you wish.
 ldap.connectionURL.description=The LDAP connection URL, for example "ldap://127.0.0.1:389/".
 ldap.ssl.description=Whether to use SSL when connecting to LDAP. If the authentication method is not DIGEST-MD5, you should check this option if your server supports it.
 ldap.userBase.description=The base DN where user objects are found, for example "ou=people,dc=jspwiki,dc=org". This DN will be searched recursively.
 ldap.roleBase.description=The base DN where role objects are found, for example "ou=roles,dc=jspwiki,dc=org". This DN will be searched recursively
-ldap.bindDN.description=If your LDAP server requires a user to be bound for LDAP searches (Active Directory does, for example), enter the login name of an authenticated user here.
-ldap.bindDNpassword.description=Enter the binding user's password here. It will be stored in the Keychain.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.
-logFile.description=JSPWiki uses Jakarta Log4j for logging.  Please tell JSPWiki where the log files should go.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.
-workDir.description=This is the place where all caches and other runtime stuff is stored.
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.instr.desc.
-install.configure.description=After you click <em>Configure!</em>, the installer will write your settings to <code>{0}</code>. It will also create an Administrator account with a random password and a corresponding Admin group. 
+install.configure.description=After you click <em>Configure!</em>, the installer will write your settings to the <code>jspwiki.properties</code> and <code>log4j.properties</code> files in <code>/WEB-INF</code>.
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.validated.new.props.
 install.jspwiki.properties=Here is your new jspwiki.properties
 ldap.authentication.description=What authentication method does your LDAP server require? "simple" sends the username and password in the clear. You should not normally select this unless SSL is used also. DIGEST-MD5 hashes the password and is more secure; most Active Directory servers support it by default.
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.title=JSPWiki Installer
-adminPassword.description=Enter the "admin" user's desired password here. This account can do anything, and can log in even if the UserDatabase is not functioning properly. The password must be at least 16 characters in length. You should write down this password after you set it. For your convenience, we have generated a random password for you. Feel free to change it to something else.
+#Formerly named ldap.bindDN.description.
+ldap.bindUser.description=If your LDAP server requires a user to be bound for LDAP searches (Active Directory does, for example), enter the login name of an authenticated user here. You may need to specify the User Base for this to work.
+#Formerly named ldap.bindDNpassword.description.
+ldap.bindPassword.description=Enter the binding user's password here. It will be stored in the Keychain.
+install.userdatabase.description=Select where user profiles will be stored. The default is in an XML file in WEB-INF. However you can also use LDAP as a read-only user database. Click the "Configure LDAP..." button if you use LDAP. 
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p1.
+install.intro.p1=Welcome!  This little JSP page is here to help you do the first difficult stage of JSPWiki installation.  If you're seeing this page, you have already installed JSPWiki correctly inside your container.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p2.
+install.intro.p2=This setup system is really meant for people who just want to be up and running really quickly. If you want to integrate JSPWiki with an existing system, I would recommend that you go and edit the <code>jspwiki.properties</code> file directly.  You can find a sample config file from <code>yourwiki/WEB-INF/</code>.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.title.
+install.basics=Basics
+#Formerly named adminPassword.description.
+install.adminPassword.description=Enter the "admin" user's desired password here. This account can do anything, and can log in even if the UserDatabase is not functioning properly. The password must be at least 16 characters in length. You should write down this password after you set it. For your convenience, we have generated a random password for you. Feel free to change it to something else.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.. Formerly named applicationName.description.
+install.applicationName.description=What should your wiki be called?  Try and make this a relatively short name.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.. Formerly named baseURL.description.
+install.baseURL.description=Please tell JSPWiki where your wiki is located, for example "http://localhost:8080/JSPWiki/".
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.. Formerly named pageDir.description.
+install.pageDir.description=By default, JSPWiki will use the VersioningFileProvider that stores files in a particular directory on your hard drive. If you specify a directory that does not exist, JSPWiki will create one for you. All attachments will also be put in the same directory.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.. Formerly named logFile.description.. Formerly named logDirectory.description.
+install.logDirectory.description=JSPWiki uses Jakarta Log4j for logging.  Please tell JSPWiki where the log files should go.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.. Formerly named workDir.description.
+install.workDir.description=This is the place where all caches and other runtime stuff is stored.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.title.
+install.advanced=Advanced Settings
+#LDAP. Formerly named install.ldap.title.
+install.ldap=LDAP Configuration
+install.success=Congratulations
+install.success.description=You have successfully installed JSPWiki. Nice work!
+install.success.clickhere=Click here to continue...
\ No newline at end of file

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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -502,33 +502,31 @@
 javascript.tip.default.title=Weitere...
 javascript.prefs.areyousure=Wenn du nicht auf 'Benutzereinstellungen speichern' klickst, werden deine Einstellungen verworfen. Bist du sicher, dass diese Seite verlassen werden soll?
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.title=JSPWiki Installation
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p1=Willkommen! Diese kleine Seite ist dazu da, Dir über die ersten Hürden deiner JSPWiki-Installation hinwegzuhelfen. Wenn du diese Seite siehst, hast du JSPWiki bereits korrekt in deinem Container installiert.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p2=Es müssen jetzt ein paar Dinge konfiguriert werden. Wenn du auf 'Weiter' klickst, wird die Datei <code>jspwiki.properties</code> aus der Distribution angepasst oder neu erstellt, falls sie nicht gefunden werden kann.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.jsp.intro.p3=Dieses Installationsprogramm ist wirklich nur für Leute gedacht, die mit JSPWiki schnell und einfach loslegen wollen. Solltest du JSPWiki in ein bestehendes System integrieren wollen, ist es ratsam die Datei <code>jspwiki.properties</code> von Hand zu bearbeiten. Eine Vorlage findest du unter <code>DeinWiki/WEB-INF/</code>.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.basics.title=Grundlegendes
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.adv.settings.title=Erweiterte Einstellungen
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.
-applicationName.description=Wie soll dein Wiki heißen? Es sollte ein möglichst kurzer Name sein!
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.
-baseURL.description=Bitte gib die Adresse ein, unter der sich dein Wiki befindet!
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.
-pageDir.description=Standardmäßig verwendet JSPWiki den VersioningFileProvider, welcher Seiten als einzelne Dateien in einem bestimmten Verzeichnis auf deiner Festplatte abspeichert. Wenn du ein nicht existierendes Verzeichnis angibst, wird JSPWiki eines für dich erstellen. Alle Anhänge werden ebenfalls in diesem Verzeichnis abgespeichert.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.
-logFile.description=JSPWiki verwendet Jakarta Log4j fürs Logging. Bitte teile JSPWiki mit, wo die Log-Dateien gespeichert werden sollen.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.
-workDir.description=Hier werden sämtliche Caches und andere Laufzeitdaten gespeichert.
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.instr.desc.
 install.configure.description=Wenn du auf 'Weiter' klickst, wird das Installationsprogramm deine Einstellungen in <code>{0}</code> abspeichern. Es wird außerdem einen Administratorzugang mit einem zufälligen Passwort sowie eine entsprechende Admin-Gruppe erstellen. 
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.validated.new.props.
 install.jspwiki.properties=Hier ist deine neue jspwiki.properties
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.title=JSPWiki Installation
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p1.
+install.intro.p1=Willkommen! Diese kleine Seite ist dazu da, Dir über die ersten Hürden deiner JSPWiki-Installation hinwegzuhelfen. Wenn du diese Seite siehst, hast du JSPWiki bereits korrekt in deinem Container installiert.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p2.
+install.intro.p2=Es müssen jetzt ein paar Dinge konfiguriert werden. Wenn du auf 'Weiter' klickst, wird die Datei <code>jspwiki.properties</code> aus der Distribution angepasst oder neu erstellt, falls sie nicht gefunden werden kann.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.title.
+install.basics=Grundlegendes
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.. Formerly named applicationName.description.
+install.applicationName.description=Wie soll dein Wiki heißen? Es sollte ein möglichst kurzer Name sein!
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.. Formerly named baseURL.description.
+install.baseURL.description=Bitte gib die Adresse ein, unter der sich dein Wiki befindet!
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.. Formerly named pageDir.description.
+install.pageDir.description=Standardmäßig verwendet JSPWiki den VersioningFileProvider, welcher Seiten als einzelne Dateien in einem bestimmten Verzeichnis auf deiner Festplatte abspeichert. Wenn du ein nicht existierendes Verzeichnis angibst, wird JSPWiki eines für dich erstellen. Alle Anhänge werden ebenfalls in diesem Verzeichnis abgespeichert.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.. Formerly named logFile.description.. Formerly named logDirectory.description.
+install.logDirectory.description=JSPWiki verwendet Jakarta Log4j fürs Logging. Bitte teile JSPWiki mit, wo die Log-Dateien gespeichert werden sollen.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.. Formerly named workDir.description.
+install.workDir.description=Hier werden sämtliche Caches und andere Laufzeitdaten gespeichert.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.title.
+install.advanced=Erweiterte Einstellungen
 # 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/templates/default_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties?rev=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -486,30 +486,28 @@
 javascript.tip.default.title=Más...
 javascript.prefs.areyousure=Si no haces click en el botón de Guardar Preferencias de Usuario perderás tus cambios. ¿Estás seguro de querer salir de esta página?
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.title=Instalador de JSPWiki
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p1=¡Bienvenido!  Esta pequeña JSP está aquí para ayudarte en la primera etapa de la configuración de JSPWiki.  Si puedes ver esta página, ya has instalado correctamente JSPWiki en tu contenedor de aplicaciones.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p2=Hay algunas cosas que deberías configurar.  Cuando submitas el formulario, el fichero <code>jspwiki.properties</code> de la distribución será modificado, o, si no puede ser encontrado, será creado uno nuevo.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.jsp.intro.p3=Este método de configuración está pensado para las personas que quieran estar funcionando lo antes posible. Si quieres integrar JSPWiki en un sistema existente, te recomendaría que editases el fichero <code>jspwiki.properties</code> directamente.  Puedes encontrar un fichero de ejemplo en <code>tu_wiki/WEB-INF/</code>.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.basics.title=Fundamentales
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.adv.settings.title=Configuración avanzada
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.
-applicationName.description=¿Cómo debería llamarse tu wiki?  Intenta hacer este nombre relativamente corto.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.
-baseURL.description=Dile a JSPWiki a través de dónde está accesible tu wiki.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.
-pageDir.description=Por defecto, JSPWiki usará el VersioningFileProvider que guarda los ficheros en un directorio de tu disco duro. Si especificas un directorio que no existe, JSPWiki creará uno por ti. Todos los ficheros adjuntos también serán guardados en ese directorio.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.
-logFile.description=JSPWiki usa Jakarta Log4j para el logging.  Por favor indica a JSPWiki dónde deberían ir los ficheros de log.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.
-workDir.description=Este es el sitio dónde todas las cachés y otras cosas calculadas en tiempo de ejecución son guardadas.
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.instr.desc.
 install.configure.description=Una vez hagas click en <em>&#161;Configura!</em>, el instalador escribirá tus preferencias en <code>{0}</code>. También creará una cuenta de Administrador con una contraseña por defecto y el correspondiente wiki-grupo Admin. 
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.validated.new.props.
 install.jspwiki.properties=Aquí está tu nuevo jspwiki.properties
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.title=Instalador de JSPWiki
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p1.
+install.intro.p1=¡Bienvenido!  Esta pequeña JSP está aquí para ayudarte en la primera etapa de la configuración de JSPWiki.  Si puedes ver esta página, ya has instalado correctamente JSPWiki en tu contenedor de aplicaciones.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p2.
+install.intro.p2=Hay algunas cosas que deberías configurar.  Cuando submitas el formulario, el fichero <code>jspwiki.properties</code> de la distribución será modificado, o, si no puede ser encontrado, será creado uno nuevo.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.title.
+install.basics=Fundamentales
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.. Formerly named applicationName.description.
+install.applicationName.description=¿Cómo debería llamarse tu wiki?  Intenta hacer este nombre relativamente corto.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.. Formerly named baseURL.description.
+install.baseURL.description=Dile a JSPWiki a través de dónde está accesible tu wiki.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.. Formerly named pageDir.description.
+install.pageDir.description=Por defecto, JSPWiki usará el VersioningFileProvider que guarda los ficheros en un directorio de tu disco duro. Si especificas un directorio que no existe, JSPWiki creará uno por ti. Todos los ficheros adjuntos también serán guardados en ese directorio.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.. Formerly named logFile.description.. Formerly named logDirectory.description.
+install.logDirectory.description=JSPWiki usa Jakarta Log4j para el logging.  Por favor indica a JSPWiki dónde deberían ir los ficheros de log.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.. Formerly named workDir.description.
+install.workDir.description=Este es el sitio dónde todas las cachés y otras cosas calculadas en tiempo de ejecución son guardadas.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.title.
+install.advanced=Configuración avanzada

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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -470,30 +470,28 @@
 javascript.tip.default.title=Lisää...
 javascript.sectionediting.label=Osionäkymä
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.title=JSPWikin asennusohjelma
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p1=Tervetuloa!  Tämä sivu auttaa sinua JSPWikin asennuksen hankalien vaiheiden ohittamisessa.  Jos näet tämän sivun, olet jo onnistuneesti tehnyt ensimmäiset asetukset oikein saadaksesi JSPWikin toimimaan servlet-ympäristössäsi.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p2=Seuraavaksi sinun on tehtävä joitain asetuksia.  Kun painat Luo asetukset, asennuspaketissa ollut <code>jspwiki.properties</code> muutetaan tekemiesi asetusten mukaisesti, tai jos sitä ei löydy, luodaan uusi.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.jsp.intro.p3=Tämä asennusohjelma on tarkoitettu lähinnä niille, jotka vain haluavat päästä nopeasti liikkeelle.  Jos haluat asentaa JSPWikin osaksi olemassaolevaa järjestelmääsi, sinun kannattaa muokata <code>jspwiki.properties</code> -tiedostoa suoraan.  Löydät esimerkkitiedoston hakemistosta <code>wikihakemisto/WEB-INF/</code>.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.basics.title=Perusasiat
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.adv.settings.title=Edistyneemmät asetukset
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.
-applicationName.description=Mikä wikisi nimeksi tulee?  Nimen kannattaa olla melko lyhyt.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.
-baseURL.description=Ole hyvä, ja kerro, mikä URL wikille tulee.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.
-pageDir.description=JSPWiki tallentaa wikisivut ja liitetiedostot oletuksena tähän hakemistoon.  Jos hakemistoa ei ole olemassa, se luodaan.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.
-logFile.description=Mihin hakemistoon logitiedostot tulisi sijoittaa?
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.
-workDir.description=Tämä on hakemisto, jonne välimuistit ja muut väliaikaiset tiedostot sijoitetaan.
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.instr.desc.
 install.configure.description=Kun klikkaat <em>Luo asetukset!</em>, asennusohjelma kirjoittaa asetuksesi tiedostoon <code>{0}</code>.  Se luo myös ylläpitäjän tunnuksen ja sille salasanan, sekä myös ylläpitäjien oman ryhmän. 
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.validated.new.props.
 install.jspwiki.properties=Tässä uusi jspwiki.properties -tiedostosi.
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.title=JSPWikin asennusohjelma
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p1.
+install.intro.p1=Tervetuloa!  Tämä sivu auttaa sinua JSPWikin asennuksen hankalien vaiheiden ohittamisessa.  Jos näet tämän sivun, olet jo onnistuneesti tehnyt ensimmäiset asetukset oikein saadaksesi JSPWikin toimimaan servlet-ympäristössäsi.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p2.
+install.intro.p2=Seuraavaksi sinun on tehtävä joitain asetuksia.  Kun painat Luo asetukset, asennuspaketissa ollut <code>jspwiki.properties</code> muutetaan tekemiesi asetusten mukaisesti, tai jos sitä ei löydy, luodaan uusi.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.title.
+install.basics=Perusasiat
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.. Formerly named applicationName.description.
+install.applicationName.description=Mikä wikisi nimeksi tulee?  Nimen kannattaa olla melko lyhyt.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.. Formerly named baseURL.description.
+install.baseURL.description=Ole hyvä, ja kerro, mikä URL wikille tulee.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.. Formerly named pageDir.description.
+install.pageDir.description=JSPWiki tallentaa wikisivut ja liitetiedostot oletuksena tähän hakemistoon.  Jos hakemistoa ei ole olemassa, se luodaan.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.. Formerly named logFile.description.. Formerly named logDirectory.description.
+install.logDirectory.description=Mihin hakemistoon logitiedostot tulisi sijoittaa?
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.. Formerly named workDir.description.
+install.workDir.description=Tämä on hakemisto, jonne välimuistit ja muut väliaikaiset tiedostot sijoitetaan.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.title.
+install.advanced=Edistyneemmät asetukset

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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -483,30 +483,28 @@
 javascript.tip.default.title=Plus...
 javascript.prefs.areyousure=Si vous ne cliquez pas sur le bouton 'Enregistrer les préférences utilisateur', vos changements seront perdus. Etes-vous sûr de vouloir quitter cette page ?
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.title=Installeur JSPWiki
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p1=Bienvenue !  Cette petite page JSP est lô pour vous aider dans la première étape délicate de l'installation de JSPWiki. Si vous voyez cette page, c'est que vous avez déjô installé correctement JSPWiki dans votre conteneur Web.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p2=Maintenant, il y a deux ou trois choses que vous devez configurer. En pressant Soumettre, le fichier <code>jspwiki.properties</code> de la distribution sera modifié ; s'il est introuvable, un nouveau fichier sera créé.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.jsp.intro.p3=Ce système de configurationest vraiment conçu pour les personnesqui veulent juste pouvoir démarrer très vite. Si vous vuolez intégrer JSPWiki à un système existant, je vous recommande d'aller éditerle fichier <code>jspwiki.properties</code> directement.Vous trouverez un fichier de configuration d'exemple dans le répertoire <code>yourwiki/WEB-INF/</code>.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.basics.title=Général
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.adv.settings.title=Avancé
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.
-applicationName.description=Comment s'appellera votre Wiki ? Pensez à un nom plutÙt court.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.
-baseURL.description=Veuillez préciser à JSPWiki où votre Wiki sera localisé sur le Web.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.
-pageDir.description=Par défaut, JSPWiki utilise son VersioningFileProvider qui stocke les fichiers dans un répertoire particulier de votre disque dur. Si vous indiquez un répertoire qui n'existe pas, JSPWiki le créera pour vous. Tous les attachements seront également mis dans ce répertoire.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.
-logFile.description=JSPWiki utilise Jakarta Log4j pour la journalisation. Veuillez indiquer à JSPWiki où ces fichiers doit se trouver.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.
-workDir.description=Voici l'endroit où tous les caches et tout les fichiers temporaires d'exécution sont stockés.
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.instr.desc.
 install.configure.description=Quand vous cliquerez sur <em>Configurer</em>, l''installeur enregistrera vos paramètres dans <code>{0}</code>. Il créera également un compte Administrateur avec un mot de passe généré aléatoirement, et un groupe Admin correspondant. 
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.validated.new.props.
 install.jspwiki.properties=Voici votre nouveau jspwiki.properties
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.title=Installeur JSPWiki
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p1.
+install.intro.p1=Bienvenue !  Cette petite page JSP est lô pour vous aider dans la première étape délicate de l'installation de JSPWiki. Si vous voyez cette page, c'est que vous avez déjô installé correctement JSPWiki dans votre conteneur Web.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p2.
+install.intro.p2=Maintenant, il y a deux ou trois choses que vous devez configurer. En pressant Soumettre, le fichier <code>jspwiki.properties</code> de la distribution sera modifié ; s'il est introuvable, un nouveau fichier sera créé.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.title.
+install.basics=Général
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.. Formerly named applicationName.description.
+install.applicationName.description=Comment s'appellera votre Wiki ? Pensez à un nom plutÙt court.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.. Formerly named baseURL.description.
+install.baseURL.description=Veuillez préciser à JSPWiki où votre Wiki sera localisé sur le Web.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.. Formerly named pageDir.description.
+install.pageDir.description=Par défaut, JSPWiki utilise son VersioningFileProvider qui stocke les fichiers dans un répertoire particulier de votre disque dur. Si vous indiquez un répertoire qui n'existe pas, JSPWiki le créera pour vous. Tous les attachements seront également mis dans ce répertoire.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.. Formerly named logFile.description.. Formerly named logDirectory.description.
+install.logDirectory.description=JSPWiki utilise Jakarta Log4j pour la journalisation. Veuillez indiquer à JSPWiki où ces fichiers doit se trouver.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.. Formerly named workDir.description.
+install.workDir.description=Voici l'endroit où tous les caches et tout les fichiers temporaires d'exécution sont stockés.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.title.
+install.advanced=Avancé

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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -479,30 +479,28 @@
 prefs.errorprefix.rename=Impossibile rinominare la pagina:&nbsp;
 prefs.user.sectionediting.text=Abilita l'editing delle sezioni con il collegamento<span class="editsection"><a href="#">[modifica]</a></span>
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.title=JSPWiki Installer
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p1=Benvenuti!  Questa semplice pagina JSP serve ad aiutare a completare il primo passo dell'istallazione
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p2=Ora ci sono alcune cose che occorre configurare. Quando premerete il bottone invia, il file <code>jspwiki.properties</code> contenuto nella distribuzione standard ver&agrave; modificato, o, se non potesseessere trovato, ne verr&agrave; creato uno nuovo.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.jsp.intro.p3=Questo sistema di setup &egrave; pensato per chi vuole avere un sistema funzionante velocemente. Se volete integrare JSPWiki in un sistema esistente, vi raccomandiamo di modificare il file<code>jspwiki.properties</code> direttamente.  Potete trovare una configurazione di esempio sotto:<code>yourwiki/WEB-INF/</code>.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.basics.title=Elementi base
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.adv.settings.title=Opzioni avanzate
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.
-applicationName.description=Come deve chiamarsi il vostro wiki? Vi conviene dare un nome relativamente corto.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.
-baseURL.description=Per favore, segnalate a JSPWiki dove &egrave; istallato il vostro wiki.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.
-pageDir.description=Per default, JSPWiki user&agrave; un VersioningFileProvider che mantiene i file in una specifica directory sul vostro disco. Se specificate una directory che non esiste, JSPWiki lacreer&agrave; automaticamente. Tutti gli allegati verranno messi nella stessa directory.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.
-logFile.description=JSPWiki usa Jakarta Log4j per il logging.  Per favore, definite dove devono essere salvati i file di log.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.
-workDir.description=Questo &egrave; il posto dove vengono mantenute le caches e altro materiale runtime.
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.instr.desc.
 install.configure.description=Dopo che avrete selezionato <em>Configura!</em>, l' installer scriver&agrave; i setting ottenuti in: <code>{0}</code>. Verr&agrave; anche creato un account di Amministratore con una password casuale e un corrispondente gruppo Admin. 
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.validated.new.props.
 install.jspwiki.properties=Ecco il vostro nuovo file  jspwiki.properties
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.title=JSPWiki Installer
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p1.
+install.intro.p1=Benvenuti!  Questa semplice pagina JSP serve ad aiutare a completare il primo passo dell'istallazione
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p2.
+install.intro.p2=Ora ci sono alcune cose che occorre configurare. Quando premerete il bottone invia, il file <code>jspwiki.properties</code> contenuto nella distribuzione standard ver&agrave; modificato, o, se non potesseessere trovato, ne verr&agrave; creato uno nuovo.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.title.
+install.basics=Elementi base
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.. Formerly named applicationName.description.
+install.applicationName.description=Come deve chiamarsi il vostro wiki? Vi conviene dare un nome relativamente corto.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.. Formerly named baseURL.description.
+install.baseURL.description=Per favore, segnalate a JSPWiki dove &egrave; istallato il vostro wiki.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.. Formerly named pageDir.description.
+install.pageDir.description=Per default, JSPWiki user&agrave; un VersioningFileProvider che mantiene i file in una specifica directory sul vostro disco. Se specificate una directory che non esiste, JSPWiki lacreer&agrave; automaticamente. Tutti gli allegati verranno messi nella stessa directory.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.. Formerly named logFile.description.. Formerly named logDirectory.description.
+install.logDirectory.description=JSPWiki usa Jakarta Log4j per il logging.  Per favore, definite dove devono essere salvati i file di log.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.. Formerly named workDir.description.
+install.workDir.description=Questo &egrave; il posto dove vengono mantenute le caches e altro materiale runtime.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.title.
+install.advanced=Opzioni avanzate

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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -486,30 +486,28 @@
 login.lostpw.name=Account email
 login.lostpw.submit=Reset wachtwoord!
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.title=JSPWiki Installer
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p1=Welkom!  Deze kleine JSP helpt je door de eerste moeilijke fase van JSPWiki installatie.  Als je deze pagina ziet, dan heb je JSPWiki al correct geinstalleerd in je (web)container.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p2=Er zijn een aantal dingen die je moet configureren.  Als je Configureer klikt , zal de standaard <code>jspwiki.properties</code> file worden gewijzigd, of als ie niet gevonden kan worden, zal er een hagelnieuwe worden gemaakt.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.jsp.intro.p3=Dit setup systeem is echt bedoeld voor mensen die meteen aan de slag willen. Als je JSPWiki wilt integreren in een bestaande omgeving, dan raad ik toch aan om de file <code>jspwiki.properties</code> zelf met het handje te wijzigen.  Je vindt een voorbeeld in <code>yourwiki/WEB-INF/</code>.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.basics.title=Basics
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.adv.settings.title=Advanced Settings
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.
-applicationName.description=Hoe moet je wiki heten ?  Probeer deze naam zinvol en kort te houden..
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.
-baseURL.description=Vertel JSPWiki waar je wiki zich bevindt.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.
-pageDir.description=Standaard gebruikt JSPWiki de VersioningFileProvider die files opslaat in een directory op schijf Als je een directory opgeeft die niet bestaat, zal JSPWiki er een voor je aanmaken. Alle attachments worden ook in deze directory opgeslagen.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.
-logFile.description=JSPWiki gebruikt Jakarta Log4j voor logging.  Vertel JSPWiki waar de log files terecht moeten komen.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.
-workDir.description=Dit is de plek waar alle caches en andere runtime spullen worden opgeslagen.
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.instr.desc.
 install.configure.description=Als je op <em>Configure!</em> klikt, zal de Installer je instelling opslaan in <code>{0}</code>. Hij zal ook een Administrator account met een random wachtwoord en een Admin group aanmaken. 
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.validated.new.props.
 install.jspwiki.properties=Hier is je hagelnieuwe jspwiki.properties
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.title=JSPWiki Installer
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p1.
+install.intro.p1=Welkom!  Deze kleine JSP helpt je door de eerste moeilijke fase van JSPWiki installatie.  Als je deze pagina ziet, dan heb je JSPWiki al correct geinstalleerd in je (web)container.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p2.
+install.intro.p2=Er zijn een aantal dingen die je moet configureren.  Als je Configureer klikt , zal de standaard <code>jspwiki.properties</code> file worden gewijzigd, of als ie niet gevonden kan worden, zal er een hagelnieuwe worden gemaakt.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.title.
+install.basics=Basics
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.. Formerly named applicationName.description.
+install.applicationName.description=Hoe moet je wiki heten ?  Probeer deze naam zinvol en kort te houden..
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.. Formerly named baseURL.description.
+install.baseURL.description=Vertel JSPWiki waar je wiki zich bevindt.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.. Formerly named pageDir.description.
+install.pageDir.description=Standaard gebruikt JSPWiki de VersioningFileProvider die files opslaat in een directory op schijf Als je een directory opgeeft die niet bestaat, zal JSPWiki er een voor je aanmaken. Alle attachments worden ook in deze directory opgeslagen.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.. Formerly named logFile.description.. Formerly named logDirectory.description.
+install.logDirectory.description=JSPWiki gebruikt Jakarta Log4j voor logging.  Vertel JSPWiki waar de log files terecht moeten komen.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.. Formerly named workDir.description.
+install.workDir.description=Dit is de plek waar alle caches en andere runtime spullen worden opgeslagen.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.title.
+install.advanced=Advanced Settings

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=812334&r1=812333&r2=812334&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 Tue Sep  8 03:43:37 2009
@@ -523,30 +523,28 @@
 javascript.tip.default.title=More...
 javascript.prefs.areyousure=Without clicking the Save User Preferences button, your changes will be lost. Are you sure you want to exit this page?
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.title=Instalador JSPWiki
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p1=Bem vindo!  Esta pequena página JSP está aqui para lhe ajudar no primeiro passo da instalação da JSPWiki. Se você está vendo essa página, você instalou corretamente a JSPWiki no seu container.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.intro.p2=Agora há algumas coisas que você deve configurar. Quando você apertar Configurar, o arquivo <code>jspwiki.properties</code> será modificado, ou se ele não for encontrado, um novo será criado.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.jsp.intro.p3=Esta opção de instalação é para pessoas que desejam a JSPWiki funcionando rapidamente. Se você deseja integrar a JSPWiki com um sistema existente eu recomendo que você edite o arquivo <code>jspwiki.properties</code> diretamente. Você pode encontrar um exemplo do arquivo de configuração em <code>suawiki/WEB-INF/</code>.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.basics.title=O básico
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
-install.jsp.adv.settings.title=Configurações avançadas
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.
-applicationName.description=Como a sua wiki deve ser chamada?  Tente utilizar um nome pequeno e simples.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.
-baseURL.description=Por favor dia à JSPWiki o local onde está armazenada a sua wiki.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.
-pageDir.description=Por padrão, a JSPWiki usará o VersioningFileProvider que armazena arquivos em um específico diretório
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.
-logFile.description=A JSPWiki utiliza o Jakarta Log4j para os logs. Por favor diga à JSPWiki odne os arquivos de log devem ir.
-#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.
-workDir.description=Esta é o lugar onde o cache e todas as coisas de runtime são armazenadas.
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.instr.desc.
 install.configure.description=Após você clicar em <em>Configurar!</em>, o instalador escreverá suas preferências em <code>{0}</code>. Também criará uma conta de Administrador com uma senha aleatória e um grupo Admin correspondente.\t\t\t    
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.validated.new.props.
 install.jspwiki.properties=Aqui está o seu novo arquivo jspwiki.properties
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 install.title=Instalador JSPWiki
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p1.
+install.intro.p1=Bem vindo!  Esta pequena página JSP está aqui para lhe ajudar no primeiro passo da instalação da JSPWiki. Se você está vendo essa página, você instalou corretamente a JSPWiki no seu container.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.intro.p2.
+install.intro.p2=Agora há algumas coisas que você deve configurar. Quando você apertar Configurar, o arquivo <code>jspwiki.properties</code> será modificado, ou se ele não for encontrado, um novo será criado.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.title.
+install.basics=O básico
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.appname.desc.. Formerly named applicationName.description.
+install.applicationName.description=Como a sua wiki deve ser chamada?  Tente utilizar um nome pequeno e simples.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.baseurl.desc.. Formerly named baseURL.description.
+install.baseURL.description=Por favor dia à JSPWiki o local onde está armazenada a sua wiki.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.basics.page.storage.desc.. Formerly named pageDir.description.
+install.pageDir.description=Por padrão, a JSPWiki usará o VersioningFileProvider que armazena arquivos em um específico diretório
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.logfile.desc.. Formerly named logFile.description.. Formerly named logDirectory.description.
+install.logDirectory.description=A JSPWiki utiliza o Jakarta Log4j para os logs. Por favor diga à JSPWiki odne os arquivos de log devem ir.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.workdir.desc.. Formerly named workDir.description.
+install.workDir.description=Esta é o lugar onde o cache e todas as coisas de runtime são armazenadas.
+#Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.. Formerly named install.jsp.adv.settings.title.
+install.advanced=Configurações avançadas