Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1FF5CC6F2 for ; Wed, 2 May 2012 07:56:37 +0000 (UTC) Received: (qmail 2335 invoked by uid 500); 2 May 2012 07:56:36 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 2195 invoked by uid 500); 2 May 2012 07:56:36 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 2187 invoked by uid 99); 2 May 2012 07:56:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2012 07:56:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 02 May 2012 07:56:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A7A0E238897A; Wed, 2 May 2012 07:56:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1332950 - in /geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources: portaldriver_en.properties portaldriver_zh.properties Date: Wed, 02 May 2012 07:56:14 -0000 To: scm@geronimo.apache.org From: xiaming@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120502075614.A7A0E238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xiaming Date: Wed May 2 07:56:14 2012 New Revision: 1332950 URL: http://svn.apache.org/viewvc?rev=1332950&view=rev Log: GERONIMO-6190 Update login page message of admin console, provided by Jeff, for trunk Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_zh.properties Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties?rev=1332950&r1=1332949&r2=1332950&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties (original) +++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties Wed May 2 07:56:14 2012 @@ -23,7 +23,7 @@ console.common.pages console.common.password = Password console.common.username = User Name console.head.title = Geronimo Console -console.login.components = Geronimo™ has integrated the following components:
  • Application server (Apache Geronimo)
  • Web server and servlet engine (Tomcat)
  • Web server and servlet engine (Jetty)
  • JSP compiler (Jasper)
  • JAX-RPC Web Services engine (Apache Axis)
  • JAX-WS Web Services engine (Apache Axis2)
  • JAX-WS Web Services engine (Apache CXF)
  • Relational database (Apache Derby)
  • Messaging (ActiveMQ)
  • User management services
  • Centralized administration console
+console.login.components = Geronimo™ has integrated the following components:
  • Application server (Apache Geronimo)
  • Web server and servlet engine (Apache Tomcat)
  • Web server and servlet engine (Jetty)
  • JSP compiler (Jasper)
  • JAX-RPC Web Services engine (Apache Axis)
  • JAX-WS Web Services engine (Apache Axis2)
  • JAX-WS Web Services engine (Apache CXF)
  • Relational database (Apache Derby)
  • Messaging (Apache ActiveMQ)
  • EJB Services (Apache OpenEJB)
  • JavaServer Faces (Apache MyFaces)
  • Context and Dependency Injection (Apache OpenWebBeans)
  • OSGi Framework (Apache Karaf)< br/>   • Enterprise OSGi (Apache Aries)
  • User management services
  • Centralized administration console
console.login.introduction = Geronimo™ is a Java-certified, production-grade platform designed to allow developers to rapidly deploy and manage their applications. The result is an integrated, highly functional application platform that leverages the latest innovations from the open source community and simplifies application deployment and maintenance. console.login.requireCookies = Note: To log in to the Geronimo Console, cookies must be enabled in your web browser. console.login.welcome = Welcome to the GERONIMO™ Console Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_zh.properties URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_zh.properties?rev=1332950&r1=1332949&r2=1332950&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_zh.properties (original) +++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_zh.properties Wed May 2 07:56:14 2012 @@ -23,7 +23,7 @@ console.common.pages console.common.password = å¯ç console.common.username = ç¨æ·å console.head.title = Geronimoæ§å¶å° -console.login.components = Geronimo™ éæäºå¦ä¸ç»ä»¶:
  • åºç¨æå¡å¨ (Apache Geronimo)
  • Webæå¡å¨åservletå¼æ (Tomcat)
  • Webæå¡å¨åservletå¼æ (Jetty)
  • JSPç¼è¯å¨ (Jasper)
  • JAX-RPC Webæå¡å¼æ (Apache Axis)
  • JAX-WS Webæå¡å¼æ (Apache Axis2)
  • JAX-WS Webæå¡å¼æ (Apache CXF)
  • å³ç³»æ°æ®åº (Apache Derby)
  • æ¶æ¯ä¸é´ä»¶ (ActiveMQ)
  • ç¨æ·ç®¡çæå¡
  • éä¸å¼çç®¡çæ§å¶å°
+console.login.components = Geronimo™ éæäºå¦ä¸ç»ä»¶:
  • åºç¨æå¡å¨ (Apache Geronimo)
  • Webæå¡å¨åservletå¼æ (Apache Tomcat)
  • Webæå¡å¨åservletå¼æ (Jetty)
  • JSPç¼è¯å¨ (Jasper)
  • JAX-RPC Webæå¡å¼æ (Apache Axis)
  • JAX-WS Webæå¡å¼æ (Apache Axis2)
  • JAX-WS Webæå¡å¼æ (Apache CXF)
  • å³ç³»æ°æ®åº (Apache Derby)
  • æ¶æ¯ä¸é´ä»¶ (Apache ActiveMQ)
  • EJBæå¡ (Apache OpenEJB)
  • JavaServer Faces (Apache MyFaces)
  • ; ä¸ä¸æåä¾èµæ³¨å¥ (Apache OpenWebBeans)
  • OSGiæ¡æ¶ (Apache Karaf)
  • ä¼ä¸çº§OSGi (Apache Aries)
  • ç¨æ·ç®¡çæå¡
  • éä¸å¼çç®¡çæ§å¶å°
console.login.introduction = Geronimo™æ¯ä¸ä¸ªéè¿äºJavaè®¤è¯çãçäº§çº§çå¹³å°ãå¶åè¡·æ¯ä¸ºäºè®©å¼åèè½å¤å¿«éé¨ç½²åç®¡çå¶åºç¨ï¼ç»æä¾¿è¯çäºä¸ä¸ªå®æ´å¹¶ä¸åè½å¼ºå¤§çåºç¨å¹³å°ãå®å©ç¨äºå¼æºç¤¾çææ°åæ°ä¸ç®åäºåºç¨çé¨ç½²åç»´æ¤ã console.login.requireCookies = æ³¨æï¼éè¦æ¿æ´»æµè§å¨çCookieåè½ï¼æè½ç»å½å°Geronimoæ§å¶å°ã console.login.welcome = æ¬¢è¿ä½¿ç¨GERONIMO™ç®¡çæ§å¶å°