Return-Path: Delivered-To: apmail-incubator-jspwiki-commits-archive@locus.apache.org Received: (qmail 87332 invoked from network); 21 Nov 2008 18:06:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Nov 2008 18:06:18 -0000 Received: (qmail 68910 invoked by uid 500); 21 Nov 2008 18:06:27 -0000 Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org Received: (qmail 68896 invoked by uid 500); 21 Nov 2008 18:06:27 -0000 Mailing-List: contact jspwiki-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jspwiki-dev@incubator.apache.org Delivered-To: mailing list jspwiki-commits@incubator.apache.org Received: (qmail 68887 invoked by uid 99); 21 Nov 2008 18:06:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Nov 2008 10:06:27 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Nov 2008 18:05:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E72B5238896B; Fri, 21 Nov 2008 10:05:19 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r719661 - in /incubator/jspwiki/trunk: ChangeLog etc/i18n/CoreResources_zh_CN.properties etc/i18n/plugin/PluginResources_zh_CN.properties src/com/ecyrd/jspwiki/Release.java Date: Fri, 21 Nov 2008 18:05:18 -0000 To: jspwiki-commits@incubator.apache.org From: metskem@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081121180519.E72B5238896B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: metskem Date: Fri Nov 21 10:05:18 2008 New Revision: 719661 URL: http://svn.apache.org/viewvc?rev=719661&view=rev Log: 3.0.0-svn-11 JSPWIKI-407: applied zh_CN patch from Hubert Chang Modified: incubator/jspwiki/trunk/ChangeLog incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties incubator/jspwiki/trunk/etc/i18n/plugin/PluginResources_zh_CN.properties incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Modified: incubator/jspwiki/trunk/ChangeLog URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=719661&r1=719660&r2=719661&view=diff ============================================================================== --- incubator/jspwiki/trunk/ChangeLog (original) +++ incubator/jspwiki/trunk/ChangeLog Fri Nov 21 10:05:18 2008 @@ -1,3 +1,9 @@ +2008-11-21 Harry Metske + + * 3.0.0-svn-11 + + * JSPWIKI-407: applied zh_CN patch from Hubert Chang + 2008-11-20 Dirk Frederickx * 3.0.0-svn-10 -- merged from 2.8.1-svn-12 Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties?rev=719661&r1=719660&r2=719661&view=diff ============================================================================== --- incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties (original) +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties Fri Nov 21 10:05:18 2008 @@ -197,3 +197,14 @@ # RSSImageLinkTag 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 + +# VariableManager +varmgr.not.logged.in=\u672a\u767b\u5f55 +varmgr.authenticated=\u5df2\u9a8c\u8bc1 +varmgr.asserted=\u5c1a\u5f85\u9a8c\u8bc1 +varmgr.anonymous=\u533f\u540d \ No newline at end of file Modified: incubator/jspwiki/trunk/etc/i18n/plugin/PluginResources_zh_CN.properties URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/plugin/PluginResources_zh_CN.properties?rev=719661&r1=719660&r2=719661&view=diff ============================================================================== --- incubator/jspwiki/trunk/etc/i18n/plugin/PluginResources_zh_CN.properties (original) +++ incubator/jspwiki/trunk/etc/i18n/plugin/PluginResources_zh_CN.properties Fri Nov 21 10:05:18 2008 @@ -48,3 +48,10 @@ formselect.namemissing = Select \u5143\u7d20\u7f3a\u5c11\u53c2\u6570 'name'\u3002 formtextarea.noneedtoshow = \uff08\u73b0\u5728\u4e0d\u5fc5\u663e\u793a\u6587\u672c\u6846\uff09 formtextarea.namemissing = Textarea \u5143\u7d20\u7f3a\u5c11\u53c2\u6570 'name'\u3002 + +# ListLocks plugin +plugin.listlocks.page=\u9875\u9762 +plugin.listlocks.locked.by=\u9501\u5b9a\u8005\u4e3a +plugin.listlocks.acquired=\u5df2\u83b7\u5f97 +plugin.listlocks.expires=\u5df2\u8fc7\u671f +plugin.listlocks.no.locks.exist=\u76ee\u524d\u4e0d\u5b58\u5728\u9501\u3002 \ No newline at end of file Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=719661&r1=719660&r2=719661&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Fri Nov 21 10:05:18 2008 @@ -77,7 +77,7 @@ *

* If the build identifier is empty, it is not added. */ - public static final String BUILD = "10"; + public static final String BUILD = "11"; /** * This is the generic version string you should use