From 00d37e85955e374be365f1c34de5af1f69a6476c Mon Sep 17 00:00:00 2001 From: Violette Roche-Montane <violette.roche-montane@forgerock.com> Date: Tue, 07 May 2013 13:50:59 +0000 Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 . --- opendj-sdk/opends/src/messages/messages/quicksetup.properties | 39 +-------------------------------------- 1 files changed, 1 insertions(+), 38 deletions(-) diff --git a/opendj-sdk/opends/src/messages/messages/quicksetup.properties b/opendj-sdk/opends/src/messages/messages/quicksetup.properties index c883fa9..5f8fe9e 100644 --- a/opendj-sdk/opends/src/messages/messages/quicksetup.properties +++ b/opendj-sdk/opends/src/messages/messages/quicksetup.properties @@ -70,10 +70,6 @@ INFO_BUILD_EXTRACTOR_ERROR_FILE_NOT_ZIP=File %s is not a .zip file. INFO_BUILD_EXTRACTOR_FILE_INVALID=Could not extract a valid server \ installation from %s because: %s -INFO_BUILD_MANAGER_DOWNLOADING_BUILD=Downloading Build... -INFO_BUILD_MANAGER_DOWNLOADING_BUILD_DONE=Finished Downloading Build -INFO_BUILD_MANAGER_DOWNLOADING_BUILD_PROGRESS=Downloading Build: %s%% \ - Completed INFO_CANCEL_BUTTON_LABEL=Cancel INFO_CANCEL_BUTTON_TOOLTIP=Cancel the currently running operation INFO_CANNOT_BIND_PORT=Cannot bind to port %s.%n%nThe port could be already in \ @@ -1178,34 +1174,13 @@ above location INFO_UPGRADE_BUILD_ID_UNKNOWN=Unknown INFO_UPGRADE_CANCELED=Upgrade canceled. -INFO_UPGRADE_CHOOSE_VERSION_BUILD_LIST_ERROR=<b>Error Accessing Build \ - Information.</b><br>Unable to retrieve the list of builds from %s due to: \ - %s.<br>Possible Causes:<br><ul><li>Need to specify a \ - proxy.<br><table><tr><td><input value="Specify Proxy" \ - type="submit"></input></td><td>Current Proxy: \ - %s<td></tr></table><br></li><li>%s is down or experiencing \ - difficulty.</li></ul><br>You can still continue with upgrade but will need to \ - download a build separately and then point to it in the wizard. -INFO_UPGRADE_CHOOSE_VERSION_LOADING_BUILD_INFO=Loading remote build \ - information... -INFO_UPGRADE_CHOOSE_VERSION_LOCAL_LABEL=Upgrade Based on Downloaded Weekly \ - Build (.zip) +INFO_UPGRADE_CHOOSE_VERSION_LOCAL_LABEL=Upgrade Based on Downloaded Build (.zip) INFO_UPGRADE_CHOOSE_VERSION_LOCAL_PATH=Path: INFO_UPGRADE_CHOOSE_VERSION_LOCAL_TOOLTIP=Upgrade to a build whose .zip file \ you have already downloaded. INFO_UPGRADE_CHOOSE_VERSION_PANEL_INSTRUCTIONS=Choose a new version or \ reference build to use for the upgrading. INFO_UPGRADE_CHOOSE_VERSION_PANEL_TITLE=Choose New Version -INFO_UPGRADE_CHOOSE_VERSION_READING_BUILD_INFO=Reading remote build \ - information... -INFO_UPGRADE_CHOOSE_VERSION_REMOTE_LABEL=Choose New Version from \ - www.forgerock.org/opendj.html -INFO_UPGRADE_CHOOSE_VERSION_REMOTE_NIGHTLY=Nightly Builds -INFO_UPGRADE_CHOOSE_VERSION_REMOTE_TOOLTIP=Download and upgrade to a build \ - publicly available on the OpenDJ website. -INFO_UPGRADE_CHOOSE_VERSION_REMOTE_WEEKLY=Weekly Builds -INFO_UPGRADE_CHOOSE_VERSION_UNABLE_TO_ACCESS_BUILD_INFO=Unable to access \ - remote build information. INFO_UPGRADE_OPERATION_PROMPT=Would you like to upgrade this installation to \ a newer version or revert to an older version? INFO_UPGRADE_OPERATION_REVERSION=Revert to a previous version @@ -1328,13 +1303,6 @@ INFO_WARNING_ICON_TOOLTIP=Warning # Only translate if the image is specific to the local INFO_WARNING_LARGE_ICON=images/warning_large.gif -INFO_WEB_PROXY_DLG_AUTH_LABEL=Authentication: -INFO_WEB_PROXY_DLG_AUTH_REQ_LABEL=Required by proxy -INFO_WEB_PROXY_DLG_HOST_LABEL=Host: -INFO_WEB_PROXY_DLG_PASSWORD_LABEL=Password: -INFO_WEB_PROXY_DLG_PORT_LABEL=Port: -INFO_WEB_PROXY_DLG_TITLE=Web Proxy Configuration -INFO_WEB_PROXY_DLG_USER_LABEL=User: INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=The %s QuickSetup tool will ask \ you for some basic server and data configuration settings and will get your \ server up and running quickly.<br><br> %s requires a Java SE 6.0 or \ @@ -1380,11 +1348,6 @@ OPENDJ_JAVA_HOME to the root of a compatible Java installation or edit the \ java.properties file and then run the dsjavaproperties script to specify the \ java version to be used. -SEVERE_ERR_INVALID_JAVA_ARGS=The java arguments used in the server \ - installation in '%s' do not seem to be compatible with the Java virtual \ - machine used to run the upgrader (%s).%n%nTo fix this problem delete the file \ - %s and click on 'Next' again.%nOnce the upgrader finishes you will have to \ - set again the java arguments by running the command-line %s. INFO_ADS_CONTEXT_EXCEPTION_MSG=Registration information error. Error type: \ '%s'. INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG=Registration information error. \ -- Gitblit v1.10.0