Breaked lines into Multi line strings and added some parameters to the resources.

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1036 b35dd754-fafc-0310-a699-88a17e54d16e

src/i18n/messenger_i18n_zh_CN.properties

@@ -165,11 +165,6 @@ xmpp.error.503=\u670d\u52a1\u4e0d\u53ef\u7528
 xmpp.error.504=\u8fdc\u7a0b\u670d\u52a1\u8d85\u65f6
 xmpp.error.unknown=\u672a\u77e5\u9519\u8bef\u7801
 
-# Chat server messages
-chat.join={0} \u5df2\u52a0\u5165\u623f\u95f4
-chat.leave={0} \u5df2\u79bb\u5f00\u623f\u95f4
-chat.error.not-supported=\u804a\u5929\u5ba2\u6237\u8bd5\u56fe\u8bbf\u95ee\u672a\u5b9e\u73b0\u7684\u529f\u80fd
-
 # Multi User Chat server messages
 muc.error.not-supported=\u804a\u5929\u5ba2\u6237\u8bd5\u56fe\u8bbf\u95ee\u672a\u5b9e\u73b0\u7684\u529f\u80fd
 muc.new=\u786e\u8ba4\u914d\u7f6e\u4e4b\u524d\u5df2\u9501\u4f4f\u8be5\u623f\u95f4\uff0c\u7981\u6b62\u8fdb\u5165\u3002
@@ -716,9 +711,7 @@ session.conflict.enter_value=\u8bf7\u8f93\u5165\u5927\u4e8e 1 \u7684\u503c\u3002
 
 #session details Page
 session.details.title=\u4f1a\u8bdd\u8be6\u7ec6\u4fe1\u606f
-session.details.info=\u4e0b\u9762\u662f\u8be5\u4f1a\u8bdd\u7684\u4f1a\u8bdd\u8be6\u7ec6\u4fe1\u606f
-session.details.info1=\u5982\u679c\u7528\u6237
-session.details.info2=\u6253\u5f00\u4e86\u591a\u4e2a\u4f1a\u8bdd\uff0c\u5219\u5b83\u4eec\u5c06\u663e\u793a\u5728\u4e0b\u9762\u3002
+session.details.info=\u4e0b\u9762\u662f\u8be5\u4f1a\u8bdd\u7684\u4f1a\u8bdd\u8be6\u7ec6\u4fe1\u606f {0}. \u5982\u679c\u7528\u6237 {1} \u6253\u5f00\u4e86\u591a\u4e2a\u4f1a\u8bdd\uff0c\u5219\u5b83\u4eec\u5c06\u663e\u793a\u5728\u4e0b\u9762\u3002
 session.details.session_id=\u4f1a\u8bdd\u6807\u8bc6\uff1a
 session.details.username=\u7528\u6237\u540d\u548c\u8d44\u6e90\uff1a
 session.details.anonymous=\u533f\u540d
@@ -797,9 +790,7 @@ setup.completed.run_info2=\u8981\u91cd\u65b0\u8fd0\u884c\u8bbe\u7f6e\uff0c\u60a8
 
 #setup datasource jndi Page
 setup.datasource.jndi.setting=\u6570\u636e\u6e90\u8bbe\u7f6e \uff0d JNDI \u8fde\u63a5
-setup.datasource.jndi.setting_info=\u8bf7\u9009\u62e9\u4e0b\u9762\u7684 JNDI \u6570\u636e\u6e90\u4ee5\u8fde\u63a5\u5230
-setup.datasource.jndi.setting_info1=\u6570\u636e\u5e93\u3002\u5bf9\u4e0d\u540c\u7684\u5e94\u7528\u7a0b\u5e8f\u670d\u52a1\u5668\u8be5\u540d\u79f0\u90fd\u4e0d\u540c\uff0c\u4f46\u901a\u5e38\u5176\u683c\u5f0f\u5982\u4e0b\uff1a
-setup.datasource.jndi.setting_info2=\u8bf7\u53c2\u9605\u60a8\u7684\u5e94\u7528\u7a0b\u5e8f\u670d\u52a1\u5668\u6587\u6863\u4ee5\u83b7\u53d6\u66f4\u591a\u4fe1\u606f\u3002
+setup.datasource.jndi.setting_info=\u8bf7\u9009\u62e9\u4e0b\u9762\u7684 JNDI \u6570\u636e\u6e90\u4ee5\u8fde\u63a5\u5230 {0} \u6570\u636e\u5e93\u3002\u5bf9\u4e0d\u540c\u7684\u5e94\u7528\u7a0b\u5e8f\u670d\u52a1\u5668\u8be5\u540d\u79f0\u90fd\u4e0d\u540c\uff0c\u4f46\u901a\u5e38\u5176\u683c\u5f0f\u5982\u4e0b\uff1a {1}. \u8bf7\u53c2\u9605\u60a8\u7684\u5e94\u7528\u7a0b\u5e8f\u670d\u52a1\u5668\u6587\u6863\u4ee5\u83b7\u53d6\u66f4\u591a\u4fe1\u606f\u3002
 setup.datasource.jndi.name=JNDI \u6570\u636e\u6e90\u540d\u79f0\uff1a
 setup.datasource.jndi.custom=\u5b9a\u5236\uff1a
 setup.datasource.jndi.valid_name=\u8bf7\u8f93\u5165\u6709\u6548\u7684 JNDI \u540d\u79f0\u3002
@@ -808,8 +799,7 @@ setup.datasource.jndi.note=\u6ce8\uff1a\u8fde\u63a5\u5230\u60a8\u7684\u6570\u636
 
 #setup datasource settings Page
 setup.datasource.settings.title=\u6570\u636e\u6e90\u8bbe\u7f6e
-setup.datasource.settings.info=\u8bf7\u9009\u62e9\u60a8\u5e0c\u671b\u8fde\u63a5\u5230
-setup.datasource.settings.info1=\u6570\u636e\u5e93\u7684\u65b9\u5f0f\u3002
+setup.datasource.settings.info=\u8bf7\u9009\u62e9\u60a8\u5e0c\u671b\u8fde\u63a5\u5230 {0} \u6570\u636e\u5e93\u7684\u65b9\u5f0f\u3002
 setup.datasource.settings.connect=\u6807\u51c6\u6570\u636e\u5e93\u8fde\u63a5
 setup.datasource.settings.connect_info=\u4f7f\u7528\u5916\u90e8\u6570\u636e\u5e93\u548c\u5185\u5efa\u8fde\u63a5\u6c60\u3002
 setup.datasource.settings.jndi=JNDI \u6570\u636e\u6e90
@@ -819,7 +809,7 @@ setup.datasource.settings.embedded_info=\u4f7f\u7528\u5d4c\u5165\u7684\u6570\u63
 
 #setup datasource standard Page
 setup.datasource.standard.title=\u6570\u636e\u6e90\u8bbe\u7f6e \uff0d \u6807\u51c6\u8fde\u63a5
-setup.datasource.standard.info=\u6307\u5b9a JDBC \u9a71\u52a8\u7a0b\u5e8f\u548c\u8fde\u63a5\u5c5e\u6027\u4ee5\u8fde\u63a5\u5230\u60a8\u7684\u6570\u636e\u5e93\u3002\u5982\u679c\u60a8\u9700\u8981\u5173\u4e8e\u8be5\u8fc7\u7a0b\u7684\u66f4\u591a\u4fe1\u606f\uff0c\u8bf7\u53c2\u9605\u968f setup.datasource.standard.note= \u63d0\u4f9b\u7684\u6570\u636e\u5e93\u6587\u6863
+setup.datasource.standard.info=\u6307\u5b9a JDBC \u9a71\u52a8\u7a0b\u5e8f\u548c\u8fde\u63a5\u5c5e\u6027\u4ee5\u8fde\u63a5\u5230\u60a8\u7684\u6570\u636e\u5e93\u3002\u5982\u679c\u60a8\u9700\u8981\u5173\u4e8e\u8be5\u8fc7\u7a0b\u7684\u66f4\u591a\u4fe1\u606f\uff0c\u8bf7\u53c2\u9605\u968f
 setup.datasource.standard.info2=\u6ce8\u610f\uff1a
 setup.datasource.standard.info3=\u5728 Jive Messenger \u53d1\u884c\u7248\u7684\u4ee5\u4e0b\u76ee\u5f55\u4e2d\u5305\u542b\u4e86\u7528\u4e8e\u6d41\u884c\u7684\u6570\u636e\u5e93\u7684\u6570\u636e\u5e93\u811a\u672c\uff1a
 setup.datasource.standard.failed_connect=\u672a\u80fd\u5efa\u7acb\u6570\u636e\u5e93\u8fde\u63a5 \uff0d \u8bf7\u67e5\u770b\u4e0b\u9762\u5217\u51fa\u7684\u7279\u5b9a\u9519\u8bef\u3002
@@ -844,8 +834,7 @@ setup.datasource.standard.note=\u6ce8\uff1a\u8fde\u63a5\u5230\u60a8\u7684\u6570\
 #setup env check Page
 setup.env.check.setup=\u8bbe\u7f6e
 setup.env.check.error=\u9519\u8bef\uff1a\u65e0\u6cd5\u7ee7\u7eed
-setup.env.check.error_info=\u60a8\u7684\u5f53\u524d\u5b89\u88c5\u4e0d\u7b26\u5408\u6700\u5c0f
-setup.env.check.error_info1=\u9700\u6c42 \uff0d \u8bf7\u67e5\u770b\u4ee5\u4e0b\u6e05\u5355\uff1a
+setup.env.check.error_info=\u60a8\u7684\u5f53\u524d\u5b89\u88c5\u4e0d\u7b26\u5408\u6700\u5c0f {0} \u9700\u6c42 \uff0d \u8bf7\u67e5\u770b\u4ee5\u4e0b\u6e05\u5355\uff1a
 setup.env.check.jdk=\u81f3\u5c11 JDK 1.5
 setup.env.check.servlet=Servlet 2.2 \u652f\u6301
 setup.env.check.jsp=JSP 1.1 \u652f\u6301
@@ -856,8 +845,7 @@ setup.env.check.doc=\u8bf7\u5148\u9605\u8bfb\u5b89\u88c5\u6587\u6863\u5e76\u91cd
 
 #setup finished Page
 setup.finished.title=\u5b89\u88c5\u5b8c\u6210\uff01
-setup.finished.info=\u8be5
-setup.finished.info1=\u5b89\u88c5\u73b0\u5728\u5df2\u5b8c\u6210\u3002\u8981\u7ee7\u7eed\uff1a
+setup.finished.info=\u8be5 {0} \u5b89\u88c5\u73b0\u5728\u5df2\u5b8c\u6210\u3002\u8981\u7ee7\u7eed\uff1a
 setup.finished.restart=\u8bf7
 setup.finished.restart2=\u670d\u52a1\u5668\u3002
 setup.finished.login=\u767b\u5f55\u5230\u7ba1\u7406\u63a7\u5236\u53f0
@@ -880,8 +868,7 @@ setup.host.settings.secure_port_number=\u901a\u8fc7SSL\u57fa\u4e8eWeb\u7684\u7ba
 
 #setup index Page
 setup.index.title=\u8bbe\u7f6e\u6e05\u5355
-setup.index.info=\u6b22\u8fce\u4f7f\u7528
-setup.index.info1=\u8bbe\u7f6e\u7a0b\u5e8f\u3002\u672c\u5de5\u5177\u5c06\u5e2e\u52a9\u60a8\u6267\u884c\u521d\u59cb\u8bbe\u7f6e\u6216\u5347\u7ea7\u8fc7\u7a0b\u3002\u7ee7\u7eed\u524d\uff0c\u8bf7\u9a8c\u8bc1\u60a8\u7684\u73af\u5883\u7b26\u5408\u4e0b\u9762\u7684\u6240\u6709\u9700\u6c42\u3002
+setup.index.info=\u6b22\u8fce\u4f7f\u7528 {0} \u8bbe\u7f6e\u7a0b\u5e8f\u3002\u672c\u5de5\u5177\u5c06\u5e2e\u52a9\u60a8\u6267\u884c\u521d\u59cb\u8bbe\u7f6e\u6216\u5347\u7ea7\u8fc7\u7a0b\u3002\u7ee7\u7eed\u524d\uff0c\u8bf7\u9a8c\u8bc1\u60a8\u7684\u73af\u5883\u7b26\u5408\u4e0b\u9762\u7684\u6240\u6709\u9700\u6c42\u3002
 setup.index.success=\u6210\u529f
 setup.index.error=\u9519\u8bef
 setup.index.vm=Java VM \u652f\u6301