1) Updated with more translations from Tom.

2) Added new pending things to translate.

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

src/i18n/wildfire_i18n_zh_CN.properties

@@ -26,8 +26,8 @@ tab.server.descr=\u5355\u51fb\u53ef\u7ba1\u7406\u670d\u52a1\u5668\u8bbe\u7f6e
         sidebar.system-props.descr=\u5355\u51fb\u53ef\u7ba1\u7406\u670d\u52a1\u5668\u5c5e\u6027
         sidebar.server-locale=\u8bed\u8a00\u548c\u65f6\u95f4
         sidebar.server-locale.descr=\u5355\u51fb\u8bbe\u7f6e\u8bed\u8a00\u548c\u65f6\u533a
-        sidebar.system-cache=Cache Summary
-        sidebar.system-cache.descr=Click to manage data caches
+        sidebar.system-cache=\u7f13\u5b58\u6458\u8981
+        sidebar.system-cache.descr=\u5355\u51fb\u7ba1\u7406\u6570\u636e\u7f13\u5b58
         sidebar.server-db=\u6570\u636e\u5e93
         sidebar.server-db.descr=\u5355\u51fb\u6d4f\u89c8\u6570\u636e\u5e93\u8fde\u63a5\u4fe1\u606f
         sidebar.server-logs=\u65e5\u5fd7
@@ -287,7 +287,7 @@ global.click_edit=\u5355\u51fb\u53ef\u7f16\u8f91...
 global.click_delete=\u5355\u51fb\u53ef\u5220\u9664...
 global.yes=\u786e\u5b9a
 global.no=\u53d6\u6d88
-global.unlimited=Unlimited
+global.unlimited=\u65e0\u9650\u5236
 
 # Group Chat Service Properties Page
 
@@ -1361,21 +1361,17 @@ filetransferproxy.settings.valid.port=\u8bf7\u8f93\u5165\u4e00\u4e2a\u6709\u6548
 filetransferproxy.settings.confirm.updated=\u6587\u4ef6\u4f20\u9001\u4ee3\u7406\u8bbe\u7f6e\u66f4\u65b0\u6210\u529f\u3002
 
 # System Cache page
-system.cache.title=Cache Summary
-system.cache.cleared=Cache(s) cleared successfully.
-system.cache.info=Wildfire relies on its cache to run efficiently. Below is a summary of all \
-    existing caches. To clear out the contents of a cache, click the checkbox next to the cache \
-    you want to clear and click "Clear Selected" below.
-system.cache.head.name=Cache Name
-system.cache.head.max=Max Size
-system.cache.head.current=Current Size
-system.cache.head.percent=Percent Used
-system.cache.head.effectiveness=Effectiveness*
-system.cache.desc.effectiveness=* Effectiveness measures how well your cache is working. If the \
-    effectiveness is low, that usually means that the cache is too small. Caches for which this \
-    may be the case are specially flagged.
-system.cache.total=Total:
-system.cache.clear-selected=Clear Selected
+system.cache.title=\u7f13\u5b58\u6458\u8981
+system.cache.cleared=\u7f13\u5b58\u6e05\u9664\u6210\u529f
+system.cache.info=Wildfire\u4f9d\u9760\u4ed6\u7684\u7f13\u5b58\u7528\u4e8e\u6709\u6548\u7684\u8fd0\u884c\u3002\u4e0b\u9762\u662f\u6240\u6709\u5b58\u5728\u7684\u7684\u7f13\u5b58\u7684\u6458\u8981\u3002\u4e3a\u4e86\u6e05\u9664\u7f13\u5b58\u7684\u5185\u5bb9\uff0c\u628a\u4f60\u60f3\u6e05\u9664\u7f13\u5b58\u7684\u9879\u76ee\u540e\u7684\u590d\u9009\u6846\u9009\u4e2d\uff0c\u518d\u70b9\u51fb"\u6e05\u9664\u5df2\u9009\u9879\u76ee"\u952e\u3002
+system.cache.head.name=\u7f13\u5b58\u540d\u79f0
+system.cache.head.max=\u6700\u5927\u7a7a\u95f4
+system.cache.head.current=\u5f53\u524d\u7a7a\u95f4
+system.cache.head.percent=\u4f7f\u7528\u767e\u5206\u6bd4
+system.cache.head.effectiveness=\u6548\u679c*
+system.cache.desc.effectiveness=* \u6548\u679c\u91cf\u5ea6\u663e\u793a\u4f60\u7684\u7f13\u5b58\u5de5\u4f5c\u662f\u5426\u5408\u9002\u3002\u5982\u679c\u6548\u7387\u5f88\u4f4e\uff0c\u5e38\u5e38\u662f\u56e0\u4e3a\u7f13\u5b58\u592a\u5c0f\u3002\u6b64\u65f6\u7f13\u5b58\u4f1a\u6709\u4e00\u4e2a\u7279\u522b\u7684\u6807\u8bc6\u3002
+system.cache.total=\u5408\u8ba1:
+system.cache.clear-selected=\u6e05\u9664\u5df2\u9009\u9879\u76ee
 
 # Upgrade process
 upgrade.database.old_schema=Found old database version. Upgrading...
@@ -1386,6 +1382,7 @@ upgrade.database.success=Database upgraded successfully.
 upgrade.database.failure=Database upgrade failed. Please manually upgrade your database.
 
 # Publish-Subscribe
+
 startup.starting.pubsub=\u53d1\u5e03-\u8ba2\u9605\u57df\uff1a{0}
 pubsub.form.default.title=\u9ed8\u8ba4\u8282\u70b9\u914d\u7f6e
 pubsub.form.default.instruction=\u7528\u9ed8\u8ba4\u7684\u914d\u7f6e\u8bbe\u5b9a\u65b0\u521b\u5efa\u7684\u8282\u70b9\u3002
@@ -1407,7 +1404,6 @@ pubsub.form.conf.body_xslt=XSLT\u4fe1\u606f\u4f53
 pubsub.form.conf.dataform_xslt=XSLT\u6709\u6548\u8f7d\u8377
 pubsub.form.conf.access_model=\u6307\u5b9a\u8c01\u53ef\u4ee5\u8ba2\u9605\u548c\u67e5\u770b\u9879\u76ee
 pubsub.form.conf.publish_model=\u6307\u5b9a\u53d1\u5e03\u8005\u6a21\u578b
-pubsub.form.conf.current_approver=\u6307\u5b9a\u5f53\u524d\u7684\u8ba2\u9605\u786e\u5b9a\u8005
 pubsub.form.conf.roster_allowed=\u597d\u53cb\u5217\u8868\u5141\u8bb8\u8ba2\u9605
 pubsub.form.conf.contact=\u6709\u95ee\u9898\u65f6\u8054\u7cfb\u76f8\u5173\u4eba\u5458
 pubsub.form.conf.description=\u8282\u70b9\u7684\u63cf\u8ff0
@@ -1433,3 +1429,18 @@ pubsub.form.subscription.show-values=\u5728\u7ebf\u7c7b\u578b\u5141\u8bb8\u63a5\
 pubsub.form.subscription.subscription_type=\u63a5\u6536\u901a\u77e5\u7684\u9879\u76ee\u6216\u8282\u70b9
 pubsub.form.subscription.subscription_depth=\u4ece\u6240\u6709\u7684\u8282\u70b9\u6216\u76f4\u63a5\u5b50\u8282\u70b9\u63a5\u6536\u901a\u77e5
 pubsub.form.subscription.keywords=\u5173\u5065\u5b57\u5339\u914d
+pubsub.form.authorization.title=PubSub subscriber request
+pubsub.form.authorization.instruction=Use the following form to approve or deny the subscription \
+    request.
+pubsub.form.authorization.node=Node ID
+pubsub.form.authorization.subscriber=Subscriber Address
+pubsub.form.authorization.allow=Allow this JID to subscribe to this pubsub node?
+pubsub.command.pending-subscriptions.label=Authorize Pending Subscriptions
+pubsub.command.pending-subscriptions.title=Authorize Pending Subscriptions
+pubsub.command.pending-subscriptions.instruction=Select node to get pending subscriptions.
+pubsub.command.pending-subscriptions.node=Node
+pubsub.command.pending-subscriptions.error.idrequired=ID of node is missing.
+pubsub.command.pending-subscriptions.error.manyIDs=More than one nodeID was selected.
+pubsub.command.pending-subscriptions.success=Pending subscriptions have been sent.
+pubsub.command.pending-subscriptions.error.forbidden=Permission denied.
+pubsub.command.pending-subscriptions.error.badid=Invalid node ID was selected.
\ No newline at end of file