From 8feee36de8e6042f928439b06a03d50018423afe Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 17 Aug 2007 00:53:26 +0000
Subject: [PATCH] The following modifications have the following goals:

---
 opends/src/messages/messages/quicksetup.properties |   55 ++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/opends/src/messages/messages/quicksetup.properties b/opends/src/messages/messages/quicksetup.properties
index 0724ad2..3c3293c 100644
--- a/opends/src/messages/messages/quicksetup.properties
+++ b/opends/src/messages/messages/quicksetup.properties
@@ -60,6 +60,12 @@
 INFO_CERTIFICATE_DIALOG_TITLE=Certificate Not Trusted
 INFO_CERTIFICATE_EXCEPTION=You must accept the certificate presented by \
  %s:%s.
+INFO_ERROR_READING_CONFIG_LDAP_CERTIFICATE=Error reading data from server.  \
+ There is an error with the certificate presented by the server.\nDetails: \
+ %s 
+INFO_ERROR_READING_CONFIG_LDAP_CERTIFICATE_SERVER=Error reading data from \
+ server %s.  There is an error with the certificate presented by the \
+ server.\nDetails: %s
 INFO_CERTIFICATE_EXPIRED=%s - Expired
 INFO_CERTIFICATE_EXPIRES_ON_LABEL=Expires On:
 INFO_CERTIFICATE_HIDE_DETAILS_TEXT=<br><br><a href="">Hide Certificate \
@@ -67,21 +73,36 @@
 INFO_CERTIFICATE_ISSUED_BY_LABEL=Issued By:
 INFO_CERTIFICATE_LABEL=Certificate:
 INFO_CERTIFICATE_NAME_MISMATCH_TEXT=The Certificate presented by the server \
- %0$s:%1$s could not be trusted.<br><br>There is a name mismatch between the \
- name of the server (%0$s) and the subject DN of the certificate.  This could \
+ %s:%s could not be trusted.<br><br>There is a name mismatch between the \
+ name of the server (%s) and the subject DN of the certificate.  This could \
  be caused because you are connected to a server pretending to be \
- %0$s:%1$s.<br><br>Before accepting this certificate, you should examine the \
- server''s certificate carefully.<br><br>Are you willing to accept this \
- certificate for the purpose of identifying the server %0$s:%1$s?
+ %s:%s.<br><br>Before accepting this certificate, you should examine the \
+ server's certificate carefully.<br><br>Are you willing to accept this \
+ certificate for the purpose of identifying the server %s:%s?
+INFO_CERTIFICATE_NAME_MISMATCH_TEXT_CLI=The Certificate presented by the server \
+ %s:%s could not be trusted.\nThere is a name mismatch between the name of \
+ the server (%s) and the subject DN of the certificate.  This could be caused \
+ because you are connected to a server pretending to be %s:%s.\n\
+ Before accepting this certificate, you should examine the server's \
+ certificate carefully.\nAre you willing to accept this certificate for \
+ the purpose of identifying the server %s:%s?
 INFO_CERTIFICATE_NOT_TRUSTED_TEXT=The Certificate presented by the server \
- %0$s:%1$s could not be trusted.<br><br>Possible reasons for this \
+ %s:%s could not be trusted.<br><br>Possible reasons for this \
  error:<br>&nbsp;&nbsp;&nbsp;&nbsp;-The Certificate Authority that issued the \
  certificate is not recognized (this is the case of the self-signed \
- certificates).<br>&nbsp;&nbsp;&nbsp;&nbsp;-The server''s certificate is \
+ certificates).<br>&nbsp;&nbsp;&nbsp;&nbsp;-The server's certificate is \
  incomplete due to a misconfiguration.<br>&nbsp;&nbsp;&nbsp;&nbsp;-The \
- server''s certificate has expired.<br>Before accepting this certificate, you \
- should examine the server''s certificate carefully.<br><br>Are you willing to \
- accept this certificate for the purpose of identifying the server %0$s:%1$s?
+ server's certificate has expired.<br>Before accepting this certificate, you \
+ should examine the server's certificate carefully.<br><br>Are you willing to \
+ accept this certificate for the purpose of identifying the server %s:%s?
+INFO_CERTIFICATE_NOT_TRUSTED_TEXT_CLI=The Certificate presented by the server \
+ %s:%s could not be trusted.\nPossible reasons for this error:\n\
+ -The Certificate Authority that issued the certificate is not recognized (this \
+ is the case of the self-signed certificates).\n-The server's certificate is \
+ incomplete due to a misconfiguration.\n-The server's certificate has \
+ expired.\nBefore accepting this certificate, you should examine the server's \
+ certificate carefully.\nAre you willing to accept this certificate for the \
+ purpose of identifying the server %s:%s?
 INFO_CERTIFICATE_NOT_VALID_YET=%s - Not valid yet
 INFO_CERTIFICATE_PUBLIC_KEY_LABEL=Public Key:
 INFO_CERTIFICATE_SERIAL_NUMBER_LABEL=Serial Number:
@@ -255,9 +276,9 @@
  %s\bat\windows-service.bat -d command-line to disable the service manually.
 INFO_ERROR_DURING_INITIALIZATION_LOG=Error during the initialization with \
  contents from server %s.  Last log details: %s.  Task state: %s.  Check the \
- error logs of the server for more information.
+ error logs of %s for more information.
 INFO_ERROR_DURING_INITIALIZATION_NO_LOG=Error during the initialization with \
- contents from server %0$s.  Task state: %1$s.  Check the error logs of %0$s \
+ contents from server %s.  Task state: %s.  Check the error logs of %s \
  for more information.
 INFO_ERROR_EMPTY_RESPONSE=ERROR:  The response value may not be an empty \
  string
@@ -307,7 +328,7 @@
 INFO_ERROR_PROP_VALUE=The value of property %s could not be determined.
 INFO_ERROR_READING_ERROROUTPUT=Error Reading error output.
 INFO_ERROR_READING_OUTPUT=Error Reading output.
-INFO_ERROR_READING_REGISTERED_SERVERS_CONFIRM=The following errors where \
+INFO_ERROR_READING_REGISTERED_SERVERS_CONFIRM=The following errors were \
  encountered reading the configuration of the existing servers:%n%s%n%nDo you \
  want to continue?
 INFO_ERROR_READING_SERVER_CONFIGURATION=Error reading configuration. \
@@ -934,11 +955,11 @@
 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 %0$s due to: \
- %1$s.<br>Possible Causes:<br><ul><li>Need to specify a \
+ 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: \
- %2$s<td></tr></table><br></li><li>%0$s is down or experiencing \
+ %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 \
@@ -962,7 +983,7 @@
 INFO_UPGRADE_CHOOSE_VERSION_UNABLE_TO_ACCESS_BUILD_INFO=Unable to access \
  remote build information.
 INFO_UPGRADE_FILE_PROMPT=Enter the name and path of the OpenDS install file \
- (.zip):
+ (.zip)
 INFO_UPGRADE_LAUNCHER_DESCRIPTION=This utility may be used to upgrade the \
  Directory Server to a newer version.
 INFO_UPGRADE_LAUNCHER_GUI_LAUNCHED_FAILED=%n%nThe graphical upgrade launch \

--
Gitblit v1.10.0