geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r887861 [2/6] - in /geronimo/server/trunk/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-portal-driv...
Date Mon, 07 Dec 2009 08:23:56 GMT
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties Mon Dec  7 08:23:55 2009
@@ -25,16 +25,16 @@
 apache.jk.ajpPort.networkPortExplanation     = <tt>mod_jk</tt> talks to the Geronimo web container using a protocol called AJP.  Currently, you do not have an AJP protocol listener configured for the web container.  Select a network port here, and an AJP protocol listener will be added for you.
 apache.jk.ajpPort.title                      = <b>Apache mod_jk</b> -- AJP Port
 apache.jk.config.logFileLocation             = <tt>mod_jk</tt> log file location
-apache.jk.config.logFileLoctionExplanation   = <tt>mod_jk</tt> writes to a log file in a location you choose.  The log file location needs to be set in the Apache configuration.   Please select the location where the <tt>mod_jk</tt> log file should be written.
+apache.jk.config.logFileLoctionExplanation   = <tt>mod_jk</tt> writes to a log file in a location you choose.  The log file location needs to be set in the Apache configuration. Select the location where the <tt>mod_jk</tt> log file should be written.
 apache.jk.config.operatingSystem             = Operating System
 apache.jk.config.operatingSystemExplanation  = The process for installing <tt>mod_jk</tt> depends on the operating system. For some, we can provide specific guidance. For others, you'll have to install <tt>mod_jk</tt> on your own.
 apache.jk.config.pathToProperties            = Path to <tt>workers.properties</tt>
 apache.jk.config.pathToPropertiesExplanation = <tt>mod_jk</tt> requires a file called <tt>workers.properties</tt> to specify which app servers can be contacted on which network ports, etc.   This tool will generate the contents for the <tt>workers.properties</tt> file,  but it also needs to point to this file in the Apache configuration data,  so we need to know where you plan to put this file.
 apache.jk.config.title                       = <b>Apache mod_jk</b> -- Basic Configuration
 apache.jk.index.frag1                        = This tool walks you through the process of configuring access to Geronimo through the Apache 2 HTTP server using the <tt>mod_jk</tt> Apache module. There are several steps needed to do this:
-apache.jk.index.frag2                        = By answering a few questions here, we can give you specific guidance and generate configuration information you can use.
+apache.jk.index.frag2                        = Answer a few questions here, and we can give you specific guidance and generate configuration information you can use.
 apache.jk.index.getStarted                   = Get Started
-apache.jk.index.notes                        = </li></ul><p>Notes:</p><ul><li>Geronimo does not remember previous settings generated using this tool;you'll need to reenter all the data each time, or just paste the new information into your existing configuration files.</li>  <li>Any web applications to be exposed via Apache must be running when you run this tool, and of course must be running to be accessed from Apache.</li></ul>
+apache.jk.index.notes                        = </li></ul><p>Notes:</p><ul><li>Geronimo does not remember previous settings generated using this tool; you need to reenter all the data each time, or just paste the new information into your existing configuration files.</li>  <li>Any web applications to be exposed by Apache must be running when you run this tool, and of course must be running to be accessed from Apache.</li></ul>
 apache.jk.index.severalSteps                 = <ol><li>Configure the Geronimo web container to support the AJP protocol</li><li>Install the <tt>mod_jk.so</tt> Apache module (compiling it if necessary)</li><li>Create a <tt>workers.properties</tt> configuration file to point Apache to the Geronimo AJP connector</li><li>Add Apache configuration information indicating which URLs should be sent to Geronimo and whether Apache should serve static content (leaving only dynamic content within the web application to Geronimo)</li></ol>
 apache.jk.results.alreadyHasAJPListener      = This Geronimo configuration already has an AJP listener running on port {0}. Nothing further needs to be done here.
 apache.jk.results.anAJPLisstnerAdded         = An AJP listener was added on port {0}.  Nothing further needs to be done here.
@@ -43,7 +43,7 @@
 apache.jk.results.howToActivateOthers        = adding the following line to <tt>/etc/httpd/conf/httpd.conf</tt>:</p><pre>LoadModule jk_module modules/mod_jk.so</pre> <p>Then you can start Apache by running <tt>service httpd start</tt>  (or <tt>service httpd restart</tt>).
 apache.jk.results.howToActivateifOsSuSE      = editing <tt>/etc/sysconfig/apache2</tt> and adding <tt>jk</tt> to the value configured for  <tt>APACHE_MODULES</tt> and then running (as root) <tt>SuSEconfig</tt> followed by  <tt>rcapache2 start</tt> (or <tt>rcapache2 restart</tt>).
 apache.jk.results.noInstructionsToInstall    = </p><p>Based on your operating system selection, I don't have specific instructions to install <tt>mod_jk</tt>.  You may be able to get a binary release from  <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/"> http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/</a>.  Otherwise, you'll have to build from source.</p><p>To enable <tt>mod_jk</tt> in Apache,  you typically need to install the <tt>.so</tt> (Linux/UNIX/Mac OS X)  or <tt>.dll</tt>  (Windows) and then add a line to the <tt>httpd.conf</tt> file like this:</p> <pre> LoadModule jk_module modules/mod_jk.so</pre> <p>Finally, start or restart Apache.</p>
-apache.jk.results.saveFollowingToFile        = You have decided to save this file at <tt> {0} </tt>.  Please save the following content to that file.
+apache.jk.results.saveFollowingToFile        = You have decided to save this file at <tt> {0} </tt>.  Save the following content to that file.
 apache.jk.results.saveWhereIfSuSE            = For SuSE, this should be saved to a file in the Apache conf.d dir, e.g.write this content to <tt>/etc/apache2/conf.d/geronimo-jk.conf</tt>
 apache.jk.results.saveWhereOthwise           = This information should be added to the Apache configuration file.  This is often at a location such as <tt>/etc/httpd/conf/httpd.conf</tt>
 apache.jk.results.step1                      = Step 1: Configure Geronimo for AJP
@@ -52,7 +52,7 @@
 apache.jk.results.step3                      = Step 3: Create a <tt>workers.properties</tt> file
 apache.jk.results.step4                      = Step 4: Apache Configuration<h2>
 apache.jk.results.step5                      = Step 5: Restart Apache
-apache.jk.results.step5Content               = With those steps completed, Apache should be ready to go!  Start Geronimo and restart Apache and try accessing a Geronimo web application through an Apache URL.  If there are any problems, check the Apache error log, and the mod_jk error log (at <tt>{0}</tt>).
+apache.jk.results.step5Content               = With those steps completed, Apache should be ready to go!  Start Geronimo and restart Apache and try accessing a Geronimo web application through an Apache URL.  If there are any problems, check the Apache error log and the mod_jk error log (at <tt>{0}</tt>).
 apache.jk.results.summary                    = This page lists the things you must do to enable <tt>mod_jk</tt> in Apache and configure it to talk to Geronimo.
 apache.jk.results.title                      = <b>Apache mod_jk</b> -- Configuration Results
 apache.jk.webApps.dynamicPaths               = Dynamic Paths
@@ -81,7 +81,7 @@
 ca.common.commonName                                = Common Name
 ca.common.company_Organization                      = Company/Organization
 ca.common.countryCode                               = Country Code
-ca.common.criticalExt                               = critical ext
+ca.common.criticalExt                               = Critical ext
 ca.common.detailsOfCert                             = Details of the Certificate to be issued
 ca.common.emptyText                                 = The focussed field must not be empty.
 ca.common.fingerPrints                              = Finger prints
@@ -95,7 +95,7 @@
 ca.common.lockCA                                    = Lock CA
 ca.common.mmddyyyy                                  = The focussed field must be a date in MM/DD/YYYY format.
 ca.common.noRequests                                = There are no requests.
-ca.common.nonCriticalExt                            = non-critical ext
+ca.common.nonCriticalExt                            = Non-critical ext
 ca.common.passwordMismatch                          = Password does not match.
 ca.common.processCSR                                = Process CSR
 ca.common.publicKey                                 = Public Key
@@ -118,19 +118,19 @@
 ca.common.viewCADetails                             = View CA Details
 ca.common.viewIssuedCert                            = View Issued Certificate
 ca.common.wrongDate                                 = To Date must be after From Date.
-ca.confirmCA.summary                                = This screen lets you review the CA details entered in the previous screen.  If you need to modify any information shown here, please go back to the previous screen.  Upon clicking the <i>Setup Certification Authority</i> button, a keypair and a self-signed certificate will be generated and stored in a keystore.  CA's certificate serial number is stored in a text file and the number is incremented each time a CSR is processed by the CA.
+ca.confirmCA.summary                                = This screen lets you review the CA details entered in the previous screen.  If you need to modify any information shown here, go back to the previous screen.  Once you click the <i>Setup Certification Authority</i> button, a keypair and a self-signed certificate will be generated and stored in a keystore.  CA's certificate serial number is stored in a text file and the number is incremented each time a CSR is processed by the CA.
 ca.confirmCA.title                                  = <b>Setup Certification Authority</b> - Step 2: Review and Confirm CA details
 ca.confirmCertReq.approveCSR                        = Approve CSR
 ca.confirmCertReq.confirmCertRequest                = Confirm Certificate Request
 ca.confirmCertReq.rejectCSR                         = Reject CSR
 ca.confirmCertReq.summary                           = This screen shows the details of the Certificate Signing Request (CSR) and allows you to approve the request. Once the request is approved, it will be considered for issue of a certificate.
 ca.confirmClientCert.issueCert                      = Issue Certificate
-ca.confirmClientCert.summary                        = This screen shows the CSR details and the certificate details entered in the previous screen.  Upon clicking the <i>Issue Certificate</i> button, a certificate will be issued and stored.  The next screen will show the details of the certificate issued.
+ca.confirmClientCert.summary                        = This screen shows the CSR details and the certificate details entered in the previous screen.  Once you click the <i>Issue Certificate</i> button, a certificate will be issued and stored.  The next screen will show the details of the certificate issued.
 ca.confirmClientCert.title                          = <b>Issue New Certificate</b> - Step 3: Confirm and Issue Certificate
 ca.index.CAFunctionsAccessed                        = CA functions can be accessed using the links provided below.
 ca.index.CAInitialized                              = CA has been initialized.
-ca.index.CALocked                                   = But, the CA is locked.  Please unlock the CA to access CA functions.
-ca.index.CANotInitialized                           = CA is not running or the CA may not have been initialized.  Please initialize the CA using the link provided below.
+ca.index.CALocked                                   = But, the CA is locked. Unlock the CA to access CA functions.
+ca.index.CANotInitialized                           = CA is not running or the CA may not have been initialized.  Initialize the CA using the link provided below.
 ca.index.publishCACert                              = Publish CA Certificate
 ca.index.requestsToBeFulfilled                      = Requests to be fulfilled
 ca.index.requestsToBeVerified                       = Requests to be verified
@@ -140,32 +140,32 @@
 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.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 the <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)
 ca.setupCA.summary                                  = On this screen you can enter the Certification Authority (CA) details, algorithm parameters for CA's keypair, algorithm for CA's self signed certificate and a password to protect the CA's private key. The next screen will let you review this information before generating the CA's keypair and self-signed certificate.
 ca.setupCA.title                                    = <b>Setup Certification Authority</b> - Step 1: Enter CA details
 ca.unlockCA.enterCAPrivateKeyPassword               = Enter the CA's private key password
 ca.unlockCA.summary                                 = This screen lets you unlock the CA by providing the password used to protect the CA's private key.  Once unlocked, the CA functions will be available.
 ca.viewCertificate.backToRequest                    = Back to Requests to be fulfilled
-ca.viewCertificate.enterSerialNumber                = Enter the serial number of the certificate to be viewed and click on <i>View Certificate</i> button.
+ca.viewCertificate.enterSerialNumber                = Enter the serial number of the certificate to be viewed and click the <i>View Certificate</i> button.
 ca.viewCertificate.screenShows                      = This screen shows the details of a certificate issued by the CA.  The base64 encoded certificate text should be sent to the requestor as a reply to their Certificate Signing Request (CSR).
 
 configmanager.help.stopStart            = Stop/Start
-configmanager.help.stopStartExp         = The stop/start toggle can be clicked to stop or start an application. If the toggle says &quot;Stop&quot; the application is running so clicking on the Stop toggle will stop the application and vice versa.
+configmanager.help.stopStartExp         = The stop/start toggle can be clicked to stop or start an application. If the toggle says &quot;Stop&quot; the application is running. So clicking the Stop toggle will stop the application and vice versa.
 configmanager.help.title                = This page lists the applications that have been installed in the server and whether they are running or stopped. There are four columns; two provide information and the other two allow user action. The first column indicates the state of the application, either &quot;stopped&quot; or &quot;running.&quot; The fourth column shows the configID of the application. The two remaining columns are:
 configmanager.help.uninstallExp         = The uninstall link will undeploy/remove the application from Geronimo.
 configmanager.normal.cancel             = &nbsp;Cancel&nbsp;
 configmanager.normal.childComponents    = Child Components
 configmanager.normal.componentName      = Component Name
-configmanager.normal.confirmMsg01       = \ is an Apache Geronimo service. Stopping this component may prevent the server or the administration console from functioning properly. All dependent components and subsequent dependencies will also be stopped. Reference the "Child Components" list in the view for directly affected components. Proceed with this action?
+configmanager.normal.confirmMsg01       = \ is an Apache Geronimo service. Stopping this component can prevent the server or the administration console from functioning properly. All dependent components and subsequent dependencies will also be stopped. See the "Child Components" list in the view for directly affected components. Proceed with this action?
 configmanager.normal.confirmMsg02       = \ provides the administration console interface that you are currently viewing. Stopping it will cause the interface to become unavailable and manual action will be required to restore the function. Proceed with this action?
-configmanager.normal.confirmMsg03       = \ is provided by Apache Geronimo and may be required by other modules (reference the "Child Components" listed in the view). All dependent components and subsequent dependencies will also be stopped. Proceed with this action?
-configmanager.normal.confirmMsg04       = \ is an Apache Geronimo service. Restarting this component may prevent the server or the administration console from functioning properly. As part of the stop action, all dependent components and subsequent dependencies will also be stopped. Only this component will be restarted. Reference the "Child Components" list in the view for directly affected components. Proceed with this action?
+configmanager.normal.confirmMsg03       = \ is provided by Apache Geronimo and may be required by other modules (see the "Child Components" listed in the view). All dependent components and subsequent dependencies will also be stopped. Proceed with this action?
+configmanager.normal.confirmMsg04       = \ is an Apache Geronimo service. Restarting this component may prevent the server or the administration console from functioning properly. As part of the stop action, all dependent components and subsequent dependencies will also be stopped. Only this component will be restarted. See the "Child Components" list in the view for directly affected components. Proceed with this action?
 configmanager.normal.confirmMsg05       = \ provides the administration console interface that you are currently viewing. Restarting it will cause the interface to become unavailable and manual action may be necessary to restore the console function. Proceed with this action?
-configmanager.normal.confirmMsg06       = \ is provided by Apache Geronimo and may be required by other modules (reference the "Child Components" listed in the view). As part of the stop action, all dependent components and subsequent dependencies will also be stopped. Proceed with this action?
-configmanager.normal.confirmMsg07       = \ is an Apache Geronimo service. Uninstalling this component may have unexpected results such as rendering the administration web console or even the server itself unstable.  Reference the "Child Components" view for directly affected components. Are you certain you wish to proceed with this uninstall?
+configmanager.normal.confirmMsg06       = \ is provided by Apache Geronimo and may be required by other modules (see the "Child Components" listed in the view). As part of the stop action, all dependent components and subsequent dependencies will also be stopped. Proceed with this action?
+configmanager.normal.confirmMsg07       = \ is an Apache Geronimo service. Uninstalling this component might have unexpected results such as rendering the administration web console or even the server itself unstable. See the "Child Components" view for directly affected components. Are you certain you wish to proceed with this uninstall?
 configmanager.normal.confirmMsg08       = \ provides the administration console user interface that you are currently viewing. Uninstalling it will cause the interface to become unavailable and manual action will be required to restore the function. Are you certain you wish to proceed with this uninstall?
-configmanager.normal.confirmMsg09       = \ is provided by Apache Geronimo and may be required by other modules (reference the "Child Components" listed in the view). Are you certain you wish to proceed with this uninstall?
+configmanager.normal.confirmMsg09       = \ is provided by Apache Geronimo and might be required by other modules (see the "Child Components" listed in the view). Are you certain you wish to proceed with this uninstall?
 configmanager.normal.confirmMsg10       = Are you certain you wish to uninstall
 configmanager.normal.displayName        = Display Name 
 configmanager.normal.expertMode         = Expert User (enable all actions on Geronimo Provided Components)
@@ -203,6 +203,7 @@
 consolebase.common.next            = Next
 consolebase.common.password        = Password
 consolebase.common.refresh         = Refresh
+consolebase.common.remove          = Remove
 consolebase.common.reset           = Reset
 consolebase.common.restart         = Restart
 consolebase.common.return          = Return
@@ -308,9 +309,9 @@
 keystore.confirmCertificate.certificateDetails = Certificate Details
 keystore.confirmCertificate.fingerprint        = Fingerprint
 keystore.confirmCertificate.importCertificate  = Import Certificate
-keystore.confirmCertificate.title              = Please confirm that this is the correct certificate to import:
+keystore.confirmCertificate.title              = Confirm that this is the correct certificate to import:
 keystore.confirmKey.generateKey                = Generate Key
-keystore.confirmKey.title                      = Please confirm that this is the correct information for the key I'm about to generate:
+keystore.confirmKey.title                      = Confirm that this is the correct information for the key I'm about to generate:
 keystore.createKeystore.createKeystore         = Create Keystore
 keystore.createKeystore.keystoreFileName       = Keystore file name
 keystore.createKeystore.passwordForKeystore    = Password for new keystore
@@ -331,7 +332,7 @@
 keystore.index.title                           = This tool walks you through the process of configuring keystores to use with SSL connectors (for the web container, etc.).
 keystore.index.type                            = Type
 keystore.index.unlocked                        = Unlocked
-keystore.unlockKey.title                       = The keystore has been unlocked.  However, a private key within the keystore also needs to be unlocked in order for SSL to work properly.  Please specify the password for the private key within the keystore.
+keystore.unlockKey.title                       = The keystore has been unlocked.  However, a private key within the keystore also needs to be unlocked in order for SSL to work properly.  Specify the password for the private key within the keystore.
 keystore.unlockKey.unlockPrivateKey            = Unlock Private Key
 keystore.unlockKeystore.enterKeystorePassword  = Enter keystore password
 keystore.uploadCertificate.aliasForCertificate = Alias for certificate
@@ -357,9 +358,9 @@
 logmanager.help.configFileExplanation             = Another configuration file can be used by entering a different path and file name in the Config file text box.
 logmanager.help.introduction                      = <p>This portlet allows the user to temporarily select a configuration file for logging and/or change the log level and Refresh period. The default &quot;Config file&quot; is a standard log4j file and defines the location where the Geronimo Server will log Geronimo output. The configuration file also defines the log level, the maximum log file size,  and other attributes associated with logging. <br> <br>   Gereonimo Console will display output from the Geronimo log file in the Server Log Viewer portlet in the next window pane.</p>
 logmanager.help.logLevelExplanation               = The user may select a level for logging from the drop-down menu.
-logmanager.help.refreshPeriodExplanation          = By default Geronimo checks every 60 seconds to see if the configuration file has changed. The user may modify the refresh period.
+logmanager.help.refreshPeriodExplanation          = By default Geronimo checks every 60 seconds to see whether the configuration file has changed. The user may modify the refresh period.
 logmanager.help.resetExplanation                  = Resets the &quot;Config File&quot;, &quot;Refresh Period&quot; and &quot;Log Level&quot; to their settings at the last &quot;Update.&quot; It does not reset to the Geronimo Server defaults.
-logmanager.help.updateExplanation                 = Make changes take effect until next server restart.
+logmanager.help.updateExplanation                 = Make changes take effect until next server restarts.
 logmanager.search.containingText                  = Containing text
 logmanager.search.fileterLog                      = Filter Log
 logmanager.search.go                              = Go 
@@ -372,15 +373,15 @@
 logmanager.search.to                              = To
 logmanager.search.withExceptions                  = With Exceptions
 logmanager.viewhelp.filterResults                 = Filter results
-logmanager.viewhelp.filterResultsExplanationFrag1 = Allows the user to customize the filtering criteria. The user can display any line of the log file starting at the first line of the log file through the end. Note: A browser may limit how many lines can be displayed at once.
+logmanager.viewhelp.filterResultsExplanationFrag1 = Allows the user to customize the filtering criteria. The user can display any line of the log file starting at the first line of the log file through the end. Note: A browser might limit how many lines can be displayed at once.
 logmanager.viewhelp.filterResultsExplanationFrag2 = The user may filter on the log level to display only log lines at that level.
 logmanager.viewhelp.filterResultsExplanationFrag3 = The user may also enter a string of text to search for.
 logmanager.viewhelp.introduction                  = This portlet displays the Geronimo server log and is helpful for debugging problems with the Geronimo Console and with deployed applications.
 logmanager.viewhelp.refreshExplanation            = Resets the filtering criteria to Geronimo Console's defaults and displays the latest 11 lines in the Geronimo log file.
 
-repository.help.addDependencyElement       = To use an artifact in an application, add a dependency element into it's deployment plan. For example, to use Castor XML add the following XML to the plan:
+repository.help.addDependencyElement       = To use an artifact in an application, add a dependency element into its deployment plan. For example, to use Castor XML add the following XML to the plan:
 repository.help.browseExplanation          = Browse to select the artifact to be added.
-repository.help.installExplanation         = Click on this button to install the artifact.
+repository.help.installExplanation         = Click this button to install the artifact.
 repository.help.title                      = This page displays the artifacts installed in the server's repository. The layout of the repository is the same as that used by Apache Maven making it possible to easily copy files over. The Geronimo Console provides a method for adding artifacts:
 repository.normal.addArchiveToRepository   = Add Archive to Repository
 repository.normal.artifact                 = Artifact
@@ -390,7 +391,7 @@
 repository.normal.replacedName             = Replaced component name
 repository.normal.replacedNameDescription  = Specify an existing component name to be replaced during runtime, the component name should be like groupId/artifactId/Version/Type. Otherwise, leave the field blank.
 repository.normal.title                    = Add Archive to Repository
-repository.normal.toViewUsage              = Click on an entry to view usage.
+repository.normal.toViewUsage              = Click an entry to view usage.
 repository.usage.content                   = To use <b>{0}</b> in an application or a module, add a dependency element under dependencies in environment element in it's deployment plan as shown below:
 repository.usage.title                     = Usage for {0}
 
@@ -406,29 +407,29 @@
 securityrealmmanager.derby.groups.help.addNewGroupBtnExp   = Clicking this button will create the new group. If users had been put in the new group, clicking &quot;Add&quot; will create the new group with the selected users in it.
 securityrealmmanager.derby.groups.help.cancelUserBtnExp    = Will cancel the creation of the new group and return the previous page to the browser.
 securityrealmmanager.derby.groups.help.descriptionExp      = The description of the group.
-securityrealmmanager.derby.groups.help.title               = This portlet lists all the Application Realm groups and allows the user to add, modify and delete them. To add a new group click on the &quot;Create New Group&quot; link and fill in the fields on that page. To modify an existing group, click on the group link and change the field(s) on the page. To delete a group, click on the &quot;Delete&quot; link to the right of the group to be deleted. <br>  <br>   Clicking on the &quot;Create New Group&quot; link allows creation of a new group by filling in the fields and  clicking on the &quot;Add&quot; button.
-securityrealmmanager.derby.groups.help.usersExp            = The box on the left lists all the current user accounts. Selecting a user and then clicking the &quot;Add&gt;&gt;&quot; button will put the user in the group. Selecting a user in the list to the right and clicking on the &quot;&lt;&lt;Remove&quot; button will delete the user from the group.
+securityrealmmanager.derby.groups.help.title               = This portlet lists all the Application Realm groups and allows the user to add, modify and delete them. To add a new group click  the &quot;Create New Group&quot; link and fill in the fields on that page. To modify an existing group, click the group link and change the field(s) on the page. To delete a group, click the &quot;Delete&quot; link to the right of the group to be deleted. <br>  <br>   Clicking the &quot;Create New Group&quot; link allows creation of a new group by filling in the fields and  clicking on the &quot;Add&quot; button.
+securityrealmmanager.derby.groups.help.usersExp            = The box on the left lists all the current user accounts. To put the user in the group, select a user and then click the &quot;Add&gt;&gt;&quot; button. To delete the user from the group, select a user in the list to the right and click the &quot;&lt;&lt;Remove&quot; button.
 securityrealmmanager.derby.groups.maximized.createNewGroup = Create New Group
 securityrealmmanager.derby.users.addmaximized.addUser      = ADD USER
 securityrealmmanager.derby.users.addmaximized.updateUser   = UPDATE USER
-securityrealmmanager.derby.users.help.addUserBtnExp        = To add the new user click the &quot;Add&quot; button.
-securityrealmmanager.derby.users.help.cancelUserBtnExp     = To cancel an add this button must be clicked before the &quot;Add&quot; button.
+securityrealmmanager.derby.users.help.addUserBtnExp        = To add the new user, click the &quot;Add&quot; button.
+securityrealmmanager.derby.users.help.cancelUserBtnExp     = To cancel an added user, click this button before the &quot;Add&quot; button.
 securityrealmmanager.derby.users.help.confirmPasswordExp   = Re-enter the new user's password.
-securityrealmmanager.derby.users.help.createUserBtnExp     = Click on this button to create the new user and return to the main &quot;Console Realm Users&quot; page. The new user will be listed there.
+securityrealmmanager.derby.users.help.createUserBtnExp     = Click this button to create the new user and return to the main &quot;Console Realm Users&quot; page. The new user will be listed there.
 securityrealmmanager.derby.users.help.departmentExp        = The user's department.
 securityrealmmanager.derby.users.help.emailExp             = The user's email address.
 securityrealmmanager.derby.users.help.familyNameExp        = The user's last name.
 securityrealmmanager.derby.users.help.givenNameExp         = The user's first name.
 securityrealmmanager.derby.users.help.passwordExp          = Password for the new user.
-securityrealmmanager.derby.users.help.title                = This page lists all the application realm users and allows you to add, modify and delete them. To add a new user click on the &quot;Create New User&quot; link and fill in the fields on that page. To modify a user's account, click on the username link for the user and change the field(s) on the page. To delete a user, click on the &quot;Delete&quot;  link to the right of the user to be deleted. <br>  <br>  Clicking on the &quot;Create New User&quot; link allows adding users by filling in the fields and clicking on the &quot;Add&quot; button. The fields are defined as follows:
+securityrealmmanager.derby.users.help.title                = This page lists all the application realm users and allows you to add, modify and delete them. To add a new user, click the &quot;Create New User&quot; link and fill in the fields on that page. To modify a user's account, click the username link for the user and change the field(s) on the page. To delete a user, click the &quot;Delete&quot;  link to the right of the user to be deleted. <br>  <br>  Clicking the &quot;Create New User&quot; link allows adding users by filling in the fields and clicking the &quot;Add&quot; button. The fields are defined as follows:
 securityrealmmanager.derby.users.help.usernameExp          = The username for the user.
 securityrealmmanager.derby.users.maximized.createNewUser   = Create New User
 securityrealmmanager.se.groups.addmaximized.addGroup       = ADD GROUP
 securityrealmmanager.se.groups.addmaximized.updateGroup    = UPDATE GROUP
 securityrealmmanager.se.groups.help.addNewGroupBtnExp      = Clicking this button will create the new group. If users had been put in the new group, clicking &quot;Add&quot; will create the new group with the selected users in it.
 securityrealmmanager.se.groups.help.cancelNewGroupBtnExp   = Cancel the current operation.
-securityrealmmanager.se.groups.help.title                  = This portlet lists all the Console Realm groups and allows the user to add, modify and delete them. To add a new group click on the &quot;Create New Group&quot; link and fill in the fields on that page. To modify an existing group, click on the group link and change the field(s) on the page. To delete a group, click on the &quot;Delete&quot; link to the right of the group to be deleted. <br>  <br>Clicking on the &quot;Create New Group&quot; link allows the user to add a new   group. The fields are defined as follows:
-securityrealmmanager.se.groups.help.usersExp               = The box on the left lists all the current user accounts. Selecting a user and then clicking the &quot;Add&gt;&gt;&quot; button will put the user in the group. Selecting a user in the list to the right and clicking on the &quot;&lt;&lt;Remove&quot; button will delete the user from the group.
+securityrealmmanager.se.groups.help.title                  = This portlet lists all the Console Realm groups and allows the user to add, modify and delete them. To add a new, click the &quot;Create New Group&quot; link and fill in the fields on that page. To modify an existing group, click the group link and change the field(s) on the page. To delete a group, click the &quot;Delete&quot; link to the right of the group to be deleted. <br>  <br>Clicking on the &quot;Create New Group&quot; link allows the user to add a new   group. The fields are defined as follows:
+securityrealmmanager.se.groups.help.usersExp               = The box on the left lists all the current user accounts. To put the user in the group, select a user and then click the &quot;Add&gt;&gt;&quot; button. To delete the user from the group, select a user in the list to the right and click the &quot;&lt;&lt;Remove&quot; button.
 securityrealmmanager.se.groups.maximized.createNewGroup    = Create New Group
 securityrealmmanager.se.groups.maximized.createNewUser     = Create New User
 securityrealmmanager.se.groups.maximized.noUsers           = No available users.
@@ -440,13 +441,13 @@
 securityrealmmanager.se.users.help.confirmPasswordExp      = Re-enter the new user's password.
 securityrealmmanager.se.users.help.createUserBtnExp        = Click on this button to create the new user and return to the main &quot;Console Realm Users&quot; page. The new user will be listed there.
 securityrealmmanager.se.users.help.passwordExp             = Password for the new user.
-securityrealmmanager.se.users.help.title                   = This portlet lists all the console realm users and allows the user to add, modify and delete them. To add a new user click on the &quot;Create New User&quot; link and fill in the fields on that page. To modify a user's account, click on the username link for the user and change the field(s) on the page. To delete a user, click on the &quot;Delete&quot; link to the right of the user to be deleted.<br> <br> Clicking on the Create New User link brings up a page that allows adding users by filling in the fields  and clicking on the&quot;Add&quot; button. The fields are defined as follows:
+securityrealmmanager.se.users.help.title                   = This portlet lists all the console realm users and allows the user to add, modify and delete them. To add a new user click the &quot;Create New User&quot; link and fill in the fields on that page. To modify a user's account, click the username link for the user and change the field(s) on the page. To delete a user, click the &quot;Delete&quot; link to the right of the user to be deleted.<br> <br> Clicking the Create New User link brings up a page that allows adding users by filling in the fields  and clicking on the&quot;Add&quot; button. The fields are defined as follows:
 securityrealmmanager.se.users.help.usernameExp             = The username for the user.
 securityrealmmanager.se.users.maximized.createNewUser      = Create New User
 
 servermanager.help.shutdownHelpBody   = <p>This portlet give the admin the ability to remotely shutdown the Geronimo server.</p><p>A shutdown will shutdown the server and cause the JVM to exit. To continue using the Geronimo Console after a shutdown, Geronimo must be restarted.</p>
 servermanager.normal.cancel           = &nbsp;Cancel&nbsp;
-servermanager.normal.comfirmMsg01     = Are you sure you want to shutdown the server (last chance)?
+servermanager.normal.comfirmMsg01     = Are you sure that you want to shutdown the server (last chance)?
 servermanager.normal.ok               = &nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;
 servermanager.normal.proceedOnlyIf    = Proceed only if you are certain you want to terminate the server.
 servermanager.normal.shutdown         = Shutdown
@@ -508,10 +509,10 @@
 webmanager.common.bufferSize                             = BufferSize
 webmanager.common.bufferSizeExp                          = The size (in bytes) of the buffer to be provided for input streams created by this connector. By default, buffers of 2048 bytes will be provided.
 webmanager.common.ciphers                                = Ciphers
-webmanager.common.ciphersExp                             = A comma separated list of the encryption ciphers that may be used. If not specified, then any available cipher may be used.
+webmanager.common.ciphersExp                             = A comma-separated list of the encryption ciphers that may be used. If not specified, any available cipher may be used.
 webmanager.common.clientAuthRequired                     = Client Auth Required
 webmanager.common.compressableMimeType                   = CompressableMimeType
-webmanager.common.compressableMimeTypeExp                = The value is a comma separated list of MIME types for which HTTP compression may be used. The default value is text/html,text/xml,text/plain.
+webmanager.common.compressableMimeTypeExp                = The value is a comma-separated list of MIME types for which HTTP compression may be used. The default value is text/html,text/xml,text/plain.
 webmanager.common.compression                            = Compression
 webmanager.common.compressionExp                         = The Connector may use HTTP/1.1 GZIP compression in an attempt to save server bandwidth. The acceptable values for the parameter is "off" (disable compression), "on" (allow compression, which causes text data to be compressed), "force" (forces compression in all cases), or a numerical integer value (which is equivalent to "on", but specifies the minimum amount of data before the output is compressed). If the content-length is not known and compression is set to "on" or more aggressive, the output will also be compressed. If not specified, this attribute is set to "off".
 webmanager.common.confirmPassword                        = Confirm Password
@@ -525,7 +526,7 @@
 webmanager.common.emptySessionPathExp                    = If checked, all paths for session cookies will be set to /.
 webmanager.common.emptyText                              = The focussed field must not be empty.
 webmanager.common.enableLookups                          = EnableLookups
-webmanager.common.enableLookupsExp                       = Check if you want calls to request.getRemoteHost() to perform DNS lookups in order to return the actual host name of the remote client.  By default, DNS lookups are enabled.
+webmanager.common.enableLookupsExp                       = Check whether you want calls to request.getRemoteHost() to perform DNS lookups in order to return the actual host name of the remote client.  By default, DNS lookups are enabled.
 webmanager.common.fields                                 = fields
 webmanager.common.host                                   = Host
 webmanager.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)
@@ -551,11 +552,11 @@
 webmanager.common.maxThreads                             = Max Threads
 webmanager.common.maxThreadsExp                          = The maximum number of threads this connector should use to handle incoming requests
 webmanager.common.minSpareThreads                        = MinSpareThreads
-webmanager.common.minSpareThreadsExp                     = The number of request processing threads that will be created when this Connector is first started. The connector will also make sure it has the specified number of idle processing threads available. This attribute should be set to a value smaller than that set for maxThreads. The default value is 4.
+webmanager.common.minSpareThreadsExp                     = The number of request processing threads that will be created when this Connector is first started. The connector will also make sure that it has the specified number of idle processing threads available. This attribute should be set to a value smaller than that set for maxThreads. The default value is 4.
 webmanager.common.minThreads                             = Min Threads
 webmanager.common.minThreadsExp                          = The minimum number of threads this connector should use to handle incoming requests
 webmanager.common.noCompressionUserAgents                = NoCompressionUserAgents
-webmanager.common.noCompressionUserAgentsExp             = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation. The default value is an empty String (regexp matching disabled).
+webmanager.common.noCompressionUserAgentsExp             = The value is a comma-separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation. The default value is an empty String (regexp matching disabled).
 webmanager.common.port                                   = Port
 webmanager.common.portExp                                = The network port to bind to.
 webmanager.common.protocol                               = Protocol
@@ -566,7 +567,7 @@
 webmanager.common.redirectPort                           = RedirectPort
 webmanager.common.redirectPortExp                        = If this Connector is supporting non-SSL requests, and a request is received for which a matching <security-constraint> requires SSL transport, Catalina will automatically redirect the request to the port number specified here.
 webmanager.common.restrictedUserAgents                   = RestrictedUserAgents
-webmanager.common.restrictedUserAgentsExp                = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features. The default value is an empty String (regexp matching disabled).
+webmanager.common.restrictedUserAgentsExp                = The value is a comma-separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features. The default value is an empty String (regexp matching disabled).
 webmanager.common.server                                 = Server
 webmanager.common.serverExp                              = The Server header for the http response. Unless your paranoid, you won't need this feature. (No offense.  The description is taken from Tomcat documentation.)
 webmanager.common.show                                   = Show
@@ -586,7 +587,7 @@
 webmanager.common.truststorePassword                     = Truststore Password
 webmanager.common.truststoreType                         = Truststore Type
 webmanager.common.uniqueName                             = Unique Name
-webmanager.common.uniqueNameExp                          = A name that is different than the name for any other web connectors in the server (no spaces in the name please)
+webmanager.common.uniqueNameExp                          = A name that is different from the name for any other web connectors in the server (no spaces in the name please)
 webmanager.common.uriEncoding                            = URIEncoding
 webmanager.common.uriEncodingExp                         = This specifies the character encoding used to decode the URI bytes, after %xx decoding the URL. Default is ISO-8859-1.
 webmanager.common.useBodyEncodingForURI                  = UseBodyEncodingForURI
@@ -602,7 +603,7 @@
 webmanager.connector.editConnector.JettyManagerImpl.38   = The maximum unaccepted connections to queue if no threads are available.
 webmanager.connector.editConnector.JettyManagerImpl.40   = The maximum time in seconds that a connection lingers during close handshaking.
 webmanager.connector.editConnector.JettyManagerImpl.42   = Port to redirect to for confidential connections. 0 if not supported.
-webmanager.connector.editConnector.JettyManagerImpl.44   = If set, then clients connecting through this connector must supply a valid client certificate.
+webmanager.connector.editConnector.JettyManagerImpl.44   = If set, clients connecting through this connector must supply a valid client certificate.
 webmanager.connector.editConnector.JettyManagerImpl.47   = The keystore to use for accessing the server's private key
 webmanager.connector.editConnector.JettyManagerImpl.50   = The keystore containing the trusted certificate entries, including Certification Authority (CA) certificates
 webmanager.connector.editConnector.JettyManagerImpl.53   = This should normally be set to TLS, though some (IBM) JVMs don't work properly with popular browsers unless it is changed to SSL.
@@ -614,7 +615,7 @@
 webmanager.connector.editConnector.TomcatManagerImpl.108 = The host name or IP to bind to. The normal values are 0.0.0.0 (all interfaces) or localhost (local connections only).
 webmanager.connector.editConnector.TomcatManagerImpl.11  = Protocol which may be used for communicating with clients.
 webmanager.connector.editConnector.TomcatManagerImpl.110 = The size (in bytes) of the buffer to be provided for input streams created by this connector.
-webmanager.connector.editConnector.TomcatManagerImpl.113 = The value is a comma separated list of MIME types for which HTTP compression may be used.
+webmanager.connector.editConnector.TomcatManagerImpl.113 = The value is a comma-separated list of MIME types for which HTTP compression may be used.
 webmanager.connector.editConnector.TomcatManagerImpl.116 = The Connector may use HTTP/1.1 GZIP compression in an attempt to save server bandwidth. The acceptable values for the parameter is <i>off</i> (disable compression), <i>on</i> (allow compression, which causes text data to be compressed), <i>force</i> (forces compression in all cases), or a numerical integer value (which is equivalent to <i>on</i>, but specifies the minimum amount of data before the output is compressed). If the content-length is not known and compression is set to <i>on</i> or more aggressive, the output will also be compressed.
 webmanager.connector.editConnector.TomcatManagerImpl.118 = The number of milliseconds during which the sockets used by this Connector will linger when they are closed. The default value is -1 (socket linger is disabled).
 webmanager.connector.editConnector.TomcatManagerImpl.120 = The number of milliseconds this Connector will wait, after accepting a connection, for the request URI line to be presented.
@@ -626,10 +627,10 @@
 webmanager.connector.editConnector.TomcatManagerImpl.132 = The maximum number of request processing threads to be created by this Connector, which therefore determines the maximum number of simultaneous requests that can be handled. If not specified, this attribute is set to 40. If an executor is associated with this connector, this attribute is ignored as the connector will execute tasks using the executor rather than an internal thread pool.
 webmanager.connector.editConnector.TomcatManagerImpl.134 = Minimum spare threads
 webmanager.connector.editConnector.TomcatManagerImpl.136 = Maximum spare threads
-webmanager.connector.editConnector.TomcatManagerImpl.139 = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation.
+webmanager.connector.editConnector.TomcatManagerImpl.139 = The value is a comma-separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation.
 webmanager.connector.editConnector.TomcatManagerImpl.14  = Ciphers which may be used for communicating with clients.
 webmanager.connector.editConnector.TomcatManagerImpl.141 = The TCP port number on which this Connector  will create a server socket and await incoming connections. Your operating system will allow only one server application to listen to a particular port number on a particular IP address.
-webmanager.connector.editConnector.TomcatManagerImpl.144 = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features. 
+webmanager.connector.editConnector.TomcatManagerImpl.144 = The value is a comma-separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features. 
 webmanager.connector.editConnector.TomcatManagerImpl.147 = The Server header for the http response.
 webmanager.connector.editConnector.TomcatManagerImpl.149 = The size (in bytes) of the buffer to be provided for socket output buffering. -1 can be specified to disable the use of a buffer.
 webmanager.connector.editConnector.TomcatManagerImpl.151 = If set to true, the TCP_NO_DELAY option will be set on the server socket, which improves performance under most circumstances.
@@ -644,13 +645,13 @@
 webmanager.connector.editConnector.TomcatManagerImpl.169 = When turning SSLEnabled value to true you will want to set the scheme attribute as well to pass the correct request.getScheme() to the servlets
 webmanager.connector.editConnector.TomcatManagerImpl.170 = When turning SSLEnabled value to true you will want to set the secure attribute as well to pass the correct request.isSecure() values to the servlets 
 webmanager.connector.editConnector.TomcatManagerImpl.17  = Name of the file that contains the server certificate. The format is PEM-encoded.
-webmanager.connector.editConnector.TomcatManagerImpl.171 = A comma separated list of the encryption ciphers that may be used. If not specified, then any available cipher may be used.
-webmanager.connector.editConnector.TomcatManagerImpl.173 = The alias used to for the server certificate in the keystore. If not specified the first key read in the keystore will be used.
+webmanager.connector.editConnector.TomcatManagerImpl.171 = A comma-separated list of the encryption ciphers that may be used. If not specified, any available cipher may be used.
+webmanager.connector.editConnector.TomcatManagerImpl.173 = The alias used to for the server certificate in the keystore. If not specified, the first key read in the keystore will be used.
 webmanager.connector.editConnector.TomcatManagerImpl.175 = The TrustStore file to use to validate client certificates.
 webmanager.connector.editConnector.TomcatManagerImpl.177 = The password to access the TrustStore.
 webmanager.connector.editConnector.TomcatManagerImpl.179 = Set the truststore type. There is normally no reason not to use the default (JKS).
 webmanager.connector.editConnector.TomcatManagerImpl.181 = Use this attribute to enable or disable sendfile capability.
-webmanager.connector.editConnector.TomcatManagerImpl.183 = Set to true to use the NIO thread pool executor. The default value is true. If set to false, it uses a thread pool based on a stack for its execution. Generally, using the executor yields a little bit slower performance, but yields a better fairness for processing connections in a high load environment as the traffic gets queued through a FIFO queue. If set to true(default) then the max pool size is the maxThreads attribute and the core pool size is the minSpareThreads. This value is ignored if the executor attribute is present and points to a valid shared thread pool.
+webmanager.connector.editConnector.TomcatManagerImpl.183 = Set to true to use the NIO thread pool executor. The default value is true. If set to false, it uses a thread pool based on a stack for its execution. Generally, using the executor yields a little bit slower performance, but yields a better fairness for processing connections in a high load environment as the traffic gets queued through a FIFO queue. If set to true(default),  the max pool size is the maxThreads attribute and the core pool size is the minSpareThreads. This value is ignored if the executor attribute is present and points to a valid shared thread pool.
 webmanager.connector.editConnector.TomcatManagerImpl.185 = The number of threads to be used to accept connections. Increase this value on a multi-CPU machine, although you would never really need more than 2. Also, with a lot of non-keep-alive connections, you might want to increase this value as well. 
 webmanager.connector.editConnector.TomcatManagerImpl.187 = The number of threads to be used to run for the polling events.
 webmanager.connector.editConnector.TomcatManagerImpl.189 = The priority of the poller threads.
@@ -685,7 +686,7 @@
 webmanager.connector.editConnector.TomcatManagerImpl.241 = The max selectors to be used in the pool, to reduce selector contention. Use this option when the command line org.apache.tomcat.util.net.NioSelectorShared value is set to false.
 webmanager.connector.editConnector.TomcatManagerImpl.243 = The max spare selectors to be used in the pool, to reduce selector contention. When a selector is returned to the pool, the system can decide to keep it or let it be GC:ed. Use this option when the command line org.apache.tomcat.util.net.NioSelectorShared value is set to false.
 webmanager.connector.editConnector.TomcatManagerImpl.245 = The following command line options are available for the NIO connector: <br><i>-Dorg.apache.tomcat.util.net.NioSelectorShared=true|false</i>. Set this value to false if you wish to use a selector for each thread. the property. If you do set it to false, you can control the size of the pool of selectors by using the selectorPool.maxSelectors attribute
-webmanager.connector.editConnector.TomcatManagerImpl.247 = The NIO connector implements an OutOfMemoryError strategy called parachute. It holds a chunk of data as a byte array. In case of an OOM, this chunk of data is released and the error is reported. This will give the VM enough room to clean up. The oomParachute represent the size in bytes of the parachute(the byte array). The default value is 1024*1024(1MB). Please note, this only works for OOM errors regarding the Java Heap space, and there is absolutely no guarantee that you will be able to recover at all. If you have an OOM outside of the Java Heap, then this parachute trick will not help.
+webmanager.connector.editConnector.TomcatManagerImpl.247 = The NIO connector implements an OutOfMemoryError strategy called parachute. It holds a chunk of data as a byte array. In case of an OOM, this chunk of data is released and the error is reported. This will give the VM enough room to clean up. The oomParachute represent the size in bytes of the parachute(the byte array). The default value is 1024*1024(1MB). Note, this only works for OOM errors regarding the Java Heap space, and there is absolutely no guarantee that you will be able to recover at all. If you have an OOM outside of the Java Heap, this parachute trick will not help.
 webmanager.connector.editConnector.TomcatManagerImpl.249 = Duration of a poll call. Lowering this value will slightly decrease latency of connections being kept alive in some cases, but will use more CPU as more poll calls are being made.
 webmanager.connector.editConnector.TomcatManagerImpl.251 = Amount of sockets that the poller responsible for polling kept alive connections can hold at a given time. Extra connections will be closed right away.
 webmanager.connector.editConnector.TomcatManagerImpl.253 = Use kernel level sendfile for certain static files.
@@ -716,7 +717,7 @@
 webmanager.connector.editConnector.TomcatManagerImpl.92  = If this Connector is being used in a proxy configuration, configure this attribute to specify the server port to be returned for calls to request.getServerPort().
 webmanager.connector.editConnector.TomcatManagerImpl.94  = If this Connector is supporting non-SSL requests, and a request is received for which a matching <security-constraint> requires SSL transport, Catalina will automatically redirect the request to the port number specified here.
 webmanager.connector.editConnector.TomcatManagerImpl.97  = This specifies the character encoding used to decode the URI bytes, after %xx decoding the URL.
-webmanager.connector.editConnector.TomcatManagerImpl.99  = This specifies if the encoding specified in contentType should be used for URI query parameters, instead of using the URIEncoding. This setting is present for compatibility with Tomcat 4.1.x, where the encoding specified in the contentType, or explicitly set using Request.setCharacterEncoding method was also used for the parameters from the URL.
+webmanager.connector.editConnector.TomcatManagerImpl.99  = This specifies whether the encoding specified in contentType should be used for URI query parameters, instead of using the URIEncoding. This setting is present for compatibility with Tomcat 4.1.x, where the encoding specified in the contentType, or explicitly set using Request.setCharacterEncoding method was also used for the parameters from the URL.
 webmanager.connector.editConnector.addNew                = Add a new
 webmanager.connector.editConnector.attribute             = Attribute
 webmanager.connector.editConnector.desc                  = Description
@@ -738,7 +739,7 @@
 webmanager.help.disableExplanation                       = Turn off statistics gathering and return the user to the main page.
 webmanager.help.refreshExplanation                       = Update the display with the latest statistics.
 webmanager.help.resetExplanation                         = Reset all counts, totals, averages, etc., to 0 and start gathering statistics again.
-webmanager.help.title                                    = Geronimo Console will collect statistics on the number of requests received by Geronimo Console and on the number of connections made to the Geronimo server. Click on the enable link to monitor the performance of the Geronimo server.
+webmanager.help.title                                    = Geronimo Console will collect statistics on the number of requests received by Geronimo Console and on the number of connections made to the Geronimo server. Click the enable link to monitor the performance of the Geronimo server.
 webmanager.normal.activeRequestCount                     = Active Request Count
 webmanager.normal.avgTime                                = Avg Time (ms)
 webmanager.normal.connectionDuration                     = Connection Duration
@@ -764,9 +765,9 @@
 webmanager.normal.totalTime                              = Total Time
 
 welcome.welcomeMaximized.fragment1   = The welcome portlet is the first page that users see when they log in to the Administrative Console. It contains introductory information about the Administrative Console.
-welcome.welcomeMaximized.fragment2   = To return to the main Welcome panel select the "view" link from the header of this portlet.
+welcome.welcomeMaximized.fragment2   = To return to the main Welcome panel, select the "view" link from the header of this portlet.
 welcome.welcomeMaximized.title       = Welcome to the Apache Geronimo&#8482; Administration Console!
-welcome.welcomeNormal.about1         = The administration console provides a convenient, user friendly way to administer many aspects of the Geronimo Server.  It is currently a work in progress, and will continue to evolve over time.  The navigation panel on the left-hand side of the screen provides easy access to the individual tasks available in the console.
+welcome.welcomeNormal.about1         = The administration console provides a convenient way to administer many aspects of the Geronimo Server.  It is currently a work in progress, and will continue to evolve over time.  The navigation panel on the left-hand side of the screen provides easy access to the individual tasks available in the console.
 welcome.welcomeNormal.about2         = This space is the main content area where the real work happens.  Each view contains one or more portlets (self contained view fragments) that typically include a link for help in the header.  Look at the top of this portlet for an example and try it out.
 welcome.welcomeNormal.about3         = The references on the right are provided so that you can learn more about Apache Geronimo, its capabilities, and what might be coming in future releases.
 welcome.welcomeNormal.about4         = Mailing lists are available to get involved in the development of Apache Geronimo or to ask questions of the community:

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties Mon Dec  7 08:23:55 2009
@@ -26,7 +26,6 @@
 Applications = Applications
 
 Artifact-Aliases = Artifact-Aliases
-
 Certificate\ Authority = Certificate Authority
 
 Certification\ Authority = Certification Authority
@@ -58,7 +57,6 @@
 Installed\ Web\ Applications = Installed Web Applications
 
 J2EE\ Connectors = J2EE Connectors
-
 JAR\ Aliases = JAR Aliases
 
 Java\ System\ Info = Java System Info
@@ -134,7 +132,7 @@
 consolebase.errorMsg21 = Unable to get next serial number from CA.
 consolebase.errorMsg22 = Errors in user input while processing a CSR.
 consolebase.errorMsg23 = Errors encountered while issuing certificate.
-consolebase.errorMsg24 = Default properties-login module does not exist, it may be replaced by a customized login module.
+consolebase.errorMsg24 = Default properties-login module does not exist, it might be replaced by a customized login module.
 consolebase.infoMsg01  = Started application
 consolebase.infoMsg02  = Stopped application
 consolebase.infoMsg03  = Restarted application
@@ -158,6 +156,6 @@
 consolebase.warnMsg03  = Web statistics are not supported for the current web container.
 consolebase.warnMsg04  = Statistics are not currently being collected.
 consolebase.warnMsg05  = CA is not running or CA may not have been initialized.  Unable to lock CA.
-consolebase.warnMsg06  = A certificate with the serial number <b>{0}</b> has already been issued. You may be seeing this message since you have clicked on 'Issue Certificate' button a second time.
+consolebase.warnMsg06  = A certificate with the serial number <b>{0}</b> has already been issued. You might be seeing this message since you have clicked 'Issue Certificate' button a second time.
 consolebase.warnMsg07  = <p style='font-size:120%;'><b>A shutdown of the server will disable this Web Console! Proceed only if you are certain you want to terminate the server.</b></p>
 consolebase.warnMsg08  = There are no Web Containers defined.

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties Mon Dec  7 08:23:55 2009
@@ -23,4 +23,4 @@
 tooltip.mode.help = Help
 tooltip.mode.edit = Edit
 
-tooltip.css.classname = tooltip
\ No newline at end of file
+tooltip.css.classname = Tooltip
\ No newline at end of file

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=887861&r1=887860&r2=887861&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 Mon Dec  7 08:23:55 2009
@@ -21,12 +21,12 @@
 console.common.loginToConsole             = Log in to the Geronimo Console
 console.common.pages                      = Pages
 console.common.password                   = Password
-console.common.username                   = Username
+console.common.username                   = User Name
 console.head.title                        = Geronimo Console
 console.login.components                  = <strong>Geronimo&#8482;</strong> has integrated the following components:<BR/> &nbsp;&nbsp;&#149;&nbsp; Application server (Apache Geronimo)<br/> &nbsp;&nbsp;&#149;&nbsp; Web server and servlet engine (Tomcat)<br/> &nbsp;&nbsp;&#149;&nbsp; Web server and servlet engine (Jetty)<br/> &nbsp;&nbsp;&#149;&nbsp; JSP compiler (Jasper)<br/> &nbsp;&nbsp;&#149;&nbsp; JAX-RPC Web Services engine (Apache Axis)<br/> &nbsp;&nbsp;&#149;&nbsp; JAX-WS Web Services engine (Apache Axis2)<br/> &nbsp;&nbsp;&#149;&nbsp; JAX-WS Web Services engine (Apache CXF)<br/> &nbsp;&nbsp;&#149;&nbsp; Relational database (Apache Derby)<br/> &nbsp;&nbsp;&#149;&nbsp; Messaging (ActiveMQ)<br/> &nbsp;&nbsp;&#149;&nbsp; User management services<br/> &nbsp;&nbsp;&#149;&nbsp; Centralized administration console<br/> 
 console.login.introduction                = <strong>GERONIMO&#8482;</strong> 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: Logging onto the Geronimo Console requires cookies to be enabled in your web browser.
+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&#8482; Console
-console.login_error.invalid               = Invalid Username and/or Password!
+console.login_error.invalid               = Invalid User Name and/or Password!
 console.login_success.loginSuccessful     = Login Successful
 console.login_success.returnToPortalTests = Click here to return to the portal tests.

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp Mon Dec  7 08:23:55 2009
@@ -35,7 +35,7 @@
 An assembly process has been developed to add these records to web.xml using Maven 2 (the
 pluto:assemble goal in maven-pluto-plugin) or Ant (AssembleTask). 
 See the testsuite web.xml file for an example how the servlet and servlet-mapping
-records should look like after assembly (other items the developer adds to web.xml should be 
+records should look like after assembly (other items that the developer adds to web.xml should be 
 carried forward into the updated file). 
 </p>
 
@@ -52,25 +52,29 @@
 
 <div class="portlet-section-subheader">Deploying a Portlet Application</div>
 <p class="portlet-font">
-	The way to deploy a portlet application depends on the app server Pluto is running in. In the bundled distribution
-	Pluto is deployed in Tomcat. In this case, you can use the Tomcat manager app to deploy the portlet
-	war. There is a 'Upload and deploy portlet war' link at the bottom of the Page Administrator portlet that points to 
-	the manager app	in the bundled distribution (this link can be changed for other app servers -- see the 
-	adjacent Help link). In the bundled distribution of Pluto, you can also simply drop the portlet application war into Tomcat's 
+    The way to deploy a portlet application depends on the app server that Pluto is running in. In the bundled distribution
+    Pluto is deployed in Tomcat. In this case, you can use the Tomcat manager app to deploy the portlet
+    war. There is a 'Upload and deploy portlet war' link at the bottom of the Page Administrator portlet that points to 
+    the manager app    in the bundled distribution (this link can be changed for other app servers -- see the 
+    adjacent Help link). In the bundled distribution of Pluto, you can also simply drop the portlet application war into Tomcat's 
     webapp directory.
 </p>
 
 <div class="portlet-section-subheader">Adding Portlets to a Portal Pages</div>
 <p class="portlet-font">
-Adding portlets to a portal page using the Pluto Page Administrator portlet involves first selecting a portal 
-page using the Portal Pages drop-down and then selecting a portlet application using the Portlet Applications 
-drop-down and finally a portlet in the adjacent drop down. When this is done, click the Add Portlet button.
+To Add portlets to a portal page using the Pluto Page Administrator portlet, take the following steps:
+Select a portal page using the Portal Pages drop-down. 
+Select a portlet application using the Portlet Applications drop-down 
+Select a portlet in the adjacent drop down. 
+Click the Add Portlet button.
 </p>
 
 <div class="portlet-section-subheader">Removing Portal Pages</div>
 <p class="portlet-font">
-Removing portlets from a portal page involves selecting a portal page using the Portal Pages drop-down, selecting
-the portlet in the adjacent list and then clicking on the Remove Page button.
+To remove portlets from a portal page, take the following steps:
+Select a portal page using the Portal Pages drop-down.
+Select the portlet in the adjacent list.
+Click the Remove Page button.
 </p>
 
 
@@ -99,10 +103,10 @@
 
 <%-- Properties for link to app server deployer and help mode file --%>
 <fmt:bundle basename="AdminPortlet">
-	<fmt:message key="appserver.deployer.help.page" var="deployerHelp"/>
+    <fmt:message key="appserver.deployer.help.page" var="deployerHelp"/>
 </fmt:bundle> 
 <portlet:renderURL portletMode="help" var="deployerhelpURL">
-	<portlet-el:param name="helpPage" value="${deployerHelp}"/>
+    <portlet-el:param name="helpPage" value="${deployerHelp}"/>
 </portlet:renderURL>
 
 <p class="portlet-font">



Mime
View raw message