Return-Path: 
 <scm-return-24243-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 93577 invoked from network); 7 Jan 2008 05:04:24 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Jan 2008 05:04:24 -0000
Received: (qmail 12722 invoked by uid 500); 7 Jan 2008 05:04:13 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 12674 invoked by uid 500); 7 Jan 2008 05:04:13 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 12663 invoked by uid 99); 7 Jan 2008 05:04:13 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jan 2008 21:04:13 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jan 2008 05:03:57 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1995C1A9894; Sun,  6 Jan 2008 21:04:02 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r609514 - in
 /geronimo/server/trunk/plugins/console/console-base-portlets/src/main:
 resources/ webapp/WEB-INF/view/ca/ webapp/WEB-INF/view/infomanager/
Date: Mon, 07 Jan 2008 05:04:01 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080107050402.1995C1A9894@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gawor
Date: Sun Jan  6 21:03:59 2008
New Revision: 609514

URL: http://svn.apache.org/viewvc?rev=609514&view=rev
Log:
fix a few resource bundle names/keys in jsps

Modified:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties?rev=609514&r1=609513&r2=609514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties Sun Jan  6 21:03:59 2008
@@ -129,8 +129,8 @@
 ca.index.title                                      = This portlet allows you to setup a Certification Authority (CA) and issue certificates in reply to Certificate Signing Requests (CSRs).   <i>Setup Certification Authority</i> function allows to initialize the CA by providing CA Identity details,   algorithm parameters for CA's key pair and self-signed certificate and a password to protect the CA's private key. This password is to be used to unlock the CA to access CA functions. Once the CA is initialized,CSRs can be processed using <i>Issue New Certificate</i> function.  Previously issued certificates can be viewed using <i>View Issued Certificate</i> function.
 ca.listRequestsIssue.CertRequestsAwaiting           = Certificate Requests awaiting fulfillment
 ca.listRequestsIssue.CertRequestsAwaitingExp        = This screen shows the certificate requests waiting to be fulfilled.
-ca.listRequestsVerify.certRequestsAwaitingVerifyExp = Certificate Requests awaiting verification
-ca.listRequestsVerify.jsp                           = This screen shows the certificate requests waiting for verification.
+ca.listRequestsVerify.certRequestsAwaitingVerify    = Certificate Requests awaiting verification
+ca.listRequestsVerify.certRequestsAwaitingVerifyExp = This screen shows the certificate requests waiting for verification.
 ca.processCSR.pastePkcs10here                       = ...paste pkcs10 encoded certificate request here...
 ca.processCSR.summary                               = This screen lets you process Certificate Signing Request (CSR) text and view the details of the requestor.  Paste the content of CSR text file you received from the requestor and click on<i>Process CSR</i> button.  The next screen will show the details of the requestor and allow you to input information required to issue a certificate.
 ca.processCSR.title                                 = <b>Issue New Certificate</b> - Step 1: Process Certificate Signing Request (CSR)\r\n

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties?rev=609514&r1=609513&r2=609514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties Sun Jan  6 21:03:59 2008
@@ -129,8 +129,8 @@
 ca.index.title                                      = \u8FD9\u4E2Aportlet\u5141\u8BB8\u4F60\u8BBE\u7F6E\u8BC1\u4E66\u6388\u6743\u673A\u6784\uFF0C\u548C\u9881\u53D1\u8BC1\u4E66\u4EE5\u4F5C\u4E3A\u5BF9\u8BC1\u4E66\u7B7E\u540D\u8BF7\u6C42\u7684\u56DE\u5E94\u3002 <i>\u8BBE\u7F6E\u8BC1\u4E66\u6388\u6743\u673A\u6784</i>\u529F\u80FD\uFF0C\u8BA9\u4F60\u63D0\u4F9BCA\u8EAB\u4EFD\u7EC6\u8282\uFF0CCA\u5BC6\u94A5\u5BF9\u7684\u7B97\u6CD5\u53C2\u6570\uFF0C\u81EA\u7B7E\u540D\u8BC1\u4E66\uFF0C\u4FDD\u62A4CA\u79C1\u94A5\u7684\u5BC6\u7801\u7B49\u4FE1\u606F\uFF0C\u6765\u521D\u59CB\u5316CA\u3002 \u8FD9\u4E2A\u5BC6\u7801\u7528\u6765\u89E3\u9501CA\u4EE5\u8BBF\u95EE\uFF23\uFF21\u63D0\u4F9B\u7684\u529F\u80FD\u3002\u4E00\u65E6\uFF23\uFF21\u88AB\u521D\u59CB\u5316\uFF0C\u53EF\u4EE5\u4F7F\u7528<i>\u9881\u53D1\u65B0\u8BC1\u4E66</i>\u529F\u80FD\u6765\u5904\u7406CSRs\u3002\u53EF\u4EE5\u4F7F\u7528 <i>\u67E5\u770B\u5DF2\u9881\u53D1\u8BC1\u4E66</i>\u529F\u80FD\u6765\u67E5\u770B\u4EE5\u524D\u9881\u53D1\u7684\u
 8BC1\u4E66\u3002 
 ca.listRequestsIssue.CertRequestsAwaiting           = \u7B49\u5F85\u5B9E\u73B0\u7684\u8BC1\u4E66\u8BF7\u6C42
 ca.listRequestsIssue.CertRequestsAwaitingExp        = \u8FD9\u4E2A\u9875\u9762\u663E\u793A\u4E86\u7B49\u5F85\u5B9E\u73B0\u7684\u8BC1\u4E66\u8BF7\u6C42\u3002
-ca.listRequestsVerify.certRequestsAwaitingVerifyExp = \u7B49\u5F85\u9A8C\u8BC1\u7684\u8BC1\u4E66\u8BF7\u6C42
-ca.listRequestsVerify.jsp                           = \u8FD9\u4E2A\u9875\u9762\u663E\u793A\u4E86\u7B49\u5F85\u9A8C\u8BC1\u7684\u8BC1\u4E66\u8BF7\u6C42\u3002
+ca.listRequestsVerify.certRequestsAwaitingVerify    = \u7B49\u5F85\u9A8C\u8BC1\u7684\u8BC1\u4E66\u8BF7\u6C42
+ca.listRequestsVerify.certRequestsAwaitingVerifyExp = \u8FD9\u4E2A\u9875\u9762\u663E\u793A\u4E86\u7B49\u5F85\u9A8C\u8BC1\u7684\u8BC1\u4E66\u8BF7\u6C42\u3002
 ca.processCSR.pastePkcs10here                       = ...\u7C98\u5E16pkcs10\u7F16\u7801\u7684\u8BC1\u4E66\u8BF7\u6C42\u5230\u8FD9\u91CC...
 ca.processCSR.summary                               = \u8FD9\u4E2A\u9875\u9762\u8BA9\u4F60\u5904\u7406\u8BC1\u4E66\u7B7E\u540D\u8BF7\u6C42\uFF0C\u548C\u67E5\u770B\u8BF7\u6C42\u8005\u7684\u8BE6\u7EC6\u4FE1\u606F\u3002\u628A\u4F60\u4ECE\u8BF7\u6C42\u8005\u90A3\u91CC\u63A5\u6536\u5230\u7684CSR\u6587\u4EF6\u7684\u5185\u5BB9\u7C98\u5E16\u5230\u8FD9\u91CC\uFF0C\u5E76\u70B9\u51FB<i>\u5904\u7406CSR</i>\u6309\u94AE\u3002\u4E0B\u4E00\u4E2A\u9875\u9762\u5C06\u4F1A\u663E\u793A\u8BF7\u6C42\u8005\u7684\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u5E76\u5141\u8BB8\u4F60\u8F93\u5165\u8981\u53D1\u5E03\u4E00\u4E2A\u8BC1\u4E66\u6240\u5FC5\u987B\u7684\u4FE1\u606F\u3002
 ca.processCSR.title                                 = <b>\u53D1\u5E03\u65B0\u8BC1\u4E66</b> -\u6B65\u9AA41: \u5904\u7406\u8BC1\u4E66\u7B7E\u540D\u8BF7\u6C42(CSR)

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp?rev=609514&r1=609513&r2=609514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp Sun Jan  6 21:03:59 2008
@@ -20,10 +20,10 @@
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<b><fmt:message key="ca.listRequestsIssue.certRequestsAwaiting"/>
+<b><fmt:message key="ca.listRequestsIssue.CertRequestsAwaiting"/>
 </b>
 
-<p><fmt:message key="ca.listRequestsIssue.certRequestsAwaitingExp"/>
+<p><fmt:message key="ca.listRequestsIssue.CertRequestsAwaitingExp"/>
 </p>
 
 <jsp:include page="_header.jsp" />

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp?rev=609514&r1=609513&r2=609514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp Sun Jan  6 21:03:59 2008
@@ -29,11 +29,11 @@
     <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="infomanager.svrInfoNormal.server"/></td>
   </tr>
   <tr>
-    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.build"/></td>
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.version"/></td>
     <td class="LightBackground" width="80%">${svrProps['Geronimo Version']}</td>
   </tr>
   <tr>
-    <td class="MediumBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.bootTime"/></td>
+    <td class="MediumBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.startTime"/></td>
     <td class="MediumBackground" width="80%">${svrProps['Kernel Boot Time']}</td>
   </tr>
   <tr>