Author: gmazza
Date: Thu Jun 6 16:54:17 2013
New Revision: 1490359
URL: http://svn.apache.org/r1490359
Log:
Updates to CH, PT_BR, FR, IT language files.
Modified:
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_zh_CN.properties
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties
incubator/jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml
Modified:
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1490359&r1=1490358&r2=1490359&view=diff
==============================================================================
---
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
(original)
+++
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
Thu Jun 6 16:54:17 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "5";
+ public static final String BUILD = "6";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_zh_CN.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_zh_CN.properties?rev=1490359&r1=1490358&r2=1490359&view=diff
==============================================================================
---
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_zh_CN.properties
(original)
+++
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_zh_CN.properties
Thu Jun 6 16:54:17 2013
@@ -22,8 +22,10 @@
# Please, do not forget to use proper HTML entities, so
# " = "
# ' = ' Note that ' is NOT HTML, and does not necessarily work in
all browsers.
-
-
+#
+# This URL useful to convert from Chinese characters to the escaped unicode
required
+# by this property file: http://www.endmemo.com/unicode/unicodeconverter.php
+#
#
# Time/date formatting. Some plugins might be using some specific formats,
@@ -60,6 +62,11 @@ security.error.passwordnomatch=\u5bc6\u7
security.error.illegalfullname=\u5168\u540d\u201c{0}\u201d\u4e0d\u7b26\u5408\u547d\u540d\u89c4\u8303
security.error.illegalloginname=\u767b\u5f55\u540d\u201c{0}\u201d\u4e0d\u7b26\u5408\u547d\u540d\u89c4\u8303
+security.error.cannot.rename=\u4E0D\u80FD\u4FEE\u6539\uFF1A\u60A8\u8F93\u5165\u7684\u7528\u6237\u540D
{0} \u5DF2\u7ECF\u88AB\u4F7F\u7528\u4E86
+security.error.fullname.taken=\u62E5\u6709\u76F8\u540C\u540D\u5B57\u7684 {0}
\u5DF2\u7ECF\u88AB\u6CE8\u518C\u4E86
+security.error.login.taken=\u7528\u6237\u540D\u5B57 {0}
\u5DF2\u7ECF\u88AB\u4F7F\u7528\u4E86
+security.user.fullname.invalid=\u4E0D\u5408\u6CD5\u7684\u7528\u6237\u540D
+
# These should roughly match whatever is used in default.properties for
UserProfile.jsp
security.user.loginname=\u767b\u5f55\u540d
security.user.fullname=\u5168\u540d
@@ -224,4 +231,5 @@ attach.parent.not.exist=\u7236\u9875\u97
varmgr.not.logged.in=\u672a\u767b\u5f55
varmgr.authenticated=\u5df2\u9a8c\u8bc1
varmgr.asserted=\u5c1a\u5f85\u9a8c\u8bc1
-varmgr.anonymous=\u533f\u540d
\ No newline at end of file
+varmgr.anonymous=\u533f\u540d
+
Modified:
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties?rev=1490359&r1=1490358&r2=1490359&view=diff
==============================================================================
---
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties
(original)
+++
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties
Thu Jun 6 16:54:17 2013
@@ -506,6 +506,8 @@ fact.isAuthenticated=Authentifi\u00E9\u0
select.one=(en s\u00E9lectionner un)
decision.createUserProfile=Nouveau profil utilisateur <strong>{2}</strong>
+notification.createUserProfile.accept.subject=Bienvenue à {0}\!
+notification.createUserProfile.accept.content=Bravo\! Votre profil pour {0} a
été créé. Les informations enregistrées sont les suivantes\: \n\nIdentifiant:\:
{1} \nVotre nom \: {2} \nCourriel: \: {3} \n\nSi vous oubliez votre mot de
passe, vous pouvez le réinitialiser à {4}.
notification.createUserProfile.reject=Votre requ\u00EAte pour cr\u00E9er un
profil utilisateur a \u00E9t\u00E9 refus\u00E9.
fact.submitter=Soumettre
Modified:
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties?rev=1490359&r1=1490358&r2=1490359&view=diff
==============================================================================
---
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties
(original)
+++
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties
Thu Jun 6 16:54:17 2013
@@ -20,7 +20,7 @@
# the "default" template. Any other template i18n file should
# be renamed in a similar way, e.g. "mytemplate.properties" under
i18n/templates
#
-# Provided by L. Gilardoni, Quinary - Feb 2008.
+# Provided by L. Gilardoni, Quinary, et. al. - Feb 2008.
#
# Common things
@@ -494,6 +494,9 @@ fact.isAuthenticated=Autenticato?
select.one=(selezionane uno)
decision.createUserProfile=Nuovo profilo utente <strong>{2}</strong>
+notification.createUserProfile.accept.subject=Benvenuto in {0}\!
+notification.createUserProfile.accept.content=Congratulazioni\! Il tuo
+nuovo profilo su {0} è stato creato. I dettagli del profilo sono\: \n\nNome
utente \: {1} \nIl tuo nome\: {2} \nE-mail \: {3} \n\nSe hai dimenticato
la password la puoi resettare qui: {4}.
notification.createUserProfile.reject=La tua richiesta di creazione di profilo
utente è stata rigettata.
fact.submitter=Submitter
Modified:
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties?rev=1490359&r1=1490358&r2=1490359&view=diff
==============================================================================
---
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties
(original)
+++
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties
Thu Jun 6 16:54:17 2013
@@ -498,6 +498,8 @@ fact.isAuthenticated=Is Authenticated?
select.one=(select one)
decision.createUserProfile=New user profile <strong>{2}</strong>
+notification.createUserProfile.accept.subject=Bem-vindo ao {0}\!
+notification.createUserProfile.accept.content=Parabéns\! Seu novo perfil em
{0} foi criado. Seguem os detalhes\: \n\nLogin:\: {1} \nNome \: {2} \nE-Mail:
\: {3} \n\nSe você esquecer sua senha você pode resetá-la em {4}.
notification.createUserProfile.reject=Your request to create a user profile
was rejected.
fact.submitter=Submitter
Modified:
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties?rev=1490359&r1=1490358&r2=1490359&view=diff
==============================================================================
---
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties
(original)
+++
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties
Thu Jun 6 16:54:17 2013
@@ -20,6 +20,9 @@
# the "default" template. Any other template i18n file should
# be renamed in a similar way, e.g. "mytemplate.properties" under
i18n/templates
#
+# This URL useful to convert from Chinese characters to the escaped unicode
required
+# by this property file: http://www.endmemo.com/unicode/unicodeconverter.php
+#
# Common things
# NLS_MESSAGEFORMAT_VAR
@@ -483,6 +486,8 @@ fact.isAuthenticated=\u662f\u5426\u7ecf\
select.one=\uff08\u9009\u62e9\u4e00\u9879\uff09
decision.createUserProfile=\u65b0\u5efa\u7528\u6237\u6982\u8981\u4fe1\u606f
<strong>{2}</strong>
+notification.createUserProfile.accept.subject=\u6B22\u8FCE\u60A8\u6765\u5230
{0}\!
+notification.createUserProfile.accept.content=\u606D\u559C\u60A8\uFF01\u4F60\u7684\u5E10\u53F7
{0}
\u5DF2\u7ECF\u521B\u9020\u6210\u529F\u4E86\u3002\u4F60\u7684\u4E2A\u4EBA\u8D44\u6599\u5982\u4E0B:
\n\n\u5E10\u53F7\: {1} \n\u60A8\u7684\u59D3\u540D\: {2} \n\u90AE\u7BB1\: {3}
\n\n\u5982\u679C\u60A8\u5FD8\u4E86\u5BC6\u7801\uFF0C\u60A8\u53EF\u5728\u4EE5\u4E0B\u7F51\u5740\u91CD\u7F6E
{4}.
notification.createUserProfile.reject=\u62d2\u7edd\u60a8\u521b\u5efa\u7528\u6237\u6982\u8981\u4fe1\u606f\u7684\u8bf7\u6c42\u3002
fact.submitter=\u63d0\u4ea4\u8005
Modified: incubator/jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml?rev=1490359&r1=1490358&r2=1490359&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml
(original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml Thu
Jun 6 16:54:17 2013
@@ -18,6 +18,11 @@
under the License.
-->
+<!-- This file differs from the production web.xml distributed in
+ src/main/webapp/WEB-INF in that both the JDBC JNDI references
+ and container-managed authentication are enabled.
+-->
+
<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
