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/07 05:35:10 UTC

svn commit: r811988 [2/3] - in /incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes: ./ templates/

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=811988&r1=811987&r2=811988&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 Mon Sep  7 03:35:09 2009
@@ -1,6 +1,6 @@
-# 
+
 #    JSPWiki - a JSP-based WikiWiki clone.
-#
+
 #    Licensed to the Apache Software Foundation (ASF) under one
 #    or more contributor license agreements.  See the NOTICE file
 #    distributed with this work for additional information
@@ -8,18 +8,18 @@
 #    to you under the Apache License, Version 2.0 (the
 #    "License"); you may not use this file except in compliance
 #    with the License.  You may obtain a copy of the License at
-#
+
 #       http://www.apache.org/licenses/LICENSE-2.0
-#
+
 #    Unless required by applicable law or agreed to in writing,
 #    software distributed under the License is distributed on an
 #    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #    KIND, either express or implied.  See the License for the
 #    specific language governing permissions and limitations
-#    under the License.  
-#
+#    under the License.
+
 ############################################################################
-#
+
 #  This is the main i18n resource file for JSPWiki internal
 #  code, the so-called core code.
 
@@ -117,15 +117,9 @@
 captcha.asirra.a.get.challenge=\u0417\u0430\u043f\u0440\u043e\u0441 \u0440\u0430\u0437\u043d\u044b\u0445 \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432.
 captcha.asirra.a.whatsthis=\u0427\u0442\u043e \u044d\u0442\u043e \u0442\u0430\u043a\u043e\u0435?
 captcha.submit=\u041f\u0443\u0441\u043a
-# Install.jsp
-install.jsp.title=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 JSPWiki 
-install.jsp.intro.title=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 JSPWiki 
-install.jsp.intro.p1=\u041f\u0440\u0438\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044e!  \u042d\u0442\u0430 \u043d\u0435\u0431\u043e\u043b\u044c\u0448\u0430\u044f \u0432\u043e\u0441\u043f\u043e\u043c\u0430\u0433\u0430\u0442\u0435\u043b\u044c\u043d\u0430\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u043f\u043e\u043c\u043e\u0436\u0435\u0442 \u043f\u0440\u0435\u043e\u0434\u043e\u043b\u0435\u0442\u044c \u043f\u0435\u0440\u0432\u044b\u0439 \u044d\u0442\u0430\u043f 
 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438=JSPWiki.  
 \u0415\u0441\u043b\u0438=\u0412\u044b \u0432\u0438\u0434\u0438\u0442\u0435 \u044d\u0442\u0443 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443, \u0437\u043d\u0438\u0447\u0430\u0442 \u0432\u044b \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u043b\u0438 JSPWiki  
 \u0432\u043d\u0443\u0442\u0440\u0438=\u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440\u0430. 
-install.jsp.intro.p2=\u0415\u0441\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0432\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c. \u041a\u043e\u0433\u0434\u0430 \u0432\u044b \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 \u043a\u043d\u043e\u043f\u043a\u0443 \u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430, \u0448\u0430\u0431\u043b\u043e\u043d \u0444\u0430\u0439\u043b\u0430 \u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430\u043c\u0438 (<code>jspwiki.properties</code>) \u0431\u0443\u0434\u0435\u0442 \u043c\u043e\u0434\u0438\u0444\u0438\u0446\u0438\u0440\u043e\u0432\u0430\u043d \u043f\u043e\u0434 \u0432\u0430\u0448\u0443 \u0441\u0438\u0441\u0442\u0435\u043c\u0443 \u0412 \u0441\u043b\u0443\u0447\u0430\u0435, \u0435\u0441\u043b\u0438 \u043e\u043d \u0431\u0443\u0434\u0435\u0442 \u043d\u0435 \u0
 43d\u0430\u0439\u0434\u0435\u043d, \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0449\u0438\u043a \u0441\u043e\u0437\u0434\u0430\u0441\u0442 \u043d\u043e\u0432\u044b\u0439.   \t\t     
-install.jsp.intro.p3=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u043f\u0440\u043e\u0438\u0441\u0445\u043e\u0434\u0438\u0442 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0431\u044b\u0441\u0442\u0440\u043e. \u0415\u0441\u043b\u0438 \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c JSPWiki, \u0440\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u044e \u043e\u0442\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u0430\u0439\u043b <code>jspwiki.properties</code> \u0432\u0440\u0443\u0447\u043d\u0443\u044e.  
 \u0412\u044b=\u043c\u043e\u0436\u0435\u0442\u0435 \u0435\u0433\u043e \u043d\u0430\u0439\u0442\u0438 \u0432 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0438 <code>yourwiki/WEB-INF/</code>
 install.jsp.install.info=\u041f\u043e\u0437\u0434\u0440\u0430\u0432\u043b\u044f\u044e: 
 install.jsp.install.warning=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435: 
@@ -133,13 +127,6 @@
 install.jsp.install.msg.rnd.pwd=\u041f\u043e\u0441\u043a\u043e\u043b\u044c\u043a\u0443 \u0435\u0449\u0451 \u043d\u0435\u0431\u044b\u043b\u043e \u0441\u0443\u043f\u0435\u0440\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0445 \u0437\u0430\u043f\u0438\u0441\u0435\u0439, \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0449\u0438\u043a \u0441\u043e\u0437\u0434\u0430\u043b \u043e\u0434\u043d\u0443 \u0441  \u0432\u044b\u0431\u043e\u0440\u043e\u0447\u043d\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u0435\u043c, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0412\u044b \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u043e\u0437\u0436\u0435. \u0423\u0447\u0451\u0442\u043d\u044b\u0439 \u043d\u043e\u043c\u0435\u0440 \u0437\u0430\u043f\u0438\u0441\u0438 {0}, \u043f\u0430\u0440\u043e\u043b\u044c {1}. \u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u0435 \u044d\u0442\u0443 \u0438\u043d\u0444\u043e\u0
 440\u043c\u0430\u0446\u0438\u044e, \u043f\u043e\u0441\u043a\u043e\u043b\u044c\u043a\u0443 \u044d\u0442\u043e \u0435\u0434\u0438\u043d\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0435 \u043c\u0435\u0441\u0442\u043e \u0433\u0434\u0435 \u043e\u043d\u0430  \u043e\u043f\u0443\u0431\u043b\u0438\u043a\u043e\u0432\u0430\u043d\u0430. \u0422\u0430\u043a\u0436\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0449\u0438\u043a \u0441\u043e\u0437\u0434\u0430\u043b \u0433\u0440\u0443\u043f\u043f\u0443 {2} \u0432 \u043a\u043e\u0442\u043e\u0440\u0443\u044e \u0432\u0445\u043e\u0434\u0438\u0442 \u0434\u0430\u043d\u044b\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c.
 install.jsp.install.msg.admin.notexists=\u0415\u0441\u043b\u0438 \u0412\u044b \u0432\u043f\u0435\u0440\u0432\u044b\u0435 \u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0435\u0441\u044c \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0449\u0438\u043a\u043e\u043c, \u0442\u043e \u0434\u043e\u043b\u0436\u043d\u044b \u0437\u043d\u0430\u0442\u044c, \u0447\u0442\u043e \u043f\u043e\u0441\u043b\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u0438 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438, \u0412\u044b \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u043f\u043e\u043f\u0430\u0441\u0442\u044c \u043d\u0430 \u044d\u0442\u0443 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443 \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0442 \u0438\u043c\u0435\u043d\u0438  
 \u0441\u0443\u043f\u0435\u0440\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f.=
-install.jsp.basics.title=\u0411\u0430\u0437\u043e\u0432\u044b\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
-install.jsp.basics.appname.label=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0432\u0438\u043a\u0438
-install.jsp.basics.appname.desc=\u041a\u0430\u043a\u043e\u0435 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0434\u043b\u044f \u0432\u0438\u043a\u0438? 
-install.jsp.basics.baseurl.label=\u041f\u0443\u0442\u044c
-install.jsp.basics.baseurl.desc=\u041c\u0435\u0441\u0442\u043e\u043d\u0430\u0445\u043e\u0436\u0434\u0435\u043d\u0438\u0435 \u0432\u0430\u0448\u0435\u0439 \u0432\u0438\u043a\u0438 (http:yourwiki.domain.com).
-install.jsp.basics.page.storage.label=\u0425\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446 
-install.jsp.basics.page.storage.desc=\u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e, JSPWiki \u0445\u0440\u0430\u043d\u0438\u0442 \u0441\u0432\u043e\u0438 \u0441\u0442\u0430\u0442\u044c\u0438 \u0432 \u0444\u0430\u0439\u043b\u0430\u0445 \u043d\u0430 \u0436\u0451\u0441\u0442\u043a\u043e\u043c \u0434\u0438\u0441\u043a\u0435. \u0415\u0441\u043b\u0438 \u0443\u043a\u0430\u0437\u0430\u043d\u0430\u044f \u043f\u0440\u0438 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442, JSPWiki \u0441\u043e\u0437\u0434\u0430\u0441\u0442 \u0435\u0451. \u0422\u0430\u043c \u0436\u0435 \u043d\u0430\u0445\u043e\u0434\u044f\u0442\u0441\u044f \u0444\u0430\u0439\u043b\u044b,\u043f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u044b\u0435 \u043a \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430\u043c. 
 install.jsp.security.title=\u0411\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u044c
 install.jsp.security.sec.conf.label=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438
 install.jsp.security.sec.conf.opt1=\u0421\u0438\u0441\u0442\u0435\u043c\u0430 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 \u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440\u0430 JAAS (\u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e)
@@ -151,14 +138,6 @@
 install.jsp.security.admaccount.notenabled=\u041d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e
 install.jsp.security.admaccount.enabled.desc=\u042d\u0442\u0430 \u0432\u0438\u043a\u0438 \u0443\u0436\u0435 \u0438\u043c\u0435\u0435\u0442 \u0441\u0443\u043f\u0435\u0440\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u0430\u043a\u043a\u0430\u0443\u043d\u0442 <strong>admin</strong>, \u043a\u043e\u0442\u043e\u0440\u044b\u0439  \u0432\u0445\u043e\u0434\u0438\u0442 \u0432 \u0433\u0440\u0443\u043f\u043f\u0443 <strong>Admin</strong>. \u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e, \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u044c JSPWiki \u0443\u0441\u0442\u0440\u043e\u0435\u043d\u0430 \u0442\u0430\u043a\u0438\u043c \u043e\u0431\u0440\u0430\u0437\u043e\u043c,  \u0447\u0442\u043e \u0432\u0441\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438, \u0432\u0445\u043e\u0434\u044f\u0449\u0438\u0435 \u0432 \u0433\u0440\u0443\u043f\u043f\u0443 \u0410\u0434\u043c\u0438\u0
 43d \u0438\u043c\u0435\u044e\u0442 \u043f\u0440\u0430\u0432\u0430 <code>AllPermission</code>. 
 install.jsp.security.admaccount.notenabled.desc=\u041f\u043e\u0445\u043e\u0436\u0435, \u044d\u0442\u0430 \u0432\u0438\u043a\u0438 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 \u0441\u0443\u043f\u0435\u0440\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f. \u041a\u043e\u0433\u0434\u0430 \u0432\u044b \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 <em>\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430!</em>, JSPWiki \u0441\u043e\u0437\u0434\u0430\u0441\u0442 \u0437\u0430\u043f\u0438\u0441\u044c \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438.
-install.jsp.adv.settings.title=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
-install.jsp.adv.settings.logfile.label=\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)
-install.jsp.adv.settings.logfile.desc=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0433\u0434\u0435 \u0431\u0443\u0434\u0443\u0442 \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u0436\u0443\u0440\u043d\u0430\u043b\u044b \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439.
-install.jsp.adv.settings.workdir.label=\u0420\u0430\u0431\u043e\u0447\u0430\u044f \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f
-install.jsp.adv.settings.workdir.desc=\u0422\u0443\u0442 \u0431\u0443\u0434\u0443\u0442 \u0445\u0440\u0430\u043d\u0438\u0442\u0441\u044f \u043a\u0435\u0448-\u0444\u0430\u0439\u043b\u044b \u0438 \u0434\u0440\u0443\u0433\u0438\u0435 \u0434\u0438\u043d\u0430\u043c\u0438\u0447\u0435\u0441\u043a\u0438\u0435 \u043e\u0431\u044a\u0435\u043a\u0442\u044b.
-install.jsp.instr.desc=\u041f\u043e\u0441\u043b\u0435 \u043a\u043b\u0438\u043a\u0430  <em>\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430!</em> , \u0441\u043a\u0440\u0438\u043f\u0442 \u0437\u0430\u043f\u0438\u0448\u0435\u0442 \u0432\u0430\u0448\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0432  \u0444\u0430\u0439\u043b <code>{0}</code>.   \u0422\u0430\u043a\u0436\u0435 \u0431\u0443\u0434\u0435\u0442 \u0441\u043e\u0437\u0434\u0430\u043d\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0432 \u0433\u0440\u0443\u043f\u0435 \u0430\u0434\u043c\u0438\u043d \u0441\u0443\u043f\u0435\u0440\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0441 \u0432\u044b\u0431\u043e\u0440\u043e\u0447\u043d\u044b\u043c \u043f\u0430\u0440\u043e\u043b\u0435\u043c.
-install.jsp.instr.submit=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430!
-install.jsp.validated.new.props=\u0412\u043e\u0442 \u0412\u0430\u0448\u0438 \u043d\u043e\u0432\u044b\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 (jspwiki.properties)
 # Installer.java
 install.installer.unable.read.props=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0440\u043e\u0447\u0435\u0441\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438: {0}
 install.installer.default.appname=\u041c\u043e\u044f \u0412\u0438\u043a\u0438
@@ -241,3 +220,15 @@
 preview=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit.
 cancel=\u041e\u0442\u043c\u0435\u043d\u0430
+#Formerly named install.jsp.instr.submit.
+org.apache.wiki.action.InstallActionBean.save=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430!
+#Formerly named install.jsp.basics.appname.label.. Formerly named applicationName.
+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

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=811988&r1=811987&r2=811988&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 Mon Sep  7 03:35:09 2009
@@ -1,6 +1,6 @@
-# 
+
 #    JSPWiki - a JSP-based WikiWiki clone.
-#
+
 #    Licensed to the Apache Software Foundation (ASF) under one
 #    or more contributor license agreements.  See the NOTICE file
 #    distributed with this work for additional information
@@ -8,18 +8,18 @@
 #    to you under the Apache License, Version 2.0 (the
 #    "License"); you may not use this file except in compliance
 #    with the License.  You may obtain a copy of the License at
-#
+
 #       http://www.apache.org/licenses/LICENSE-2.0
-#
+
 #    Unless required by applicable law or agreed to in writing,
 #    software distributed under the License is distributed on an
 #    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #    KIND, either express or implied.  See the License for the
 #    specific language governing permissions and limitations
-#    under the License.  
-#
+#    under the License.
+
 ############################################################################
-#
+
 #  This is the main i18n resource file for JSPWiki internal
 #  code, the so-called core code.
 
@@ -117,24 +117,11 @@
 captcha.asirra.a.get.challenge=\u8bf7\u6c42\u4e0d\u540c\u7684\u56fe\u7247\u3002
 captcha.asirra.a.whatsthis=\u8fd9\u662f\u4ec0\u4e48\uff1f
 captcha.submit=\u63d0\u4ea4
-# Install.jsp
-install.jsp.title=JSPWiki \u5b89\u88c5\u7a0b\u5e8f
-install.jsp.intro.title=JSPWiki \u5b89\u88c5\u7a0b\u5e8f
-install.jsp.intro.p1=\u6b22\u8fce\u4f7f\u7528 JSPWiki\uff01\u672c JSP \u9875\u9762\u65e8\u5728\u5e2e\u52a9\u60a8\u5b8c\u6210 JSPWiki \u5b89\u88c5\u7684\u7b2c\u4e00\u4e2a\u9636\u6bb5\u3002\u5982\u679c\u770b\u5230\u6b64\u9875\u9762\uff0c\u8bf4\u660e\u60a8\u5df2\u7ecf\u5728 Web \u5bb9\u5668\uff08Web Container\uff09\u91cc\u6b63\u786e\u5730\u5b89\u88c5\u4e86 JSPWiki\u3002
-install.jsp.intro.p2=\u73b0\u5728\u8fd8\u9700\u8981\u8fdb\u884c\u4e00\u4e9b\u914d\u7f6e\u3002\u5728\u6309\u4e0b\u201c\u914d\u7f6e\uff01\u201d\u540e\uff0c\u5c06\u4f1a\u4fee\u6539\u7a0b\u5e8f\u5305\u91cc\u7684 <code>jspwiki.properties</code> \u6587\u4ef6\uff0c\u5982\u679c\u627e\u4e0d\u5230\u7684\u8fd9\u4e2a\u6587\u4ef6\u7684\u8bdd\uff0c\u7a0b\u5e8f\u4f1a\u521b\u5efa\u8fd9\u6837\u4e00\u4e2a\u65b0\u6587\u4ef6\u3002
-install.jsp.intro.p3=\u672c\u5b89\u88c5\u7a0b\u5e8f\u662f\u9488\u5bf9\u90a3\u4e9b\u53ea\u60f3\u5c3d\u5feb\u5b89\u88c5\u5e76\u8fd0\u884c JSPWiki \u7684\u4eba\u8bbe\u8ba1\u7684\u3002\u5982\u679c\u60a8\u6253\u7b97\u628a JSPWiki \u96c6\u6210\u5230\u73b0\u6709\u7684\u7cfb\u7edf\uff0c\u5efa\u8bae\u76f4\u63a5\u7f16\u8f91 <code>jspwiki.properties</code> \u6587\u4ef6\u3002\u53ef\u4ee5\u5728 <code>yourwiki/WEB-INF/</code> \u4e0b\u9762\u627e\u5230\u4e00\u4e2a\u6837\u672c\u914d\u7f6e\u6587\u4ef6\u3002
 install.jsp.install.info=\u597d\u6d88\u606f\uff1a
 install.jsp.install.warning=\u8b66\u544a\uff1a
 install.jsp.install.error=\u65e0\u6cd5\u4fdd\u5b58\u914d\u7f6e\uff1a
 install.jsp.install.msg.rnd.pwd=\u7531\u4e8e\u8fd8\u6ca1\u6709\u7ba1\u7406\u5458\u5e10\u6237\uff0cJSPWiki \u4f1a\u521b\u5efa\u4e00\u4e2a\u7ba1\u7406\u5458\u5e10\u6237\uff0c\u5bc6\u7801\u968f\u673a\u751f\u6210\u3002\u5f53\u7136\u4e86\uff0c\u60a8\u53ef\u4ee5\u968f\u540e\u4fee\u6539\u8fd9\u4e2a\u5bc6\u7801\u3002\u5e10\u6237 ID \u4e3a [{0}]\uff0c\u5bc6\u7801\u4e3a\uff1a__{1}__\u3002\u8bf7\u5c06\u6b64\u4fe1\u606f\u5199\u4e0b\u6765\u5e76\u59a5\u5584\u4fdd\u7ba1\u3002\u53e6\u5916 JSPWiki \u8fd8\u521b\u5efa\u4e86\u4e00\u4e2a\u540d\u4e3a {2} \u7684 wiki \u7ec4\uff0c\u8fd9\u4e2a\u7ec4\u5305\u542b\u6b64\u7528\u6237\u3002
 install.jsp.install.msg.admin.notexists=\u60a8\u662f\u7b2c\u4e00\u6b21\u8fd0\u884c\u6b64\u5b89\u88c5\u7a0b\u5e8f\u5417\uff1f\u5982\u679c\u662f\u7684\u8bdd\uff0c\u60a8\u5e94\u8be5\u4e86\u89e3\u5728 JSPWiki \u9a8c\u8bc1\u5e76\u9996\u6b21\u4fdd\u5b58\u914d\u7f6e\u4e4b\u540e\uff0c\u5c06\u9700\u8981\u7ba1\u7406\u5458\u6743\u9650\u624d\u80fd\u91cd\u65b0\u8bbf\u95ee\u6b64\u9875\u9762\u3002\u8fd9\u6837\u505a\u7684\u76ee\u7684\u662f\u9632\u6b62\u6709\u4e9b\u4eba\u901a\u8fc7 Internet \u7834\u574f\u60a8\u7684 wiki \u5e94\u7528\u3002
-install.jsp.basics.title=\u57fa\u672c
-install.jsp.basics.appname.label=\u5e94\u7528\u7a0b\u5e8f\u540d\u79f0
-install.jsp.basics.appname.desc=\u6253\u7b97\u600e\u4e48\u547d\u540d\u60a8\u7684 wiki\uff1f\u5c3d\u91cf\u4f7f\u7528\u76f8\u5bf9\u7b80\u77ed\u7684\u540d\u79f0\u3002
-install.jsp.basics.baseurl.label=\u57fa\u672c URL\uff08Base URL\uff09
-install.jsp.basics.baseurl.desc=\u8bf7\u6307\u5b9a JSPWiki \u7684\u4f4d\u7f6e\u3002
-install.jsp.basics.page.storage.label=\u9875\u9762\u5b58\u50a8
-install.jsp.basics.page.storage.desc=\u7f3a\u7701\u60c5\u51b5\u4e0b\uff0cJSPWiki \u4f1a\u4f7f\u7528 VersioningFileProvider\uff0c\u5b83\u4f1a\u628a\u6587\u4ef6\u4fdd\u5b58\u5728\u60a8\u7684\u786c\u76d8\u4e0a\u7684\u7279\u5b9a\u76ee\u5f55\u3002\u5982\u679c\u6307\u5b9a\u4e86\u4e0d\u5b58\u5728\u7684\u76ee\u5f55\uff0cJSPWiki \u4f1a\u81ea\u52a8\u521b\u5efa\u3002\u6240\u6709\u7684\u9644\u4ef6\u4e5f\u4f1a\u4fdd\u5b58\u5728\u8fd9\u4e2a\u76ee\u5f55\u3002
 install.jsp.security.title=\u5b89\u5168\u8bbe\u7f6e
 install.jsp.security.sec.conf.label=\u5b89\u5168\u914d\u7f6e
 install.jsp.security.sec.conf.opt1=JAAS \u548c\u5bb9\u5668\uff08container\uff09\u5b89\u5168\u6027\uff08\u7f3a\u7701\u503c\uff09
@@ -145,14 +132,6 @@
 install.jsp.security.admaccount.notenabled=\u672a\u542f\u7528
 install.jsp.security.admaccount.enabled.desc=\u6b64 wiki \u6709\u4e00\u4e2a\u540d\u4e3a <strong>admin</strong> \u7684\u7ba1\u7406\u5458\u5e10\u6237\uff0c\u8fd9\u4e2a\u5e10\u6237\u5c5e\u4e8e wiki \u7ec4 <strong>Admin</strong>\u3002 \u7f3a\u7701\u60c5\u51b5\u4e0b\uff0cJSPWiki \u7684\u5b89\u5168\u6027\u7b56\u7565\u8d4b\u4e88 Admin \u7ec4\u4e2d\u7684\u6240\u6709\u6210\u5458\u5177\u6709\u5168\u90e8\u6743\u9650\u7684 <code>AllPermission</code>\u3002
 install.jsp.security.admaccount.notenabled.desc=\u6b64 wiki \u4f3c\u4e4e\u6ca1\u6709\u7ba1\u7406\u5458\u5e10\u6237\u3002\u5355\u51fb<em>\u914d\u7f6e\uff01</em>\u540e\uff0cJSPWiki \u5c06\u4f1a\u4e3a\u60a8\u521b\u5efa\u4e00\u4e2a\u3002
-install.jsp.adv.settings.title=\u9ad8\u7ea7\u8bbe\u7f6e
-install.jsp.adv.settings.logfile.label=\u65e5\u5fd7\u6587\u4ef6
-install.jsp.adv.settings.logfile.desc=JSPWiki \u4f7f\u7528 Jakarta Log4j \u8bb0\u5f55\u65e5\u5fd7\u3002\u8bf7\u544a\u8bc9 JSPWiki \u65e5\u5fd7\u6587\u4ef6\u7684\u4fdd\u5b58\u4f4d\u7f6e\u3002
-install.jsp.adv.settings.workdir.label=\u5de5\u4f5c\u76ee\u5f55
-install.jsp.adv.settings.workdir.desc=\u8fd9\u4e2a\u5730\u65b9\u4f1a\u4fdd\u5b58\u6240\u6709\u7f13\u5b58\u548c\u5176\u4ed6\u8fd0\u884c\u65f6\u751f\u6210\u7684\u6570\u636e\u3002
-install.jsp.instr.desc=\u5728\u5355\u51fb<em>\u914d\u7f6e\uff01</em>\u540e\uff0c\u5b89\u88c5\u7a0b\u5e8f\u5c06\u628a\u60a8\u7684\u8bbe\u7f6e\u5199\u5230 <code>{0}</code>\u3002 \u5b83\u8fd8\u4f1a\u521b\u5efa\u4e00\u4e2a\u7ba1\u7406\u5458\u5e10\u6237\uff08\u5bc6\u7801\u968f\u673a\u751f\u6210\uff09\u548c\u4e00\u4e2a Admin \u7ec4\u3002
-install.jsp.instr.submit=\u914d\u7f6e\uff01
-install.jsp.validated.new.props=\u4e0b\u9762\u662f\u60a8\u7684\u65b0 jspwiki.properties \u6587\u4ef6
 # Installer.java
 install.installer.unable.read.props=\u4e0d\u80fd\u8bfb\u53d6\u5c5e\u6027\uff1a{0}
 install.installer.default.appname=MyWiki
@@ -328,4 +307,16 @@
 preview=\u9884\u89c8
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit.
 cancel=\u53d6\u6d88
+#Formerly named install.jsp.instr.submit.
+org.apache.wiki.action.InstallActionBean.save=\u914d\u7f6e\uff01
+#Formerly named install.jsp.basics.appname.label.. Formerly named applicationName.
+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
 #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=811988&r1=811987&r2=811988&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 Mon Sep  7 03:35:09 2009
@@ -1,6 +1,6 @@
-# 
+
 #    JSPWiki - a JSP-based WikiWiki clone.
-#
+
 #    Licensed to the Apache Software Foundation (ASF) under one
 #    or more contributor license agreements.  See the NOTICE file
 #    distributed with this work for additional information
@@ -8,18 +8,18 @@
 #    to you under the Apache License, Version 2.0 (the
 #    "License"); you may not use this file except in compliance
 #    with the License.  You may obtain a copy of the License at
-#
+
 #       http://www.apache.org/licenses/LICENSE-2.0
-#
+
 #    Unless required by applicable law or agreed to in writing,
 #    software distributed under the License is distributed on an
 #    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #    KIND, either express or implied.  See the License for the
 #    specific language governing permissions and limitations
-#    under the License.  
-#
+#    under the License.
+
 ############################################################################
-#
+
 #  This file contains the localized resource definitions for
 #  the "default" template.  Any other template i18n file should
 #  be renamed in a similar way, e.g. "mytemplate.properties" under i18n/templates
@@ -490,3 +490,45 @@
 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. 
+#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.

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=811988&r1=811987&r2=811988&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 Mon Sep  7 03:35:09 2009
@@ -1,6 +1,6 @@
-# 
+
 #    JSPWiki - a JSP-based WikiWiki clone.
-#
+
 #    Licensed to the Apache Software Foundation (ASF) under one
 #    or more contributor license agreements.  See the NOTICE file
 #    distributed with this work for additional information
@@ -8,18 +8,18 @@
 #    to you under the Apache License, Version 2.0 (the
 #    "License"); you may not use this file except in compliance
 #    with the License.  You may obtain a copy of the License at
-#
+
 #       http://www.apache.org/licenses/LICENSE-2.0
-#
+
 #    Unless required by applicable law or agreed to in writing,
 #    software distributed under the License is distributed on an
 #    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #    KIND, either express or implied.  See the License for the
 #    specific language governing permissions and limitations
-#    under the License.  
-#
+#    under the License.
+
 ############################################################################
-#
+
 #  This file contains the localized resource definitions for
 #  the "default" template.  Any other template i18n file should
 #  be renamed in a similar way, e.g. "mytemplate.properties" under i18n/templates
@@ -501,6 +501,34 @@
 javascript.sectionediting.label=Vorhandene Abschnitte
 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
 # 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=811988&r1=811987&r2=811988&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 Mon Sep  7 03:35:09 2009
@@ -1,6 +1,6 @@
-# 
+
 #    JSPWiki - a JSP-based WikiWiki clone.
-#
+
 #    Licensed to the Apache Software Foundation (ASF) under one
 #    or more contributor license agreements.  See the NOTICE file
 #    distributed with this work for additional information
@@ -8,18 +8,18 @@
 #    to you under the Apache License, Version 2.0 (the
 #    "License"); you may not use this file except in compliance
 #    with the License.  You may obtain a copy of the License at
-#
+
 #       http://www.apache.org/licenses/LICENSE-2.0
-#
+
 #    Unless required by applicable law or agreed to in writing,
 #    software distributed under the License is distributed on an
 #    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #    KIND, either express or implied.  See the License for the
 #    specific language governing permissions and limitations
-#    under the License.  
-#
+#    under the License.
+
 ############################################################################
-#
+
 #  Este archivo contiene los textos localizados en español de España (es_ES)
 #  para la plantilla (template) "default".
 
@@ -485,3 +485,31 @@
 javascript.sectionediting.label=Visión preliminar de la sección
 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

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=811988&r1=811987&r2=811988&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 Mon Sep  7 03:35:09 2009
@@ -1,6 +1,6 @@
-# 
+
 #    JSPWiki - a JSP-based WikiWiki clone.
-#
+
 #    Licensed to the Apache Software Foundation (ASF) under one
 #    or more contributor license agreements.  See the NOTICE file
 #    distributed with this work for additional information
@@ -8,18 +8,18 @@
 #    to you under the Apache License, Version 2.0 (the
 #    "License"); you may not use this file except in compliance
 #    with the License.  You may obtain a copy of the License at
-#
+
 #       http://www.apache.org/licenses/LICENSE-2.0
-#
+
 #    Unless required by applicable law or agreed to in writing,
 #    software distributed under the License is distributed on an
 #    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #    KIND, either express or implied.  See the License for the
 #    specific language governing permissions and limitations
-#    under the License.  
-#
+#    under the License.
+
 ############################################################################
-#
+
 #  This file contains the localized resource definitions for
 
 #  the "default" template.  Any other template i18n file should
@@ -469,3 +469,31 @@
 javascript.sort.descending=Laskeva järjestys.  Klikkaa vaihtaaksesi.
 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

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=811988&r1=811987&r2=811988&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 Mon Sep  7 03:35:09 2009
@@ -1,6 +1,6 @@
-# 
+
 #    JSPWiki - a JSP-based WikiWiki clone.
-#
+
 #    Licensed to the Apache Software Foundation (ASF) under one
 #    or more contributor license agreements.  See the NOTICE file
 #    distributed with this work for additional information
@@ -8,18 +8,18 @@
 #    to you under the Apache License, Version 2.0 (the
 #    "License"); you may not use this file except in compliance
 #    with the License.  You may obtain a copy of the License at
-#
+
 #       http://www.apache.org/licenses/LICENSE-2.0
-#
+
 #    Unless required by applicable law or agreed to in writing,
 #    software distributed under the License is distributed on an
 #    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #    KIND, either express or implied.  See the License for the
 #    specific language governing permissions and limitations
-#    under the License.  
-#
+#    under the License.
+
 ############################################################################
-#
+
 #  This file contains the french-localized resource definitions for
 #  the "default" template.  Any other template i18n file should
 #  be renamed in a similar way, e.g. "mytemplate.properties" under i18n/templates
@@ -482,3 +482,31 @@
 javascript.sectionediting.label=Aperçu de la section
 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

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=811988&r1=811987&r2=811988&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 Mon Sep  7 03:35:09 2009
@@ -1,6 +1,6 @@
-# 
+
 #    JSPWiki - a JSP-based WikiWiki clone.
-#
+
 #    Licensed to the Apache Software Foundation (ASF) under one
 #    or more contributor license agreements.  See the NOTICE file
 #    distributed with this work for additional information
@@ -8,18 +8,18 @@
 #    to you under the Apache License, Version 2.0 (the
 #    "License"); you may not use this file except in compliance
 #    with the License.  You may obtain a copy of the License at
-#
+
 #       http://www.apache.org/licenses/LICENSE-2.0
-#
+
 #    Unless required by applicable law or agreed to in writing,
 #    software distributed under the License is distributed on an
 #    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #    KIND, either express or implied.  See the License for the
 #    specific language governing permissions and limitations
-#    under the License.  
-#
+#    under the License.
+
 ############################################################################
-#
+
 #  This file contains the localized resource definitions for
 #  the "default" template.  Any other template i18n file should
 #  be renamed in a similar way, e.g. "mytemplate.properties" under i18n/templates
@@ -478,3 +478,31 @@
 javascript.sectionediting.label=Riassunto della Sezione
 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

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=811988&r1=811987&r2=811988&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 Mon Sep  7 03:35:09 2009
@@ -1,6 +1,6 @@
-# 
+
 #    JSPWiki - a JSP-based WikiWiki clone.
-#
+
 #    Licensed to the Apache Software Foundation (ASF) under one
 #    or more contributor license agreements.  See the NOTICE file
 #    distributed with this work for additional information
@@ -8,18 +8,18 @@
 #    to you under the Apache License, Version 2.0 (the
 #    "License"); you may not use this file except in compliance
 #    with the License.  You may obtain a copy of the License at
-#
+
 #       http://www.apache.org/licenses/LICENSE-2.0
-#
+
 #    Unless required by applicable law or agreed to in writing,
 #    software distributed under the License is distributed on an
 #    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #    KIND, either express or implied.  See the License for the
 #    specific language governing permissions and limitations
-#    under the License.  
-#
+#    under the License.
+
 ############################################################################
-#
+
 #  This file contains the localized resource definitions for
 #  the "default" template.  Any other template i18n file should
 #  be renamed in a similar way, e.g. "mytemplate.properties" under i18n/templates
@@ -485,3 +485,31 @@
 javascript.favorites.show=Klik om je favorieten te tonen
 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