From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001 From: matthew_swift <matthew_swift@localhost> Date: Fri, 05 Jun 2009 09:04:50 +0000 Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0 --- opends/src/messages/messages/admin_tool.properties | 80 ++++++++++++++++++++-------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/opends/src/messages/messages/admin_tool.properties b/opends/src/messages/messages/admin_tool.properties index d90eec2..59feb12 100644 --- a/opends/src/messages/messages/admin_tool.properties +++ b/opends/src/messages/messages/admin_tool.properties @@ -83,7 +83,7 @@ INFO_CLI_UNINSTALL_CONFIRM_OUTSIDELOGS=The Directory Server contains log \ files in the following locations outside the server path:%n%s%nRemove these \ files? -INFO_CLI_UNINSTALL_CONFIRM_STOP=The OpenDS server is currently running and \ +INFO_CLI_UNINSTALL_CONFIRM_STOP=The server is currently running and \ must be stopped before uninstallation can continue.%nStop the Server and \ permanently delete the files? SEVERE_ERR_CLI_UNINSTALL_NOTHING_TO_BE_UNINSTALLED_NON_INTERACTIVE=You must \ @@ -95,14 +95,14 @@ INFO_CLI_UNINSTALL_CONFIRM_UPDATE_REMOTE=This server is configured to do \ replication.%nIf the server is actually replicating contents with other \ servers you must provide administrator authentication to remove \ - references to this server in the replicating OpenDS servers.%n%nType 'Yes' to \ + references to this server in the replicating servers.%n%nType 'Yes' to \ provide authentication to remove the remote references.%nType 'No' to \ continue the uninstall without updating remote references.%nProvide \ authentication? INFO_CLI_UNINSTALL_CONFIRM_UPDATE_REMOTE_AND_START=This server is \ configured to do replication.%nIf the server is actually replicating contents \ with other servers it must be started and you must provide administrator \ - authentication to remove references to this server in the replicating OpenDS \ + authentication to remove references to this server in the replicating \ servers.%n%nType 'Yes' to start the server and then provide authentication \ to remove the remote references.%nType 'No' to continue the uninstall without \ updating remote references.%nStart the server and provide authentication? @@ -110,9 +110,9 @@ address) as it is referenced in remote servers for replication INFO_UNINSTALL_CONFIRM_PROVIDE_AUTHENTICATION_AGAIN=Do you want to provide \ authentication again? (If you say no, the references to this server in other \ -OpenDS servers will not be removed). +servers will not be removed). INFO_CLI_UNINSTALL_WHAT_TO_DELETE=Do you want to remove all components of \ - OpenDS or select the components to remove? + the server or select the components to remove? INFO_CLI_UNINSTALL_REMOVE_ALL=Remove all components INFO_CLI_UNINSTALL_SPECIFY_WHAT_REMOVE=Select the components to be removed INFO_CLI_VIEW_DETAILS=View Details @@ -120,7 +120,7 @@ INFO_CLI_NUMBER_PROMPT=Enter a number or press Enter to accept the default INFO_CLI_INVALID_RESPONSE=Invalid response INFO_CLOSE_BUTTON_UNINSTALL_TOOLTIP=Close Uninstall Window -INFO_CONFIRM_CLOSE_UNINSTALL_MSG=OpenDS Uninstall has not yet completed.%nAre \ +INFO_CONFIRM_CLOSE_UNINSTALL_MSG=The Uninstall has not yet completed.%nAre \ you sure you want to close the Uninstall Window? INFO_CONFIRM_CLOSE_UNINSTALL_TITLE=Confirmation Required INFO_CONFIRM_RESTART_MESSAGE=Are you sure you want to Restart the Directory \ @@ -128,15 +128,15 @@ INFO_CONFIRM_RESTART_TITLE=Confirmation Required INFO_CONFIRM_STOP_MESSAGE=Are you sure you want to Stop the Directory Server? INFO_CONFIRM_STOP_TITLE=Confirmation Required -INFO_CONFIRM_UNINSTALL_PANEL_INSTRUCTIONS=The OpenDS Uninstall tool will \ - remove all parts of the OpenDS server you have selected below from your \ +INFO_CONFIRM_UNINSTALL_PANEL_INSTRUCTIONS=The Uninstall tool will \ + remove all parts of the server you have selected below from your \ system. If all are selected, the server will be removed entirely. INFO_CONFIRM_UNINSTALL_PANEL_TITLE=Uninstall Options INFO_CONFIRM_UNINSTALL_REPLICATION_SERVER_NOT_RUNNING_MSG=This server is \ configured to do replication.%nIf the server is actually replicating contents \ with other servers it must be started and then you must provide \ administrator authentication to remove references to this server \ - in the replicating OpenDS servers.%n%nClick on 'Yes' to start the server and \ + in the replicating servers.%n%nClick on 'Yes' to start the server and \ then provide authentication to remove the remote references.%nClick on 'No' \ to continue the uninstall without updating remote references. INFO_CONFIRM_UNINSTALL_REPLICATION_SERVER_NOT_RUNNING_TITLE=Confirmation \ @@ -144,14 +144,14 @@ INFO_CONFIRM_UNINSTALL_REPLICATION_SERVER_RUNNING_MSG=This server is \ configured to do replication.%nIf the server is actually replicating contents \ with other servers you must provide administrator authentication to remove \ - references to this server in the replicating OpenDS servers.%n%nClick on \ + references to this server in the replicating servers.%n%nClick on \ 'Yes' to provide authentication to remove the remote references.%nClick on \ 'No' to continue the uninstall without updating remote references. INFO_CONFIRM_UNINSTALL_REPLICATION_SERVER_RUNNING_TITLE=Confirmation Required INFO_CONFIRM_UNINSTALL_SERVER_NOT_RUNNING_MSG=Confirm Uninstall%nAll selected \ files will be permanently deleted, are you sure you want to continue? INFO_CONFIRM_UNINSTALL_SERVER_NOT_RUNNING_TITLE=Confirm Uninstall -INFO_CONFIRM_UNINSTALL_SERVER_RUNNING_MSG=Server is Running%nThe OpenDS \ +INFO_CONFIRM_UNINSTALL_SERVER_RUNNING_MSG=Server is Running%nThe \ server is currently running and must be stopped before uninstallation can \ continue. Do you want the uninstaller to stop the server for you and continue \ with the uninstall? If you click No, you will need to stop the server \ @@ -247,7 +247,7 @@ INFO_NOTHING_SELECTED_TO_UNINSTALL=You must select something to be \ uninstalled. INFO_NUMBER_ENTRIES_COLUMN=Entries -INFO_OPENDS_VERSION_LABEL=OpenDS Version: +INFO_OPENDS_VERSION_LABEL=Version: INFO_PROGRESS_REMOVING_REFERENCES=Removing references on %s INFO_PROTOCOL_COLUMN=Protocol INFO_REMOVE_BACKUPS_LABEL=Backup Files Contained in bak Directory @@ -304,34 +304,34 @@ INFO_SUMMARY_DELETING_INSTALLATION_FILES=Deleting Files under the \ Installation Path... INFO_SUMMARY_DISABLING_WINDOWS_SERVICE=Disabling Windows Service... -INFO_SUMMARY_UNCONFIGURING_REPLICATION=Removing references in remote OpenDS \ +INFO_SUMMARY_UNCONFIGURING_REPLICATION=Removing references in remote \ servers... -INFO_SUMMARY_UNINSTALL_FINISHED_SUCCESSFULLY=<b>OpenDS Uninstall Completed \ +INFO_SUMMARY_UNINSTALL_FINISHED_SUCCESSFULLY=<b>Uninstall Completed \ Successfully.</b> -INFO_SUMMARY_UNINSTALL_FINISHED_SUCCESSFULLY_CLI=OpenDS Uninstall Completed \ +INFO_SUMMARY_UNINSTALL_FINISHED_SUCCESSFULLY_CLI=Uninstall Completed \ Successfully. -INFO_SUMMARY_UNINSTALL_FINISHED_SUCCESSFULLY_REMOVE_JARFILES=<b>OpenDS \ +INFO_SUMMARY_UNINSTALL_FINISHED_SUCCESSFULLY_REMOVE_JARFILES=<b>The \ Uninstall Completed Successfully.</b><br><br>To complete the uninstallation, \ you must delete manually the following files and directories:<br>%s -INFO_SUMMARY_UNINSTALL_FINISHED_SUCCESSFULLY_REMOVE_JARFILES_CLI=OpenDS \ - Uninstall Completed Successfully.%nTo complete the uninstallation, you must \ +INFO_SUMMARY_UNINSTALL_FINISHED_SUCCESSFULLY_REMOVE_JARFILES_CLI=The Uninstall \ + Completed Successfully.%nTo complete the uninstallation, you must \ delete manually the following files and directories:%n%s INFO_SUMMARY_UNINSTALL_FINISHED_WITH_ERROR=An error occurred. Check \ 'Details' text area for more information. -INFO_SUMMARY_UNINSTALL_FINISHED_WITH_ERROR_ON_REMOTE=<b>OpenDS Uninstall \ - Succeeded With Warnings</b><br>OpenDS was successfully uninstalled in the \ +INFO_SUMMARY_UNINSTALL_FINISHED_WITH_ERROR_ON_REMOTE=<b>The Uninstall \ + Succeeded With Warnings</b><br>The server was successfully uninstalled in the \ local machine but some error occurred updating remote servers. Check \ 'Details' text area for more information. -INFO_SUMMARY_UNINSTALL_FINISHED_WITH_ERROR_ON_REMOTE_CLI=OpenDS was \ +INFO_SUMMARY_UNINSTALL_FINISHED_WITH_ERROR_ON_REMOTE_CLI=The server was \ successfully uninstalled in the local machine but some error occurred \ updating remote servers. -INFO_SUMMARY_UNINSTALL_FINISHED_WITH_ERROR_DELETING=<b>OpenDS Uninstall \ - Succeeded With Warnings</b><br>OpenDS was successfully uninstalled in the \ +INFO_SUMMARY_UNINSTALL_FINISHED_WITH_ERROR_DELETING=<b>The Uninstall \ + Succeeded With Warnings</b><br>The server was successfully uninstalled in the \ local machine but some error occurred deleting files. Check \ 'Details' text area for more information about the files that caused the \ problem.<br><br>Verify that there is no other program using those files and \ delete them manually. -INFO_SUMMARY_UNINSTALL_FINISHED_WITH_ERROR_DELETING_CLI=OpenDS was \ +INFO_SUMMARY_UNINSTALL_FINISHED_WITH_ERROR_DELETING_CLI=The server was \ successfully uninstalled in the local machine but some error occurred \ deleting files. Check 'Details' text area for more information about the \ files that caused the problem.%n%nVerify that there is no other program \ @@ -348,24 +348,24 @@ INFO_UNINSTALL_LAUNCHER_USAGE_DESCRIPTION=This utility can be used to \ uninstall the Directory Server. INFO_UNINSTALL_LOGIN_CANCEL_BUTTON_TOOLTIP=Close this dialog and do not try \ - to remove references of this server in other OpenDS servers. + to remove references of this server in other servers. INFO_UNINSTALL_LOGIN_DIALOG_MSG=You must provide a Global Administrative User \ - ID to be able to remove the references to this server in other OpenDS \ + ID to be able to remove the references to this server in other \ servers.%nYou must also provide the name of this host (or IP address) as it \ is referenced in remote servers. INFO_UNINSTALL_LOGIN_HOST_NAME_LABEL=Host Name: INFO_UNINSTALL_LOGIN_HOST_NAME_TOOLTIP=The name of this host (or IP address) \ - as it is referenced in other OpenDS servers. + as it is referenced in other servers. INFO_UNINSTALL_LOGIN_OK_BUTTON_TOOLTIP=Try to connect with the provided \ authentication. INFO_UNINSTALL_LOGIN_PWD_TOOLTIP=The password of the Global Administrator to \ - be used to read and update configuration in other OpenDS servers. + be used to read and update configuration in other servers. INFO_UNINSTALL_LOGIN_UID_TOOLTIP=The Global Administrator User ID to be used \ - to read and update configuration in other OpenDS servers. + to read and update configuration in other servers. INFO_UNKNOWN_LABEL=-- INFO_UNINSTALLDS_DESCRIPTION_FORCE=Specifies whether the uninstall should \ continue if there is an error updating references to this server in remote \ - OpenDS instances or not. This argument can only be used with the %s no \ + server instances or not. This argument can only be used with the %s no \ prompt argument. INFO_DESCRIPTION_REFERENCED_HOST=The name of this host (or IP address) as \ it is referenced in remote servers for replication @@ -376,7 +376,7 @@ INFO_UNINSTALLDS_DESCRIPTION_QUIET=Run uninstall in quiet mode. Quiet mode \ will not output progress information to standard output INFO_UNINSTALLDS_DESCRIPTION_REMOVE_ALL=Remove all components of \ - OpenDS (this option is not compatible with the rest of remove options) + the server (this option is not compatible with the rest of remove options) INFO_UNINSTALLDS_DESCRIPTION_REMOVE_SERVER_LIBRARIES=Remove Server Libraries \ and Administrative Tools INFO_UNINSTALLDS_DESCRIPTION_REMOVE_DATABASES=Remove database contents @@ -549,7 +549,7 @@ used when %s has been specified INFO_REPLICATION_ENABLE_ADMINISTRATOR_MUST_BE_CREATED=Global Administrator \ must be created.%nYou must provide the credentials of the Global \ - Administrator that will be created to manage the OpenDS instances that are \ + Administrator that will be created to manage the server instances that are \ being replicated. INFO_ADMINISTRATOR_UID_PROMPT=Global Administrator User ID INFO_ADMINISTRATOR_PWD_PROMPT=Global Administrator Password: @@ -558,7 +558,7 @@ MILD_ERR_ERROR_CONNECTING_TO_SERVER_PROMPT_AGAIN=Could not connect to the \ Directory Server %s with the provided credentials.%nError details: %s%n%n\ Provide again the required information to connect to the server: -INFO_REPLICATION_ENABLE_HOST1_CONNECTION_PARAMETERS=>>>> Specify OpenDS administration \ +INFO_REPLICATION_ENABLE_HOST1_CONNECTION_PARAMETERS=>>>> Specify server administration \ connection parameters for the first server INFO_REPLICATION_ENABLE_HOSTNAME1_PROMPT=Host name of the first server INFO_REPLICATION_ENABLE_PORT1_PROMPT=Administration port of the first server @@ -570,7 +570,7 @@ communication when connecting to replication port %s on the first server? INFO_REPLICATION_ENABLE_BINDDN1_PROMPT=Bind DN for the first server INFO_REPLICATION_ENABLE_PASSWORD1_PROMPT=Password for %s on the first server: -INFO_REPLICATION_ENABLE_HOST2_CONNECTION_PARAMETERS=>>>> Specify OpenDS administration \ +INFO_REPLICATION_ENABLE_HOST2_CONNECTION_PARAMETERS=>>>> Specify server administration \ connection parameters for the second server INFO_REPLICATION_ENABLE_HOSTNAME2_PROMPT=Host name of the second server INFO_REPLICATION_ENABLE_PORT2_PROMPT=Administration port of the second server @@ -582,10 +582,10 @@ communication when connecting to replication port %s on the second server? INFO_REPLICATION_ENABLE_BINDDN2_PROMPT=Bind DN for the second server INFO_REPLICATION_ENABLE_PASSWORD2_PROMPT=Password for %s on the second server: -INFO_REPLICATION_INITIALIZE_SOURCE_CONNECTION_PARAMETERS=>>>> Specify OpenDS \ +INFO_REPLICATION_INITIALIZE_SOURCE_CONNECTION_PARAMETERS=>>>> Specify server \ administration connection parameters for the source server INFO_REPLICATION_INITIALIZE_DESTINATION_CONNECTION_PARAMETERS=>>>> Specify \ - OpenDS administration connection parameters for the destination server + server administration connection parameters for the destination server SEVERE_ERR_NO_SUFFIXES_AVAILABLE_TO_ENABLE_REPLICATION=There are no base DN's \ available to enable replication between the two servers. INFO_ALREADY_REPLICATED_SUFFIXES=The following base DN's are already replicated \ @@ -1740,10 +1740,10 @@ back, leave the Java Home text field empty or specify a valid Java home.<br>\ Error details:<br>%s SEVERE_ERR_CTRL_PANEL_NOT_WORKING_JVM_DETAILS=The Java binary '%s' \ - could not be used to launch the OpenDS scripts.<br>OpenDS cannot run using \ + could not be used to launch the server scripts.<br>The server cannot run using \ the provided Java Home. SEVERE_ERR_CTRL_PANEL_NOT_WORKING_FALLBACK_JVM_DETAILS=The Java binary '%s' \ - could not be used to launch the OpenDS scripts. This value will be used as \ + could not be used to launch the server scripts. This value will be used as \ fall back when the OPENDS_JAVA_HOME environment variable is not defined. If \ you do not want to specify a fall back, leave the Java Home text field empty \ or specify a valid Java home. @@ -2248,7 +2248,7 @@ INFO_CTRL_PANEL_ADMINISTRATIVE_USERS_LABEL=Administrative Users: INFO_CTRL_PANEL_INSTALLATION_PATH_LABEL=Installation Path: INFO_CTRL_PANEL_INSTANCE_PATH_LABEL=Instance Path: -INFO_CTRL_PANEL_OPENDS_VERSION_LABEL=OpenDS Version: +INFO_CTRL_PANEL_OPENDS_VERSION_LABEL=Version: INFO_CTRL_PANEL_JAVA_VERSION_LABEL=Java Version: INFO_CTRL_PANEL_ADMIN_CONNECTOR_LABEL=Administration Connector: INFO_CTRL_PANEL_ADMIN_CONNECTOR_DESCRIPTION=Port %d (LDAPS) @@ -2259,7 +2259,7 @@ INFO_CTRL_PANEL_WINDOWS_SERVICE_TITLE=Windows Service Configuration INFO_CTRL_PANEL_WINDOWS_SERVICE_PANEL_TEXT=This page indicates whether this \ - OpenDS instance is configured to run as a Windows Service. To manage \ + server instance is configured to run as a Windows Service. To manage \ auto-start and other features, run the Windows Service Control Manager of the \ operating system. INFO_CTRL_PANEL_WINDOWS_SERVICE_INTEGRATION_LABEL=Windows Service Integration: -- Gitblit v1.10.0