From ab876bef211de01506e59eba53ce6777f57cb5e2 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 13 Mar 2012 23:52:28 +0000
Subject: [PATCH] Fix OPENDJ-82: Improve dsreplication status script friendly mode

---
 opendj-sdk/opends/src/messages/messages/admin_tool.properties |   35 ++++++++++++++++-------------------
 1 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/opendj-sdk/opends/src/messages/messages/admin_tool.properties b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
index c25dc7c..cae1386 100644
--- a/opendj-sdk/opends/src/messages/messages/admin_tool.properties
+++ b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
@@ -22,6 +22,7 @@
 #
 #      Copyright 2006-2010 Sun Microsystems, Inc.
 #      Portions copyright 2011 ForgeRock AS.
+#      Portions copyright 2012 profiq s.r.o.
 
 
 
@@ -849,32 +850,30 @@
 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_SUFFIX_DN=Suffix DN
+INFO_REPLICATION_STATUS_HEADER_REPLICATION_ENABLED=Replication enabled
 INFO_REPLICATION_STATUS_HEADER_SERVERPORT=Server
 INFO_REPLICATION_STATUS_HEADER_NUMBER_ENTRIES=Entries
-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_RS_ID=RS ID
+INFO_REPLICATION_STATUS_HEADER_DS_ID=DS ID
+INFO_REPLICATION_STATUS_HEADER_MISSING_CHANGES=M.C. (2)
+INFO_REPLICATION_STATUS_HEADER_AGE_OF_OLDEST_MISSING_CHANGE=A.O.M.C. (3)
+INFO_REPLICATION_STATUS_HEADER_REPLICATION_PORT=RS Port (1)
 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 applied to at least one of \
- the other servers).%n[2] Age of oldest missing change: the date on which the \
- oldest change that has not arrived on this server was generated.%n[3] The \
+INFO_REPLICATION_STATUS_REPLICATED_LEGEND=[1] The \
  port used to communicate between the servers whose contents are being \
- replicated.%n[4] Whether the replication communication through the \
+ replicated.%n[2] The number of changes that are \
+ still missing on this server (and that have been applied to at least one of \
+ the other servers).%n[3] Age of oldest missing change: the date on which the \
+ oldest change that has not arrived on this server was generated.%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:
-INFO_REPLICATION_STATUS_LABEL_REPLICATION_PORT=Replication Port:
-INFO_REPLICATION_STATUS_LABEL_SECURE=Security:
 INFO_REPLICATION_STATUS_NOT_A_REPLICATION_SERVER_LEGEND=[5] Server not \
  configured as a replication server (no replication changelog).
 INFO_REPLICATION_STATUS_NOT_A_REPLICATION_DOMAIN_LEGEND=[6] Server does not \
  contain replicated data for the suffix.
-INFO_REPLICATION_STATUS_NOT_A_REPLICATION_SERVER_SHORT=-- (5)
-INFO_REPLICATION_STATUS_NOT_A_REPLICATION_DOMAIN_SHORT=-- (6)
+INFO_REPLICATION_STATUS_NOT_A_REPLICATION_SERVER_SHORT=(5)
+INFO_REPLICATION_STATUS_NOT_A_REPLICATION_DOMAIN_SHORT=(6)
 INFO_REPLICATION_STATUS_NOT_A_REPLICATION_SERVER_LONG=Server not configured as \
  a replication server (no changelog)
 INFO_REPLICATION_STATUS_NOT_A_REPLICATION_DOMAIN_LONG=Server does not contain \
@@ -895,8 +894,6 @@
  changelog) is required in the replication topology.  It is recommended to \
  have at least two replication servers (two changelogs) to avoid a single \
  point of failure in the replication topology.
-INFO_REPLICATION_STATUS_SECURITY_ENABLED=Enabled
-INFO_REPLICATION_STATUS_SECURITY_DISABLED=Disabled
 INFO_REPLICATION_CRITICAL_ERROR_DETAILS=Details: %s
 INFO_PROGRESS_PRE_EXTERNAL_INITIALIZATION=Preparing base DN %s to be \
  initialized externally

--
Gitblit v1.10.0