jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1225830 [2/4] - in /incubator/jspwiki/trunk/src/WebContent: WEB-INF/classes/ WEB-INF/classes/templates/ templates/default/editors/ templates/default/layout/
Date Fri, 30 Dec 2011 14:02:29 GMT
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=1225830&r1=1225829&r2=1225830&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 Fri Dec 30 14:02:28 2011
@@ -42,119 +42,119 @@ common.timeformat=HH:mm:ss
 # Date stamp format when showing just the date.
 common.dateformat=yyyy-MM-dd, EEEE
 # "Unknown author"
-common.unknownauthor=\u672a\u7f72\u540d\u4f5c\u8005
+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}
+decision.editWikiApproval=\u7F16\u8F91\u9875\u9762 {2}
 # Security
 
-security.error.noaccess.logged=\u60a8\u65e0\u6743\u8bbf\u95ee\u201c{0}\u201d\u3002\u662f\u5426\u8981\u4ee5\u5176\u4ed6\u7528\u6237\u7684\u8eab\u4efd\u767b\u5f55\uff1f
-security.error.noaccess=\u60a8\u65e0\u6743\u8bbf\u95ee\u201c{0}\u201d\u3002\u8bf7\u5148\u767b\u5f55\u3002
-security.error.wrongip=\u5c1d\u8bd5\u4ee5\u5176\u4ed6 IP \u5730\u5740\u53d1\u8d34\u3002
-security.error.createprofilebeforelogin=\u53ea\u6709\u767b\u5f55\u540e\u624d\u80fd\u521b\u5efa\u6982\u8981\u6587\u4ef6\u3002
-security.error.blankpassword=\u5bc6\u7801\u4e0d\u80fd\u4e3a\u7a7a
-security.error.passwordnomatch=\u5bc6\u7801\u4e0d\u5339\u914d
-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.noaccess.logged=\u60A8\u65E0\u6743\u8BBF\u95EE\u201C{0}\u201D\u3002\u662F\u5426\u8981\u4EE5\u5176\u4ED6\u7528\u6237\u7684\u8EAB\u4EFD\u767B\u5F55\uFF1F
+security.error.noaccess=\u60A8\u65E0\u6743\u8BBF\u95EE\u201C{0}\u201D\u3002\u8BF7\u5148\u767B\u5F55\u3002
+security.error.wrongip=\u5C1D\u8BD5\u4EE5\u5176\u4ED6 IP \u5730\u5740\u53D1\u8D34\u3002
+security.error.createprofilebeforelogin=\u53EA\u6709\u767B\u5F55\u540E\u624D\u80FD\u521B\u5EFA\u6982\u8981\u6587\u4EF6\u3002
+security.error.blankpassword=\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A
+security.error.passwordnomatch=\u5BC6\u7801\u4E0D\u5339\u914D
+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
 # These should roughly match whatever is used in default.properties for UserProfile.jsp
-security.user.loginname=\u767b\u5f55\u540d
-security.user.fullname=\u5168\u540d
-security.user.email=\u7535\u5b50\u90ae\u4ef6\u5730\u5740
+security.user.loginname=\u767B\u5F55\u540D
+security.user.fullname=\u5168\u540D
+security.user.email=\u7535\u5B50\u90AE\u4EF6\u5730\u5740
 # Renaming
 
-rename.empty=\u65b0\u9875\u9762\u7684\u540d\u79f0\u4e3a\u7a7a\u3002
-rename.error.title=\u65e0\u6cd5\u91cd\u547d\u540d\u9875\u9762
-rename.error.reason=\u539f\u56e0\uff1a
-rename.identical=\u9875\u9762\u540d\u79f0\u76f8\u540c\u3002
-rename.exists=\u9875\u9762\u201c{1}\u201d\u5df2\u5b58\u5728\u3002\u8bf7\u66f4\u6539\u65b0\u540d\u79f0\uff0c\u6216\u8005\u5148\u5220\u9664\u9875\u9762\u201c{1}\u201d\u3002
-rename.unknownerror=\u53d1\u751f\u672a\u77e5\u9519\u8bef\uff08{0}\uff09
+rename.empty=\u65B0\u9875\u9762\u7684\u540D\u79F0\u4E3A\u7A7A\u3002
+rename.error.title=\u65E0\u6CD5\u91CD\u547D\u540D\u9875\u9762
+rename.error.reason=\u539F\u56E0\uFF1A
+rename.identical=\u9875\u9762\u540D\u79F0\u76F8\u540C\u3002
+rename.exists=\u9875\u9762\u201C{1}\u201D\u5DF2\u5B58\u5728\u3002\u8BF7\u66F4\u6539\u65B0\u540D\u79F0\uFF0C\u6216\u8005\u5148\u5220\u9664\u9875\u9762\u201C{1}\u201D\u3002
+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=\u7528\u6237\u540d\u6216\u5bc6\u7801\u9519\u8bef\u3002
-login.error.noaccess=\u5bf9\u4e0d\u8d77\uff0c\u60a8\u65e0\u6743\u64cd\u4f5c\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
 
 # 0 = login name, 1 = password, 2 = URL, 3 = Application name (as signature)
 # This is text, not HTML.
-lostpwd.newpassword.email=\u6309\u7167\u8981\u6c42\uff0c\u767b\u5f55\u201c{0}\u201d\u7684\u65b0\u5bc6\u7801\u4e3a\u201c{1}\u201d\n\n\u60a8\u53ef\u80fd\u4ee5\u201c{2}\u201d\u8fdb\u884c\u4e86\u767b\u5f55\u3002\n\n-- {3}
-lostpwd.newpassword.subject={0} \u7684\u65b0\u5bc6\u7801
-lostpwd.nouser=\u627e\u4e0d\u5230\u7528\u6237\u6216\u7535\u5b50\u90ae\u4ef6\u201c{0}\u201d\u3002
-lostpwd.nomail=\u5185\u90e8\u9519\u8bef\uff1a\u65e0\u6cd5\u53d1\u9001\u7535\u5b50\u90ae\u4ef6\uff01\u8bf7\u4e0e\u7ad9\u70b9\u7ba1\u7406\u5458\u8054\u7cfb\u3002
-lostpwd.emailed=\u5df2\u5c06\u65b0\u5bc6\u7801\u53d1\u9001\u5230\u6240\u8bf7\u6c42\u5e10\u6237\u7684\u90ae\u7bb1\u4e2d\u3002
-lostpwd.reset.title=\u5bc6\u7801\u91cd\u8bbe
-lostpwd.reset.unable=\u65e0\u6cd5\u91cd\u8bbe\u5bc6\u7801\u3002\u8bf7\u91cd\u8bd5\u3002
-lostpwd.reset.blurb=\u662f\u5426\u4e22\u5931\u6216\u5fd8\u8bb0\u5bc6\u7801\uff1f\u8bf7\u5728\u6b64\u8f93\u5165\u5e10\u6237\u540d\u79f0\u6216\u7535\u5b50\u90ae\u4ef6\uff1a
-lostpwd.reset.submit=\u91cd\u8bbe\u5bc6\u7801\uff01
+lostpwd.newpassword.email=\u6309\u7167\u8981\u6C42\uFF0C\u767B\u5F55\u201C{0}\u201D\u7684\u65B0\u5BC6\u7801\u4E3A\u201C{1}\u201D\n\n\u60A8\u53EF\u80FD\u4EE5\u201C{2}\u201D\u8FDB\u884C\u4E86\u767B\u5F55\u3002\n\n-- {3}
+lostpwd.newpassword.subject={0} \u7684\u65B0\u5BC6\u7801
+lostpwd.nouser=\u627E\u4E0D\u5230\u7528\u6237\u6216\u7535\u5B50\u90AE\u4EF6\u201C{0}\u201D\u3002
+lostpwd.nomail=\u5185\u90E8\u9519\u8BEF\uFF1A\u65E0\u6CD5\u53D1\u9001\u7535\u5B50\u90AE\u4EF6\uFF01\u8BF7\u4E0E\u7AD9\u70B9\u7BA1\u7406\u5458\u8054\u7CFB\u3002
+lostpwd.emailed=\u5DF2\u5C06\u65B0\u5BC6\u7801\u53D1\u9001\u5230\u6240\u8BF7\u6C42\u5E10\u6237\u7684\u90AE\u7BB1\u4E2D\u3002
+lostpwd.reset.title=\u5BC6\u7801\u91CD\u8BBE
+lostpwd.reset.unable=\u65E0\u6CD5\u91CD\u8BBE\u5BC6\u7801\u3002\u8BF7\u91CD\u8BD5\u3002
+lostpwd.reset.blurb=\u662F\u5426\u4E22\u5931\u6216\u5FD8\u8BB0\u5BC6\u7801\uFF1F\u8BF7\u5728\u6B64\u8F93\u5165\u5E10\u6237\u540D\u79F0\u6216\u7535\u5B50\u90AE\u4EF6\uFF1A
+lostpwd.reset.submit=\u91CD\u8BBE\u5BC6\u7801\uFF01
 # TraditionalDiffProvider
 
-diff.traditional.added=\u5728\u7b2c {0} \u884c\u6dfb\u52a0\u4e86 {1}
-diff.traditional.changed=\u5728\u7b2c {0} \u884c\u66f4\u6539\u4e86 {1}
-diff.traditional.removed=\u5728\u7b2c {0} \u884c\u5220\u9664\u4e86 {1}
-diff.traditional.oneline=\u4e00\u884c
-diff.traditional.lines={2} \u884c
+diff.traditional.added=\u5728\u7B2C {0} \u884C\u6DFB\u52A0\u4E86 {1}
+diff.traditional.changed=\u5728\u7B2C {0} \u884C\u66F4\u6539\u4E86 {1}
+diff.traditional.removed=\u5728\u7B2C {0} \u884C\u5220\u9664\u4E86 {1}
+diff.traditional.oneline=\u4E00\u884C
+diff.traditional.lines={2} \u884C
 # InputValidator
 
-validate.unsafechars={0} \u4e0d\u80fd\u5305\u542b\u8fd9\u4e9b\u5b57\u7b26\uff1a{1}
-validate.invalidemail={0} \u65e0\u6548
-validate.cantbenull={0} \u4e0d\u80fd\u4e3a\u7a7a
+validate.unsafechars={0} \u4E0D\u80FD\u5305\u542B\u8FD9\u4E9B\u5B57\u7B26\uFF1A{1}
+validate.invalidemail={0} \u65E0\u6548
+validate.cantbenull={0} \u4E0D\u80FD\u4E3A\u7A7A
 # UserProfileTag
 
-userprofile.nogroups=\uff08\u65e0\uff09
-userprofile.noroles=\uff08\u65e0\uff09
+userprofile.nogroups=\uFF08\u65E0\uFF09
+userprofile.noroles=\uFF08\u65E0\uFF09
 # NewGroup.jsp
-newgroup.exists=\u7ec4\u201c{0}\u201d\u5df2\u5b58\u5728\u3002\u8bf7\u5c1d\u8bd5\u5176\u4ed6\u540d\u79f0\u3002
+newgroup.exists=\u7EC4\u201C{0}\u201D\u5DF2\u5B58\u5728\u3002\u8BF7\u5C1D\u8BD5\u5176\u4ED6\u540D\u79F0\u3002
 # JSPWikiMarkupParser
 
-markupparser.error.invalidset=\u627e\u5230\u65e0\u6548 SET\uff1a{0}
-markupparser.error.nointerwikiref=\u5728 Wiki \u5c5e\u6027\u4e2d\u672a\u5b9a\u4e49\u540d\u4e3a\u201c{0}\u201d\u7684 InterWiki \u5f15\u7528\uff01
-markupparser.error.parserfailure=\u89e3\u6790\u5931\u8d25\uff1a{0}
-markupparser.error.javascriptattempt=\u5c1d\u8bd5\u8f93\u51fa JavaScript\uff01
-markupparser.link.create=\u521b\u5efa\u201c{0}\u201d
+markupparser.error.invalidset=\u627E\u5230\u65E0\u6548 SET\uFF1A{0}
+markupparser.error.nointerwikiref=\u5728 Wiki \u5C5E\u6027\u4E2D\u672A\u5B9A\u4E49\u540D\u4E3A\u201C{0}\u201D\u7684 InterWiki \u5F15\u7528\uFF01
+markupparser.error.parserfailure=\u89E3\u6790\u5931\u8D25\uFF1A{0}
+markupparser.error.javascriptattempt=\u5C1D\u8BD5\u8F93\u51FA JavaScript\uFF01
+markupparser.link.create=\u521B\u5EFA\u201C{0}\u201D
 # Captcha.jsp
-captcha.js.humancheckcomplete.alert=\u8bf7\u6b63\u786e\u8fa8\u8ba4 cats\u3002
-captcha.asirra.please.select=\u8bf7\u9009\u62e9\u6240\u6709\u6709\u732b\u7684\u7167\u7247\uff1a
-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.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.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
-install.jsp.security.sec.conf.opt2=\u4ec5\u4f7f\u7528\u5bb9\u5668\u5b89\u5168\u6027
-install.jsp.security.sec.conf.desc=\u7f3a\u7701\u60c5\u51b5\u4e0b\uff0cJSPWiki \u4f7f\u7528\u57fa\u4e8e JAAS \u7684\u5b89\u5168\u7cfb\u7edf\u7ba1\u7406\u5bf9\u8d44\u6e90\u7684\u8bbf\u95ee\u3002\u5982\u679c\u60a8\u5df2\u7ecf\u5728 <code>web.xml</code> \u6587\u4ef6\u4e2d\u542f\u7528\u4e86\u5bb9\u5668\u5b89\u5168\u7ea6\u675f\uff08container security constraints\uff09\uff0c\u5b83\u4f1a\u4fdd\u7559\u8fd9\u4e9b\u8bbe\u7f6e\uff0c\u4f7f\u8fd9\u4e9b\u8bbe\u7f6e\u4ecd\u7136\u6709\u6548\u3002\u5982\u679c\u7981\u7528 JAAS \u5b89\u5168\u6027\uff0cJSPWiki \u53ef\u80fd\u4e0d\u4f1a\u6309\u7167\u60a8\u9884\u671f\u7684\u90a3\u6837\u8fd0\u884c\u3002\u4f46\u60a8\u5728\u8fdb\u884c\u6545\u969c\u8bca\u65ad\u7684\u65f6\u5019\u53ef\u80fd\u9700\u8981\u8fd9\u4e48\u505a \u2014\u2014 \u7981\u7528 JAAS \u5b89\u5168\u6027\u3002
-install.jsp.security.admaccount.label=\u7ba1\u7406\u5458\u5e10\u6237
-install.jsp.security.admaccount.enabled=\u5df2\u542f\u7528
-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
+captcha.js.humancheckcomplete.alert=\u8BF7\u6B63\u786E\u8FA8\u8BA4 cats\u3002
+captcha.asirra.please.select=\u8BF7\u9009\u62E9\u6240\u6709\u6709\u732B\u7684\u7167\u7247\uFF1A
+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.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.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
+install.jsp.security.sec.conf.opt2=\u4EC5\u4F7F\u7528\u5BB9\u5668\u5B89\u5168\u6027
+install.jsp.security.sec.conf.desc=\u7F3A\u7701\u60C5\u51B5\u4E0B\uFF0CJSPWiki \u4F7F\u7528\u57FA\u4E8E JAAS \u7684\u5B89\u5168\u7CFB\u7EDF\u7BA1\u7406\u5BF9\u8D44\u6E90\u7684\u8BBF\u95EE\u3002\u5982\u679C\u60A8\u5DF2\u7ECF\u5728 <code>web.xml</code> \u6587\u4EF6\u4E2D\u542F\u7528\u4E86\u5BB9\u5668\u5B89\u5168\u7EA6\u675F\uFF08container security constraints\uFF09\uFF0C\u5B83\u4F1A\u4FDD\u7559\u8FD9\u4E9B\u8BBE\u7F6E\uFF0C\u4F7F\u8FD9\u4E9B\u8BBE\u7F6E\u4ECD\u7136\u6709\u6548\u3002\u5982\u679C\u7981\u7528 JAAS \u5B89\u5168\u6027\uFF0CJSPWiki \u53EF\u80FD\u4E0D\u4F1A\u6309\u7167\u60A8\u9884\u671F\u7684\u90A3\u6837\u8FD0\u884C\u3002\u4F46\u60A8\u5728\u8FDB\u884C\u6545\u969C\u8BCA\u65AD\u7684\u65F6\u5019\u53EF\u80FD\u9700\u8981\u8FD9\u4E48\u505A \u2014\u2014 \u7981\u7528 JAAS \u5B89\u5168\u6027\u3002
+install.jsp.security.admaccount.label=\u7BA1\u7406\u5458\u5E10\u6237
+install.jsp.security.admaccount.enabled=\u5DF2\u542F\u7528
+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
 # Installer.java
-install.installer.unable.read.props=\u4e0d\u80fd\u8bfb\u53d6\u5c5e\u6027\uff1a{0}
+install.installer.unable.read.props=\u4E0D\u80FD\u8BFB\u53D6\u5C5E\u6027\uFF1A{0}
 install.installer.default.appname=MyWiki
-install.installer.default.pagedir=\u8bf7\u914d\u7f6e\uff01
-install.installer.props.saved=\u65b0\u7684\u5c5e\u6027\uff08properties\uff09\u5df2\u7ecf\u4fdd\u5b58\u3002\u9664\u975e\u8fd9\u662f\u60a8\u7b2c\u4e00\u6b21\u5b89\u88c5\uff0c\u5426\u5219\u8bf7\u91cd\u65b0\u542f\u52a8\u5bb9\u5668\uff08container\uff09\u3002\u5f80\u4e0b\u62c9\u4e00\u70b9\u67e5\u770b\u60a8\u7684\u65b0 jspwiki.properties\u3002
-install.installer.props.notsaved=\u65e0\u6cd5\u5199\u5165\u5c5e\u6027\uff1a{0}\u3002 \u8bf7\u5c06\u4e0b\u9762\u7684\u6587\u4ef6\u590d\u5236\u4e3a\u60a8\u7684 jspwiki.properties\n{1}
-install.installer.validate.baseurl=\u5fc5\u987b\u5bf9\u6b64 wiki \u5b9a\u4e49\u57fa\u672c URL\uff08base URL\uff09\u3002
-install.installer.validate.pagedir=\u5fc5\u987b\u5b9a\u4e49\u6587\u4ef6\u4fdd\u5b58\u7684\u4f4d\u7f6e\u3002
-install.installer.validate.appname=\u5fc5\u987b\u5b9a\u4e49\u5e94\u7528\u7a0b\u5e8f\u540d\u79f0\u3002
-install.installer.validate.workdir=\u5fc5\u987b\u5b9a\u4e49\u5de5\u4f5c\u76ee\u5f55\u3002
-install.installer.validate.logdir=\u5fc5\u987b\u5b9a\u4e49\u65e5\u5fd7\u76ee\u5f55\u3002
+install.installer.default.pagedir=\u8BF7\u914D\u7F6E\uFF01
+install.installer.props.saved=\u65B0\u7684\u5C5E\u6027\uFF08properties\uFF09\u5DF2\u7ECF\u4FDD\u5B58\u3002\u9664\u975E\u8FD9\u662F\u60A8\u7B2C\u4E00\u6B21\u5B89\u88C5\uFF0C\u5426\u5219\u8BF7\u91CD\u65B0\u542F\u52A8\u5BB9\u5668\uFF08container\uFF09\u3002\u5F80\u4E0B\u62C9\u4E00\u70B9\u67E5\u770B\u60A8\u7684\u65B0 jspwiki.properties\u3002
+install.installer.props.notsaved=\u65E0\u6CD5\u5199\u5165\u5C5E\u6027\uFF1A{0}\u3002 \u8BF7\u5C06\u4E0B\u9762\u7684\u6587\u4EF6\u590D\u5236\u4E3A\u60A8\u7684 jspwiki.properties\n{1}
+install.installer.validate.baseurl=\u5FC5\u987B\u5BF9\u6B64 wiki \u5B9A\u4E49\u57FA\u672C URL\uFF08base URL\uFF09\u3002
+install.installer.validate.pagedir=\u5FC5\u987B\u5B9A\u4E49\u6587\u4EF6\u4FDD\u5B58\u7684\u4F4D\u7F6E\u3002
+install.installer.validate.appname=\u5FC5\u987B\u5B9A\u4E49\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u3002
+install.installer.validate.workdir=\u5FC5\u987B\u5B9A\u4E49\u5DE5\u4F5C\u76EE\u5F55\u3002
+install.installer.validate.logdir=\u5FC5\u987B\u5B9A\u4E49\u65E5\u5FD7\u76EE\u5F55\u3002
 # RSSImageLinkTag
-rss.title=\u9875\u9762 {0} \u7684 RSS \u8ba2\u9605\u6e90
+rss.title=\u9875\u9762 {0} \u7684 RSS \u8BA2\u9605\u6E90
 # AttachmentManager
-attach.unwanted.file=\u4e0d\u9700\u8981\u7684\u6587\u4ef6\u540d\u79f0\u3002
-attach.empty.file=\u6587\u4ef6\u540d\u4e3a\u7a7a\u3002
-attach.parent.not.exist=\u7236\u9875\u9762\u4e0d\u5b58\u5728
+attach.unwanted.file=\u4E0D\u9700\u8981\u7684\u6587\u4EF6\u540D\u79F0\u3002
+attach.empty.file=\u6587\u4EF6\u540D\u4E3A\u7A7A\u3002
+attach.parent.not.exist=\u7236\u9875\u9762\u4E0D\u5B58\u5728
 # VariableManager
-varmgr.not.logged.in=\u672a\u767b\u5f55
-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
+varmgr.not.logged.in=\u672A\u767B\u5F55
+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:
@@ -167,7 +167,7 @@ varmgr.dateformat.invalid.parm=\u65e0\u6
 ###############################################################################
 
 # 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.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>
@@ -192,15 +192,15 @@ stripes.messages.footer=</ul>
 #      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
+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
@@ -210,19 +210,19 @@ converter.creditCard.invalidCreditCard=\
 #      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
+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
+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
+profile.saveError=\u4FDD\u5B58\u6982\u8981\u662F\u53D1\u751F\u672A\u77E5\u9519\u8BEF
 ######################################################################
 
 #  JSPWiki field labels used by <stripes:*> tags
@@ -230,134 +230,132 @@ profile.saveError=\u4fdd\u5b58\u6982\u89
 ######################################################################
 
 # Formerly login.login
-loginName=\u767b\u5f55\u540d
+loginName=\u767B\u5F55\u540D
 # Formerly login.password
-password=\u5bc6\u7801
+password=\u5BC6\u7801
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.remember.
-remember=\u662f\u5426\u8bb0\u4f4f\u6211\u7684\u4fe1\u606f\uff1f
+remember=\u662F\u5426\u8BB0\u4F4F\u6211\u7684\u4FE1\u606F\uFF1F
 # Formerly login.submit.login
-login=\u767b\u5f55
+login=\u767B\u5F55
 # Formerly login.lostpw.name, prefs.email
-email=\u7535\u5b50\u90ae\u4ef6\u5730\u5740
+email=\u7535\u5B50\u90AE\u4EF6\u5730\u5740
 # Formerly prefs.loginname
-profile.loginName=\u767b\u5f55\u540d
+profile.loginName=\u767B\u5F55\u540D
 # Formerly prefs.password
-profile.password=\u5bc6\u7801
+profile.password=\u5BC6\u7801
 # Formerly prefs.password2
-passwordAgain=\u5bc6\u7801\u9a8c\u8bc1
+passwordAgain=\u5BC6\u7801\u9A8C\u8BC1
 # Formerly prefs.fullname
-profile.fullname=\u540d\u5b57
+profile.fullname=\u540D\u5B57
 # Formerly prefs.save.submit
-org.apache.wiki.action.UserProfileActionBean.save=\u4fdd\u5b58\u6982\u8981\u4fe1\u606f
+org.apache.wiki.action.UserProfileActionBean.save=\u4FDD\u5B58\u6982\u8981\u4FE1\u606F
 #Formerly prefs.assertedname
 assertedName=???
 #Formerly edit.chooseeditor
-editor=\u540d\u5b57
+editor=\u540D\u5B57
 #Formerly prefs.user.sectionediting
-sectionEditing=\u6bb5\u843d\u7f16\u8f91
+sectionEditing=\u6BB5\u843D\u7F16\u8F91
 #Formerly prefs.user.skin
 skin=\u5916\u8868
 #Formerly prefs.user.language
-locale=\u8bed\u8a00
+locale=\u8BED\u8A00
 #Formerly prefs.user.orientation
-orientation=\u83dc\u5355\u4f4d\u7f6e
+orientation=\u83DC\u5355\u4F4D\u7F6E
 #Formerly prefs.user.orientation.left
-Orientation.LEFT=\u5de6\u4fa7
+Orientation.LEFT=\u5DE6\u4FA7
 #Formerly prefs.user.orientation.right
-Orientation.RIGHT=\u53f3\u4fa7
+Orientation.RIGHT=\u53F3\u4FA7
 #Formerly prefs.user.timeformat
-timeFormat=\u65f6\u95f4\u683c\u5f0f
+timeFormat=\u65F6\u95F4\u683C\u5F0F
 #Formerly prefs.user.timezone
-timeZone=\u65f6\u533a
+timeZone=\u65F6\u533A
 #Formerly prefs.save.prefs.submit
-org.apache.wiki.action.UserPreferencesActionBean.save=\u4fdd\u5b58\u504f\u597d
+org.apache.wiki.action.UserPreferencesActionBean.save=\u4FDD\u5B58\u504F\u597D
 # Formerly prefs.clear.submit
-clearAssertedName=\u91cd\u7f6e\u504f\u597d
+clearAssertedName=\u91CD\u7F6E\u504F\u597D
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-common.nopage=\u8be5\u9875\u4e0d\u5b58\u5728\u3002\u4e3a\u4ec0\u4e48\u4e0d{0}\uff1f
+common.nopage=\u8BE5\u9875\u4E0D\u5B58\u5728\u3002\u4E3A\u4EC0\u4E48\u4E0D{0}\uFF1F
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named info.deleteattachment.submit.
-org.apache.wiki.action.ViewActionBean.deleteAttachment=\u5220\u9664\u9644\u4ef6
+org.apache.wiki.action.ViewActionBean.deleteAttachment=\u5220\u9664\u9644\u4EF6
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named attach.add.submit.
-org.apache.wiki.action.ViewActionBean.upload=\u4e0a\u4f20
+org.apache.wiki.action.ViewActionBean.upload=\u4E0A\u4F20
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-attach.add.selectfile=\u9009\u62e9\u6587\u4ef6\uff1a
+attach.add.selectfile=\u9009\u62E9\u6587\u4EF6\uFF1A
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-attach.add.changenote=\u53d8\u66f4\u6ce8\u91ca\uff1a
+attach.add.changenote=\u53D8\u66F4\u6CE8\u91CA\uFF1A
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-edit.locked=\u7528\u6237 <strong>{0}</strong> \u5df2\u5f00\u59cb\u7f16\u8f91\u8be5\u9875\u9762\uff0c\u4f46\u8fd8\u672a\u4fdd\u5b58\u3002\u6211\u4e0d\u4f1a\u963b\u6b62\u60a8\u7f16\u8f91\u8be5\u9875\u9762\uff0c\u4f46\u662f\u8981\u77e5\u9053\u5176\u4ed6\u4eba\u53ef\u80fd\u4f1a\u5f88\u70e6\u3002\u7b49\u5f85\u9501\u5b9a\u8fc7\u671f\u6216\u522b\u4eba\u505c\u6b62\u7f16\u8f91\uff0c\u8fd9\u6837\u4f1a\u6bd4\u8f83\u793c\u8c8c\u3002\u9501\u5b9a\u4f1a\u5728 {1} \u5206\u949f\u540e\u8fc7\u671f\u3002
+edit.locked=\u7528\u6237 <strong>{0}</strong> \u5DF2\u5F00\u59CB\u7F16\u8F91\u8BE5\u9875\u9762\uFF0C\u4F46\u8FD8\u672A\u4FDD\u5B58\u3002\u6211\u4E0D\u4F1A\u963B\u6B62\u60A8\u7F16\u8F91\u8BE5\u9875\u9762\uFF0C\u4F46\u662F\u8981\u77E5\u9053\u5176\u4ED6\u4EBA\u53EF\u80FD\u4F1A\u5F88\u70E6\u3002\u7B49\u5F85\u9501\u5B9A\u8FC7\u671F\u6216\u522B\u4EBA\u505C\u6B62\u7F16\u8F91\uFF0C\u8FD9\u6837\u4F1A\u6BD4\u8F83\u793C\u8C8C\u3002\u9501\u5B9A\u4F1A\u5728 {1} \u5206\u949F\u540E\u8FC7\u671F\u3002
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-edit.restoring=\u5c06\u6062\u590d\u7248\u672c {2}\u3002\u5355\u51fb\u201c\u4fdd\u5b58\u201d\u6765\u8fdb\u884c\u6062\u590d\u3002\u4e5f\u53ef\u4ee5\u5728\u6062\u590d\u9875\u9762\u524d\u8fdb\u884c\u7f16\u8f91\u3002
+edit.restoring=\u5C06\u6062\u590D\u7248\u672C {2}\u3002\u5355\u51FB\u201C\u4FDD\u5B58\u201D\u6765\u8FDB\u884C\u6062\u590D\u3002\u4E5F\u53EF\u4EE5\u5728\u6062\u590D\u9875\u9762\u524D\u8FDB\u884C\u7F16\u8F91\u3002
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.sneakpreview.
-livePreview=\u62a2\u5148\u9884\u89c8
+livePreview=\u62A2\u5148\u9884\u89C8
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.name.
-author=\u60a8\u7684\u540d\u79f0(<span class='accesskey'>N</span>)
+author=\u60A8\u7684\u540D\u79F0(<span class\='accesskey'>N</span>)
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.submit.
-save=\u4fdd\u5b58
+save=\u4FDD\u5B58
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.preview.submit.
-preview=\u9884\u89c8
+preview=\u9884\u89C8
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit.
-cancel=\u53d6\u6d88
+cancel=\u53D6\u6D88
 #Formerly named install.jsp.instr.submit.
-org.apache.wiki.action.InstallActionBean.save=\u914d\u7f6e\uff01
+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
+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
+properties.jspwiki.jspwiki_baseURL=\u57FA\u672C URL\uFF08Base URL\uFF09
 #Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir.
-properties.jspwiki.jspwiki_workDir=\u5de5\u4f5c\u76ee\u5f55
+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
+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
+properties.priha.priha_provider_defaultProvider_directory=\u9875\u9762\u5B58\u50A8
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.changenote.. Formerly named changenote.
-changeNote=\u66f4\u6539\u6ce8\u91ca
+changeNote=\u66F4\u6539\u6CE8\u91CA
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.find.submit.
-org.apache.wiki.action.EditActionBean.findAndReplace=\u66ff\u6362
+org.apache.wiki.action.EditActionBean.findAndReplace=\u66FF\u6362
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named grp.savegroup.
-org.apache.wiki.action.GroupActionBean.save=\u4fdd\u5b58\u7ec4
+org.apache.wiki.action.GroupActionBean.save=\u4FDD\u5B58\u7EC4
 #Copied from etc/i18n/templates/default.properties.. Formerly named newgroup.name.
-group=\u540d\u5b57
+group=\u540D\u5B57
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named group.members.
-members=\u7ec4\u6210\u5458
+members=\u7EC4\u6210\u5458
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.title.
-org.apache.wiki.action.WorkflowActionBean.abort=\u653e\u5f03
+org.apache.wiki.action.WorkflowActionBean.abort=\u653E\u5F03
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.step.abort.
-Outcome.step.abort=\u653e\u5f03
+Outcome.step.abort=\u653E\u5F03
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.step.complete.
-Outcome.step.complete=\u5df2\u5b8c\u6210
+Outcome.step.complete=\u5DF2\u5B8C\u6210
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.step.continue.
-Outcome.step.continue=\u7ee7\u7eed
+Outcome.step.continue=\u7EE7\u7EED
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.decision.acknowledge.
-Outcome.decision.acknowledge=\u786e\u5b9a
+Outcome.decision.acknowledge=\u786E\u5B9A
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.decision.approve.
-Outcome.decision.approve=\u5141\u8bb8
+Outcome.decision.approve=\u5141\u8BB8
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.decision.deny.
-Outcome.decision.deny=\u62d2\u7edd
+Outcome.decision.deny=\u62D2\u7EDD
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.decision.hold.
-Outcome.decision.hold=\u6302\u8d77
+Outcome.decision.hold=\u6302\u8D77
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.decision.reassign.
-Outcome.decision.reassign=\u91cd\u65b0\u6307\u5b9a
+Outcome.decision.reassign=\u91CD\u65B0\u6307\u5B9A
 #Formerly named captcha.description.
-org.apache.wiki.content.inspect.AsirraCaptcha.description=\u6211\u4eec\u76f8\u4fe1\u60a8\u53ef\u80fd\u662f\u4e00\u4e2a\u673a\u5668\u4eba\u7a0b\u5e8f\u6216\u8005\u5783\u573e\u90ae\u4ef6\u6563\u64ad\u8005\u3002\u8bf7\u4ece\u4e0b\u9762\u7684\u4e00\u7ec4\u56fe\u4e2d\u8df3\u51fa\u5c0f\u732b\uff08kittens\uff09\uff0c\u8fd9\u6837\u6211\u4eec\u53ef\u4ee5\u77e5\u9053\u60a8\u662f\u6b63\u5e38\u7684\u4eba\u7c7b\uff1f
+org.apache.wiki.content.inspect.AsirraCaptcha.description=\u6211\u4EEC\u76F8\u4FE1\u60A8\u53EF\u80FD\u662F\u4E00\u4E2A\u673A\u5668\u4EBA\u7A0B\u5E8F\u6216\u8005\u5783\u573E\u90AE\u4EF6\u6563\u64AD\u8005\u3002\u8BF7\u4ECE\u4E0B\u9762\u7684\u4E00\u7EC4\u56FE\u4E2D\u8DF3\u51FA\u5C0F\u732B\uFF08kittens\uFF09\uFF0C\u8FD9\u6837\u6211\u4EEC\u53EF\u4EE5\u77E5\u9053\u60A8\u662F\u6B63\u5E38\u7684\u4EBA\u7C7B\uFF1F
 #Formerly named captcha.asirra.adopt.me.
-org.apache.wiki.content.inspect.AsirraCaptcha.adoptMe=\u6536\u517b\u6211
+org.apache.wiki.content.inspect.AsirraCaptcha.adoptMe=\u6536\u517B\u6211
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named info.delete.submit.
-org.apache.wiki.action.DeleteActionBean.delete=\u5220\u9664\u6574\u4e2a\u9875\u9762
+org.apache.wiki.action.DeleteActionBean.delete=\u5220\u9664\u6574\u4E2A\u9875\u9762
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.. Formerly named org.apache.wiki.action.ViewActionBean.rename.
-org.apache.wiki.action.RenameActionBean.rename=\u91cd\u547d\u540d\u9875\u9762
+org.apache.wiki.action.RenameActionBean.rename=\u91CD\u547D\u540D\u9875\u9762
 #Formerly login.lostpw.submit. Formerly named resetPassword.
-org.apache.wiki.action.LostPasswordActionBean.reset=\u91cd\u8bbe\u5bc6\u7801
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
-org.apache.wiki.action.SearchActionBean.go=\u8f6c\u5230\uff01
+org.apache.wiki.action.LostPasswordActionBean.reset=\u91CD\u8BBE\u5BC6\u7801
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
-org.apache.wiki.action.SearchActionBean.search=\u67e5\u627e\uff01
+org.apache.wiki.action.SearchActionBean.search=\u67E5\u627E\uFF01
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.
-SearchScope.ALL=\u641c\u7d22\u6240\u6709\u6587\u6863
+SearchScope.ALL=\u641C\u7D22\u6240\u6709\u6587\u6863
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.authors.
-SearchScope.AUTHORS=\u4f5c\u8005
+SearchScope.AUTHORS=\u4F5C\u8005
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.content.
-SearchScope.CONTENTS=\u9875\u9762\u5185\u5bb9
+SearchScope.CONTENTS=\u9875\u9762\u5185\u5BB9
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.attach.
-SearchScope.ATTACHMENTS=\u9644\u4ef6
+SearchScope.ATTACHMENTS=\u9644\u4EF6
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.pagename.. Formerly named SearchScope.PAGE_NAME.
-SearchScope.PAGE_NAMES=\u9875\u9762\u540d\u79f0
+SearchScope.PAGE_NAMES=\u9875\u9762\u540D\u79F0

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=1225830&r1=1225829&r2=1225830&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 Fri Dec 30 14:02:28 2011
@@ -359,6 +359,7 @@ sbox.search.result=Quick search
 sbox.search.target=(type ahead)
 sbox.clearrecent=(Clear)
 sbox.recentsearches=Recent Searches
+sbox.go=Go
 # UploadTemplate.jsp
 # move all to attach.
 upload.title={0}: Add Attachment
@@ -508,6 +509,7 @@ install.applicationName.description=What
 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 Priha JCR implementation to store files in a particular directory on your hard drive. If you specify a directory that does not exist, JSPWiki will create one for you.
+install.initialPageDir.description=Tell JSPWiki where is the initial set of pages to load in. It can be the default set of pages bundled with JSPWiki, or may be your own set of pages. If you specify a directory that does not exist, JSPWiki will create one for you.
 #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 (by default) Apache 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.

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=1225830&r1=1225829&r2=1225830&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 Fri Dec 30 14:02:28 2011
@@ -375,6 +375,7 @@ sbox.search.result=Schnellsuche
 sbox.search.target=(Tippe einfach drauf los!)
 sbox.clearrecent=(Zurücksetzen)
 sbox.recentsearches=Letzte Suchanfragen
+sbox.go=Los!
 # UploadTemplate.jsp
 # move all to attach.
 upload.title={0}: Anhang hinzufügen

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=1225830&r1=1225829&r2=1225830&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 Fri Dec 30 14:02:28 2011
@@ -26,7 +26,7 @@
 
 # Textos comunes
 
-common.nopage=Esta página no existe. &#191;Por qué no vas y {0}?
+common.nopage=Esta p\u00E1gina no existe. \u00BFPor qu\u00E9 no vas y {0}?
 common.createit=la creas
 common.more=Más...
 common.ajax.loading=Cargando...
@@ -35,7 +35,7 @@ common.ajax.loading=Cargando...
 attach.tab=Adjuntar
 attach.list=Lista de adjuntos
 attach.add=Subir nuevo adjunto
-attach.add.info=Para subir un nuevo adjunto a esta página, por favor usa el siguiente control de texto, y haz click en &#8220;Subir&#8221;.
+attach.add.info=Para subir un nuevo adjunto a esta p\u00E1gina, por favor usa el siguiente control de texto, y haz click en &\#8220;Subir&\#8221;.
 attach.add.permission=Solo pueden subir adjuntos los usuarios autorizados.
 attach.bytes=bytes
 attach.preview=Previsualización de la imagen
@@ -362,6 +362,7 @@ sbox.search.result=Búsqueda rápida
 sbox.search.target=(escribe en el cuadro de búsqueda)
 sbox.clearrecent=(Borrar)
 sbox.recentsearches=Búsquedas Recientes
+sbox.go=\u00A1Ir\!
 # UploadTemplate.jsp
 # move all to attach.
 upload.title={0}: Añadir adjunto
@@ -472,7 +473,7 @@ javascript.filter.all=( Todos )
 javascript.group.validName=Por favor, proporciona un nombre válido para el nuevo grupo
 javascript.category.title=Haz click para mostrar la categoría [{0}] ...
 javascript.slimbox.info=Imagen {0} de {1}
-javascript.slimbox.error=Error - Hubo un problema con tu petición.\nPor favor, prueba otra vez
+javascript.slimbox.error=Error - Hubo un problema con tu petici\u00F3n. Por favor, prueba otra vez
 javascript.slimbox.directLink=Enlace directo al resultado
 javascript.slimbox.remoteRequest=Petición Remota {0} de {1}
 javascript.slimbox.previous=&laquo;Anterior
@@ -516,7 +517,8 @@ install.applicationName.description=¿C�
 #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.
+install.pageDir.description=Por defecto, JSPWiki usará la implementación Priha JCR para guardar los ficheros en un directorio de tu disco duro. Si especificas un directorio que no existe, JSPWiki lo creará por ti.
+install.initialPageDir.description=Indica dónde se encuentra el conjunto inicial de páginas a cargar en JSPWiki. Puedes usar el que viene distribuido junto con JSPWiki, o tu propio conjunto de páginas. Si especificas un directorio que no existe, JSPWiki lo creará por ti.
 #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.
@@ -526,7 +528,7 @@ install.advanced=Configuración avanzada
 #LDAP. Formerly named install.ldap.title.
 install.ldap=Configuración LDAP
 install.success=Enhorabuena
-install.success.description=Has instalado JSPWiki con éxito. ¡Buen trabajo!
+install.success.description=Has instalado JSPWiki con \u00E9xito. \u00A1Buen trabajo\!
 install.success.clickhere=Click aquí para continuar...
 #Copied from src/WebContent/WEB-INF/classes/CoreResources.properties.
 newgroup.heading.create=Crear Nuevo Grupo

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=1225830&r1=1225829&r2=1225830&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 Fri Dec 30 14:02:28 2011
@@ -347,6 +347,7 @@ sbox.search.result=Pikahaku
 sbox.search.target=(kirjoita vain jotain)
 sbox.clearrecent=(Tyhjää)
 sbox.recentsearches=Viimeisimmät hakusi
+sbox.go=Mene!
 # UploadTemplate.jsp
 # move all to attach.
 upload.title={0}: Liitetiedoston lisäys

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=1225830&r1=1225829&r2=1225830&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 Fri Dec 30 14:02:28 2011
@@ -40,7 +40,7 @@ common.more=Plus...
 attach.tab=Attacher
 attach.list=Liste des attachements
 attach.add=Ajouter un attachement
-attach.add.info=Pour publier un nouvel attachement à cette page, veuillez utiliser la boite suivante pour atteindre le fichier, puis cliquez sur \u201cTélécharger\u201d.
+attach.add.info=Pour publier un nouvel attachement \u00E0 cette page, veuillez utiliser la boite suivante pour atteindre le fichier, puis cliquez sur \u201CT\u00E9l\u00E9charger\u201D.
 attach.add.permission=Seuls les utilisateurs autorisés peuvent publier de nouveaux attachements.
 attach.bytes=octets
 attach.preview=Prévisualisation de l'image
@@ -84,7 +84,7 @@ editgroup.heading.edit=Editer le groupe 
 editgroup.instructions=Cette page vous permet d''ajouter ou d''éditer des membres pour le groupe Wiki appelé <strong>{0}</strong>. En général, seuls les membres du groupe peuvent éditer la liste des membres. Par défaut, la personne qui crée le groupe en est membre.
 editgroup.saveerror=Impossible d'enregistrer le groupe&160;:&nbsp;
 editgroup.memberlist=L'appartenance à ce groupe. Entrez le nom complet ou Wiki de chaque utilisateur, séparé par des retours chariots.
-editgroup.savehelp=Quand vous cliquerez sur \u201cEnregistrer le groupe\u201d, ce groupe sera enregistré sous le nom <strong>{0}</strong>. Vous pouvez spécifier ce nom dans les listes de contrôle d''accès (ACL) à la page.
+editgroup.savehelp=Quand vous cliquerez sur \u201CEnregistrer le groupe\u201D, ce groupe sera enregistr\u00E9 sous le nom <strong>{0}</strong>. Vous pouvez sp\u00E9cifier ce nom dans les listes de contr\u00F4le d''acc\u00E8s (ACL) \u00E0 la page.
 editgroup.submit.save=Enregistrer le groupe
 # Favorites.jsp
 
@@ -99,7 +99,7 @@ fav.aggregatewiki.title=Agréger la sour
 find.tab=Recherche Wiki
 find.tab.help=Aide
 find.input=Entrez votre requête ici :
-find.heading.results=Résultats de la recherche sur \u201c{0}\u201d
+find.heading.results=R\u00E9sultats de la recherche sur \u201C{0}\u201D
 find.resultsstart={0} résultats trouvés ; voici les résultats {1} à {2}.
 find.results.page=Page
 find.results.score=Score
@@ -186,7 +186,7 @@ info.uploadnew=Télécharger une nouvell
 #info.uploadnew.submit=T\u00E9l\u00E9charger un nouvel attachement
 info.uploadnew.filename=Sélectionner le fichier :
 info.uploadnew.changenote=Modifier la note :
-info.uploadnew.help=Pour télécharger un nouvel attachement à cette page, veuillez utiliser la boite suivante pour atteindre le fichier, puis cliquez sur le bouton \u201cTélécharger\u201d.
+info.uploadnew.help=Pour t\u00E9l\u00E9charger un nouvel attachement \u00E0 cette page, veuillez utiliser la boite suivante pour atteindre le fichier, puis cliquez sur le bouton \u201CT\u00E9l\u00E9charger\u201D.
 info.uploadnew.nopermission=Seuls les utilisateurs autorisés ont le droit de télécharger une nouvelle version.
 info.deleteattachment=Supprimer l'attachement
 info.attachment.history=Historique des révisions des attachements
@@ -218,7 +218,7 @@ login.loginhelpmissing=Il semblerait que
 newgroup.errorprefix=Erreur : 
 newgroup.instructions.start=Cette page vous permet de créer un nouveau groupe Wiki.
 newgroup.name.description=Le nom du nouveau groupe.
-newgroup.instructions.end=Quand vous cliquerez sur \u201cEnregistrer le groupe,\u201d ce groupe sera enregistré. Vous pouvez spécifier le nom du groupe dans les listes de contrôle d'accès (ACL) à la page.
+newgroup.instructions.end=Quand vous cliquerez sur \u201CEnregistrer le groupe,\u201D ce groupe sera enregistr\u00E9. Vous pouvez sp\u00E9cifier le nom du groupe dans les listes de contr\u00F4le d'acc\u00E8s (ACL) \u00E0 la page.
 newgroup.creategroup=Créer un groupe
 newgroup.defaultgroupname=MonGroupe
 # PageActions.jsp
@@ -285,10 +285,10 @@ prefs.user.sectionediting.text=Autoriser
 prefs.user.timezone.server=[SERVEUR]
 prefs.user.language.default=[DEFAUT]
 prefs.instructions=Modifiez vos préférences utilisateur ici. Vos choix seront enregistrés dans les cookies de votre navigateur.
-prefs.assertedname.description=Votre nom. Si n''avez pas encore créé de profil utilisateur, vous pouvez dire à {0} qui vous êtes, en \u201csupposant\u201d votre identité. Mais vous ne voudriez pas nous mentir, n''est-ce pas ? Notez qu''indiquer votre nom d''utilisateur ainsi n''est pas une manière correcte de s''identifier, parce que cela ne fait que poser un cookie dans votre navigateur sans requérir de mot de passe. Selon la politique de sécurité en vigueur, le Wiki peut vous accorder des droits plus limités en tant qu''utilisateur \u201csupposé\u201d.Vous pouvez vous authentifier proprement auprès de {0} si vous utilisez plutôt un identifiant et un mot de passe classiques, qui sont plus sûrs.
+prefs.assertedname.description=Votre nom. Si n''avez pas encore cr\u00E9\u00E9 de profil utilisateur, vous pouvez dire \u00E0 {0} qui vous \u00EAtes, en \u201Csupposant\u201D votre identit\u00E9. Mais vous ne voudriez pas nous mentir, n''est-ce pas\u00A0? Notez qu''indiquer votre nom d''utilisateur ainsi n''est pas une mani\u00E8re correcte de s''identifier, parce que cela ne fait que poser un cookie dans votre navigateur sans requ\u00E9rir de mot de passe. Selon la politique de s\u00E9curit\u00E9 en vigueur, le Wiki peut vous accorder des droits plus limit\u00E9s en tant qu''utilisateur \u201Csuppos\u00E9\u201D.Vous pouvez vous authentifier proprement aupr\u00E8s de {0} si vous utilisez plut\u00F4t un identifiant et un mot de passe classiques, qui sont plus s\u00FBrs.
 prefs.assertedname.create=Créer un nouveau profil utilisateur
 prefs.submit.setname=Modifier le nom de l'utilisateur
-prefs.clear.description=Dans certains cas, vous pouvez avoir besoin de supprimer votre nom d'utilisateur de votre profil \u201csupposé\u201d sur cet ordinateur. Cliquez pour cela sur le bouton \u201cNettoyer les préférences utilisateur\u201d. Notez que cela supprimera, de manière permanente, toutes les préférences utilisateur que vous avez pu positionner. Vous devrez les saisir à nouveau.
+prefs.clear.description=Dans certains cas, vous pouvez avoir besoin de supprimer votre nom d'utilisateur de votre profil \u201Csuppos\u00E9\u201D sur cet ordinateur. Cliquez pour cela sur le bouton \u201CNettoyer les pr\u00E9f\u00E9rences utilisateur\u201D. Notez que cela supprimera, de mani\u00E8re permanente, toutes les pr\u00E9f\u00E9rences utilisateur que vous avez pu positionner. Vous devrez les saisir \u00E0 nouveau.
 prefs.newprofile=Créeer un nouveau profil utilisateur
 prefs.oldprofile=Modifier votre profil Wiki.
 prefs.errorprefix.prefs=Impossible d'enregistrer les préférences :&nbsp;
@@ -301,10 +301,10 @@ prefs.password.description=Fixe le mot d
 prefs.password2.description=Re-saisissez votre mot de passe pour vérification.
 prefs.fullname.description=Utilisez votre nom dans les listes de contrôle d'accès (ACL) ou les groupes Wiki.
 prefs.email.description=(optionnel). Si vous perdez votre mot de passe, vous pouvez demander à ce qu'un nouveau mot de passe, généré aléatoirement, vous soit envoyé à cette adresse.
-prefs.cookie.info=Ce wiki se souvient automatiquement de vous grâce à des cookies, sans requérir une quelconque authentification. Pour utiliser cette fonctionnalité, votre navigateur doit accepter les cookies provenant de ce site Web. Lorsque vous cliquerez sur \u201cEnregistrer profil,\u201d le cookie sera enregistré par votre navigateur.
+prefs.cookie.info=Ce wiki se souvient automatiquement de vous gr\u00E2ce \u00E0 des cookies, sans requ\u00E9rir une quelconque authentification. Pour utiliser cette fonctionnalit\u00E9, votre navigateur doit accepter les cookies provenant de ce site Web. Lorsque vous cliquerez sur \u201CEnregistrer profil,\u201D le cookie sera enregistr\u00E9 par votre navigateur.
 prefs.acl.info=Les listes de contrôle d'accès (ACL) ou les groupes Wiki contenant votre identité doivent spécifier votre nom ou votre identifiant Wiki. Vous êtes également membre des rôles et groupes ci-dessus.
 prefs.lastmodified=Vous avez créé votre profil le {0}, et vous l''avez modifié pour la dernière fois le {1}
-prefs.save.description=Cliquez sur \u201cEnregistrer le profil\u201d pour enregistrer votre profil Wiki.
+prefs.save.description=Cliquez sur \u201CEnregistrer le profil\u201D pour enregistrer votre profil Wiki.
 prefs.roles=Rôles
 prefs.groups=Groupes
 prefs.creationdate=Date de création
@@ -343,7 +343,7 @@ notification.createUserProfile.reject=Vo
 fact.submitter=Soumettre
 #  PreviewContent.jsp
 preview.tab=AperÁu
-preview.info=Ceci est un <strong>aperçu</strong> !  Cliquez sur \u201cRé-éditer\u201d pour revenir à l'éditeur, ou sur \u201cEnregistrer\u201d si vous êtes satisfait de ce que vous voyez.
+preview.info=Ceci est un <strong>aper\u00E7u</strong>\u00A0\!  Cliquez sur \u201CR\u00E9-\u00E9diter\u201D pour revenir \u00E0 l'\u00E9diteur, ou sur \u201CEnregistrer\u201D si vous \u00EAtes satisfait de ce que vous voyez.
 #  SearchBox.jsp
 sbox.search.submit=Navigation Rapide
 sbox.view=voir
@@ -358,12 +358,13 @@ sbox.search.result=Recherche rapide
 sbox.search.target=(écrivez là)
 sbox.clearrecent=(Effacer)
 sbox.recentsearches=Recherches récentes
+sbox.go=Ouvrir le meilleur résultat !
 # UploadTemplate.jsp
 # move all to attach.
 upload.title={0}: Ajouter un attachement
 upload.heading.upload=Télécharger un nouvel attachement à {0}
 upload.attachments=Attachements actuels
-upload.info=Pour télécharger un nouvel attachement à cette page, veuillez utiliser la boite suivante pour atteindre le fichier, puis cliquez sur \u201cTélécharger\u201d.
+upload.info=Pour t\u00E9l\u00E9charger un nouvel attachement \u00E0 cette page, veuillez utiliser la boite suivante pour atteindre le fichier, puis cliquez sur \u201CT\u00E9l\u00E9charger\u201D.
 upload.submit=Télécharger
 upload.done=Si vous avez fini de télécharger, peut-être voulez-vous revenir vers {0}
 # ViewTemplate.jsp

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=1225830&r1=1225829&r2=1225830&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 Fri Dec 30 14:02:28 2011
@@ -352,6 +352,7 @@ sbox.search.result=Ricerca veloce
 sbox.search.target=(inserisci)
 sbox.clearrecent=(svuota)
 sbox.recentsearches=Ultime modifiche
+sbox.go=Vai!
 # UploadTemplate.jsp
 # move all to attach.
 upload.title={0}: Aggiungi un allegato

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=1225830&r1=1225829&r2=1225830&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 Fri Dec 30 14:02:28 2011
@@ -353,6 +353,7 @@ sbox.search.result=Snel-zoek
 sbox.search.target=(Typ vooruit)
 sbox.clearrecent=(Verwijder)
 sbox.recentsearches=Recente Zoekopdrachten
+sbox.go=Ga!
 # UploadTemplate.jsp
 # move all to attach.
 upload.title={0}: Bijlage toevoegen

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=1225830&r1=1225829&r2=1225830&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 Fri Dec 30 14:02:28 2011
@@ -387,6 +387,7 @@ sbox.search.result=Quick search
 sbox.search.target=(type ahead)
 sbox.clearrecent=(Clear)
 sbox.recentsearches=Recent Searches
+sbox.go=Go!
 # UploadTemplate.jsp
 # move all to attach.
 upload.title={0}: Add Attachment
@@ -501,7 +502,7 @@ javascript.prefs.areyousure=Without clic
 #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.. 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    
+install.configure.description=Ap\u00F3s voc\u00EA clicar em <em>Configurar\!</em>, o instalador escrever\u00E1 suas prefer\u00EAncias em <code>{0}</code>. Tamb\u00E9m criar\u00E1 uma conta de Administrador com uma senha aleat\u00F3ria 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.



Mime
View raw message