From cf6a30a62ca4cef27254d68e27f96431188bb4a3 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Wed, 18 Aug 2010 15:41:44 +0000
Subject: [PATCH] Update to messages and localized messages.

---
 opends/src/messages/messages/replication_zh_CN.properties |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/opends/src/messages/messages/replication_zh_CN.properties b/opends/src/messages/messages/replication_zh_CN.properties
index 2a25d2d..b122860 100644
--- a/opends/src/messages/messages/replication_zh_CN.properties
+++ b/opends/src/messages/messages/replication_zh_CN.properties
@@ -65,12 +65,12 @@
 DEBUG_ERROR_UPDATING_RUV_14=\u5728\u66f4\u65b0\u670d\u52a1\u5668\u72b6\u6001 %2$s \u65f6\u51fa\u73b0\u9519\u8bef %1$s: %3$s \u57fa DN: %4$s
 MILD_ERR_ERROR_SEARCHING_RUV_15=\u5728\u641c\u7d22\u670d\u52a1\u5668\u72b6\u6001 %2$s \u65f6\u51fa\u73b0\u9519\u8bef %1$s: %3$s \u57fa DN: %4$s
 NOTICE_NO_CHANGELOG_SERVER_LISTENING_17=\u6ca1\u6709\u590d\u5236\u670d\u52a1\u5668\u5728 %s \u4e0a\u4fa6\u542c
-NOTICE_FOUND_CHANGELOGS_WITH_MY_CHANGES_18=\u5bf9\u4e8e\u540e\u7f00 %s\uff0c\u5728\u670d\u52a1\u5668 ID %s \u4e2d\u627e\u5230 %d \u4e2a\u5305\u542b\u6700\u65b0\u66f4\u6539\u7684\u590d\u5236\u670d\u52a1\u5668
+NOTICE_FOUND_CHANGELOGS_WITH_MY_CHANGES_18=\u5bf9\u4e8e\u540e\u7f00 %1$s\uff0c\u5728\u670d\u52a1\u5668 ID %3$s \u4e2d\u627e\u5230 %2$d \u4e2a\u5305\u542b\u6700\u65b0\u66f4\u6539\u7684\u590d\u5236\u670d\u52a1\u5668
 NOTICE_NEED_MORE_THAN_ONE_CHANGELOG_SERVER_19=\u5e94\u914d\u7f6e\u591a\u4e2a\u590d\u5236\u670d\u52a1\u5668
 SEVERE_ERR_EXCEPTION_SENDING_TOPO_INFO_20=\u5728\u57df %s \u4e0a\u4e3a %s \u670d\u52a1\u5668 %s \u53d1\u9001\u62d3\u6251\u4fe1\u606f\uff08\u7528\u4e8e\u66f4\u65b0\uff09\u65f6\u6355\u83b7\u5230 IOException: %s
 MILD_ERR_CANNOT_RECOVER_CHANGES_21=\u5728\u4e3a\u57fa DN %s \u641c\u7d22\u6570\u636e\u5e93\u4e2d\u7684\u65e7\u66f4\u6539\u65f6\u51fa\u73b0\u9519\u8bef
 NOTICE_COULD_NOT_FIND_CHANGELOG_WITH_MY_CHANGES_22=\u5bf9\u4e8e\u540e\u7f00 %s\uff0c\u627e\u4e0d\u5230\u5df2\u5e94\u7528\u6240\u6709\u672c\u5730\u66f4\u6539\u7684\u590d\u5236\u670d\u52a1\u5668\u3002\u627e\u5230 %d \u4e2a\u975e\u6700\u65b0\u590d\u5236\u670d\u52a1\u5668\u3002\u5c06\u91cd\u653e\u66f4\u6539
-NOTICE_COULD_NOT_FIND_CHANGELOG_23=\u5bf9\u4e8e\u540e\u7f00 %s\uff0c\u65e0\u6cd5\u8fde\u63a5\u5230\u4efb\u4f55\u590d\u5236\u670d\u52a1\u5668\uff0c\u6b63\u5728\u91cd\u8bd5...
+NOTICE_COULD_NOT_FIND_CHANGELOG_23=\u5bf9\u4e8e\u540e\u7f00 %s\uff0c\u65e0\u6cd5\u8fde\u63a5\u5230\u4ee5\u4e0b RS \u5019\u9009 %s \u4e2d\u7684\u4efb\u610f\u590d\u5236\u670d\u52a1\u5668\uff0c\u6b63\u5728\u91cd\u8bd5...
 NOTICE_EXCEPTION_CLOSING_DATABASE_24=\u5728\u5173\u95ed\u590d\u5236\u670d\u52a1\u5668\u6570\u636e\u5e93 %s \u65f6\u51fa\u73b0\u9519\u8bef:
 SEVERE_ERR_EXCEPTION_DECODING_OPERATION_25=\u5c1d\u8bd5\u91cd\u653e %s \u65f6\u51fa\u73b0\u9519\u8bef\uff0c\u65e0\u6cd5\u5bf9\u64cd\u4f5c\u8fdb\u884c\u89e3\u7801:
 FATAL_ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR_26=\u5c1d\u8bd5\u4f7f\u7528\u57fa\u7840\u6570\u636e\u5e93\u65f6\u51fa\u73b0\u9519\u8bef\u3002\u590d\u5236\u670d\u52a1\u5668\u5c06\u88ab\u5173\u95ed
@@ -199,8 +199,8 @@
 MILD_ERR_ERROR_RETRIEVING_MONITOR_DATA_155=\u68c0\u7d22\u76d1\u89c6\u6570\u636e\u65f6\u51fa\u9519: %s
 SEVERE_ERR_EXCEPTION_LOCKING_RS_DOMAIN_156=\u9501\u5b9a\u590d\u5236\u670d\u52a1\u5668\u57df\u65f6\u6355\u83b7\u5230\u5f02\u5e38: %s 
 SEVERE_ERR_REPLICATION_PROTOCOL_MESSAGE_TYPE_157=\u590d\u5236\u534f\u8bae\u9519\u8bef\u3002\u9519\u8bef\u6d88\u606f\u7c7b\u578b\u3002\u63a5\u6536\u5230 %s\uff0c\u8981\u6c42 %s  
-SEVERE_ERR_RESYNC_REQUIRED_MISSING_DOMAIN_IN_PROVIDED_COOKIE_158=\u8981\u6c42\u5b8c\u5168\u518d\u540c\u6b65\u3002\u539f\u56e0\uff1a\u63d0\u4f9b\u7684 cookie \u7f3a\u5c11\u590d\u5236\u57df %s
-SEVERE_ERR_BYTE_COUNT_159=\u670d\u52a1\u5668\u5904\u7406\u7a0b\u5e8f\u5b57\u8282\u8ba1\u6570\u4e0d\u6b63\u786e\uff08\u5df2\u4fee\u590d\uff09
+SEVERE_ERR_RESYNC_REQUIRED_MISSING_DOMAIN_IN_PROVIDED_COOKIE_158=\u8981\u6c42\u5b8c\u5168\u518d\u540c\u6b65\uff0c\u56e0\u4e3a\u63d0\u4f9b\u7684 Cookie \u7f3a\u5c11\u590d\u5236\u57df %s\u3002\u4ee5\u4e0b Cookie \u503c\u53ef\u7528\u4e8e\u68c0\u7d22\u7f3a\u5931\u7684\u66f4\u6539\uff0c\u5305\u62ec\u7f3a\u5931\u57df %s \u7684\u66f4\u6539\u7684\u5b8c\u6574\u8bb0\u5f55
+SEVERE_ERR_BYTE_COUNT_159=\u670d\u52a1\u5668\u5904\u7406\u7a0b\u5e8f\u5b57\u8282\u8ba1\u6570\u4e0d\u6b63\u786e\uff0c\u5b57\u8282\u8ba1\u6570=%s\uff08\u5df2\u4fee\u6b63\uff09
 NOTICE_ERR_FRACTIONAL_CONFIG_UNKNOWN_OBJECT_CLASS_160=\u90e8\u5206\u590d\u5236\u914d\u7f6e\u9519\u8bef\uff1a\u5728\u6a21\u5f0f\u4e2d\u65e0\u6cd5\u627e\u5230 %s \u7684\u5bf9\u8c61\u7c7b\u5b9a\u4e49
 NOTICE_ERR_FRACTIONAL_CONFIG_UNKNOWN_ATTRIBUTE_TYPE_161=\u90e8\u5206\u590d\u5236\u914d\u7f6e\u9519\u8bef\uff1a\u5728\u6a21\u5f0f\u4e2d\u65e0\u6cd5\u627e\u5230 %s \u7684\u5c5e\u6027\u7c7b\u578b\u5b9a\u4e49
 NOTICE_ERR_FRACTIONAL_CONFIG_NOT_OPTIONAL_ATTRIBUTE_162=\u90e8\u5206\u590d\u5236\u914d\u7f6e\u9519\u8bef\uff1a\u5728\u7c7b %2$s \u4e2d\u65e0\u6cd5\u9009\u62e9\u5c5e\u6027 %1$s
@@ -242,4 +242,5 @@
 NOTICE_RESENDING_INIT_FROM_REMOTE_REQUEST_198=\u7531\u4e8e\u8d85\u7ea7\u7528\u6237\u9519\u8bef\uff0c\u91cd\u65b0\u53d1\u9001\u9488\u5bf9\u8fdc\u7a0b\u670d\u52a1\u5668\u521d\u59cb\u5316\u7684\u65b0\u521d\u59cb\u5316\u8bf7\u6c42: %s
 NOTICE_RESENDING_INIT_TARGET_199=\u7531\u4e8e\u8d85\u7ea7\u7528\u6237\u9519\u8bef\uff0c\u91cd\u65b0\u53d1\u9001\u9488\u5bf9\u8fdc\u7a0b\u670d\u52a1\u5668\u521d\u59cb\u5316\u7684\u65b0\u521d\u59cb\u5316\u5f00\u59cb: %s
 NOTICE_ERR_WHILE_TRYING_TO_DECODE_RUV_IN_STATE_200=\u5c1d\u8bd5\u5c06 RUV \u8f6c\u6362\u4e3a\u540e\u7f00 %s \u7684\u72b6\u6001\u65f6\u53d1\u751f\u9519\u8bef
-
+SEVERE_ERR_RSQUEUE_DIFFERENT_MSGS_WITH_SAME_CN_201=\u7528\u76f8\u540c\u7684\u66f4\u6539\u53f7=%s \u6765\u5904\u7406\u4e24\u4e2a\u4e0d\u540c\u7684\u66f4\u6539\u3002\u4ee5\u524d\u7684 msg=<%s>\uff0c\u65b0\u7684 msg=<%s>
+SEVERE_ERR_COULD_NOT_SOLVE_CONFLICT_202=\u5c1d\u8bd5\u89e3\u51b3\u4e0e DN %s \u7684\u51b2\u7a81\u65f6\u51fa\u73b0\u9519\u8bef\uff1a\u9519\u8bef %s

--
Gitblit v1.10.0