From 486ffa6d0abfa0b91dc7ab22ee71758b5eecfb88 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 26 Sep 2007 18:57:15 +0000
Subject: [PATCH] Fix for 2306: configure replication encryption on or off in dsreplication and setup-gui

---
 opends/src/messages/messages/admin_tool.properties |   43 +++++++++++++++++++++++++++++++++----------
 1 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/opends/src/messages/messages/admin_tool.properties b/opends/src/messages/messages/admin_tool.properties
index b64e3b6..edb1cbd 100644
--- a/opends/src/messages/messages/admin_tool.properties
+++ b/opends/src/messages/messages/admin_tool.properties
@@ -242,6 +242,7 @@
 INFO_NO_LISTENERS_FOUND=-No Listener Ports Found-
 INFO_NOT_APPLICABLE_LABEL=--
 INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_CLI_LABEL=<not available> (*)
+INFO_NOT_AVAILABLE_SHORT_LABEL=N/A
 INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_CLI_LEGEND=* Information only \
  available if you provide authentication information when launching the status \
  command.
@@ -411,6 +412,10 @@
  the replication mechanism in the first server to communicate with the other \
  servers.  You have to specify this option only if replication was not \
  previously configured in the first server.
+INFO_DESCRIPTION_ENABLE_SECURE_REPLICATION1=Specifies whether or not the \
+ communication through the replication port of the first server is encrypted \
+ or not.  This option will only be taken into account the first time \
+ replication is configured on the first server.
 INFO_DESCRIPTION_ENABLE_REPLICATION_HOST2=Directory server hostname or IP \
  address of the second server whose contents will be replicated
 INFO_DESCRIPTION_ENABLE_REPLICATION_SERVER_PORT2=Directory server port \
@@ -432,10 +437,14 @@
  password of the global administrator will be used to bind
 INFO_DESCRIPTION_ENABLE_REPLICATION_USE_SSL2=Use SSL for secure \
  communication with the second server
-INFO_DESCRIPTION_ENABLE_REPLICATION_PORT2=Specifies the port that will be used by \
- the replication mechanism in the second server to communicate with the other \
- servers.  You have to specify this option only if replication was not \
+INFO_DESCRIPTION_ENABLE_REPLICATION_PORT2=Specifies the port that will be used \
+ by the replication mechanism in the second server to communicate with the \
+ other servers.  You have to specify this option only if replication was not \
  previously configured in the second server.
+INFO_DESCRIPTION_ENABLE_SECURE_REPLICATION2=Specifies whether or not the \
+ communication through the replication port of the second server is encrypted \
+ or not.  This option will only be taken into account the first time \
+ replication is configured on the second server.
 INFO_DESCRIPTION_ENABLE_REPLICATION_STARTTLS2=Use StartTLS to secure \
  communication with the second server
 INFO_DESCRIPTION_REPLICATION_BASEDNS=Specifies the Base DN of \
@@ -547,6 +556,8 @@
 INFO_REPLICATION_ENABLE_PORT1_PROMPT=LDAP port of the first server
 INFO_REPLICATION_ENABLE_REPLICATIONPORT1_PROMPT=Replication port for the first \
  server (the port must be free)
+INFO_REPLICATION_ENABLE_SECURE1_PROMPT=Use encrypted communication with \
+ replication port %s for 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_USESSL1_PROMPT=Use SSL to connect to the first server?
@@ -556,6 +567,8 @@
 INFO_REPLICATION_ENABLE_PORT2_PROMPT=LDAP port of the second server
 INFO_REPLICATION_ENABLE_REPLICATIONPORT2_PROMPT=Replication port for the \
  second server (the port must be free)
+INFO_REPLICATION_ENABLE_SECURE2_PROMPT=Use encrypted communication with \
+ replication port %s for 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_ENABLE_USESSL2_PROMPT=Use SSL to connect to the second server?
@@ -688,17 +701,27 @@
 INFO_REPLICATION_STATUS_IS_REPLICATED=Replication
 INFO_REPLICATION_STATUS_REPLICATED=%s - Replication Enabled
 INFO_REPLICATION_STATUS_NOT_REPLICATED=%s - Replication Disabled
-INFO_REPLICATION_STATUS_HEADER_SERVERPORT=Server:port
+INFO_REPLICATION_STATUS_HEADER_SERVERPORT=Server
 INFO_REPLICATION_STATUS_HEADER_NUMBER_ENTRIES=Entries
-INFO_REPLICATION_STATUS_HEADER_MISSING_CHANGES=Missing Changes (1)
+INFO_REPLICATION_STATUS_HEADER_MISSING_CHANGES=M.C. (1)
 INFO_REPLICATION_STATUS_HEADER_AGE_OF_OLDEST_MISSING_CHANGE=A.O.M.C. (2)
+INFO_REPLICATION_STATUS_HEADER_REPLICATION_PORT=Port (3)
+INFO_REPLICATION_STATUS_HEADER_SECURE=Security (4)
 INFO_REPLICATION_STATUS_REPLICATED_LEGEND=[1] The number of changes that are \
  still missing on this server (and that have been at least applied to one of \
  the other servers).%n[2] Age of oldest missing change: the age (in \
- seconds) of the oldest change that has not arrived to this server.
-INFO_REPLICATION_STATUS_LABEL_SERVERPORT=Server
-INFO_REPLICATION_STATUS_LABEL_NUMBER_ENTRIES=Entries
-INFO_REPLICATION_STATUS_LABEL_MISSING_CHANGES=Missing Changes
+ seconds) of the oldest change that has not arrived to this server.%n[3] The \
+ port used to communicate between the servers whose contents are being \
+ replicated.%n[4] Whether the replication communication through the \
+ replication port is encrypted or not.
+INFO_REPLICATION_STATUS_LABEL_SERVERPORT=Server:
+INFO_REPLICATION_STATUS_LABEL_NUMBER_ENTRIES=Entries:
+INFO_REPLICATION_STATUS_LABEL_MISSING_CHANGES=Missing Changes:
 INFO_REPLICATION_STATUS_LABEL_AGE_OF_OLDEST_MISSING_CHANGE=Age of oldest \
-missing change
+missing change:
+INFO_REPLICATION_STATUS_LABEL_REPLICATION_PORT=Replication Port:
+INFO_REPLICATION_STATUS_LABEL_SECURE=Security:
+INFO_REPLICATION_STATUS_SECURITY_ENABLED=Enabled
+INFO_REPLICATION_STATUS_SECURITY_DISABLED=Disabled
+
 

--
Gitblit v1.10.0