From 3dfb061cbafd3a97c9359f739942924a8ee525f1 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 02 Nov 2011 12:07:15 +0000
Subject: [PATCH] Fix for OPENDJ-222 : Renamed environment variables to OPENDJ_... Updated scripts so that if OPENDJ_JAVA_HOME and OPENDJ_JAVA_ARGS are not defined, we look at the legacy OPENDS_... ones.
---
opends/src/messages/messages/tools_zh_CN.properties | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opends/src/messages/messages/tools_zh_CN.properties b/opends/src/messages/messages/tools_zh_CN.properties
index 8c47368..5f6ee09 100644
--- a/opends/src/messages/messages/tools_zh_CN.properties
+++ b/opends/src/messages/messages/tools_zh_CN.properties
@@ -21,6 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
+# Portions Copyright 2011 ForgeRock AS
@@ -1002,7 +1003,7 @@
INFO_CREATERC_USER_DESCRIPTION_1375=\u8fd0\u884c\u670d\u52a1\u5668\u65f6\u5e94\u4f7f\u7528\u7684\u7528\u6237\u5e10\u6237\u540d\u79f0
INFO_CREATERC_JAVA_HOME_DESCRIPTION_1376=\u8fd0\u884c\u670d\u52a1\u5668\u65f6\u5e94\u4f7f\u7528\u7684 Java \u5b89\u88c5\u8def\u5f84
INFO_CREATERC_JAVA_ARGS_DESCRIPTION_1377=\u8fd0\u884c\u670d\u52a1\u5668\u65f6\u5e94\u4f20\u9012\u7ed9 JVM \u7684\u4e00\u7ec4\u53c2\u6570
-SEVERE_ERR_CREATERC_JAVA_HOME_DOESNT_EXIST_1378=\u6307\u5b9a\u4e3a OPENDS_JAVA_HOME \u8def\u5f84\u7684\u76ee\u5f55 %s \u4e0d\u5b58\u5728\u6216\u5e76\u975e\u76ee\u5f55
+SEVERE_ERR_CREATERC_JAVA_HOME_DOESNT_EXIST_1378=\u6307\u5b9a\u4e3a OPENDJ_JAVA_HOME \u8def\u5f84\u7684\u76ee\u5f55 %s \u4e0d\u5b58\u5728\u6216\u5e76\u975e\u76ee\u5f55
INFO_INSTALLDS_STATUS_COMMAND_LINE_1379=\u8981\u67e5\u770b\u57fa\u672c\u670d\u52a1\u5668\u914d\u7f6e\u72b6\u6001\u548c\u914d\u7f6e\uff0c\u60a8\u53ef\u4ee5\u542f\u52a8 %s
INFO_INSTALLDS_PROMPT_ENABLE_SSL_1380=\u662f\u5426\u8981\u542f\u7528 SSL\uff1f
INFO_INSTALLDS_PROMPT_LDAPSPORT_1381=\u60a8\u5e0c\u671b\u76ee\u5f55\u670d\u52a1\u5668\u4f7f\u7528\u54ea\u4e2a\u7aef\u53e3\u63a5\u53d7\u6765\u81ea LDAPS \u5ba2\u6237\u7aef\u7684\u8fde\u63a5\uff1f
@@ -1366,6 +1367,6 @@
INFO_TIMEOUT_PLACEHOLDER_1711={timeout}
INFO_DESCRIPTION_CONNECTION_TIMEOUT_1712=\u5efa\u7acb\u8fde\u63a5\u6240\u80fd\u5360\u7528\u7684\u6700\u5927\u65f6\u95f4\u957f\u5ea6\uff08\u4ee5\u6beb\u79d2\u4e3a\u5355\u4f4d\uff09
MILD_ERR_MAKELDIF_CANNOT_WRITE_ENTRY_WITHOUT_DN_1713=\u5c1d\u8bd5\u5411 LDIF \u5199\u5165\u6761\u76ee\u65f6\u51fa\u73b0\u9519\u8bef\uff1a\u65e0\u6cd5\u8ba1\u7b97\u6761\u76ee\u7684 DN\uff08\u627e\u4e0d\u5230 RDN \u5c5e\u6027 %s \u7684\u503c\uff09
-SEVERE_ERR_CLIENT_SIDE_TIMEOUT_1714=\u51fa\u73b0\u5ba2\u6237\u7aef\u8d85\u65f6\u3002%n\u5176\u4ed6\u4fe1\u606f: %s
+SEVERE_ERR_CLIENT_SIDE_TIMEOUT_1714=\u51fa\u73b0\u5ba2\u6237\u7aef\u8d85\u65f6\u3002%n\u5176\u4ed6\u4fe1\u606f: %s
INFO_LABEL_DBTEST_INDEX_UNDEFINED_RECORD_COUNT_1715=\u672a\u5b9a\u4e49
--
Gitblit v1.10.0