From 88153a926cb3e096a7e681119e585a5c55ca1d68 Mon Sep 17 00:00:00 2001
From: shankar_mbn <shankar_mbn@localhost>
Date: Mon, 30 Mar 2009 06:21:19 +0000
Subject: [PATCH] OpenDS precommit Fixes:  Addition of Localized resource files with new translations

---
 opends/src/messages/messages/quicksetup_zh_TW.properties |   59 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/opends/src/messages/messages/quicksetup_zh_TW.properties b/opends/src/messages/messages/quicksetup_zh_TW.properties
index c376670..80a5313 100644
--- a/opends/src/messages/messages/quicksetup_zh_TW.properties
+++ b/opends/src/messages/messages/quicksetup_zh_TW.properties
@@ -20,7 +20,7 @@
 #
 # CDDL HEADER END
 #
-#      Copyright 2006-2008 Sun Microsystems, Inc.
+#      Copyright 2006-2009 Sun Microsystems, Inc.
 
 
 
@@ -78,6 +78,7 @@
 INFO_CANNOT_CONNECT_TO_SHUTDOWN_WITHOUT_CAUSE=\u7121\u6cd5\u4f7f\u7528\u63d0\u4f9b\u7684\u6191\u8b49\u9023\u7dda\u81f3\u76ee\u9304\u4f3a\u670d\u5668\u3002%n\u8acb\u6aa2\u67e5\u7ba1\u7406\u4f7f\u7528\u8005 DN \u548c\u5bc6\u78bc\u662f\u5426\u6709\u6548\u3002
 INFO_CANNOT_UPDATE_SECURITY_WARNING=\u5df2\u505c\u7528\u3002\u627e\u4e0d\u5230\u6709\u6548\u7684 keytool \u6307\u4ee4\u3002
 INFO_CANNOT_USE_DEFAULT_PORT=\u7121\u6cd5\u4f7f\u7528 389\u3002\u9023\u63a5\u57e0\u5df2\u5728\u4f7f\u7528\u4e2d\uff0c\u6216\u4f7f\u7528\u8005\u672a\u7372\u6388\u6b0a\u3002
+INFO_CANNOT_USE_DEFAULT_ADMIN_CONNECTOR_PORT=Could not use 4444. \u9023\u63a5\u57e0\u5df2\u5728\u4f7f\u7528\u4e2d\uff0c\u6216\u4f7f\u7528\u8005\u672a\u7372\u6388\u6b0a\u3002
 INFO_CANNOT_USE_DEFAULT_SECURE_PORT=\u7121\u6cd5\u4f7f\u7528 636\u3002\u9023\u63a5\u57e0\u5df2\u5728\u4f7f\u7528\u4e2d\uff0c\u6216\u4f7f\u7528\u8005\u672a\u7372\u6388\u6b0a\u3002
 INFO_CERTIFICATE_CHAIN_COMBO_TOOLTIP=\u82e5\u8981\u6aa2\u8996\u6307\u5b9a\u6191\u8b49\u7684\u8a73\u7d30\u8cc7\u8a0a\uff0c\u8acb\u52a0\u4ee5\u9078\u53d6\u3002
 INFO_CERTIFICATE_CHAIN_LABEL=\u6191\u8b49\u93c8:
@@ -134,7 +135,7 @@
 INFO_CONTACTING_SERVER_LABEL=\u6b63\u5728\u9023\u7d61\u4f3a\u670d\u5668...
 INFO_CONTINUE_BUTTON_INSTALL_TOOLTIP=\u7e7c\u7e8c\u8a2d\u5b9a
 INFO_CONTINUE_BUTTON_LABEL=\u7e7c\u7e8c
-INFO_COULD_NOT_LAUNCH_STATUS_PANEL_MSG=\u555f\u52d5\u72c0\u614b\u9762\u677f\u6642\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4\u3002
+INFO_COULD_NOT_LAUNCH_CONTROL_PANEL_MSG=An unexpected error occurred launching the Control Panel.
 INFO_CREATE_BASE_ENTRY_LABEL=\u50c5\u5efa\u7acb\u57fa\u5e95\u9805\u76ee (%s)
 INFO_CREATE_BASE_ENTRY_TOOLTIP=\u50c5\u70ba\u76ee\u9304\u57fa\u5e95 DN \u5efa\u7acb\u9802\u5c64\u9805\u76ee
 INFO_CREATE_GLOBAL_ADMINISTRATOR_STEP=\u5168\u57df\u7ba1\u7406\u54e1
@@ -185,7 +186,7 @@
 INFO_EMPTY_REMOTE_DN=\u60a8\u5fc5\u9808\u63d0\u4f9b\u7ba1\u7406\u4f7f\u7528\u8005\u7684\u503c\u3002
 INFO_EMPTY_REMOTE_HOST=\u60a8\u5fc5\u9808\u63d0\u4f9b\u5b8c\u5168\u5408\u683c\u7684\u4e3b\u6a5f\u540d\u7a31\u3002
 INFO_EMPTY_REMOTE_PWD=\u60a8\u5fc5\u9808\u63d0\u4f9b\u7ba1\u7406\u4f7f\u7528\u8005\u5bc6\u78bc\u3002
-INFO_EMPTY_SERVER_LOCATION=\u9078\u53d6\u7684\u76ee\u9304\u7121\u6548\u3002\u60a8\u5fc5\u9808\u63d0\u4f9b\u6709\u6548\u7684 OpenDS \u6839\u5b89\u88dd\u76ee\u9304\u3002
+INFO_EMPTY_SERVER_LOCATION=Invalid Directory Selected.  You must provide a valid OpenDS root installation directory.
 INFO_ENABLE_SSL=\u5728 LDAP \u9023\u63a5\u57e0 %s \u4e0a\u555f\u7528 SSL
 INFO_ENABLE_SSL_LABEL=\u5728\u9023\u63a5\u57e0\u4e0a\u555f\u7528 SSL:
 INFO_ENABLE_SSL_TOOLTIP=\u5728\u6307\u5b9a\u7684\u9023\u63a5\u57e0\u4e0a\u555f\u7528 SSL\u3002
@@ -196,6 +197,7 @@
 INFO_ENABLE_WINDOWS_SERVICE_TOOLTIP=\u82e5\u8981\u8b93 OpenDS \u4ee5 Windows \u670d\u52d9\u7684\u5f62\u5f0f\u57f7\u884c\uff0c\u8acb\u9078\u53d6\u6b64\u6838\u53d6\u65b9\u584a\u3002
 INFO_EQUAL_PORTS=\u60a8\u5fc5\u9808\u70ba LDAP \u8207 LDAPS \u901a\u8a0a\u6307\u5b9a\u4e0d\u540c\u7684\u9023\u63a5\u57e0\u3002
 INFO_ERROR_ACCESSING_JKS_KEYSTORE=\u7121\u6cd5\u5b58\u53d6 JKS \u91d1\u9470\u5eab\u3002\u6aa2\u67e5\u6a94\u6848\u5167\u5bb9\u662f\u5426\u5c0d\u61c9\u65bc\u6709\u6548\u7684 JKS \u91d1\u9470\u5eab\u3001\u60a8\u662f\u5426\u6709\u8a72\u91d1\u9470\u5eab\u7684\u5b58\u53d6\u6b0a\u9650\u3001\u4ee5\u53ca\u63d0\u4f9b\u7684 PIN \u662f\u5426\u6709\u6548\u3002
+INFO_ERROR_ACCESSING_JCEKS_KEYSTORE=Could not access the JCEKS key store.  Check that the running Java installation supports JCEKS, that the contents of the file correspond to a valid JCEKS key store, that you have access rights to it and that the provided PIN is valid.
 INFO_ERROR_ACCESSING_PKCS11_KEYSTORE=\u7121\u6cd5\u5b58\u53d6 PKCS#11 \u91d1\u9470\u5eab\u3002\u6aa2\u67e5\u662f\u5426\u5df2\u5b89\u88dd\uff0c\u4ee5\u53ca\u63d0\u4f9b\u7684 PIN \u662f\u5426\u6709\u6548\u3002
 INFO_ERROR_ACCESSING_PKCS12_KEYSTORE=\u7121\u6cd5\u5b58\u53d6 PKCS#12 \u91d1\u9470\u5eab\u3002\u6aa2\u67e5\u6a94\u6848\u5167\u5bb9\u662f\u5426\u5c0d\u61c9\u65bc\u6709\u6548\u7684 PKCS#12 \u91d1\u9470\u5eab\u3001\u60a8\u662f\u5426\u6709\u8a72\u91d1\u9470\u5eab\u7684\u5b58\u53d6\u6b0a\u9650\u3001\u4ee5\u53ca\u63d0\u4f9b\u7684 PIN \u662f\u5426\u6709\u6548\u3002
 INFO_ERROR_NO_KEYSTORE_PASSWORD=\u60a8\u5fc5\u9808\u63d0\u4f9b\u91d1\u9470\u5eab\u7684 PIN\uff0c\u624d\u80fd\u64f7\u53d6\u4f3a\u670d\u5668\u6240\u8981\u4f7f\u7528\u7684\u6191\u8b49\u3002
@@ -240,7 +242,7 @@
 INFO_ERROR_DISABLING_WINDOWS_SERVICE=\u505c\u7528 Windows \u670d\u52d9\u6642\u767c\u751f\u932f\u8aa4\u3002\u5617\u8a66\u7d50\u675f\u8655\u7406\u7a0b\u5e8f opends_service.exe \u4e26\u57f7\u884c %s\bat\windows-service.bat -d \u6307\u4ee4\u884c\uff0c\u4ee5\u624b\u52d5\u505c\u7528\u670d\u52d9\u3002
 INFO_ERROR_DURING_INITIALIZATION_LOG=\u4ee5\u4f3a\u670d\u5668 %s \u4e2d\u7684\u5167\u5bb9\u9032\u884c\u521d\u59cb\u5316\u671f\u9593\u767c\u751f\u932f\u8aa4\u3002\u6700\u65b0\u7684\u8a18\u9304\u8a73\u7d30\u8cc7\u8a0a: %s\u3002\u4f5c\u696d\u72c0\u614b: %s\u3002\u5982\u9700\u66f4\u591a\u8cc7\u8a0a\uff0c\u8acb\u6aa2\u67e5 %s \u7684\u932f\u8aa4\u8a18\u9304\u3002
 INFO_ERROR_DURING_INITIALIZATION_NO_LOG=\u4ee5\u4f3a\u670d\u5668 %s \u4e2d\u7684\u5167\u5bb9\u9032\u884c\u521d\u59cb\u5316\u671f\u9593\u767c\u751f\u932f\u8aa4\u3002\u4f5c\u696d\u72c0\u614b: %s\u3002\u5982\u9700\u66f4\u591a\u8cc7\u8a0a\uff0c\u8acb\u6aa2\u67e5 %s \u7684\u932f\u8aa4\u8a18\u9304\u3002
-INFO_ERROR_EMPTY_RESPONSE=\u932f\u8aa4: \u56de\u61c9\u503c\u4e0d\u53ef\u70ba\u7a7a\u5b57\u4e32
+INFO_ERROR_EMPTY_RESPONSE=\u932f\u8aa4\uff1a\u56de\u61c9\u503c\u4e0d\u53ef\u70ba\u7a7a\u5b57\u4e32
 INFO_ERROR_ENABLING_WINDOWS_SERVICE=\u555f\u7528 Windows \u670d\u52d9\u6642\u767c\u751f\u932f\u8aa4\u3002
 INFO_ERROR_FAILED_MOVING_FILE=\u7121\u6cd5\u5c07\u6a94\u6848 %s \u79fb\u81f3 %s\u3002\u8acb\u78ba\u5b9a\u76ee\u524d\u6c92\u6709\u5176\u4ed6\u61c9\u7528\u7a0b\u5f0f\u9396\u5b9a\u6b64\u6a94\u6848\u3002
 INFO_ERROR_FAILED_TO_CREATE_STAGE_DIRECTORY=\u7121\u6cd5\u5efa\u7acb\u5206\u6bb5\u76ee\u9304 %s\u3002
@@ -253,7 +255,7 @@
 INFO_ERROR_IMPORTING_LDIF=\u532f\u5165 LDIF \u6a94\u6848\u6642\u767c\u751f\u932f\u8aa4\u3002
 INFO_ERROR_INITIALIZING_LOG=\u521d\u59cb\u5316\u8a18\u9304\u6642\u767c\u751f\u932f\u8aa4\u3002
 INFO_ERROR_INITIALIZING_UPGRADE=\u521d\u59cb\u5316\u5347\u7d1a\u6642\u767c\u751f\u932f\u8aa4\u3002
-INFO_ERROR_INSTALL_ROOT_DIR_EMPTY=\u76ee\u9304 %s \u70ba\u7a7a\uff0c\u6216\u60a8\u6c92\u6709\u6b0a\u9650\u53ef\u5b58\u53d6\u5176\u5167\u5bb9\u3002
+INFO_ERROR_INSTALL_ROOT_DIR_EMPTY=Directory %s is either empty or you lack permissions to access its contents.
 INFO_ERROR_INSTALL_ROOT_DIR_NO_DIR=\u76ee\u9304 %s \u4e0d\u5305\u542b\u76ee\u9304 %s\u3002
 INFO_ERROR_INSTALL_ROOT_DIR_NO_EXIST=\u76ee\u9304 %s \u4e0d\u5b58\u5728\u3002
 INFO_ERROR_INSTALL_ROOT_DIR_NOT_DIR=\u6a94\u6848 %s \u4e0d\u662f OpenDS \u5b89\u88dd\u6839\u76ee\u9304\u3002
@@ -332,7 +334,7 @@
 INFO_GENERAL_LOADING=\u6b63\u5728\u8f09\u5165...
 INFO_GENERAL_NONE=\u7121
 INFO_GENERAL_SEE_FOR_DETAILS=\u5982\u9700\u6b64\u4f5c\u696d\u7684\u8a73\u7d30\u8a18\u9304\uff0c\u8acb\u53c3\u95b1 %s\u3002
-INFO_GENERAL_SEE_FOR_HISTORY=\u5982\u9700\u5b89\u88dd\u6b77\u7a0b\u8a18\u9304\uff0c\u8acb\u53c3\u95b1 %s\u3002
+INFO_GENERAL_SEE_FOR_HISTORY=See %s for a detailed installation history.
 INFO_GENERAL_SERVER_STARTED=\u5df2\u555f\u52d5
 INFO_GENERAL_SERVER_STOPPED=\u5df2\u505c\u6b62
 INFO_GENERAL_UNKNOWN=\u4e0d\u660e
@@ -403,6 +405,10 @@
 INFO_JKS_CERTIFICATE_LABEL=Java \u91d1\u9470\u5eab (JKS) \u6a94\u6848
 INFO_JKS_CERTIFICATE_TOOLTIP=\u82e5\u60a8\u5177\u6709 JKS \u6191\u8b49\uff0c\u8acb\u9078\u53d6\u6b64\u9078\u9805\u3002
 INFO_JKS_KEYSTORE_DOES_NOT_EXIST=\u627e\u4e0d\u5230 Java \u91d1\u9470\u5eab\u7684\u6191\u8b49\u3002\u8acb\u6aa2\u67e5\u63d0\u4f9b\u7684\u8def\u5f91\u662f\u5426\u6709\u6548\u3002
+INFO_JCEKS_CERTIFICATE=Use existing JCEKS File
+INFO_JCEKS_CERTIFICATE_LABEL=JCEKS File
+INFO_JCEKS_CERTIFICATE_TOOLTIP=Select this option if you have a JCEKS certificate.
+INFO_JCEKS_KEYSTORE_DOES_NOT_EXIST=\u627e\u4e0d\u5230 Java \u91d1\u9470\u5eab\u7684\u6191\u8b49\u3002\u8acb\u6aa2\u67e5\u63d0\u4f9b\u7684\u8def\u5f91\u662f\u5426\u6709\u6548\u3002
 INFO_KEYSTORE_PATH_DOES_NOT_EXIST=\u63d0\u4f9b\u7684\u91d1\u9470\u5eab\u8def\u5f91\u4e0d\u5b58\u5728\u3002
 INFO_KEYSTORE_PATH_LABEL=\u91d1\u9470\u5eab\u8def\u5f91:
 INFO_KEYSTORE_PATH_NOT_A_FILE=\u63d0\u4f9b\u7684\u91d1\u9470\u5eab\u8def\u5f91\u4e0d\u662f\u6a94\u6848\u3002
@@ -444,9 +450,6 @@
 INFO_OPEN_LDIF_FILE_DIALOG_TITLE=\u9078\u64c7 LDIF \u6a94\u6848
 INFO_OPEN_SERVER_LOCATION_DIALOG_TITLE=\u9078\u64c7\u5b89\u88dd\u8def\u5f91
 INFO_OPEN_ZIP_FILE_DIALOG_TITLE=\u9078\u64c7 OpenDS \u5b89\u88dd\u5957\u4ef6 (.zip)
-# Only translate if the image is specific to the local
-INFO_OPENDS_SMALL_ICON=images/opends_logo_small.png
-INFO_OPENDS_SMALL_ICON_DESCRIPTION=OpenDS \u5716\u793a\u3002
 # Only translate if the color is specific to the local
 INFO_OPTIONPANE_BACKGROUND_COLOR=255,255,255
 INFO_ORACLE_ACTION_PROMPT=\u60a8\u662f\u5426\u5df2\u57f7\u884c\u8aaa\u660e\u7684\u4f5c\u696d\uff1f
@@ -483,6 +486,7 @@
 INFO_PROGRESS_COLOR=000,000,000
 INFO_PROGRESS_CONFIGURING=\u6b63\u5728\u914d\u7f6e\u76ee\u9304\u4f3a\u670d\u5668
 INFO_PROGRESS_CONFIGURING_REPLICATION=\u6b63\u5728\u914d\u7f6e\u8907\u88fd
+INFO_PROGRESS_CREATING_REPLICATED_BACKENDS=Creating Replicated Base DNs
 INFO_PROGRESS_CONFIGURING_REPLICATION_REMOTE=\u6b63\u5728\u914d\u7f6e %s \u4e0a\u7684\u8907\u88fd
 INFO_WARNING_SERVERS_CLOCK_DIFFERENCE=\u4f3a\u670d\u5668 %s \u8207 %s \u7684\u6642\u9418\u4e4b\u9593\u6709 %s \u5206\u9418\u4ee5\u4e0a\u7684\u6642\u5dee\u3002\u57f7\u884c\u8907\u88fd\u6642\uff0c\u6642\u9418\u4e0d\u9700\u540c\u6b65\u5316\uff0c\u4f46\u5728\u76e3\u8996\u4f3a\u670d\u5668\u9593\u7684\u8907\u88fd\u66f4\u65b0\u6642\u53ef\u80fd\u6703\u5f88\u56f0\u96e3\u3002
 INFO_PROGRESS_COPYING_FILE=\u6b63\u5728\u5c07\u6a94\u6848 %s \u8907\u88fd\u5230 %s
@@ -548,10 +552,8 @@
 INFO_REMOTE_SERVER_DN_TOOLTIP=\u60a8\u8981\u7528\u4ee5\u8907\u88fd\u8cc7\u6599\u4e4b OpenDS \u4e2d\u7684\u7ba1\u7406\u54e1 DN \u6216 UID\u3002
 INFO_REMOTE_SERVER_HOST_LABEL=\u4e3b\u6a5f\u540d\u7a31:
 INFO_REMOTE_SERVER_HOST_TOOLTIP=\u60a8\u8981\u7528\u4ee5\u8907\u88fd\u8cc7\u6599\u4e4b OpenDS \u6240\u5728\u4e3b\u6a5f\u7684\u5b8c\u5168\u5408\u683c\u540d\u7a31\u3002
-INFO_REMOTE_SERVER_PORT_IS_SECURE_LABEL=\u6b64\u70ba\u5b89\u5168\u9023\u63a5\u57e0
-INFO_REMOTE_SERVER_PORT_IS_SECURE_TOOLTIP=\u6aa2\u67e5\u9019\u500b\u63d0\u4f9b\u7684\u9023\u63a5\u57e0\u662f\u5426\u70ba LDAPS \u9023\u63a5\u57e0\u3002
-INFO_REMOTE_SERVER_PORT_LABEL=\u9023\u63a5\u57e0:
-INFO_REMOTE_SERVER_PORT_TOOLTIP=\u60a8\u8981\u7528\u4ee5\u8907\u88fd\u8cc7\u6599\u4e4b OpenDS \u7684 LDAP \u9023\u63a5\u57e0\u3002
+INFO_REMOTE_SERVER_PORT_LABEL=Administration Connector Port:
+INFO_REMOTE_SERVER_PORT_TOOLTIP=The administration connector port of the OpenDS you want to replicate data with.
 INFO_REMOTE_SERVER_PWD_LABEL=\u7ba1\u7406\u5bc6\u78bc:
 INFO_REMOTE_SERVER_PWD_TOOLTIP=\u60a8\u8981\u7528\u4ee5\u8907\u88fd\u8cc7\u6599\u4e4b OpenDS \u4e2d\u7684\u7ba1\u7406\u54e1\u5bc6\u78bc\u3002
 INFO_REMOTE_SERVER_REPLICATION_PORT=%s - \u8981\u5728\u9060\u7aef\u4f3a\u670d\u5668 %s \u4e0a\u914d\u7f6e
@@ -565,7 +567,7 @@
 INFO_RETRY_BUTTON_LABEL=\u91cd\u8a66
 INFO_REVERSION_CANCELED=\u5fa9\u539f\u5df2\u53d6\u6d88\u3002
 INFO_REVERSION_ORACLE_EI_ACTION=\u82e5\u8981\u5f9e\u7248\u672c %s \u5fa9\u539f\u70ba\u7248\u672c %s\uff0c\u5fc5\u9808\u57f7\u884c\u9032\u4e00\u6b65\u7684\u52d5\u4f5c\u3002
-INFO_REVERSION_ORACLE_FAILURE=\u4e0d\u652f\u63f4\u5f9e\u7248\u672c %s \u5fa9\u539f\u70ba\u7248\u672c %s \u7684\u4f5c\u696d\u3002\u82e5\u8981\u9032\u884c\u5fa9\u539f\uff0c\u60a8\u5fc5\u9808\u89e3\u9664\u5b89\u88dd\u76ee\u524d\u7684\u4f3a\u670d\u5668\u3001\u5b89\u88dd\u65b0\u7684\u4f3a\u670d\u5668\uff0c\u7136\u5f8c\u624b\u52d5\u9077\u79fb\u60a8\u7684\u8cc7\u6599\u3002
+INFO_REVERSION_ORACLE_FAILURE=Reversion from version %s to version %s is not supported.  To revert you must uninstall the current server, install the new server, and manually migrate your data.
 INFO_REVERSION_ORACLE_SUCCESS=\u652f\u63f4\u5f9e\u7248\u672c %s \u5fa9\u539f\u70ba\u7248\u672c %s \u7684\u4f5c\u696d\u3002
 INFO_REVERT_ERROR_EMPTY_HISTORY_DIR=\u5148\u524d\u7684\u5347\u7d1a\u672a\u7522\u751f\u73fe\u6709\u5099\u4efd\u4f4d\u7f6e\u3002\u300c\u6b77\u7a0b\u8a18\u9304\u300d\u76ee\u9304\u662f\u7a7a\u7684\u3002
 INFO_REVERT_ERROR_INVALID_HISTORY_DIR=\u5148\u524d\u7684\u5347\u7d1a\u672a\u7522\u751f\u6709\u6548\u7684\u73fe\u6709\u5099\u4efd\u4f4d\u7f6e\u3002
@@ -611,6 +613,8 @@
 INFO_SERVER_NOT_RUNNING_TITLE=\u76ee\u9304\u4f3a\u670d\u5668\u76ee\u524d\u672a\u57f7\u884c
 INFO_SERVER_PORT_LABEL=LDAP \u5075\u807d\u7a0b\u5f0f\u9023\u63a5\u57e0:
 INFO_SERVER_PORT_TOOLTIP=\u8f38\u5165\u4f3a\u670d\u5668\u5c07\u7528\u4ee5\u5075\u807d LDAP \u8acb\u6c42\u7684\u9023\u63a5\u57e0\u865f\u78bc
+INFO_ADMIN_CONNECTOR_PORT_LABEL=Administration Connector Port:
+INFO_ADMIN_CONNECTOR_PORT_TOOLTIP=Enter the port number that the administration connector will use.
 INFO_SERVER_SECURITY_BUTTON_LABEL=\u914d\u7f6e...
 INFO_SERVER_SECURITY_BUTTON_TOOLTIP=\u6309\u4e00\u4e0b\u4ee5\u914d\u7f6e LDAP \u5b89\u5168\u5b58\u53d6\u3002
 INFO_SERVER_SECURITY_LABEL=LDAP \u5b89\u5168\u5b58\u53d6:
@@ -674,8 +678,8 @@
 INFO_SUMMARY_IMPORTING_LDIF=\u6b63\u5728\u532f\u5165 LDIF \u6a94\u6848...
 INFO_SUMMARY_INITIALIZE_REPLICATED_SUFFIXES=\u6b63\u5728\u521d\u59cb\u5316\u8907\u88fd\u57fa\u5e95 DN \u7684\u5167\u5bb9...
 INFO_SUMMARY_INSTALL_FINISHED_CANCELED=<b>OpenDS QuickSetup \u5df2\u53d6\u6d88\u3002</b> <br>\u8a2d\u5b9a\u5df2\u53d6\u6d88\uff0c\u5728\u6b64\u4f5c\u696d\u671f\u9593\u5b89\u88dd\u65bc\u7cfb\u7d71\u4e0a\u7684\u4efb\u4f55\u6a94\u6848\u7686\u5df2\u79fb\u9664\u3002
-INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY=<b>\u5df2\u6210\u529f\u5b8c\u6210 OpenDS QuickSetup\u3002</b><br>OpenDS \u73fe\u5df2\u5b89\u88dd\u65bc %s \u4e2d\u3002<br>\u4f3a\u670d\u5668\u70ba %s\u3002<br><br>\u5982\u9700\u4f3a\u670d\u5668\u7ba1\u7406\u8207\u914d\u7f6e\u7684\u7c21\u4ecb\uff0c\u8acb\u700f\u89bd <a href="https://www.opends.org/wiki/page/QuickReferenceGuide">OpenDS \u5feb\u901f\u53c3\u8003</a>\u9801\u9762\u3002<br>\u82e5\u8981\u6aa2\u8996\u57fa\u672c\u7684\u4f3a\u670d\u5668\u914d\u7f6e\u72c0\u614b\uff0c\u4ee5\u53ca\u555f\u52d5/\u505c\u6b62\u4f3a\u670d\u5668\uff0c\u8acb\u6309\u4e00\u4e0b\u3010\u555f\u52d5\u72c0\u614b\u9762\u677f\u3011\u3002\u8acb\u6ce8\u610f\uff0c\u60a8\u53ef\u4ee5\u5728\u7a0d\u5f8c\u4f7f\u7528 %s \u555f\u52d5\u6b64\u5de5\u5177\u3002<br><INPUT type="submit" value="Launch Status Panel"></INPUT>
-INFO_SUMMARY_INSTALL_FINISHED_WITH_ERROR=\u767c\u751f\u932f\u8aa4\u3002\u5982\u9700\u66f4\u591a\u8cc7\u8a0a\uff0c\u8acb\u6aa2\u67e5\u300c\u8a73\u7d30\u8cc7\u8a0a\u300d\u6587\u5b57\u5340\u3002<br>\u4f3a\u670d\u5668\u70ba %s\u3002<br>\u82e5\u8981\u6aa2\u8996\u57fa\u672c\u7684\u4f3a\u670d\u5668\u914d\u7f6e\u72c0\u614b\uff0c\u8acb\u6309\u4e00\u4e0b\u3010\u555f\u52d5\u72c0\u614b\u9762\u677f\u3011\u3002\u8acb\u6ce8\u610f\uff0c\u60a8\u53ef\u4ee5\u5728\u7a0d\u5f8c\u4f7f\u7528 %s \u555f\u52d5\u6b64\u5de5\u5177\u3002<br><INPUT type="submit" value="Launch Status Panel"></INPUT>
+INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY=<b>\u5df2\u6210\u529f\u5b8c\u6210 OpenDS QuickSetup\u3002</b><br>OpenDS \u73fe\u5df2\u5b89\u88dd\u65bc %s \u4e2d\u3002<br>\u4f3a\u670d\u5668\u70ba %s\u3002<br><br>\u5982\u9700\u4f3a\u670d\u5668\u7ba1\u7406\u8207\u914d\u7f6e\u7684\u7c21\u4ecb\uff0c\u8acb\u700f\u89bd <a href="https://www.opends.org/wiki/page/QuickReferenceGuide">OpenDS \u5feb\u901f\u53c3\u8003</a>\u9801\u9762\u3002<br>To see server configuration status and to perform some basic administration tasks on the server, click Launch Control Panel.  Note that you can launch this tool later using %s.<br><INPUT type="submit" value="Launch Control Panel"></INPUT>
+INFO_SUMMARY_INSTALL_FINISHED_WITH_ERROR=\u767c\u751f\u932f\u8aa4\u3002\u5982\u9700\u66f4\u591a\u8cc7\u8a0a\uff0c\u8acb\u6aa2\u67e5\u300c\u8a73\u7d30\u8cc7\u8a0a\u300d\u6587\u5b57\u5340\u3002<br>The server is %s.<br>To see basic server configuration status and to perfrom some basic administration tasks on the server, click Launch Control Panel.  Note that you can launch this tool later using %s.<br><INPUT type="submit" value="Launch Control Panel"></INPUT>
 INFO_SUMMARY_INSTALL_NOT_STARTED=\u6b63\u5728\u555f\u52d5 QuickSetup...
 INFO_SUMMARY_REVERT_ABORT=\u6b63\u5728\u53d6\u6d88\u5fa9\u539f...
 INFO_SUMMARY_REVERT_CLEANUP=\u6b63\u5728\u6e05\u9664...
@@ -711,13 +715,13 @@
 INFO_SUMMARY_UPGRADE_CLEANUP=\u6b63\u5728\u6e05\u9664...
 INFO_SUMMARY_UPGRADE_DOWNLOADING=\u6b63\u5728\u4e0b\u8f09\u5efa\u7f6e...
 INFO_SUMMARY_UPGRADE_EXTRACTING=\u6b63\u5728\u64f7\u53d6\u5efa\u7f6e...
-INFO_SUMMARY_UPGRADE_FINISHED_CANCELED=<b>OpenDS QuickUpgrade \u5df2\u53d6\u6d88\u3002</b> <br>\u5347\u7d1a\u4f5c\u696d\u5df2\u53d6\u6d88\uff0c\u4e14\u5b89\u88dd\u5df2\u9084\u539f\u70ba\u5347\u7d1a\u4f5c\u696d\u4e4b\u524d\u7684\u72c0\u614b\u3002<br><br><INPUT type="submit" value="Launch Status Panel"></INPUT>
+INFO_SUMMARY_UPGRADE_FINISHED_CANCELED=<b>OpenDS QuickUpgrade \u5df2\u53d6\u6d88\u3002</b> <br>\u5347\u7d1a\u4f5c\u696d\u5df2\u53d6\u6d88\uff0c\u4e14\u5b89\u88dd\u5df2\u9084\u539f\u70ba\u5347\u7d1a\u4f5c\u696d\u4e4b\u524d\u7684\u72c0\u614b\u3002<br><br><INPUT type="submit" value="Launch Control Panel"></INPUT>
 INFO_SUMMARY_UPGRADE_FINISHED_CANCELED_CLI=OpenDS QuickUpgrade \u5df2\u53d6\u6d88\u3002\u5347\u7d1a\u4f5c\u696d\u5df2\u53d6\u6d88\uff0c\u4e14\u5b89\u88dd\u5df2\u9084\u539f\u70ba\u5347\u7d1a\u4f5c\u696d\u4e4b\u524d\u7684\u72c0\u614b\u3002
-INFO_SUMMARY_UPGRADE_FINISHED_SUCCESSFULLY=<b>\u5df2\u6210\u529f\u5b8c\u6210 OpenDS QuickUpgrade\u3002</b><br>%s \u4e0a\u7684 OpenDS \u5b89\u88dd\u73fe\u5df2\u5347\u7d1a\u70ba\u7248\u672c %s\u3002<br><br><INPUT type="submit" value="Launch Status Panel"></INPUT>
+INFO_SUMMARY_UPGRADE_FINISHED_SUCCESSFULLY=<b>\u5df2\u6210\u529f\u5b8c\u6210 OpenDS QuickUpgrade\u3002</b><br>The OpenDS installation at %s has now been upgraded to version %s.<br><br><INPUT type="submit" value="Launch Control Panel"></INPUT>
 INFO_SUMMARY_UPGRADE_FINISHED_SUCCESSFULLY_CLI=\u5df2\u6210\u529f\u5b8c\u6210 OpenDS QuickUpgrade\u3002%s \u4e0a\u7684 OpenDS \u5b89\u88dd\u73fe\u5df2\u5347\u7d1a\u70ba\u7248\u672c %s\u3002
-INFO_SUMMARY_UPGRADE_FINISHED_WITH_ERRORS=<b>OpenDS QuickUpgrade \u5931\u6557</b><br>\u5347\u7d1a\u4f5c\u696d\u56e0\u932f\u8aa4\u800c\u7121\u6cd5\u6210\u529f\u5b8c\u6210\uff0c\u4e14\u5b89\u88dd\u5df2\u9084\u539f\u70ba\u5347\u7d1a\u4f5c\u696d\u4e4b\u524d\u7684\u72c0\u614b\u3002\u8acb\u53c3\u95b1\u300c\u8a73\u7d30\u8cc7\u8a0a\u300d\u4e00\u7bc0\uff0c\u4ee5\u9032\u4e00\u6b65\u4e86\u89e3\u5347\u7d1a\u4f5c\u696d\u5931\u6557\u7684\u539f\u56e0\u3002<br><br><INPUT type="submit" value="Launch Status Panel"></INPUT>
+INFO_SUMMARY_UPGRADE_FINISHED_WITH_ERRORS=<b>OpenDS QuickUpgrade \u5931\u6557</b><br>\u5347\u7d1a\u4f5c\u696d\u56e0\u932f\u8aa4\u800c\u7121\u6cd5\u6210\u529f\u5b8c\u6210\uff0c\u4e14\u5b89\u88dd\u5df2\u9084\u539f\u70ba\u5347\u7d1a\u4f5c\u696d\u4e4b\u524d\u7684\u72c0\u614b\u3002\u8acb\u53c3\u95b1\u300c\u8a73\u7d30\u8cc7\u8a0a\u300d\u4e00\u7bc0\uff0c\u4ee5\u9032\u4e00\u6b65\u4e86\u89e3\u5347\u7d1a\u4f5c\u696d\u5931\u6557\u7684\u539f\u56e0\u3002<br><br><INPUT type="submit" value="Launch Control Panel"></INPUT>
 INFO_SUMMARY_UPGRADE_FINISHED_WITH_ERRORS_CLI=OpenDS QuickUpgrade \u5931\u6557\u3002\u5347\u7d1a\u4f5c\u696d\u56e0\u932f\u8aa4\u800c\u7121\u6cd5\u6210\u529f\u5b8c\u6210\uff0c\u4e14\u5b89\u88dd\u5df2\u9084\u539f\u70ba\u5347\u7d1a\u4f5c\u696d\u4e4b\u524d\u7684\u72c0\u614b\u3002\u8acb\u53c3\u95b1\u8a18\u9304\uff0c\u4ee5\u4e86\u89e3\u5347\u7d1a\u4f5c\u696d\u4e4b\u6240\u4ee5\u5931\u6557\u7684\u8a73\u7d30\u8cc7\u8a0a\u3002
-INFO_SUMMARY_UPGRADE_FINISHED_WITH_WARNINGS=<b>OpenDS QuickUpgrade \u6210\u529f\uff0c\u4f46\u51fa\u73fe\u8b66\u544a</b><br>\u5347\u7d1a\u4f5c\u696d\u5df2\u6210\u529f\u5b8c\u6210\uff0c\u4f46\u5347\u7d1a\u7a0b\u5f0f\u51fa\u73fe\u5fc5\u9808\u6ce8\u610f\u7684\u554f\u984c\u3002\u8acb\u53c3\u95b1\u300c\u8a73\u7d30\u8cc7\u8a0a\u300d\u4e00\u7bc0\uff0c\u4ee5\u4e86\u89e3\u554f\u984c\u7684\u8a73\u7d30\u8cc7\u8a0a\u3002<br><br><INPUT type="submit" value="Launch Status Panel"></INPUT>
+INFO_SUMMARY_UPGRADE_FINISHED_WITH_WARNINGS=<b>OpenDS QuickUpgrade \u6210\u529f\uff0c\u4f46\u51fa\u73fe\u8b66\u544a</b><br>\u5347\u7d1a\u4f5c\u696d\u5df2\u6210\u529f\u5b8c\u6210\uff0c\u4f46\u5347\u7d1a\u7a0b\u5f0f\u51fa\u73fe\u5fc5\u9808\u6ce8\u610f\u7684\u554f\u984c\u3002\u8acb\u53c3\u95b1\u300c\u8a73\u7d30\u8cc7\u8a0a\u300d\u4e00\u7bc0\uff0c\u4ee5\u4e86\u89e3\u554f\u984c\u7684\u8a73\u7d30\u8cc7\u8a0a\u3002<br><br><INPUT type="submit" value="Launch Control Panel"></INPUT>
 INFO_SUMMARY_UPGRADE_FINISHED_WITH_WARNINGS_CLI=OpenDS QuickUpgrade \u6210\u529f\uff0c\u4f46\u51fa\u73fe\u8b66\u544a\u3002\u5347\u7d1a\u4f5c\u696d\u5df2\u6210\u529f\u5b8c\u6210\uff0c\u4f46\u5347\u7d1a\u7a0b\u5f0f\u51fa\u73fe\u5fc5\u9808\u6ce8\u610f\u7684\u554f\u984c\u3002\u5982\u9700\u554f\u984c\u7684\u8a73\u7d30\u8cc7\u8a0a\uff0c\u8acb\u53c3\u95b1\u8a18\u9304\u3002
 INFO_SUMMARY_UPGRADE_HISTORY=\u6b63\u5728\u8a18\u9304\u5347\u7d1a\u6b77\u7a0b\u8a18\u9304...
 INFO_SUMMARY_UPGRADE_INITIALIZING=\u6b63\u5728\u521d\u59cb\u5316\u5347\u7d1a...
@@ -800,7 +804,7 @@
 INFO_REVERSION_ORACLE_WARNING=\u5fa9\u539f\u8b66\u544a
 INFO_REVERSION_ORACLE_ACTION=\u5347\u7d1a\u9700\u8981\u624b\u52d5\u64cd\u4f5c
 INFO_REVERSION_ORACLE_INFO=\u5347\u7d1a\u8cc7\u8a0a
-INFO_REVERSION_ORACLE_UNSUPPORTED=\u5f9e\u7248\u672c %s \u5fa9\u539f\u70ba\u7248\u672c %s \u7684\u4f5c\u696d\u4e0d\u53d7\u652f\u63f4\u3002\u82e5\u8981\u9032\u884c\u5347\u7d1a\uff0c\u60a8\u5fc5\u9808\u89e3\u9664\u5b89\u88dd\u76ee\u524d\u7684\u4f3a\u670d\u5668\u3001\u5b89\u88dd\u65b0\u7684\u4f3a\u670d\u5668\uff0c\u7136\u5f8c\u624b\u52d5\u9077\u79fb\u60a8\u7684\u8cc7\u6599: %s
+INFO_REVERSION_ORACLE_UNSUPPORTED=\u5f9e\u7248\u672c %s \u5fa9\u539f\u70ba\u7248\u672c %s \u7684\u4f5c\u696d\u4e0d\u53d7\u652f\u63f4\u3002To upgrade you must uninstall the current server, install the new server, and manually migrate your data: %s
 INFO_UPGRADE_ORACLE_SAME_VERSION=\u76ee\u524d\u7684\u7248\u672c\u8207\u8981\u5347\u7d1a\u7684\u76ee\u6a19\u4e8c\u9032\u4f4d\u7248\u672c\u76f8\u540c (%s)
 INFO_REVERSION_TYPE_PROMPT=\u60a8\u8981\u5982\u4f55\u6307\u5b9a\u7528\u4ee5\u5fa9\u539f\u6b64\u5be6\u4f8b\u7684\u6b78\u6a94\uff1f
 INFO_REVERSION_TYPE_PROMPT_RECENT=\u4f7f\u7528\u6700\u65b0\u7248\u7684\u6b78\u6a94
@@ -811,7 +815,7 @@
 INFO_UPGRADE_ORACLE_ACTION=\u5347\u7d1a\u9700\u8981\u624b\u52d5\u64cd\u4f5c
 INFO_UPGRADE_ORACLE_INFO=\u5347\u7d1a\u8cc7\u8a0a
 INFO_UPGRADE_ORACLE_SUCCESS=\u652f\u63f4\u5f9e\u7248\u672c %s \u5347\u7d1a\u70ba\u7248\u672c %s \u7684\u4f5c\u696d\u3002
-INFO_UPGRADE_ORACLE_UNSUPPORTED=\u5f9e\u7248\u672c %s \u5347\u7d1a\u70ba\u7248\u672c %s \u7684\u4f5c\u696d\u4e0d\u53d7\u652f\u63f4\u3002\u82e5\u8981\u9032\u884c\u5347\u7d1a\uff0c\u60a8\u5fc5\u9808\u89e3\u9664\u5b89\u88dd\u76ee\u524d\u7684\u4f3a\u670d\u5668\u3001\u5b89\u88dd\u65b0\u7684\u4f3a\u670d\u5668\uff0c\u7136\u5f8c\u624b\u52d5\u9077\u79fb\u60a8\u7684\u8cc7\u6599: %s
+INFO_UPGRADE_ORACLE_UNSUPPORTED=\u5f9e\u7248\u672c %s \u5347\u7d1a\u70ba\u7248\u672c %s \u7684\u4f5c\u696d\u4e0d\u53d7\u652f\u63f4\u3002To upgrade you must uninstall the current server, install the new server, and manually migrate your data: %s
 INFO_UPGRADE_ORACLE_WARNING=\u5347\u7d1a\u8b66\u544a
 INFO_UPGRADE_REVIEW_PANEL_INSTRUCTIONS=\u8907\u67e5\u8a2d\u5b9a\uff0c\u82e5\u6b63\u78ba\u7121\u8aa4\uff0c\u8acb\u6309\u4e00\u4e0b\u3010\u7d50\u675f\u3011\u3002
 INFO_UPGRADE_REVIEW_PANEL_NEW_VERSION_LABEL=\u65b0\u7248\u672c:
@@ -858,9 +862,20 @@
 INFO_WELCOME_PANEL_TITLE=\u6b61\u8fce\u4f7f\u7528
 INFO_WELCOME_PANEL_WEBSTART_INSTRUCTIONS=OpenDS QuickSetup \u5de5\u5177\u6703\u8981\u6c42\u60a8\u63d0\u4f9b\u67d0\u4e9b\u57fa\u672c\u4f3a\u670d\u5668\u8207\u8cc7\u6599\u914d\u7f6e\u8a2d\u5b9a\uff0c\u4e26\u6703\u5feb\u901f\u555f\u52d5\u4e26\u57f7\u884c\u60a8\u7684\u4f3a\u670d\u5668\u3002<br><br>QuickSetup \u6703\u5b89\u88dd\u4e26\u914d\u7f6e\u6700\u65b0\u7684\u6bcf\u9031\u66f4\u65b0\u7248\u3002\u60a8\u4e5f\u53ef\u4ee5\u4f7f\u7528 QuickSetup \u8a2d\u5b9a\u60a8\u624b\u52d5\u4e0b\u8f09\u7684\u6bcf\u9031\u66f4\u65b0\u7248\u3002\u82e5\u8981\u57f7\u884c\u6b64\u6848\u4f8b\u4e2d\u7684 QuickSetup\uff0c\u8acb\u5728 OpenDS \u76ee\u9304\u7684\u9802\u5c64\u4f7f\u7528 %s \u6307\u4ee4\u3002\u6b64 QuickSetup \u5be6\u4f8b\u6703\u4f7f\u7528\u4e0b\u5217 OpenDS \u5efa\u7f6e: %s (\u5efa\u7f6e ID: %s) <br><br> OpenDS \u9700\u8981 Java SE 5.0 \u6216\u66f4\u9ad8\u7684\u57f7\u884c\u968e\u6bb5\u3002<br><br>\u5982\u9700 QuickSetup \u7684\u5176\u4ed6\u8cc7\u8a0a\uff0c\u8acb\u53c3\u95b1 <a href="https://www.opends.org/wiki/page/OverviewOfTheQuickSetupTool">OpenDS \u6587\u4ef6 Wiki</a>\u3002
 INFO_WELCOME_STEP=\u6b61\u8fce\u4f7f\u7528
+INFO_LICENSE_PANEL_OFFLINE_INSTRUCTIONS=Please read the following important information before continuing.
+INFO_LICENSE_PANEL_TITLE=License
+INFO_LICENSE_PANEL_WEBSTART_INSTRUCTIONS=bla bla
+INFO_LICENSE_STEP=License
+INFO_LICENSE_DETAILS_LABEL=Please read the following License Agreement.\nYou must accept the terms of the agreement before continuing with the installation.
+INFO_LICENSE_CLICK_LABEL=Click to accept
+INFO_LICENSE_CLI_ACCEPT_QUESTION=Accept the license (%s/%s) [%s]:
+INFO_LICENSE_CLI_ACCEPT_YES=Yes
+INFO_LICENSE_CLI_ACCEPT_NO=\u5426
+INFO_LICENSE_CLI_ACCEPT_INVALID_RESPONSE=\u7121\u6548\u7684\u56de\u61c9
 INFO_CONFIRM_UNINSTALL_STEP=\u89e3\u9664\u5b89\u88dd\u9078\u9805
 INFO_ZIP_FILES_DESCRIPTION=OpenDS \u5b89\u88dd\u5957\u4ef6 (.zip)
 SEVERE_ERR_COULD_NOT_FIND_REPLICATIONID=\u627e\u4e0d\u5230\u9060\u7aef\u5c0d\u7b49\u7aef\u53ef\u521d\u59cb\u5316\u672c\u6a5f\u57fa\u5e95 DN \u7684\u5167\u5bb9: %s\u3002
 INFO_NEW_UPGRADE_SCRIPT_AVAILABLE=\u300c%s\u300d\u5df2\u6709\u65b0\u7248\u53ef\u4f9b\u4f7f\u7528\u3002\u5b8c\u6210\u6b64\u4f5c\u696d\u5f8c\uff0c\u61c9\u522a\u9664\u6b64\u7a0b\u5e8f\u6a94\uff0c\u4e26\u5c07\u300c%s\u300d\u91cd\u65b0\u547d\u540d\u70ba\u300c%1$s\u300d\u3002
 MILD_ERR_ERROR_CREATING_JAVA_HOME_SCRIPTS=\u4ee5 java \u7279\u6027\u66f4\u65b0\u7a0b\u5e8f\u6a94\u6642\u767c\u751f\u932f\u8aa4\u3002\u932f\u8aa4\u78bc: %d
 SEVERE_ERR_INCOMPATIBLE_VERSION=\u5fc5\u8981\u7684 Java \u6700\u4f4e\u7248\u672c\u70ba %s\u3002%n%n\u5075\u6e2c\u5230\u7684\u7248\u672c\u70ba %s\u3002%n\u5075\u6e2c\u5230\u7684\u4e8c\u9032\u4f4d\u6a94\u70ba %s%n%n\\u8acb\u5c07 OPENDS_JAVA_HOME \u8a2d\u70ba\u76f8\u5bb9 Java \u5b89\u88dd\u7684\u6839\u76ee\u9304\uff0c\u6216\u7de8\u8f2f java.properties \u6a94\u6848\uff0c\u7136\u5f8c\u57f7\u884c dsjavaproperties \u7a0b\u5e8f\u6a94\uff0c\u4ee5\u6307\u5b9a\u8981\u4f7f\u7528\u7684 java \u7248\u672c\u3002
+SEVERE_ERR_INVALID_JAVA_ARGS=The java arguments used in the OpenDS installation in '%s' do not seem to be compatible with the JVM 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.

--
Gitblit v1.10.0