From e033824f8a8782f2da2e5dd71f5703fc4cf7915b Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Fri, 30 Sep 2011 13:26:25 -0700
Subject: WIP INTL-46 Update translation for Traditional Chinese

---
 .../skins/default/xui/zh/floater_about_land.xml    |  80 ++++-----
 .../default/xui/zh/floater_animation_preview.xml   |   4 +-
 .../skins/default/xui/zh/floater_build_options.xml |   4 +-
 .../newview/skins/default/xui/zh/floater_bumps.xml |   2 +-
 .../skins/default/xui/zh/floater_buy_currency.xml  |   2 +-
 .../skins/default/xui/zh/floater_buy_land.xml      |   6 +-
 .../skins/default/xui/zh/floater_critical.xml      |   2 +-
 .../default/xui/zh/floater_day_cycle_options.xml   |   2 +-
 .../skins/default/xui/zh/floater_display_name.xml  |   6 +-
 .../skins/default/xui/zh/floater_image_preview.xml |  14 +-
 .../skins/default/xui/zh/floater_incoming_call.xml |   4 +-
 .../skins/default/xui/zh/floater_inspect.xml       |   6 +-
 .../xui/zh/floater_inventory_view_finder.xml       |   2 +-
 .../skins/default/xui/zh/floater_outgoing_call.xml |   6 +-
 .../default/xui/zh/floater_preview_animation.xml   |   4 +-
 .../skins/default/xui/zh/floater_preview_sound.xml |   4 +-
 .../skins/default/xui/zh/floater_texture_ctrl.xml  |   2 +-
 .../newview/skins/default/xui/zh/floater_tools.xml |  52 +++---
 .../skins/default/xui/zh/floater_url_entry.xml     |   2 +-
 .../default/xui/zh/floater_voice_controls.xml      |   6 +-
 .../skins/default/xui/zh/menu_inventory.xml        |  28 +--
 .../default/xui/zh/menu_inventory_gear_default.xml |   2 +-
 indra/newview/skins/default/xui/zh/menu_viewer.xml | 103 +++++------
 indra/newview/skins/default/xui/zh/mime_types.xml  |   8 +-
 .../skins/default/xui/zh/mime_types_linux.xml      |   8 +-
 .../skins/default/xui/zh/mime_types_mac.xml        |   4 +-
 .../newview/skins/default/xui/zh/notifications.xml | 196 ++++++++++-----------
 .../skins/default/xui/zh/panel_bottomtray.xml      |   2 +-
 .../skins/default/xui/zh/panel_edit_alpha.xml      |  10 +-
 .../skins/default/xui/zh/panel_edit_eyes.xml       |   2 +-
 .../skins/default/xui/zh/panel_edit_gloves.xml     |   2 +-
 .../skins/default/xui/zh/panel_edit_hair.xml       |   2 +-
 .../skins/default/xui/zh/panel_edit_jacket.xml     |   4 +-
 .../skins/default/xui/zh/panel_edit_pants.xml      |   2 +-
 .../skins/default/xui/zh/panel_edit_profile.xml    |   4 +-
 .../skins/default/xui/zh/panel_edit_shirt.xml      |   2 +-
 .../skins/default/xui/zh/panel_edit_shoes.xml      |   2 +-
 .../skins/default/xui/zh/panel_edit_skin.xml       |   6 +-
 .../skins/default/xui/zh/panel_edit_skirt.xml      |   2 +-
 .../skins/default/xui/zh/panel_edit_socks.xml      |   2 +-
 .../skins/default/xui/zh/panel_edit_tattoo.xml     |   4 +-
 .../skins/default/xui/zh/panel_edit_underpants.xml |   2 +-
 .../skins/default/xui/zh/panel_edit_undershirt.xml |   2 +-
 .../skins/default/xui/zh/panel_group_general.xml   |   4 +-
 .../default/xui/zh/panel_group_land_money.xml      |   6 +-
 .../skins/default/xui/zh/panel_main_inventory.xml  |   2 +-
 .../xui/zh/panel_media_settings_general.xml        |   4 +-
 .../xui/zh/panel_media_settings_permissions.xml    |   6 +-
 .../skins/default/xui/zh/panel_my_profile.xml      |   2 +-
 indra/newview/skins/default/xui/zh/panel_notes.xml |   4 +-
 .../default/xui/zh/panel_outfits_inventory.xml     |   2 +-
 .../newview/skins/default/xui/zh/panel_people.xml  |   2 +-
 .../skins/default/xui/zh/panel_place_profile.xml   |   6 +-
 .../default/xui/zh/panel_preferences_graphics1.xml |   4 +-
 .../default/xui/zh/panel_preferences_move.xml      |   2 +-
 .../default/xui/zh/panel_preferences_privacy.xml   |   2 +-
 .../default/xui/zh/panel_prim_media_controls.xml   |  14 +-
 .../skins/default/xui/zh/panel_profile_view.xml    |   8 +-
 .../skins/default/xui/zh/panel_region_general.xml  |   2 +-
 .../skins/default/xui/zh/panel_region_terrain.xml  |  14 +-
 .../skins/default/xui/zh/panel_script_ed.xml       |   2 +-
 .../skins/default/xui/zh/panel_side_tray.xml       |   2 +-
 .../newview/skins/default/xui/zh/role_actions.xml  |   4 +-
 .../skins/default/xui/zh/sidepanel_inventory.xml   |   6 +-
 .../skins/default/xui/zh/sidepanel_task_info.xml   |  16 +-
 indra/newview/skins/default/xui/zh/strings.xml     | 140 +++++++--------
 66 files changed, 432 insertions(+), 431 deletions(-)

(limited to 'indra/newview/skins/default/xui/zh')

diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml
index e59a23fda0..2568d492f0 100644
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -90,19 +90,19 @@
 				群組：
 			</text>
 			<button label="設定" name="Set..."/>
-			<check_box label="Allow Deed to Group" name="check deed" tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation."/>
-			<button label="Deed" name="Deed..." tool_tip="You may only deed land if you are an officer in the selected group."/>
+			<check_box label="允許讓渡給群組" name="check deed" tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation."/>
+			<button label="讓渡" name="Deed..." tool_tip="You may only deed land if you are an officer in the selected group."/>
 			<check_box label="Owner Makes Contribution With Deed" name="check contrib" tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it."/>
 			<text name="For Sale:">
 				出售：
 			</text>
 			<text name="Not for sale.">
-				Not for sale
+				不出售
 			</text>
 			<text name="For Sale: Price L$[PRICE].">
 				Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²)
 			</text>
-			<button label="Sell Land" name="Sell Land..."/>
+			<button label="出售土地" name="Sell Land..."/>
 			<text name="For sale to">
 				出售給：[BUYER]
 			</text>
@@ -134,7 +134,7 @@
 			<button label="購買土地" name="Buy Land..."/>
 			<button label="腳本資訊" name="Scripts..."/>
 			<button label="為群組購買" name="Buy For Group..."/>
-			<button label="購買通行權" name="Buy Pass..." tool_tip="A pass gives you temporary access to this land."/>
+			<button label="購買通行權" name="Buy Pass..." tool_tip="通行權允許你暫時可出入這塊土地。"/>
 			<button label="放棄土地" name="Abandon Land..."/>
 			<button label="Reclaim Land" name="Reclaim Land..."/>
 			<button label="Linden Sale" name="Linden Sale..." tool_tip="Land must be owned, set content, and not already for auction."/>
@@ -212,31 +212,31 @@
 				Region Object Bonus Factor: [BONUS]
 			</text>
 			<text name="Simulator primitive usage:">
-				Primitive usage:
+				幾何元件使用：
 			</text>
 			<text name="objects_available">
-				[COUNT] out of [MAX] ([AVAILABLE] available)
+				使用　[MAX]　中的 [COUNT] （剩餘 [AVAILABLE] 可用）
 			</text>
 			<text name="Primitives parcel supports:">
-				Prims parcel supports:
+				地段所提供的幾何元件數：
 			</text>
 			<text name="object_contrib_text">
 				[COUNT]
 			</text>
 			<text name="Primitives on parcel:">
-				Prims on parcel:
+				地段上的幾何元件數：
 			</text>
 			<text name="total_objects_text">
 				[COUNT]
 			</text>
 			<text name="Owned by parcel owner:">
-				Owned by parcel owner:
+				地段擁有者所擁有：
 			</text>
 			<text name="owner_objects_text">
 				[COUNT]
 			</text>
 			<button label="顯示" label_selected="顯示" name="ShowOwner"/>
-			<button label="退回" name="ReturnOwner..." tool_tip="Return objects to their owners."/>
+			<button label="退回" name="ReturnOwner..." tool_tip="退回物件給它們的擁有者。"/>
 			<text name="Set to group:">
 				設定群組：
 			</text>
@@ -244,15 +244,15 @@
 				[COUNT]
 			</text>
 			<button label="顯示" label_selected="顯示" name="ShowGroup"/>
-			<button label="退回" name="ReturnGroup..." tool_tip="Return objects to their owners."/>
+			<button label="退回" name="ReturnGroup..." tool_tip="退回物件給它們的擁有者。"/>
 			<text name="Owned by others:">
-				Owned by others:
+				其他人所擁有：
 			</text>
 			<text name="other_objects_text">
 				[COUNT]
 			</text>
 			<button label="顯示" label_selected="顯示" name="ShowOther"/>
-			<button label="退回" name="ReturnOther..." tool_tip="Return objects to their owners."/>
+			<button label="退回" name="ReturnOther..." tool_tip="退回物件給它們的擁有者。"/>
 			<text name="Selected / sat upon:">
 				Selected / sat upon:
 			</text>
@@ -263,9 +263,9 @@
 				Auto return other Residents&apos; objects (minutes, 0 for off):
 			</text>
 			<text name="Object Owners:">
-				Object Owners:
+				物件擁有者：
 			</text>
-			<button name="Refresh List" tool_tip="Refresh Object List"/>
+			<button name="Refresh List" tool_tip="刷新物件清單"/>
 			<button label="退回物件" name="Return objects..."/>
 			<name_list name="owner list">
 				<name_list.columns label="Type" name="type"/>
@@ -276,14 +276,14 @@
 		</panel>
 		<panel label="選項" name="land_options_panel">
 			<panel.string name="search_enabled_tooltip">
-				Let people see this parcel in search results
+				讓其他人可以在搜尋結果中看到這塊地段
 			</panel.string>
 			<panel.string name="search_disabled_small_tooltip">
 				This option is disabled because this parcel&apos;s area is 128 m² or smaller.
 Only large parcels can be listed in search.
 			</panel.string>
 			<panel.string name="search_disabled_permissions_tooltip">
-				This option is disabled because you cannot modify this parcel&apos;s options.
+				這個選項已關閉因為你不能修改這個地段的選項。
 			</panel.string>
 			<panel.string name="mature_check_mature">
 				適度成人內容
@@ -331,35 +331,35 @@ Only large parcels can be listed in search.
 			</text>
 			<check_box label="安全（無傷害）" name="check safe" tool_tip="若勾選則設應土地為安全的，傷害性的戰鬥將被關閉。清除勾選後才能進行傷害性的戰鬥。"/>
 			<check_box label="禁止推撞" name="PushRestrictCheck" tool_tip="防止使用腳本推撞。勾選這個選項將可以有效防止你土地上的破壞行為。"/>
-			<check_box label="將地點刊登顯示在搜尋中（L$30 / 每週）" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results"/>
+			<check_box label="將地點刊登顯示在搜尋中（L$30 / 每週）" name="ShowDirectoryCheck" tool_tip="讓其他人可以在搜尋結果中看到這塊地段"/>
 			<combo_box name="land category with adult">
 				<combo_box.item label="任何類別" name="item0"/>
 				<combo_box.item label="Linden Location" name="item1"/>
 				<combo_box.item label="完全成人" name="item2"/>
-				<combo_box.item label="Arts &amp; Culture" name="item3"/>
-				<combo_box.item label="Business" name="item4"/>
-				<combo_box.item label="Educational" name="item5"/>
-				<combo_box.item label="Gaming" name="item6"/>
+				<combo_box.item label="藝術與文化" name="item3"/>
+				<combo_box.item label="商業" name="item4"/>
+				<combo_box.item label="教育" name="item5"/>
+				<combo_box.item label="遊戲" name="item6"/>
 				<combo_box.item label="聚會所" name="item7"/>
-				<combo_box.item label="Newcomer Friendly" name="item8"/>
-				<combo_box.item label="Parks &amp; Nature" name="item9"/>
-				<combo_box.item label="Residential" name="item10"/>
-				<combo_box.item label="Shopping" name="item11"/>
+				<combo_box.item label="新手友善" name="item8"/>
+				<combo_box.item label="公園與自然" name="item9"/>
+				<combo_box.item label="住宅" name="item10"/>
+				<combo_box.item label="採購" name="item11"/>
 				<combo_box.item label="Rental" name="item13"/>
 				<combo_box.item label="Other" name="item12"/>
 			</combo_box>
 			<combo_box name="land category">
 				<combo_box.item label="任何類別" name="item0"/>
 				<combo_box.item label="Linden Location" name="item1"/>
-				<combo_box.item label="Arts &amp; Culture" name="item3"/>
-				<combo_box.item label="Business" name="item4"/>
-				<combo_box.item label="Educational" name="item5"/>
-				<combo_box.item label="Gaming" name="item6"/>
+				<combo_box.item label="藝術與文化" name="item3"/>
+				<combo_box.item label="商業" name="item4"/>
+				<combo_box.item label="教育" name="item5"/>
+				<combo_box.item label="遊戲" name="item6"/>
 				<combo_box.item label="聚會所" name="item7"/>
-				<combo_box.item label="Newcomer Friendly" name="item8"/>
-				<combo_box.item label="Parks &amp; Nature" name="item9"/>
-				<combo_box.item label="Residential" name="item10"/>
-				<combo_box.item label="Shopping" name="item11"/>
+				<combo_box.item label="新手友善" name="item8"/>
+				<combo_box.item label="公園與自然" name="item9"/>
+				<combo_box.item label="住宅" name="item10"/>
+				<combo_box.item label="採購" name="item11"/>
 				<combo_box.item label="Rental" name="item13"/>
 				<combo_box.item label="Other" name="item12"/>
 			</combo_box>
@@ -367,7 +367,7 @@ Only large parcels can be listed in search.
 			<text name="Snapshot:">
 				快照：
 			</text>
-			<texture_picker name="snapshot_ctrl" tool_tip="點擊以挑選圖片"/>
+			<texture_picker name="snapshot_ctrl" tool_tip="點擊以挑選圖像"/>
 			<text name="landing_point">
 				登陸點：[LANDING]
 			</text>
@@ -398,7 +398,7 @@ Only large parcels can be listed in search.
 			<text name="Media texture:">
 				取代材質：
 			</text>
-			<texture_picker name="media texture" tool_tip="點擊以挑選圖片"/>
+			<texture_picker name="media texture" tool_tip="點擊以挑選圖像"/>
 			<text name="replace_texture_help">
 				Objects using this texture will show the movie or web page after you click the play arrow.  Select the thumbnail to choose a different texture.
 			</text>
@@ -412,7 +412,7 @@ Only large parcels can be listed in search.
 				像素
 			</text>
 			<text name="Options:">
-				Options:
+				選項：
 			</text>
 			<check_box label="Loop" name="media_loop" tool_tip="Play media in a loop.  When the media has finished playing, it will restart from the beginning."/>
 		</panel>
@@ -442,14 +442,14 @@ Only large parcels can be listed in search.
 				One or more of these options is set at the estate level
 			</panel.string>
 			<text name="Limit access to this parcel to:">
-				Access To This Parcel
+				出入此地段
 			</text>
 			<text name="Only Allow">
 				Restrict Access to Residents verified by:
 			</text>
 			<check_box label="Payment Information on File [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Ban unidentified Residents."/>
 			<check_box label="年齡驗證 [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."/>
-			<check_box label="允許出入的群組：[GROUP]" name="GroupCheck" tool_tip="Set group in the General tab."/>
+			<check_box label="允許出入的群組：[GROUP]" name="GroupCheck" tool_tip="設定群組於一般頁籤。"/>
 			<check_box label="出售通行權給：" name="PassCheck" tool_tip="允許暫時出入這個地段"/>
 			<combo_box name="pass_combo">
 				<combo_box.item label="Anyone" name="Anyone"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
index baf68ffce6..c5e2eac446 100644
--- a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
@@ -173,8 +173,8 @@ Maximum animation length is [MAX_LENGTH] seconds.
 	</combo_box>
 	<spinner label="淡入（秒）" name="ease_in_time" tool_tip="Amount of time (in seconds) over which animations blends in"/>
 	<spinner label="淡出（秒）" name="ease_out_time" tool_tip="Amount of time (in seconds) over which animations blends out"/>
-	<button name="play_btn" tool_tip="Play your animation"/>
-	<button name="pause_btn" tool_tip="Pause your animation"/>
+	<button name="play_btn" tool_tip="播放你的動作"/>
+	<button name="pause_btn" tool_tip="暫停你的動做"/>
 	<button name="stop_btn" tool_tip="Stop animation playback"/>
 	<text name="bad_animation_text">
 		Unable to read animation file.
diff --git a/indra/newview/skins/default/xui/zh/floater_build_options.xml b/indra/newview/skins/default/xui/zh/floater_build_options.xml
index 95211b746c..b9d3b6b849 100644
--- a/indra/newview/skins/default/xui/zh/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/zh/floater_build_options.xml
@@ -4,7 +4,7 @@
 	<spinner label="Grid Extents (meters)" name="GridDrawSize"/>
 	<check_box label="貼齊至子單位" name="GridSubUnit"/>
 	<check_box label="View cross-sections" name="GridCrossSection"/>
-	<text name="grid_opacity_label" tool_tip="Grid opacity">
-		Opacity:
+	<text name="grid_opacity_label" tool_tip="格線不透明度">
+		不透明度：
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_bumps.xml b/indra/newview/skins/default/xui/zh/floater_bumps.xml
index 64c11af953..2d76a9f831 100644
--- a/indra/newview/skins/default/xui/zh/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bumps.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_bumps" title="BUMPS, PUSHES &amp; HITS">
+<floater name="floater_bumps" title="碰撞、推擠與打擊">
 	<floater.string name="none_detected">
 		未偵測到
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
index f187a1ab40..d63e73c6f1 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
@@ -55,7 +55,7 @@
 		Confirming this purchase only buys L$, not the object.
 	</text>
 	<text name="purchase_warning_notenough">
-		You aren&apos;t buying enough L$. Please increase the amount.
+		你並未購買足夠的林登幣，請先添加一些數量。
 	</text>
 	<button label="立即購買" name="buy_btn"/>
 	<button label="取消" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
index c4a5d174ef..336d14747d 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
@@ -26,10 +26,10 @@ Try selecting a smaller area.
 		You do not have permission to buy land for your active group.
 	</floater.string>
 	<floater.string name="parcel_not_for_sale">
-		The selected parcel is not for sale.
+		所選擇的地段不出售。.
 	</floater.string>
 	<floater.string name="group_already_owns">
-		The group already owns the parcel.
+		這個群組已擁有這個地段。
 	</floater.string>
 	<floater.string name="you_already_own">
 		你已經擁有這個地段。
@@ -62,7 +62,7 @@ Try selecting a smaller area.
 		Cannot buy now:
 	</floater.string>
 	<floater.string name="not_for_sale">
-		Not for sale:
+		不出售：
 	</floater.string>
 	<floater.string name="none_needed">
 		none needed
diff --git a/indra/newview/skins/default/xui/zh/floater_critical.xml b/indra/newview/skins/default/xui/zh/floater_critical.xml
index da357bde56..7d08fe8af2 100644
--- a/indra/newview/skins/default/xui/zh/floater_critical.xml
+++ b/indra/newview/skins/default/xui/zh/floater_critical.xml
@@ -2,7 +2,7 @@
 <floater name="modal container">
 	<button label="繼續" label_selected="繼續" name="Continue"/>
 	<text name="tos_heading">
-		Please read the following message carefully.
+		請仔細閱讀下列的訊息。
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
index 28d2ba6ed4..84186c5836 100644
--- a/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
@@ -85,7 +85,7 @@
 			<text name="DayCycleText3">
 				預覽：
 			</text>
-			<button label="Play" label_selected="Play" name="WLAnimSky"/>
+			<button label="播放" label_selected="播放" name="WLAnimSky"/>
 			<button label="停止!" label_selected="停止" name="WLStopAnimSky"/>
 			<button label="Use Estate Time" label_selected="Go to Estate Time" name="WLUseLindenTime"/>
 			<button label="Save Test Day" label_selected="Save Test Day" name="WLSaveDayCycle"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_display_name.xml b/indra/newview/skins/default/xui/zh/floater_display_name.xml
index 39abfe0b8b..01b5088794 100644
--- a/indra/newview/skins/default/xui/zh/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/zh/floater_display_name.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Display Name" title="CHANGE DISPLAY NAME">
+<floater name="Display Name" title="變更顯示名稱">
 	<text name="info_text">
 		The name you give your avatar is called your Display Name. You can change it once a week.
 	</text>
@@ -7,12 +7,12 @@
 		You cannot change your Display Name until: [TIME].
 	</text>
 	<text name="set_name_label">
-		New Display Name:
+		新顯示名稱：
 	</text>
 	<text name="name_confirm_label">
 		Type your new name again to confirm:
 	</text>
-	<button label="儲存" name="save_btn" tool_tip="Save your new Display Name"/>
+	<button label="儲存" name="save_btn" tool_tip="儲存你的新顯示名稱"/>
 	<button label="重設" name="reset_btn" tool_tip="Make Display Name the same as Username"/>
 	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_image_preview.xml b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
index d7e9a7704c..1260601f90 100644
--- a/indra/newview/skins/default/xui/zh/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
@@ -12,14 +12,14 @@
 	<combo_box label="服裝類型" name="clothing_type_combo">
 		<item label="圖像" name="Image" value="圖像"/>
 		<item label="頭髮" name="Hair" value="頭髮"/>
-		<item label="Female Head" name="FemaleHead" value="Female Head"/>
-		<item label="Female Upper Body" name="FemaleUpperBody" value="Female Upper Body"/>
-		<item label="Female Lower Body" name="FemaleLowerBody" value="Female Lower Body"/>
-		<item label="Male Head" name="MaleHead" value="Male Head"/>
-		<item label="Male Upper Body" name="MaleUpperBody" value="Male Upper Body"/>
-		<item label="Male Lower Body" name="MaleLowerBody" value="Male Lower Body"/>
+		<item label="女性頭部" name="FemaleHead" value="女性頭部"/>
+		<item label="女性上半身" name="FemaleUpperBody" value="女性上半身"/>
+		<item label="女性下半身" name="FemaleLowerBody" value="女性下半身"/>
+		<item label="男性頭部" name="MaleHead" value="男性頭部"/>
+		<item label="男性上半身" name="MaleUpperBody" value="男性上半身"/>
+		<item label="男性下半身" name="MaleLowerBody" value="男性下半身"/>
 		<item label="裙子" name="Skirt" value="裙子"/>
-		<item label="Sculpted Prim" name="SculptedPrim" value="Sculpted Prim"/>
+		<item label="雕刻的幾何元件" name="SculptedPrim" value="雕刻的幾何元件"/>
 	</combo_box>
 	<text name="bad_image_text">
 		無法讀取圖像。
diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
index 123cdd9f2c..a0f31fa11f 100644
--- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
@@ -13,10 +13,10 @@
 		通話中。
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
-		has joined a Voice Chat call with a conference chat.
+		已加訴入會議交談中的語音聊天。
 	</floater.string>
 	<floater.string name="VoiceInviteGroup">
-		just joined &apos;[GROUP]&apos; voice channel.
+		剛加入 &apos;[GROUP]&apos; 語音頻道。
 	</floater.string>
 	<floater.string name="VoiceInviteQuestionGroup">
 		Would you like to leave [CURRENT_CHAT] and join the call with &apos;[GROUP]&apos;?
diff --git a/indra/newview/skins/default/xui/zh/floater_inspect.xml b/indra/newview/skins/default/xui/zh/floater_inspect.xml
index 295538f797..ea3d9d0c3e 100644
--- a/indra/newview/skins/default/xui/zh/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inspect.xml
@@ -5,9 +5,9 @@
 	</floater.string>
 	<scroll_list name="object_list" tool_tip="Select an object from this list to highlight it in-world">
 		<scroll_list.columns label="物件名稱" name="object_name"/>
-		<scroll_list.columns label="Owner Name" name="owner_name"/>
-		<scroll_list.columns label="Creator Name" name="creator_name"/>
-		<scroll_list.columns label="Creation Date" name="creation_date"/>
+		<scroll_list.columns label="擁有者名稱" name="owner_name"/>
+		<scroll_list.columns label="創造者名稱" name="creator_name"/>
+		<scroll_list.columns label="創造日期" name="creation_date"/>
 	</scroll_list>
 	<button label="察看擁有者檔案..." name="button owner" tool_tip="See profile of the highlighted object&apos;s owner"/>
 	<button label="察看創造者檔案..." name="button creator" tool_tip="See profile of the highlighted object&apos;s original creator"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
index 370ab32b9f..d698edf5e5 100644
--- a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
@@ -5,7 +5,7 @@
 	<check_box label="服裝" name="check_clothing"/>
 	<check_box label="姿勢" name="check_gesture"/>
 	<check_box label="地標" name="check_landmark"/>
-	<check_box label="Notecards" name="check_notecard"/>
+	<check_box label="記事卡" name="check_notecard"/>
 	<check_box label="Objects" name="check_object"/>
 	<check_box label="腳本" name="check_script"/>
 	<check_box label="Sounds" name="check_sound"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
index 8b15668e3b..63da47f4de 100644
--- a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
@@ -4,10 +4,10 @@
 		5
 	</floater.string>
 	<floater.string name="localchat">
-		Nearby Voice Chat
+		附近的語音聊天
 	</floater.string>
 	<floater.string name="anonymous">
-		anonymous
+		匿名
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
 		通話中。
@@ -22,7 +22,7 @@
 		Calling [CALLEE_NAME]
 	</text>
 	<text name="noanswer">
-		No Answer.  Please try again later.
+		無應答，請稍候再試。
 	</text>
 	<text name="nearby">
 		You have been disconnected from [VOICE_CHANNEL_NAME].  [RECONNECT_NEARBY]
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
index ead8dc49a6..c435ddc0bd 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
@@ -6,6 +6,6 @@
 	<text name="desc txt">
 		描述：
 	</text>
-	<button label="Play Inworld" label_selected="停止" name="Anim play btn" tool_tip="Play this animation so that others can see it"/>
-	<button label="Play Locally" label_selected="停止" name="Anim audition btn" tool_tip="Play this animation so that only you can see it"/>
+	<button label="播放於虛擬世界" label_selected="停止" name="Anim play btn" tool_tip="Play this animation so that others can see it"/>
+	<button label="播放於本地" label_selected="停止" name="Anim audition btn" tool_tip="Play this animation so that only you can see it"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
index d99d13669f..46844349de 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
@@ -6,6 +6,6 @@
 	<text name="desc txt">
 		描述：
 	</text>
-	<button label="Play Inworld" label_selected="Play Inworld" name="Sound play btn" tool_tip="Play this sound so that others can hear it"/>
-	<button label="Play Locally" label_selected="Play Locally" name="Sound audition btn" tool_tip="Play this sound so that only you can hear it"/>
+	<button label="播放於虛擬世界" label_selected="播放於虛擬世界" name="Sound play btn" tool_tip="Play this sound so that others can hear it"/>
+	<button label="播放於本地" label_selected="播放於本地" name="Sound audition btn" tool_tip="Play this sound so that only you can hear it"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index fc00b0b4a2..01586ac153 100644
--- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="PICK: TEXTURE">
 	<floater.string name="choose_picture">
-		點擊以挑選圖片
+		點擊以挑選圖像
 	</floater.string>
 	<floater.string name="pick title">
 		Pick:
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index c70e70451e..2db98eb3d7 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -48,7 +48,7 @@
 		Drag to move, shift-drag to copy
 	</text>
 	<radio_group name="focus_radio_group">
-		<radio_item label="Zoom" name="radio zoom"/>
+		<radio_item label="縮放" name="radio zoom"/>
 		<radio_item label="環繞（Ctrl）" name="radio orbit"/>
 		<radio_item label="平移（Ctrl+Shift）" name="radio pan"/>
 	</radio_group>
@@ -75,10 +75,10 @@
 	</text>
 	<check_box initial_value="true" label="伸展材質" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="貼齊格線" name="checkbox snap to grid"/>
-	<combo_box name="combobox grid mode" tool_tip="Choose the type of grid ruler for positioning the object">
-		<combo_box.item label="World grid" name="World"/>
-		<combo_box.item label="Local grid" name="Local"/>
-		<combo_box.item label="Reference grid" name="Reference"/>
+	<combo_box name="combobox grid mode" tool_tip="選擇物件定位參考的格線尺度類型">
+		<combo_box.item label="世界格線" name="World"/>
+		<combo_box.item label="地方格線" name="Local"/>
+		<combo_box.item label="參考格線" name="Reference"/>
 	</combo_box>
 	<button name="Options..." tool_tip="察看更多格線選項"/>
 	<button name="ToolCube" tool_tip="Cube"/>
@@ -125,15 +125,15 @@
 		物件： [COUNT]
 	</text>
 	<text name="prim_count">
-		Prims: [COUNT]
+		幾何元件： [COUNT]
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="一般" name="General">
 			<panel.string name="text deed continued">
-				Deed
+				讓渡
 			</panel.string>
 			<panel.string name="text deed">
-				Deed
+				讓渡
 			</panel.string>
 			<panel.string name="text modify info 1">
 				你能修改這個物件
@@ -183,7 +183,7 @@
 			<name_box initial_value="載入中..." name="Group Name Proxy"/>
 			<button name="button set group" tool_tip="選擇一個群組以分享這物件權限"/>
 			<check_box label="分享" name="checkbox share with group" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."/>
-			<button label="Deed" label_selected="Deed" name="button deed" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."/>
+			<button label="讓渡" label_selected="讓渡" name="button deed" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."/>
 			<text name="label click action">
 				點擊以：
 			</text>
@@ -272,7 +272,7 @@
 				<combo_box.item label="Sculpted" name="Sculpted"/>
 			</combo_box>
 			<combo_box name="material">
-				<combo_box.item label="Stone" name="Stone"/>
+				<combo_box.item label="石頭" name="Stone"/>
 				<combo_box.item label="金屬" name="Metal"/>
 				<combo_box.item label="玻璃" name="Glass"/>
 				<combo_box.item label="木頭" name="Wood"/>
@@ -340,7 +340,7 @@
 			<text name="text revolutions">
 				Revolutions
 			</text>
-			<texture_picker label="Sculpt Texture" name="sculpt texture control" tool_tip="點擊以挑選圖片"/>
+			<texture_picker label="Sculpt Texture" name="sculpt texture control" tool_tip="點擊以挑選圖像"/>
 			<check_box label="Mirror" name="sculpt mirror control" tool_tip="Flips sculpted prim along the X axis"/>
 			<check_box label="Inside-out" name="sculpt invert control" tool_tip="Inverts the sculpted prims normals, making it appear inside-out"/>
 			<text name="label sculpt type">
@@ -356,28 +356,28 @@
 		</panel>
 		<panel label="特性" name="Features">
 			<text name="select_single">
-				Select only one primitive to edit features.
+				只能選擇一個幾何元件去編輯細節。
 			</text>
 			<text name="edit_object">
 				編輯物件特性：
 			</text>
-			<check_box label="Flexible Path" name="Flexible1D Checkbox Ctrl" tool_tip="Allows object to flex about the Z axis (Client-side only)"/>
-			<spinner label="Softness" name="FlexNumSections"/>
-			<spinner label="Gravity" name="FlexGravity"/>
-			<spinner label="Drag" name="FlexFriction"/>
-			<spinner label="Wind" name="FlexWind"/>
-			<spinner label="Tension" name="FlexTension"/>
-			<spinner label="Force X" name="FlexForceX"/>
-			<spinner label="Force Y" name="FlexForceY"/>
-			<spinner label="Force Z" name="FlexForceZ"/>
-			<check_box label="Light" name="Light Checkbox Ctrl" tool_tip="Causes object to emit light"/>
+			<check_box label="彈性路徑" name="Flexible1D Checkbox Ctrl" tool_tip="Allows object to flex about the Z axis (Client-side only)"/>
+			<spinner label="柔軟" name="FlexNumSections"/>
+			<spinner label="重力" name="FlexGravity"/>
+			<spinner label="拖曳" name="FlexFriction"/>
+			<spinner label="風力" name="FlexWind"/>
+			<spinner label="張力" name="FlexTension"/>
+			<spinner label="強制 X 軸" name="FlexForceX"/>
+			<spinner label="強制 Y 軸" name="FlexForceY"/>
+			<spinner label="強制 Z 軸" name="FlexForceZ"/>
+			<check_box label="光源" name="Light Checkbox Ctrl" tool_tip="導致物件發光"/>
 			<color_swatch name="colorswatch" tool_tip="點擊以開啟顏色挑選器"/>
 			<texture_picker label="" name="light texture control" tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)"/>
-			<spinner label="Intensity" name="Light Intensity"/>
+			<spinner label="強度" name="Light Intensity"/>
 			<spinner label="FOV" name="Light FOV"/>
-			<spinner label="Radius" name="Light Radius"/>
+			<spinner label="半徑" name="Light Radius"/>
 			<spinner label="Focus" name="Light Focus"/>
-			<spinner label="Falloff" name="Light Falloff"/>
+			<spinner label="衰減" name="Light Falloff"/>
 			<spinner label="Ambiance" name="Light Ambiance"/>
 		</panel>
 		<panel label="材質" name="Texture">
@@ -387,7 +387,7 @@
 			<panel.string name="string repeats per face">
 				每一面重覆次數
 			</panel.string>
-			<texture_picker label="材質" name="texture control" tool_tip="點擊以挑選圖片"/>
+			<texture_picker label="材質" name="texture control" tool_tip="點擊以挑選圖像"/>
 			<color_swatch label="顏色" name="colorswatch" tool_tip="點擊以開啟顏色挑選器"/>
 			<text name="color trans">
 				透明度 %
diff --git a/indra/newview/skins/default/xui/zh/floater_url_entry.xml b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
index 65f6a9cb95..9e3f3cd47d 100644
--- a/indra/newview/skins/default/xui/zh/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
@@ -3,7 +3,7 @@
 	<text name="media_label">
 		媒體 URL：
 	</text>
-	<button label="" name="ok_btn"/>
+	<button label="確定" name="ok_btn"/>
 	<button label="取消" name="cancel_btn"/>
 	<button label="清除" name="clear_btn"/>
 	<text name="loading_label">
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
index c27b80e9c5..24b7efea4f 100644
--- a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="Voice Controls">
+<floater name="floater_voice_controls" title="語音控制">
 	<string name="title_nearby">
-		NEARBY VOICE
+		附近的語音
 	</string>
 	<string name="title_group">
 		與 [GROUP] 進行群組通話
@@ -13,7 +13,7 @@
 		與 [NAME] 進行通話
 	</string>
 	<string name="no_one_near">
-		No one near has voice enabled
+		附近沒有一人開啟語音
 	</string>
 	<layout_stack name="my_call_stack">
 		<layout_panel name="my_panel">
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
index 49a50c97c6..87d769af0d 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -2,17 +2,17 @@
 <menu name="Popup">
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="購買" name="Task Buy"/>
-	<menu_item_call label="Open" name="Task Open"/>
-	<menu_item_call label="Play" name="Task Play"/>
-	<menu_item_call label="Properties" name="Task Properties"/>
+	<menu_item_call label="開啟" name="Task Open"/>
+	<menu_item_call label="播放" name="Task Play"/>
+	<menu_item_call label="屬性" name="Task Properties"/>
 	<menu_item_call label="更名" name="Task Rename"/>
 	<menu_item_call label="刪除" name="Task Remove"/>
 	<menu_item_call label="清空垃圾筒" name="Empty Trash"/>
-	<menu_item_call label="Empty Lost And Found" name="Empty Lost And Found"/>
+	<menu_item_call label="清空 Lost And Found" name="Empty Lost And Found"/>
 	<menu_item_call label="新資料夾" name="New Folder"/>
-	<menu_item_call label="New Script" name="New Script"/>
-	<menu_item_call label="New Notecard" name="New Note"/>
-	<menu_item_call label="New Gesture" name="New Gesture"/>
+	<menu_item_call label="新腳本" name="New Script"/>
+	<menu_item_call label="新記事卡" name="New Note"/>
+	<menu_item_call label="新姿勢" name="New Gesture"/>
 	<menu label="新衣服" name="New Clothes">
 		<menu_item_call label="新襯衫" name="New Shirt"/>
 		<menu_item_call label="新褲子" name="New Pants"/>
@@ -52,11 +52,11 @@
 	<menu_item_call label="添加到目前裝扮" name="Add To Outfit"/>
 	<menu_item_call label="由目前的裝扮移除" name="Remove From Outfit"/>
 	<menu_item_call label="尋找原件" name="Find Original"/>
-	<menu_item_call label="Purge Item" name="Purge Item"/>
-	<menu_item_call label="Restore Item" name="Restore Item"/>
+	<menu_item_call label="清空物品" name="Purge Item"/>
+	<menu_item_call label="恢復物品" name="Restore Item"/>
 	<menu_item_call label="開啟" name="Open"/>
-	<menu_item_call label="Open Original" name="Open Original"/>
-	<menu_item_call label="Properties" name="Properties"/>
+	<menu_item_call label="開啟原件" name="Open Original"/>
+	<menu_item_call label="屬性" name="Properties"/>
 	<menu_item_call label="更名" name="Rename"/>
 	<menu_item_call label="覆製資產 UUID" name="Copy Asset UUID"/>
 	<menu_item_call label="覆製" name="Copy"/>
@@ -68,11 +68,11 @@
 	<menu_item_call label="Start Conference Chat" name="Conference Chat Folder"/>
 	<menu_item_call label="播放" name="Sound Play"/>
 	<menu_item_call label="添加地標" name="About Landmark"/>
-	<menu_item_call label="Play Inworld" name="Animation Play"/>
-	<menu_item_call label="Play Locally" name="Animation Audition"/>
+	<menu_item_call label="播放於虛擬世界" name="Animation Play"/>
+	<menu_item_call label="播放於本地" name="Animation Audition"/>
 	<menu_item_call label="送出即時訊息" name="Send Instant Message"/>
 	<menu_item_call label="發給瞬間傳送請求..." name="Offer Teleport..."/>
-	<menu_item_call label="Start Conference Chat" name="Conference Chat"/>
+	<menu_item_call label="開始會議交談" name="Conference Chat"/>
 	<menu_item_call label="Activate" name="Activate"/>
 	<menu_item_call label="Deactivate" name="Deactivate"/>
 	<menu_item_call label="另存" name="Save As"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
index 74b90ada5e..8ad0e7324f 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
@@ -6,7 +6,7 @@
 	<menu_item_check label="總是由名稱排序資料夾" name="sort_folders_by_name"/>
 	<menu_item_check label="系統資料夾排序到最上方" name="sort_system_folders_to_top"/>
 	<menu_item_call label="顯示過濾器" name="show_filters"/>
-	<menu_item_call label="Reset Filters" name="reset_filters"/>
+	<menu_item_call label="重設過濾器" name="reset_filters"/>
 	<menu_item_call label="關閉全部資料夾" name="close_folders"/>
 	<menu_item_call label="清空 Lost and Found" name="empty_lostnfound"/>
 	<menu_item_call label="儲存材質為" name="Save Texture As"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index a51e26c3f4..f7be781cac 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -139,45 +139,46 @@
 		<menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/>
 		<menu_item_check label="高解析度快照" name="HighResSnapshot"/>
 		<menu_item_check label="靜音拍攝快照到硬碟" name="QuietSnapshotsToDisk"/>
+		<menu_item_check label="壓縮快照存到硬碟" name="CompressSnapshotsToDisk"/>
 		<menu label="效能工具" name="Performance Tools">
 			<menu_item_call label="Lag Meter" name="Lag Meter"/>
 			<menu_item_check label="統計列" name="Statistics Bar"/>
 			<menu_item_check label="Show Avatar Rendering Cost" name="Avatar Rendering Cost"/>
 		</menu>
-		<menu label="Highlighting and Visibility" name="Highlighting and Visibility">
+		<menu label="高亮顯示與可見度" name="Highlighting and Visibility">
 			<menu_item_check label="Cheesy Beacon" name="Cheesy Beacon"/>
-			<menu_item_check label="Hide Particles" name="Hide Particles"/>
-			<menu_item_check label="Hide Selected" name="Hide Selected"/>
+			<menu_item_check label="隱藏粒子效果" name="Hide Particles"/>
+			<menu_item_check label="隱藏所選擇的" name="Hide Selected"/>
 			<menu_item_check label="高亮顯示透明物件" name="Highlight Transparent"/>
 			<menu_item_check label="顯示 HUD 附件" name="Show HUD Attachments"/>
-			<menu_item_check label="Show Mouselook Crosshairs" name="ShowCrosshairs"/>
+			<menu_item_check label="顯示第一人稱視角準星" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Rendering Types" name="Rendering Types">
-			<menu_item_check label="Simple" name="Simple"/>
+			<menu_item_check label="簡單" name="Simple"/>
 			<menu_item_check label="半透明" name="Alpha"/>
-			<menu_item_check label="Tree" name="Tree"/>
-			<menu_item_check label="Avatars" name="Character"/>
-			<menu_item_check label="SurfacePath" name="SurfacePath"/>
-			<menu_item_check label="Sky" name="Sky"/>
-			<menu_item_check label="Water" name="Water"/>
-			<menu_item_check label="Ground" name="Ground"/>
-			<menu_item_check label="Volume" name="Volume"/>
-			<menu_item_check label="Grass" name="Grass"/>
-			<menu_item_check label="Clouds" name="Clouds"/>
-			<menu_item_check label="Particles" name="Particles"/>
-			<menu_item_check label="Bump" name="Bump"/>
+			<menu_item_check label="樹木" name="Tree"/>
+			<menu_item_check label="化身" name="Character"/>
+			<menu_item_check label="地表" name="SurfacePath"/>
+			<menu_item_check label="天空" name="Sky"/>
+			<menu_item_check label="水文" name="Water"/>
+			<menu_item_check label="地面" name="Ground"/>
+			<menu_item_check label="體積" name="Volume"/>
+			<menu_item_check label="草地" name="Grass"/>
+			<menu_item_check label="雲彩" name="Clouds"/>
+			<menu_item_check label="粒子效果" name="Particles"/>
+			<menu_item_check label="碰撞" name="Bump"/>
 		</menu>
 		<menu label="Rendering Features" name="Rendering Features">
 			<menu_item_check label="UI" name="UI"/>
 			<menu_item_check label="Selected" name="Selected"/>
 			<menu_item_check label="Highlighted" name="Highlighted"/>
 			<menu_item_check label="Dynamic Textures" name="Dynamic Textures"/>
-			<menu_item_check label="Foot Shadows" name="Foot Shadows"/>
-			<menu_item_check label="Fog" name="Fog"/>
+			<menu_item_check label="腳步陰影" name="Foot Shadows"/>
+			<menu_item_check label="霧氣" name="Fog"/>
 			<menu_item_check label="Test FRInfo" name="Test FRInfo"/>
-			<menu_item_check label="Flexible Objects" name="Flexible Objects"/>
+			<menu_item_check label="彈性物件" name="Flexible Objects"/>
 		</menu>
-		<menu_item_check label="Use Plugin Read Thread" name="Use Plugin Read Thread"/>
+		<menu_item_check label="使用外卦讀取緒" name="Use Plugin Read Thread"/>
 		<menu_item_call label="清除群組快取資料" name="ClearGroupCache"/>
 		<menu_item_check label="滑鼠平滑移動" name="Mouse Smoothing"/>
 		<menu label="快速鍵" name="Shortcuts">
@@ -213,13 +214,13 @@
 			<menu_item_check label="除錯控制台" name="Debug Console"/>
 			<menu_item_call label="通知控制台" name="Notifications"/>
 			<menu_item_check label="材質尺寸控制台" name="Texture Size"/>
-			<menu_item_check label="Texture Category Console" name="Texture Category"/>
-			<menu_item_check label="Fast Timers" name="Fast Timers"/>
+			<menu_item_check label="材質分類控制台" name="Texture Category"/>
+			<menu_item_check label="快速碼錶" name="Fast Timers"/>
 			<menu_item_check label="記憶體" name="Memory"/>
-			<menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/>
+			<menu_item_call label="地區資訊傳至除錯控制台" name="Region Info to Debug Console"/>
 			<menu_item_call label="群組資訊至除錯控制台" name="Group Info to Debug Console"/>
 			<menu_item_call label="Capabilities Info to Debug Console" name="Capabilities Info to Debug Console"/>
-			<menu_item_check label="Camera" name="Camera"/>
+			<menu_item_check label="攝影機" name="Camera"/>
 			<menu_item_check label="風力" name="Wind"/>
 			<menu_item_check label="FOV" name="FOV"/>
 			<menu_item_check label="Badge" name="Badge"/>
@@ -244,7 +245,7 @@
 			<menu_item_call label="模擬記憶體不足" name="Memory Leaking Simulation"/>
 		</menu>
 		<menu label="Render Tests" name="Render Tests">
-			<menu_item_check label="Camera Offset" name="Camera Offset"/>
+			<menu_item_check label="攝影機位移" name="Camera Offset"/>
 			<menu_item_check label="Randomize Framerate" name="Randomize Framerate"/>
 			<menu_item_check label="Periodic Slow Frame" name="Periodic Slow Frame"/>
 			<menu_item_check label="Frame Test" name="Frame Test"/>
@@ -275,12 +276,12 @@
 			<menu_item_check label="Shadows from Sun/Moon/Projectors" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO and Shadow Smoothing" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Global Illumination (experimental)" name="Global Illumination"/>
-			<menu_item_check label="Debug GL" name="Debug GL"/>
-			<menu_item_check label="Debug Pipeline" name="Debug Pipeline"/>
+			<menu_item_check label="GL 除錯" name="Debug GL"/>
+			<menu_item_check label="管線除錯" name="Debug Pipeline"/>
 			<menu_item_check label="自動半透明遮罩（遞延）" name="Automatic Alpha Masks (deferred)"/>
 			<menu_item_check label="自動半透明遮罩（非遞延）" name="Automatic Alpha Masks (non-deferred)"/>
 			<menu_item_check label="Animation Textures" name="Animation Textures"/>
-			<menu_item_check label="Disable Textures" name="Disable Textures"/>
+			<menu_item_check label="關閉材質" name="Disable Textures"/>
 			<menu_item_check label="Full Res Textures" name="Rull Res Textures"/>
 			<menu_item_check label="Audit Textures" name="Audit Textures"/>
 			<menu_item_check label="Texture Atlas (experimental)" name="Texture Atlas"/>
@@ -297,30 +298,30 @@
 			<menu_item_call label="Drop a Packet" name="Drop a Packet"/>
 		</menu>
 		<menu_item_call label="Dump Scripted Camera" name="Dump Scripted Camera"/>
-		<menu_item_call label="Bumps, Pushes &amp; Hits" name="Bumps, Pushes &amp;amp; Hits"/>
-		<menu label="Recorder" name="Recorder">
-			<menu_item_call label="Start Playback" name="Start Playback"/>
-			<menu_item_call label="Stop Playback" name="Stop Playback"/>
-			<menu_item_check label="Loop Playback" name="Loop Playback"/>
-			<menu_item_call label="Start Record" name="Start Record"/>
-			<menu_item_call label="Stop Record" name="Stop Record"/>
-		</menu>
-		<menu label="World" name="World">
-			<menu_item_check label="Sim Sun Override" name="Sim Sun Override"/>
+		<menu_item_call label="碰撞、推擠與打擊" name="Bumps, Pushes &amp;amp; Hits"/>
+		<menu label="錄製器" name="Recorder">
+			<menu_item_call label="開始播放" name="Start Playback"/>
+			<menu_item_call label="停止播放" name="Stop Playback"/>
+			<menu_item_check label="循環播放" name="Loop Playback"/>
+			<menu_item_call label="開始錄製" name="Start Record"/>
+			<menu_item_call label="停止錄製" name="Stop Record"/>
+		</menu>
+		<menu label="世界" name="World">
+			<menu_item_check label="模擬器太陽設定覆蓋" name="Sim Sun Override"/>
 			<menu_item_check label="Cheesy Beacon" name="Cheesy Beacon"/>
-			<menu_item_check label="Fixed Weather" name="Fixed Weather"/>
+			<menu_item_check label="固定天氣" name="Fixed Weather"/>
 			<menu_item_call label="傾印地區物件快取" name="Dump Region Object Cache"/>
 		</menu>
 		<menu label="UI" name="UI">
-			<menu_item_call label="Media Browser Test" name="Web Browser Test"/>
-			<menu_item_call label="Web Content Browser" name="Web Content Browser"/>
+			<menu_item_call label="測試媒體瀏覽器" name="Web Browser Test"/>
+			<menu_item_call label="網頁內容瀏覽器" name="Web Content Browser"/>
 			<menu_item_call label="Dump SelectMgr" name="Dump SelectMgr"/>
 			<menu_item_call label="傾印收納區" name="Dump Inventory"/>
-			<menu_item_call label="Dump Timers" name="Dump Timers"/>
+			<menu_item_call label="傾印碼錶" name="Dump Timers"/>
 			<menu_item_call label="Dump Focus Holder" name="Dump Focus Holder"/>
 			<menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/>
 			<menu_item_call label="Print Agent Info" name="Print Agent Info"/>
-			<menu_item_call label="Memory Stats" name="Memory Stats"/>
+			<menu_item_call label="計憶體狀態" name="Memory Stats"/>
 			<menu_item_check label="Region Debug Console" name="Region Debug Console"/>
 			<menu_item_check label="Debug SelectMgr" name="Debug SelectMgr"/>
 			<menu_item_check label="Debug Clicks" name="Debug Clicks"/>
@@ -331,9 +332,9 @@
 			<menu_item_check label="Debug WindowProc" name="Debug WindowProc"/>
 		</menu>
 		<menu label="XUI" name="XUI">
-			<menu_item_call label="Reload Color Settings" name="Reload Color Settings"/>
-			<menu_item_call label="Show Font Test" name="Show Font Test"/>
-			<menu_item_check label="Show XUI Names" name="Show XUI Names"/>
+			<menu_item_call label="重新載入顏色設定" name="Reload Color Settings"/>
+			<menu_item_call label="顯示字型測試" name="Show Font Test"/>
+			<menu_item_check label="顯示 XUI 名稱" name="Show XUI Names"/>
 			<menu_item_call label="送出測試 IMs" name="Send Test IMs"/>
 			<menu_item_call label="沖洗名稱快取資料" name="Flush Names Caches"/>
 		</menu>
@@ -348,12 +349,12 @@
 			<menu label="Character Tests" name="Character Tests">
 				<menu_item_call label="Appearance To XML" name="Appearance To XML"/>
 				<menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/>
-				<menu_item_call label="Test Male" name="Test Male"/>
-				<menu_item_call label="Test Female" name="Test Female"/>
-				<menu_item_call label="Toggle PG" name="Toggle PG"/>
-				<menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/>
+				<menu_item_call label="男性測試" name="Test Male"/>
+				<menu_item_call label="女性測試" name="Test Female"/>
+				<menu_item_call label="PG　切換" name="Toggle PG"/>
+				<menu_item_check label="允許選擇化身" name="Allow Select Avatar"/>
 			</menu>
-			<menu_item_call label="Force Params to Default" name="Force Params to Default"/>
+			<menu_item_call label="強制參數為預設值" name="Force Params to Default"/>
 			<menu_item_check label="動作資訊" name="Animation Info"/>
 			<menu_item_check label="慢動作" name="Slow Motion Animations"/>
 			<menu_item_check label="顯示注視在" name="Show Look At"/>
diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml
index 89fe92fabc..8ac1bf6920 100644
--- a/indra/newview/skins/default/xui/zh/mime_types.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -27,10 +27,10 @@
 			圖像
 		</label>
 		<tooltip name="image_tooltip">
-			There is an image at this location
+			有一個圖像在此位置
 		</tooltip>
 		<playtip name="image_playtip">
-			View this location&apos;s image
+			察看這個位置的圖像
 		</playtip>
 	</widgetset>
 	<widgetset name="audio">
@@ -38,10 +38,10 @@
 			音頻
 		</label>
 		<tooltip name="audio_tooltip">
-			There is audio at this location
+			有一個音頻在此位置
 		</tooltip>
 		<playtip name="audio_playtip">
-			Play this location&apos;s audio
+			播放這個硾的音頻
 		</playtip>
 	</widgetset>
 	<scheme name="rtsp">
diff --git a/indra/newview/skins/default/xui/zh/mime_types_linux.xml b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
index 08839abe6a..90f17b841c 100644
--- a/indra/newview/skins/default/xui/zh/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
@@ -30,7 +30,7 @@
 			There is an image at this location
 		</tooltip>
 		<playtip name="image_playtip">
-			View this location&apos;s image
+			察看這個位置的圖像
 		</playtip>
 	</widgetset>
 	<widgetset name="audio">
@@ -38,10 +38,10 @@
 			音頻
 		</label>
 		<tooltip name="audio_tooltip">
-			There is audio at this location
+			有一個音頻在此位置
 		</tooltip>
 		<playtip name="audio_playtip">
-			Play this location&apos;s audio
+			播放這個位置的音頻
 		</playtip>
 	</widgetset>
 	<scheme name="rtsp">
@@ -66,7 +66,7 @@
 	</mimetype>
 	<mimetype name="video/*">
 		<label name="video2_label">
-			Video
+			影片
 		</label>
 	</mimetype>
 	<mimetype name="image/*">
diff --git a/indra/newview/skins/default/xui/zh/mime_types_mac.xml b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
index 7958f64219..b8105c145c 100644
--- a/indra/newview/skins/default/xui/zh/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
@@ -27,10 +27,10 @@
 			圖像
 		</label>
 		<tooltip name="image_tooltip">
-			有一個影像在此位置
+			有一個圖像在此位置
 		</tooltip>
 		<playtip name="image_playtip">
-			察看在此位置的影像
+			察看在此位置的圖像
 		</playtip>
 	</widgetset>
 	<widgetset name="audio">
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 1c89e9b522..2d309a2af0 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -758,16 +758,16 @@ No parcel selected.
 No region selected.
 	</notification>
 	<notification name="CannotReleaseLandNothingSelected">
-		Unable to abandon land:
-No parcel selected.
+		無法放棄土地：
+無地段被選擇。
 	</notification>
 	<notification name="CannotReleaseLandNoRegion">
 		無法放棄土地：
 無法尋找地區。
 	</notification>
 	<notification name="CannotBuyLandNothingSelected">
-		Unable to buy land:
-No parcel selected.
+		無法購買土地：
+無地段被選擇。
 	</notification>
 	<notification name="CannotBuyLandNoRegion">
 		Unable to buy land:
@@ -777,121 +777,121 @@ Cannot find the region this land is in.
 		You cannot close the Buy Land window until [APP_NAME] estimates the price of this transaction.
 	</notification>
 	<notification name="CannotDeedLandNothingSelected">
-		Unable to deed land:
+		無法讓渡土地：
 無地段被選取。
 	</notification>
 	<notification name="CannotDeedLandNoGroup">
-		Unable to deed land:
+		無法讓渡土地：
 無群組被選取。
 	</notification>
 	<notification name="CannotDeedLandNoRegion">
-		Unable to deed land:
-Cannot find the region this land is in.
+		無法讓渡土地：
+無法發現這塊土地所在的地區。
 	</notification>
 	<notification name="CannotDeedLandMultipleSelected">
-		Unable to deed land:
-Multiple parcels selected.
+		無法讓渡土地：
+複數地段被選取。
 
-Try selecting a single parcel.
+請試著選取單一地段。
 	</notification>
 	<notification name="CannotDeedLandWaitingForServer">
-		Unable to deed land:
-Waiting for server to report ownership.
+		無法讓渡土地：
+等候伺服器報告擁有權。
 
-Please try again.
+請再試一次。
 	</notification>
 	<notification name="CannotDeedLandNoTransfer">
-		Unable to deed land:
-The region [REGION] does not allow transfer of land.
+		無法讓渡土地：
+此 [REGION] 地區並不允許土地轉移。
 	</notification>
 	<notification name="CannotReleaseLandWatingForServer">
-		Unable to abandon land:
-Waiting for server to update parcel information.
+		無法放棄土地：
+等候伺服器更新地段資訊。
 
-Try again in a few seconds.
+請稍後幾秒再試一次。
 	</notification>
 	<notification name="CannotReleaseLandSelected">
-		Unable to abandon land:
-You do not own all the parcels selected.
+		無法放棄土地：
+你並位擁有所選擇的全部土地。
 
-Please select a single parcel.
+請選擇一個單一地段。
 	</notification>
 	<notification name="CannotReleaseLandDontOwn">
-		Unable to abandon land:
-You don&apos;t have permission to release this parcel.
-Parcels you own appear in green.
+		無法放棄土地：
+你並沒有權限去釋出這個地段。
+你所擁有的地段將呈現綠色。
 	</notification>
 	<notification name="CannotReleaseLandRegionNotFound">
-		Unable to abandon land:
-Cannot find the region this land is in.
+		無法放棄土地：
+無法發現這快土地所在的地區。
 	</notification>
 	<notification name="CannotReleaseLandNoTransfer">
-		Unable to abandon land:
-The region [REGION] does not allow transfer of land.
+		無法放棄土地：
+此 [REGION] 地區並不許土地轉移。
 	</notification>
 	<notification name="CannotReleaseLandPartialSelection">
-		Unable to abandon land:
-You must select an entire parcel to release it.
+		無法放棄土地：
+你必須選取一整個地段以釋出它。
 
-Select an entire parcel, or divide your parcel first.
+選取一整個地段，或先進行分割。
 	</notification>
 	<notification name="ReleaseLandWarning">
-		You are about to release [AREA] m² of land.
-Releasing this parcel will remove it from your land holdings, but will not grant any L$.
+		你釋出約 [AREA] m² 面積土地。
+釋出個地段將會由你所持有的土地中移除，但不會給予任何 L$。
 
-Release this land?
+你確定要釋出這塊土地？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="CannotDivideLandNothingSelected">
-		Unable to divide land:
+		無法分割土地：
 
-No parcels selected.
+無地段被選取。
 	</notification>
 	<notification name="CannotDivideLandPartialSelection">
-		Unable to divide land:
+		無法分割土地：
 
-You have an entire parcel selected.
-Try selecting a part of the parcel.
+你現在選取整個地段。
+請試著選取其中部分地段。
 	</notification>
 	<notification name="LandDivideWarning">
-		Dividing this land will split this parcel into two and each parcel can have its own settings. Some settings will be reset to defaults after the operation.
+		分割土地會將佌地段一分為二，每一個地段將都各自有其設定。 在這個操作之後，一些設定值將會回復到預設值。
 
-Divide land?
+進行分割土地？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="CannotDivideLandNoRegion">
-		Unable to divide land:
-Cannot find the region this land is in.
+		無法分割土地：
+無法發現這塊土地所在的地區。
 	</notification>
 	<notification name="CannotJoinLandNoRegion">
-		Unable to join land:
-Cannot find the region this land is in.
+		無法合併土地：
+無法發現這塊土地所在的地區。
 	</notification>
 	<notification name="CannotJoinLandNothingSelected">
-		Unable to join land:
-No parcels selected.
+		無法合併土地：
+無地段被選取。
 	</notification>
 	<notification name="CannotJoinLandEntireParcelSelected">
-		Unable to join land:
-You only have one parcel selected.
+		無法合併土地：
+你只有選取一個地段。
 
-Select land across both parcels.
+請跨越兩個地段選取土地。
 	</notification>
 	<notification name="CannotJoinLandSelection">
-		Unable to join land:
-You must select more than one parcel.
+		無法合併土地：
+你必須選取超過一個地段。
 
-Select land across both parcels.
+請跨越兩個地段選取土地。
 	</notification>
 	<notification name="JoinLandWarning">
-		Joining this land will create one large parcel out of all parcels intersecting the selected rectangle.
-You will need to reset the name and options of the new parcel.
+		合併土地將會在選取的全部地段範圍裡產生一個巨大的地段。
+你將會需要重設這個新地段的名稱與設定選項。
 
-Join land?
+進行土地合併？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmNotecardSave">
-		This notecard needs to be saved before the item can be copied or viewed. Save notecard?
+		在物品能被覆製或察看前，這記事卡必須先進行儲存。儲存記事卡？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmItemCopy">
@@ -1377,7 +1377,7 @@ We must restart [APP_NAME] to install the update.
 	<notification name="DeedObjectToGroup">
 		Deeding this object will cause the group to:
 * Receive L$ paid into the object
-		<usetemplate ignoretext="在我讓渡一個物件給群組前確認" name="okcancelignore" notext="取消" yestext="Deed"/>
+		<usetemplate ignoretext="在我讓渡一個物件給群組前確認" name="okcancelignore" notext="取消" yestext="讓渡"/>
 	</notification>
 	<notification name="WebLaunchExternalTarget">
 		你確定要開啟網頁瀏覽器去察看這個內容？
@@ -1457,7 +1457,7 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo
 	<notification name="JoinedTooManyGroupsMember">
 		You have reached your maximum number of groups. Please leave another group before joining this one, or decline the offer.
 [NAME] has invited you to join a group as a member.
-		<usetemplate name="okcancelbuttons" notext="Decline" yestext="加入"/>
+		<usetemplate name="okcancelbuttons" notext="謝絕" yestext="加入"/>
 	</notification>
 	<notification name="JoinedTooManyGroups">
 		You have reached your maximum number of groups. Please leave some group before joining or creating a new one.
@@ -1509,12 +1509,12 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo
 Just like in real life, it takes a while for everyone to learn about a new name.  Please allow several days for [http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update] in objects, scripts, search, etc.
 	</notification>
 	<notification name="SetDisplayNameBlocked">
-		Sorry, you cannot change your display name. If you feel this is in error, please contact support.
+		抱歉，你不可以變更你的顯示名稱。如果你覺得這是錯誤，請連繫支援廠商。
 	</notification>
 	<notification name="SetDisplayNameFailedLength">
-		Sorry, that name is too long.  Display names can have a maximum of [LENGTH] characters.
+		抱歉，這名稱太長。顯示名稱最大長度為 [LENGTH] 字元。
 
-Please try a shorter name.
+請嘗試短一些的名稱。
 	</notification>
 	<notification name="SetDisplayNameFailedGeneric">
 		Sorry, we could not set your display name.  Please try again later.
@@ -1890,7 +1890,7 @@ Move the inventory item(s)?
 	</notification>
 	<notification name="ConfirmQuit">
 		你確定你要結束退出？
-		<usetemplate ignoretext="當我結束退出時進行確認" name="okcancelignore" notext="不結束退出" yestext="結束退出"/>
+		<usetemplate ignoretext="當我結束退出時進行確認" name="okcancelignore" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<notification name="DeleteItems">
 		[QUESTION]
@@ -1941,11 +1941,11 @@ Linden Lab
 		The following required components are missing from [FLOATER]:
 [COMPONENTS]
 	</notification>
-	<notification label="Replace Existing Attachment" name="ReplaceAttachment">
+	<notification label="取代現有的附件" name="ReplaceAttachment">
 		There is already an object attached to this point on your body.
 Do you want to replace it with the selected object?
 		<form name="form">
-			<ignore name="ignore" text="Replace an existing attachment with the selected item"/>
+			<ignore name="ignore" text="以所選擇的物品取代現有的附加物"/>
 			<button ignore="自動取代" name="Yes" text="確定"/>
 			<button ignore="絕不取代" name="No" text="取消"/>
 		</form>
@@ -2109,10 +2109,10 @@ Link to this from a web page to give others easy access to this location, or try
 		Topic: [SUBJECT], Message: [MESSAGE]
 	</notification>
 	<notification name="FriendOnline">
-		[NAME] is Online
+		[NAME] 上線
 	</notification>
 	<notification name="FriendOffline">
-		[NAME] is Offline
+		[NAME] 離線
 	</notification>
 	<notification name="AddSelfFriend">
 		Although you&apos;re very nice, you can&apos;t add yourself as a friend.
@@ -2208,7 +2208,7 @@ Please select a single object.
 		[NAME] 接收到你提供的收納區物品。
 	</notification>
 	<notification name="InventoryDeclined">
-		[NAME] 拒絕你提供的收納區物品。
+		[NAME] 謝絕你提供的收納區物品。
 	</notification>
 	<notification name="ObjectMessage">
 		[NAME]: [MESSAGE]
@@ -2418,7 +2418,7 @@ Please try again in a few moments.
 	</notification>
 	<notification name="ObjectGiveItem">
 		An object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; owned by [NAME_SLURL] has given you this [OBJECTTYPE]:
-&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
+[ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Keep"/>
 			<button name="Discard" text="Discard"/>
@@ -2443,7 +2443,7 @@ Please try again in a few moments.
 		[MESSAGE]
 		<form name="form">
 			<button name="Join" text="加入"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="謝絕"/>
 			<button name="Info" text="資訊"/>
 		</form>
 	</notification>
@@ -2475,7 +2475,7 @@ Please try again in a few moments.
 (By default, you will be able to see each other&apos;s online status.)
 		<form name="form">
 			<button name="Accept" text="接受"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="謝絕"/>
 		</form>
 	</notification>
 	<notification name="FriendshipOffered">
@@ -2487,27 +2487,27 @@ Please try again in a few moments.
 (By default, you will be able to see each other&apos;s online status.)
 		<form name="form">
 			<button name="Accept" text="接受"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="謝絕"/>
 		</form>
 	</notification>
 	<notification name="FriendshipAccepted">
 		[NAME] accepted your friendship offer.
 	</notification>
 	<notification name="FriendshipDeclined">
-		[NAME] declined your friendship offer.
+		[NAME] 謝絕你的交友邀請。
 	</notification>
 	<notification name="FriendshipAcceptedByMe">
-		Friendship offer accepted.
+		交友邀請被接受。
 	</notification>
 	<notification name="FriendshipDeclinedByMe">
-		Friendship offer declined.
+		交友邀請被謝絕。
 	</notification>
 	<notification name="OfferCallingCard">
 		[NAME] is offering their calling card.
 This will add a bookmark in your inventory so you can quickly IM this Resident.
 		<form name="form">
 			<button name="Accept" text="接受"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="謝絕"/>
 		</form>
 	</notification>
 	<notification name="RegionRestartMinutes">
@@ -2559,7 +2559,7 @@ Grant this request?
 		<form name="form">
 			<button name="Grant" text="Grant"/>
 			<button name="Deny" text="Deny"/>
-			<button name="Details" text="Details..."/>
+			<button name="Details" text="細節..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -2602,7 +2602,7 @@ Things you build here will be deleted after you leave, so don&apos;t forget to r
 Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
 		<form name="form">
 			<button name="Accept" text="接受"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="謝絕"/>
 			<button name="Mute" text="Block"/>
 		</form>
 	</notification>
@@ -2620,7 +2620,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Block
 Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
 		<form name="form">
 			<button name="Accept" text="接受"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="謝絕"/>
 			<button name="Mute" text="Block"/>
 		</form>
 	</notification>
@@ -2629,7 +2629,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Block
 Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
 		<form name="form">
 			<button name="Accept" text="接受"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="謝絕"/>
 			<button name="Mute" text="Block"/>
 		</form>
 	</notification>
@@ -2638,7 +2638,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Block
 Click Accept to join the chat or Decline to decline the invitation. Click Block to block this caller.
 		<form name="form">
 			<button name="Accept" text="接受"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="謝絕"/>
 			<button name="Mute" text="Block"/>
 		</form>
 	</notification>
@@ -2757,10 +2757,10 @@ With the following Residents:
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ItemsShared">
-		Items successfully shared.
+		物品已成功分享。
 	</notification>
 	<notification name="DeedToGroupFail">
-		Deed to group failed.
+		讓渡給群組失敗。
 	</notification>
 	<notification name="AvatarRezNotification">
 		( [EXISTENCE] seconds alive )
@@ -2822,7 +2822,7 @@ You uploaded a [RESOLUTION] baked texture for &apos;[BODYREGION]&apos; after [TI
 You locally updated a [RESOLUTION] baked texture for &apos;[BODYREGION]&apos; after [TIME] seconds.
 	</notification>
 	<notification name="ConfirmLeaveCall">
-		Are you sure you want to leave this call?
+		你確定要離開這段通話？
 		<usetemplate ignoretext="我結束通話前進行確認" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="ConfirmMuteAll">
@@ -2846,7 +2846,7 @@ Click on the up arrow to see the voice control panel.
 
 Hiding the Speak button will disable the voice feature.
 	</notification>
-	<notification label="Explore the World" name="HintDestinationGuide">
+	<notification label="探索世界" name="HintDestinationGuide">
 		The Destination Guide contains thousands of new places to discover. Select a location and choose Teleport to start exploring.
 	</notification>
 	<notification label="側邊欄" name="HintSidePanel">
@@ -2862,7 +2862,7 @@ Click anywhere on the ground to walk to that spot.
 2. Click and Drag to Rotate View
 Click and drag anywhere on the world to rotate your view
 	</notification>
-	<notification label="Display Name" name="HintDisplayName">
+	<notification label="顯示名稱" name="HintDisplayName">
 		Set your customizable display name here. This is in addition to your unique username, which can&apos;t be changed. You can change how you see other people&apos;s names in your preferences.
 	</notification>
 	<notification label="View" name="HintView">
@@ -2871,7 +2871,7 @@ Click and drag anywhere on the world to rotate your view
 	<notification label="收納區" name="HintInventory">
 		Check your inventory to find items. Newest items can be easily found in the Recent tab.
 	</notification>
-	<notification label="You&apos;ve got Linden Dollars!" name="HintLindenDollar">
+	<notification label="你得到林登幣!" name="HintLindenDollar">
 		Here&apos;s your current balance of L$. Click Buy L$ to purchase more Linden Dollars.
 	</notification>
 	<notification name="PopupAttempt">
@@ -2892,38 +2892,38 @@ Click and drag anywhere on the world to rotate your view
 	</notification>
 	<notification label="" name="ModeChange">
 		改變劉覽器模式要求你必須結束退出並重新啟動。
-		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoClassifieds">
 		Creation and editing of Classifieds is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
-		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoGroupInfo">
 		Creation and editing of Groups is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
-		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoPicks">
 		Creation and editing of Picks is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
-		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoWorldMap">
 		Viewing of the world map is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
-		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoVoiceCall">
 		Voice calls are only available in Advanced mode. Would you like to logout and change modes?
-		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoAvatarShare">
 		Sharing is only available in Advanced mode. Would you like to logout and change modes?
-		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoAvatarPay">
 		Paying other residents is only available in Advanced mode. Would you like to logout and change modes?
-		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<global name="UnsupportedCPU">
-		- Your CPU speed does not meet the minimum requirements.
+		- 你的 CPU 運算速度未達到系統最低配備要求。
 	</global>
 	<global name="UnsupportedGLRequirements">
 		You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
@@ -2940,7 +2940,7 @@ If you continue to have problems, please visit the [SUPPORT_SITE].
 		- 你的顯示卡未達系統最低配備要求。
 	</global>
 	<global name="UnsupportedRAM">
-		- Your system memory does not meet the minimum requirements.
+		- 你的系統記憶體卡未達系統最低配備要求。
 	</global>
 	<global name="You can only set your &apos;Home Location&apos; on your land or at a mainland Infohub.">
 		若你擁有一塊土地，你可以標記它成為你的家的位置。
diff --git a/indra/newview/skins/default/xui/zh/panel_bottomtray.xml b/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
index 2b0cd7c0a6..734b83e6cc 100644
--- a/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
@@ -16,7 +16,7 @@
 			<bottomtray_button label="移動" name="movement_btn" tool_tip="顯示 / 隱藏 移動控制"/>
 		</layout_panel>
 		<layout_panel name="cam_panel">
-			<bottomtray_button label="View" name="camera_btn" tool_tip="顯示 / 隱藏 攝影機控制"/>
+			<bottomtray_button label="視角" name="camera_btn" tool_tip="顯示 / 隱藏 攝影機控制"/>
 		</layout_panel>
 		<layout_panel name="snapshot_panel">
 			<bottomtray_button name="snapshots" tool_tip="拍攝快照"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
index 6b17302bf1..eda4e99a13 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
@@ -2,11 +2,11 @@
 <panel name="edit_alpha_panel">
 	<scroll_container name="avatar_alpha_color_panel_scroll">
 		<panel name="avatar_alpha_color_panel">
-			<texture_picker label="下半身半透明" name="Lower Alpha" tool_tip="點擊以挑選圖片"/>
-			<texture_picker label="上半身半透明" name="Upper Alpha" tool_tip="點擊以挑選圖片"/>
-			<texture_picker label="頭部半透明" name="Head Alpha" tool_tip="點擊以挑選圖片"/>
-			<texture_picker label="眼睛半透明" name="Eye Alpha" tool_tip="點擊以挑選圖片"/>
-			<texture_picker label="頭髮半透明" name="Hair Alpha" tool_tip="點擊以挑選圖片"/>
+			<texture_picker label="下半身半透明" name="Lower Alpha" tool_tip="點擊以挑選圖像"/>
+			<texture_picker label="上半身半透明" name="Upper Alpha" tool_tip="點擊以挑選圖像"/>
+			<texture_picker label="頭部半透明" name="Head Alpha" tool_tip="點擊以挑選圖像"/>
+			<texture_picker label="眼睛半透明" name="Eye Alpha" tool_tip="點擊以挑選圖像"/>
+			<texture_picker label="頭髮半透明" name="Hair Alpha" tool_tip="點擊以挑選圖像"/>
 		</panel>
 	</scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
index 99e2874319..40dd61971a 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_eyes_panel">
 	<panel name="avatar_eye_color_panel">
-		<texture_picker label="Iris" name="Iris" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="Iris" name="Iris" tool_tip="點擊以挑選圖像"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
index 9c542366bc..7b39e33a9b 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_gloves_panel">
 	<panel name="avatar_gloves_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
index d9ddafac3b..a7440093bc 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_hair_panel">
 	<panel name="avatar_hair_color_panel">
-		<texture_picker label="材質" name="Texture" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Texture" tool_tip="點擊以挑選圖像"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
index df85f7deb2..dcef070e2e 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_jacket_panel">
 	<panel name="avatar_jacket_color_panel">
-		<texture_picker label="上半身材質" name="Upper Fabric" tool_tip="點擊以挑選圖片"/>
-		<texture_picker label="下半身材質" name="Lower Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="上半身材質" name="Upper Fabric" tool_tip="點擊以挑選圖像"/>
+		<texture_picker label="下半身材質" name="Lower Fabric" tool_tip="點擊以挑選圖像"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
index 76560256f7..01b875f1bd 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_pants_panel">
 	<panel name="avatar_pants_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
index 2258e51b85..7734c3a417 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
@@ -26,9 +26,9 @@
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<panel name="data_panel">
-				<text name="display_name_label" value="Display Name:"/>
+				<text name="display_name_label" value="顯示名稱："/>
 				<text name="solo_username_label" value="使用者名稱："/>
-				<button name="set_name" tool_tip="Set Display Name"/>
+				<button name="set_name" tool_tip="設定顯示名稱"/>
 				<text name="user_label" value="使用者名稱："/>
 				<panel name="lifes_images_panel">
 					<panel name="second_life_image_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
index ecfc1e2fad..f8ff76aa9b 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shirt_panel">
 	<panel name="avatar_shirt_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
index 675caf9e2e..97e43f5753 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shoes_panel">
 	<panel name="avatar_shoes_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
 		<color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml
index 22f0279060..fdd6d05ca5 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_skin_panel">
 	<panel name="avatar_skin_color_panel">
-		<texture_picker label="Head Tattoos" name="Head Tattoos" tool_tip="點擊以挑選圖片"/>
-		<texture_picker label="Upper Tattoos" name="Upper Tattoos" tool_tip="點擊以挑選圖片"/>
-		<texture_picker label="Lower Tattoos" name="Lower Tattoos" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="Head Tattoos" name="Head Tattoos" tool_tip="點擊以挑選圖像"/>
+		<texture_picker label="Upper Tattoos" name="Upper Tattoos" tool_tip="點擊以挑選圖像"/>
+		<texture_picker label="Lower Tattoos" name="Lower Tattoos" tool_tip="點擊以挑選圖像"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
index 5c46f94fe9..10432c16b1 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_skirt_panel">
 	<panel name="avatar_skirt_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
index 09c888f226..6727781740 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_socks_panel">
 	<panel name="avatar_socks_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
index 946f8b22dc..1b34a0e0ee 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_tattoo_panel">
 	<panel name="avatar_tattoo_color_panel">
-		<texture_picker label="頭部刺青" name="Head Tattoo" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="頭部刺青" name="Head Tattoo" tool_tip="點擊以挑選圖像"/>
 		<texture_picker label="上半身刺青" name="Upper Tattoo" tool_tip="點擊以挑選照片"/>
-		<texture_picker label="下半身刺青" name="Lower Tattoo" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="下半身刺青" name="Lower Tattoo" tool_tip="點擊以挑選圖像"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
index 82ab70bafc..15cae8d233 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_underpants_panel">
 	<panel name="avatar_underpants_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
index b284668777..486175eb64 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_undershirt_panel">
 	<panel name="avatar_undershirt_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open Color Picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_group_general.xml b/indra/newview/skins/default/xui/zh/panel_group_general.xml
index f70fbf22a8..55cbf5a617 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_general.xml
@@ -12,7 +12,7 @@ Hover your mouse over the options for more help.
 		Retrieving member data
 	</panel.string>
 	<panel name="group_info_top">
-		<texture_picker label="" name="insignia" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="" name="insignia" tool_tip="點擊以挑選圖像"/>
 		<text name="prepend_founded_by">
 			創辦人：
 		</text>
@@ -52,6 +52,6 @@ Hover your mouse over the options for more help.
 			<combo_box.item label="適度成人內容" name="mature"/>
 			<combo_box.item label="一般普級內容" name="pg"/>
 		</combo_box>
-		<check_box initial_value="true" label="顯示在搜尋中" name="show_in_group_list" tool_tip="Let people see this group in search results"/>
+		<check_box initial_value="true" label="顯示在搜尋中" name="show_in_group_list" tool_tip="讓其他人可以在搜尋結果中看到這個群組"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
index 1bf3929683..5ac7410c8b 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
@@ -52,7 +52,7 @@
 			m²
 		</text>
 		<text name="your_contribution_max_value">
-			([AMOUNT] max)
+			（[AMOUNT] 最大）
 		</text>
 		<text name="group_over_limit_text">
 			More land credits are needed to support land in use
@@ -67,14 +67,14 @@
 				載入中...
 			</text_editor>
 		</panel>
-		<panel label="DETAILS" name="group_money_details_tab">
+		<panel label="細節" name="group_money_details_tab">
 			<text_editor name="group_money_details_text">
 				載入中...
 			</text_editor>
 			<button name="earlier_details_button" tool_tip="Back"/>
 			<button name="later_details_button" tool_tip="Next"/>
 		</panel>
-		<panel label="SALES" name="group_money_sales_tab">
+		<panel label="銷售" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
 				載入中...
 			</text_editor>
diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
index f7dada226f..53ecf3eb19 100644
--- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Things" name="main inventory panel">
+<panel label="事物" name="main inventory panel">
 	<panel.string name="ItemcountFetching">
 		Fetching [ITEM_COUNT] Items... [FILTER]
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
index 3e44f2a584..321c003acd 100644
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
@@ -17,8 +17,8 @@
 	<button label="重設" name="current_url_reset_btn"/>
 	<check_box initial_value="false" label="Auto Loop" name="auto_loop"/>
 	<check_box initial_value="false" label="First Click Interacts" name="first_click_interact"/>
-	<check_box initial_value="false" label="Auto Zoom" name="auto_zoom"/>
-	<check_box initial_value="false" label="Auto Play Media" name="auto_play"/>
+	<check_box initial_value="false" label="自動縮放" name="auto_zoom"/>
+	<check_box initial_value="false" label="自動播放媒體" name="auto_play"/>
 	<text name="media_setting_note">
 		Note: Residents can override this setting
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
index ec62b61c54..173edc76f6 100644
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
@@ -14,16 +14,16 @@
 	<text name="owner_label">
 		擁有者
 	</text>
-	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_owner_interact"/>
+	<check_box initial_value="false" label="允許導航與互動" name="perms_owner_interact"/>
 	<check_box initial_value="false" label="顯示控制列" name="perms_owner_control"/>
 	<text name="group_label">
 		群組：
 	</text>
-	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_group_interact"/>
+	<check_box initial_value="false" label="允許導航與互動" name="perms_group_interact"/>
 	<check_box initial_value="false" label="顯示控制列" name="perms_group_control"/>
 	<text name="anyone_label">
 		任何人
 	</text>
-	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_anyone_interact"/>
+	<check_box initial_value="false" label="允許導航與互動" name="perms_anyone_interact"/>
 	<check_box initial_value="false" label="顯示控制列" name="perms_anyone_control"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_my_profile.xml b/indra/newview/skins/default/xui/zh/panel_my_profile.xml
index e26ccdef73..79817d7be9 100644
--- a/indra/newview/skins/default/xui/zh/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_my_profile.xml
@@ -31,7 +31,7 @@
 							User name
 						</text>
 						<text name="name_descr_text">
-							Display Name
+							顯示名稱
 						</text>
 						<button label="檔案" name="see_profile_btn" tool_tip="察看這位化身的檔案"/>
 					</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_notes.xml b/indra/newview/skins/default/xui/zh/panel_notes.xml
index 5d0e6760ff..875c6bb328 100644
--- a/indra/newview/skins/default/xui/zh/panel_notes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_notes.xml
@@ -15,7 +15,7 @@
 		<layout_panel name="notes_buttons_panel">
 			<layout_stack name="bottom_bar_ls">
 				<layout_panel name="add_friend_btn_lp">
-					<button label="加為朋友" name="add_friend" tool_tip="Offer friendship to the Resident"/>
+					<button label="加為朋友" name="add_friend" tool_tip="向這個居民提出交友邀請"/>
 				</layout_panel>
 				<layout_panel name="im_btn_lp">
 					<button label="IM" name="im" tool_tip="開啟即時訊息會話"/>
@@ -24,7 +24,7 @@
 					<button label="通話" name="call" tool_tip="與這位居民通話"/>
 				</layout_panel>
 				<layout_panel name="show_on_map_btn_lp">
-					<button label="地圖" name="show_on_map_btn" tool_tip="Show the Resident on the map"/>
+					<button label="地圖" name="show_on_map_btn" tool_tip="在地圖上顯示這個居民"/>
 				</layout_panel>
 				<layout_panel name="teleport_btn_lp">
 					<button label="瞬間傳送" name="teleport" tool_tip="發給瞬間傳送請求"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
index dfd81a85cc..d9718d8294 100644
--- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Things" name="Outfits">
+<panel label="事物" name="Outfits">
 	<panel.string name="wear_outfit_tooltip">
 		穿上所選擇的裝扮
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index c97ff2ae96..9c265622fa 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray panel -->
-<panel label="People" name="people_panel">
+<panel label="人群" name="people_panel">
 	<string name="no_recent_people" value="No recent people. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]."/>
 	<string name="no_filtered_recent_people" value="Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]."/>
 	<string name="no_one_near" value="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]."/>
diff --git a/indra/newview/skins/default/xui/zh/panel_place_profile.xml b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
index d7bcb0d027..1772b65434 100644
--- a/indra/newview/skins/default/xui/zh/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
@@ -66,7 +66,7 @@
 						<text name="build_value" value="On"/>
 						<text name="scripts_label" value="腳本："/>
 						<text name="scripts_value" value="On"/>
-						<text name="damage_label" value="商害："/>
+						<text name="damage_label" value="傷害："/>
 						<text name="damage_value" value="Off"/>
 						<button label="關於土地" name="about_land_btn"/>
 					</panel>
@@ -102,11 +102,11 @@
 						<text name="sales_price_label" value="價格："/>
 						<text name="area_label" value="面積："/>
 						<text name="traffic_label" value="流量："/>
-						<text name="primitives_label" value="Primitives:"/>
+						<text name="primitives_label" value="幾何元件："/>
 						<text name="parcel_scripts_label" value="腳本："/>
 						<text name="terraform_limits_label" value="土地變形限制："/>
 						<text name="subdivide_label" value="分割土地/合併土地能力："/>
-						<text name="resale_label" value="ReSale ability:"/>
+						<text name="resale_label" value="轉售能力："/>
 						<text name="sale_to_label" value="出售給："/>
 					</panel>
 				</accordion_tab>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index ee8cd9794a..874fb6b218 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -47,14 +47,14 @@
 		<text name="DrawDistanceMeterText2">
 			m
 		</text>
-		<slider label="Max. particle count:" name="MaxParticleCount"/>
+		<slider label="最大粒子效果數量：" name="MaxParticleCount"/>
 		<slider label="Max. # of non-impostor avatars:" name="MaxNumberAvatarDrawn"/>
 		<slider label="後製品質：" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
 			網面細節：
 		</text>
 		<slider label="物件：" name="ObjectMeshDetail"/>
-		<slider label="Flexiprims:" name="FlexibleMeshDetail"/>
+		<slider label="彈性幾何元件：" name="FlexibleMeshDetail"/>
 		<slider label="樹木：" name="TreeMeshDetail"/>
 		<slider label="化身：" name="AvatarMeshDetail"/>
 		<slider label="地形：" name="TerrainMeshDetail"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
index 57e3540b3d..ce176b1e3c 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
@@ -15,7 +15,7 @@
 	<check_box label="反轉" name="invert_mouse"/>
 	<check_box label="總是使用方向鍵移動" name="arrow_keys_move_avatar_check"/>
 	<check_box label="連點按住後跑步" name="tap_tap_hold_to_run"/>
-	<check_box label="雙擊以D：" name="double_click_chkbox"/>
+	<check_box label="雙擊以：" name="double_click_chkbox"/>
 	<radio_group name="double_click_action">
 		<radio_item label="瞬間傳送" name="radio_teleport"/>
 		<radio_item label="自動導航駕駛" name="radio_autopilot"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
index bd6d465572..07fdfd87e3 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
@@ -8,7 +8,7 @@
 		（位置、圖像、網頁、搜尋的歷史紀錄）
 	</text>
 	<check_box label="將我顯示在搜尋的結果中" name="online_searchresults"/>
-	<check_box label="只有我的朋友和群組知道我在線上" name="online_visibility"/>
+	<check_box label="只有我的朋友和群組知道我上線" name="online_visibility"/>
 	<check_box label="只有我的朋友和群組可以 IM 或與我通話。" name="voice_call_friends_only_check"/>
 	<check_box label="當通話結束時關閉麥克風" name="auto_disengage_mic_check"/>
 	<check_box label="登入時顯示我最愛的地標位置（經由 &apos;開始於&apos; 的下拉式選單）" name="favorites_on_login_check"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
index 8d0e2a6355..df1a1b73a1 100644
--- a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
@@ -37,28 +37,28 @@
 			<button name="fwd_btn" tool_tip="Navigate forward"/>
 		</layout_panel>
 		<layout_panel name="home">
-			<button name="home_btn" tool_tip="Home page"/>
+			<button name="home_btn" tool_tip="首頁"/>
 		</layout_panel>
 		<layout_panel name="media_stop">
 			<button name="media_stop_btn" tool_tip="停止媒體"/>
 		</layout_panel>
 		<layout_panel name="reload">
-			<button name="reload_btn" tool_tip="Reload"/>
+			<button name="reload_btn" tool_tip="重新載入"/>
 		</layout_panel>
 		<layout_panel name="stop">
-			<button name="stop_btn" tool_tip="Stop loading"/>
+			<button name="stop_btn" tool_tip="停止載入"/>
 		</layout_panel>
 		<layout_panel name="play">
-			<button name="play_btn" tool_tip="Play media"/>
+			<button name="play_btn" tool_tip="播放媒體"/>
 		</layout_panel>
 		<layout_panel name="pause">
-			<button name="pause_btn" tool_tip="Pause media"/>
+			<button name="pause_btn" tool_tip="暫停媒體"/>
 		</layout_panel>
 		<layout_panel name="media_address">
-			<line_editor name="media_address_url" tool_tip="Media URL"/>
+			<line_editor name="media_address_url" tool_tip="媒體網址"/>
 			<layout_stack name="media_address_url_icons">
 				<layout_panel>
-					<icon name="media_whitelist_flag" tool_tip="White List enabled"/>
+					<icon name="media_whitelist_flag" tool_tip="白名單已啟用"/>
 				</layout_panel>
 				<layout_panel>
 					<icon name="media_secure_lock_flag" tool_tip="Secured Browsing"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_view.xml b/indra/newview/skins/default/xui/zh/panel_profile_view.xml
index 12fe776e45..2684287692 100644
--- a/indra/newview/skins/default/xui/zh/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/zh/panel_profile_view.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_target_profile">
 	<string name="status_online">
-		Online
+		上線
 	</string>
 	<string name="status_offline">
-		Offline
+		離線
 	</string>
-	<text name="display_name_label" value="Display Name:"/>
+	<text name="display_name_label" value="顯示名稱："/>
 	<text name="solo_username_label" value="使用者名稱："/>
-	<text name="status" value="Online"/>
+	<text name="status" value="上線"/>
 	<text name="user_name_small" value="Jack oh look at me this is a super duper long name"/>
 	<button name="copy_to_clipboard" tool_tip="覆製到剪貼簿"/>
 	<text name="user_label" value="使用者名稱："/>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_general.xml b/indra/newview/skins/default/xui/zh/panel_region_general.xml
index 38fde494aa..a441b8898d 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml
@@ -24,7 +24,7 @@
 	<check_box label="限制推撞" name="restrict_pushobject"/>
 	<check_box label="允許土地轉售" name="allow_land_resell_check"/>
 	<check_box label="允許土地 合併/分割" name="allow_parcel_changes_check"/>
-	<check_box label="阻擋土地顯示於搜尋中" name="block_parcel_search_check" tool_tip="Let people see this region and its parcels in search results"/>
+	<check_box label="阻擋土地顯示於搜尋中" name="block_parcel_search_check" tool_tip="讓其他人可以在搜尋結果中看到這個地區與其中的地段"/>
 	<spinner label="人數上限" name="agent_limit_spin"/>
 	<spinner label="Object Bonus" name="object_bonus_spin"/>
 	<text label="Maturity" name="access_text">
diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
index 0622cb4e73..7cae8fe8cf 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
@@ -6,14 +6,14 @@
 	<text name="region_text">
 		未知
 	</text>
-	<spinner label="Water Height" name="water_height_spin"/>
-	<spinner label="Terrain Raise Limit" name="terrain_raise_spin"/>
-	<spinner label="Terrain Lower Limit" name="terrain_lower_spin"/>
-	<check_box label="Use Estate Sun" name="use_estate_sun_check"/>
-	<check_box label="Fixed Sun" name="fixed_sun_check"/>
+	<spinner label="水文高度" name="water_height_spin"/>
+	<spinner label="地形提升限制" name="terrain_raise_spin"/>
+	<spinner label="地形降低限制" name="terrain_lower_spin"/>
+	<check_box label="使用領地的太陽設定" name="use_estate_sun_check"/>
+	<check_box label="固定太陽" name="fixed_sun_check"/>
 	<slider label="Phase" name="sun_hour_slider"/>
 	<button label="套用" name="apply_btn"/>
-	<button label="Download RAW terrain..." name="download_raw_btn" tool_tip="Available only to estate owners, not managers"/>
-	<button label="上傳 RAW 地形檔..." name="upload_raw_btn" tool_tip="Available only to estate owners, not managers"/>
+	<button label="下載 RAW 地形..." name="download_raw_btn" tool_tip="只允許領地擁有者而非管理者進行操作"/>
+	<button label="上傳 RAW 地形檔..." name="upload_raw_btn" tool_tip="只允許領地擁有者而非管理者進行操作"/>
 	<button label="Bake Terrain" name="bake_terrain_btn" tool_tip="Set current terrain as mid-point for raise/lower limits"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
index 1dc7c1e089..cc2b0fc673 100644
--- a/indra/newview/skins/default/xui/zh/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
@@ -4,7 +4,7 @@
 		載入中...
 	</panel.string>
 	<panel.string name="can_not_view">
-		你不察看或編輯此腳本，自從它被設定為 &quot;no copy&quot; 後。你需要完整權限去察看或編輯有包含腳本在內的物件。
+		你不能察看或編輯此腳本，自從它被設定為 &quot;no copy&quot; 後。你需要完整權限去察看或編輯有包含腳本在內的物件。
 	</panel.string>
 	<panel.string name="public_objects_can_not_run">
 		公開物件不能執行腳本
diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray.xml b/indra/newview/skins/default/xui/zh/panel_side_tray.xml
index b706f1839a..e5c7deb7d6 100644
--- a/indra/newview/skins/default/xui/zh/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_side_tray.xml
@@ -11,7 +11,7 @@
 			<panel label="自己" name="panel_me"/>
 		</panel_container>
 	</sidetray_tab>
-	<sidetray_tab description="Find your friends, contacts and people nearby." name="sidebar_people" tab_title="People">
+	<sidetray_tab description="Find your friends, contacts and people nearby." name="sidebar_people" tab_title="人群">
 		<panel_container name="panel_container">
 			<panel label="群組檔案" name="panel_group_info_sidetray"/>
 			<panel label="Blocked Residents &amp; Objects" name="panel_block_list_sidetray"/>
diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml
index d5c3096b22..32bf0d22d8 100644
--- a/indra/newview/skins/default/xui/zh/role_actions.xml
+++ b/indra/newview/skins/default/xui/zh/role_actions.xml
@@ -18,7 +18,7 @@
 		<action description="Change Charter, Insignia, and &apos;Show in search&apos;" longdescription="Change Charter, Insignia, and &apos;Show in search&apos;. This is done in the General section." name="group change identity" value="11"/>
 	</action_set>
 	<action_set description="These Abilities include powers to deed, modify, and sell land in this group&apos;s land holdings. To get to the About Land window, right-click the ground and select &apos;About Land&apos;, or click the &apos;i&apos; icon in the Navigation Bar." name="Parcel Management">
-		<action description="Deed land and buy land for group" longdescription="Deed land and buy land for group. This is done in About Land &gt; General tab." name="land deed" value="12"/>
+		<action description="讓渡土地或購買土地給群組" longdescription="Deed land and buy land for group. This is done in About Land &gt; General tab." name="land deed" value="12"/>
 		<action description="Abandon land to Governor Linden" longdescription="Abandon land to Governor Linden. *WARNING* Any Member in a Role with this Ability can abandon group-owned land in About Land &gt; General tab, reverting it to Linden ownership without a sale! Be sure you know what you&apos;re doing before assigning this Ability." name="land release" value="13"/>
 		<action description="Set land for sale info" longdescription="Set land for sale info. *WARNING* Any Member in a Role with this Ability can sell group-owned land in About Land &gt; General tab as they wish! Be sure you know what you&apos;re doing before assigning this Ability." name="land set sale info" value="14"/>
 		<action description="Subdivide and join parcels" longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide&apos;. To join, select two or more contiguous parcels and click &apos;Join&apos;." name="land divide join" value="15"/>
@@ -54,7 +54,7 @@
 		<action description="Landscaping using Linden plants" longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder, or they can be created via the Build menu." name="land gardening" value="35"/>
 	</action_set>
 	<action_set description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Build Tools &gt; General tab. Right-click an object and Edit to see its settings." name="Object Management">
-		<action description="Deed objects to group" longdescription="Deed objects to group in the Build Tools &gt; General tab." name="object deed" value="36"/>
+		<action description="讓渡物件給群組" longdescription="Deed objects to group in the Build Tools &gt; General tab." name="object deed" value="36"/>
 		<action description="Manipulate (move, copy, modify) group-owned objects" longdescription="Manipulate (move, copy, modify) group-owned objects in the Build Tools &gt; General tab." name="object manipulate" value="38"/>
 		<action description="Set group-owned objects for sale" longdescription="Set group-owned objects for sale in the Build Tools &gt; General tab." name="object set sale" value="39"/>
 	</action_set>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
index 4cc16ed250..7abe95a402 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Things" name="objects panel">
+<panel label="事物" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
 		<panel name="button_panel">
 			<layout_stack name="button_panel_ls">
@@ -11,8 +11,8 @@
 				</layout_panel>
 				<layout_panel name="shop_btn_lp">
 					<button label="Shop" name="shop_btn" tool_tip="Open Marketplace webpage"/>
-					<button label="Wear" name="wear_btn" tool_tip="穿上所選擇的裝扮"/>
-					<button label="Play" name="play_btn"/>
+					<button label="穿上" name="wear_btn" tool_tip="穿上所選擇的裝扮"/>
+					<button label="播放" name="play_btn"/>
 					<button label="瞬間傳送" name="teleport_btn" tool_tip="瞬間傳送到所選的區域"/>
 				</layout_panel>
 			</layout_stack>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
index 5aad4568bd..3d46e52726 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="object properties" title="物件檔案">
 	<panel.string name="text deed continued">
-		Deed
+		讓渡
 	</panel.string>
 	<panel.string name="text deed">
-		Deed
+		讓渡
 	</panel.string>
 	<panel.string name="text modify info 1">
 		你可以修改這個物件
@@ -56,7 +56,7 @@
 		</text>
 		<button name="button set group" tool_tip="選擇一個群組以分享這個物件的權限"/>
 		<name_box initial_value="載入中..." name="Group Name Proxy"/>
-		<button label="Deed" label_selected="Deed" name="button deed" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."/>
+		<button label="讓渡" label_selected="讓渡" name="button deed" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."/>
 		<text name="label click action">
 			點擊以：
 		</text>
@@ -85,16 +85,16 @@
 			</text>
 			<check_box label="修改" name="checkbox next owner can modify"/>
 			<check_box label="覆製" name="checkbox next owner can copy"/>
-			<check_box label="轉移" name="checkbox next owner can transfer" tool_tip="Next owner can give away or resell this object"/>
+			<check_box label="轉移" name="checkbox next owner can transfer" tool_tip="下一個擁有者可以送出或轉售這個物件"/>
 		</panel>
 		<check_box label="出售" name="checkbox for sale"/>
 		<combo_box name="sale type">
-			<combo_box.item label="Copy" name="Copy"/>
-			<combo_box.item label="Contents" name="Contents"/>
-			<combo_box.item label="Original" name="Original"/>
+			<combo_box.item label="副本" name="Copy"/>
+			<combo_box.item label="內容" name="Contents"/>
+			<combo_box.item label="原件" name="Original"/>
 		</combo_box>
 		<spinner label="價格： L$" name="Edit Cost"/>
-		<check_box label="顯示在搜尋中" name="search_check" tool_tip="Let people see this object in search results"/>
+		<check_box label="顯示在搜尋中" name="search_check" tool_tip="讓其他人可以在搜尋結果中察看到此物件"/>
 		<text name="B:">
 			B:
 		</text>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 0949e61fa1..6dbe44d32e 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -1042,10 +1042,10 @@
 		按下 ESC 鍵回復到世界的視角
 	</string>
 	<string name="InventoryNoMatchingItems">
-		Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].
+		沒有發現你想要找的嗎？試試 [secondlife:///app/search/all/[SEARCH_TERM] 搜尋]。
 	</string>
 	<string name="PlacesNoMatchingItems">
-		Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].
+		沒有發現你想要找的嗎？試試 [secondlife:///app/search/places/[SEARCH_TERM] 搜尋]。
 	</string>
 	<string name="FavoritesNoMatchingItems">
 		Drag a landmark here to add it to your favorites.
@@ -1190,25 +1190,25 @@
 		Buy for L$
 	</string>
 	<string name="Stone">
-		Stone
+		石頭
 	</string>
 	<string name="Metal">
-		Metal
+		金屬
 	</string>
 	<string name="Glass">
-		Glass
+		玻璃
 	</string>
 	<string name="Wood">
-		Wood
+		木頭
 	</string>
 	<string name="Flesh">
-		Flesh
+		肌肉
 	</string>
 	<string name="Plastic">
-		Plastic
+		塑膠
 	</string>
 	<string name="Rubber">
-		Rubber
+		橡膠
 	</string>
 	<string name="Light">
 		Light
@@ -1385,7 +1385,7 @@
 		Charter Member
 	</string>
 	<string name="AcctTypeEmployee">
-		Linden Lab Employee
+		林登實驗室員工
 	</string>
 	<string name="PaymentInfoUsed">
 		Payment Info Used
@@ -1433,7 +1433,7 @@
 		伺服器上未發現腳本。
 	</string>
 	<string name="CompileQueueProblemDownloading">
-		Problem downloading
+		問題下載中
 	</string>
 	<string name="CompileQueueInsufficientPermDownload">
 		Insufficient permissions to download a script.
@@ -1491,7 +1491,7 @@
 		（未知）
 	</string>
 	<string name="SummaryForTheWeek" value="Summary for this week, beginning on"/>
-	<string name="NextStipendDay" value="The next stipend day is"/>
+	<string name="NextStipendDay" value="下一個發薪日為"/>
 	<string name="GroupIndividualShare" value="Group       Individual Share"/>
 	<string name="GroupColumn" value="群組"/>
 	<string name="Balance">
@@ -1507,7 +1507,7 @@
 		Total
 	</string>
 	<string name="NoGroupDataFound">
-		No group data found for group
+		無群組資料發現
 	</string>
 	<string name="IMParentEstate">
 		parent estate
@@ -1540,13 +1540,13 @@
 		地段腳本記憶體
 	</string>
 	<string name="ScriptLimitsParcelsOwned">
-		Parcels Listed: [PARCELS]
+		地段清單：[PARCELS]
 	</string>
 	<string name="ScriptLimitsMemoryUsed">
-		Memory used: [COUNT] kb out of [MAX] kb; [AVAILABLE] kb available
+		計憶體用量：使用 [MAX] kb 中的 [COUNT] kb ；剩餘 [AVAILABLE] kb 可用
 	</string>
 	<string name="ScriptLimitsMemoryUsedSimple">
-		Memory used: [COUNT] kb
+		記憶體用量：[COUNT] kb
 	</string>
 	<string name="ScriptLimitsParcelScriptURLs">
 		地段腳本 URLs
@@ -1573,7 +1573,7 @@
 		You do not have permission to examine this parcel
 	</string>
 	<string name="SITTING_ON">
-		Sitting On
+		坐在
 	</string>
 	<string name="ATTACH_CHEST">
 		胸部
@@ -1759,7 +1759,7 @@
 		預覽
 	</string>
 	<string name="MultiPropertiesTitle">
-		Properties
+		屬性
 	</string>
 	<string name="InvOfferAnObjectNamed">
 		An object named
@@ -1889,40 +1889,40 @@
 		PDT
 	</string>
 	<string name="Direction_Forward">
-		Forward
+		向前
 	</string>
 	<string name="Direction_Left">
-		Left
+		向左
 	</string>
 	<string name="Direction_Right">
-		Right
+		向右
 	</string>
 	<string name="Direction_Back">
-		Back
+		向後
 	</string>
 	<string name="Direction_North">
-		North
+		北
 	</string>
 	<string name="Direction_South">
-		South
+		南
 	</string>
 	<string name="Direction_West">
-		West
+		西
 	</string>
 	<string name="Direction_East">
-		East
+		東
 	</string>
 	<string name="Direction_Up">
-		Up
+		向上
 	</string>
 	<string name="Direction_Down">
-		Down
+		向下
 	</string>
 	<string name="Any Category">
 		任何類別
 	</string>
 	<string name="Shopping">
-		Shopping
+		採購
 	</string>
 	<string name="Land Rental">
 		Land Rental
@@ -1958,28 +1958,28 @@
 		完全成人
 	</string>
 	<string name="Arts&amp;Culture">
-		Arts &amp; Culture
+		藝術與文化
 	</string>
 	<string name="Business">
-		Business
+		商業
 	</string>
 	<string name="Educational">
-		Educational
+		教育
 	</string>
 	<string name="Gaming">
-		Gaming
+		遊戲
 	</string>
 	<string name="Hangout">
 		聚會所
 	</string>
 	<string name="Newcomer Friendly">
-		Newcomer Friendly
+		新手友善
 	</string>
 	<string name="Parks&amp;Nature">
-		Parks &amp; Nature
+		公園與自然
 	</string>
 	<string name="Residential">
-		Residential
+		住宅
 	</string>
 	<string name="Stage">
 		Stage
@@ -2024,36 +2024,36 @@
 		---
 	</string>
 	<string name="Multiple Media">
-		Multiple Media
+		多媒體
 	</string>
 	<string name="Play Media">
-		Play/Pause Media
+		播放／暫停 媒體
 	</string>
 	<string name="MBCmdLineError">
-		An error was found parsing the command line.
-Please see: http://wiki.secondlife.com/wiki/Client_parameters
-Error:
+		解析命令列時發現錯誤。
+請參閱： http://wiki.secondlife.com/wiki/Client_parameters
+錯誤：
 	</string>
 	<string name="MBCmdLineUsg">
-		[APP_NAME] Command line usage:
+		[APP_NAME] 命令列用法：
 	</string>
 	<string name="MBUnableToAccessFile">
-		[APP_NAME] is unable to access a file that it needs.
+		[APP_NAME] 無法存取它所需要的檔案。
 
 This can be because you somehow have multiple copies running, or your system incorrectly thinks a file is open.
 If this message persists, restart your computer and try again.
 If it continues to persist, you may need to completely uninstall [APP_NAME] and reinstall it.
 	</string>
 	<string name="MBFatalError">
-		Fatal Error
+		致命錯誤
 	</string>
 	<string name="MBRequiresAltiVec">
 		[APP_NAME] requires a processor with AltiVec (G4 or later).
 	</string>
 	<string name="MBAlreadyRunning">
-		[APP_NAME] is already running.
-Check your task bar for a minimized copy of the program.
-If this message persists, restart your computer.
+		[APP_NAME] 已經在執行中。
+請檢查你的工作列裡是否有其他最小化的相同程式。
+如果這個訊息持續出現，請重新啟動你的電腦。
 	</string>
 	<string name="MBFrozenCrashed">
 		[APP_NAME] appears to have frozen or crashed on the previous run.
@@ -2082,8 +2082,8 @@ Please download the latest version from www.secondlife.com.
 		錯誤
 	</string>
 	<string name="MBFullScreenErr">
-		Unable to run fullscreen at [WIDTH] x [HEIGHT].
-Running in window.
+		無法執行全螢幕於 [WIDTH] x [HEIGHT].
+執行於視窗中。
 	</string>
 	<string name="MBDestroyWinFailed">
 		Shutdown Error while destroying window (DestroyWindow() failed)
@@ -2111,7 +2111,7 @@ Also be sure your monitor is set to True Color (32-bit) in Control Panels &gt; D
 If you continue to receive this message, contact the [SUPPORT_SITE].
 	</string>
 	<string name="MBPixelFmtSetErr">
-		Can&apos;t set pixel format
+		無法設定像素格式
 	</string>
 	<string name="MBGLContextErr">
 		Can&apos;t create GL rendering context
@@ -2920,7 +2920,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Middle Part
 	</string>
 	<string name="More">
-		More
+		更多
 	</string>
 	<string name="More Blush">
 		More Blush
@@ -3559,7 +3559,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		購買這塊土地
 	</string>
 	<string name="LocationCtrlVoiceTooltip">
-		Voice not available here
+		此地並不允許語音
 	</string>
 	<string name="LocationCtrlFlyTooltip">
 		不允許飛行
@@ -3568,13 +3568,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		禁止推撞
 	</string>
 	<string name="LocationCtrlBuildTooltip">
-		Building/dropping objects not allowed
+		建造／丟棄 物件不被允許
 	</string>
 	<string name="LocationCtrlScriptsTooltip">
-		Scripts not allowed
+		腳本不被允許
 	</string>
 	<string name="LocationCtrlDamageTooltip">
-		Health
+		健康
 	</string>
 	<string name="LocationCtrlAdultIconTooltip">
 		完全成人地區
@@ -3628,7 +3628,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		[NAME] 正在輸入...
 	</string>
 	<string name="Unnamed">
-		(Unnamed)
+		（未命名）
 	</string>
 	<string name="IM_moderated_chat_label">
 		(Moderated: Voices off by default)
@@ -3670,10 +3670,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Connected, click Leave Call to hang up
 	</string>
 	<string name="hang_up-im">
-		Left voice call
+		離開語音通話
 	</string>
 	<string name="answering-im">
-		Connecting...
+		聯接中...
 	</string>
 	<string name="conference-title">
 		Ad-hoc Conference
@@ -3715,10 +3715,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		此會話不再存在
 	</string>
 	<string name="no_ability_error">
-		You do not have that ability.
+		你並不具有這個能力。
 	</string>
 	<string name="no_ability">
-		You do not have that ability.
+		你並不具有這個能力。
 	</string>
 	<string name="not_a_mod_error">
 		You are not a session moderator.
@@ -3903,7 +3903,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		內容
 	</string>
 	<string name="Gesture">
-		Gesture
+		姿勢
 	</string>
 	<string name="Male Gestures">
 		男性姿勢
@@ -4048,7 +4048,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		US$ [AMOUNT]
 	</string>
 	<string name="Membership">
-		Membership
+		成員資格
 	</string>
 	<string name="Roles">
 		角色
@@ -4057,13 +4057,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Group Identity
 	</string>
 	<string name="Parcel Management">
-		Parcel Management
+		地段管理
 	</string>
 	<string name="Parcel Identity">
 		Parcel Identity
 	</string>
 	<string name="Parcel Settings">
-		Parcel Settings
+		地段設定
 	</string>
 	<string name="Parcel Powers">
 		Parcel Powers
@@ -4075,10 +4075,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Parcel Content
 	</string>
 	<string name="Object Management">
-		Object Management
+		物件管理
 	</string>
 	<string name="Accounting">
-		Accounting
+		會計
 	</string>
 	<string name="Notices">
 		通知
@@ -4087,16 +4087,16 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		聊天
 	</string>
 	<string name="DeleteItems">
-		Delete selected items?
+		刪除所選取的物品？
 	</string>
 	<string name="DeleteItem">
-		Delete selected item?
+		刪除所選取的物品？
 	</string>
 	<string name="EmptyOutfitText">
 		沒有任何物品在這個裝扮內
 	</string>
 	<string name="ExternalEditorNotSet">
-		Select an editor using the ExternalEditor setting.
+		選擇一個編輯器使用 ExternalEditor 設定。
 	</string>
 	<string name="ExternalEditorNotFound">
 		Cannot find the external editor you specified.
@@ -4107,7 +4107,7 @@ Try enclosing path to the editor with double quotes.
 		Error parsing the external editor command.
 	</string>
 	<string name="ExternalEditorFailedToRun">
-		External editor failed to run.
+		執行外部編輯器失敗。
 	</string>
 	<string name="Esc">
 		Esc
-- 
cgit v1.2.3