Updated to 2.4.2 (with 1 missing translation)

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

src/i18n/wildfire_i18n_zh_CN.properties

@@ -7,7 +7,7 @@
 ##
 ## For a full changelog, refer to the English bundle, wildfire_i18n_en.properties.
 ##
-## Updated for release: 2.3.0
+## Updated for release: 2.4.2 (missing translation of group.edit.note)
 
 # Wildfire
 
@@ -51,8 +51,8 @@ tab.server.descr=\u5355\u51fb\u53ef\u7ba1\u7406\u670d\u52a1\u5668\u8bbe\u7f6e
         sidebar.server-data-settings.descr=\u70b9\u51fb\u7ba1\u7406\u79c1\u6709\u6570\u636e\u5b58\u50a8
         sidebar.server-ssl=\u5b89\u5168\u8bbe\u7f6e
         sidebar.server-ssl.descr=\u70b9\u51fb\u6d4f\u89c8SSL\u8bbe\u7f6e
-        sidebar.server-compression=Compression Settings
-        sidebar.server-compression.descr=Click to view compression settings.
+        sidebar.server-compression=\u538b\u7f29\u8bbe\u7f6e
+        sidebar.server-compression.descr=\u5355\u51fb\u67e5\u770b\u538b\u7f29\u8bbe\u7f6e
 tab.tab-users=\u7528\u6237\uff0f\u7ec4
 tab.tab-users.descr=\u5355\u51fb\u53ef\u7ba1\u7406\u7528\u6237\u548c\u7ec4
     sidebar.sidebar-users=\u7528\u6237
@@ -280,8 +280,8 @@ global.pages=\u9875
 global.delete=\u5220\u9664
 global.click_edit=\u5355\u51fb\u53ef\u7f16\u8f91...
 global.click_delete=\u5355\u51fb\u53ef\u5220\u9664...
-global.yes=Yes
-global.no=No
+global.yes=\u786e\u5b9a
+global.no=\u53d6\u6d88
 
 # Group Chat Service Properties Page
 
@@ -439,6 +439,7 @@ group.edit.remove=\u5220\u9664
 group.edit.user_hint=\u8be5\u7ec4\u4e2d\u65e0\u6210\u5458\u3002\u8bf7\u4f7f\u7528\u4e0a\u9762\u7684\u8868\u5355\u6dfb\u52a0\u4e00\u4e9b\u6210\u5458\u3002
 group.edit.inexistent_user={0}\u4e0d\u662f\u4e00\u4e2a\u6ce8\u518c\u7528\u6237\u3002
 group.edit.already_user={0}\u7ec4\u4e2d\u5df2\u7ecf\u5b58\u5728\u3002
+group.edit.note=Note: Remote users or entities should accept presence subscriptions automatically.
 
 # Group summary Page
 
@@ -1134,9 +1135,9 @@ ssl.settings.error_messenge=\u9519\u8bef\u6d88\u606f
 ssl.settings.error_certificate=\u5b89\u88c5\u8bc1\u4e66\u65f6\u51fa\u9519\uff0c\u8bf7\u53c2\u9605\u4e0b\u9762\u7684\u8868\u5355\u3002
 ssl.settings.info=SSL\uff0fTLS \u5141\u8bb8\u5728\u670d\u52a1\u5668\u548c\u5ba2\u6237\u673a\u4e4b\u95f4\u5efa\u7acb\u5b89\u5168\u8fde\u63a5\u3002\u672c\u9875\u9762\u663e\u793a\u5df2\u5b89\u88c5\u7684\u8bc1\u4e66\u3002\u8bf7\u4f7f\u7528\u9875\u9762\u5e95\u90e8\u7684\u8868\u5355\u5b89\u88c5\u65b0\u8bc1\u4e66\u3002
 ssl.settings.certificate=\u5df2\u5b89\u88c5\u7684\u8bc1\u4e66
-ssl.settings.alias=\u522b\u540d\uff08\u4e3b\u673a\uff09
-ssl.settings.expiration=Expires
-ssl.settings.self-signed=Self-signed
+ssl.settings.alias=\u4e3b\u673a(\u522b\u540d)
+ssl.settings.expiration=\u8fc7\u671f
+ssl.settings.self-signed=\u81ea\u5b9a\u4e49\u7b7e\u540d
 ssl.settings.publickey=\u516c\u5f00\u5bc6\u94a5
 ssl.settings.publickey.title=\u70b9\u51fb\u663e\u793a\u6216\u9690\u85cf\u516c\u5f00\u5bc6\u94a5
 ssl.settings.publickey.label=\u663e\u793a/\u9690\u85cf
@@ -1156,32 +1157,31 @@ ssl.settings.client=\u5ba2\u6237\u673a\u8bc1\u4e66
 ssl.settings.a_certificate=\u8bc1\u4e66
 ssl.settings.paste_certificate=\u7c98\u8d34 CA \u53d1\u9001\u7ed9\u60a8\u7684\u8bc1\u4e66\u6216\u7531 keytool \u751f\u6210\u7684\u81ea\u7b7e\u7f72\u8bc1\u4e66\u3002
 ssl.settings.add_certificate=\u6dfb\u52a0\u8bc1\u4e66
-ssl.settings.server.legend=Server Connection Security
-ssl.settings.server.label_required=Required
-ssl.settings.server.label_required_info=Connections between servers always use secured connections.
-ssl.settings.server.label_notrequired=Optional
-ssl.settings.server.label_notrequired_info=Connections between servers may use secured connections.
-ssl.settings.server.label_custom=Custom
-ssl.settings.server.label_custom_info=Advanced configuration
-ssl.settings.server.dialback=Server Dialback:
-ssl.settings.server.customTLS=TLS method:
+ssl.settings.server.legend=\u670d\u52a1\u5668\u8054\u63a5\u5b89\u5168
+ssl.settings.server.label_required=\u5fc5\u5907\u9879
+ssl.settings.server.label_required_info=\u670d\u52a1\u5668\u4e4b\u95f4\u5df2\u7ecf\u4f7f\u7528\u5b89\u5168\u8054\u63a5\u3002
+ssl.settings.server.label_notrequired=\u53ef\u9009\u9879
+ssl.settings.server.label_notrequired_info=\u670d\u52a1\u5668\u4e4b\u95f4\u53ef\u4ee5\u4f7f\u7528\u5b89\u5168\u8054\u63a5
+ssl.settings.server.label_custom=\u81ea\u5b9a\u4e49
+ssl.settings.server.label_custom_info=\u9ad8\u7ea7\u8bbe\u7f6e
+ssl.settings.server.dialback=\u670d\u52a1\u5668\u56de\u53eb:
+ssl.settings.server.customTLS=TLS\u65b9\u6848:
 
 # Compression settings Page
 
-compression.settings.title=Compression Settings
-compression.settings.update=Settings updated successfully.
-compression.settings.info=Clients and servers can connect to the server and compress their traffic. \
-        Use the following form to specify if the server will offer stream compression to clients and servers.
-compression.settings.client.policy=Client Compression Policy
-compression.settings.client.enable=Available
-compression.settings.client.enable_info=Clients will be offered the option to use compressed traffic.
-compression.settings.client.disable=Not Available
-compression.settings.client.disable_info=Clients will not receive the option to use compressed traffic.
-compression.settings.server.policy=Server Compression Policy
-compression.settings.server.enable=Available
-compression.settings.server.enable_info=Communication between servers will try to use compressed traffic.
-compression.settings.server.disable=Not Available
-compression.settings.server.disable_info=Communication between servers will not use compressed traffic.
+compression.settings.title=\u538b\u7f29\u8bbe\u7f6e
+compression.settings.update=\u8bbe\u7f6e\u66f4\u65b0\u6210\u529f
+compression.settings.info=\u5ba2\u6237\u7aef\u6216\u670d\u52a1\u5668\u80fd\u591f\u4f7f\u7528\u538b\u7f29\u901a\u4fe1\u65b9\u5f0f\u4e0e\u672c\u670d\u52a1\u5668\u8054\u63a5\u3002\u5982\u679c\u672c\u670d\u52a1\u5668\u60f3\u63d0\u4f9b\u538b\u7f29\u65b9\u5f0f\u4e0e\u5176\u5b83\u670d\u52a1\u5668\u6216\u5ba2\u6237\u7aef\u8054\u63a5\uff0c\u8bf7\u586b\u5199\u4e0b\u9762\u7684\u8868\u5355\u8fdb\u884c\u6307\u5b9a\u3002
+compression.settings.client.policy=\u5ba2\u6237\u7aef\u538b\u7f29\u65b9\u6cd5
+compression.settings.client.enable=\u6709\u6548
+compression.settings.client.enable_info=\u5ba2\u6237\u7aef\u5c06\u63d0\u4f9b\u53ef\u9009\u7684\u538b\u7f29\u65b9\u6cd5\u4e0e\u670d\u52a1\u5668\u8fdb\u884c\u901a\u4fe1\u3002
+compression.settings.client.disable=\u65e0\u6548
+compression.settings.client.disable_info=\u5ba2\u6237\u7aef\u5c06\u4e0d\u80fd\u63d0\u4f9b\u53ef\u9009\u7684\u538b\u7f29\u65b9\u6cd5\u4e0e\u670d\u52a1\u5668\u8fdb\u884c\u901a\u4fe1\u3002
+compression.settings.server.policy=\u670d\u52a1\u5668\u538b\u7f29\u65b9\u6cd5
+compression.settings.server.enable=\u6709\u6548
+compression.settings.server.enable_info=\u670d\u52a1\u5668\u4e4b\u95f4\u7684\u901a\u4fe1\u5c06\u4f7f\u7528\u538b\u7f29\u65b9\u6cd5
+compression.settings.server.disable=\u65e0\u6548
+compression.settings.server.disable_info=\u670d\u52a1\u5668\u4e4b\u95f4\u7684\u901a\u4fe1\u5c06\u4e0d\u80fd\u4f7f\u7528\u538b\u7f29\u65b9\u6cd5
 
 # User create Page