You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2009/12/07 09:10:26 UTC

svn commit: r887859 [1/6] - in /geronimo/server/branches/2.2/plugins: activemq/activemq-portlets/src/main/i18n-resources/ console/console-base-portlets/src/main/i18n-resources/ console/console-portal-driver/src/main/i18n-resources/ console/console-port...

Author: genspring
Date: Mon Dec  7 08:10:25 2009
New Revision: 887859

URL: http://svn.apache.org/viewvc?rev=887859&view=rev
Log:
GERONIMO-4977 Geronimo EN/Simp.Chinese UI information improvement for Console, thanks Jeff for the patch !

Modified:
    geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties
    geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties
    geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties
    geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties
    geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties
    geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties
    geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties
    geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties
    geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
    geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties
    geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_zh.properties
    geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties
    geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_zh.properties
    geronimo/server/branches/2.2/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_en.properties
    geronimo/server/branches/2.2/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_zh.properties
    geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_en.properties
    geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_zh.properties
    geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_en.properties
    geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_zh.properties
    geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties   (contents, props changed)
    geronimo/server/branches/2.2/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/plancreator-portlet_en.properties
    geronimo/server/branches/2.2/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/portletinfo_en.properties
    geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_en.properties
    geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_zh.properties
    geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
    geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_zh.properties
    geronimo/server/branches/2.2/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties Mon Dec  7 08:10:25 2009
@@ -27,27 +27,27 @@
 jmsmanager.activemq.common.poolMaxCapacityExp               = Maximum connection pool size.
 jmsmanager.activemq.common.serverURL                        = Server URL
 jmsmanager.activemq.common.serverURLExp                     = URL of the server to connect to.
-jmsmanager.activemq.common.testConn                         = test connection
+jmsmanager.activemq.common.testConn                         = Test connection
 jmsmanager.activemq.common.testResult                       = Test Result
 jmsmanager.activemq.common.userNameExp                      = User name to use.
 jmsmanager.activemq.config.passwordsNotMatch                = Passwords did not match
 jmsmanager.activemq.config.repeatPassword                   = Repeat Password
-jmsmanager.activemq.config.serverUrl                        = ServerUrl
-jmsmanager.activemq.config.userName                         = UserName
+jmsmanager.activemq.config.serverUrl                        = Server Url
+jmsmanager.activemq.config.userName                         = User Name
 jmsmanager.activemq.help.addNewJMSConnFactoryExp            = This link brings up a form for adding a new connection factory. The fields are defined on the form.
-jmsmanager.activemq.help.detailExp                          = This link provides details on the connector. Clicking on the details link will display information about the Connection Factory in Property/Value pairs. Click on the "Back to JMS Connection Factories" button to return to the main JMS Connection Factories page.
+jmsmanager.activemq.help.detailExp                          = This link provides details on the connector. Click the details link to display information about the Connection Factory in Property/Value pairs. Click the "Back to JMS Connection Factories" button to return to the main JMS Connection Factories page.
 jmsmanager.activemq.help.nameExp                            = Name of the connection factory.
 jmsmanager.activemq.help.stateExp                           = The state of the connection, either "Running" or "Stopped."
 jmsmanager.activemq.help.testConnExp                        = This link can be used to test the connector. A result will be returned of either "Connected" or a failure message.
 jmsmanager.activemq.help.title                              = This portlet displays the JMS connectors that are configured with the Geronimo server.
 jmsmanager.broker.cancel                                    =  Cancel 
-jmsmanager.broker.confirmMsg01                              = Are you sure you want to delete 
-jmsmanager.broker.creationtip                               = Please edit the ActiveMQ XML template configuration file in the edit box below, then click the save buttion to save the changes and redeploy the broker
+jmsmanager.broker.confirmMsg01                              = Are you sure that you want to delete? 
+jmsmanager.broker.creationtip                               = Edit the ActiveMQ XML template configuration file in the edit box below, then click the save buttion to save the changes and redeploy the broker
 jmsmanager.broker.emptyText                                 = The focussed field must not be empty.
-jmsmanager.broker.emptybrokerconfig                         = ActiveMQ XML configuration could not be empty
-jmsmanager.broker.emptybrokername                           = Broker name could not be empty
+jmsmanager.broker.emptybrokerconfig                         = ActiveMQ XML configuration must not be empty
+jmsmanager.broker.emptybrokername                           = Broker name must not be empty
 jmsmanager.broker.ok                                        =    OK   
-jmsmanager.broker.updatetip                                 = Please edit the ActiveMQ XML configuration file in the edit box below, then click the save buttion to save the changes and redeploy the broker.
+jmsmanager.broker.updatetip                                 = Edit the ActiveMQ XML configuration file in the edit box below, then click the save buttion to save the changes and redeploy the broker.
 jmsmanager.common.actions                                   = Actions
 jmsmanager.common.addNewDatasource                          = Add New Datasource
 jmsmanager.common.addQueue_Topic                            = Add Queue/Topic
@@ -60,12 +60,12 @@
 jmsmanager.common.correlationID                             = CorrelationID
 jmsmanager.common.create                                    = Create
 jmsmanager.common.currentDepth                              = Current Depth
-jmsmanager.common.delete                                    = delete
+jmsmanager.common.delete                                    = Delete
 jmsmanager.common.description                               = Description
 jmsmanager.common.destination                               = Destination
 jmsmanager.common.destinationPhysicalName                   = Destination Physical Name
-jmsmanager.common.detail                                    = detail
-jmsmanager.common.edit                                      = edit
+jmsmanager.common.detail                                    = Detail
+jmsmanager.common.edit                                      = Edit
 jmsmanager.common.expiration                                = Expiration
 jmsmanager.common.host                                      = Host
 jmsmanager.common.hostExp                                   = The host name or IP to bind to.  The normal values are <tt>0.0.0.0</tt> (all interfaces) or <tt>localhost</tt> (local connections only)
@@ -90,14 +90,14 @@
 jmsmanager.common.protocol                                  = Protocol
 jmsmanager.common.refresh                                   = Refresh
 jmsmanager.common.remove                                    = Remove
-jmsmanager.common.replyTo                                   = ReplyTo
+jmsmanager.common.replyTo                                   = Reply To
 jmsmanager.common.reset                                     = Reset
 jmsmanager.common.save                                      = Save
 jmsmanager.common.sharable                                  = Sharable
 jmsmanager.common.start                                     = start
 jmsmanager.common.state                                     = State
 jmsmanager.common.statiscticFor                             = Statistic for {0}
-jmsmanager.common.stop                                      = stop
+jmsmanager.common.stop                                      = Stop
 jmsmanager.common.submit                                    = Submit
 jmsmanager.common.testConn                                  = test connection
 jmsmanager.common.timestamp                                 = Timestamp
@@ -105,23 +105,23 @@
 jmsmanager.common.type                                      = Type
 jmsmanager.common.userName                                  = User Name
 jmsmanager.common.value                                     = Value
-jmsmanager.common.viewDLQ                                   = view DLQ
-jmsmanager.common.viewMessages                              = view messages
-jmsmanager.connectionhelp.addNewDatasourceExp               = Clicking on this link allows the user to add a new datasource. On the add new datasource form, fill in the fields and click on the Create button to add the new datasource. The fields are defined on the form itself.
-jmsmanager.connectionhelp.detailExp                         = This link provides details on the connector.  Clicking on the details link will display information about the Connection Factory in Property/Value pairs. Click on &quot;Back to Datasources&quot; to return to the main JMS Connection Factories page.
+jmsmanager.common.viewDLQ                                   = View DLQ
+jmsmanager.common.viewMessages                              = View messages
+jmsmanager.connectionhelp.addNewDatasourceExp               = Click this link to add a new datasource. On the add new datasource form, fill in the fields and click the Create button to add the new datasource. The fields are defined on the form itself.
+jmsmanager.connectionhelp.detailExp                         = This link provides details on the connector.  Click the details link to display information about the Connection Factory in Property/Value pairs. Click on &quot;Back to Datasources&quot; to return to the main JMS Connection Factories page.
 jmsmanager.connectionhelp.nameExp                           = Name of the Connection Factory.
 jmsmanager.connectionhelp.stateExp                          = The state of the connection, either &quot;Running&quot; or &quot;Stopped.&quot;
 jmsmanager.connectionhelp.testConnExp                       = This link can be used to test the connector. A result will be returned of either &quot;Connected&quot; or a failure message.
 jmsmanager.connectionhelp.title                             = This portlet displays the JMS connectors that are configured with the Geronimo server and allows the user to add datasources as well.
-jmsmanager.help.addQueue_TopicExp                           = To create a queue/topic click on the &quot;Add Queue/Topic&quot; link. This link brings up a form that allows the user to add a queue or a topic. Fill in the text boxes on the form and click on the &quot;Submit&quot; button. The fields and buttons on the form are defined as follows:
+jmsmanager.help.addQueue_TopicExp                           = To create a queue/topic, click the &quot;Add Queue/Topic&quot; link. This link brings up a form that allows the user to add a queue or a topic. Fill in the text boxes on the form and click the &quot;Submit&quot; button. The fields and buttons on the form are defined as follows:
 jmsmanager.help.applicationNameExp                          = This is the &quot;configID&quot; in the geronimo-web.xml file. Or this can be set to the string &quot;null&quot; if the admin object is deployed stand-alone. By default this field contains the string &quot;null.&quot;
 jmsmanager.help.backBtnExp                                  = The Back button returns the user to the &quot;JMS Destination Manager&quot; main page without adding a queue or a topic.
 jmsmanager.help.clearBtnExp                                 = The Clear button resets all input fields to the default values.
 jmsmanager.help.destinationPhysicalNameExp                  = The name of the connection factory that ActiveMQ knows about.
 jmsmanager.help.messageDestinationNameExp                   = The name of the queue or topic. This is the name used in the admin object gbean name and is linked to by &lt;message-destination-link&gt; in the geronimo-web.xml plan.
-jmsmanager.help.moduleNameExp                               = If the module is deployed stand-alone this field is the &quot;configID&quot; in the geronimo-web.xml file. If it is deployed in an application (ear) this field should be the path of the module inside the ear, such as, myResourceAdapter.rar. By default this field contains &quot;defaultJMS.&quot;
+jmsmanager.help.moduleNameExp                               = If the module is deployed stand-alone, this field is the &quot;configID&quot; in the geronimo-web.xml file. If it is deployed in an application (ear), this field should be the path of the module inside the ear, such as, myResourceAdapter.rar. By default this field contains &quot;defaultJMS.&quot;
 jmsmanager.help.submitBtnExp                                = The Submit button creates a new queue or topic and returns the user to the JMS Destination Manager main page.
-jmsmanager.help.summary                                     = <p>On the main JMS Destination Manager pane, there is an &quot;Actions&quot; column that provides three actions which can be performed on a queue or topic. To remove a queue or topic, click on the &quot;remove&quot; link to the right of the queue/topic to be removed. To view a message, click on the &quot;view messages&quot; link to the right of the queue/topic. To view the dead letter queue, click on the &quot;view DLQ&quot; link.</p><p> <strong>Note:</strong> Queues/Topics with no messages will be removed after restarting the server.</p>
+jmsmanager.help.summary                                     = <p>On the main JMS Destination Manager pane, there is an &quot;Actions&quot; column that provides three actions which can be performed on a queue or topic. To remove a queue or topic, click the &quot;remove&quot; link to the right of the queue/topic to be removed. To view a message, click the &quot;view messages&quot; link to the right of the queue/topic. To view the dead letter queue, click the &quot;view DLQ&quot; link.</p><p> <strong>Note:</strong> Queues/Topics with no messages will be removed after restarting the server.</p>
 jmsmanager.help.title                                       = This portlet is used to create and remove queues/topics.
 jmsmanager.help.typeExp                                     = The type of message, either queue or topic.
 jmsmanager.sendmessage.correlationId                        = JMS Correlation ID
@@ -137,9 +137,9 @@
 jmsmanager.sendmessage.type                                 = Type
 jmsmanager.server.connector.editGeneric.addJMSConnector     = Add new {0} connector for {1}
 jmsmanager.server.connector.editGeneric.editJMSConnector    = Edit {0} connector {1} for {2}.
-jmsmanager.server.connector.editGeneric.namingJMSConnectors = A name that is different than the name for any other JMS connectors in the server
+jmsmanager.server.connector.editGeneric.namingJMSConnectors = A name that is different from the name for any other JMS connectors in the server
 jmsmanager.server.connector.editGeneric.uniqueName          = Unique Name
-jmsmanager.server.connector.editGeneric.uniqueNameExp       = A name that is different than the name for any other JMS connectors in the server
+jmsmanager.server.connector.editGeneric.uniqueNameExp       = A name that is different from the name for any other JMS connectors in the server
 jmsmanager.server.connector.help.title                      = Shows all the network connectors configured for the currently available JMS brokers. Lets you start, stop, add, remove, and edit JMS network connectors.
 jmsmanager.server.connector.normal.addConnectorTo           = Add connector to {0}
 jmsmanager.server.connector.normal.addNewParaListener       = Add new <b>{0}</b> listener
@@ -206,7 +206,7 @@
 jmswizard.list.serverWide                               = Server-wide
 jmswizard.list.title                                    = This page lists all the available JMS Resource Groups.
 jmswizard.plan.JMSProviderRAR                           = JMS Provider RAR
-jmswizard.plan.JMSProviderRARExp                        = The Resource Adapter RAR that can be used to connect to the JMS provider in question.  This RAR should be installed under GERONIMO/repository/ in  order for it to appear in this list.
+jmswizard.plan.JMSProviderRARExp                        = The Resource Adapter RAR that can be used to connect to the JMS provider in question.  This RAR must be installed under GERONIMO/repository/ in  order for it to appear in this list.
 jmswizard.plan.addToEAR                                 = Add to EAR
 jmswizard.plan.addToEARExp                              = Instead of deploying as a top-level JMS resource, you can deploy this pool as part of an EAR.  To add a JMS resource to an EAR using this plan:<ol>  <li>Copy and paste the plan to a file</li>  <li>Save the plan file to the top level of your EAR</li>  <li>Copy the RAR file from <tt>{0}</tt> to the top level of your EAR</li>  <li>Create a <tt>META-INF/geronimo-application.xml</tt> file in your EAR that has a <tt>module</tt> entry like this (substituting the correct RAR file name and plan file name):</li></ol>
 jmswizard.plan.deployCommand                            = Deploy Command
@@ -218,7 +218,7 @@
 jmswizard.provider.JMSProviderRAR                       = JMS Provider RAR
 jmswizard.provider.JMSProviderRARExp                    = The Resource Adapter RAR that can be used to connect to the JMS provider in question.  This RAR should be installed under GERONIMO/repository/ in order for it to appear in this list.
 jmswizard.provider.title                                = <b>JMS Resource Group</b> -- Select JMS Provider RAR
-jmswizard.raInstance.BrokerXmlConfig                    = Sets the XML configuration file used to configure the embedded ActiveMQ broker via Spring if using embedded mode.<br>BrokerXmlConfig is the filename which is assumed to be on the classpath unless a URL is specified. So a value of foo/bar.xml would be assumed to be on the classpath whereas file:dir/file.xml would use the file system. Any valid URL string is supported.
+jmswizard.raInstance.BrokerXmlConfig                    = Sets the XML configuration file used to configure the embedded ActiveMQ broker by Spring if using embedded mode.<br>BrokerXmlConfig is the filename which is assumed to be on the classpath unless a URL is specified. So a value of foo/bar.xml would be assumed to be on the classpath whereas file:dir/file.xml would use the file system. Any valid URL string is supported.
 jmswizard.raInstance.Clientid                           = The client id that will be set on the connection that is established to the ActiveMQ server.
 jmswizard.raInstance.Password                           = The default password that will be used to log the default user into the ActiveMQ server.
 jmswizard.raInstance.ServerUrl                          = The URL to the ActiveMQ server that you want this connection to connect to.  If using an embedded broker, this value should be 'vm://localhost'.
@@ -232,8 +232,8 @@
 jmswizard.status.addConnFactory                         = Add Connection Factory
 jmswizard.status.addDestination                         = Add Destination
 jmswizard.status.deployNow                              = Deploy Now
-jmswizard.status.factoriesDestinationsAdded             = These are the connection factories and destinations you've added to the JMS resource group so far.  When you're finished adding connection factories and destinations, you can review the Geronimo deployment plan for this resource group, or go ahead and deploy it.
-jmswizard.status.noFactoriesDestinations                = So far, you've entered the basic configuration information required for a JMS resource group.  Now you can create connection factories and destinations.  When you're finished adding connection factories and destinations, you can review the Geronimo deployment plan for this JMS resource group, or go ahead and deploy it.
+jmswizard.status.factoriesDestinationsAdded             = These are the connection factories and destinations you've added to the JMS resource group so far.  When you've finished adding connection factories and destinations, you can review the Geronimo deployment plan for this resource group, or go ahead and deploy it.
+jmswizard.status.noFactoriesDestinations                = So far, you've entered the basic configuration information required for a JMS resource group.  Now you can create connection factories and destinations.  When you've finished adding connection factories and destinations, you can review the Geronimo deployment plan for this JMS resource group, or go ahead and deploy it.
 jmswizard.status.resourceGroup                          = Resource Group
 jmswizard.status.showPlan                               = Show Plan
 jmswizard.status.title                                  = <b>JMS Resource Group</b> -- Current Progress

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties Mon Dec  7 08:10:25 2009
@@ -16,8 +16,8 @@
 #  limitations under the License.
 #=====================================================================
 
-jmsmanager.activemq.addACF.nameExp                          = 该ActiveMQ连接工厂的名称
-jmsmanager.activemq.common.addNewJMSConnFactory             = 添加新的JMS连接工厂
+jmsmanager.activemq.addACF.nameExp                          = 该 ActiveMQ 连接工厂的名称
+jmsmanager.activemq.common.addNewJMSConnFactory             = 添加新的 JMS 连接工厂
 jmsmanager.activemq.common.blockingTimeout                  = 堵塞超时(毫秒)
 jmsmanager.activemq.common.blockingTimeoutExp               = 堵塞超时(毫秒)
 jmsmanager.activemq.common.connName                         = 连接名称
@@ -25,23 +25,23 @@
 jmsmanager.activemq.common.passwordExp                      = 对应用户名的密码
 jmsmanager.activemq.common.poolMaxCapacity                  = 连接池最大连接数
 jmsmanager.activemq.common.poolMaxCapacityExp               = 连接池最大连接数
-jmsmanager.activemq.common.serverURL                        = 服务器URL
+jmsmanager.activemq.common.serverURL                        = 服务器 URL
 jmsmanager.activemq.common.serverURLExp                     = 连接服务器的地址
 jmsmanager.activemq.common.testConn                         = 测试连接
 jmsmanager.activemq.common.testResult                       = 测试结果
 jmsmanager.activemq.common.userNameExp                      = 使用的用户名
 jmsmanager.activemq.config.passwordsNotMatch                = 密码不匹配
 jmsmanager.activemq.config.repeatPassword                   = 确认密码
-jmsmanager.activemq.config.serverUrl                        = 服务器URL
+jmsmanager.activemq.config.serverUrl                        = 服务器 URL
 jmsmanager.activemq.config.userName                         = 用户名
-jmsmanager.activemq.help.addNewJMSConnFactoryExp            = 该连接用于打开添加新连接工厂的表单
-jmsmanager.activemq.help.detailExp                          = 该链接提供连接器的详细信息, 点击该链接会以属性名和对应值的方式显示连接工厂的信息. 点击"返回JMS连接工厂"按钮将返回JMS工厂列表页面
+jmsmanager.activemq.help.addNewJMSConnFactoryExp            = 该链接用于打开添加新连接工厂的表单
+jmsmanager.activemq.help.detailExp                          = 该链接提供连接器的详细信息, 点击该链接会以属性名和对应值的方式显示连接工厂的信息. 点击"返回 JMS 连接工厂"按钮将返回 JMS 工厂列表页面
 jmsmanager.activemq.help.nameExp                            = 连接工厂的名称
 jmsmanager.activemq.help.stateExp                           = 连接的状态,包含"运行"和"停止"状态
-jmsmanager.activemq.help.testConnExp                        = 该连接用于测试连接器, 将返回"成功连接"或者一个错误信息。
-jmsmanager.activemq.help.title                              = 该Portlet显示在Geronimo服务器中配置的JMS连接器
+jmsmanager.activemq.help.testConnExp                        = 该链接用于测试连接器, 将返回"成功连接"或者一个错误信息。
+jmsmanager.activemq.help.title                              = 该 Portle t显示在 Geronimo 服务器中配置的 JMS 连接器
 jmsmanager.broker.cancel                                    = &nbsp;取消&nbsp;
-jmsmanager.broker.confirmMsg01                              = 你确定要删除
+jmsmanager.broker.confirmMsg01                              = 你确定要删除?
 jmsmanager.broker.creationtip                               = 请编辑下面编辑框中的 ActiveMQ XML 模板配置文件, 然后点击保存按钮保存修改并部署该 Broker
 jmsmanager.broker.emptyText                                 = 焦点所在字段不能为空。
 jmsmanager.broker.emptybrokerconfig                         = ActiveMQ XML 配置不可为空
@@ -68,15 +68,15 @@
 jmsmanager.common.edit                                      = 编辑
 jmsmanager.common.expiration                                = 截止
 jmsmanager.common.host                                      = 主机
-jmsmanager.common.hostExp                                   = 要绑定到的主机名称或者IP地址。通常值为<tt>0.0.0.0</tt> (all interfaces) 或者<tt>localhost</tt> (只用于本机连接)
+jmsmanager.common.hostExp                                   = 要绑定到的主机名称或者 IP 地址。通常值为<tt>0.0.0.0</tt> (all interfaces) 或者<tt>localhost</tt> (只用于本机连接)
 jmsmanager.common.inhibitGet                                = 禁止 Get
 jmsmanager.common.inhibitPut                                = 禁止 Put
-jmsmanager.common.listJMSConnectors                         = 列出JMS连接器
+jmsmanager.common.listJMSConnectors                         = 列出 JMS 连接器
 jmsmanager.common.maximumDepth                              = 最大深度
 jmsmanager.common.maximumMessageLength                      = 消息最大长度
 jmsmanager.common.message                                   = 消息
 jmsmanager.common.messageDestinationName                    = 消息目的地名称
-jmsmanager.common.messageID                                 = 消息ID
+jmsmanager.common.messageID                                 = 消息 ID
 jmsmanager.common.moduleName                                = 模块名
 jmsmanager.common.name                                      = 名称
 jmsmanager.common.openInputCount                            = Open Input Count
@@ -108,19 +108,19 @@
 jmsmanager.common.viewDLQ                                   = 查看 DLQ
 jmsmanager.common.viewMessages                              = 查看消息
 jmsmanager.connectionhelp.addNewDatasourceExp               = 点击该链接允许用户添加新的数据源. 在数据源添加表单中, 填写输入字段并点击创建按钮来添加新的数据源
-jmsmanager.connectionhelp.detailExp                         = 该链接提供连接器详细情况, 点击该链接将以键值对的形式显示相关的信息.点击'返回'按钮可返回JMS连接工厂主页面
+jmsmanager.connectionhelp.detailExp                         = 该链接提供连接器详细情况, 点击该链接将以键值对的形式显示相关的信息.点击'返回'按钮可返回 JMS 连接工厂主页面
 jmsmanager.connectionhelp.nameExp                           = 连接工厂的名称
 jmsmanager.connectionhelp.stateExp                          = 连接的状态, 包括'运行'和'停止'
 jmsmanager.connectionhelp.testConnExp                       = 该链接用于测试连接器, 将返回"成功连接"或者一个错误信息。
-jmsmanager.connectionhelp.title                             = 该Portlet显示在Geronimo服务器中配置并允许添加数据源的JMS连接器
+jmsmanager.connectionhelp.title                             = 该 Portlet 显示在 Geronimo 服务器中配置并允许添加数据源的JMS连接器
 jmsmanager.help.addQueue_TopicExp                           = 点击'添加队列或主题'链接可以创建队列或者主题.该链接将打开用户可用于添加队列或者主题的表单.填写表单中的输入框并点击'提交'按钮. 表单中的字段和按钮以如下形式定义"
-jmsmanager.help.applicationNameExp                          = 该项对应于geronimo-web.xml中的'configID'.如果该管理对象部署成'stand-alone'形式, 可以设置成'null'.
-jmsmanager.help.backBtnExp                                  = 返回按钮用于直接返回到'JMS目标管理'页面, 取消添加队列或主题的操作
+jmsmanager.help.applicationNameExp                          = 该项对应于 geronimo-web.xml 中的 'configID '.如果该管理对象部署成 'stand-alone' 形式, 可以设置成'null'.
+jmsmanager.help.backBtnExp                                  = 返回按钮用于直接返回到 'JMS 目标管理'页面, 取消添加队列或主题的操作
 jmsmanager.help.clearBtnExp                                 = 清除按钮用于重置所有输入框到默认值
-jmsmanager.help.destinationPhysicalNameExp                  = ActiveMQ可识别的连接工厂的名字
+jmsmanager.help.destinationPhysicalNameExp                  = ActiveMQ 可识别的连接工厂的名字
 jmsmanager.help.messageDestinationNameExp                   = 队列或主题的名称, 该名称用于管理对象的gbean名称,并与geronimo-web.xml部署计划中的'message-destination-link'字段关联
-jmsmanager.help.moduleNameExp                               = 如果模块以'stand-alone'形式部署, 该字段对应于geronimo-web.xml中的'configID'. 如果部署于一个应用程序(ear)中, 该字段应为在ear中该模块的路径, 例如, myResourceAdapter.rar. 默认情况下该字段包含'defaultJMS'.
-jmsmanager.help.submitBtnExp                                = 提交后将创建一个新的队列或者主题, 并返回到JMS目标管理页面
+jmsmanager.help.moduleNameExp                               = 如果模块以'stand-alone'形式部署, 该字段对应于 geronimo-web.xml 中的'configID'. 如果部署于一个应用程序(ear)中, 该字段应为在ear中该模块的路径, 例如, myResourceAdapter.rar. 默认情况下该字段包含'defaultJMS'.
+jmsmanager.help.submitBtnExp                                = 提交后将创建一个新的队列或者主题, 并返回到 JMS 目标管理页面
 jmsmanager.help.summary                                     = <p>在JMS目的管理页面上, '操作'列提供三类针对队列或主题的操作. 删除一个队列或主题, 点击其右侧的'删除'链接;查看一条消息, 点击右侧的'查看消息'链接.查看死信队列, 点击'查看 DLG'链接</p><p><strong>注意:</strong>没有消息的队列或者主题会在服务器重启后删除</p>
 jmsmanager.help.title                                       = 该Portlet用于创建和删除队列或主题.
 jmsmanager.help.typeExp                                     = 消息的类型, 包括队列或者主题.
@@ -137,25 +137,25 @@
 jmsmanager.sendmessage.type                                 = 类型
 jmsmanager.server.connector.editGeneric.addJMSConnector     = Add new {0} connector for {1}
 jmsmanager.server.connector.editGeneric.editJMSConnector    = Edit {0} connector {1} for {2}.
-jmsmanager.server.connector.editGeneric.namingJMSConnectors = 不同于当前服务器中存在的JMS连接器的名称
+jmsmanager.server.connector.editGeneric.namingJMSConnectors = 不同于当前服务器中存在的 JMS 连接器的名称
 jmsmanager.server.connector.editGeneric.uniqueName          = 唯一的名称
 jmsmanager.server.connector.editGeneric.uniqueNameExp       = 给连接器取一个与服务器中任何其它JMS连接器不同的名称
-jmsmanager.server.connector.help.title                      = 显示为当前可用JMS brokers配置的所有网络连接器。你可以启动,停止,添加,删除和编辑JMS网络连接器。
+jmsmanager.server.connector.help.title                      = 显示为当前可用 JMS broker 配置的所有网络连接器。你可以启动,停止,添加,删除和编辑JMS网络连接器。
 jmsmanager.server.connector.normal.addConnectorTo           = 添加连接器到{0}
 jmsmanager.server.connector.normal.addNewParaListener       = 添加新的<b>{0}</b>监听器
 jmsmanager.server.connector.normal.confirmDelete            = 你确信要删除 {0} ?
-jmsmanager.server.connector.normal.noJMSNetworkConnectors   = 不存在预定义的JMS网络连接器
-jmsmanager.server.connector.normal.title                    = 当前可用的JMS网络连接器:
-jmsmanager.server.help.title                                = 显示可用的JMS brokers
-jmsmanager.server.normal.addJMSBroker                       = 添加新的JMS Broker
-jmsmanager.server.normal.noJMSBrokers                       = 不存在预定义的JMS brokers
-jmsmanager.server.normal.title                              = 在服务器中可用的JMS brokers包括
+jmsmanager.server.connector.normal.noJMSNetworkConnectors   = 不存在预定义的 JMS 网络连接器
+jmsmanager.server.connector.normal.title                    = 当前可用的 JMS 网络连接器:
+jmsmanager.server.help.title                                = 显示可用的 JMS brokers
+jmsmanager.server.normal.addJMSBroker                       = 添加新的 JMS Broker
+jmsmanager.server.normal.noJMSBrokers                       = 不存在预定义的 JMS brokers
+jmsmanager.server.normal.title                              = 在服务器中可用的 JMS brokers 包括
 jmsmanager.viewDLQ.deadLetterQueueName                      = Dead Letter Queue 名称
-jmsmanager.viewDLQ.noMessages                               = 在Dead Letter Queue中的没有消息
+jmsmanager.viewDLQ.noMessages                               = 在 Dead Letter Queue 中的没有消息
 jmsmanager.viewmessages.jsp.noMessagesInDest                = 目标中没有消息
 
 jmswizard.common.Browse                                 = 浏览
-jmswizard.common.JMSFactoryType                         = JMS工厂类型
+jmswizard.common.JMSFactoryType                         = JMS 工厂类型
 jmswizard.common.Purge                                  = 清除
 jmswizard.common.Send                                   = 发送
 jmswizard.common.actions                                = 操作
@@ -168,7 +168,7 @@
 jmswizard.common.connectionFactoryName                  = 连接工厂名称
 jmswizard.common.connectionPoolParameters               = 连接池参数
 jmswizard.common.consumerCount                          = 消费者总数
-jmswizard.common.currentStatusForJMSResourceGroup       = JMS资源组{0}的当前状态
+jmswizard.common.currentStatusForJMSResourceGroup       = JMS 资源组{0}的当前状态
 jmswizard.common.deployedAs                             = 部署为
 jmswizard.common.destination                            = 目标
 jmswizard.common.emptyText                              = 焦点所在字段不能为空。
@@ -193,47 +193,47 @@
 jmswizard.destination.destinationConfSettings           = 目的地配置
 jmswizard.destination.messageDestinationName            = 消息目的地名称
 jmswizard.destination.title                             = <b>JMS资源组</b> -- 配置目的地
-jmswizard.destinationType.JMSDestinationType            = JMS目的地类型
+jmswizard.destinationType.JMSDestinationType            = JMS 目的地类型
 jmswizard.destinationType.selectDesiredInterfacetype    = 这个资源适配器声明了几个可能目的地接口。为这个目的地选择想要的接口类型。
-jmswizard.destinationType.title                         = <b>JMS资源组</b> -- 选择目的地类型
-jmswizard.factory.title                                 = <b>JMS资源组</b> -- 配置连接工厂
-jmswizard.factoryType.title                             = <b>JMS资源组</b> -- 选择连接工厂类型
+jmswizard.destinationType.title                         = <b>JMS 资源组</b> -- 选择目的地类型
+jmswizard.factory.title                                 = <b>JMS 资源组</b> -- 配置连接工厂
+jmswizard.factoryType.title                             = <b>JMS 资源组</b> -- 选择连接工厂类型
 jmswizard.list.applicationScoped                        = 应用程序范围
 jmswizard.list.comfirmMsg01                             = 确定清除消息?
-jmswizard.list.createJMSResourceGroup                   = 创建新的JMS资源组:
-jmswizard.list.forAnotherJMSProvider                    = 其他JMS提供者...
-jmswizard.list.noJMSResourceGroups                      = 没有预定义的JMS资源组
+jmswizard.list.createJMSResourceGroup                   = 创建新的 JMS 资源组:
+jmswizard.list.forAnotherJMSProvider                    = 其他 JMS 提供者...
+jmswizard.list.noJMSResourceGroups                      = 没有预定义的 JMS 资源组
 jmswizard.list.serverWide                               = 服务端
-jmswizard.list.title                                    = 这个页面列出了所有可用的JMS资源组.
+jmswizard.list.title                                    = 这个页面列出了所有可用的 JMS 资源组.
 jmswizard.plan.JMSProviderRAR                           = JMS Provider RAR
-jmswizard.plan.JMSProviderRARExp                        = 用于连接当前JMS提供者的资源适配RAR包. RAR包应该安装在GERONIMO/repository/下以便在列表中显示.
+jmswizard.plan.JMSProviderRARExp                        = 用于连接当前 JMS 提供者的资源适配 RAR 包. RAR 包应该安装在 GERONIMO/repository/下以便在列表中显示.
 jmswizard.plan.addToEAR                                 = 添加到EAR
-jmswizard.plan.addToEARExp                              = 你可以把这个JMS池部署成EAR中的一部分,而不是把它部署成顶层的JMS资源。要将JMS资源添加到EAR中,请使用下面的步骤:<ol>  <li>拷贝并粘帖部署计划到文件中</li>  <li>保存文件到你的EAR的顶层目录</li>  <li>从<tt>{0}</tt>拷贝RAR文件到你的EAR的顶层目录</li>  <li>在你的EAR中创建一个<tt>META-INF/geronimo-application.xml</tt>,其中有下面这样的<tt>module</tt>条目(替换成正确的RAR文件名和部署计划文件名):</li></ol>
+jmswizard.plan.addToEARExp                              = 你可以把这个 JMS 池部署成 EAR 中的一部分,而不是把它部署成顶层的 JMS 资源。要将 JMS 资源添加到 EAR 中,请使用下面的步骤:<ol>  <li>拷贝并粘帖部署计划到文件中</li>  <li>保存文件到你的 EAR 的顶层目录</li>  <li>从<tt>{0}</tt>拷贝 RAR 文件到你的 EAR 的顶层目录</li>  <li>在你的EAR中创建一个<tt>META-INF/geronimo-application.xml</tt>,其中有下面这样的<tt>module</tt>条目(替换成正确的RAR文件名和部署计划文件名):</li></ol>
 jmswizard.plan.deployCommand                            = 部署命令
-jmswizard.plan.deployCommandExp                         = 要在命令行中使用这个部署计划来部署JMS资源,请拷贝并粘帖上面的XML到文件中。(比如:<tt>plan-file.xml</tt>),并保存它。然后运行象下面的命:
+jmswizard.plan.deployCommandExp                         = 要在命令行中使用这个部署计划来部署 JMS 资源,请拷贝并粘帖上面的 XML 到文件中。(比如:<tt>plan-file.xml</tt>),并保存它。然后运行象下面的命:
 jmswizard.plan.deployJMSResource                        = 部署JMS资源
 jmswizard.plan.deploymentPlan                           = 部署计划
 jmswizard.plan.edit                                     = 编辑设置
 jmswizard.plan.title                                    = <b>JMS资源组</b> -- 显示部署计划
 jmswizard.provider.JMSProviderRAR                       = JMS Provider RAR
-jmswizard.provider.JMSProviderRARExp                    = 用于连接当前JMS提供者的资源适配RAR包. RAR包应该安装在GERONIMO/repository/下以便在列表中显示.
+jmswizard.provider.JMSProviderRARExp                    = 用于连接当前 JMS 提供者的资源适配 RA R包. RAR 包应该安装在 GERONIMO/repository/ 下以便在列表中显示.
 jmswizard.provider.title                                = <b>JMS 资源组</b> -- 选择 JMS Provider RAR
-jmswizard.raInstance.BrokerXmlConfig                    = 如果使用内嵌模式,请设定用于设置内嵌的ActiveMQ代理的XML设定文件(通过Spring)<br>BrokerXmlConfig是该文件名,如果没有指定URL的话则假定它在classpath上。所以值foo/bar.xml将假定在classpath上,而file:dir/file.xml将使用文件系统。支持任何有效的URL字符串。
-jmswizard.raInstance.Clientid                           = 建立到ActiveMQ服务器的连接上设定的客户id。
-jmswizard.raInstance.Password                           = 用于默认用户登录到ActiveMQ服务器的默认密码。
-jmswizard.raInstance.ServerUrl                          = 你想连接到的ActiveMQ服务器的URL。如果使用内置的代理,这个值应该是'vm://localhost'。
+jmswizard.raInstance.BrokerXmlConfig                    = 如果使用内嵌模式,请设定用于设置内嵌的 ActiveMQ 代理的 XML 设定文件(通过 Spring)<br>BrokerXmlConfig是该文件名,如果没有指定URL的话则假定它在 classpath 上。所以值 foo/bar.xml 将假定在 classpath 上,而 file:dir/file.xml 将使用文件系统。支持任何有效的URL字符串。
+jmswizard.raInstance.Clientid                           = 建立到 ActiveMQ 服务器的连接上设定的客户id。
+jmswizard.raInstance.Password                           = 用于默认用户登录到 ActiveMQ 服务器的默认密码。
+jmswizard.raInstance.ServerUrl                          = 你想连接到的 ActiveMQ 服务器的 URL。如果使用内置的代理,这个值应该是'vm://localhost'。
 jmswizard.raInstance.UseInboundSession                  = 布尔值设定传出的连接是否应该复用传入的连接的会话来发送消息。
-jmswizard.raInstance.UserName                           = 用于建立到ActiveMQ服务器的连接的默认用户名。
+jmswizard.raInstance.UserName                           = 用于建立到 ActiveMQ 服务器的连接的默认用户名。
 jmswizard.raInstance.basicConfigSettings                = 基本配置设置.
 jmswizard.raInstance.resourceGroupName                  = 资源组名称
-jmswizard.raInstance.resourceGroupNameExp               = 一个唯一的资源适配器名称。使用这个设置来生成资源组的配置名称,并将消息驱动Bean连接到JMS服务器
+jmswizard.raInstance.resourceGroupNameExp               = 一个唯一的资源适配器名称。使用这个设置来生成资源组的配置名称,并将消息驱动 Bean 连接到 JMS 服务器
 jmswizard.raInstance.title                              = <b>JMS资源组</b> -- 配置服务器连接
-jmswizard.raInstance.titleExp                           = 这个页面要设置的属性对不同的JMS提供者是不一样的,但是这些通常是配置到JMS服务器的连接属性。你在下一步创建的连接工厂,或者目的地通常要使用这些设置与服务器通信。
+jmswizard.raInstance.titleExp                           = 这个页面要设置的属性对不同的 JMS 提供者是不一样的,但是这些通常是配置到JMS服务器的连接属性。你在下一步创建的连接工厂,或者目的地通常要使用这些设置与服务器通信。
 jmswizard.status.addConnFactory                         = 添加连接工厂
 jmswizard.status.addDestination                         = 添加目的地
 jmswizard.status.deployNow                              = 现在部署
-jmswizard.status.factoriesDestinationsAdded             = 这是到目前为止你添加的连接工厂和目的地。当你完成添加连接工厂和目的地之后,你可以查看这个JMS资源组的部署计划。或者直接部署它。
-jmswizard.status.noFactoriesDestinations                = 到目前为止,你已经为JMS资源组的填写了必须的基本配置信息。现在你可以创建连接工厂和目的地。当你完成添加连接工厂和目的地之后,你可以查看这个JMS资源组的部署计划。或者直接部署它。
+jmswizard.status.factoriesDestinationsAdded             = 这是到目前为止你添加的连接工厂和目的地。当你完成添加连接工厂和目的地之后,你可以查看这个 JMS 资源组的部署计划。或者直接部署它。
+jmswizard.status.noFactoriesDestinations                = 到目前为止,你已经为 JMS 资源组的填写了必须的基本配置信息。现在你可以创建连接工厂和目的地。当你完成添加连接工厂和目的地之后,你可以查看这个 JMS 资源组的部署计划。或者直接部署它。
 jmswizard.status.resourceGroup                          = 资源组
 jmswizard.status.showPlan                               = 显示部署计划
-jmswizard.status.title                                  = <b>JMS资源组</b> -- 当前进展
+jmswizard.status.title                                  = <b>JMS 资源组</b> -- 当前进展

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties Mon Dec  7 08:10:25 2009
@@ -30,7 +30,7 @@
 activemq.errorMsg04 = Error encountered while purging message destination {0}
 activemq.infoMsg01  = Message sent successfully.
 activemq.infoMsg02  = Deployment completed successfully!
-activemq.warnMsg01  = Can not count Consumer Count/Queue Size of {0} for the server url is not belong to an embedded broker
+activemq.warnMsg01  = Cannot count Consumer Count/Queue Size of {0} for the server url does not belong to an embedded broker
 
 jmsmanager.broker.failAddBroker             = Fail to add Broker {0} due to {1}
 jmsmanager.broker.failDeleteBroker          = Fail to delete the broker {0} due to {1}

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties Mon Dec  7 08:10:25 2009
@@ -16,13 +16,13 @@
 #  limitations under the License.
 #=====================================================================
 
-JMS\ Network\ Listeners = JMS网络监听器
+JMS\ Network\ Listeners = JMS 网络监听器
 
-JMS\ Resources = JMS资源
+JMS\ Resources = JMS 资源
 
-JMS\ Server = JMS服务器
+JMS\ Server = JMS 服务器
 
-JMS\ Server\ Manager = JMS服务器管理
+JMS\ Server\ Manager = JMS 服务器管理
 
 activemq.errorMsg01 = 发送消息时遇到错误。
 activemq.errorMsg02 = 部署失败!