Author: metskem
Date: Thu Feb 19 16:41:54 2009
New Revision: 745919
URL: http://svn.apache.org/viewvc?rev=745919&view=rev
Log:
3.0.0-svn-71 JSPWIKI-508 - Simplified Chinese translation updated, thanks to
David Gao
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources_zh_CN.properties
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=745919&r1=745918&r2=745919&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Feb 19 16:41:54 2009
@@ -1,3 +1,9 @@
+2008-02-19 Harry Metske <[email protected]>
+
+ * 3.0.0-svn-71
+
+ * JSPWIKI-508 - Simplified Chinese translation updated, thanks to
David Gao
+
2008-02-15 Harry Metske <[email protected]>
* 3.0.0-svn-70
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=745919&r1=745918&r2=745919&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
Thu Feb 19 16:41:54 2009
@@ -21,7 +21,6 @@
# Date stamp format when showing just the date.
common.dateformat=yyyy-MM-dd, EEEE
# "Unknown author"
-
common.unknownauthor=\u672a\u7f72\u540d\u4f5c\u8005
# Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments
for workflow
decision.editWikiApproval=\u7f16\u8f91\u9875\u9762 {2}
@@ -49,7 +48,7 @@
rename.unknownerror=\u53d1\u751f\u672a\u77e5\u9519\u8bef\uff08{0}\uff09
# Login.jsp
#login.error.capslock=Invalid login (please check your Caps Lock key) #obsolete
-login.error.password=\u65e0\u6548\u767b\u5f55\u3002
+login.error.password=\u7528\u6237\u540d\u6216\u5bc6\u7801\u9519\u8bef\u3002
login.error.noaccess=\u5bf9\u4e0d\u8d77\uff0c\u60a8\u65e0\u6743\u64cd\u4f5c\u3002
# Lostpassword.jsp
@@ -155,35 +154,129 @@
varmgr.authenticated=\u5df2\u9a8c\u8bc1
varmgr.asserted=\u5c1a\u5f85\u9a8c\u8bc1
varmgr.anonymous=\u533f\u540d
+varmgr.dateformat.invalid.format=\u6307\u5b9a\u7684\u65e5\u671f\u683c\u5f0f\u65e0\u6548\uff1a
+varmgr.dateformat.noformat=\u672a\u6307\u5b9a\u65e5\u671f\u683c\u5f0f\u3002
+varmgr.dateformat.invalid.parm=\u65e0\u6cd5\u8bc6\u522b\u7684\u53c2\u6570\uff1a
+###############################################################################
+## Default Resource Bundle file for the Stripes Framework. Values should be
+## placed in here for the following:
+## - Form Field Labels, unless you want users to see a non-localized, non-
+## pretty name from the form field declaration (prettied up a little).
+## - Error messages for:
+## - Standard validation error messages
+## - Converter error messages
+## - Error messages used in your custom ActionBean classes
+###############################################################################
+
+# Resource strings used by the <stripes:errors> tag when there are no nested
tags
+stripes.errors.header=<div style="color:#b72222; font-weight:
bold">\u8bf7\u4fee\u590d\u4ee5\u4e0b\u9519\u8bef\uff1a</div><ol>
+stripes.errors.beforeError=<li style="color: #b72222;">
+stripes.errors.afterError=</li>
+stripes.errors.footer=</ol>
+# Resource strings used by the <stripes:errors> tag when displaying errors for
a
+# specific field (e.g. <stripes:errors field="password"/>). If not supplied the
+# values above will be used instead.
+stripes.fieldErrors.header=
+stripes.fieldErrors.beforeError=<span style="color: #b72222;">
+stripes.fieldErrors.afterError=</span><br />
+stripes.fieldErrors.footer=
+# Resource strings used by the stripes:messages tag
+stripes.messages.header=<ul class="messages">
+stripes.messages.beforeMessage=<li>
+stripes.messages.afterMessage=</li>
+stripes.messages.footer=</ul>
+# Validation error messages produced by Stripes' built-in converter classes.
These
+# are default error messages and can be overridden on per-field and per-form
levels.
+# Using the 'invalidNumber' error for a field 'age' of a form posting to
+# '/user/Profile.action', the keys looked for (in order) would be:
+# 1: /user/Profile.action.age.invalidNumber
+# 2: /user/Profile.action.age.errorMessage
+# 3: age.errorMessage
+# 4: /user/Profile.action.invalidNumber
+# 5: converter.number.invalidNumber
+converter.number.invalidNumber={0}
\u5b57\u6bb5\u7684\u503c\uff08{1}\uff09\u5fc5\u987b\u4e3a\u6709\u6548\u6570\u5b57\u3002
+converter.byte.outOfRange={0}
\u81ea\u52a8\u7684\u503c\uff08{1}\uff09\u5df2\u8d85\u51fa {2} \u81f3 {3}
\u7684\u8303\u56f4
+converter.short.outOfRange={0}
\u81ea\u52a8\u7684\u503c\uff08{1}\uff09\u5df2\u8d85\u51fa {2} \u81f3 {3}
\u7684\u8303\u56f4
+converter.integer.outOfRange={0}
\u81ea\u52a8\u7684\u503c\uff08{1}\uff09\u5df2\u8d85\u51fa {2} \u81f3 {3}
\u7684\u8303\u56f4
+converter.float.outOfRange={0}
\u81ea\u52a8\u7684\u503c\uff08{1}\uff09\u5df2\u8d85\u51fa {2} \u81f3 {3}
\u7684\u8303\u56f4
+converter.enum.notAnEnumeratedValue=\u503c\u201c{1}\u201d\u5bf9 {0}
\u5b57\u6bb5\u6765\u8bf4\u662f\u65e0\u6548\u503c
+converter.date.invalidDate={0}
\u5b57\u6bb5\u7684\u503c\uff08{1}\uff09\u5fc5\u987b\u4e3a\u6709\u6548\u65e5\u671f\u3002
+converter.email.invalidEmail=\u8f93\u5165\u7684\u503c\uff08{1}\uff09\u4e0d\u662f\u6709\u6548\u7684\u90ae\u4ef6\u5730\u5740
+converter.creditCard.invalidCreditCard=\u8f93\u5165\u7684\u503c\uff08{1}\uff09\u4e0d\u662f\u6709\u6548\u7684\u4fe1\u7528\u5361\u53f7\u7801
+# Validation error messages produced by Stripes' annotation based validations.
These
+# are default error messages and can be overridden on per-field and per-form
levels.
+# Using the 'valueNotPresent' required field error for a field 'username' of a
form
+# posting to '/user/Register.action', the keys looked for (in order) would be:
+# 1: /user/Register.action.username.valueNotPresent
+# 2: /user/Register.action.username.errorMessage
+# 3: username.errorMessage
+# 4: /user/Register.action.valueNotPresent
+# 5: validation.required.valueNotPresent
+validation.required.valueNotPresent={0} \u4e3a\u5fc5\u586b\u5b57\u6bb5
+validation.minlength.valueTooShort={0} \u5fc5\u987b\u81f3\u5c11\u6709 {2}
\u4e2a\u5b57\u7b26
+validation.maxlength.valueTooLong={0} \u4e0d\u80fd\u8d85\u8fc7 {2}
\u4e2a\u5b57\u7b26
+validation.minvalue.valueBelowMinimum={0}
\u5141\u8bb8\u7684\u6700\u5c0f\u503c\u4e3a {2}
+validation.maxvalue.valueAboveMaximum={0}
\u5141\u8bb8\u7684\u6700\u5927\u503c\u4e3a {2}
+validation.mask.valueDoesNotMatch=<em>{1}</em> \u4e0d\u662f\u6709\u6548\u7684
{0}
+validation.expression.valueFailedExpression=\u4e3a {0}
\u5b57\u6bb5\u63d0\u4f9b\u7684\u503c\uff08{1}\uff09\u65e0\u6548
+validation.file.postBodyTooBig={3} KB
\u7684\u603b\u4e0a\u4f20\u5927\u5c0f\u8d85\u8fc7\u4e86\u6700\u5927\u503c {2} KB
+# Messages produced by JSPWiki's ActionBeans
+profile.nameCollision={0} \u5df2\u88ab\u4f7f\u7528\u3002
+profile.noPasswordMatch=\u5bc6\u7801\u5fc5\u987b\u5339\u914d
+# Formerly saveError
+profile.saveError=\u4fdd\u5b58\u6982\u8981\u662f\u53d1\u751f\u672a\u77e5\u9519\u8bef
######################################################################
# JSPWiki field labels used by <stripes:*> tags
######################################################################
+# Formerly login.login
loginName=\u767b\u5f55\u540d
+# Formerly login.password
password=\u5bc6\u7801
+# Formerly login.remember
remember=\u662f\u5426\u8bb0\u4f4f\u6211\u7684\u4fe1\u606f\uff1f
-login=\u767b\u5f55\u540d
+# Formerly login.submit.login
+login=\u767b\u5f55
+# Formerly login.lostpw.name, prefs.email
email=\u7535\u5b50\u90ae\u4ef6\u5730\u5740
-resetPassword=\u91cd\u8bbe\u5bc6\u7801\uff01
+# Formerly login.lostpw.submit
+resetPassword=\u91cd\u8bbe\u5bc6\u7801
+# Formerly prefs.loginname
profile.loginName=\u767b\u5f55\u540d
+# Formerly prefs.password
profile.password=\u5bc6\u7801
+# Formerly prefs.password2
passwordAgain=\u5bc6\u7801\u9a8c\u8bc1
+# Formerly prefs.fullname
profile.fullname=\u540d\u5b57
+# Formerly prefs.save.submit
org.apache.wiki.action.UserProfileActionBean.save=\u4fdd\u5b58\u6982\u8981\u4fe1\u606f
-assertedName=\u540d\u5b57
-editor=\u7f16\u8f91\u5668
+#Formerly prefs.assertedname
+assertedName=
+#Formerly edit.chooseeditor
+editor=\u540d\u5b57
+#Formerly prefs.user.sectionediting
sectionEditing=\u6bb5\u843d\u7f16\u8f91
+#Formerly prefs.user.skin
skin=\u5916\u8868
+#Formerly prefs.user.language
locale=\u8bed\u8a00
+#Formerly prefs.user.orientation
orientation=\u83dc\u5355\u4f4d\u7f6e
+#Formerly prefs.user.orientation.left
Orientation.LEFT=\u5de6\u4fa7
+#Formerly prefs.user.orientation.right
Orientation.RIGHT=\u53f3\u4fa7
+#Formerly prefs.user.timeformat
timeFormat=\u65f6\u95f4\u683c\u5f0f
+#Formerly prefs.user.timezone
timeZone=\u65f6\u533a
-org.apache.wiki.action.UserPreferencesActionBean.save=\u4fdd\u5b58\u7528\u6237\u9996\u9009\u9879
-clearAssertedName=\u6e05\u9664\u7528\u6237\u9996\u9009\u9879
+#Formerly prefs.save.prefs.submit
+org.apache.wiki.action.UserPreferencesActionBean.save=\u4fdd\u5b58\u504f\u597d
+# Formerly prefs.clear.submit
+clearAssertedName=\u91cd\u7f6e\u504f\u597d
#Copied from etc/i18n/templates/default.properties.
newgroup.name=\u540d\u5b57
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources_zh_CN.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources_zh_CN.properties?rev=745919&r1=745918&r2=745919&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources_zh_CN.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources_zh_CN.properties
Thu Feb 19 16:41:54 2009
@@ -54,4 +54,13 @@
plugin.listlocks.locked.by=\u9501\u5b9a\u8005\u4e3a
plugin.listlocks.acquired=\u5df2\u83b7\u5f97
plugin.listlocks.expires=\u5df2\u8fc7\u671f
-plugin.listlocks.no.locks.exist=\u76ee\u524d\u4e0d\u5b58\u5728\u9501\u3002
\ No newline at end of file
+plugin.listlocks.no.locks.exist=\u76ee\u524d\u4e0d\u5b58\u5728\u9501\u3002
+
+# InsertPage plugin
+plugin.insert.notfound=\u9875\u9762\u63d0\u4f9b\u7a0b\u5e8f\u627e\u4e0d\u5230\u9875\u9762\u3002
+plugin.insert.recursion=\u9519\u8bef\uff1a\u5faa\u73af\u5f15\u7528 --
\u4e0d\u80fd\u5728\u9875\u9762\u4e2d\u63d2\u5165\u8fd9\u4e2a\u9875\u9762\u672c\u8eab\uff01
+plugin.insert.nopermission=\u65e0\u6743\u67e5\u770b\u8fd9\u4e2a\u63d2\u5165\u7684\u9875\u9762\u3002
+plugin.insert.nopage1=\u6ca1\u6709\u9875\u9762\u540d\u4e3a
+plugin.insert.nopage2=\u60a8\u60f3\u8981
+plugin.insert.nopage3=\u521b\u5efa\u5b83\uff1f
+plugin.insert.definepage=\u60a8\u5df2\u7ecf\u5b9a\u4e49\u4e86\u4e00\u4e2a\u9875\u9762\uff01
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties?rev=745919&r1=745918&r2=745919&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties
Thu Feb 19 16:41:54 2009
@@ -67,6 +67,7 @@
editgroup.memberlist=\u8be5\u7ec4\u7684\u6210\u5458\u8d44\u683c\u3002\u8f93\u5165\u6bcf\u4e2a\u7528\u6237\u7684\u540d\u79f0\u6216
Wiki \u540d\uff0c\u7528\u56de\u8f66\u7b26\u5206\u9694\u3002
editgroup.savehelp=\u5355\u51fb\u201c\u4fdd\u5b58\u7ec4\u201d\uff0c\u8be5\u7ec4\u5c06\u88ab\u4fdd\u5b58\u4e3a
<strong>{0}</strong>\u3002\u53ef\u4ee5\u5728\u9875\u9762\u8bbf\u95ee\u63a7\u5236\u8868\uff08ACL\uff09\u6307\u5b9a\u540d\u79f0\u3002
editgroup.submit.save=\u4fdd\u5b58\u7ec4
+editgroup.illegalname=\u7ec4\u540d {1}
\u975e\u6cd5\u3002\u8bf7\u9009\u62e9\u5176\u4ed6\u540d\u79f0\uff01
# Favorites.jsp
fav.myfavorites=\u6211\u7684\u6536\u85cf\u5939
@@ -100,8 +101,8 @@
group.tab=\u67e5\u770b\u7ec4
#replaced by grp.deletegroup.confirm
-#group.areyousure=Are you sure you want to permanently delete group
"{0}"? \
-# Users might not be able to access pages whose ACLS contain this group.
\\n\\n \
+#group.areyousure=Are you sure you want to permanently delete group
"{0}"? \
+# Users might not be able to access pages whose ACLS contain this group.
\\n\\n \
# If you click OK, the group will be removed immediately.
group.doesnotexist=\u8be5\u7ec4\u4e0d\u5b58\u5728\u3002
group.createsuggestion=\u4e3a\u4ec0\u4e48\u4e0d {0}
@@ -189,7 +190,7 @@
# LoginContent.jsp
login.tab=\u767b\u5f55\u540d
-login.title=\u767b\u5f55
+login.title=\u767b\u5f55\u540d
login.heading.login=\u767b\u5f55 {0}
login.help=\u8bf7\u7528\u60a8\u7684\u767b\u5f55\u540d\u548c\u5bc6\u7801\u767b\u5f55\u3002
login.errorprefix=\u9519\u8bef\uff1a
@@ -203,6 +204,8 @@
login.lostpw.getnew=\u83b7\u53d6\u65b0\u5bc6\u7801\uff01
login.lostpw.heading=\u91cd\u8bbe\u5bc6\u7801
login.lostpw.help=\u4e22\u5931\u6216\u5fd8\u8bb0\u4e86\u5bc6\u7801\uff1f\u5728\u6b64\u8f93\u5165\u6ce8\u518c\u4f7f\u7528\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u3002
+login.lostpw.name=\u5e10\u6237\u7535\u5b50\u90ae\u4ef6
+login.lostpw.submit=\u91cd\u8bbe\u5bc6\u7801\uff01
login.lostpw.reset.clickhere=\u5355\u51fb\u6b64\u5904
login.lostpw.reset.login=\u4e00\u6536\u5230\u65b0\u5bc6\u7801\uff0c{0}
\u5c31\u4f1a\u767b\u5f55\u3002
login.register.tab=\u6ce8\u518c\u65b0\u7528\u6237
@@ -306,6 +309,9 @@
prefs.groups=\u7ec4
prefs.creationdate=\u521b\u5efa\u65e5\u671f
prefs.profile.lastmodified=\u66f4\u65b0\u65e5\u671f
+# Enumerated types
+Orientation.LEFT=\u5de6\u4fa7
+Orientation.RIGHT=\u53f3\u4fa7
# Workflow generic messages
workflow.tab=\u5de5\u4f5c\u6d41
workflow.heading=\u5de5\u4f5c\u6d41\u9879\u76ee
@@ -454,8 +460,8 @@
javascript.edit.toolbar.makeSelection=\u8bf7\u5148\u8fdb\u884c\u9009\u62e9\u3002
javascript.edit.resize=\u62d6\u52a8\u6765\u8c03\u6574\u6587\u672c\u533a\u7684\u5927\u5c0f
javascript.edit.areyousure=\u5982\u679c\u6ca1\u6709\u5355\u51fb\u201c\u4fdd\u5b58\u201d\u6309\u94ae\u6240\u505a\u7684\u66f4\u6539\u5c06\u4e22\u5931\u3002\u662f\u5426\u8981\u9000\u51fa\u6b64\u9875\u9762\uff1f
-javascript.favs.show=\u5355\u51fb\u663e\u793a\u6536\u85cf\u5939
-javascript.favs.hide=\u5355\u51fb\u9690\u85cf\u6536\u85cf\u5939
+javascript.favorites.show=\u5355\u51fb\u663e\u793a\u6536\u85cf\u5939
+javascript.favorites.hide=\u5355\u51fb\u9690\u85cf\u6536\u85cf\u5939
javascript.quick.edit=[\u7f16\u8f91]
javascript.quick.edit.title=\u7f16\u8f91\u6bb5\u843d {0}...
javascript.collapse=\u5355\u51fb\u6298\u53e0
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=745919&r1=745918&r2=745919&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Thu Feb 19
16:41:54 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "70";
+ public static final String BUILD = "71";
/**
* This is the generic version string you should use
