Return-Path: 
 <scm-return-34872-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 59524 invoked from network); 8 Jan 2009 17:20:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 8 Jan 2009 17:20:03 -0000
Received: (qmail 37162 invoked by uid 500); 8 Jan 2009 17:20:03 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 37025 invoked by uid 500); 8 Jan 2009 17:20:03 -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 37007 invoked by uid 99); 8 Jan 2009 17:20:03 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jan 2009 09:20:03 -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; Thu, 08 Jan 2009 17:20:02 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B95EE2388988; Thu,  8 Jan 2009 09:19:40 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r732763 [2/2] - in /geronimo/server/trunk/plugins:
 console/console-base-portlets/src/main/resources/
 console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/
 console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/
 co...
Date: Thu, 08 Jan 2009 17:19:39 -0000
To: scm@geronimo.apache.org
From: dwoods@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090108171941.B95EE2388988@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp Thu Jan  8 09:19:37 2009
@@ -41,7 +41,7 @@
     <input type="hidden" name="mode" value="unlockCA-after" />
     <b><label for="<portlet:namespace/>password"><fmt:message key="ca.unlockCA.enterCAPrivateKeyPassword"/></label>:</b>
     <input type="password" name="password" id="<portlet:namespace/>password" size="20" maxlength="200" />
-    <br />
+    <br /><br />
 
     <input type="submit" value='<fmt:message key="ca.common.unlockCertAuthority"/>' onClick="return <portlet:namespace/>validateForm();"/>
     <input type="reset" name="reset" value='<fmt:message key="consolebase.common.reset"/>'>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp Thu Jan  8 09:19:37 2009
@@ -138,7 +138,7 @@
             </c:otherwise>
         </c:choose>
         <tr>
-            <th class="${backgroundClass}" align="right"><fmt:message key="ca.common.fingerPrintst"/>:</th>
+            <th class="${backgroundClass}" align="right"><fmt:message key="ca.common.fingerPrints"/>:</th>
             <td class="${backgroundClass}">
   <c:forEach items="${fingerPrints}" var="fp">
                 ${fp.key} = &nbsp; ${fp.value} <br/>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp Thu Jan  8 09:19:37 2009
@@ -214,7 +214,7 @@
 
 </script>
 
-<CommonMsg:commonMsg/><br>
+<CommonMsg:commonMsg/>
 
 <br/>
 <form name="checkExpert">
@@ -336,8 +336,6 @@
   </c:forEach>
 </table>
 
-<br />
-
 <script>
 // Call to set initial expert mode actions correctly 
 init();

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp Thu Jan  8 09:19:37 2009
@@ -129,7 +129,7 @@
 </table>
 <br/>
 
-<b><fmt:message key="consolebase.common.virtualMachine"/>:</b>
+<b><fmt:message key="infomanager.javaSysNormal.virtualMachine"/>:</b>
 <table width="100%" class="TableLine" summary="Virtual Machine">
   <tr>
     <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="consolebase.common.item"/></th>
@@ -166,7 +166,7 @@
 </table>
 <br/>
 
-<b><fmt:message key="consolebase.common.operatingSystem"/>:</b>
+<b><fmt:message key="infomanager.javaSysNormal.operatingSystem"/>:</b>
 <table width="100%" class="TableLine" summary="Operating System">
   <tr>
     <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="consolebase.common.item"/></th>
@@ -243,7 +243,7 @@
 </table>
 <br/>
 
-<b><fmt:message key="consolebase.common.user"/>:</b>
+<b><fmt:message key="infomanager.javaSysNormal.user"/>:</b>
 <table width="100%" class="TableLine" summary="User">
   <tr>
     <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="consolebase.common.item"/></th>
@@ -280,7 +280,7 @@
 </table>
 <br/>
 
-<b><fmt:message key="consolebase.common.etc"/>:</b>
+<b><fmt:message key="infomanager.javaSysNormal.etc"/>:</b>
 <table width="100%" class="TableLine" summary="Etc">
   <tr>
     <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="consolebase.common.item"/></th>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp Thu Jan  8 09:19:37 2009
@@ -56,7 +56,7 @@
 <portlet:param name="mode" value="changePassword-before" />
 <portlet:param name="keystore" value="${id}" />
 <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
-Change key password</a></td>
+<fmt:message key="keystore.certificateDetails.changeKeyPwd"/></a></td>
 </c:if>
 
 <td>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp Thu Jan  8 09:19:37 2009
@@ -82,12 +82,12 @@
                         <portlet:param name="mode" value="certificateDetails-before" />
                         <portlet:param name="id" value="${keystore}" />
                         <portlet:param name="alias" value="${alias}" />
-                    </portlet:actionURL>">Cancel</a></p>
+                    </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>
     </c:when>
     <c:otherwise>
         <p><a href="<portlet:actionURL portletMode="view">
                         <portlet:param name="mode" value="viewKeystore-before" />
                         <portlet:param name="id" value="${keystore}" />
-                    </portlet:actionURL>">Cancel</a></p>
+                    </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>
     </c:otherwise>
 </c:choose>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp Thu Jan  8 09:19:37 2009
@@ -34,6 +34,7 @@
     <br />
 
     <c:if test="${mode eq 'unlockKeystore' && !empty keys}">
+        <br />
         <b><label for="<portlet:namespace/>keyAlias"><fmt:message key="keystore.common.unlockPrivateKey"/></label>:</b>
         <select name="keyAlias" id="<portlet:namespace/>keyAlias">
             <c:forEach var="alias" items="${keys}">
@@ -45,6 +46,7 @@
         <br />
     </c:if>
 
+    <br />
     <input type="submit" value='<fmt:message key="keystore.common.unlockKeystore"/>'/>
 </form>
 

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/help.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/help.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/help.jsp Thu Jan  8 09:19:37 2009
@@ -19,7 +19,6 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-<br />
 <%--   Removed until a better mechanism for rebooting the server is created
 <p>This portlet allows a warm reboot of the server or a shutdown of it.</p>
 <p>A warm reboot will shutdown all applications and services and reboot the Geronimo kernel within the same process. The Geronimo Console session will be disconnected. Reconnect after the server is back up.</p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp Thu Jan  8 09:19:37 2009
@@ -23,9 +23,9 @@
 
 <table width="100%" border="0" cellspacing="0" cellpadding="0">    
   <tr>
-    <td width="15%" >&nbsp;</td>
+    <td width="25%" >&nbsp;</td>
     <td><CommonMsg:commonMsg/></td>
-    <td width="15%" >&nbsp;</td>
+    <td width="25%" >&nbsp;</td>
   </tr>
 </table>
 <%--   Removed until a better mechanism for rebooting the server is created
@@ -43,4 +43,3 @@
 </form>
 </table>
 <br />
-<br />

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/threads/monitor.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/threads/monitor.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/threads/monitor.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/threads/monitor.jsp Thu Jan  8 09:19:37 2009
@@ -20,7 +20,7 @@
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<p><fmt:message key="threads.monitor.title"><fmt:param value="${poolName}"/></fmt:message>:</p>
+<p><fmt:message key="threads.monitor.title"><fmt:param value="${poolName}"/></fmt:message></p>
 
 <table>
   <tr>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp Thu Jan  8 09:19:37 2009
@@ -178,7 +178,7 @@
                     </tr>
                     <tr>
                         <td colspan="4" align="left">
-                            <input type="submit" value="Filter Log"/>
+                            <input type="submit" value="<fmt:message key="webaccesslogmanager.common.filterLog"/>"/>
                         </td>
                     </tr>
                 </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp Thu Jan  8 09:19:37 2009
@@ -67,20 +67,20 @@
 <!-- Current Task -->
 <c:choose>
   <c:when test="${mode eq 'add'}">
-    Add a new ${connectorType}
+    <fmt:message key="webmanager.connector.editConnector.addNew"/> ${connectorType}
   </c:when>
   <c:otherwise>
-    Edit connector ${uniqueName}
+    <fmt:message key="webmanager.connector.editConnector.editConnector"/> ${uniqueName}
   </c:otherwise>
 </c:choose>
 <p>
-(<strong>*</strong> denotes a required attribute)
+<fmt:message key="webmanager.connector.editConnector.requiredAttribute"/>
 <table border="0" cellpadding="3">
 <tr>
-  <th class="DarkBackground">Attribute</th>
-  <th class="DarkBackground">Type</th>
-  <th class="DarkBackground">Value</th>
-  <th class="DarkBackground">Description</th>
+  <th class="DarkBackground"><fmt:message key="webmanager.connector.editConnector.attribute"/></th>
+  <th class="DarkBackground"><fmt:message key="webmanager.connector.editConnector.type"/></th>
+  <th class="DarkBackground"><fmt:message key="webmanager.connector.editConnector.value"/></th>
+  <th class="DarkBackground"><fmt:message key="webmanager.connector.editConnector.desc"/></th>
 </tr>
 <tr>
   <td class="LightBackground"><strong>*<fmt:message key="webmanager.common.uniqueName"/></strong></td>
@@ -132,7 +132,7 @@
         </c:when>
         <c:when test="${connectorAttribute.attributeClass.simpleName eq 'Boolean'}">
 		    <td class="${style}"><input name="${connectorAttribute.attributeName}" id="<portlet:namespace/>${connectorAttribute.attributeName}" type="checkbox" 
-		    <c:if test="${connectorAttribute.value}"><label for="<portlet:namespace/>${connectorAttribute.attributeName}">checked</label></c:if>></td>
+		    <c:if test="${connectorAttribute.value}">checked</c:if> /></td>
         </c:when>
         <c:when test="${fn:containsIgnoreCase(connectorAttribute.attributeName, 'pass')}">
 		    <td class="${style}"><input name="${connectorAttribute.attributeName}" id="<portlet:namespace/>${connectorAttribute.attributeName}" type="password" size="30"

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp Thu Jan  8 09:19:37 2009
@@ -21,7 +21,7 @@
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<CommonMsg:commonMsg/>
+<CommonMsg:commonMsg/><br>
 
 <c:if test="${statsOn}">
 <table width="100%" class="TableLine" summary="Statistic">

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp Thu Jan  8 09:19:37 2009
@@ -56,11 +56,11 @@
     <tr>
       <td width="30%" >&nbsp;</td>
       <td class="Body" align="CENTER" valign="top">
-        <table align="center" cellspacing="0" cellpadding="0" width="550" border="0" valign="top" style="background-color:#F7F7F7; border:1px solid #88A4D7; font-family:Verdana,Helvetica,sans-serif; font-size:100%;">
+        <table align="center" cellspacing="0" cellpadding="0" width="550" border="0" valign="top" style="background-color:#F7F7F7; border:1px solid #88A4D7;">
           <tbody>
             <tr valign="top">
               <td style="width: 20px;"><img height="16" align="baseline" width="16" title="Error" alt="Error" src="/console/images/msg_error.gif"/></td>
-              <td><span style="color:#CC0000; font-family:Verdana,Helvetica,sans-serif;"><fmt:message key="console.login_error.invalid"/></span></td>
+              <td><span style="color:#CC0000; font-family:Verdana,Helvetica,sans-serif; font-size:120%;"><fmt:message key="console.login_error.invalid"/></span></td>
             </tr>
           </tbody>
         </table>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyIndex.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyIndex.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyIndex.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyIndex.jsp Thu Jan  8 09:19:37 2009
@@ -27,8 +27,8 @@
 <form name="<portlet:namespace/>AssemblyForm" action="<portlet:actionURL/>" method="POST">
     <label for="<portlet:namespace/>type"><fmt:message key="car.index.assemblyMode"/></label>
     <select name="type" id="<portlet:namespace/>type">
-        <option selected><fmt:message key="car.index.assemblyHelp.FuncCentric.title"/></option>
-        <option><fmt:message key="car.index.assemblyHelp.AppCentric.title"/></option>
+        <option selected>Function Centric</option>
+        <option>Application Centric</option>
     </select>
     <input type="hidden" name="mode" value="assemblyName-before"/>
     <input type="submit" value='<fmt:message key="car.index.assembleServer"/>'/>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp Thu Jan  8 09:19:37 2009
@@ -107,7 +107,7 @@
       </tr>
     <c:if test="${optionMap[option].password}">
       <tr>
-        <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>confirm-option-${option}">Confirm password</label>:</div></th>
+        <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>confirm-option-${option}"><fmt:message key="consolebase.common.confirmPassword"/></label>:</div></th>
         <td><input name="confirm-option-${option}" id="<portlet:namespace/>confirm-option-${option}" type="password"
                    size="${optionMap[option].length}" value="${realm.options[option]}"></td>
       </tr>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp Thu Jan  8 09:19:37 2009
@@ -546,7 +546,7 @@
     <tr>
       <td colspan="1" align="left"><button type="button" value="Cancel" onclick="javascript:history.go(-1)"><fmt:message key="monitor.common.cancel"/></button></td>
       <td>&nbsp;</td>
-      <td colspan="1" align="right"><input type="submit" value="Save" /></td>
+      <td colspan="1" align="right"><input type="submit" value="<fmt:message key="monitor.common.save"/>" /></td>
       <td></td>
     </tr>
   </table>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp Thu Jan  8 09:19:37 2009
@@ -166,7 +166,7 @@
             <table width="100%" style="border-bottom: 1px solid #2581c7;" cellspacing="1" cellpadding="1">
                 <tr>
                     <td class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1"><fmt:message key="monitor.common.next"/><fmt:message key="monitor.common.action"/></font>
+                        <font face="Verdana" size="+1"><fmt:message key="monitor.common.action"/></font>
                     </td>
                 </tr>
                 <tr>

Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/view/ejbserver/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/view/ejbserver/help.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/view/ejbserver/help.jsp (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/view/ejbserver/help.jsp Thu Jan  8 09:19:37 2009
@@ -37,7 +37,7 @@
 </ul>
 </p>
 <h3><fmt:message key="portlet.openejb.help.containerinfo"/></h3>
-<p><fmt:message key="portlet.openejb.help.containerinfodesc"/>:
+<p><fmt:message key="portlet.openejb.help.containerinfodesc"/>
 <ul>
   <li><b><fmt:message key="portlet.openejb.help.statelesscontainer"/></b>
     <ul>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase.properties?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase.properties (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase.properties Thu Jan  8 09:19:37 2009
@@ -220,3 +220,4 @@
 internaldb.runSQLNormal.note2                 = 2) Query results will be displayed for single 'Select' statement
 internaldb.runSQLNormal.note3                 = 3) Use single quotes to encapsulate literal strings
 internaldb.runSQLNormal.reallyDeleteDatabase  = Are you sure you want to delete this database?
+internaldb.runSQLNormal.runSQL                = Run SQL

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase_zh.properties?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase_zh.properties (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase_zh.properties Thu Jan  8 09:19:37 2009
@@ -220,3 +220,4 @@
 internaldb.runSQLNormal.note2                 = 2) \u5355\u4E2A Select \u8BED\u53E5\u7684\u67E5\u8BE2\u7ED3\u679C\u4F1A\u88AB\u663E\u793A
 internaldb.runSQLNormal.note3                 = 3) \u4F7F\u7528\u5355\u5F15\u53F7\u62EC\u4F4F\u6587\u672C\u5B57\u7B26\u4E32
 internaldb.runSQLNormal.reallyDeleteDatabase  = \u786E\u5B9A\u8981\u5220\u9664\u8FD9\u4E2A\u6570\u636E\u5E93\u4E48\uFF1F
+internaldb.runSQLNormal.runSQL                = \u8FD0\u884CSQL

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp?rev=732763&r1=732762&r2=732763&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp Thu Jan  8 09:19:37 2009
@@ -88,7 +88,7 @@
         <option value="${dsName}"<c:if test="${useDB==dsName}"> selected="selected"</c:if>>${dsName}</option>
       </c:forEach>
       </select>&nbsp;
-      <input type="submit" value="Run SQL" onClick="return <portlet:namespace/>validateForm3();"></td>
+      <input type="submit" value="<fmt:message key="internaldb.runSQLNormal.runSQL"/>" onClick="return <portlet:namespace/>validateForm3();"></td>
   </tr>
  </c:otherwise>
 </c:choose>