Index: D:/eclipse_software/Workspace-web/JSPWiki-svn/etc/i18n/CoreResources_zh_CN.properties
===================================================================
--- D:/eclipse_software/Workspace-web/JSPWiki-svn/etc/i18n/CoreResources_zh_CN.properties (revision 668384)
+++ D:/eclipse_software/Workspace-web/JSPWiki-svn/etc/i18n/CoreResources_zh_CN.properties (working copy)
@@ -2,25 +2,30 @@
# This is the main i18n resource file for JSPWiki internal
# code, the so-called core code.
#
-# Anrede Du oder Sie? http://lists.wikimedia.org/pipermail/wikide-l/2007-July/019595.html
-#
# Please, do not forget to use proper HTML entities, so
# " = "
# ' = ' Note that ' is NOT HTML, and does not necessarily work in all browsers.
-# Common things
-# Date format used across JSPWiki. Please see "SimpleDateFormat" on information
-# how to handle this
+#
+# Time/date formatting. Some plugins might be using some specific formats,
+# but you are free to use these times and dates.
+#
+# Timedate format used when a full time/date is used
# NLS_MESSAGEFORMAT_VAR
-common.dateformat = yyyy-MM-dd HH:mm:ss zzzz
+common.datetimeformat = yyyy-MM-dd HH:mm:ss zzz
+
+# Time stamp format when a simple time stamp is needed (without date)
common.timeformat = HH:mm:ss
-common.dateformat = EEEE, MMMM d, yyyy
+# Date stamp format when showing just the date.
+common.dateformat = yyyy-MM-dd, EEEE
-# Outcomes
+# "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}
@@ -44,18 +49,15 @@
# Renaming
-rename.empty=\u65b0\u9875\u9762\u7684\u540d\u79f0\u4e3a\u7a7a\u3002
\n\
-\u5355\u51fb\u6d4f\u89c8\u5668\u4e0a\u7684\u540e\u9000\u6309\u94ae\uff0c\u586b\u5199\u65b0\u540d\u79f0\u3002
+rename.empty=\u65b0\u9875\u9762\u7684\u540d\u79f0\u4e3a\u7a7a\u3002\u5355\u51fb\u6d4f\u89c8\u5668\u4e0a\u7684\u201c\u540e\u9000\u201d\u6309\u94ae\uff0c\u7136\u540e\u586b\u5199\u65b0\u540d\u79f0\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
\n\
-\u5355\u51fb\u6d4f\u89c8\u5668\u4e0a\u7684\u540e\u9000\u6309\u94ae\uff0c\u66f4\u6539\u65b0\u540d\u79f0\u3002
-rename.exists=\u9875\u9762\u201c{0}\u201d\u5df2\u5b58\u5728\u3002
\n\
-\u5355\u51fb\u6d4f\u89c8\u5668\u4e0a\u7684\u540e\u9000\u6309\u94ae\uff0c\u66f4\u6539\u65b0\u540d\u79f0\uff0c\u6216\u8005\u5148\u5220\u9664\u9875\u9762\u201c{0}\u201d\u3002
+rename.identical=\u9875\u9762\u540d\u79f0\u76f8\u540c\u3002\u5355\u51fb\u6d4f\u89c8\u5668\u4e0a\u7684\u201c\u540e\u9000\u201d\u6309\u94ae\uff0c\u7136\u540e\u66f4\u6539\u65b0\u540d\u79f0\u3002
+rename.exists=\u9875\u9762\u201c{0}\u201d\u5df2\u5b58\u5728\u3002\u5355\u51fb\u6d4f\u89c8\u5668\u4e0a\u7684\u201c\u540e\u9000\u201d\u6309\u94ae\uff0c\u66f4\u6539\u65b0\u540d\u79f0\uff0c\u6216\u8005\u5148\u5220\u9664\u9875\u9762\u201c{0}\u201d\u3002
rename.unknownerror=\u53d1\u751f\u672a\u77e5\u9519\u8bef\uff08{0}\uff09
# Login.jsp
-login.error.capslock=\u65e0\u6548\u767b\u5f55\uff08\u8bf7\u68c0\u67e5 Caps Lock \u952e\uff09
+#login.error.capslock=Invalid login (please check your Caps Lock key) #obsolete
login.error.password=\u65e0\u6548\u767b\u5f55\u3002
login.error.noaccess=\u5bf9\u4e0d\u8d77\uff0c\u60a8\u65e0\u6743\u64cd\u4f5c\u3002
@@ -69,7 +71,7 @@
\n\
-- {3}
lostpwd.newpassword.subject={0} \u7684\u65b0\u5bc6\u7801
-lostpwd.nouser=\u627e\u4e0d\u5230\u7528\u6237\u6216\u7535\u5b50\u90ae\u4ef6 {0}\u3002
+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
@@ -98,6 +100,9 @@
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
+
# JSPWikiMarkupParser
markupparser.error.invalidset = \u627e\u5230\u65e0\u6548 SET\uff1a{0}
@@ -105,3 +110,89 @@
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.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
+captcha.asirra.please.select=\u8bf7\u9009\u62e9\u6240\u6709\u6709\u732b\u7684\u7167\u7247\uff1a
+captcha.asirra.adopt.me=\u6536\u517b\u6211
+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 jspwiki.properties \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 jspwiki.properties \u6587\u4ef6\u3002\
+\u53ef\u4ee5\u5728 yourwiki/WEB-INF/ \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
+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 web.xml \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 admin \u7684\u7ba1\u7406\u5458\u5e10\u6237\uff0c\u8fd9\u4e2a\u5e10\u6237\u5c5e\u4e8e wiki \u7ec4 Admin\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 AllPermission\u3002
+install.jsp.security.admaccount.notenabled.desc=\u6b64 wiki \u4f3c\u4e4e\u6ca1\u6709\u7ba1\u7406\u5458\u5e10\u6237\u3002\
+\u5355\u51fb\u914d\u7f6e\uff01\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\u914d\u7f6e\uff01\u540e\uff0c\u5b89\u88c5\u7a0b\u5e8f\u5c06\u628a\u60a8\u7684\u8bbe\u7f6e\u5199\u5230 {0}\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
+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
Index: D:/eclipse_software/Workspace-web/JSPWiki-svn/etc/i18n/templates/default_zh_CN.properties
===================================================================
--- D:/eclipse_software/Workspace-web/JSPWiki-svn/etc/i18n/templates/default_zh_CN.properties (revision 668384)
+++ D:/eclipse_software/Workspace-web/JSPWiki-svn/etc/i18n/templates/default_zh_CN.properties (working copy)
@@ -16,11 +16,11 @@
attach.tab=\u9644\u4ef6
attach.list=\u9644\u4ef6\u5217\u8868
attach.add=\u6dfb\u52a0\u65b0\u9644\u4ef6
-attach.add.info=\u8981\u5411\u8be5\u9875\u9762\u6dfb\u52a0\u65b0\u9644\u4ef6\uff0c\u8bf7\u7528\u4e0b\u9762\u7684\u6846\u627e\u5230\u6587\u4ef6\uff0c\u7136\u540e\u5355\u51fb“\u4e0a\u4f20”\u3002
-attach.add.permission=\u53ea\u6709\u901a\u8fc7\u8ba4\u8bc1\u7684\u7528\u6237\u624d\u80fd\u4e0a\u4f20\u65b0\u9644\u4ef6\u3002
+attach.add.info=\u8981\u5411\u8be5\u9875\u9762\u6dfb\u52a0\u65b0\u9644\u4ef6\uff0c\u8bf7\u7528\u4e0b\u9762\u7684\u6846\u627e\u5230\u6587\u4ef6\uff0c\u7136\u540e\u5355\u51fb\u201c\u4e0a\u4f20\u201d\u3002
+attach.add.permission=\u53ea\u6709\u6388\u6743\u7684\u7528\u6237\u624d\u80fd\u4e0a\u4f20\u65b0\u9644\u4ef6\u3002
attach.bytes=\u5b57\u8282
attach.add.selectfile=\u9009\u62e9\u6587\u4ef6\uff1a
-attach.add.changenote=\u5bf9\u53d8\u66f4\u7684\u6ce8\u91ca\uff1a
+attach.add.changenote=\u53d8\u66f4\u6ce8\u91ca\uff1a
attach.add.submit=\u4e0a\u4f20
attach.preview=\u56fe\u50cf\u9884\u89c8
attach.deleteconfirm=\u8bf7\u786e\u8ba4\u662f\u5426\u8981\u6c38\u4e45\u5220\u9664\u6b64\u9644\u4ef6\uff01
@@ -32,13 +32,14 @@
comment.title.comment={0}\uff1a\u6ce8\u91ca\uff1a{1}
comment.tab.discussionpage=\u8ba8\u8bba\u9875\u9762
comment.tab.addcomment=\u6dfb\u52a0\u6ce8\u91ca
-comment.edithelpmissing=\u54e6\uff0c\u770b\u4e0a\u53bb {0} \u9875\u9762\u5df2\u7ecf\u6ca1\u6709\u4e86\u3002\
+comment.edithelpmissing=\u54e6\uff0c\u4f3c\u4e4e {0} \u9875\u9762\u4e0d\u89c1\u4e86\u3002\
\u4e00\u5b9a\u662f\u6709\u4eba\u5bf9\u5b89\u88c5\u8fdb\u884c\u4e86\u64cd\u4f5c...\
\u60a8\u53ef\u4ee5\u4ece jspwiki.org \u7684 EditPageHelp \u9875\u9762\u590d\u5236\u6587\u672c\u3002
# ConflictContent.jsp
-conflict.oops=
\u54e6\uff01\ +conflict.oops.title=\u54ce\u5440\uff01 +conflict.oops=
\u54ce\u5440\uff01\ \u5728\u60a8\u7f16\u8f91\u65f6\u5df2\u7ecf\u6709\u4eba\u4fee\u6539\u4e86\u9875\u9762\uff01\
\u6211\u592a\u7b28\u4e86\uff0c\u4e0d\u77e5\u9053\u90a3\u4e9b\u9875\u9762\u6709\u4ec0\u4e48\u533a\u522b\uff0c\u9700\u8981\u60a8\u5e2e\u6211\u770b\u770b\u3002\
\u6211\u6253\u5370\u4e86 Wiki \u9875\u9762\u4e2d\u7684\u6587\u672c\u548c\u60a8\u505a\u7684\u66f4\u6539\u3002\
@@ -62,7 +63,7 @@
# EditContent.jsp
-edit.locked=\u7528\u6237 “{0}” \u5df2\u5f00\u59cb\u7f16\u8f91\u8be5\u9875\u9762\uff0c\u4f46\u8fd8\u672a\u4fdd\u5b58\u3002\
+edit.locked=\u7528\u6237 {0} \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
@@ -79,6 +80,7 @@
# 0 : Application name
# 1 : Page name
edit.title.edit={0}\uff1a\u7f16\u8f91\uff1a{1}
+edit.sections=\u6bb5\u843d
# EditGroup.jsp
editgroup.tab=\u7f16\u8f91\u7ec4
@@ -105,12 +107,14 @@
# FindContent.jsp
find.tab=\u641c\u7d22 Wiki
+find.tab.help=\u5e2e\u52a9
find.input=\u5728\u6b64\u8f93\u5165\u67e5\u8be2\uff1a
find.heading.results=\u201c{0}\u201d\u7684\u641c\u7d22\u7ed3\u679c
find.resultsstart=\u627e\u5230 {0} \u4e2a\u7ed3\u679c\uff0c\u6b64\u5904\u662f {1} \u5230 {2} \u7684\u7ed3\u679c\u3002
find.results.page=\u9875\u9762
find.results.score=\u5206\u6570
-find.noresults=\u65e0\u7ed3\u679c
+find.noresults=\u627e\u4e0d\u5230\u7ed3\u679c\u3002\
+\u53ef\u80fd\u6b64 wiki \u6ca1\u6709\u60a8\u8981\u627e\u7684\u6587\u6863\uff0c\u6216\u8005\u60a8\u6ca1\u6709\u6743\u9650\u67e5\u770b\u8981\u627e\u7684\u6587\u6863\u3002
find.getprevious=\u83b7\u5f97\u524d {0} \u4e2a\u7ed3\u679c
find.getnext=\u83b7\u5f97\u540e {0} \u4e2a\u7ed3\u679c
find.externalsearch=\u5c1d\u8bd5\u5728\u4ee5\u4e0b\u5730\u65b9\u8fdb\u884c\u76f8\u540c\u7684\u641c\u7d22\uff1a
@@ -126,7 +130,7 @@
# GroupContent.jsp
group.tab=\u67e5\u770b\u7ec4
-group.areyousure=\u662f\u5426\u8981\u6c38\u4e45\u5220\u9664\u7ec4\u201c{0}\u201d\uff1f\
+group.areyousure=\u786e\u5b9a\u8981\u6c38\u4e45\u5220\u9664\u7ec4\u201c{0}\u201d\u5417\uff1f\
\u7528\u6237\u53ef\u80fd\u65e0\u6cd5\u8bbf\u95ee ACLS \u4e2d\u5305\u542b\u8be5\u7ec4\u7684\u9875\u9762\u3002\
\\n\\n\u5982\u679c\u5355\u51fb\u201c\u786e\u5b9a\u201d\uff0c\u4f1a\u7acb\u5373\u5220\u9664\u8be5\u7ec4\u3002
group.doesnotexist=\u8be5\u7ec4\u4e0d\u5b58\u5728\u3002
@@ -163,24 +167,23 @@
# InfoContent.jsp
info.pagename=\u9875\u9762\u540d\u79f0
info.parent=\u7236\u9875\u9762
-info.lastmodified=\u8be5\u9875\u9762\uff08\u4fee\u8ba2\u7248 {0}\uff09\u6700\u540e\u66f4\u65b0\u65f6\u95f4\u4e3a {1}\uff0c\u66f4\u65b0\u8005\u4e3a {2}
+info.lastmodified=\u8be5\u9875\u9762\uff08\u4fee\u8ba2\u7248 {0}\uff09\u6700\u540e\u7531 {2} \u5728 {1} \u4fee\u6539\u3002
info.createdon=\u8be5\u9875\u9762\u7531 {1} \u521b\u5efa\u4e8e {0}
info.current=\u5f53\u524d\u9875\u9762\u7248\u672c
info.noversions=\u65e0\u7248\u672c\u4fe1\u606f\u3002
info.feed=\u9875\u9762\u8ba2\u9605\u6e90
info.pagediff.title=\u663e\u793a\u4e0a\u4e00\u6b21\u9875\u9762\u66f4\u65b0\u6240\u505a\u7684\u66f4\u6539
-info.rsspagefeed.title=\u9875\u9762 {0} \u7684 RSS \u8ba2\u9605\u6e90
info.rename.submit=\u91cd\u547d\u540d\u9875\u9762
info.updatereferrers=\u662f\u5426\u66f4\u65b0\u5f15\u7528\uff1f
-info.rename.permission=\u53ea\u6709\u901a\u8fc7\u8ba4\u8bc1\u7684\u7528\u6237\u624d\u80fd\u91cd\u547d\u540d\u9875\u9762\u3002
+info.rename.permission=\u53ea\u6709\u6388\u6743\u7684\u7528\u6237\u624d\u80fd\u91cd\u547d\u540d\u9875\u9762\u3002
-info.delete.submit=\u5220\u9664\u5168\u90e8\u9875\u9762
-info.delete.attachmentwarning=\u9996\u5148\u5220\u9664\u8be5\u9875\u9762\u7684\u6240\u6709\u9644\u4ef6
+info.delete.submit=\u5220\u9664\u6574\u4e2a\u9875\u9762
+#info.delete.attachmentwarning=First delete all attachments of this page
info.confirmdelete=\u8bf7\u786e\u8ba4\u662f\u5426\u8981\u6c38\u4e45\u5220\u9664\u6b64\u5185\u5bb9\uff01
-info.delete.permission=\u53ea\u6709\u901a\u8fc7\u8ba4\u8bc1\u7684\u7528\u6237\u624d\u80fd\u5220\u9664\u9875\u9762\u3002
+info.delete.permission=\u53ea\u6709\u6388\u6743\u7684\u7528\u6237\u624d\u80fd\u5220\u9664\u9875\u9762\u3002
info.moreinfo=\u66f4\u591a\u4fe1\u606f...
info.backtomainpage=\u8fd4\u56de {0}
@@ -196,9 +199,9 @@
info.pagination.last=\u6700\u540e\u4e00\u9875
info.pagination.previous=\u4e0a\u4e00\u9875
info.pagination.next=\u4e0b\u4e00\u9875
-info.pagination.all=\u6240\u6709
-info.pagination.total= \uff08\u9879\u603b\u6570\uff1a{0}\uff09
-info.pagination.show.title=\u663e\u793a\u4ece {0} \u5230 {1} \u7684\u9879
+info.pagination.all=\u5168\u90e8
+info.pagination.total= \uff08\u603b\u8ba1 {0} \u9879\uff09
+info.pagination.show.title=\u663e\u793a\u4ece\u4fee\u8ba2 {0} \u5230 {1} \u7684\u9879
info.pagination.showall.title=\u663e\u793a\u6240\u6709\u9879
info.version=\u7248\u672c
@@ -222,14 +225,14 @@
#info.uploadnew.submit=Upload new attachment
info.uploadnew.filename=\u9009\u62e9\u6587\u4ef6\uff1a
info.uploadnew.changenote=\u5bf9\u53d8\u66f4\u7684\u6ce8\u91ca\uff1a
-info.uploadnew.help=\u8981\u5411\u8be5\u9875\u9762\u6dfb\u52a0\u65b0\u9644\u4ef6\uff0c\u8bf7\u7528\u4e0b\u9762\u7684\u6846\u627e\u5230\u6587\u4ef6\uff0c\u7136\u540e\u5355\u51fb“\u4e0a\u4f20”\u3002
-info.uploadnew.nopermission=\u53ea\u6709\u901a\u8fc7\u8ba4\u8bc1\u7684\u7528\u6237\u624d\u80fd\u4e0a\u4f20\u65b0\u9644\u4ef6\u7248\u672c\u3002
+info.uploadnew.help=\u8981\u5411\u8be5\u9875\u9762\u6dfb\u52a0\u65b0\u9644\u4ef6\uff0c\u8bf7\u7528\u4e0b\u9762\u7684\u6846\u627e\u5230\u6587\u4ef6\uff0c\u7136\u540e\u5355\u51fb\u201c\u4e0a\u4f20\u201d\u3002
+info.uploadnew.nopermission=\u53ea\u6709\u6388\u6743\u7684\u7528\u6237\u624d\u80fd\u4e0a\u4f20\u65b0\u9644\u4ef6\u7248\u672c\u3002
info.deleteattachment=\u5220\u9664\u9644\u4ef6
info.deleteattachment.submit=\u5220\u9664\u9644\u4ef6
info.attachment.history=\u9644\u4ef6\u4fee\u8ba2\u5386\u53f2\u8bb0\u5f55
-info.attachment.type=\u79cd\u7c7b
+info.attachment.type=\u7c7b\u578b
info.attachment.name=\u9644\u4ef6\u540d\u79f0
info.kilobytes=kB
@@ -237,14 +240,14 @@
# LoginContent.jsp
login.tab=\u767b\u5f55
-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
login.login=\u767b\u5f55\u540d
login.password=\u5bc6\u7801
-login.remember=\u8bb0\u4f4f\u6211\u7684\u4fe1\u606f\uff1f
+login.remember=\u662f\u5426\u8bb0\u4f4f\u6211\u7684\u4fe1\u606f\uff1f
login.submit.login=\u767b\u5f55
login.invite=\u8981\u767b\u5f55\u5417\uff1f
@@ -266,15 +269,15 @@
login.register.tab=\u6ce8\u518c\u65b0\u7528\u6237
login.tab.help=\u5e2e\u52a9
-login.loginhelpmissing=\u54e6\uff0c\u770b\u4e0a\u53bb {0} \u9875\u9762\u5df2\u7ecf\u6ca1\u6709\u4e86\u3002\
+login.loginhelpmissing=\u54e6\uff0c\u4f3c\u4e4e {0} \u9875\u9762\u4e0d\u89c1\u4e86\u3002\
\u4e00\u5b9a\u662f\u6709\u4eba\u5bf9\u5b89\u88c5\u8fdb\u884c\u4e86\u64cd\u4f5c...\
-
\u60a8\u53ef\u4ee5\u4ece jspwiki.org \u7684 {0} \u9875\u9762\u590d\u5236\u6587\u672c\u3002
+
\u60a8\u53ef\u4ee5\u4ece jspwiki.org \u7684 LoginHelp \u9875\u9762\u590d\u5236\u6587\u672c\u3002
# NewGroupContent.jsp
newgroup.heading.create=\u521b\u5efa\u65b0\u7ec4
newgroup.errorprefix=\u9519\u8bef\uff1a
newgroup.instructions.start=\u60a8\u53ef\u4ee5\u4f7f\u7528\u8be5\u9875\u9762\u521b\u5efa\u65b0 Wiki \u7ec4\u3002
-newgroup.name=\u540d\u79f0
+newgroup.name=\u540d\u5b57
newgroup.name.description=\u65b0\u7ec4\u7684\u540d\u79f0\u3002
newgroup.members.description=\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
@@ -293,9 +296,9 @@
actions.viewparent.title=\u67e5\u770b\u7236\u9875\u9762 [ v ]
actions.home=\u4e3b\u9875
actions.home.title=\u8f6c\u5230\u4e3b\u9875 {0}
-actions.edit=\u7f16\u8f91(E)
+actions.edit=\u7f16\u8f91(E)
actions.edit.title=\u7f16\u8f91\u5f53\u524d\u9875\u9762 [ e ]
-actions.editparent=\u7f16\u8f91\u7236\u9875\u9762(E)
+actions.editparent=\u7f16\u8f91\u7236\u9875\u9762(E)
actions.editparent.title=\u7f16\u8f91\u7236\u9875\u9762 [ e ]
actions.index=\u5b57\u6bcd\u7d22\u5f15
actions.index.title=\u6240\u6709\u9875\u9762\u7684\u5b57\u6bcd\u6392\u5e8f\u5217\u8868
@@ -310,7 +313,7 @@
actions.upload=\u9644\u52a0\u6587\u4ef6
actions.info=\u4fe1\u606f
actions.info.title=\u5176\u4ed6\u9875\u9762\u4fe1\u606f\u548c\u7248\u672c\u5386\u53f2\u8bb0\u5f55 [ i ]
-actions.prefs=\u6211\u7684\u9996\u9009\u9879(P)
+actions.prefs=\u6211\u7684\u9996\u9009\u9879(P)
actions.prefs.title=\u7ba1\u7406\u9996\u9009\u9879 [ p ]
actions.editgroup=\u7f16\u8f91\u7ec4
actions.deletegroup=\u5220\u9664\u7ec4
@@ -328,6 +331,7 @@
actions.systeminfo=JSPWiki \u7cfb\u7edf\u4fe1\u606f
actions.systeminfo.title=\u663e\u793a JSPWiki \u7cfb\u7edf\u8bbe\u7f6e\u4fe1\u606f
actions.rawpage=\u67e5\u770b\u9875\u9762\u6e90
+actions.rawpage.title=\u67e5\u770b\u9875\u9762\u6e90
# PageContent.jsp
@@ -347,22 +351,19 @@
prefs.tab.prefs=\u9996\u9009\u9879
prefs.tab.profile=\u6982\u8981\u4fe1\u606f
-prefs.cookies=\u60a8\u7684\u9009\u62e9\u5c06\u4f5c\u4e3a cookie \u4fdd\u5b58\u5728\u6d4f\u89c8\u5668\u4e2d\u3002
+prefs.cookies=\u60a8\u7684\u9009\u62e9\u5c06\u4fdd\u5b58\u4e3a\u6d4f\u89c8\u5668\u4e2d\u7684 cookie\u3002
prefs.user.skin=\u5916\u8868
prefs.user.orientation=\u6536\u85cf\u5939\u6837\u5f0f
prefs.user.orientation.left=\u5de6
prefs.user.orientation.right=\u53f3
-prefs.user.fontsize=\u5b57\u4f53\u5927\u5c0f
prefs.user.editorareaheight=\u7f16\u8f91\u5668\u533a\u57df\u7684\u9ad8\u5ea6
prefs.user.timeformat=\u9009\u62e9\u65f6\u95f4\u683c\u5f0f
prefs.user.timezone=\u9009\u62e9\u65f6\u533a
+prefs.user.timezone.server=[\u670d\u52a1\u5668]
+prefs.user.language=\u9009\u62e9\u8bed\u8a00
+prefs.user.language.default=[\u7f3a\u7701\u503c]
-pref.fontsize.title.down=\u7f29\u5c0f\u5b57\u4f53\u5927\u5c0f
-pref.fontsize.reset=\u7f3a\u7701
-pref.fontsize.title.reset=\u5c06\u5b57\u4f53\u5927\u5c0f\u91cd\u8bbe\u4e3a\u6d4f\u89c8\u5668\u7f3a\u7701\u503c
-pref.fontsize.title.up=\u653e\u5927\u5b57\u4f53\u5927\u5c0f
-
prefs.instructions=\u5728\u6b64\u8bbe\u7f6e\u7528\u6237\u9996\u9009\u9879\u3002\u60a8\u7684\u9009\u62e9\u5c06\u4fdd\u5b58\u4e3a\u6d4f\u89c8\u5668\u4e2d\u7684 cookie\u3002
prefs.assertedname=\u540d\u5b57
prefs.assertedname.description=\u60a8\u7684\u59d3\u540d\u3002\
@@ -375,7 +376,7 @@
prefs.submit.setname=\u8bbe\u7f6e\u7528\u6237\u540d
prefs.save.prefs.submit=\u4fdd\u5b58\u7528\u6237\u9996\u9009\u9879
prefs.clear.submit=\u6e05\u9664\u7528\u6237\u9996\u9009\u9879
-prefs.clear.description=\u5728\u67d0\u4e9b\u60c5\u51b5\u4e0b\uff0c\u60a8\u53ef\u80fd\u9700\u8981\u4ece\u8ba1\u7b97\u673a\u5220\u9664 ‘asserted’ \u7528\u6237\u540d\u548c\u7528\u6237\u9996\u9009\u9879\u3002\
+prefs.clear.description=\u5728\u67d0\u4e9b\u60c5\u51b5\u4e0b\uff0c\u60a8\u53ef\u80fd\u9700\u8981\u4ece\u8ba1\u7b97\u673a\u5220\u9664\u201casserted\u201d\u7528\u6237\u540d\u548c\u7528\u6237\u9996\u9009\u9879\u3002\
\u8981\u8fd9\u6837\u505a\uff0c\u8bf7\u5355\u51fb\u201c\u6e05\u9664\u7528\u6237\u9996\u9009\u9879\u201d\u6309\u94ae\u3002\
\u6ce8\u610f\uff0c\u8fd9\u5c06\u6c38\u8fdc\u5220\u9664\u60a8\u6240\u8bbe\u7f6e\u7684\u6240\u6709\u7528\u6237\u9996\u9009\u9879\u3002\
\u60a8\u9700\u8981\u91cd\u65b0\u8f93\u5165\u8fd9\u4e9b\u4fe1\u606f\u3002
@@ -446,6 +447,9 @@
outcome.decision.hold=\u6302\u8d77
outcome.decision.reassign=\u91cd\u65b0\u6307\u5b9a
+workflow.details.title=\u663e\u793a\u6216\u9690\u85cf\u8be6\u7ec6\u4fe1\u606f
+workflow.details=\u8be6\u7ec6\u4fe1\u606f...
+
# Specific workflow/decision messages
workflow.saveWikiPage=\u4fdd\u5b58 Wiki \u9875\u9762 {2}
decision.saveWikiPage=\u6279\u51c6\u9875\u9762 {2}
@@ -457,6 +461,7 @@
fact.isAuthenticated=\u662f\u5426\u7ecf\u8fc7\u8ba4\u8bc1\uff1f
select.one=\uff08\u9009\u62e9\u4e00\u9879\uff09
+workflow.creatUserProfile=\u65b0\u7528\u6237\u6982\u8981\u4fe1\u606f {2}
decision.createUserProfile=\u65b0\u7528\u6237\u6982\u8981\u4fe1\u606f {2}
notification.createUserProfile.reject=\u62d2\u7edd\u60a8\u521b\u5efa\u7528\u6237\u6982\u8981\u4fe1\u606f\u7684\u8bf7\u6c42\u3002
fact.submitter=\u63d0\u4ea4\u8005
@@ -486,7 +491,7 @@
upload.title={0}\uff1a\u6dfb\u52a0\u9644\u4ef6
upload.heading.upload=\u5c06\u65b0\u9644\u4ef6\u4e0a\u4f20\u5230 {0}
upload.attachments=\u5f53\u524d\u9644\u4ef6
-upload.info=\u8981\u5411\u8be5\u9875\u9762\u6dfb\u52a0\u65b0\u9644\u4ef6\uff0c\u8bf7\u7528\u4e0b\u9762\u7684\u6846\u627e\u5230\u6587\u4ef6\uff0c\u7136\u540e\u5355\u51fb“\u4e0a\u4f20”\u3002
+upload.info=\u8981\u5411\u8be5\u9875\u9762\u6dfb\u52a0\u65b0\u9644\u4ef6\uff0c\u8bf7\u7528\u4e0b\u9762\u7684\u6846\u627e\u5230\u6587\u4ef6\uff0c\u7136\u540e\u5355\u51fb\u201c\u4e0a\u4f20\u201d\u3002
upload.submit=\u4e0a\u4f20
upload.done=\u4e0a\u4f20\u5b8c\u6210\uff0c\u60a8\u53ef\u80fd\u8981\u8fd4\u56de\u5230 {0}
@@ -511,6 +516,7 @@
editor.plain.changenote=\u66f4\u6539\u6ce8\u91ca
editor.commentsignature=\u6ce8\u91ca\u7b7e\u540d
+editor.plain.toolbar=\u5de5\u5177\u680f
editor.plain.find=\u67e5\u627e
editor.plain.replace=\u66ff\u6362
editor.plain.matchcase=\u5339\u914d\u5927\u5c0f\u5199
@@ -531,8 +537,9 @@
editor.plain.tabcompletion=Tab \u5b8c\u6210\uff08\u5173\u952e\u5b57 + Tab\uff09
editor.plain.tabcompletion.title=\u5c06\u5173\u952e\u5b57\u81ea\u52a8\u6269\u5c55\u4e3a Wiki \u6807\u8bb0
-editor.plain.editassist=\u7f16\u8f91\u52a9\u624b
-editor.plain.editassist.title=\u5207\u6362\u7f16\u8f91\u52a9\u624b\u6309\u94ae
+#editor.plain.editassist=Edit Assist
+#editor.plain.editassist.title=Toggle Edit Assist buttons
+editor.plain.sneakpreview=\u62a2\u5148\u9884\u89c8
editor.plain.tbLink.title=\u94fe\u63a5 - \u63d2\u5165 Wiki \u94fe\u63a5
editor.plain.tbH1.title=h1 - \u63d2\u5165\u6807\u9898\u6837\u5f0f1
editor.plain.tbH2.title=h2 - \u63d2\u5165\u6807\u9898\u6837\u5f0f 2
@@ -578,6 +585,7 @@
#
javascript.sbox.clone.suffix=-New
+javascript.edit.allsections=\uff08\u5168\u90e8\uff09
javascript.edit.startOfPage=\uff08\u9875\u9762\u5f00\u59cb\uff09
javascript.edit.findandreplace.nomatch=\u672a\u627e\u5230\u5339\u914d\u9879\uff01
javascript.edit.toolbar.makeSelection=\u8bf7\u5148\u8fdb\u884c\u9009\u62e9\u3002
@@ -585,13 +593,12 @@
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
-# not yet used in jspwiki
-javascript.quick.top=\u8f6c\u5230\u9876\u90e8
-javascript.quick.previous=\u8f6c\u5230\u524d\u4e00\u4e2a\u90e8\u5206
-javascript.quick.edit=\u7f16\u8f91\u6b64\u90e8\u5206
-javascript.quick.next=\u8f6c\u5230\u4e0b\u4e00\u4e2a\u90e8\u5206
-javascript.quick.bottom=\u8f6c\u5230\u5e95\u90e8
+javascript.favs.show=\u5355\u51fb\u663e\u793a\u6536\u85cf\u5939
+javascript.favs.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
javascript.expand=\u5355\u51fb\u6269\u5c55
@@ -602,11 +609,18 @@
javascript.group.validName=\u8bf7\u4e3a\u65b0\u7ec4\u6307\u5b9a\u6709\u6548\u7684\u540d\u79f0
+javascript.category.title=\u5355\u51fb\u663e\u793a\u7c7b\u522b [{0}] ...
+
javascript.slimbox.info=\u56fe\u50cf {0}\uff08\u5171 {1} \u4e2a\uff09
javascript.slimbox.error=