From 5eefd0d66d39dc4be2810a504146ee6e93cde51e Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Thu, 18 Aug 2011 16:22:53 -0700
Subject: WIP INTL-46 Update translation for Traditional Chinese

---
 .../newview/skins/default/xui/zh/floater_about.xml |   4 +-
 .../skins/default/xui/zh/floater_about_land.xml    |  46 +--
 .../default/xui/zh/floater_animation_preview.xml   |   2 +-
 .../skins/default/xui/zh/floater_auction.xml       |   2 +-
 .../skins/default/xui/zh/floater_avatar_picker.xml |   2 +-
 .../default/xui/zh/floater_avatar_textures.xml     |  26 +-
 .../skins/default/xui/zh/floater_bulk_perms.xml    |  16 +-
 .../newview/skins/default/xui/zh/floater_bumps.xml |  12 +-
 .../skins/default/xui/zh/floater_buy_currency.xml  |   8 +-
 .../skins/default/xui/zh/floater_buy_land.xml      |   6 +-
 .../skins/default/xui/zh/floater_buy_object.xml    |   2 +-
 .../skins/default/xui/zh/floater_camera.xml        |  24 +-
 .../skins/default/xui/zh/floater_choose_group.xml  |   4 +-
 .../default/xui/zh/floater_day_cycle_options.xml   |  95 +++++
 .../skins/default/xui/zh/floater_display_name.xml  |   2 +-
 .../skins/default/xui/zh/floater_env_settings.xml  |  25 ++
 .../skins/default/xui/zh/floater_gesture.xml       |   2 +-
 .../skins/default/xui/zh/floater_god_tools.xml     |  24 +-
 .../xui/zh/floater_inventory_item_properties.xml   |   2 +-
 .../xui/zh/floater_inventory_view_finder.xml       |   2 +-
 .../skins/default/xui/zh/floater_land_holdings.xml |  14 +-
 .../default/xui/zh/floater_live_lsleditor.xml      |   4 +-
 .../skins/default/xui/zh/floater_moveview.xml      |  24 +-
 .../skins/default/xui/zh/floater_mute_object.xml   |   4 +-
 .../default/xui/zh/floater_outfit_save_as.xml      |   2 +-
 indra/newview/skins/default/xui/zh/floater_pay.xml |   2 +-
 .../skins/default/xui/zh/floater_pay_object.xml    |   2 +-
 .../skins/default/xui/zh/floater_perm_prefs.xml    |   2 +-
 .../default/xui/zh/floater_preview_gesture.xml     |   4 +-
 .../default/xui/zh/floater_preview_notecard.xml    |   4 +-
 .../skins/default/xui/zh/floater_preview_sound.xml |   2 +-
 .../default/xui/zh/floater_publish_classified.xml  |   4 +-
 .../xui/zh/floater_region_debug_console.xml        |   2 +-
 .../default/xui/zh/floater_script_preview.xml      |   2 +-
 .../skins/default/xui/zh/floater_script_queue.xml  |   6 +-
 .../skins/default/xui/zh/floater_search.xml        |   2 +-
 .../default/xui/zh/floater_settings_debug.xml      |   4 +-
 .../newview/skins/default/xui/zh/floater_stats.xml |   6 +-
 .../newview/skins/default/xui/zh/floater_tools.xml |  12 +-
 .../skins/default/xui/zh/floater_top_objects.xml   |   4 +-
 .../default/xui/zh/floater_voice_controls.xml      |   8 +-
 .../newview/skins/default/xui/zh/floater_water.xml |  70 ++++
 .../skins/default/xui/zh/floater_web_content.xml   |   8 +-
 .../default/xui/zh/floater_whitelist_entry.xml     |   6 +-
 .../default/xui/zh/floater_windlight_options.xml   | 167 ++++++++
 .../skins/default/xui/zh/floater_world_map.xml     |  26 +-
 .../newview/skins/default/xui/zh/inspect_group.xml |   6 +-
 .../skins/default/xui/zh/inspect_remote_object.xml |   2 +-
 .../skins/default/xui/zh/menu_attachment_other.xml |   4 +-
 .../skins/default/xui/zh/menu_attachment_self.xml  |   2 +-
 .../skins/default/xui/zh/menu_avatar_other.xml     |   2 +-
 .../skins/default/xui/zh/menu_avatar_self.xml      |   4 +-
 .../skins/default/xui/zh/menu_gesture_gear.xml     |   2 +-
 .../skins/default/xui/zh/menu_group_plus.xml       |   4 +-
 .../skins/default/xui/zh/menu_imchiclet_group.xml  |   2 +-
 .../default/xui/zh/menu_inspect_avatar_gear.xml    |   4 +-
 .../default/xui/zh/menu_inspect_self_gear.xml      |   4 +-
 .../skins/default/xui/zh/menu_inventory.xml        |  10 +-
 .../skins/default/xui/zh/menu_inventory_add.xml    |   4 +-
 .../default/xui/zh/menu_inventory_gear_default.xml |   4 +-
 .../skins/default/xui/zh/menu_outfit_gear.xml      |   4 +-
 .../skins/default/xui/zh/menu_participant_list.xml |   2 +-
 .../xui/zh/menu_people_friends_view_sort.xml       |   6 +-
 .../xui/zh/menu_people_groups_view_sort.xml        |   4 +-
 .../skins/default/xui/zh/menu_people_nearby.xml    |   2 +-
 .../xui/zh/menu_people_nearby_multiselect.xml      |   2 +-
 .../xui/zh/menu_people_nearby_view_sort.xml        |   6 +-
 .../skins/default/xui/zh/menu_place_add_button.xml |   2 +-
 .../skins/default/xui/zh/menu_url_group.xml        |   4 +-
 indra/newview/skins/default/xui/zh/menu_viewer.xml |  68 ++--
 .../default/xui/zh/menu_wearable_list_item.xml     |   2 +-
 indra/newview/skins/default/xui/zh/mime_types.xml  |  34 +-
 .../skins/default/xui/zh/mime_types_linux.xml      |  28 +-
 .../skins/default/xui/zh/mime_types_mac.xml        |  40 +-
 .../newview/skins/default/xui/zh/notifications.xml | 228 +++++------
 .../default/xui/zh/panel_block_list_sidetray.xml   |   8 +-
 .../skins/default/xui/zh/panel_classified_info.xml |   4 +-
 .../skins/default/xui/zh/panel_edit_alpha.xml      |  10 +-
 .../skins/default/xui/zh/panel_edit_classified.xml |   6 +-
 .../skins/default/xui/zh/panel_edit_physics.xml    |  12 +-
 .../skins/default/xui/zh/panel_edit_pick.xml       |   2 +-
 .../skins/default/xui/zh/panel_edit_shoes.xml      |   2 +-
 .../skins/default/xui/zh/panel_edit_wearable.xml   |  10 +-
 .../default/xui/zh/panel_group_control_panel.xml   |   8 +-
 .../skins/default/xui/zh/panel_group_general.xml   |  12 +-
 .../default/xui/zh/panel_group_info_sidetray.xml   |  16 +-
 .../skins/default/xui/zh/panel_group_invite.xml    |   4 +-
 .../default/xui/zh/panel_group_land_money.xml      |   8 +-
 .../skins/default/xui/zh/panel_group_notices.xml   |   2 +-
 .../skins/default/xui/zh/panel_group_notify.xml    |   4 +-
 .../skins/default/xui/zh/panel_group_roles.xml     |  26 +-
 .../skins/default/xui/zh/panel_landmarks.xml       |   4 +-
 .../xui/zh/panel_media_settings_general.xml        |   2 +-
 .../xui/zh/panel_media_settings_permissions.xml    |   2 +-
 .../xui/zh/panel_media_settings_security.xml       |   2 +-
 .../skins/default/xui/zh/panel_navigation_bar.xml  |   4 +-
 .../skins/default/xui/zh/panel_nearby_media.xml    |  10 +-
 indra/newview/skins/default/xui/zh/panel_notes.xml |   2 +-
 .../skins/default/xui/zh/panel_outfits_wearing.xml |   2 +-
 .../newview/skins/default/xui/zh/panel_people.xml  |  50 +--
 indra/newview/skins/default/xui/zh/panel_picks.xml |   2 +-
 .../skins/default/xui/zh/panel_place_profile.xml   |  32 +-
 .../newview/skins/default/xui/zh/panel_places.xml  |   4 +-
 .../default/xui/zh/panel_preferences_chat.xml      |  10 +-
 .../default/xui/zh/panel_preferences_general.xml   |  12 +-
 .../default/xui/zh/panel_preferences_graphics1.xml |  74 ++--
 .../default/xui/zh/panel_preferences_move.xml      |  12 +-
 .../default/xui/zh/panel_preferences_privacy.xml   |   4 +-
 .../default/xui/zh/panel_preferences_setup.xml     |   2 +-
 .../default/xui/zh/panel_preferences_sound.xml     |   4 +-
 .../newview/skins/default/xui/zh/panel_profile.xml |   8 +-
 .../skins/default/xui/zh/panel_region_covenant.xml |   4 +-
 .../skins/default/xui/zh/panel_region_debug.xml    |  14 +-
 .../skins/default/xui/zh/panel_region_estate.xml   |   8 +-
 .../skins/default/xui/zh/panel_region_general.xml  |  18 +-
 .../skins/default/xui/zh/panel_script_ed.xml       |   6 +-
 .../skins/default/xui/zh/panel_side_tray.xml       |   2 +-
 .../skins/default/xui/zh/panel_status_bar.xml      |   4 +-
 .../skins/default/xui/zh/panel_world_map.xml       |   2 +-
 .../newview/skins/default/xui/zh/role_actions.xml  |  14 +-
 .../skins/default/xui/zh/sidepanel_item_info.xml   |   2 +-
 .../skins/default/xui/zh/sidepanel_task_info.xml   |  22 +-
 indra/newview/skins/default/xui/zh/strings.xml     | 441 +++++++++++----------
 .../skins/default/xui/zh/teleport_strings.xml      |  18 +-
 124 files changed, 1237 insertions(+), 877 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_env_settings.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_water.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_windlight_options.xml

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index bee940ddc1..0ac85d399e 100644
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -35,7 +35,7 @@ Qt Webkit 版本： [QT_WEBKIT_VERSION]
 		（無）
 	</floater.string>
 	<floater.string name="AboutTraffic">
-		Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
+		封包損失：[PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
 	</floater.string>
 	<tab_container name="about_tab">
 		<panel label="資訊" name="support_panel">
@@ -77,7 +77,7 @@ google-perftools Copyright (c) 2005, Google Inc.
 
 All rights reserved.  See licenses.txt for details.
 
-Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+語音聊天音頻編碼：Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 			</text_editor>
 		</panel>
 	</tab_container>
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 efd8909e67..e59a23fda0 100644
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -30,7 +30,7 @@
 				Anyone
 			</panel.string>
 			<panel.string name="area_text">
-				Area
+				區域
 			</panel.string>
 			<panel.string name="area_size_text">
 				[AREA] m²
@@ -42,7 +42,7 @@
 				You must approve your purchase to modify this land.
 			</panel.string>
 			<panel.string name="group_owned_text">
-				（社團所擁有）
+				（群組所擁有）
 			</panel.string>
 			<panel.string name="profile_text">
 				檔案
@@ -81,13 +81,13 @@
 				分級：
 			</text>
 			<text name="ContentRatingText">
-				成人
+				完全成人
 			</text>
 			<text name="Owner:">
 				擁有者：
 			</text>
 			<text name="Group:">
-				社團：
+				群組：
 			</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."/>
@@ -133,7 +133,7 @@
 			</text>
 			<button label="購買土地" name="Buy Land..."/>
 			<button label="腳本資訊" name="Scripts..."/>
-			<button label="Buy For Group" name="Buy For Group..."/>
+			<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="Abandon Land..."/>
 			<button label="Reclaim Land" name="Reclaim Land..."/>
@@ -186,7 +186,7 @@
 				分級：
 			</text>
 			<text name="region_maturity_text">
-				成人
+				完全成人
 			</text>
 			<text name="resellable_lbl">
 				Resale:
@@ -238,7 +238,7 @@
 			<button label="顯示" label_selected="顯示" name="ShowOwner"/>
 			<button label="退回" name="ReturnOwner..." tool_tip="Return objects to their owners."/>
 			<text name="Set to group:">
-				Set to group:
+				設定群組：
 			</text>
 			<text name="group_objects_text">
 				[COUNT]
@@ -286,10 +286,10 @@ Only large parcels can be listed in search.
 				This option is disabled because you cannot modify this parcel&apos;s options.
 			</panel.string>
 			<panel.string name="mature_check_mature">
-				Moderate Content
+				適度成人內容
 			</panel.string>
 			<panel.string name="mature_check_adult">
-				成人內容
+				完全成人內容
 			</panel.string>
 			<panel.string name="mature_check_mature_tooltip">
 				Your parcel information or content is considered moderate.
@@ -315,17 +315,17 @@ Only large parcels can be listed in search.
 				建造：
 			</text>
 			<check_box label="任何人" name="edit objects check"/>
-			<check_box label="社團" name="edit group objects check"/>
+			<check_box label="群組" name="edit group objects check"/>
 			<text name="allow_label3">
 				物件進入：
 			</text>
 			<check_box label="任何人" name="all object entry check"/>
-			<check_box label="社團" name="group object entry check"/>
+			<check_box label="群組" name="group object entry check"/>
 			<text name="allow_label4">
 				執行腳本：
 			</text>
 			<check_box label="任何人" name="check other scripts"/>
-			<check_box label="社團" name="check group scripts"/>
+			<check_box label="群組" name="check group scripts"/>
 			<text name="land_options_label">
 				土地選項：
 			</text>
@@ -335,7 +335,7 @@ Only large parcels can be listed in search.
 			<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="完全成人" 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"/>
@@ -363,7 +363,7 @@ Only large parcels can be listed in search.
 				<combo_box.item label="Rental" name="item13"/>
 				<combo_box.item label="Other" name="item12"/>
 			</combo_box>
-			<check_box label="Moderate Content" name="MatureCheck" tool_tip=" "/>
+			<check_box label="適度成人內容" name="MatureCheck" tool_tip=" "/>
 			<text name="Snapshot:">
 				快照：
 			</text>
@@ -416,12 +416,12 @@ Only large parcels can be listed in search.
 			</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>
-		<panel label="SOUND" name="land_audio_panel">
+		<panel label="聲音" name="land_audio_panel">
 			<text name="MusicURL:">
-				Music URL:
+				音樂 URL：
 			</text>
 			<text name="Sound:">
-				Sound:
+				聲音：
 			</text>
 			<check_box label="Restrict gesture and object sounds to this parcel" name="check sound local"/>
 			<text name="Voice settings:">
@@ -449,11 +449,11 @@ Only large parcels can be listed in search.
 			</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="Allow Group Access: [GROUP]" name="GroupCheck" tool_tip="Set group in the General tab."/>
-			<check_box label="Sell passes to:" name="PassCheck" tool_tip="Allows temporary access to this parcel"/>
+			<check_box label="允許出入的群組：[GROUP]" name="GroupCheck" tool_tip="Set group in the General tab."/>
+			<check_box label="出售通行權給：" name="PassCheck" tool_tip="允許暫時出入這個地段"/>
 			<combo_box name="pass_combo">
 				<combo_box.item label="Anyone" name="Anyone"/>
-				<combo_box.item label="社團" name="Group"/>
+				<combo_box.item label="群組" name="Group"/>
 			</combo_box>
 			<spinner label="Price in L$:" name="PriceSpin"/>
 			<spinner label="Hours of access:" name="HoursSpin"/>
@@ -462,11 +462,11 @@ Only large parcels can be listed in search.
 					Allowed Residents
 				</text>
 				<name_list name="AccessList" tool_tip="([LISTED] listed, [MAX] max)"/>
-				<button label="Add" name="add_allowed"/>
-				<button label="Remove" label_selected="Remove" name="remove_allowed"/>
+				<button label="添加" name="add_allowed"/>
+				<button label="移除" label_selected="移除" name="remove_allowed"/>
 			</panel>
 			<panel name="Banned_layout_panel">
-				<text label="Ban" name="BanCheck">
+				<text label="禁止" name="BanCheck">
 					被封鎖的居民
 				</text>
 				<name_list name="BannedList" tool_tip="([LISTED] listed, [MAX] max)"/>
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 b5d65119f7..baf68ffce6 100644
--- a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
@@ -35,7 +35,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
 		Cannot get JOINT name.
 	</floater.string>
 	<floater.string name="E_ST_NO_OFFSET">
-		Cannot find OFFSET.
+		無法尋找位移。
 	</floater.string>
 	<floater.string name="E_ST_NO_CHANNELS">
 		Cannot find CHANNELS.
diff --git a/indra/newview/skins/default/xui/zh/floater_auction.xml b/indra/newview/skins/default/xui/zh/floater_auction.xml
index eb1c9e55dc..b1862bc582 100644
--- a/indra/newview/skins/default/xui/zh/floater_auction.xml
+++ b/indra/newview/skins/default/xui/zh/floater_auction.xml
@@ -6,6 +6,6 @@
 	<check_box initial_value="true" label="Include yellow selection fence" name="fence_check"/>
 	<button label="Snapshot" label_selected="Snapshot" name="snapshot_btn"/>
 	<button label="Sell to Anyone" label_selected="Sell to Anyone" name="sell_to_anyone_btn"/>
-	<button label="Clear Settings" label_selected="Clear Settings" name="reset_parcel_btn"/>
+	<button label="清除設定" label_selected="清除設定" name="reset_parcel_btn"/>
 	<button label="Start Auction" label_selected="Start Auction" name="start_auction_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
index 27a4199f8c..7e2d74c728 100644
--- a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
@@ -36,7 +36,7 @@
 		</panel>
 		<panel label="接近我" name="NearMePanel">
 			<text name="InstructSelectResident">
-				選擇一位附近的人：
+				選擇一個附近的人：
 			</text>
 			<slider label="範圍" name="near_me_range"/>
 			<text name="meters">
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
index b1dc081f04..36dae7c798 100644
--- a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
@@ -17,31 +17,31 @@ Textures
 			<panel name="scroll_content_panel">
 				<texture_picker label="頭髮" name="hair-baked"/>
 				<texture_picker label="頭髮" name="hair_grain"/>
-				<texture_picker label="Hair Alpha" name="hair_alpha"/>
+				<texture_picker label="頭髮半透明" name="hair_alpha"/>
 				<texture_picker label="頭部" name="head-baked"/>
-				<texture_picker label="Makeup" name="head_bodypaint"/>
-				<texture_picker label="Head Alpha" name="head_alpha"/>
+				<texture_picker label="化妝" name="head_bodypaint"/>
+				<texture_picker label="頭部半透明" name="head_alpha"/>
 				<texture_picker label="頭部刺青" name="head_tattoo"/>
 				<texture_picker label="眼睛" name="eyes-baked"/>
 				<texture_picker label="眼睛" name="eyes_iris"/>
-				<texture_picker label="Eyes Alpha" name="eyes_alpha"/>
-				<texture_picker label="Upper Body" name="upper-baked"/>
-				<texture_picker label="Upper BodyPaint" name="upper_bodypaint"/>
+				<texture_picker label="眼睛半透明" name="eyes_alpha"/>
+				<texture_picker label="上半身半透明" name="upper-baked"/>
+				<texture_picker label="上半身身體部位" name="upper_bodypaint"/>
 				<texture_picker label="內衣" name="upper_undershirt"/>
 				<texture_picker label="手套" name="upper_gloves"/>
 				<texture_picker label="襯衫" name="upper_shirt"/>
-				<texture_picker label="Upper Jacket" name="upper_jacket"/>
-				<texture_picker label="Upper Alpha" name="upper_alpha"/>
-				<texture_picker label="Upper Tattoo" name="upper_tattoo"/>
-				<texture_picker label="Lower Body" name="lower-baked"/>
-				<texture_picker label="Lower BodyPaint" name="lower_bodypaint"/>
+				<texture_picker label="上半身夾克" name="upper_jacket"/>
+				<texture_picker label="上半身半透明" name="upper_alpha"/>
+				<texture_picker label="上半身刺青" name="upper_tattoo"/>
+				<texture_picker label="下半身" name="lower-baked"/>
+				<texture_picker label="下半身身體部位" name="lower_bodypaint"/>
 				<texture_picker label="內褲" name="lower_underpants"/>
 				<texture_picker label="襪子" name="lower_socks"/>
 				<texture_picker label="鞋子" name="lower_shoes"/>
 				<texture_picker label="褲子" name="lower_pants"/>
 				<texture_picker label="夾克" name="lower_jacket"/>
-				<texture_picker label="Lower Alpha" name="lower_alpha"/>
-				<texture_picker label="Lower Tattoo" name="lower_tattoo"/>
+				<texture_picker label="下半身半透明" name="lower_alpha"/>
+				<texture_picker label="下半身刺青" name="lower_tattoo"/>
 				<texture_picker label="裙子" name="skirt-baked"/>
 				<texture_picker label="裙子" name="skirt"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
index 629b0d17d5..660710fb7b 100644
--- a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="EDIT CONTENT PERMISSIONS">
+<floater name="floaterbulkperms" title="編輯內容物權限">
 	<floater.string name="nothing_to_modify_text">
-		Selection contains no editable contents.
+		選擇未包含可編輯的內容物。
 	</floater.string>
 	<floater.string name="status_text">
-		Setting permissions on [NAME]
+		設定權限於 [NAME]
 	</floater.string>
 	<floater.string name="start_text">
-		Starting permission change requests...
+		開始進行權限變更要求...
 	</floater.string>
 	<floater.string name="done_text">
-		Finished permission change requests.
+		權限變更要求已完成。
 	</floater.string>
 	<icon name="icon_animation" tool_tip="動作"/>
 	<icon name="icon_bodypart" tool_tip="身體部位"/>
@@ -24,10 +24,10 @@
 	<button label="√ 全部" name="check_all"/>
 	<button label="清除" label_selected="無" name="check_none"/>
 	<text name="newperms">
-		New Content Permissions
+		新內容物權限
 	</text>
 	<text name="GroupLabel">
-		社團：
+		群組：
 	</text>
 	<check_box label="分享" name="share_with_group"/>
 	<text name="AnyoneLabel">
@@ -39,7 +39,7 @@
 	</text>
 	<check_box label="修改" name="next_owner_modify"/>
 	<check_box label="覆製" name="next_owner_copy"/>
-	<check_box initial_value="true" label="轉移" name="next_owner_transfer" tool_tip="Next owner can give away or resell this object"/>
+	<check_box initial_value="true" label="轉移" name="next_owner_transfer" tool_tip="下一個擁有者能送出或轉售這個物件"/>
 	<button label="確定" name="apply"/>
 	<button label="取消" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_bumps.xml b/indra/newview/skins/default/xui/zh/floater_bumps.xml
index d2b7494b08..64c11af953 100644
--- a/indra/newview/skins/default/xui/zh/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bumps.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_bumps" title="BUMPS, PUSHES &amp; HITS">
 	<floater.string name="none_detected">
-		None detected
+		未偵測到
 	</floater.string>
 	<floater.string name="bump">
-		[TIME]  [NAME] bumped you
+		[TIME]  [NAME] 碰撞你
 	</floater.string>
 	<floater.string name="llpushobject">
-		[TIME]  [NAME] pushed you with a script
+		[TIME]  [NAME] 以腳本推撞你
 	</floater.string>
 	<floater.string name="selected_object_collide">
-		[TIME]  [NAME] hit you with an object
+		[TIME]  [NAME] 以物件擊中你
 	</floater.string>
 	<floater.string name="scripted_object_collide">
-		[TIME]  [NAME] hit you with a scripted object
+		[TIME]  [NAME] 以腳本物件擊中你
 	</floater.string>
 	<floater.string name="physical_object_collide">
-		[TIME]  [NAME] hit you with a physical object
+		[TIME]  [NAME] 以物理物件擊中你
 	</floater.string>
 	<floater.string name="timeStr">
 		[[hour,datetime,slt]:[min,datetime,slt]]
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 d8e9fb0ecc..f187a1ab40 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
@@ -7,7 +7,7 @@
 		你需要更多 L$
 	</text>
 	<text name="contacting">
-		Contacting LindeX...
+		聯接到 LindeX 中...
 	</text>
 	<text name="info_buying">
 		購買 L$
@@ -28,7 +28,7 @@
 		1234
 	</line_editor>
 	<text name="buying_label">
-		For the price
+		以此價格
 	</text>
 	<text name="currency_est">
 		approx. [LOCALAMOUNT]
@@ -60,7 +60,7 @@
 	<button label="立即購買" name="buy_btn"/>
 	<button label="取消" name="cancel_btn"/>
 	<text name="info_cannot_buy">
-		Unable to Buy
+		無法購買
 	</text>
-	<button label="Continue to the Web" name="error_web"/>
+	<button label="繼續到網頁" name="error_web"/>
 </floater>
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 34401c11d0..c4a5d174ef 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
@@ -16,7 +16,7 @@
 		You do not have permission to buy land for your active group.
 	</floater.string>
 	<floater.string name="no_land_selected">
-		No land selected.
+		無土地被選擇。
 	</floater.string>
 	<floater.string name="multiple_parcels_selected">
 		Multiple different parcels selected. 
@@ -32,7 +32,7 @@ Try selecting a smaller area.
 		The group already owns the parcel.
 	</floater.string>
 	<floater.string name="you_already_own">
-		You already own the parcel.
+		你已經擁有這個地段。
 	</floater.string>
 	<floater.string name="set_to_sell_to_other">
 		The selected parcel is set to sell to another party.
@@ -47,7 +47,7 @@ Try selecting a smaller area.
 	<floater.string name="processing">
 		Processing your purchase...
  
-(This may take a minute or two.)
+（過程這將會花費一到兩分鐘）
 	</floater.string>
 	<floater.string name="fetching_error">
 		There has been an error while fetching land buying information.
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_object.xml b/indra/newview/skins/default/xui/zh/floater_buy_object.xml
index ef8bc183a4..507e482766 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="BUY COPY OF OBJECT">
+<floater name="contents" title="購買物件副本">
 	<floater.string name="title_buy_text">
 		購買
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/zh/floater_camera.xml b/indra/newview/skins/default/xui/zh/floater_camera.xml
index 65d04583f5..f4db20684c 100644
--- a/indra/newview/skins/default/xui/zh/floater_camera.xml
+++ b/indra/newview/skins/default/xui/zh/floater_camera.xml
@@ -10,56 +10,56 @@
 		Move Camera Up and Down, Left and Right
 	</floater.string>
 	<floater.string name="camera_modes_title">
-		Camera modes
+		攝影機模式
 	</floater.string>
 	<floater.string name="pan_mode_title">
-		Orbit Zoom Pan
+		環繞縮放平移
 	</floater.string>
 	<floater.string name="presets_mode_title">
-		Preset Views
+		預設視角
 	</floater.string>
 	<floater.string name="free_mode_title">
-		View Object
+		視角物件
 	</floater.string>
 	<panel name="controls">
 		<panel name="preset_views_list">
 			<panel_camera_item name="front_view">
 				<panel_camera_item.text name="front_view_text">
-					Front View
+					前視視角
 				</panel_camera_item.text>
 			</panel_camera_item>
 			<panel_camera_item name="group_view">
 				<panel_camera_item.text name="side_view_text">
-					Side View
+					側視視角
 				</panel_camera_item.text>
 			</panel_camera_item>
 			<panel_camera_item name="rear_view">
 				<panel_camera_item.text name="rear_view_text">
-					Rear View
+					後視視角
 				</panel_camera_item.text>
 			</panel_camera_item>
 		</panel>
 		<panel name="camera_modes_list">
 			<panel_camera_item name="object_view">
 				<panel_camera_item.text name="object_view_text">
-					Object View
+					物件視角
 				</panel_camera_item.text>
 			</panel_camera_item>
 			<panel_camera_item name="mouselook_view">
 				<panel_camera_item.text name="mouselook_view_text">
-					Mouselook View
+					第一人稱視角
 				</panel_camera_item.text>
 			</panel_camera_item>
 		</panel>
 		<panel name="zoom">
 			<joystick_rotate name="cam_rotate_stick" tool_tip="Orbit camera around focus"/>
 			<slider_bar name="zoom_slider" tool_tip="Zoom camera toward focus"/>
-			<joystick_track name="cam_track_stick" tool_tip="Move camera up and down, left and right"/>
+			<joystick_track name="cam_track_stick" tool_tip="移動攝影機上下左右"/>
 		</panel>
 	</panel>
 	<panel name="buttons">
-		<button label="" name="presets_btn" tool_tip="Preset Views"/>
+		<button label="" name="presets_btn" tool_tip="預設視角"/>
 		<button label="" name="pan_btn" tool_tip="Orbit Zoom Pan"/>
-		<button label="" name="avatarview_btn" tool_tip="Camera modes"/>
+		<button label="" name="avatarview_btn" tool_tip="攝影機模式"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_choose_group.xml b/indra/newview/skins/default/xui/zh/floater_choose_group.xml
index 9968565bf2..9977bfc828 100644
--- a/indra/newview/skins/default/xui/zh/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/zh/floater_choose_group.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="groups" title="社團">
+<floater name="groups" title="群組">
 	<text name="groupdesc">
-		選擇一個社團：
+		選擇一個群組：
 	</text>
 	<button label="確定" label_selected="確定" name="OK"/>
 	<button label="取消" label_selected="取消" name="Cancel"/>
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
new file mode 100644
index 0000000000..28d2ba6ed4
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Day Cycle Floater" title="日循環編輯器">
+	<tab_container name="Day Cycle Tabs">
+		<panel label="日循環" name="Day Cycle">
+			<multi_slider initial_value="0" name="WLTimeSlider"/>
+			<multi_slider initial_value="0" name="WLDayCycleKeys"/>
+			<text name="WL12am">
+				12am
+			</text>
+			<text name="WL3am">
+				3am
+			</text>
+			<text name="WL6am">
+				6am
+			</text>
+			<text name="WL9amHash">
+				9am
+			</text>
+			<text name="WL12pmHash">
+				12pm
+			</text>
+			<text name="WL3pm">
+				3pm
+			</text>
+			<text name="WL6pm">
+				6pm
+			</text>
+			<text name="WL9pm">
+				9pm
+			</text>
+			<text name="WL12am2">
+				12am
+			</text>
+			<text name="WL12amHash">
+				|
+			</text>
+			<text name="WL3amHash">
+				I
+			</text>
+			<text name="WL6amHash">
+				|
+			</text>
+			<text name="WL9amHash2">
+				I
+			</text>
+			<text name="WL12pmHash2">
+				|
+			</text>
+			<text name="WL3pmHash">
+				I
+			</text>
+			<text name="WL6pmHash">
+				|
+			</text>
+			<text name="WL9pmHash">
+				I
+			</text>
+			<text name="WL12amHash2">
+				|
+			</text>
+			<button label="Add Key" label_selected="Add Key" name="WLAddKey"/>
+			<button label="Delete Key" label_selected="Delete Key" name="WLDeleteKey"/>
+			<text name="WLCurKeyFrameText">
+				Key Frame Settings:
+			</text>
+			<text name="WLCurKeyTimeText">
+				Key Time:
+			</text>
+			<spinner label="Hour" name="WLCurKeyHour"/>
+			<spinner label="Min" name="WLCurKeyMin"/>
+			<text name="WLCurKeyTimeText2">
+				Key Preset:
+			</text>
+			<combo_box label="Preset" name="WLKeyPresets"/>
+			<text name="DayCycleText">
+				Snap:
+			</text>
+			<combo_box label="五分鐘" name="WLSnapOptions"/>
+			<text name="DayCycleText2">
+				Length of Cycle:
+			</text>
+			<spinner label="小時" name="WLLengthOfDayHour"/>
+			<spinner label="分" name="WLLengthOfDayMin"/>
+			<spinner label="秒" name="WLLengthOfDaySec"/>
+			<text name="DayCycleText3">
+				預覽：
+			</text>
+			<button label="Play" label_selected="Play" 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"/>
+			<button label="Load Test Day" label_selected="Load Test Day" name="WLLoadDayCycle"/>
+		</panel>
+	</tab_container>
+</floater>
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 e12fc21166..39abfe0b8b 100644
--- a/indra/newview/skins/default/xui/zh/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/zh/floater_display_name.xml
@@ -13,6 +13,6 @@
 		Type your new name again to confirm:
 	</text>
 	<button label="儲存" name="save_btn" tool_tip="Save your new Display Name"/>
-	<button label="Reset" name="reset_btn" tool_tip="Make Display Name the same as Username"/>
+	<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_env_settings.xml b/indra/newview/skins/default/xui/zh/floater_env_settings.xml
new file mode 100644
index 0000000000..534ee7f0d0
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_env_settings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="ENVIRONMENT EDITOR">
+	<floater.string name="timeStr">
+		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
+	</floater.string>
+	<text name="EnvTimeText">
+		Time of Day
+	</text>
+	<text name="EnvTimeText2">
+		12:00 PM
+	</text>
+	<text name="EnvCloudText">
+		Cloud Cover
+	</text>
+	<text name="EnvWaterColorText">
+		水色
+	</text>
+	<color_swatch name="EnvWaterColor" tool_tip="Click to open color picker"/>
+	<text name="EnvWaterFogText">
+		水霧
+	</text>
+	<button label="Use Estate Time" name="EnvUseEstateTimeButton"/>
+	<button label="進階天空" name="EnvAdvancedSkyButton"/>
+	<button label="進階水文" name="EnvAdvancedWaterButton"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_gesture.xml b/indra/newview/skins/default/xui/zh/floater_gesture.xml
index 651a976774..a809cf085c 100644
--- a/indra/newview/skins/default/xui/zh/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_gesture.xml
@@ -4,7 +4,7 @@
 		載入中...
 	</floater.string>
 	<floater.string name="playing">
-		(Playing)
+		（播放中）
 	</floater.string>
 	<floater.string name="copy_name">
 		Copy of [COPY_NAME]
diff --git a/indra/newview/skins/default/xui/zh/floater_god_tools.xml b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
index fbe89ab2a6..448113bf74 100644
--- a/indra/newview/skins/default/xui/zh/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
@@ -2,25 +2,25 @@
 <floater name="godtools floater" title="神之工具">
 	<tab_container name="GodTools Tabs">
 		<panel label="網格" name="grid">
-			<button label="Flush This Region&apos;s Map Visibility Caches" label_selected="Flush This Region&apos;s Map Visibility Caches" name="Flush This Region&apos;s Map Visibility Caches"/>
+			<button label="刷新這個地區的地圖可視快取" label_selected="刷新這個地區的地圖可視快取" name="Flush This Region&apos;s Map Visibility Caches"/>
 		</panel>
 		<panel label="地區" name="region">
 			<text name="Region Name:">
 				地區名稱：
 			</text>
 			<check_box label="Prelude" name="check prelude" tool_tip="Set this to make the region a prelude"/>
-			<check_box label="Fixed Sun" name="check fixed sun" tool_tip="Fix the sun position (like in Region/Estate &gt; Terrain"/>
+			<check_box label="固定太陽" name="check fixed sun" tool_tip="Fix the sun position (like in Region/Estate &gt; Terrain"/>
 			<check_box label="Reset Home On Teleport" name="check reset home" tool_tip="When Resident teleports out, reset their home to the destination position."/>
 			<check_box label="Visible" name="check visible" tool_tip="Set this to make the region visible to non-gods"/>
-			<check_box label="Damage" name="check damage" tool_tip="Set this to enable damage in this region"/>
-			<check_box label="Block Traffic Tracking" name="block dwell" tool_tip="Set this to make the region not compute traffic"/>
-			<check_box label="Block Terraform" name="block terraform" tool_tip="Set this to disallow people terraforming their land"/>
-			<check_box label="Sandbox" name="is sandbox" tool_tip="Toggle whether this is a sandbox region"/>
-			<button label="Bake Terrain" label_selected="Bake Terrain" name="Bake Terrain" tool_tip="Save the current terrain as default"/>
+			<check_box label="傷害" name="check damage" tool_tip="Set this to enable damage in this region"/>
+			<check_box label="阻止流量追蹤" name="block dwell" tool_tip="Set this to make the region not compute traffic"/>
+			<check_box label="阻止變形" name="block terraform" tool_tip="Set this to disallow people terraforming their land"/>
+			<check_box label="沙盒" name="is sandbox" tool_tip="Toggle whether this is a sandbox region"/>
+			<button label="Bake Terrain" label_selected="Bake Terrain" name="Bake Terrain" tool_tip="儲存目前的地形為預設"/>
 			<button label="Revert Terrain" label_selected="Revert Terrain" name="Revert Terrain" tool_tip="Replace the current terrain with default"/>
 			<button label="Swap Terrain" label_selected="Swap Terrain" name="Swap Terrain" tool_tip="Swap current terrain with default"/>
 			<text name="estate id">
-				Estate ID:
+				領地 ID：
 			</text>
 			<text name="parent id">
 				Parent ID:
@@ -40,14 +40,14 @@
 			<text name="land cost text">
 				L$ per m²:
 			</text>
-			<button label="Refresh" label_selected="Refresh" name="Refresh" tool_tip="Click here to refresh the above information"/>
-			<button label="套用" label_selected="套用" name="Apply" tool_tip="Click here to apply any changes from above"/>
+			<button label="重新整理" label_selected="重新整理" name="Refresh" tool_tip="Click here to refresh the above information"/>
+			<button label="套用" label_selected="套用" name="Apply" tool_tip="點擊此處以接受套用上述變更"/>
 			<button label="選擇地區" label_selected="選擇地區" name="Select Region" tool_tip="Select the whole region with the land tool"/>
 			<button label="立即自動儲存" label_selected="立即自動儲存" name="Autosave now" tool_tip="Save gzipped state to autosave directory"/>
 		</panel>
 		<panel label="物件" name="objects">
 			<panel.string name="no_target">
-				(no target)
+				（無目標）
 			</panel.string>
 			<text name="Region Name:">
 				地區名稱：
@@ -61,7 +61,7 @@
 			<button label="套用" label_selected="套用" name="Apply" tool_tip="Click here to apply any changes from above"/>
 			<button label="Set Target" label_selected="Set Target" name="Set Target" tool_tip="Set the target avatar for object deletion"/>
 			<text name="target_avatar_name">
-				(no target)
+				（無目標）
 			</text>
 			<button label="Delete Target&apos;s Scripted Objects On Others Land" label_selected="Delete Target&apos;s Scripted Objects On Others Land" name="Delete Target&apos;s Scripted Objects On Others Land" tool_tip="Delete all scripted objects owned by the target on land not owned by the target. (no copy) objects will be returned."/>
 			<button label="Delete Target&apos;s Scripted Objects On *Any* Land" label_selected="Delete Target&apos;s Scripted Objects On *Any* Land" name="Delete Target&apos;s Scripted Objects On *Any* Land" tool_tip="Delete all scripted objects owned by the target in this region. (no copy) objects will be returned."/>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
index fcd702b16d..a41be7ef9a 100644
--- a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
@@ -46,7 +46,7 @@
 	</text>
 	<check_box label="覆製" name="CheckEveryoneCopy"/>
 	<text name="GroupLabel">
-		社團：
+		群組：
 	</text>
 	<check_box label="分享" name="CheckShareWithGroup"/>
 	<text name="NextOwnerLabel">
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 a4ede92ab1..370ab32b9f 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory Finder" title="最近_收納區_物品">
 	<check_box label="動作" name="check_animation"/>
-	<check_box label="Calling Cards" name="check_calling_card"/>
+	<check_box label="名片" name="check_calling_card"/>
 	<check_box label="服裝" name="check_clothing"/>
 	<check_box label="姿勢" name="check_gesture"/>
 	<check_box label="地標" name="check_landmark"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
index 3d9d391a21..1d172f63e1 100644
--- a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="land holdings floater" title="MY LAND">
+<floater name="land holdings floater" title="我的土地">
 	<floater.string name="area_string">
 		[AREA] m²
 	</floater.string>
 	<scroll_list name="parcel list">
 		<scroll_list.columns label="地段" name="name"/>
 		<scroll_list.columns label="地區" name="location"/>
-		<scroll_list.columns label="Type" name="type"/>
-		<scroll_list.columns label="Area" name="area"/>
+		<scroll_list.columns label="類型" name="type"/>
+		<scroll_list.columns label="區域" name="area"/>
 	</scroll_list>
-	<button label="瞬間傳送" label_selected="瞬間傳送" name="Teleport" tool_tip="Teleport to the center of this land."/>
-	<button label="地圖" label_selected="地圖" name="Show on Map" tool_tip="Show this land on the world map"/>
+	<button label="瞬間傳送" label_selected="瞬間傳送" name="Teleport" tool_tip="瞬間傳送到這土地的中央。"/>
+	<button label="地圖" label_selected="地圖" name="Show on Map" tool_tip="將這塊土地顯示在世界地圖上。"/>
 	<text name="contrib_label">
 		Contributions to your groups:
 	</text>
 	<scroll_list name="grant list">
-		<scroll_list.columns label="社團" name="group"/>
-		<scroll_list.columns label="Area" name="area"/>
+		<scroll_list.columns label="群組" name="group"/>
+		<scroll_list.columns label="區域" name="area"/>
 	</scroll_list>
 	<text name="allowed_label">
 		Allowed land holdings at current payment plan:
diff --git a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
index e6f6e32352..fe61c312ed 100644
--- a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
@@ -9,7 +9,7 @@
 	<floater.string name="Title">
 		腳本：[NAME]
 	</floater.string>
-	<button label="Reset" label_selected="Reset" name="Reset"/>
-	<check_box initial_value="true" label="Running" name="running"/>
+	<button label="重設" label_selected="重設" name="Reset"/>
+	<check_box initial_value="true" label="執行中" name="running"/>
 	<check_box initial_value="true" label="Mono" name="mono"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_moveview.xml b/indra/newview/skins/default/xui/zh/floater_moveview.xml
index 3e44f458e7..e1155bdf34 100644
--- a/indra/newview/skins/default/xui/zh/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_moveview.xml
@@ -43,33 +43,33 @@
 		向下飛（按下 C 鍵）
 	</string>
 	<string name="jump_tooltip">
-		Jump (press E)
+		跳躍（按下 E 鍵）
 	</string>
 	<string name="crouch_tooltip">
-		Crouch (press C)
+		蹲下（按下 C 鍵）
 	</string>
 	<string name="walk_title">
-		Walk
+		行走
 	</string>
 	<string name="run_title">
-		Run
+		跑步
 	</string>
 	<string name="fly_title">
 		飛行
 	</string>
 	<panel name="panel_actions">
-		<button name="turn left btn" tool_tip="Turn left (press Left Arrow or A)"/>
-		<joystick_slide name="move left btn" tool_tip="Walk left (press Shift + Left Arrow or A)"/>
-		<button name="turn right btn" tool_tip="Turn right (press Right Arrow or D)"/>
-		<joystick_slide name="move right btn" tool_tip="Walk right (press Shift + Right Arrow or D)"/>
-		<joystick_turn name="forward btn" tool_tip="Walk forward (press up arrow or W)"/>
-		<joystick_turn name="backward btn" tool_tip="Walk backward (press down arrow or S)"/>
+		<button name="turn left btn" tool_tip="左轉（按下左方向鍵或按 A 鍵）"/>
+		<joystick_slide name="move left btn" tool_tip="向左走（按下 Shift 加左方向鍵或按 A 鍵）"/>
+		<button name="turn right btn" tool_tip="右轉（按下右方向鍵或按 D 鍵）"/>
+		<joystick_slide name="move right btn" tool_tip="向右走（按下 Shift 加右方向鍵或按 D 鍵）"/>
+		<joystick_turn name="forward btn" tool_tip="向前走（按向上方向鍵或按 W 鍵）"/>
+		<joystick_turn name="backward btn" tool_tip="向後退（按向下方向鍵或按 S 鍵）"/>
 		<button name="move up btn" tool_tip="向上飛（按下 E 鍵）"/>
 		<button name="move down btn" tool_tip="向下飛（按下 C 建）"/>
 	</panel>
 	<panel name="panel_modes">
-		<button label="" name="mode_walk_btn" tool_tip="Walking mode"/>
-		<button label="" name="mode_run_btn" tool_tip="Running mode"/>
+		<button label="" name="mode_walk_btn" tool_tip="行走模式"/>
+		<button label="" name="mode_run_btn" tool_tip="跑步模式"/>
 		<button label="" name="mode_fly_btn" tool_tip="飛行模式"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_mute_object.xml b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
index 7d76f4de08..606e061395 100644
--- a/indra/newview/skins/default/xui/zh/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="block by name" title="BLOCK OBJECT BY NAME">
+<floater name="block by name" title="依名稱封鎖物件">
 	<text name="message">
 		Block an object:
 	</text>
 	<line_editor name="object_name">
-		Object name
+		物件名稱
 	</line_editor>
 	<text name="note">
 		* Only blocks object text, not sounds
diff --git a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
index e33183a0dc..a557e1c2e3 100644
--- a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
@@ -6,6 +6,6 @@
 		儲存我正在穿的為新裝扮：
 	</text>
 	<line_editor name="name ed">
-		[DESC] (new)
+		[DESC] （新）
 	</line_editor>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pay.xml b/indra/newview/skins/default/xui/zh/floater_pay.xml
index b4841df0ff..0a823cd82e 100644
--- a/indra/newview/skins/default/xui/zh/floater_pay.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money">
 	<string name="payee_group">
-		支付社團
+		支付群組
 	</string>
 	<string name="payee_resident">
 		支付居民
diff --git a/indra/newview/skins/default/xui/zh/floater_pay_object.xml b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
index 2a2aec93b9..39259524d7 100644
--- a/indra/newview/skins/default/xui/zh/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money">
 	<string name="payee_group">
-		支付社團
+		支付群組
 	</string>
 	<string name="payee_resident">
 		支付居民
diff --git a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
index 31b8133a18..498848ee56 100644
--- a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="perm prefs" title="預設上傳權限">
 	<panel label="權限" name="permissions">
-		<check_box label="與社團分享" name="share_with_group"/>
+		<check_box label="與群組分享" name="share_with_group"/>
 		<check_box label="允許任何人覆製" name="everyone_copy"/>
 		<text name="NextOwnerLabel">
 			下一個擁有者可以：
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
index 0649ecb791..ad49370423 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
@@ -40,7 +40,7 @@
 	<combo_box label="無" name="modifier_combo"/>
 	<combo_box label="無" name="key_combo"/>
 	<text name="library_label">
-		Library:
+		資源庫：
 	</text>
 	<scroll_list name="library_list">
 		<scroll_list.rows name="action_animation" value="動作"/>
@@ -48,7 +48,7 @@
 		<scroll_list.rows name="action_chat" value="聊天"/>
 		<scroll_list.rows name="action_wait" value="等待"/>
 	</scroll_list>
-	<button label="Add &gt;&gt;" name="add_btn"/>
+	<button label="添加 &gt;&gt;" name="add_btn"/>
 	<text name="steps_label">
 		Steps:
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
index 3c2f913a6d..9447939801 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview notecard" title="記事卡：">
 	<floater.string name="no_object">
-		Unable to find object containing this notecard.
+		未發現物件包含此記事卡。
 	</floater.string>
 	<floater.string name="not_allowed">
-		You do not have permission to view this notecard.
+		你並沒有權限去察看此記事卡。
 	</floater.string>
 	<floater.string name="Title">
 		記事卡： [NAME]
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 d9854a85b6..d99d13669f 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_sound">
 	<floater.string name="Title">
-		Sound: [NAME]
+		聲音： [NAME]
 	</floater.string>
 	<text name="desc txt">
 		描述：
diff --git a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
index acec1efcb0..5f0ffea182 100644
--- a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
@@ -5,7 +5,7 @@
         
 Remember, Classified fees are non-refundable.
 	</text>
-	<spinner label="價格： L$" name="price_for_listing" tool_tip="Price for listing." value="50"/>
-	<button label="Publish" name="publish_btn"/>
+	<spinner label="價格： L$" name="price_for_listing" tool_tip="刊登費用。" value="50"/>
+	<button label="發布" name="publish_btn"/>
 	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
index b16a3bd9cc..4ff2a3fc79 100644
--- a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="region_debug_console" title="Region Debug"/>
+<floater name="region_debug_console" title="地區除錯"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_script_preview.xml b/indra/newview/skins/default/xui/zh/floater_script_preview.xml
index 75ef4ebe73..c3d05402c0 100644
--- a/indra/newview/skins/default/xui/zh/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_preview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview lsl text" title="SCRIPT: ROTATION SCRIPT">
 	<floater.string name="Title">
-		SCRIPT: [NAME]
+		腳本：[NAME]
 	</floater.string>
 	<text name="desc txt">
 		描述：
diff --git a/indra/newview/skins/default/xui/zh/floater_script_queue.xml b/indra/newview/skins/default/xui/zh/floater_script_queue.xml
index 4062db5014..ff02946d86 100644
--- a/indra/newview/skins/default/xui/zh/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_queue.xml
@@ -7,13 +7,13 @@
 		Done.
 	</floater.string>
 	<floater.string name="Resetting">
-		Resetting
+		重設中
 	</floater.string>
 	<floater.string name="Running">
-		Running
+		執行中
 	</floater.string>
 	<floater.string name="NotRunning">
-		Not running
+		非執行中
 	</floater.string>
 	<button label="關閉" label_selected="關閉" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_search.xml b/indra/newview/skins/default/xui/zh/floater_search.xml
index 5b247350b8..bb693b7a70 100644
--- a/indra/newview/skins/default/xui/zh/floater_search.xml
+++ b/indra/newview/skins/default/xui/zh/floater_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="FIND">
+<floater name="floater_search" title="尋找">
 	<floater.string name="loading_text">
 		載入中...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
index bba075cf08..56a31bc292 100644
--- a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
@@ -4,10 +4,10 @@
 		<radio_item label="TRUE" name="TRUE" value="true"/>
 		<radio_item label="FALSE" name="FALSE" value=""/>
 	</radio_group>
-	<color_swatch label="Color" name="val_color_swatch"/>
+	<color_swatch label="顏色" name="val_color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
 	<spinner label="x" name="val_spinner_2"/>
 	<spinner label="x" name="val_spinner_3"/>
 	<spinner label="x" name="val_spinner_4"/>
-	<button label="Reset to default" name="default_btn"/>
+	<button label="回復至預設值" name="default_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml
index eebd5df3f7..582572d0e2 100644
--- a/indra/newview/skins/default/xui/zh/floater_stats.xml
+++ b/indra/newview/skins/default/xui/zh/floater_stats.xml
@@ -50,9 +50,9 @@
 				<stat_bar label="物件" name="simobjects"/>
 				<stat_bar label="Active Objects" name="simactiveobjects"/>
 				<stat_bar label="Active Scripts" name="simactivescripts"/>
-				<stat_bar label="Script Events" name="simscripteps"/>
-				<stat_bar label="Packets In" name="siminpps"/>
-				<stat_bar label="Packets Out" name="simoutpps"/>
+				<stat_bar label="腳本事件" name="simscripteps"/>
+				<stat_bar label="進入封包" name="siminpps"/>
+				<stat_bar label="出去封包" name="simoutpps"/>
 				<stat_bar label="擱置下載" name="simpendingdownloads"/>
 				<stat_bar label="擱置上傳" name="simpendinguploads"/>
 				<stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index 300d7ee63b..c70e70451e 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -49,13 +49,13 @@
 	</text>
 	<radio_group name="focus_radio_group">
 		<radio_item label="Zoom" name="radio zoom"/>
-		<radio_item label="Orbit (Ctrl)" name="radio orbit"/>
-		<radio_item label="Pan (Ctrl+Shift)" name="radio pan"/>
+		<radio_item label="環繞（Ctrl）" name="radio orbit"/>
+		<radio_item label="平移（Ctrl+Shift）" name="radio pan"/>
 	</radio_group>
 	<slider_bar initial_value="0.125" name="slider zoom"/>
 	<radio_group name="move_radio_group">
 		<radio_item label="移動" name="radio move"/>
-		<radio_item label="Lift (Ctrl)" name="radio lift"/>
+		<radio_item label="舉起（Ctrl）" name="radio lift"/>
 		<radio_item label="Spin (Ctrl+Shift)" name="radio spin"/>
 	</radio_group>
 	<radio_group name="edit_radio_group">
@@ -178,10 +178,10 @@
 				擁有者：
 			</text>
 			<text name="Group:">
-				社團：
+				群組：
 			</text>
 			<name_box initial_value="載入中..." name="Group Name Proxy"/>
-			<button name="button set group" tool_tip="選擇一個社團以分享這物件權限"/>
+			<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."/>
 			<text name="label click action">
@@ -480,7 +480,7 @@
 		<check_box label="顯示擁有者" name="checkbox show owners" tool_tip="Colorize the parcels according to the type of owner: 
 
 綠色 = 你的土地 
-水藍 = 你社團的土地 
+水藍 = 你群組的土地 
 紅色 = 其他人所有 
 黃色 = 出售 
 紫色 = 拍賣 
diff --git a/indra/newview/skins/default/xui/zh/floater_top_objects.xml b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
index 074a4a1881..0e7e0c5b1a 100644
--- a/indra/newview/skins/default/xui/zh/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
@@ -22,7 +22,7 @@
 		積分
 	</floater.string>
 	<floater.string name="none_descriptor">
-		None found.
+		未發現。
 	</floater.string>
 	<text name="title_text">
 		載入中...
@@ -39,7 +39,7 @@
 	<text name="id_text">
 		物件 ID:
 	</text>
-	<button label="Show Beacon" name="show_beacon_btn"/>
+	<button label="顯示指標" name="show_beacon_btn"/>
 	<text name="obj_name_text">
 		物件名稱：
 	</text>
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 4d650eaaee..c27b80e9c5 100644
--- a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
@@ -4,13 +4,13 @@
 		NEARBY VOICE
 	</string>
 	<string name="title_group">
-		Group Call with [GROUP]
+		與 [GROUP] 進行群組通話
 	</string>
 	<string name="title_adhoc">
-		Conference Call
+		會議通話
 	</string>
 	<string name="title_peer_2_peer">
-		Call with [NAME]
+		與 [NAME] 進行通話
 	</string>
 	<string name="no_one_near">
 		No one near has voice enabled
@@ -22,7 +22,7 @@
 		<layout_panel name="leave_call_panel">
 			<layout_stack name="voice_effect_and_leave_call_stack">
 				<layout_panel name="leave_call_btn_panel">
-					<button label="Leave Call" name="leave_call_btn"/>
+					<button label="結束通話" name="leave_call_btn"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_water.xml b/indra/newview/skins/default/xui/zh/floater_water.xml
new file mode 100644
index 0000000000..5fb57272af
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_water.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Water Floater" title="進階水文編輯器">
+	<floater.string name="WLDefaultWaterNames">
+		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+	</floater.string>
+	<text name="KeyFramePresetsText">
+		Water Presets:
+	</text>
+	<button label="新增" label_selected="新增" name="WaterNewPreset"/>
+	<button label="儲存" label_selected="儲存" name="WaterSavePreset"/>
+	<button label="刪除" label_selected="刪除" name="WaterDeletePreset"/>
+	<tab_container name="Water Tabs">
+		<panel label="設定" name="Settings">
+			<text name="BHText">
+				Water Fog Color
+			</text>
+			<color_swatch name="WaterFogColor" tool_tip="點擊以開啟顏色挑選器"/>
+			<text name="WaterFogDensText">
+				Fog Density Exponent
+			</text>
+			<text name="WaterUnderWaterFogModText">
+				Underwater Fog Modifier
+			</text>
+			<text name="BDensText">
+				Reflection Wavelet Scale
+			</text>
+			<slider label="1" name="WaterNormalScaleX"/>
+			<slider label="2" name="WaterNormalScaleY"/>
+			<slider label="3" name="WaterNormalScaleZ"/>
+			<text name="HDText">
+				Fresnel Scale
+			</text>
+			<text name="FresnelOffsetText">
+				Fresnel Offset
+			</text>
+			<text name="DensMultText">
+				Refract Scale Above
+			</text>
+			<text name="WaterScaleBelowText">
+				Refract Scale Below
+			</text>
+			<text name="MaxAltText">
+				Blur Multiplier
+			</text>
+		</panel>
+		<panel label="圖像" name="Waves">
+			<text name="BHText">
+				Big Wave Direction
+			</text>
+			<text name="WaterWave1DirXText">
+				X
+			</text>
+			<text name="WaterWave1DirYText">
+				Y
+			</text>
+			<text name="BHText2">
+				Little Wave Direction
+			</text>
+			<text name="WaterWave2DirXText">
+				X
+			</text>
+			<text name="WaterWave2DirYText">
+				Y
+			</text>
+			<text name="BHText3">
+				正常地圖
+			</text>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_web_content.xml b/indra/newview/skins/default/xui/zh/floater_web_content.xml
index a756498b81..be6bf8bb27 100644
--- a/indra/newview/skins/default/xui/zh/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/zh/floater_web_content.xml
@@ -2,13 +2,13 @@
 <floater name="floater_web_content" title="">
 	<layout_stack name="stack1">
 		<layout_panel name="nav_controls">
-			<button name="back" tool_tip="Navigate back"/>
-			<button name="forward" tool_tip="Navigate forward"/>
+			<button name="back" tool_tip="向後導覽"/>
+			<button name="forward" tool_tip="向前導覽"/>
 			<button name="stop" tool_tip="停止導覽"/>
 			<button name="reload" tool_tip="重載頁面"/>
 			<combo_box name="address" tool_tip="在此輸入 URL 位置"/>
-			<icon name="media_secure_lock_flag" tool_tip="Secured Browsing"/>
-			<button name="popexternal" tool_tip="Open current URL in your desktop browser"/>
+			<icon name="media_secure_lock_flag" tool_tip="加密的瀏覽"/>
+			<button name="popexternal" tool_tip="在你的桌面瀏覽器中開啟目前的 URL 位址"/>
 		</layout_panel>
 	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
index 36e00049f0..967e36ead7 100644
--- a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="whitelist_entry" title="WHITELIST ENTRY">
+<floater name="whitelist_entry" title="許可的項目清單">
 	<text name="media_label">
-		Enter a URL or URL pattern to add to the list of allowed domains
+		輸入一個 URL 位址或 URL 格式以添加到允許的網域清單中
 	</text>
-	<line_editor name="whitelist_entry" tool_tip="Enter a URL or URL pattern to White List"/>
+	<line_editor name="whitelist_entry" tool_tip="輸入一個 URL 位址或 URL 格式到白名單"/>
 	<button label="確定" name="ok_btn"/>
 	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
new file mode 100644
index 0000000000..383e35d50d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="WindLight floater" title="進階天空編輯器">
+	<floater.string name="WLDefaultSkyNames">
+		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
+	</floater.string>
+	<text name="KeyFramePresetsText">
+		天空預設值：
+	</text>
+	<button label="新增" label_selected="新增" name="WLNewPreset"/>
+	<button label="儲存" label_selected="儲存" name="WLSavePreset"/>
+	<button label="刪除" label_selected="刪除" name="WLDeletePreset"/>
+	<button label="日循環編輯器" label_selected="日循環編輯器" name="WLDayCycleMenuButton"/>
+	<tab_container name="WindLight Tabs">
+		<panel label="大氣" name="Atmosphere">
+			<text name="BHText">
+				藍天水平線
+			</text>
+			<text name="BHText2">
+				R
+			</text>
+			<text name="BHText3">
+				G
+			</text>
+			<text name="BHText4">
+				B
+			</text>
+			<text name="BHText5">
+				I
+			</text>
+			<text name="BDensText">
+				陰霾水平線
+			</text>
+			<text name="BDensText2">
+				藍天密度
+			</text>
+			<text name="BHText6">
+				R
+			</text>
+			<text name="BHText7">
+				G
+			</text>
+			<text name="BHText8">
+				B
+			</text>
+			<text name="BHText9">
+				I
+			</text>
+			<text name="HDText">
+				陰霾密度
+			</text>
+			<text name="DensMultText">
+				密度倍增
+			</text>
+			<text name="WLDistanceMultText">
+				距離倍增
+			</text>
+			<text name="MaxAltText">
+				最大高度
+			</text>
+		</panel>
+		<panel label="照明" name="Lighting">
+			<text name="SLCText">
+				日／月 顏色
+			</text>
+			<text name="BHText">
+				R
+			</text>
+			<text name="BHText2">
+				G
+			</text>
+			<text name="BHText3">
+				B
+			</text>
+			<text name="BHText4">
+				I
+			</text>
+			<text name="TODText">
+				日／月 位置
+			</text>
+			<text name="WLAmbientText">
+				環境
+			</text>
+			<text name="BHText5">
+				R
+			</text>
+			<text name="BHText6">
+				G
+			</text>
+			<text name="BHText7">
+				B
+			</text>
+			<text name="BHText8">
+				I
+			</text>
+			<text name="WLEastAngleText">
+				東升角度
+			</text>
+			<text name="SunGlowText">
+				太陽光輝
+			</text>
+			<slider label="焦點" name="WLGlowB"/>
+			<slider label="尺寸" name="WLGlowR"/>
+			<text name="SceneGammaText">
+				場景 Gamma 值
+			</text>
+			<text name="WLStarText">
+				星空量度
+			</text>
+		</panel>
+		<panel label="雲彩" name="Clouds">
+			<text name="WLCloudColorText">
+				雲彩顏色
+			</text>
+			<text name="BHText">
+				R
+			</text>
+			<text name="BHText2">
+				G
+			</text>
+			<text name="BHText3">
+				B
+			</text>
+			<text name="BHText4">
+				I
+			</text>
+			<text name="WLCloudColorText2">
+				雲彩 XY 軸 / 密度
+			</text>
+			<text name="BHText5">
+				X
+			</text>
+			<text name="BHText6">
+				Y
+			</text>
+			<text name="BHText7">
+				D
+			</text>
+			<text name="WLCloudCoverageText">
+				雲彩覆蓋
+			</text>
+			<text name="WLCloudScaleText">
+				雲彩規模
+			</text>
+			<text name="WLCloudDetailText">
+				雲彩細節（XY 軸 / 密度）
+			</text>
+			<text name="BHText8">
+				X
+			</text>
+			<text name="BHText9">
+				Y
+			</text>
+			<text name="BHText10">
+				D
+			</text>
+			<text name="WLCloudScrollXText">
+				雲彩 X 滾軸
+			</text>
+			<check_box label="鎖定" name="WLCloudLockX"/>
+			<text name="WLCloudScrollYText">
+				雲彩 Y 滾軸
+			</text>
+			<check_box label="鎖定" name="WLCloudLockY"/>
+			<check_box label="描繪傳統雲彩" name="DrawClassicClouds"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_world_map.xml b/indra/newview/skins/default/xui/zh/floater_world_map.xml
index 552bb02582..6ac6fb76b7 100644
--- a/indra/newview/skins/default/xui/zh/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/zh/floater_world_map.xml
@@ -2,45 +2,45 @@
 <floater name="worldmap" title="世界地圖">
 	<panel name="layout_panel_1">
 		<text name="events_label">
-			Legend
+			圖例
 		</text>
 	</panel>
 	<panel name="layout_panel_2">
-		<button name="Show My Location" tool_tip="Center map on my avatar&apos;s location"/>
+		<button name="Show My Location" tool_tip="以我的化身所在位置居中地圖"/>
 		<text name="me_label">
-			Me
+			自己
 		</text>
 		<text name="person_label">
 			人
 		</text>
 		<text name="infohub_label">
-			Infohub
+			資訊中心
 		</text>
 		<text name="land_sale_label">
-			Land Sale
+			土地出售
 		</text>
 		<text name="auction_label">
-			land auction
+			土地拍賣
 		</text>
 		<text name="by_owner_label">
-			by owner
+			依擁有者
 		</text>
 		<button name="Go Home" tool_tip="瞬間傳送到我的家位置"/>
 		<text name="Home_label">
 			家
 		</text>
 		<text name="events_label">
-			Events:
+			事件：
 		</text>
 		<text name="pg_label">
-			一般
+			一般普級
 		</text>
 		<check_box initial_value="true" name="events_mature_chk"/>
 		<text name="events_mature_label">
-			Moderate
+			適度成人
 		</text>
 		<text name="events_adult_label">
-			成人
+			完全成人
 		</text>
 	</panel>
 	<panel name="layout_panel_3">
@@ -55,8 +55,8 @@
 		<combo_box label="我的地標" name="landmark combo" tool_tip="將地標位置顯示在地圖上">
 			<combo_box.item label="我的地標" name="item1"/>
 		</combo_box>
-		<search_editor label="Regions by Name" name="location" tool_tip="輸入一個地區的名稱"/>
-		<button label="Find" name="DoSearch" tool_tip="Search for region"/>
+		<search_editor label="地區依名稱" name="location" tool_tip="輸入一個地區的名稱"/>
+		<button label="尋找" name="DoSearch" tool_tip="搜尋地區"/>
 		<button name="Clear" tool_tip="Clear tracking lines and reset map"/>
 		<text name="events_label">
 			位置：
diff --git a/indra/newview/skins/default/xui/zh/inspect_group.xml b/indra/newview/skins/default/xui/zh/inspect_group.xml
index 3583976646..ac331be203 100644
--- a/indra/newview/skins/default/xui/zh/inspect_group.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_group.xml
@@ -5,16 +5,16 @@
 -->
 <floater name="inspect_group">
 	<string name="PrivateGroup">
-		私人社團
+		私人群組
 	</string>
 	<string name="FreeToJoin">
 		免費加入
 	</string>
 	<string name="CostToJoin">
-		L$[AMOUNT] to join
+		花費 L$[AMOUNT] 加入
 	</string>
 	<string name="YouAreMember">
-		You are a member
+		你是成員
 	</string>
 	<text name="group_subtitle">
 		123 members
diff --git a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml
index 26f49ce69a..bed19d6d78 100644
--- a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml
@@ -17,6 +17,6 @@
 		http://slurl.com/Ahern/50/50/50
 	</text>
 	<button label="地圖" name="map_btn"/>
-	<button label="Block" name="block_btn"/>
+	<button label="封鎖" name="block_btn"/>
 	<button label="關閉" name="close_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
index a04d59bc81..885c4b9add 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
@@ -5,13 +5,13 @@
 	<menu_item_call label="加為朋友" name="Add Friend"/>
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="通話" name="Call"/>
-	<menu_item_call label="邀請加入社團" name="Invite..."/>
+	<menu_item_call label="邀請加入群組" name="Invite..."/>
 	<menu_item_call label="封鎖" name="Avatar Mute"/>
 	<menu_item_call label="回報" name="abuse"/>
 	<menu_item_call label="凍結" name="Freeze..."/>
 	<menu_item_call label="踢出" name="Eject..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
-	<menu_item_call label="Zoom In" name="Zoom In"/>
+	<menu_item_call label="放大" name="Zoom In"/>
 	<menu_item_call label="支付" name="Pay..."/>
 	<menu_item_call label="物件檔案" name="Object Inspect"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
index e3a791cde5..1911a1aeff 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
@@ -9,7 +9,7 @@
 	<menu_item_call label="編輯我的裝扮" name="Edit Outfit"/>
 	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
 	<menu_item_call label="我的朋友" name="Friends..."/>
-	<menu_item_call label="我的社團" name="Groups..."/>
+	<menu_item_call label="我的群組" name="Groups..."/>
 	<menu_item_call label="我的檔案" name="Profile..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
 	<menu_item_call label="丟棄" name="Drop"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
index acf98dfdfa..260571eb54 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
@@ -5,7 +5,7 @@
 	<menu_item_call label="加為朋友" name="Add Friend"/>
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="通話" name="Call"/>
-	<menu_item_call label="邀請加入社團" name="Invite..."/>
+	<menu_item_call label="邀請加入群組" name="Invite..."/>
 	<menu_item_call label="Block" name="Avatar Mute"/>
 	<menu_item_call label="回報" name="abuse"/>
 	<menu_item_call label="凍結" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
index 646edcf563..d516e3ab58 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
@@ -15,7 +15,7 @@
 			<menu_item_call label="內褲" name="Self Underpants"/>
 			<menu_item_call label="刺青" name="Self Tattoo"/>
 			<menu_item_call label="Physics" name="Self Physics"/>
-			<menu_item_call label="Alpha" name="Self Alpha"/>
+			<menu_item_call label="半透明" name="Self Alpha"/>
 			<menu_item_call label="全部衣服" name="All Clothes"/>
 		</context_menu>
 		<context_menu label="HUD" name="Object Detach HUD"/>
@@ -26,7 +26,7 @@
 	<menu_item_call label="編輯我裝扮" name="Edit Outfit"/>
 	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
 	<menu_item_call label="我的朋友" name="Friends..."/>
-	<menu_item_call label="我的社團" name="Groups..."/>
+	<menu_item_call label="我的群組" name="Groups..."/>
 	<menu_item_call label="我的檔案" name="Profile..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
index e053eb2388..a331c47a6e 100644
--- a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_gesture_gear">
-	<menu_item_call label="Add/Remove from Favorites" name="activate"/>
+	<menu_item_call label="由我的最愛中 添加/移除" name="activate"/>
 	<menu_item_call label="覆製" name="copy_gesture"/>
 	<menu_item_call label="貼上" name="paste"/>
 	<menu_item_call label="覆製 UUID" name="copy_uuid"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_group_plus.xml b/indra/newview/skins/default/xui/zh/menu_group_plus.xml
index 77c2c92491..d4a5a69104 100644
--- a/indra/newview/skins/default/xui/zh/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/zh/menu_group_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_group_plus">
-	<menu_item_call label="Join Group..." name="item_join"/>
-	<menu_item_call label="New Group..." name="item_new"/>
+	<menu_item_call label="加入群組..." name="item_join"/>
+	<menu_item_call label="新群組..." name="item_new"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
index 2577c582a7..4664fcb027 100644
--- a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet Group Menu">
-	<menu_item_call label="社團資訊" name="Show Profile"/>
+	<menu_item_call label="群組資訊" name="Show Profile"/>
 	<menu_item_call label="顯示會話" name="Chat"/>
 	<menu_item_call label="結束會話" name="End Session"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
index 0f14057c07..7385764e4c 100644
--- a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
@@ -5,7 +5,7 @@
 	<menu_item_call label="IM" name="im"/>
 	<menu_item_call label="通話" name="call"/>
 	<menu_item_call label="瞬間傳送" name="teleport"/>
-	<menu_item_call label="Invite to Group" name="invite_to_group"/>
+	<menu_item_call label="邀請加入群組" name="invite_to_group"/>
 	<menu_item_call label="Block" name="block"/>
 	<menu_item_call label="Unblock" name="unblock"/>
 	<menu_item_call label="回報" name="report"/>
@@ -14,7 +14,7 @@
 	<menu_item_call label="踢出" name="kick"/>
 	<menu_item_call label="CSR" name="csr"/>
 	<menu_item_call label="材質除錯" name="debug"/>
-	<menu_item_call label="Find On Map" name="find_on_map"/>
+	<menu_item_call label="在地圖上尋找" name="find_on_map"/>
 	<menu_item_call label="Zoom In" name="zoom_in"/>
 	<menu_item_call label="支付" name="pay"/>
 	<menu_item_call label="分享" name="share"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
index 2d7da70bfc..1c75705743 100644
--- a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
@@ -14,7 +14,7 @@
 			<menu_item_call label="內衣" name="Self Undershirt"/>
 			<menu_item_call label="內褲" name="Self Underpants"/>
 			<menu_item_call label="刺青" name="Self Tattoo"/>
-			<menu_item_call label="Alpha" name="Self Alpha"/>
+			<menu_item_call label="半透明" name="Self Alpha"/>
 			<menu_item_call label="全部衣服" name="All Clothes"/>
 		</context_menu>
 		<context_menu label="HUD" name="Object Detach HUD"/>
@@ -25,7 +25,7 @@
 	<menu_item_call label="編輯我的裝扮" name="Edit Outfit"/>
 	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
 	<menu_item_call label="我的朋友" name="Friends..."/>
-	<menu_item_call label="我的社團" name="Groups..."/>
+	<menu_item_call label="我的群組" name="Groups..."/>
 	<menu_item_call label="我的檔案" name="Profile..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
index a93e8be149..49a50c97c6 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -23,9 +23,9 @@
 		<menu_item_call label="新手套" name="New Gloves"/>
 		<menu_item_call label="新內衣" name="New Undershirt"/>
 		<menu_item_call label="新內褲" name="New Underpants"/>
-		<menu_item_call label="New Alpha Mask" name="New Alpha Mask"/>
+		<menu_item_call label="新半透明遮罩" name="New Alpha Mask"/>
 		<menu_item_call label="新刺青" name="New Tattoo"/>
-		<menu_item_call label="New Physics" name="New Physics"/>
+		<menu_item_call label="新身體物理" name="New Physics"/>
 	</menu>
 	<menu label="新身體部位" name="New Body Parts">
 		<menu_item_call label="新體形" name="New Shape"/>
@@ -51,7 +51,7 @@
 	<menu_item_call label="取代目前的裝扮" name="Replace Outfit"/>
 	<menu_item_call label="添加到目前裝扮" name="Add To Outfit"/>
 	<menu_item_call label="由目前的裝扮移除" name="Remove From Outfit"/>
-	<menu_item_call label="Find Original" name="Find Original"/>
+	<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="Open"/>
@@ -71,7 +71,7 @@
 	<menu_item_call label="Play Inworld" name="Animation Play"/>
 	<menu_item_call label="Play Locally" name="Animation Audition"/>
 	<menu_item_call label="送出即時訊息" name="Send Instant Message"/>
-	<menu_item_call label="Offer Teleport..." name="Offer Teleport..."/>
+	<menu_item_call label="發給瞬間傳送請求..." name="Offer Teleport..."/>
 	<menu_item_call label="Start Conference Chat" name="Conference Chat"/>
 	<menu_item_call label="Activate" name="Activate"/>
 	<menu_item_call label="Deactivate" name="Deactivate"/>
@@ -81,7 +81,7 @@
 	<menu label="Attach To" name="Attach To"/>
 	<menu label="Attach To HUD" name="Attach To HUD"/>
 	<menu_item_call label="編輯" name="Wearable Edit"/>
-	<menu_item_call label="Add" name="Wearable Add"/>
+	<menu_item_call label="添加" name="Wearable Add"/>
 	<menu_item_call label="脫下" name="Take Off"/>
 	<menu_item_call label="-- 無選項 --" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
index 9199608200..a0fc060e27 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
@@ -21,9 +21,9 @@
 		<menu_item_call label="新手套" name="New Gloves"/>
 		<menu_item_call label="新內衣" name="New Undershirt"/>
 		<menu_item_call label="新內褲" name="New Underpants"/>
-		<menu_item_call label="New Alpha" name="New Alpha"/>
+		<menu_item_call label="新半透明" name="New Alpha"/>
 		<menu_item_call label="新刺青" name="New Tattoo"/>
-		<menu_item_call label="New Physics" name="New Physics"/>
+		<menu_item_call label="新身體物理" name="New Physics"/>
 	</menu>
 	<menu label="新身體部位" name="New Body Parts">
 		<menu_item_call label="新體形" name="New Shape"/>
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 f51b27d9ce..74b90ada5e 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
@@ -11,7 +11,7 @@
 	<menu_item_call label="清空 Lost and Found" name="empty_lostnfound"/>
 	<menu_item_call label="儲存材質為" name="Save Texture As"/>
 	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="Find Original" name="Find Original"/>
-	<menu_item_call label="Find All Links" name="Find All Links"/>
+	<menu_item_call label="尋找原件" name="Find Original"/>
+	<menu_item_call label="尋找全部聯結" name="Find All Links"/>
 	<menu_item_call label="清空垃圾筒" name="empty_trash"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
index cf47020bd9..90704fee65 100644
--- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
@@ -13,8 +13,8 @@
 		<menu_item_call label="新手套" name="New Gloves"/>
 		<menu_item_call label="新內衣" name="New Undershirt"/>
 		<menu_item_call label="新內褲" name="New Underpants"/>
-		<menu_item_call label="New Alpha" name="New Alpha"/>
-		<menu_item_call label="New Physics" name="New Physics"/>
+		<menu_item_call label="新半透明" name="New Alpha"/>
+		<menu_item_call label="新身體物理" name="New Physics"/>
 		<menu_item_call label="新刺青" name="New Tattoo"/>
 	</menu>
 	<menu label="新身體部位" name="New Body Parts">
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_list.xml b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
index 3737e3d041..81ae6e4e85 100644
--- a/indra/newview/skins/default/xui/zh/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
@@ -8,7 +8,7 @@
 	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_check label="View People Icons" name="View Icons"/>
+	<menu_item_check label="察看人群圖示" name="View Icons"/>
 	<menu_item_check label="Block Voice" name="Block/Unblock"/>
 	<menu_item_check label="Block Text" name="MuteText"/>
 	<context_menu label="Moderator Options" name="Moderator Options">
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
index 2b0c461312..59854faeec 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
@@ -2,7 +2,7 @@
 <toggleable_menu name="menu_group_plus">
 	<menu_item_check label="依名稱排序" name="sort_name"/>
 	<menu_item_check label="依狀態排序" name="sort_status"/>
-	<menu_item_check label="View People Icons" name="view_icons"/>
-	<menu_item_check label="View Permissions Granted" name="view_permissions"/>
-	<menu_item_call label="Show Blocked Residents &amp; Objects" name="show_blocked_list"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+	<menu_item_check label="察看許可權限" name="view_permissions"/>
+	<menu_item_call label="顯示被封鎖的居民與物件" name="show_blocked_list"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
index cf36507d74..1be5c69b94 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-	<menu_item_check label="顯示社團圖示" name="Display Group Icons"/>
-	<menu_item_call label="脫離所選擇的社團" name="Leave Selected Group"/>
+	<menu_item_check label="顯示群組圖示" name="Display Group Icons"/>
+	<menu_item_call label="脫離所選擇的群組" name="Leave Selected Group"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
index 49fa775424..9faa35001c 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
@@ -9,5 +9,5 @@
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="支付" name="Pay"/>
 	<menu_item_check label="Block/Unblock" name="Block/Unblock"/>
-	<menu_item_call label="Offer Teleport" name="teleport"/>
+	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
index c7aff48df4..1380e0b307 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
@@ -6,5 +6,5 @@
 	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_call label="Offer Teleport" name="teleport"/>
+	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
index 5cf54b117b..a7f5c74b82 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Sort by Recent Speakers" name="sort_by_recent_speakers"/>
+	<menu_item_check label="依最近說話者排序" name="sort_by_recent_speakers"/>
 	<menu_item_check label="依名稱排序" name="sort_name"/>
 	<menu_item_check label="依距離排序" name="sort_distance"/>
-	<menu_item_check label="View People Icons" name="view_icons"/>
-	<menu_item_call label="Show Blocked Residents &amp; Objects" name="show_blocked_list"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+	<menu_item_call label="顯示笨封鎖的居民與物件" name="show_blocked_list"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
index d0b9438cfc..95f8917234 100644
--- a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_folder_gear">
-	<menu_item_call label="Add Folder" name="add_folder"/>
+	<menu_item_call label="添加資料夾" name="add_folder"/>
 	<menu_item_call label="添加地標" name="add_landmark"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_group.xml b/indra/newview/skins/default/xui/zh/menu_url_group.xml
index 2cbdd602cb..de97bb731f 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="顯示社團資訊" name="show_group"/>
-	<menu_item_call label="覆製社團到剪貼簿" name="url_copy_label"/>
+	<menu_item_call label="顯示群組資訊" name="show_group"/>
+	<menu_item_call label="覆製群組到剪貼簿" name="url_copy_label"/>
 	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 6d70ac4c1f..ce588c7e6b 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -26,7 +26,7 @@
 	</menu>
 	<menu label="溝通" name="Communicate">
 		<menu_item_call label="我的朋友" name="My Friends"/>
-		<menu_item_call label="我的社團" name="My Groups"/>
+		<menu_item_call label="我的群組" name="My Groups"/>
 		<menu_item_check label="附近的聊天" name="Nearby Chat"/>
 		<menu_item_call label="附近的人群" name="Active Speakers"/>
 	</menu>
@@ -96,7 +96,7 @@
 		<menu label="腳本" name="Scripts">
 			<menu_item_call label="重新編譯腳本（Mono）" name="Mono"/>
 			<menu_item_call label="重新編譯腳本（LSL）" name="LSL"/>
-			<menu_item_call label="Reset Scripts" name="Reset Scripts"/>
+			<menu_item_call label="重設腳本" name="Reset Scripts"/>
 			<menu_item_call label="設定腳本為執行中" name="Set Scripts to Running"/>
 			<menu_item_call label="設定腳本為非執行中" name="Set Scripts to Not Running"/>
 		</menu>
@@ -155,7 +155,7 @@
 		</menu>
 		<menu label="Rendering Types" name="Rendering Types">
 			<menu_item_check label="Simple" name="Simple"/>
-			<menu_item_check label="Alpha" name="Alpha"/>
+			<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"/>
@@ -179,21 +179,21 @@
 			<menu_item_check label="Flexible Objects" name="Flexible Objects"/>
 		</menu>
 		<menu_item_check label="Use Plugin Read Thread" name="Use Plugin Read Thread"/>
-		<menu_item_call label="Clear Group Cache" name="ClearGroupCache"/>
-		<menu_item_check label="Mouse Smoothing" name="Mouse Smoothing"/>
+		<menu_item_call label="清除群組快取資料" name="ClearGroupCache"/>
+		<menu_item_check label="滑鼠平滑移動" name="Mouse Smoothing"/>
 		<menu label="快速鍵" name="Shortcuts">
 			<menu_item_call label="圖像（L$[COST]）..." name="Upload Image"/>
 			<menu_item_check label="搜尋" name="Search"/>
 			<menu_item_call label="釋出按鍵" name="Release Keys"/>
 			<menu_item_call label="設定使用者界面大小至預設值" name="Set UI Size to Default"/>
-			<menu_item_check label="Show Advanced Menu - legacy shortcut" name="Show Advanced Menu - legacy shortcut"/>
+			<menu_item_check label="顯示進階選單 － 舊版捷徑" name="Show Advanced Menu - legacy shortcut"/>
 			<menu_item_call label="關閉視窗" name="Close Window"/>
 			<menu_item_call label="關閉全部視窗" name="Close All Windows"/>
-			<menu_item_call label="Snapshot to Disk" name="Snapshot to Disk"/>
+			<menu_item_call label="拍攝快照到硬碟" name="Snapshot to Disk"/>
 			<menu_item_call label="第一人稱視角" name="Mouselook"/>
 			<menu_item_check label="Joystick Flycam" name="Joystick Flycam"/>
-			<menu_item_call label="Reset View" name="Reset View"/>
-			<menu_item_call label="Look at Last Chatter" name="Look at Last Chatter"/>
+			<menu_item_call label="重設視角" name="Reset View"/>
+			<menu_item_call label="注視上一位聊天者" name="Look at Last Chatter"/>
 			<menu label="選擇建造工具" name="Select Tool">
 				<menu_item_call label="聚焦工具" name="Focus"/>
 				<menu_item_call label="移動工具" name="Move"/>
@@ -218,10 +218,10 @@
 			<menu_item_check label="Fast Timers" 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="Group Info to Debug Console" name="Group 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="Wind" name="Wind"/>
+			<menu_item_check label="風力" name="Wind"/>
 			<menu_item_check label="FOV" name="FOV"/>
 			<menu_item_check label="Badge" name="Badge"/>
 		</menu>
@@ -232,17 +232,17 @@
 			<menu_item_check label="Show Matrices" name="Show Matrices"/>
 			<menu_item_check label="Show Color Under Cursor" name="Show Color Under Cursor"/>
 			<menu_item_check label="顯示記憶體" name="Show Memory"/>
-			<menu_item_check label="Show Updates to Objects" name="Show Updates"/>
-		</menu>
-		<menu label="Force an Error" name="Force Errors">
-			<menu_item_call label="Force Breakpoint" name="Force Breakpoint"/>
-			<menu_item_call label="Force LLError And Crash" name="Force LLError And Crash"/>
-			<menu_item_call label="Force Bad Memory Access" name="Force Bad Memory Access"/>
-			<menu_item_call label="Force Infinite Loop" name="Force Infinite Loop"/>
-			<menu_item_call label="Force Driver Crash" name="Force Driver Carsh"/>
-			<menu_item_call label="Force Software Exception" name="Force Software Exception"/>
-			<menu_item_call label="Force Disconnect Viewer" name="Force Disconnect Viewer"/>
-			<menu_item_call label="Simulate a Memory Leak" name="Memory Leaking Simulation"/>
+			<menu_item_check label="顯示更新到物件" name="Show Updates"/>
+		</menu>
+		<menu label="強制錯誤" name="Force Errors">
+			<menu_item_call label="強制中斷點" name="Force Breakpoint"/>
+			<menu_item_call label="強制腳本錯誤並崩潰" name="Force LLError And Crash"/>
+			<menu_item_call label="強制不良的記憶體存取" name="Force Bad Memory Access"/>
+			<menu_item_call label="強制無限迴圈" name="Force Infinite Loop"/>
+			<menu_item_call label="強制驅動程式崩潰" name="Force Driver Carsh"/>
+			<menu_item_call label="強制軟體例外異常" name="Force Software Exception"/>
+			<menu_item_call label="強制瀏覽器斷線" name="Force Disconnect Viewer"/>
+			<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"/>
@@ -278,8 +278,8 @@
 			<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="Automatic Alpha Masks (deferred)" name="Automatic Alpha Masks (deferred)"/>
-			<menu_item_check label="Automatic Alpha Masks (non-deferred)" name="Automatic Alpha Masks (non-deferred)"/>
+			<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="Full Res Textures" name="Rull Res Textures"/>
@@ -310,7 +310,7 @@
 			<menu_item_check label="Sim Sun Override" name="Sim Sun Override"/>
 			<menu_item_check label="Cheesy Beacon" name="Cheesy Beacon"/>
 			<menu_item_check label="Fixed Weather" name="Fixed Weather"/>
-			<menu_item_call label="Dump Region Object Cache" name="Dump Region Object Cache"/>
+			<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"/>
@@ -325,10 +325,10 @@
 			<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"/>
-			<menu_item_check label="Debug Views" name="Debug Views"/>
+			<menu_item_check label="視角除錯" name="Debug Views"/>
 			<menu_item_check label="Debug Name Tooltips" name="Debug Name Tooltips"/>
-			<menu_item_check label="Debug Mouse Events" name="Debug Mouse Events"/>
-			<menu_item_check label="Debug Keys" name="Debug Keys"/>
+			<menu_item_check label="滑鼠事件除錯" name="Debug Mouse Events"/>
+			<menu_item_check label="按鍵除錯" name="Debug Keys"/>
 			<menu_item_check label="Debug WindowProc" name="Debug WindowProc"/>
 		</menu>
 		<menu label="XUI" name="XUI">
@@ -336,7 +336,7 @@
 			<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="送出測試 IMs" name="Send Test IMs"/>
-			<menu_item_call label="Flush Names Caches" name="Flush Names Caches"/>
+			<menu_item_call label="沖洗名稱快取資料" name="Flush Names Caches"/>
 		</menu>
 		<menu label="化身" name="Character">
 			<menu label="Grab Baked Texture" name="Grab Baked Texture">
@@ -380,14 +380,14 @@
 	<menu label="Admin" name="Admin">
 		<menu label="Object">
 			<menu_item_call label="取得副本" name="Take Copy"/>
-			<menu_item_call label="Force Owner To Me" name="Force Owner To Me"/>
+			<menu_item_call label="強制擁有者為我" name="Force Owner To Me"/>
 			<menu_item_call label="Force Owner Permissive" name="Force Owner Permissive"/>
 			<menu_item_call label="刪除" name="Delete"/>
 			<menu_item_call label="Lock" name="Lock"/>
 			<menu_item_call label="Get Assets IDs" name="Get Assets IDs"/>
 		</menu>
 		<menu label="地段" name="Parcel">
-			<menu_item_call label="Force Owner To Me" name="Owner To Me"/>
+			<menu_item_call label="強制擁有者為我" name="Owner To Me"/>
 			<menu_item_call label="Set to Linden Content" name="Set to Linden Content"/>
 			<menu_item_call label="Claim Public Land" name="Claim Public Land"/>
 		</menu>
@@ -410,9 +410,9 @@
 			<menu_item_call label="內衣" name="Menu Undershirt"/>
 			<menu_item_call label="內褲" name="Menu Underpants"/>
 			<menu_item_call label="裙子" name="Skirt"/>
-			<menu_item_call label="Alpha" name="Alpha"/>
-			<menu_item_call label="Tattoo" name="Tattoo"/>
-			<menu_item_call label="Physics" name="Physics"/>
+			<menu_item_call label="半透明" name="Alpha"/>
+			<menu_item_call label="刺青" name="Tattoo"/>
+			<menu_item_call label="身體物理" name="Physics"/>
 			<menu_item_call label="全部衣服" name="All Clothes"/>
 		</menu>
 		<menu label="幫助" name="Help">
diff --git a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
index c5c1f661fb..2eea314dd8 100644
--- a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
@@ -2,7 +2,7 @@
 <context_menu name="Outfit Wearable Context Menu">
 	<menu_item_call label="取代" name="wear_replace"/>
 	<menu_item_call label="Wear" name="wear_wear"/>
-	<menu_item_call label="Add" name="wear_add"/>
+	<menu_item_call label="添加" name="wear_add"/>
 	<menu_item_call label="Take Off / Detach" name="take_off_or_detach"/>
 	<menu_item_call label="卸下" name="detach"/>
 	<context_menu label="Attach to" name="wearable_attach_to"/>
diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml
index 3498942f9b..89fe92fabc 100644
--- a/indra/newview/skins/default/xui/zh/mime_types.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -5,7 +5,7 @@
 			網頁內容
 		</label>
 		<tooltip name="web_tooltip">
-			This location has Web content
+			這位置有網頁內容
 		</tooltip>
 		<playtip name="web_playtip">
 			顯示網頁內容
@@ -35,7 +35,7 @@
 	</widgetset>
 	<widgetset name="audio">
 		<label name="audio_label">
-			Audio
+			音頻
 		</label>
 		<tooltip name="audio_tooltip">
 			There is audio at this location
@@ -61,12 +61,12 @@
 	</mimetype>
 	<mimetype name="audio/*">
 		<label name="audio2_label">
-			Audio
+			音頻
 		</label>
 	</mimetype>
 	<mimetype name="video/*">
 		<label name="video2_label">
-			Video
+			視頻
 		</label>
 	</mimetype>
 	<mimetype name="image/*">
@@ -76,7 +76,7 @@
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			影片（QuickTime）
+			視頻（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -86,7 +86,7 @@
 	</mimetype>
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">
-			Ogg Audio/Video
+			Ogg 音頻/視頻
 		</label>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -106,7 +106,7 @@
 	</mimetype>
 	<mimetype name="application/smil">
 		<label name="application/smil_label">
-			Synchronized Multimedia Integration Language (SMIL)
+			同步多媒體整合語言（SMIL）
 		</label>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
@@ -121,22 +121,22 @@
 	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">
-			Audio (MIDI)
+			音頻（MIDI）
 		</label>
 	</mimetype>
 	<mimetype name="audio/mpeg">
 		<label name="audio/mpeg_label">
-			Audio (MP3)
+			音頻（MP3）
 		</label>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
 		<label name="audio/x-aiff_label">
-			Audio (AIFF)
+			音頻（AIFF）
 		</label>
 	</mimetype>
 	<mimetype name="audio/x-wav">
 		<label name="audio/x-wav_label">
-			Audio (WAV)
+			音頻（WAV）
 		</label>
 	</mimetype>
 	<mimetype name="image/bmp">
@@ -186,32 +186,32 @@
 	</mimetype>
 	<mimetype name="video/mpeg">
 		<label name="video/mpeg_label">
-			影片（MPEG）
+			視頻（MPEG）
 		</label>
 	</mimetype>
 	<mimetype name="video/mp4">
 		<label name="video/mp4_label">
-			影片（MP4）
+			視頻（MP4）
 		</label>
 	</mimetype>
 	<mimetype name="video/quicktime">
 		<label name="video/quicktime_label">
-			影片（QuickTime）
+			視頻（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
 		<label name="video/x-ms-asf_label">
-			影片（Windows Media ASF）
+			視頻（Windows Media ASF）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
 		<label name="video/x-ms-wmv_label">
-			影片（Windows Media WMV）
+			視頻（Windows Media WMV）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-msvideo">
 		<label name="video/x-msvideo_label">
-			影片（AVI）
+			視頻（AVI）
 		</label>
 	</mimetype>
 </mimetypes>
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 3498942f9b..08839abe6a 100644
--- a/indra/newview/skins/default/xui/zh/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
@@ -35,7 +35,7 @@
 	</widgetset>
 	<widgetset name="audio">
 		<label name="audio_label">
-			Audio
+			音頻
 		</label>
 		<tooltip name="audio_tooltip">
 			There is audio at this location
@@ -61,7 +61,7 @@
 	</mimetype>
 	<mimetype name="audio/*">
 		<label name="audio2_label">
-			Audio
+			音頻
 		</label>
 	</mimetype>
 	<mimetype name="video/*">
@@ -76,7 +76,7 @@
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			影片（QuickTime）
+			視頻（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -86,7 +86,7 @@
 	</mimetype>
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">
-			Ogg Audio/Video
+			Ogg 音頻/視頻
 		</label>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -121,22 +121,22 @@
 	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">
-			Audio (MIDI)
+			音頻（MIDI）
 		</label>
 	</mimetype>
 	<mimetype name="audio/mpeg">
 		<label name="audio/mpeg_label">
-			Audio (MP3)
+			音頻（MP3）
 		</label>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
 		<label name="audio/x-aiff_label">
-			Audio (AIFF)
+			音頻（AIFF）
 		</label>
 	</mimetype>
 	<mimetype name="audio/x-wav">
 		<label name="audio/x-wav_label">
-			Audio (WAV)
+			音頻（WAV）
 		</label>
 	</mimetype>
 	<mimetype name="image/bmp">
@@ -186,32 +186,32 @@
 	</mimetype>
 	<mimetype name="video/mpeg">
 		<label name="video/mpeg_label">
-			影片（MPEG）
+			視頻（MPEG）
 		</label>
 	</mimetype>
 	<mimetype name="video/mp4">
 		<label name="video/mp4_label">
-			影片（MP4）
+			視頻（MP4）
 		</label>
 	</mimetype>
 	<mimetype name="video/quicktime">
 		<label name="video/quicktime_label">
-			影片（QuickTime）
+			視頻（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
 		<label name="video/x-ms-asf_label">
-			影片（Windows Media ASF）
+			視頻（Windows Media ASF）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
 		<label name="video/x-ms-wmv_label">
-			影片（Windows Media WMV）
+			視頻（Windows Media WMV）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-msvideo">
 		<label name="video/x-msvideo_label">
-			影片（AVI）
+			視頻（AVI）
 		</label>
 	</mimetype>
 </mimetypes>
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 3f38c528a6..7958f64219 100644
--- a/indra/newview/skins/default/xui/zh/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
@@ -27,21 +27,21 @@
 			圖像
 		</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">
 		<label name="audio_label">
-			Audio
+			音頻
 		</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">
@@ -61,12 +61,12 @@
 	</mimetype>
 	<mimetype name="audio/*">
 		<label name="audio2_label">
-			Audio
+			音頻
 		</label>
 	</mimetype>
 	<mimetype name="video/*">
 		<label name="video2_label">
-			Video
+			視頻
 		</label>
 	</mimetype>
 	<mimetype name="image/*">
@@ -76,7 +76,7 @@
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			影片 （QuickTime）
+			視頻 （QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -86,7 +86,7 @@
 	</mimetype>
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">
-			Ogg Audio/Video
+			OGG 音頻/視頻
 		</label>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -106,7 +106,7 @@
 	</mimetype>
 	<mimetype name="application/smil">
 		<label name="application/smil_label">
-			Synchronized Multimedia Integration Language (SMIL)
+			同步多媒體整合語言（SMIL）
 		</label>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
@@ -121,22 +121,22 @@
 	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">
-			Audio (MIDI)
+			音頻 （MIDI）
 		</label>
 	</mimetype>
 	<mimetype name="audio/mpeg">
 		<label name="audio/mpeg_label">
-			Audio (MP3)
+			音頻（MP3）
 		</label>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
 		<label name="audio/x-aiff_label">
-			Audio (AIFF)
+			音頻（AIFF）
 		</label>
 	</mimetype>
 	<mimetype name="audio/x-wav">
 		<label name="audio/x-wav_label">
-			Audio (WAV)
+			音頻（WAV）
 		</label>
 	</mimetype>
 	<mimetype name="image/bmp">
@@ -186,32 +186,32 @@
 	</mimetype>
 	<mimetype name="video/mpeg">
 		<label name="video/mpeg_label">
-			影片（MPEG）
+			視頻（MPEG）
 		</label>
 	</mimetype>
 	<mimetype name="video/mp4">
 		<label name="video/mp4_label">
-			影片（MP4）
+			視頻（MP4）
 		</label>
 	</mimetype>
 	<mimetype name="video/quicktime">
 		<label name="video/quicktime_label">
-			影片（QuickTime）
+			視頻（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
 		<label name="video/x-ms-asf_label">
-			影片（Windows Media ASF）
+			視頻（Windows Media ASF）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
 		<label name="video/x-ms-wmv_label">
-			影片（Windows Media WMV）
+			視頻（Windows Media WMV）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-msvideo">
 		<label name="video/x-msvideo_label">
-			影片（AVI）
+			視頻（AVI）
 		</label>
 	</mimetype>
 </mimetypes>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 65bb8ce517..f819ed35e6 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <notifications>
 	<global name="skipnexttime">
-		Don&apos;t show me this again
+		不再顯示此提醒
 	</global>
 	<global name="alwayschoose">
-		Always choose this option
+		總是選取這個選項
 	</global>
 	<global name="implicitclosebutton">
 		關閉
@@ -44,7 +44,7 @@
 			<button name="Cancel_yesnocancelbuttons" text="$canceltext"/>
 		</form>
 	</template>
-	<notification label="Unknown Notification Message" name="MissingAlert">
+	<notification label="未知的通知訊息" name="MissingAlert">
 		Your version of [APP_NAME] does not know how to display the notification it just received.  Please verify that you have the latest Viewer installed.
 
 Error details: The notification called &apos;[_NAME]&apos; was not found in notifications.xml.
@@ -72,9 +72,9 @@ Error details: The notification called &apos;[_NAME]&apos; was not found in noti
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="LoginFailedNoNetwork">
-		Could not connect to the [SECOND_LIFE_GRID].
+		無法連接到[SECOND_LIFE_GRID].
     &apos;[DIAGNOSTIC]&apos;
-Make sure your Internet connection is working properly.
+請確定你的網際網路是正常運作的。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="MessageTemplateNotFound">
@@ -82,7 +82,7 @@ Make sure your Internet connection is working properly.
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="WearableSave">
-		Save changes to current clothing/body part?
+		除存變更到目前的衣服/身體部位？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="不要儲存" yestext="儲存"/>
 	</notification>
 	<notification name="CompileQueueSaveText">
@@ -132,7 +132,7 @@ Do you want to grant modify rights for the selected Residents?
 		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="UnableToCreateGroup">
-		Unable to create group.
+		無法建立新群組。
 [MESSAGE]
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
@@ -142,7 +142,7 @@ Do you want to grant modify rights for the selected Residents?
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="忽視變更" yestext="套用變更"/>
 	</notification>
 	<notification name="MustSpecifyGroupNoticeSubject">
-		You must specify a subject to send a group notice.
+		你必須指定一個主旨以送出群組通知。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="AddGroupOwnerWarning">
@@ -150,7 +150,7 @@ Do you want to grant modify rights for the selected Residents?
 Members cannot be removed from that role.
 The members must resign from the role themselves.
 Are you sure you want to continue?
-		<usetemplate ignoretext="Confirm before I add a new group Owner" name="okcancelignore" notext="否" yestext="是"/>
+		<usetemplate ignoretext="在我添加一個新的群組擁有者前確認" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="AssignDangerousActionWarning">
 		You are about to add the Ability &apos;[ACTION_NAME]&apos; to the Role &apos;[ROLE_NAME]&apos;.
@@ -173,17 +173,17 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
 	<notification name="AttachmentDrop">
 		You are about to drop your attachment.
     Are you sure you want to continue?
-		<usetemplate ignoretext="Confirm before dropping attachments" name="okcancelignore" notext="否" yestext="是"/>
+		<usetemplate ignoretext="在丟下附件前確認" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="JoinGroupCanAfford">
-		Joining this group costs L$[COST].
-Do you wish to proceed?
-		<usetemplate name="okcancelbuttons" notext="取消" yestext="Join"/>
+		加入此群組須花費 L$[COST]。
+你確定要繼續嗎？
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="加入"/>
 	</notification>
 	<notification name="JoinGroupNoCost">
 		You are joining group [NAME].
 Do you wish to proceed?
-		<usetemplate name="okcancelbuttons" notext="取消" yestext="Join"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="加入"/>
 	</notification>
 	<notification name="JoinGroupCannotAfford">
 		Joining this group costs L$[COST].
@@ -193,7 +193,7 @@ You do not have enough L$ to join this group.
 		Creating this group will cost L$100.
 Groups need more than one member, or they are deleted forever.
 Please invite members within 48 hours.
-		<usetemplate canceltext="取消" name="okcancelbuttons" notext="取消" yestext="Create group for L$100"/>
+		<usetemplate canceltext="取消" name="okcancelbuttons" notext="取消" yestext="花費 L$100 建立群組"/>
 	</notification>
 	<notification name="LandBuyPass">
 		For L$[COST] you can enter this land (&apos;[PARCEL_NAME]&apos;) for [TIME] hours.  Buy a pass?
@@ -341,7 +341,7 @@ There is no reimbursement for fees paid.
 	<notification name="DeleteMedia">
 		You have selected to delete the media associated with this face.
 Are you sure you want to continue?
-		<usetemplate ignoretext="Confirm before I delete media from an object" name="okcancelignore" notext="否" yestext="是"/>
+		<usetemplate ignoretext="在我由一個部件中刪除媒體前確認" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="ClassifiedSave">
 		Save changes to classified [NAME]?
@@ -370,14 +370,14 @@ Are you sure you want to continue?
 		Please select a proposal to view.
 	</notification>
 	<notification name="SelectHistoryItemToView">
-		Please select a history item to view.
+		請選擇一個歷史紀錄物品去察看。
 	</notification>
 	<notification name="CacheWillClear">
-		Cache will be cleared after you restart [APP_NAME].
+		當你重新啟動 [APP_NAME] 後快取資料將會被清除。
 	</notification>
 	<notification name="CacheWillBeMoved">
-		Cache will be moved after you restart [APP_NAME].
-Note: This will clear the cache.
+		當你重新啟動 [APP_NAME] 後快取資料將被移動。
+注意：這將會清除快取資料。
 	</notification>
 	<notification name="ChangeConnectionPort">
 		Port settings take effect after you restart [APP_NAME].
@@ -519,7 +519,7 @@ Do you really want to give these items?
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="踢出並封鎖" yestext="踢出"/>
 	</notification>
 	<notification name="EjectAvatarNoBan">
-		將這一位化身由你的土地踢出？
+		將這一個化身由你的土地踢出？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="踢出"/>
 	</notification>
 	<notification name="EjectAvatarFullnameNoBan">
@@ -527,10 +527,10 @@ Do you really want to give these items?
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="踢出"/>
 	</notification>
 	<notification name="EjectAvatarFromGroup">
-		你已將 [AVATAR_NAME] 由社團 [GROUP_NAME]　中踢出
+		你已將 [AVATAR_NAME] 由群組 [GROUP_NAME]　中踢出
 	</notification>
 	<notification name="AcquireErrorTooManyObjects">
-		ACQUIRE ERROR: Too many objects selected.
+		取得錯誤：太多物件被選取。
 	</notification>
 	<notification name="AcquireErrorObjectSpan">
 		ACQUIRE ERROR: Objects span more than one region.
@@ -605,7 +605,7 @@ Expected [VALIDS]
 [FILE]
 	</notification>
 	<notification name="SoundFileInvalidTooLong">
-		Audio file is too long (10 second maximum):
+		音頻檔太長（最大值 10 秒）：
 [FILE]
 	</notification>
 	<notification name="ProblemWithFile">
@@ -738,8 +738,8 @@ If you continue to get this message, please check the [SUPPORT_SITE].
 		收納區功能目前無法使用。
 	</notification>
 	<notification name="CannotSetLandOwnerNothingSelected">
-		Unable to set land owner:
-No parcel selected.
+		無法設定土地擁有者：
+無地段被選取。
 	</notification>
 	<notification name="CannotSetLandOwnerMultipleRegions">
 		Unable to force land ownership because selection spans multiple regions. Please select a smaller area and try again.
@@ -762,8 +762,8 @@ No region selected.
 No parcel selected.
 	</notification>
 	<notification name="CannotReleaseLandNoRegion">
-		Unable to abandon land:
-Cannot find region.
+		無法放棄土地：
+無法尋找地區。
 	</notification>
 	<notification name="CannotBuyLandNothingSelected">
 		Unable to buy land:
@@ -778,11 +778,11 @@ Cannot find the region this land is in.
 	</notification>
 	<notification name="CannotDeedLandNothingSelected">
 		Unable to deed land:
-No parcel selected.
+無地段被選取。
 	</notification>
 	<notification name="CannotDeedLandNoGroup">
 		Unable to deed land:
-No Group selected.
+無群組被選取。
 	</notification>
 	<notification name="CannotDeedLandNoRegion">
 		Unable to deed land:
@@ -1377,11 +1377,11 @@ 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="Confirm before I deed an object to a group" name="okcancelignore" notext="取消" yestext="Deed"/>
+		<usetemplate ignoretext="在我讓渡一個物件給群組前確認" name="okcancelignore" notext="取消" yestext="Deed"/>
 	</notification>
 	<notification name="WebLaunchExternalTarget">
-		Do you want to open your Web browser to view this content?
-		<usetemplate ignoretext="Launch my browser to view a web page" name="okcancelignore" notext="取消" yestext="確定"/>
+		你確定要開啟網頁瀏覽器去察看這個內容？
+		<usetemplate ignoretext="啟動我的網頁瀏覽器去察看網頁" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchJoinNow">
 		前往你的[http://secondlife.com/account/ 塗鴉牆]以進行管理你的帳戶？
@@ -1389,37 +1389,37 @@ We must restart [APP_NAME] to install the update.
 	</notification>
 	<notification name="WebLaunchSecurityIssues">
 		Visit the [SECOND_LIFE] Wiki for details of how to report a security issue.
-		<usetemplate ignoretext="Launch my browser to learn how to report a Security Issue" name="okcancelignore" notext="取消" yestext="確定"/>
+		<usetemplate ignoretext="開啟我的網頁瀏覽器以學習如何回報一個安全性的議題" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchQAWiki">
-		Visit the [SECOND_LIFE] QA Wiki.
-		<usetemplate ignoretext="Launch my browser to view the QA Wiki" name="okcancelignore" notext="取消" yestext="確定"/>
+		拜訪 [SECOND_LIFE] 問與答維基。
+		<usetemplate ignoretext="開啟我的網頁瀏覽器去察看問與答維基" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchPublicIssue">
-		Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and other issues.
-		<usetemplate ignoretext="Launch my browser to use the Public Issue Tracker" name="okcancelignore" notext="取消" yestext="前往頁面"/>
+		拜訪 [SECOND_LIFE] 公共議題追蹤，那裡你將可以回報臭蟲與其他議題。
+		<usetemplate ignoretext="開啟我的網頁瀏覽器以使用公共議題追蹤。" name="okcancelignore" notext="取消" yestext="前往頁面"/>
 	</notification>
 	<notification name="WebLaunchSupportWiki">
 		前往林登官方部落格，以取得最新的新聞與資訊。
-		<usetemplate ignoretext="Launch my browser to view the blog" name="okcancelignore" notext="取消" yestext="確定"/>
+		<usetemplate ignoretext="開啟我的網頁瀏覽器以察看部落格" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchLSLGuide">
-		Do you want to open the Scripting Guide for help with scripting?
-		<usetemplate ignoretext="Launch my browser to view the Scripting Guide" name="okcancelignore" notext="取消" yestext="確定"/>
+		你要開啟腳本撰寫指引以幫助你開發腳本嗎？
+		<usetemplate ignoretext="開啟我的網頁瀏覽器以察看腳本撰寫指引" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchLSLWiki">
-		Do you want to visit the LSL Portal for help with scripting?
-		<usetemplate ignoretext="Launch my browser to view the LSL Portal" name="okcancelignore" notext="取消" yestext="前往頁面"/>
+		你要拜訪 LSL 入口以取得腳本設計的幫助嗎？
+		<usetemplate ignoretext="開啟我的網頁瀏覽器以察看 LSL 入口" name="okcancelignore" notext="取消" yestext="前往頁面"/>
 	</notification>
 	<notification name="ReturnToOwner">
-		Are you sure you want to return the selected objects to their owners? Transferable deeded objects will be returned to their previous owners.
+		你確定要退回所選擇的物件給它們的擁有者嗎？ 可轉移並讓渡的物件將會退回給它們的前一位擁有者。
 
-*WARNING* No-transfer deeded objects will be deleted!
-		<usetemplate ignoretext="Confirm before I return objects to their owners" name="okcancelignore" notext="取消" yestext="確定"/>
+*警告* 非可轉移並讓渡的物件將會被刪除!
+		<usetemplate ignoretext="在我退回物件給它們的擁有者前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="GroupLeaveConfirmMember">
-		You are currently a member of the group [GROUP].
-Leave Group?
+		你目前是 [GROUP] 群組的成員。
+是否要離開群組？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmKick">
@@ -1452,12 +1452,12 @@ Leave Group?
 	<notification name="BusyModeSet">
 		Busy mode is set.
 Chat and instant messages will be hidden. Instant messages will get your Busy mode response. All teleportation offers will be declined. All inventory offers will go to your Trash.
-		<usetemplate ignoretext="I change my status to Busy mode" name="okignore" yestext="確定"/>
+		<usetemplate ignoretext="我變更我的狀態為忙碌模式" name="okignore" yestext="確定"/>
 	</notification>
 	<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="Join"/>
+		<usetemplate name="okcancelbuttons" notext="Decline" yestext="加入"/>
 	</notification>
 	<notification name="JoinedTooManyGroups">
 		You have reached your maximum number of groups. Please leave some group before joining or creating a new one.
@@ -1757,7 +1757,7 @@ Publish this classified now for L$[AMOUNT]?
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="SetGroupMature">
-		Does this group contain Moderate content?
+		這個群組將包含適度成人內容？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification label="Confirm restart" name="ConfirmRestart">
@@ -1894,7 +1894,7 @@ Move the inventory item(s)?
 	</notification>
 	<notification name="DeleteItems">
 		[QUESTION]
-		<usetemplate ignoretext="Confirm before deleting items" name="okcancelignore" notext="取消" yestext="確定"/>
+		<usetemplate ignoretext="刪除物品前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="HelpReportAbuseEmailLL">
 		Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards].
@@ -1955,37 +1955,37 @@ Do you want to replace it with the selected object?
 
 Would you like to leave Busy Mode before completing this transaction?
 		<form name="form">
-			<ignore name="ignore" text="I am about to pay a person or object while I am in Busy mode"/>
-			<button ignore="Always leave Busy Mode" name="Yes" text="確定"/>
-			<button ignore="Never leave Busy Mode" name="No" text="取消"/>
+			<ignore name="ignore" text="當我在忙碌模式時，將要支付金錢或給他人物件"/>
+			<button ignore="總是離開忙碌模式" name="Yes" text="確定"/>
+			<button ignore="絕不離開忙碌模式" name="No" text="取消"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
-		The folder &apos;[FOLDERNAME]&apos; is a system folder. Deleting system folders can cause instability.  Are you sure you want to delete it?
-		<usetemplate ignoretext="Confirm before I delete a system folder" name="okcancelignore" notext="取消" yestext="確定"/>
+		資料夾 &apos;[FOLDERNAME]&apos; 是系統資料夾。刪除系統資料夾將導致不穩定。你確定你要刪除它？
+		<usetemplate ignoretext="在我刪除系統資料夾前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmEmptyTrash">
-		Are you sure you want to permanently delete the contents of your Trash?
-		<usetemplate ignoretext="Confirm before I empty the inventory Trash folder" name="okcancelignore" notext="取消" yestext="確定"/>
+		你確定你要對你垃圾筒中的內容進行刪除？
+		<usetemplate ignoretext="在我清空收納區垃圾筒資料夾前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmClearBrowserCache">
-		Are you sure you want to delete your travel, web, and search history?
+		你確定要刪除你的旅行、網頁及搜尋歷史紀錄嗎？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmClearCookies">
-		Are you sure you want to clear your cookies?
+		你確定要清除你的 cookies 嗎？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="是"/>
 	</notification>
 	<notification name="ConfirmClearMediaUrlList">
-		Are you sure you want to clear your list of saved URLs?
+		你確定要清除你所儲存的 Url 清單嗎？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="是"/>
 	</notification>
 	<notification name="ConfirmEmptyLostAndFound">
-		Are you sure you want to permanently delete the contents of your Lost And Found?
-		<usetemplate ignoretext="Confirm before I empty the inventory Lost And Found folder" name="okcancelignore" notext="否" yestext="是"/>
+		你確定你要進行刪除所有 Lost And Found 資料夾中的內容？
+		<usetemplate ignoretext="在我清空收納區中的 Lost And Found 資料夾前進行確認" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="CopySLURL">
-		The following SLurl has been copied to your clipboard:
+		下列的 SLurl 位置已經覆製到你的剪貼簿上：
  [SLURL]
 
 Link to this from a web page to give others easy access to this location, or try it out yourself by pasting it into the address bar of any web browser.
@@ -1994,11 +1994,11 @@ Link to this from a web page to give others easy access to this location, or try
 		</form>
 	</notification>
 	<notification name="WLSavePresetAlert">
-		Do you wish to overwrite the saved preset?
-		<usetemplate name="okcancelbuttons" notext="No" yestext="是"/>
+		你要覆寫已儲存的預設配置嗎？
+		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="WLDeletePresetAlert">
-		Do you wish to delete [SKY]?
+		你要刪除 [SKY]?
 		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="WLNoEditDefault">
@@ -2015,7 +2015,7 @@ Link to this from a web page to give others easy access to this location, or try
 		Give me a name for the new sky.
 		<form name="form">
 			<input name="message">
-				New Preset
+				新預設配配置
 			</input>
 			<button name="OK" text="確定"/>
 			<button name="Cancel" text="取消"/>
@@ -2094,13 +2094,13 @@ Link to this from a web page to give others easy access to this location, or try
 		[MESSAGE]
 	</notification>
 	<notification name="Cancelled">
-		Cancelled
+		已取消
 	</notification>
 	<notification name="CancelledSit">
-		Cancelled Sit
+		取消坐下
 	</notification>
 	<notification name="CancelledAttach">
-		Cancelled Attach
+		取消貼上
 	</notification>
 	<notification name="ReplacedMissingWearable">
 		Replaced missing clothing/body part with default.
@@ -2131,13 +2131,13 @@ Link to this from a web page to give others easy access to this location, or try
 		In-world snapshot upload done
 	</notification>
 	<notification name="TerrainDownloaded">
-		Terrain.raw downloaded
+		地形 .raw 檔已下載
 	</notification>
 	<notification name="GestureMissing">
-		Hmm. Gesture [NAME] is missing from the database.
+		嗯，姿勢 [NAME] 在資料庫中遺失。
 	</notification>
 	<notification name="UnableToLoadGesture">
-		Unable to load gesture [NAME].
+		無法載入姿勢 [NAME]。
 	</notification>
 	<notification name="LandmarkMissing">
 		資料庫中的地標遺失。
@@ -2146,30 +2146,30 @@ Link to this from a web page to give others easy access to this location, or try
 		無法載入地標，請再試一次。
 	</notification>
 	<notification name="CapsKeyOn">
-		Your Caps Lock key is on.
-This might affect your password.
+		你的大寫鍵已啟用。
+這將可能會影響到你輸入的密碼。
 	</notification>
 	<notification name="NotecardMissing">
-		Notecard is missing from database.
+		記事卡在資料庫中遺失。
 	</notification>
 	<notification name="NotecardNoPermissions">
-		You don&apos;t have permission to view this notecard.
+		你並沒有權限去察看這個記事卡。
 	</notification>
 	<notification name="RezItemNoPermissions">
-		Insufficient permissions to rez object.
+		產生物件時發生權限衝突。
 	</notification>
 	<notification name="UnableToLoadNotecard">
-		Unable to load notecard.
-Please try again.
+		無法載入記事卡。
+請再試一次。
 	</notification>
 	<notification name="ScriptMissing">
-		Script is missing from database.
+		腳本在資料庫中遺失。
 	</notification>
 	<notification name="ScriptNoPermissions">
-		Insufficient permissions to view script.
+		察看腳本時發生權限衝突。
 	</notification>
 	<notification name="UnableToLoadScript">
-		Unable to load script.  Please try again.
+		無法載入腳本。請再試一次。
 	</notification>
 	<notification name="IncompleteInventory">
 		The complete contents you are offering are not yet locally available. Please try offering those items again in a minute.
@@ -2193,31 +2193,31 @@ Please try again.
 Please select a single object.
 	</notification>
 	<notification name="ObjectNotForSale">
-		This object is not for sale.
+		這物件不出售。
 	</notification>
 	<notification name="EnteringGodMode">
-		Entering god mode, level [LEVEL]
+		進入神之模式中，等級 [LEVEL]
 	</notification>
 	<notification name="LeavingGodMode">
-		Now leaving god mode, level [LEVEL]
+		現在離開神之模式，等級 [LEVEL]
 	</notification>
 	<notification name="CopyFailed">
-		You don&apos;t have permission to copy this.
+		你並沒有權限去覆製這個。
 	</notification>
 	<notification name="InventoryAccepted">
-		[NAME] received your inventory offer.
+		[NAME] 接收到你提供的收納區物品。
 	</notification>
 	<notification name="InventoryDeclined">
-		[NAME] declined your inventory offer.
+		[NAME] 拒絕你提供的收納區物品。
 	</notification>
 	<notification name="ObjectMessage">
 		[NAME]: [MESSAGE]
 	</notification>
 	<notification name="CallingCardAccepted">
-		Your calling card was accepted.
+		你的名片已被接受。
 	</notification>
 	<notification name="CallingCardDeclined">
-		Your calling card was declined.
+		你的名片已被拒絕。
 	</notification>
 	<notification name="TeleportToLandmark">
 		You can teleport to locations like &apos;[NAME]&apos; by opening the Places panel on the right side of your screen, and then select the Landmarks tab.
@@ -2249,12 +2249,12 @@ Try selecting a smaller piece of land.
 		[MESSAGE]
 	</notification>
 	<notification name="EventNotification">
-		Event Notification:
+		活動通知：
 
 [NAME]
 [DATE]
 		<form name="form">
-			<button name="Details" text="Details"/>
+			<button name="Details" text="細節"/>
 			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
@@ -2312,8 +2312,8 @@ Non-transferable objects that are deeded to the group have been deleted.
 You can be hurt here. If you die, you will be teleported to your home location.
 	</notification>
 	<notification name="NoFly">
-		This area has flying disabled.
-You can&apos;t fly here.
+		這區域關閉並禁止飛行。
+你不能在此處飛行。
 	</notification>
 	<notification name="PushRestricted">
 		This area does not allow pushing. You can&apos;t push others here unless you own the land.
@@ -2353,13 +2353,13 @@ Please go to the Knowledge Base for details on accessing areas with this maturit
 		You do not have proper payment status to enter this region.
 	</notification>
 	<notification name="MustGetAgeRgion">
-		You must be age-verified to enter this region.
+		你必須通過年齡認證以進入這地區。
 	</notification>
 	<notification name="MustGetAgeParcel">
-		You must be age-verified to enter this parcel.
+		你必須通過年齡驗證以進入這地段。
 	</notification>
 	<notification name="NoDestRegion">
-		No destination region found.
+		無目的地地區發現。
 	</notification>
 	<notification name="NotAllowedInDest">
 		You are not allowed into the destination.
@@ -2381,10 +2381,10 @@ Please go to the Knowledge Base for details on accessing areas with this maturit
 Please try again in a few moments.
 	</notification>
 	<notification name="GeneralFailure">
-		General failure.
+		一般故障。
 	</notification>
 	<notification name="RoutedWrongRegion">
-		Routed to wrong region. Please try again.
+		路由導向到錯誤地區。請再試一次。
 	</notification>
 	<notification name="NoValidAgentID">
 		No valid agent id.
@@ -2442,7 +2442,7 @@ Please try again in a few moments.
 	<notification name="JoinGroup">
 		[MESSAGE]
 		<form name="form">
-			<button name="Join" text="Join"/>
+			<button name="Join" text="加入"/>
 			<button name="Decline" text="Decline"/>
 			<button name="Info" text="資訊"/>
 		</form>
@@ -2709,15 +2709,15 @@ They will be blocked for a few seconds for your security.
 	<notification name="IMToast">
 		[MESSAGE]
 		<form name="form">
-			<button name="respondbutton" text="Respond"/>
+			<button name="respondbutton" text="回應"/>
 		</form>
 	</notification>
 	<notification name="ConfirmCloseAll">
-		Are you sure you want to close all IMs?
-		<usetemplate ignoretext="Confirm before I close all IMs" name="okcancelignore" notext="取消" yestext="確定"/>
+		你確定要關閉全部 IMs 對話視窗？
+		<usetemplate ignoretext="在我關閉全部的 IMs 對話視窗前確認。" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="AttachmentSaved">
-		Attachment has been saved.
+		附件已儲存。
 	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Unable to find the help topic for this element.
@@ -2831,7 +2831,7 @@ This will also cause all residents that later join the call to be
 muted, even after you have left the call.
 
 Mute everyone?
-		<usetemplate ignoretext="Confirm before I mute all participants in a group call" name="okcancelignore" notext="取消" yestext="確定"/>
+		<usetemplate ignoretext="在我對所有群組通話的參與者予以靜音前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification label="聊天" name="HintChat">
 		To join the conversation, type into the chat field below.
@@ -2875,10 +2875,10 @@ Click and drag anywhere on the world to rotate your view
 		Here&apos;s your current balance of L$. Click Buy L$ to purchase more Linden Dollars.
 	</notification>
 	<notification name="PopupAttempt">
-		A pop-up was prevented from opening.
+		一個突顯式視窗開啟時被阻擋。
 		<form name="form">
-			<ignore name="ignore" text="Enable all pop-ups"/>
-			<button name="open" text="Open pop-up window"/>
+			<ignore name="ignore" text="啟用全部的突顯式視窗"/>
+			<button name="open" text="開啟突顯式視窗"/>
 		</form>
 	</notification>
 	<notification name="AuthRequest">
@@ -2943,10 +2943,10 @@ If you continue to have problems, please visit the [SUPPORT_SITE].
 		- 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.">
-		If you own a piece of land, you can make it your home location.
-Otherwise, you can look at the Map and find places marked &quot;Infohub&quot;.
+		若你擁有一塊土地，你可以標記它成為你的家的位置。
+或者，你可以察看地圖尋找標記為 &quot;資訊中心&quot; 的地方。
 	</global>
 	<global name="You died and have been teleported to your home location">
-		You died and have been teleported to your home location.
+		你已經死亡並且被瞬間傳送回你的家的位置。
 	</global>
 </notifications>
diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
index 9ef4258f0b..1dfa024138 100644
--- a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
@@ -3,8 +3,8 @@
 	<text name="title_text">
 		封鎖清單
 	</text>
-	<scroll_list name="blocked" tool_tip="List of currently blocked Residents"/>
-	<button label="Block person" name="Block resident..." tool_tip="Pick a Resident to block"/>
-	<button label="Block object by name" name="Block object by name..." tool_tip="Pick an object to block by name"/>
-	<button label="Unblock" name="Unblock" tool_tip="Remove Resident or object from blocked list"/>
+	<scroll_list name="blocked" tool_tip="目前封鎖的居民清單"/>
+	<button label="封鎖他人" name="Block resident..." tool_tip="挑選一位居民以進行封鎖"/>
+	<button label="依名稱封鎖物件" name="Block object by name..." tool_tip="依名稱挑選一個物件進行封鎖"/>
+	<button label="解除封鎖" name="Unblock" tool_tip="將居民或物件由封鎖清單中移除"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_classified_info.xml b/indra/newview/skins/default/xui/zh/panel_classified_info.xml
index 94edb7ab71..cf3113ef1c 100644
--- a/indra/newview/skins/default/xui/zh/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_classified_info.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_classified_info">
 	<panel.string name="type_mature">
-		Moderate
+		適度成人
 	</panel.string>
 	<panel.string name="type_pg">
-		General Content
+		一般普級內容
 	</panel.string>
 	<panel.string name="l$_price">
 		L$[PRICE]
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 73c59d9ae3..6b17302bf1 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="Lower Alpha" name="Lower Alpha" tool_tip="點擊以挑選圖片"/>
-			<texture_picker label="Upper Alpha" name="Upper Alpha" tool_tip="點擊以挑選圖片"/>
-			<texture_picker label="Head Alpha" name="Head Alpha" tool_tip="點擊以挑選圖片"/>
-			<texture_picker label="Eye Alpha" name="Eye Alpha" tool_tip="點擊以挑選圖片"/>
-			<texture_picker label="Hair Alpha" 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_classified.xml b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
index e749d9e3e7..f12701c981 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
@@ -32,9 +32,9 @@
 			<button label="Set to Current Location" name="set_to_curr_location_btn"/>
 			<text name="category_label" value="Category:"/>
 			<text name="content_type_label" value="Content type:"/>
-			<icons_combo_box label="General Content" name="content_type">
-				<icons_combo_box.item label="Moderate Content" name="mature_ci" value="Mature"/>
-				<icons_combo_box.item label="General Content" name="pg_ci" value="PG"/>
+			<icons_combo_box label="一般普級內容" name="content_type">
+				<icons_combo_box.item label="適度成人內容" name="mature_ci" value="Mature"/>
+				<icons_combo_box.item label="一般普級內容" name="pg_ci" value="PG"/>
 			</icons_combo_box>
 			<check_box label="Auto renew each week" name="auto_renew"/>
 			<text name="price_for_listing_label" value="Price for listing:"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml
index 77ee4fd36d..26fedb59be 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml
@@ -2,12 +2,12 @@
 <panel name="edit_physics_panel">
 	<panel label="" name="accordion_panel">
 		<accordion name="physics_accordion">
-			<accordion_tab name="physics_breasts_updown_tab" title="Breasts Bounce"/>
-			<accordion_tab name="physics_breasts_inout_tab" title="Breasts Cleavage"/>
-			<accordion_tab name="physics_breasts_leftright_tab" title="Breasts Sway"/>
-			<accordion_tab name="physics_belly_tab" title="Belly Bounce"/>
-			<accordion_tab name="physics_butt_tab" title="Butt Bounce"/>
-			<accordion_tab name="physics_butt_leftright_tab" title="Butt Sway"/>
+			<accordion_tab name="physics_breasts_updown_tab" title="乳房彈性"/>
+			<accordion_tab name="physics_breasts_inout_tab" title="乳溝深淺"/>
+			<accordion_tab name="physics_breasts_leftright_tab" title="乳房搖擺"/>
+			<accordion_tab name="physics_belly_tab" title="腹部彈性"/>
+			<accordion_tab name="physics_butt_tab" title="臀部彈性"/>
+			<accordion_tab name="physics_butt_leftright_tab" title="臀部搖擺"/>
 			<accordion_tab name="physics_advanced_tab" title="進階參數"/>
 		</accordion>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
index a624877ab3..6ac7226185 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="儲存精選地點" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel2">
+			<layout_panel name="layout_panel1">
 				<button label="取消" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
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 7bf923b4ca..675caf9e2e 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
@@ -2,7 +2,7 @@
 <panel name="edit_shoes_panel">
 	<panel name="avatar_shoes_color_panel">
 		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
+		<color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
index 936a2651ab..066b1fd389 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
@@ -40,13 +40,13 @@
 		Editing Underpants
 	</string>
 	<string name="edit_alpha_title">
-		Editing Alpha Mask
+		半透明遮罩編輯中
 	</string>
 	<string name="edit_tattoo_title">
-		Editing Tattoo
+		刺青編輯中
 	</string>
 	<string name="edit_physics_title">
-		Editing Physics
+		身體物理編輯中
 	</string>
 	<string name="shape_desc_text">
 		體形：
@@ -88,13 +88,13 @@
 		內褲：
 	</string>
 	<string name="alpha_desc_text">
-		Alpha Mask:
+		半透明遮罩：
 	</string>
 	<string name="tattoo_desc_text">
 		刺青：
 	</string>
 	<string name="physics_desc_text">
-		Physics:
+		身體物理：
 	</string>
 	<labeled_back_button label="儲存" name="back_btn" tool_tip="回到編輯裝扮"/>
 	<text name="edit_wearable_title" value="體形編輯中"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
index 1e3c18f522..3915e80d43 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
@@ -2,16 +2,16 @@
 <panel name="panel_im_control_panel">
 	<layout_stack name="vertical_stack">
 		<layout_panel name="group_info_btn_panel">
-			<button label="社團檔案" name="group_info_btn"/>
+			<button label="群組檔案" name="group_info_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
-			<button label="Call Group" name="call_btn"/>
+			<button label="群組通話" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
-			<button label="Leave Call" name="end_call_btn"/>
+			<button label="結束通話" name="end_call_btn"/>
 		</layout_panel>
 		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Open Voice Controls" name="voice_ctrls_btn"/>
+			<button label="開啟語音控制" name="voice_ctrls_btn"/>
 		</layout_panel>
 	</layout_stack>
 </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 a97a35056b..f70fbf22a8 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_general.xml
@@ -6,7 +6,7 @@
 Hover your mouse over the options for more help.
 	</panel.string>
 	<panel.string name="group_info_unchanged">
-		一般社團資訊已經被變更
+		一般群組資訊已經被變更
 	</panel.string>
 	<panel.string name="incomplete_member_data_str">
 		Retrieving member data
@@ -22,7 +22,7 @@ Hover your mouse over the options for more help.
 		<button label="現在就加入!!" name="btn_join"/>
 	</panel>
 	<text_editor name="charter">
-		Group Charter
+		群組規章
 	</text_editor>
 	<name_list name="visible_members">
 		<name_list.columns label="成員" name="name"/>
@@ -36,11 +36,11 @@ Hover your mouse over the options for more help.
 		我的頭銜：
 	</text>
 	<combo_box name="active_title" tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active."/>
-	<check_box label="接受社團通知" name="receive_notices" tool_tip="Sets whether you want to receive Notices from this group.  Uncheck this box if this group is spamming you."/>
+	<check_box label="接受群組通知" name="receive_notices" tool_tip="Sets whether you want to receive Notices from this group.  Uncheck this box if this group is spamming you."/>
 	<check_box label="顯示在我的檔案中" name="list_groups_in_profile" tool_tip="Sets whether you want to show this group in your profile"/>
 	<panel name="preferences_container">
 		<text name="group_settngs_label">
-			社團
+			群組
 		</text>
 		<check_box label="任何人都可以加入" name="open_enrollement" tool_tip="Sets whether this group allows new members to join without being invited."/>
 		<check_box label="加入費用" name="check_enrollment_fee" tool_tip="Sets whether to require an enrollment fee to join the group"/>
@@ -49,8 +49,8 @@ Hover your mouse over the options for more help.
 			<combo_item name="select_mature">
 				- 選擇內容分級 -
 			</combo_item>
-			<combo_box.item label="Moderate Content" name="mature"/>
-			<combo_box.item label="一般內容" name="pg"/>
+			<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"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
index 320645ea5e..db01edcdb3 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="社團檔案" name="GroupInfo">
+<panel label="群組檔案" name="GroupInfo">
 	<panel.string name="default_needs_apply_text">
-		There are unsaved changes
+		變更未儲存
 	</panel.string>
 	<panel.string name="want_apply_text">
-		Do you want to save these changes?
+		你要儲存這些變更嗎？
 	</panel.string>
 	<panel.string name="group_join_btn">
-		Join (L$[AMOUNT])
+		加入（L$[AMOUNT]）
 	</panel.string>
 	<panel.string name="group_join_free">
-		Free
+		免費
 	</panel.string>
 	<panel name="group_info_top">
 		<text_editor name="group_name" value="（載入中...）"/>
-		<line_editor label="Type your new group name here" name="group_name_editor"/>
+		<line_editor label="在此輸入你的新群組名稱" name="group_name_editor"/>
 	</panel>
 	<layout_stack name="layout">
 		<layout_panel name="group_accordions">
@@ -31,11 +31,11 @@
 			<button label="聊天" name="btn_chat"/>
 		</layout_panel>
 		<layout_panel name="call_btn_lp">
-			<button label="Group Call" name="btn_call" tool_tip="Call this group"/>
+			<button label="群組通話" name="btn_call" tool_tip="與此群組進行通話"/>
 		</layout_panel>
 		<layout_panel name="btn_apply_lp">
 			<button label="儲存" label_selected="儲存" name="btn_apply"/>
-			<button label="創造社團" name="btn_create" tool_tip="創造一個新社團"/>
+			<button label="創造群組" name="btn_create" tool_tip="創造一個新群組"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_invite.xml b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
index a1395f454b..07dcb2303e 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
@@ -12,7 +12,7 @@
 	<text name="help_text">
 		You can select multiple Residents to invite to your group. Click &apos;Open Resident Chooser&apos; to start.
 	</text>
-	<button label="Open Resident Chooser" name="add_button"/>
+	<button label="開啟居民選擇視窗" name="add_button"/>
 	<name_list name="invitee_list" tool_tip="Hold the Ctrl key and click Resident names to multi-select"/>
 	<button label="Remove Selected from List" name="remove_button" tool_tip="Removes the Residents selected above from the invite list"/>
 	<text name="role_text">
@@ -22,6 +22,6 @@
 	<button label="送出邀請" name="ok_button"/>
 	<button label="取消" name="cancel_button"/>
 	<string name="GroupInvitation">
-		社團邀請
+		群組邀請
 	</string>
 </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 58022c2279..1bf3929683 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
@@ -7,7 +7,7 @@
 		You don&apos;t have permission to view group owned land
 	</panel.string>
 	<panel.string name="epmty_view_group_land_text">
-		No entries
+		沒有項目
 	</panel.string>
 	<panel.string name="cant_view_group_accounting_text">
 		You don&apos;t have permission to view the group&apos;s accounting information.
@@ -16,7 +16,7 @@
 		載入中...
 	</panel.string>
 	<panel.string name="land_contrib_error">
-		Unable to set your land contribution
+		無法設定你的土地捐獻
 	</panel.string>
 	<panel name="layout_panel_landmoney">
 		<scroll_list name="group_parcel_list">
@@ -46,7 +46,7 @@
 			[AREA] m²
 		</text>
 		<text name="your_contribution_label">
-			Your contribution:
+			你的捐獻：
 		</text>
 		<text name="your_contribution_units">
 			m²
@@ -58,7 +58,7 @@
 			More land credits are needed to support land in use
 		</text>
 		<text name="group_money_heading">
-			社團 L$
+			群組 L$
 		</text>
 	</panel>
 	<tab_container name="group_money_tab_container">
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notices.xml b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
index 65c07e7137..26273dd9ce 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
@@ -10,7 +10,7 @@ You can turn off Notices on the General tab.
 	</panel.string>
 	<text name="lbl2">
 		通知保留 14 天。
-每個社團一天最多 200 則
+每個群組一天最多 200 則
 	</text>
 	<scroll_list name="notice_list">
 		<scroll_list.columns label="主旨" name="subject"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notify.xml b/indra/newview/skins/default/xui/zh/panel_group_notify.xml
index 803f34d5a7..00462d8b0b 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_notify.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="instant_message" name="panel_group_notify">
+<panel label="即時訊息" name="panel_group_notify">
 	<string name="message_max_lines_count" value="7"/>
 	<string name="subject_font" value="SANSSERIF_BIG"/>
 	<string name="date_font" value="SANSSERIF"/>
 	<panel label="header" name="header">
 		<text name="title" value="Sender Name / Group Name"/>
 	</panel>
-	<text_editor name="message" value="message"/>
+	<text_editor name="message" value="訊息"/>
 	<text name="attachment" value="Attachment"/>
 	<button label="確定" name="btn_ok"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
index fff4383893..cf5fc26d14 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="成員與角色" name="roles_tab">
 	<panel.string name="default_needs_apply_text">
-		There are unsaved changes
+		未儲存的設定
 	</panel.string>
 	<panel.string name="want_apply_text">
-		Do you want to save your changes?
+		你要儲存你的變更嗎？
 	</panel.string>
 	<tab_container name="roles_tab_container">
 		<panel label="成員" name="members_sub_tab" tool_tip="成員">
 			<panel.string name="help_text">
-				You can add or remove Roles assigned to Members.
-Select multiple Members by holding the Ctrl key and
-clicking on their names.
+				你可以添加或移除一個角色指派給成員。
+選責多個成員時同時按著 Ctrl 鍵且
+使用滑鼠左鍵點擊他們的名字。
 			</panel.string>
 			<panel.string name="donation_area">
 				[AREA] m²
@@ -55,12 +55,12 @@ things in this group. There&apos;s a broad variety of Abilities.
 	</tab_container>
 	<panel name="members_footer">
 		<text name="static">
-			Assigned Roles
+			指派角色
 		</text>
 		<text name="static2">
-			Allowed Abilities
+			允許的能力
 		</text>
-		<scroll_list name="member_allowed_actions" tool_tip="For details of each allowed ability see the abilities tab"/>
+		<scroll_list name="member_allowed_actions" tool_tip="想瞭解有關於允許的能力的細節請查閱能力頁籤"/>
 	</panel>
 	<panel name="roles_footer">
 		<text name="static">
@@ -73,23 +73,23 @@ things in this group. There&apos;s a broad variety of Abilities.
 			描述
 		</text>
 		<text name="static4">
-			Assigned Members
+			指派角色
 		</text>
 		<check_box label="Reveal members" name="role_visible_in_list" tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group."/>
 		<text name="static5">
-			Allowed Abilities
+			允許的能力
 		</text>
-		<scroll_list name="role_allowed_actions" tool_tip="For details of each allowed ability see the abilities tab"/>
+		<scroll_list name="role_allowed_actions" tool_tip="想瞭解有關於每一項允許的能力的細節請查閱能力頁籤"/>
 	</panel>
 	<panel name="actions_footer">
 		<text_editor name="action_description">
 			This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
 		</text_editor>
 		<text name="static2">
-			Roles with this ability
+			有此能力的角色
 		</text>
 		<text name="static3">
-			Members with this ability
+			有此能力的成員
 		</text>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_landmarks.xml b/indra/newview/skins/default/xui/zh/panel_landmarks.xml
index fa907e3d90..eea406170a 100644
--- a/indra/newview/skins/default/xui/zh/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_landmarks.xml
@@ -4,12 +4,12 @@
 		<accordion_tab name="tab_favorites" title="最愛列"/>
 		<accordion_tab name="tab_landmarks" title="我的地標"/>
 		<accordion_tab name="tab_inventory" title="我的收納區"/>
-		<accordion_tab name="tab_library" title="Library"/>
+		<accordion_tab name="tab_library" title="資源庫"/>
 	</accordion>
 	<panel name="bottom_panel">
 		<layout_stack name="bottom_panel">
 			<layout_panel name="options_gear_btn_panel">
-				<menu_button name="options_gear_btn" tool_tip="Show additional options"/>
+				<menu_button name="options_gear_btn" tool_tip="顯示額外選項"/>
 			</layout_panel>
 			<layout_panel name="add_btn_panel">
 				<button name="add_btn" tool_tip="添加新地標"/>
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 059a78cf7d..3e44f2a584 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
@@ -14,7 +14,7 @@
 		目前頁面：
 	</text>
 	<text name="current_url" tool_tip="The current page for this media source" value=""/>
-	<button label="Reset" name="current_url_reset_btn"/>
+	<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"/>
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 3645f471ce..ec62b61c54 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
@@ -17,7 +17,7 @@
 	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" 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_control"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
index ef56c34b5c..aaaf6bfb94 100644
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
@@ -4,7 +4,7 @@
 	<text name="home_url_fails_some_items_in_whitelist">
 		Entries that the home page fails against are marked:
 	</text>
-	<button label="Add" name="whitelist_add"/>
+	<button label="添加" name="whitelist_add"/>
 	<button label="刪除" name="whitelist_del"/>
 	<text name="home_url_fails_whitelist">
 		Warning: the home page specified in the General tab fails to pass this whitelist. It has been disabled until a valid entry has been added.
diff --git a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
index 1748d117f4..60a5767d09 100644
--- a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
@@ -9,8 +9,8 @@
 			<combo_editor label="搜尋 [SECOND_LIFE]" name="search_combo_editor"/>
 		</search_combo_box>
 	</panel>
-	<favorites_bar name="favorite" tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!">
-		<label name="favorites_bar_label" tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!">
+	<favorites_bar name="favorite" tool_tip="拖曳傳送地標到此以便讓你在第二人生中能快速傳送到你最愛的地點!!">
+		<label name="favorites_bar_label" tool_tip="拖曳傳送地標到此以便讓你在第二人生中能快速傳送到你最愛的地點!!">
 			最愛列
 		</label>
 		<chevron_button name="&gt;&gt;" tool_tip="顯示更多我的最愛"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
index 5ab6837569..6a4b5fcf35 100644
--- a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
@@ -30,9 +30,9 @@
 		</text>
 		<combo_box name="show_combo">
 			<combo_box.item label="全部" name="All"/>
-			<combo_box.item label="In this Parcel" name="WithinParcel"/>
-			<combo_box.item label="Outside this Parcel" name="OutsideParcel"/>
-			<combo_box.item label="On other Avatars" name="OnOthers"/>
+			<combo_box.item label="在此地段內" name="WithinParcel"/>
+			<combo_box.item label="在此地段外部" name="OutsideParcel"/>
+			<combo_box.item label="在其他化身身上" name="OnOthers"/>
 		</combo_box>
 		<scroll_list name="media_list">
 			<scroll_list.columns label="Proximity" name="media_proximity"/>
@@ -53,10 +53,10 @@
 					<button name="pause_btn" tool_tip="暫停所選擇的媒體"/>
 				</layout_panel>
 				<layout_panel name="volume_slider_ctrl">
-					<slider_bar initial_value="0.5" name="volume_slider" tool_tip="Audio volume for selected media"/>
+					<slider_bar initial_value="0.5" name="volume_slider" tool_tip="所選擇的媒體之音頻音量"/>
 				</layout_panel>
 				<layout_panel name="mute">
-					<button name="mute_btn" tool_tip="Mute audio on selected media"/>
+					<button name="mute_btn" tool_tip="靜音所選擇的媒體音頻"/>
 				</layout_panel>
 				<layout_panel name="zoom">
 					<button name="zoom_btn" tool_tip="Zoom into selected media"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_notes.xml b/indra/newview/skins/default/xui/zh/panel_notes.xml
index f68fd74d1f..5d0e6760ff 100644
--- a/indra/newview/skins/default/xui/zh/panel_notes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_notes.xml
@@ -27,7 +27,7 @@
 					<button label="地圖" name="show_on_map_btn" tool_tip="Show the Resident on the map"/>
 				</layout_panel>
 				<layout_panel name="teleport_btn_lp">
-					<button label="瞬間傳送" name="teleport" tool_tip="Offer teleport"/>
+					<button label="瞬間傳送" name="teleport" tool_tip="發給瞬間傳送請求"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
index 39a9bcb848..693cdcdeca 100644
--- a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Wearing">
 	<panel name="bottom_panel">
-		<menu_button name="options_gear_btn" tool_tip="Show additional options"/>
+		<menu_button name="options_gear_btn" tool_tip="顯示額外選項"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 4c6d6c76be..c97ff2ae96 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -14,18 +14,18 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 	<string name="no_filtered_friends_msg">
 		Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search].
 	</string>
-	<string name="people_filter_label" value="Filter People"/>
-	<string name="groups_filter_label" value="Filter Groups"/>
-	<string name="no_filtered_groups_msg" value="Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/groups/[SEARCH_TERM] Search]."/>
-	<string name="no_groups_msg" value="Looking for Groups to join? Try [secondlife:///app/search/groups Search]."/>
-	<string name="MiniMapToolTipMsg" value="[REGION](Double-click to open Map, shift-drag to pan)"/>
-	<string name="AltMiniMapToolTipMsg" value="[REGION](Double-click to teleport, shift-drag to pan)"/>
-	<filter_editor label="Filter" name="filter_input"/>
+	<string name="people_filter_label" value="人員過濾器"/>
+	<string name="groups_filter_label" value="群組過濾器"/>
+	<string name="no_filtered_groups_msg" value="沒有發現你要找的嗎？何不試試 [secondlife:///app/search/groups/[SEARCH_TERM] 搜尋]。"/>
+	<string name="no_groups_msg" value="想找尋群組加入嗎？何不試試 [secondlife:///app/search/groups 搜尋]。"/>
+	<string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/>
+	<string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/>
+	<filter_editor label="過濾器" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="附近" name="nearby_panel">
 			<panel label="bottom_panel" name="bottom_panel">
 				<menu_button name="nearby_view_sort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="Add selected Resident to your friends List"/>
+				<button name="add_friend_btn" tool_tip="添加已選擇的居民到Ad你的朋友清單"/>
 			</panel>
 		</panel>
 		<panel label="我的朋友" name="friends_panel">
@@ -39,55 +39,55 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 						<menu_button name="friends_viewsort_btn" tool_tip="顯示額外選項"/>
 					</layout_panel>
 					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Offer friendship to a Resident"/>
+						<button name="add_btn" tool_tip="向居民提出加為好友邀請"/>
 					</layout_panel>
 					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Remove selected person from your Friends list"/>
+						<dnd_button name="del_btn" tool_tip="由你的朋友清單移除所選擇的人"/>
 					</layout_panel>
 				</layout_stack>
 			</panel>
 		</panel>
-		<panel label="我的社團" name="groups_panel">
+		<panel label="我的群組" name="groups_panel">
 			<panel label="bottom_panel" name="bottom_panel">
 				<menu_button name="groups_viewsort_btn" tool_tip="選項"/>
-				<button name="plus_btn" tool_tip="Join group/Create new group"/>
-				<button name="activate_btn" tool_tip="Activate selected group"/>
+				<button name="plus_btn" tool_tip="加入群組/創立新群組"/>
+				<button name="activate_btn" tool_tip="啟用所選擇的群組"/>
 			</panel>
 		</panel>
-		<panel label="RECENT" name="recent_panel">
+		<panel label="最近" name="recent_panel">
 			<panel label="bottom_panel" name="bottom_panel">
 				<menu_button name="recent_viewsort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="Add selected Resident to your friends List"/>
+				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
 			</panel>
 		</panel>
 	</tab_container>
 	<panel name="button_bar">
 		<layout_stack name="bottom_bar_ls">
 			<layout_panel name="view_profile_btn_lp">
-				<button label="檔案" name="view_profile_btn" tool_tip="Show picture, groups, and other Residents information"/>
+				<button label="檔案" name="view_profile_btn" tool_tip="顯示圖片、群組與其他居民資訊"/>
 			</layout_panel>
-			<layout_panel name="im_btn_lp">
+			<layout_panel name="chat_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/>
 			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="通話" name="call_btn" tool_tip="Call this Resident"/>
+			<layout_panel name="chat_btn_lp">
+				<button label="通話" name="call_btn" tool_tip="與此居民進行通話"/>
 			</layout_panel>
-			<layout_panel name="share_btn_lp">
+			<layout_panel name="chat_btn_lp">
 				<button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
 			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="瞬間傳送" name="teleport_btn" tool_tip="Offer teleport"/>
+			<layout_panel name="chat_btn_lp">
+				<button label="瞬間傳送" name="teleport_btn" tool_tip="發給瞬間傳送請求"/>
 			</layout_panel>
 		</layout_stack>
 		<layout_stack name="bottom_bar_ls1">
 			<layout_panel name="group_info_btn_lp">
-				<button label="社團檔案" name="group_info_btn" tool_tip="顯示社團資訊"/>
+				<button label="群組檔案" name="group_info_btn" tool_tip="顯示群組資訊"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
-				<button label="Group Chat" name="chat_btn" tool_tip="開啟聊天會話"/>
+				<button label="群組聊天" name="chat_btn" tool_tip="開啟聊天會話"/>
 			</layout_panel>
 			<layout_panel name="group_call_btn_lp">
-				<button label="Group Call" name="group_call_btn" tool_tip="Call this group"/>
+				<button label="群組通話" name="group_call_btn" tool_tip="與此群組進行通話"/>
 			</layout_panel>
 		</layout_stack>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_picks.xml b/indra/newview/skins/default/xui/zh/panel_picks.xml
index a233092dc2..15733b71b0 100644
--- a/indra/newview/skins/default/xui/zh/panel_picks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_picks.xml
@@ -19,7 +19,7 @@
 				<button label="資訊" name="info_btn" tool_tip="顯示精選地點資訊"/>
 			</layout_panel>
 			<layout_panel name="teleport_btn_lp">
-				<button label="瞬間傳送" name="teleport_btn" tool_tip="瞬間傳送到相對應的區域"/>
+				<button label="瞬間傳送" name="teleport_btn" tool_tip="瞬間傳送到的區域"/>
 			</layout_panel>
 			<layout_panel name="show_on_map_btn_lp">
 				<button label="地圖" name="show_on_map_btn" tool_tip="在世界地圖上顯示相對應的區域"/>
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 aa7b036398..d7bcb0d027 100644
--- a/indra/newview/skins/default/xui/zh/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
@@ -4,33 +4,33 @@
 	<string name="off" value="Off"/>
 	<string name="anyone" value="Anyone"/>
 	<string name="available" value="available"/>
-	<string name="allocated" value="allocated"/>
+	<string name="allocated" value="已分配"/>
 	<string name="title_place" value="地點檔案"/>
 	<string name="title_teleport_history" value="瞬間傳送歷史紀錄"/>
-	<string name="not_available" value="(N\A)"/>
+	<string name="not_available" value="（N\A）"/>
 	<string name="unknown" value="（未知）"/>
 	<string name="public" value="（公開）"/>
 	<string name="none_text" value="（無）"/>
 	<string name="sale_pending_text" value="（擱置銷售）"/>
-	<string name="group_owned_text" value="（社團所擁有）"/>
+	<string name="group_owned_text" value="（群組所擁有）"/>
 	<string name="price_text" value="L$"/>
 	<string name="area_text" value="m²"/>
 	<string name="all_residents_text" value="全部居民"/>
-	<string name="group_text" value="社團"/>
+	<string name="group_text" value="群組"/>
 	<string name="can_resell">
-		Purchased land in this region may be resold.
+		購買這地區的土地允許轉售。
 	</string>
 	<string name="can_not_resell">
-		Purchased land in this region may not be resold.
+		購買這地區的土地不允許轉售。
 	</string>
 	<string name="can_change">
-		Purchased land in this region may be joined or subdivided.
+		購買這地區的土地允許進行合併或分割。
 	</string>
 	<string name="can_not_change">
-		Purchased land in this region may not be joined or subdivided.
+		購買這地區的土地不允許進行合併或分割。
 	</string>
 	<string name="server_update_text">
-		Place information not available without server update.
+		地點資訊因無伺服器更新故無法提供。
 	</string>
 	<string name="server_error_text">
 		Information about this location is unavailable at this time, please try again later.
@@ -41,7 +41,7 @@
 	<string name="acquired_date">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</string>
-	<button name="back_btn" tool_tip="Back"/>
+	<button name="back_btn" tool_tip="返回"/>
 	<text name="title" value="地點檔案"/>
 	<scroll_container name="place_scroll">
 		<panel name="scrolling_panel">
@@ -56,7 +56,7 @@
 					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="分級："/>
 						<text name="rating_value" value="未知"/>
-						<text name="voice_label" value="Voice:"/>
+						<text name="voice_label" value="語音："/>
 						<text name="voice_value" value="On"/>
 						<text name="fly_label" value="飛行："/>
 						<text name="fly_value" value="On"/>
@@ -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="Damage:"/>
+						<text name="damage_label" value="商害："/>
 						<text name="damage_value" value="Off"/>
 						<button label="關於土地" name="about_land_btn"/>
 					</panel>
@@ -78,10 +78,10 @@
 						<text name="region_type_label" value="類型："/>
 						<text name="region_type" value="Moose"/>
 						<text name="region_rating_label" value="分級："/>
-						<text name="region_rating" value="成人"/>
+						<text name="region_rating" value="完全成人"/>
 						<text name="region_owner_label" value="擁有者："/>
 						<text name="region_owner" value="moose Van Moose extra long name moose"/>
-						<text name="region_group_label" value="社團："/>
+						<text name="region_group_label" value="群組："/>
 						<text name="region_group">
 							The Mighty Moose of mooseville soundvillemoose
 						</text>
@@ -104,8 +104,8 @@
 						<text name="traffic_label" value="流量："/>
 						<text name="primitives_label" value="Primitives:"/>
 						<text name="parcel_scripts_label" value="腳本："/>
-						<text name="terraform_limits_label" value="Terraform limits:"/>
-						<text name="subdivide_label" value="Subdivide/Join ability:"/>
+						<text name="terraform_limits_label" value="土地變形限制："/>
+						<text name="subdivide_label" value="分割土地/合併土地能力："/>
 						<text name="resale_label" value="ReSale ability:"/>
 						<text name="sale_to_label" value="出售給："/>
 					</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_places.xml b/indra/newview/skins/default/xui/zh/panel_places.xml
index 6434a7279c..8ac464271e 100644
--- a/indra/newview/skins/default/xui/zh/panel_places.xml
+++ b/indra/newview/skins/default/xui/zh/panel_places.xml
@@ -11,7 +11,7 @@
 						<button label="瞬間傳送" name="teleport_btn" tool_tip="瞬間傳送到所選擇的區域"/>
 					</layout_panel>
 					<layout_panel name="chat_btn_lp">
-						<button label="地圖" name="map_btn" tool_tip="Show the corresponding area on the World Map"/>
+						<button label="地圖" name="map_btn" tool_tip="在世界地圖上顯示相對應的區域"/>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
@@ -24,7 +24,7 @@
 						<menu_button name="overflow_btn" tool_tip="顯示額外選項"/>
 					</layout_panel>
 				</layout_stack>
-				<layout_stack name="bottom_bar_profile_ls">
+				<layout_stack name="bottom_bar_ls3">
 					<layout_panel name="profile_btn_lp">
 						<button label="檔案" name="profile_btn" tool_tip="顯示地點檔案"/>
 					</layout_panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index c691edb11c..c083d40a82 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -10,7 +10,7 @@
 	</radio_group>
 	<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
 	<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
-	<check_box label="Enable plain text IM and chat history" name="plain_text_chat_history"/>
+	<check_box label="啟用純本文 IM 與聊天歷史紀錄" name="plain_text_chat_history"/>
 	<check_box label="聊天泡泡" name="bubble_text_chat"/>
 	<text name="show_ims_in_label">
 		顯示 IMs 於：
@@ -23,14 +23,14 @@
 		<radio_item label="頁籤" name="radio2" value="1"/>
 	</radio_group>
 	<text name="disable_toast_label">
-		Enable incoming chat popups:
+		啟用傳入聊天的突顯示視窗：
 	</text>
-	<check_box label="Group Chats" name="EnableGroupChatPopups" tool_tip="Check to see popups when a Group Chat message arrives"/>
-	<check_box label="IM 聊天" name="EnableIMChatPopups" tool_tip="Check to see popups when an instant message arrives"/>
+	<check_box label="群組聊天" name="EnableGroupChatPopups" tool_tip="當群組聊天訊息抵達時查看突顯式視窗"/>
+	<check_box label="IM 聊天" name="EnableIMChatPopups" tool_tip="當即時訊息抵達時查看突顯式視窗"/>
 	<spinner label="Nearby chat toasts life time:" name="nearby_toasts_lifetime"/>
 	<spinner label="Nearby chat toasts fading time:" name="nearby_toasts_fadingtime"/>
 	<text name="translate_chb_label">
-		Use machine translation while chatting (powered by Google)
+		聊天時使用機器自動進行翻譯（由 Google 所提供）
 	</text>
 	<text name="translate_language_text">
 		聊天翻譯為：
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index b7449dad10..cabe13adb8 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -23,9 +23,9 @@
 		我想要能進出內容分級的地區為：
 	</text>
 	<combo_box name="maturity_desired_combobox">
-		<combo_box.item label="General, Moderate, Adult" name="Desired_Adult"/>
-		<combo_box.item label="General and Moderate" name="Desired_Mature"/>
-		<combo_box.item label="一般" name="Desired_PG"/>
+		<combo_box.item label="一般普級，適度成人，完全成人" name="Desired_Adult"/>
+		<combo_box.item label="一般普級與適度成人" name="Desired_Mature"/>
+		<combo_box.item label="一般普級" name="Desired_PG"/>
 	</combo_box>
 	<text name="start_location_textbox">
 		開始位置：
@@ -45,9 +45,9 @@
 	</radio_group>
 	<check_box label="我的名字" name="show_my_name_checkbox1"/>
 	<check_box label="使用者名稱" name="show_slids" tool_tip="顯示使用者名稱，就像 bobsmith123 這類的"/>
-	<check_box label="社團頭銜" name="show_all_title_checkbox1" tool_tip="顯示社團頭銜，像是 Officer 或成員"/>
-	<check_box label="高亮顯示朋友" name="show_friends" tool_tip="高亮顯示你朋友的名稱標籤"/>
-	<check_box label="View Display Names" name="display_names_check" tool_tip="Check to use display names in chat, IM, name tags, etc."/>
+	<check_box label="群組頭銜" name="show_all_title_checkbox1" tool_tip="顯示群組頭銜，像是 Officer 或成員"/>
+	<check_box label="高亮標示朋友" name="show_friends" tool_tip="高亮顯示你朋友的名稱標籤"/>
+	<check_box label="察看顯示名稱" name="display_names_check" tool_tip="Check to use display names in chat, IM, name tags, etc."/>
 	<text name="inworld_typing_rg_label">
 		按下字母鍵：
 	</text>
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 8c728bf779..ee8cd9794a 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="圖形" name="Display panel">
 	<text name="QualitySpeed">
-		Quality and speed:
+		品質與速度：
 	</text>
 	<text name="FasterText">
-		Faster
+		最快
 	</text>
 	<text name="BetterText">
-		Better
+		最佳
 	</text>
 	<text name="ShadersPrefText">
-		Low
+		低
 	</text>
 	<text name="ShadersPrefText2">
-		Mid
+		中
 	</text>
 	<text name="ShadersPrefText3">
-		High
+		高
 	</text>
 	<text name="ShadersPrefText4">
-		Ultra
+		超高
 	</text>
 	<panel label="自訂圖形" name="CustomGraphics Panel">
 		<text name="ShadersText">
-			Shaders:
+			著色器：
 		</text>
-		<check_box initial_value="true" label="Transparent Water" name="TransparentWater"/>
-		<check_box initial_value="true" label="Bump mapping and shiny" name="BumpShiny"/>
-		<check_box initial_value="true" label="Basic shaders" name="BasicShaders" tool_tip="Disabling this option may prevent some graphics card drivers from crashing"/>
-		<check_box initial_value="true" label="Atmospheric shaders" name="WindLightUseAtmosShaders"/>
+		<check_box initial_value="true" label="清澈透明的水" name="TransparentWater"/>
+		<check_box initial_value="true" label="凹凸映射與光澤效果" name="BumpShiny"/>
+		<check_box initial_value="true" label="基本著色" name="BasicShaders" tool_tip="關閉此一選項可能避免部分顯示卡驅動程式損毀當機"/>
+		<check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/>
 		<text name="reflection_label">
-			Water Reflections:
+			水文反射：
 		</text>
 		<combo_box name="Reflections">
-			<combo_box.item label="Minimal" name="0"/>
-			<combo_box.item label="Terrain and trees" name="1"/>
+			<combo_box.item label="最小" name="0"/>
+			<combo_box.item label="地形與樹木" name="1"/>
 			<combo_box.item label="全部靜態物件" name="2"/>
 			<combo_box.item label="全部化身與物件" name="3"/>
-			<combo_box.item label="Everything" name="4"/>
+			<combo_box.item label="一切" name="4"/>
 		</combo_box>
-		<slider label="Avatar Physics:" name="AvatarPhysicsDetail"/>
+		<slider label="化身物理：" name="AvatarPhysicsDetail"/>
 		<text name="AvatarPhysicsDetailText">
-			Low
+			低
 		</text>
 		<slider label="描繪距離：" name="DrawDistance"/>
 		<text name="DrawDistanceMeterText2">
@@ -49,54 +49,54 @@
 		</text>
 		<slider label="Max. particle count:" name="MaxParticleCount"/>
 		<slider label="Max. # of non-impostor avatars:" name="MaxNumberAvatarDrawn"/>
-		<slider label="Post process quality:" name="RenderPostProcess"/>
+		<slider label="後製品質：" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
-			Mesh detail:
+			網面細節：
 		</text>
-		<slider label="Objects:" name="ObjectMeshDetail"/>
+		<slider label="物件：" name="ObjectMeshDetail"/>
 		<slider label="Flexiprims:" name="FlexibleMeshDetail"/>
-		<slider label="Trees:" name="TreeMeshDetail"/>
-		<slider label="Avatars:" name="AvatarMeshDetail"/>
-		<slider label="Terrain:" name="TerrainMeshDetail"/>
-		<slider label="Sky:" name="SkyMeshDetail"/>
+		<slider label="樹木：" name="TreeMeshDetail"/>
+		<slider label="化身：" name="AvatarMeshDetail"/>
+		<slider label="地形：" name="TerrainMeshDetail"/>
+		<slider label="天空：" name="SkyMeshDetail"/>
 		<text name="PostProcessText">
-			Low
+			低
 		</text>
 		<text name="ObjectMeshDetailText">
-			Low
+			低
 		</text>
 		<text name="FlexibleMeshDetailText">
-			Low
+			低
 		</text>
 		<text name="TreeMeshDetailText">
-			Low
+			低
 		</text>
 		<text name="AvatarMeshDetailText">
-			Low
+			低
 		</text>
 		<text name="TerrainMeshDetailText">
-			Low
+			低
 		</text>
 		<text name="SkyMeshDetailText">
-			Low
+			低
 		</text>
 		<text name="AvatarRenderingText">
 			Avatar Rendering:
 		</text>
 		<check_box initial_value="true" label="Avatar impostors" name="AvatarImpostors"/>
 		<check_box initial_value="true" label="Hardware skinning" name="AvatarVertexProgram"/>
-		<check_box initial_value="true" label="Avatar cloth" name="AvatarCloth"/>
+		<check_box initial_value="true" label="化身衣服" name="AvatarCloth"/>
 		<text name="TerrainDetailText">
-			Terrain detail:
+			地形細節：
 		</text>
 		<radio_group name="TerrainDetailRadio">
-			<radio_item label="Low" name="0"/>
-			<radio_item label="High" name="2"/>
+			<radio_item label="低" name="0"/>
+			<radio_item label="高" name="2"/>
 		</radio_group>
 		--&gt;
 	</panel>
 	<button label="套用" label_selected="套用" name="Apply"/>
-	<button label="Reset" name="Defaults"/>
+	<button label="重設" name="Defaults"/>
 	<button label="進階" name="Advanced"/>
 	<button label="硬體" label_selected="硬體" name="GraphicsHardwareButton"/>
 </panel>
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 de296f72f3..57e3540b3d 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
@@ -5,20 +5,20 @@
 	<text name="heading2">
 		自動位移：
 	</text>
-	<check_box label="建造 / 編輯" name="edit_camera_movement" tool_tip="Use automatic camera positioning when entering and exiting edit mode"/>
-	<check_box label="編輯外觀" name="appearance_camera_movement" tool_tip="Use automatic camera positioning while in edit mode"/>
-	<check_box initial_value="true" label="側邊欄" name="appearance_sidebar_positioning" tool_tip="Use automatic camera positioning for sidebar"/>
+	<check_box label="建造 / 編輯" name="edit_camera_movement" tool_tip="使用進入或離開編輯模式時自動調整攝影機位置功能"/>
+	<check_box label="編輯外觀" name="appearance_camera_movement" tool_tip="使用編輯模式時自動調整攝影機位置功能"/>
+	<check_box initial_value="true" label="側邊欄" name="appearance_sidebar_positioning" tool_tip="使用開啟側邊欄時自動調整攝影機位置功能"/>
 	<check_box label="將我顯示於第一人稱視角中" name="first_person_avatar_visible"/>
 	<text name=" Mouse Sensitivity">
-		Mouselook mouse sensitivity:
+		第一人稱視角滑鼠敏感度：
 	</text>
 	<check_box label="反轉" name="invert_mouse"/>
 	<check_box label="總是使用方向鍵移動" name="arrow_keys_move_avatar_check"/>
-	<check_box label="Tap-tap-hold to run" name="tap_tap_hold_to_run"/>
+	<check_box label="連點按住後跑步" name="tap_tap_hold_to_run"/>
 	<check_box label="雙擊以D：" name="double_click_chkbox"/>
 	<radio_group name="double_click_action">
 		<radio_item label="瞬間傳送" name="radio_teleport"/>
-		<radio_item label="Auto-pilot" name="radio_autopilot"/>
+		<radio_item label="自動導航駕駛" name="radio_autopilot"/>
 	</radio_group>
 	<button label="其他設備" name="joystick_setup_button"/>
 </panel>
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 89a1a48abf..bd6d465572 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
@@ -8,8 +8,8 @@
 		（位置、圖像、網頁、搜尋的歷史紀錄）
 	</text>
 	<check_box label="將我顯示在搜尋的結果中" name="online_searchresults"/>
-	<check_box label="只有我的朋友和社團知道我在線上" name="online_visibility"/>
-	<check_box label="只有我的朋友和社團可以 IM 或與我通話。" name="voice_call_friends_only_check"/>
+	<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"/>
 	<text name="Logs:">
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
index e7a934c5cc..efefb92df6 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
@@ -21,7 +21,7 @@
 		快取位置：
 	</text>
 	<button label="瀏覽" label_selected="瀏覽" name="set_cache"/>
-	<button label="重設" label_selected="重設" name="reset_cache"/>
+	<button label="" label_selected="重設" name="reset_cache"/>
 	<text name="Web:">
 		網頁：
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
index 305d1e2ac9..3280b9357b 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
@@ -9,7 +9,7 @@
 		最小化時靜音
 	</text>
 	<slider label="按鍵音" name="UI Volume"/>
-	<slider label="Ambient" name="Wind Volume"/>
+	<slider label="環境音" name="Wind Volume"/>
 	<slider label="音效" name="SFX Volume"/>
 	<slider label="串流音樂" name="Music Volume"/>
 	<check_box label="已啟用" name="enable_music"/>
@@ -33,7 +33,7 @@
 	<check_box label="Toggle speak on/off when I press:" name="push_to_talk_toggle_check" tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."/>
 	<line_editor label="Push-to-Speak trigger" name="modifier_combo"/>
 	<button label="設定按鍵" name="set_voice_hotkey_button"/>
-	<button name="set_voice_middlemouse_button" tool_tip="Reset to Middle Mouse Button"/>
+	<button name="set_voice_middlemouse_button" tool_tip="重設滑鼠中鍵按鈕"/>
 	<button label="輸入 / 輸出設備" name="device_settings_btn"/>
 	<panel label="設備設定" name="device_settings_panel">
 		<panel.string name="default_text">
diff --git a/indra/newview/skins/default/xui/zh/panel_profile.xml b/indra/newview/skins/default/xui/zh/panel_profile.xml
index fcf7bb64db..502449ac3a 100644
--- a/indra/newview/skins/default/xui/zh/panel_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_profile.xml
@@ -36,9 +36,9 @@
 					<text name="title_acc_status_text" value="帳戶狀態："/>
 					<text name="title_partner_text" value="配偶："/>
 					<panel name="partner_data_panel">
-						<text initial_value="(retrieving)" name="partner_text"/>
+						<text initial_value="（檢索中）" name="partner_text"/>
 					</panel>
-					<text name="title_groups_text" value="社團："/>
+					<text name="title_groups_text" value="群組："/>
 				</panel>
 			</scroll_container>
 		</layout_panel>
@@ -47,7 +47,7 @@
 		<layout_panel name="profile_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="開啟即時訊息會話"/>
@@ -56,7 +56,7 @@
 					<button label="通話" name="call" tool_tip="與這位居民通話"/>
 				</layout_panel>
 				<layout_panel name="chat_btn_lp">
-					<button label="瞬間傳送" name="teleport" tool_tip="Offer teleport"/>
+					<button label="瞬間傳送" name="teleport" tool_tip="發給瞬間傳送請求"/>
 				</layout_panel>
 				<layout_panel name="overflow_btn_lp">
 					<menu_button label="▼" name="overflow_btn" tool_tip="支付金錢，或分享收納區給居民"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
index 315bc0ac8e..ad94c4c7e9 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
@@ -36,7 +36,7 @@
 	<text_editor name="covenant_editor">
 		There is no Covenant provided for this Estate.
 	</text_editor>
-	<button label="Reset" name="reset_covenant"/>
+	<button label="重設" name="reset_covenant"/>
 	<text name="covenant_help_text">
 		Changes to the covenant will show on all parcels in the estate.
 	</text>
@@ -62,7 +62,7 @@
 		分級：
 	</text>
 	<text name="region_maturity_text">
-		成人
+		完全成人
 	</text>
 	<text name="resellable_lbl">
 		轉售：
diff --git a/indra/newview/skins/default/xui/zh/panel_region_debug.xml b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
index 1ffbcbf8fd..ed5e6e9d2c 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
@@ -7,8 +7,8 @@
 		未知
 	</text>
 	<check_box label="關閉腳本" name="disable_scripts_check" tool_tip="關閉這個地區現在的全部腳本"/>
-	<check_box label="Disable Collisions" name="disable_collisions_check" tool_tip="Disable non-avatar collisions in this region"/>
-	<check_box label="Disable Physics" name="disable_physics_check" tool_tip="Disable all physics in this region"/>
+	<check_box label="關閉碰撞" name="disable_collisions_check" tool_tip="關閉這個地區現在的非化身碰撞"/>
+	<check_box label="關閉物理" name="disable_physics_check" tool_tip="關閉這個地區現在的全部物理"/>
 	<button label="套用" name="apply_btn"/>
 	<text name="objret_text_lbl">
 		物件退回
@@ -23,12 +23,12 @@
 	<text name="options_text_lbl">
 		選項：
 	</text>
-	<check_box label="With scripts" name="return_scripts" tool_tip="只退回R包含腳本的物件"/>
-	<check_box label="On someone else&apos;s land" name="return_other_land" tool_tip="Return only objects which are on land belonging to someone else"/>
-	<check_box label="In every region of this estate" name="return_estate_wide" tool_tip="Return objects in all of the regions that make up this estate"/>
+	<check_box label="包含有腳本" name="return_scripts" tool_tip="只退回包含腳本的物件"/>
+	<check_box label="位於其他人土地上" name="return_other_land" tool_tip="只退回物件在屬於某個其他人土地上的物件"/>
+	<check_box label="於這個領地內的每一個地區" name="return_estate_wide" tool_tip="退回這個領地內全部地區中標記為他的物件"/>
 	<button label="退回" name="return_btn"/>
-	<button label="Get Top Colliders..." name="top_colliders_btn" tool_tip="List of objects experiencing the most potential collisions"/>
-	<button label="Get Top Scripts..." name="top_scripts_btn" tool_tip="List of objects spending the most time running scripts"/>
+	<button label="取得最常碰撞的物件..." name="top_colliders_btn" tool_tip="條列出目前運作中最常碰撞的物件清單"/>
+	<button label="取得最耗能腳本..." name="top_scripts_btn" tool_tip="條列出目前運作中最耗能的腳本清單"/>
 	<button label="地區重新啟動" name="restart_btn" tool_tip="給予兩分鐘倒數計時並重新啟動"/>
 	<button label="延遲重新啟動" name="cancel_restart_btn" tool_tip="延遲地區重新啟動一小時"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_estate.xml b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
index 1f1676167b..efa3be2f51 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="領地" name="Estate">
 	<text name="estate_help_text">
-		Changes to settings on this tab will affect all regions in the estate.
+		變更此夜籤中的設定會影響這個領地內的全部地區設定。
 	</text>
 	<text name="estate_text">
 		領地：
@@ -16,9 +16,9 @@
 		（未知）
 	</text>
 	<check_box label="Use Global Time" name="use_global_time_check"/>
-	<check_box label="Fixed Sun" name="fixed_sun_check"/>
+	<check_box label="固定太陽" name="fixed_sun_check"/>
 	<slider label="Phase" name="sun_hour_slider"/>
-	<check_box label="Allow Public Access" name="externally_visible_check"/>
+	<check_box label="允許公開出入" name="externally_visible_check"/>
 	<text name="Only Allow">
 		Restrict Access to accounts verified by:
 	</text>
@@ -40,7 +40,7 @@
 	<button label="移除..." name="remove_allowed_avatar_btn"/>
 	<button label="添加..." name="add_allowed_avatar_btn"/>
 	<text name="allow_group_label">
-		允許的社團：
+		允許的群組：
 	</text>
 	<button label="移除..." name="remove_allowed_group_btn"/>
 	<button label="添加..." name="add_allowed_group_btn"/>
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 dce75c997d..38fde494aa 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml
@@ -18,10 +18,10 @@
 	<text name="region_type">
 		未知
 	</text>
-	<check_box label="Block Terraform" name="block_terraform_check"/>
-	<check_box label="Block Fly" name="block_fly_check"/>
-	<check_box label="Allow Damage" name="allow_damage_check"/>
-	<check_box label="Restrict Pushing" name="restrict_pushobject"/>
+	<check_box label="阻止變形" name="block_terraform_check"/>
+	<check_box label="阻止飛行" name="block_fly_check"/>
+	<check_box label="允許傷害" name="allow_damage_check"/>
+	<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"/>
@@ -30,13 +30,13 @@
 	<text label="Maturity" name="access_text">
 		分級：
 	</text>
-	<icons_combo_box label="Moderate" name="access_combo">
-		<icons_combo_box.item label="成人" name="Adult" value="42"/>
-		<icons_combo_box.item label="Moderate" name="Mature" value="21"/>
-		<icons_combo_box.item label="一般" name="PG" value="13"/>
+	<icons_combo_box label="適度成人" name="access_combo">
+		<icons_combo_box.item label="完全成人" name="Adult" value="42"/>
+		<icons_combo_box.item label="適度成人" name="Mature" value="21"/>
+		<icons_combo_box.item label="一般普級" name="PG" value="13"/>
 	</icons_combo_box>
 	<button label="套用" name="apply_btn"/>
-	<button label="強制瞬間傳送一位居民回家..." name="kick_btn"/>
+	<button label="強制瞬間傳送一個居民回家..." name="kick_btn"/>
 	<button label="強制瞬間傳送所有居民回家..." name="kick_all_btn"/>
 	<button label="送出訊息到地區..." name="im_btn"/>
 	<button label="管理瞬間傳送中心..." name="manage_telehub_btn"/>
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 e42d904f32..1dc7c1e089 100644
--- a/indra/newview/skins/default/xui/zh/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
@@ -4,10 +4,10 @@
 		載入中...
 	</panel.string>
 	<panel.string name="can_not_view">
-		You can not view or edit this script, since it has been set as &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
+		你不察看或編輯此腳本，自從它被設定為 &quot;no copy&quot; 後。你需要完整權限去察看或編輯有包含腳本在內的物件。
 	</panel.string>
 	<panel.string name="public_objects_can_not_run">
-		Public Objects cannot run scripts
+		公開物件不能執行腳本
 	</panel.string>
 	<panel.string name="script_running">
 		執行中
@@ -16,7 +16,7 @@
 		腳本：[NAME]
 	</panel.string>
 	<panel.string name="external_editor_not_set">
-		Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.
+		由環境變數設定 LL_SCRIPT_EDITOR 或是 ExternalEditor 設定來選擇一個編輯器。
 	</panel.string>
 	<menu_bar name="script_menu">
 		<menu label="檔案" name="File">
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 625213e376..b706f1839a 100644
--- a/indra/newview/skins/default/xui/zh/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_side_tray.xml
@@ -13,7 +13,7 @@
 	</sidetray_tab>
 	<sidetray_tab description="Find your friends, contacts and people nearby." name="sidebar_people" tab_title="People">
 		<panel_container name="panel_container">
-			<panel label="社團檔案" name="panel_group_info_sidetray"/>
+			<panel label="群組檔案" name="panel_group_info_sidetray"/>
 			<panel label="Blocked Residents &amp; Objects" name="panel_block_list_sidetray"/>
 		</panel_container>
 	</sidetray_tab>
diff --git a/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
index 9a59d627d0..808e14f3c3 100644
--- a/indra/newview/skins/default/xui/zh/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
@@ -16,12 +16,12 @@
 		L$ [AMT]
 	</panel.string>
 	<panel name="balance_bg">
-		<text name="balance" tool_tip="Click to refresh your L$ balance" value="L$20"/>
+		<text name="balance" tool_tip="點擊以重新更新你的 L$ 帳戶餘額" value="L$20"/>
 		<button label="購買 L$" name="buyL" tool_tip="點擊以購買更多 L$"/>
 	</panel>
 	<text name="TimeText" tool_tip="目前時區（太平洋）">
 		24:00 AM PST
 	</text>
 	<button name="media_toggle_btn" tool_tip="開始 / 停止全部媒體（音樂、影片、網頁）"/>
-	<button name="volume_btn" tool_tip="Global Volume Control"/>
+	<button name="volume_btn" tool_tip="全域音量控制"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_world_map.xml b/indra/newview/skins/default/xui/zh/panel_world_map.xml
index ad28361a7f..b5aa659bf0 100644
--- a/indra/newview/skins/default/xui/zh/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/zh/panel_world_map.xml
@@ -4,7 +4,7 @@
 		載入中...
 	</panel.string>
 	<panel.string name="InvalidLocation">
-		Invalid Location
+		無效的位置
 	</panel.string>
 	<panel.string name="world_map_north">
 		N
diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml
index 534c0f39fc..d5c3096b22 100644
--- a/indra/newview/skins/default/xui/zh/role_actions.xml
+++ b/indra/newview/skins/default/xui/zh/role_actions.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <role_actions>
 	<action_set description="These Abilities include powers to add and remove group Members, and allow new Members to join without an invitation." name="Membership">
-		<action description="Invite People to this Group" longdescription="Invite People to this Group using the &apos;Invite&apos; button in the Roles section &gt; Members tab." name="member invite" value="1"/>
-		<action description="將會員由這個社團中踢出" longdescription="Eject Members from this Group using the &apos;Eject&apos; button in the Roles section &gt; Members tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability." name="member eject" value="2"/>
+		<action description="邀請他人加入這個群組" longdescription="邀請他人加入這個群組，請按下於角色區段中的成員頁籤中的 &apos;邀請&apos; 按鈕。" name="member invite" value="1"/>
+		<action description="將會員由這個群組中踢出" longdescription="Eject Members from this Group using the &apos;Eject&apos; button in the Roles section &gt; Members tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability." name="member eject" value="2"/>
 		<action description="Toggle &apos;Open Enrollment&apos; and change &apos;Enrollment fee&apos;" longdescription="Toggle &apos;Open Enrollment&apos; to let new Members join without an invitation, and change the &apos;Enrollment fee&apos; in the General section." name="member options" value="3"/>
 	</action_set>
 	<action_set description="These Abilities include powers to add, remove, and change group Roles, add and remove Members in Roles, and assign Abilities to Roles." name="Roles">
-		<action description="Create new Roles" longdescription="Create new Roles in the Roles section &gt; Roles tab." name="role create" value="4"/>
+		<action description="創立一個新角色" longdescription="創立一個新角色於角色區段 &gt; 角色頁籤。" name="role create" value="4"/>
 		<action description="刪除角色" longdescription="Delete Roles in the Roles section &gt; Roles tab." name="role delete" value="5"/>
 		<action description="Change Role names, titles, descriptions, and whether Role members are publicly revealed" longdescription="Change Role names, titles, descriptions, and whether Role members are publicly revealed. This is done at the bottom of the the Roles section &gt; Roles tab after selecting a Role." name="role properties" value="6"/>
 		<action description="Assign Members to Assigner&apos;s Roles" longdescription="Assign Members to Roles in the list of Assigned Roles (Roles section &gt; Members tab). A Member with this Ability can only add Members to a Role that the assigner is already in." name="role assign member limited" value="7"/>
@@ -50,7 +50,7 @@
 	<action_set description="These Abilities include powers to allow members to return objects and place and move Linden plants. This is useful for Members to clean up litter and do landscaping, but it should also be used with care, because there&apos;s no undo for returning objects." name="Parcel Content">
 		<action description="Return objects owned by group" longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab." name="land return group owned" value="48"/>
 		<action description="Return objects set to group" longdescription="Return objects on group-owned parcels that are set to the group in About Land &gt; Objects tab." name="land return group set" value="33"/>
-		<action description="Return non-group objects" longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab." name="land return non group" value="34"/>
+		<action description="退回非群組物件" longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab." name="land return non group" value="34"/>
 		<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">
@@ -66,8 +66,8 @@
 		<action description="接收通知與察看過去通知" longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group &gt; Notices section." name="notices receive" value="43"/>
 	</action_set>
 	<action_set description="These Abilities include powers to allow or restrict access to group chat sessions and group voice chat." name="Chat">
-		<action description="Join Group Chat" longdescription="Members in a Role with this Ability can join group chat sessions, for text and voice." name="join group chat" value="16"/>
-		<action description="Join Group Voice Chat" longdescription="Members in a Role with this Ability can join group voice chat sessions.  NOTE: The Join Group Chat ability is required to access the voice chat session." name="join voice chat" value="27"/>
-		<action description="Moderate Group Chat" longdescription="Members in a Role with this Ability can control access and participation in group voice and text chat sessions." name="moderate group chat" value="37"/>
+		<action description="加入群組聊天" longdescription="Members in a Role with this Ability can join group chat sessions, for text and voice." name="join group chat" value="16"/>
+		<action description="加入群組語音聊天" longdescription="Members in a Role with this Ability can join group voice chat sessions.  NOTE: The Join Group Chat ability is required to access the voice chat session." name="join voice chat" value="27"/>
+		<action description="適度成人內容的群組聊天" longdescription="Members in a Role with this Ability can control access and participation in group voice and text chat sessions." name="moderate group chat" value="37"/>
 	</action_set>
 </role_actions>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
index f28638d93d..adc815fb4b 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
@@ -52,7 +52,7 @@
 				</text>
 				<check_box label="覆製" name="CheckEveryoneCopy"/>
 				<text name="GroupLabel">
-					社團：
+					群組：
 				</text>
 				<check_box label="分享" name="CheckShareWithGroup" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."/>
 				<text name="NextOwnerLabel">
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 f308f2d4d0..5aad4568bd 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -7,19 +7,19 @@
 		Deed
 	</panel.string>
 	<panel.string name="text modify info 1">
-		You can modify this object
+		你可以修改這個物件
 	</panel.string>
 	<panel.string name="text modify info 2">
-		You can modify these objects
+		你可以修改這些物件
 	</panel.string>
 	<panel.string name="text modify info 3">
-		You can&apos;t modify this object
+		你不可以修改這個物件
 	</panel.string>
 	<panel.string name="text modify info 4">
-		You can&apos;t modify these objects
+		你不可以修改這些物件
 	</panel.string>
 	<panel.string name="text modify warning">
-		This object has linked parts
+		這個物件有聯結到其他部分
 	</panel.string>
 	<panel.string name="Cost Default">
 		價格： L$
@@ -28,13 +28,13 @@
 		總價： L$
 	</panel.string>
 	<panel.string name="Cost Per Unit">
-		Price Per: L$
+		單價： L$
 	</panel.string>
 	<panel.string name="Cost Mixed">
-		Mixed Price
+		混合價格
 	</panel.string>
 	<panel.string name="Sale Mixed">
-		Mixed Sale
+		混合銷售
 	</panel.string>
 	<text name="title" value="物件檔案"/>
 	<text name="where" value="(Inworld)"/>
@@ -52,9 +52,9 @@
 			擁有者：
 		</text>
 		<text name="Group_label">
-			社團：
+			群組：
 		</text>
-		<button name="button set group" tool_tip="Choose a group to share this object&apos;s permissions"/>
+		<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."/>
 		<text name="label click action">
@@ -77,7 +77,7 @@
 			<check_box label="覆製" name="checkbox allow everyone copy"/>
 			<check_box label="移動" name="checkbox allow everyone move"/>
 			<text name="GroupLabel">
-				社團：
+				群組：
 			</text>
 			<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."/>
 			<text name="NextOwnerLabel">
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 53f997017d..0949e61fa1 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -38,25 +38,25 @@
 		回存中...
 	</string>
 	<string name="ProgressChangingResolution">
-		Changing Resolution...
+		變更解析度...
 	</string>
 	<string name="Fullbright">
-		Fullbright (Legacy)
+		全亮（舊版）
 	</string>
 	<string name="LoginInProgress">
-		Logging in. [APP_NAME] may appear frozen.  Please wait.
+		登入中。[APP_NAME] 可能出現凍結狀態。請耐心稍等。
 	</string>
 	<string name="LoginInProgressNoFrozen">
-		Logging in...
+		登入中...
 	</string>
 	<string name="LoginAuthenticating">
-		Authenticating
+		身份驗證中
 	</string>
 	<string name="LoginMaintenance">
-		Performing account maintenance...
+		進行帳戶維護...
 	</string>
 	<string name="LoginAttempt">
-		Previous login attempt failed. Logging in, attempt [NUMBER]
+		先前企圖嘗試登入失敗。現登入中，嘗試 [NUMBER]
 	</string>
 	<string name="LoginPrecaching">
 		世界載入中...
@@ -101,7 +101,7 @@
 		服裝下載中...
 	</string>
 	<string name="InvalidCertificate">
-		The server returned an invalid or corrupt certificate. Please contact the Grid administrator.
+		伺服器回傳一個無效果損壞的憑證。請連繫網格管理者。
 	</string>
 	<string name="CertInvalidHostname">
 		An invalid hostname was used to access the server, please check your SLURL or Grid hostname.
@@ -146,7 +146,7 @@
 		你已經被所在的地區中斷聯結。
 	</string>
 	<string name="SentToInvalidRegion">
-		You were sent to an invalid region.
+		你被傳送到一個無效的地區。
 	</string>
 	<string name="TestingDisconnect">
 		測試瀏覽器斷線
@@ -155,28 +155,28 @@
 		人
 	</string>
 	<string name="TooltipNoName">
-		(no name)
+		（無名稱）
 	</string>
 	<string name="TooltipOwner">
 		擁有者：
 	</string>
 	<string name="TooltipPublic">
-		Public
+		公開
 	</string>
 	<string name="TooltipIsGroup">
-		（社團）
+		（群組）
 	</string>
 	<string name="TooltipForSaleL$">
 		出售： L$[AMOUNT]
 	</string>
 	<string name="TooltipFlagGroupBuild">
-		Group Build
+		群組建造
 	</string>
 	<string name="TooltipFlagNoBuild">
 		禁止建造
 	</string>
 	<string name="TooltipFlagNoEdit">
-		社團建造
+		群組建造
 	</string>
 	<string name="TooltipFlagNotSafe">
 		非安全
@@ -185,7 +185,7 @@
 		禁止飛行
 	</string>
 	<string name="TooltipFlagGroupScripts">
-		社團腳本
+		群組腳本
 	</string>
 	<string name="TooltipFlagNoScripts">
 		禁止腳本
@@ -210,10 +210,10 @@
 		瞭解更多有關這個居民
 	</string>
 	<string name="TooltipAgentMute">
-		Click to mute this Resident
+		點擊以封鎖這位居民
 	</string>
 	<string name="TooltipAgentUnmute">
-		Click to unmute this Resident
+		點擊以解除封鎖這位居民
 	</string>
 	<string name="TooltipAgentIM">
 		點擊開始 IM 這位居民
@@ -222,47 +222,47 @@
 		點擊以支付這位居民
 	</string>
 	<string name="TooltipAgentOfferTeleport">
-		Click to offer a teleport request to this Resident
+		點擊以送出瞬間傳送邀請給這位居民
 	</string>
 	<string name="TooltipAgentRequestFriend">
-		Click to send a friend request to this Resident
+		點擊以送出交友邀請給這位居民
 	</string>
 	<string name="TooltipGroupUrl">
-		Click to view this group&apos;s description
+		點擊以察看這個群組的描述
 	</string>
 	<string name="TooltipEventUrl">
-		Click to view this event&apos;s description
+		點擊以察看這個活動的描述
 	</string>
 	<string name="TooltipClassifiedUrl">
 		Click to view this classified
 	</string>
 	<string name="TooltipParcelUrl">
-		Click to view this parcel&apos;s description
+		點擊以察看這個地段的描述
 	</string>
 	<string name="TooltipTeleportUrl">
-		Click to teleport to this location
+		點擊以傳送到這個位置
 	</string>
 	<string name="TooltipObjectIMUrl">
-		Click to view this object&apos;s description
+		點擊以察看這個物件的描述
 	</string>
 	<string name="TooltipMapUrl">
-		Click to view this location on a map
+		點擊以察看此處在地圖上的位置
 	</string>
 	<string name="TooltipSLAPP">
-		Click to run the secondlife:// command
+		點擊以執行 secondlife:// 指令
 	</string>
-	<string name="CurrentURL" value="CurrentURL: [CurrentURL]"/>
+	<string name="CurrentURL" value="目前網址：[CurrentURL]"/>
 	<string name="SLurlLabelTeleport">
 		瞬間傳送到
 	</string>
 	<string name="SLurlLabelShowOnMap">
-		Show Map for
+		顯示地圖為了
 	</string>
 	<string name="SLappAgentMute">
-		Mute
+		封鎖
 	</string>
 	<string name="SLappAgentUnmute">
-		Unmute
+		解除封鎖
 	</string>
 	<string name="SLappAgentIM">
 		IM
@@ -271,7 +271,7 @@
 		支付
 	</string>
 	<string name="SLappAgentOfferTeleport">
-		Offer Teleport to
+		發給瞬間傳送請求到
 	</string>
 	<string name="SLappAgentRequestFriend">
 		交友要求
@@ -295,7 +295,7 @@
 		脫下
 	</string>
 	<string name="BUTTON_DOCK">
-		Dock
+		停泊固定
 	</string>
 	<string name="BUTTON_HELP">
 		顯示幫助
@@ -307,22 +307,22 @@
 		未發現。
 	</string>
 	<string name="RetrievingData">
-		Retrieving...
+		檢索...
 	</string>
 	<string name="ReleaseNotes">
-		Release Notes
+		釋出版本說明
 	</string>
 	<string name="LoadingData">
 		載入中...
 	</string>
 	<string name="AvatarNameNobody">
-		(nobody)
+		（沒有人）
 	</string>
 	<string name="AvatarNameWaiting">
-		(waiting)
+		（等待中）
 	</string>
 	<string name="AvatarNameMultiple">
-		(multiple)
+		（多個）
 	</string>
 	<string name="GroupNameNone">
 		（無）
@@ -334,25 +334,25 @@
 		無錯誤
 	</string>
 	<string name="AssetErrorRequestFailed">
-		Asset request: failed
+		資產請求：失敗
 	</string>
 	<string name="AssetErrorNonexistentFile">
-		Asset request: non-existent file
+		資產要求：非已存在檔案
 	</string>
 	<string name="AssetErrorNotInDatabase">
-		Asset request: asset not found in database
+		資產要求：資產並未發現於資料庫中
 	</string>
 	<string name="AssetErrorEOF">
-		End of file
+		檔案結尾
 	</string>
 	<string name="AssetErrorCannotOpenFile">
-		Cannot open file
+		無法開啟檔案
 	</string>
 	<string name="AssetErrorFileNotFound">
-		File not found
+		檔案未發現
 	</string>
 	<string name="AssetErrorTCPTimeout">
-		File transfer timeout
+		檔案傳輸逾時
 	</string>
 	<string name="AssetErrorCircuitGone">
 		Circuit gone
@@ -370,13 +370,13 @@
 		聲音
 	</string>
 	<string name="calling card">
-		calling card
+		名片
 	</string>
 	<string name="landmark">
 		地標
 	</string>
 	<string name="legacy script">
-		legacy script
+		舊版腳本
 	</string>
 	<string name="clothing">
 		服裝
@@ -427,16 +427,16 @@
 		姿勢
 	</string>
 	<string name="simstate">
-		simstate
+		模擬器狀態
 	</string>
 	<string name="favorite">
-		favorite
+		我的最愛
 	</string>
 	<string name="symbolic link">
-		link
+		聯結
 	</string>
 	<string name="symbolic folder link">
-		folder link
+		資料夾聯結
 	</string>
 	<string name="AvatarEditingAppearance">
 		（外觀編輯中）
@@ -448,13 +448,13 @@
 		忙碌
 	</string>
 	<string name="AvatarMuted">
-		Blocked
+		封鎖的
 	</string>
 	<string name="anim_express_afraid">
-		Afraid
+		害怕
 	</string>
 	<string name="anim_express_anger">
-		Angry
+		生氣
 	</string>
 	<string name="anim_away">
 		Away
@@ -472,19 +472,19 @@
 		Blow Kiss
 	</string>
 	<string name="anim_express_bored">
-		Bored
+		無聊
 	</string>
 	<string name="anim_bow">
 		Bow
 	</string>
 	<string name="anim_clap">
-		Clap
+		拍手
 	</string>
 	<string name="anim_courtbow">
 		Court Bow
 	</string>
 	<string name="anim_express_cry">
-		Cry
+		哭泣
 	</string>
 	<string name="anim_dance1">
 		Dance 1
@@ -541,19 +541,19 @@
 		Kiss My Butt
 	</string>
 	<string name="anim_express_kiss">
-		Kiss
+		親吻
 	</string>
 	<string name="anim_laugh_short">
-		Laugh
+		笑
 	</string>
 	<string name="anim_musclebeach">
 		Muscle Beach
 	</string>
 	<string name="anim_no_unhappy">
-		No (Unhappy)
+		不（不快樂）
 	</string>
 	<string name="anim_no_head">
-		No
+		不
 	</string>
 	<string name="anim_nyanya">
 		Nya-nya-nya
@@ -598,10 +598,10 @@
 		Roundhouse Kick
 	</string>
 	<string name="anim_express_sad">
-		Sad
+		傷心
 	</string>
 	<string name="anim_salute">
-		Salute
+		敬禮
 	</string>
 	<string name="anim_shout">
 		Shout
@@ -610,7 +610,7 @@
 		Shrug
 	</string>
 	<string name="anim_express_smile">
-		Smile
+		微笑
 	</string>
 	<string name="anim_smoke_idle">
 		Smoke Idle
@@ -622,7 +622,7 @@
 		Smoke Throw Down
 	</string>
 	<string name="anim_express_surprise">
-		Surprise
+		驚喜
 	</string>
 	<string name="anim_sword_strike_r">
 		Sword Strike
@@ -637,22 +637,22 @@
 		Wave
 	</string>
 	<string name="anim_whisper">
-		Whisper
+		耳語
 	</string>
 	<string name="anim_whistle">
-		Whistle
+		吹口哨
 	</string>
 	<string name="anim_express_wink">
-		Wink
+		眨眼
 	</string>
 	<string name="anim_wink_hollywood">
-		Wink (Hollywood)
+		眨眼（好萊塢）
 	</string>
 	<string name="anim_express_worry">
-		Worry
+		擔心
 	</string>
 	<string name="anim_yes_happy">
-		Yes (Happy)
+		是（快樂）
 	</string>
 	<string name="anim_yes_head">
 		是
@@ -679,25 +679,25 @@
 		Can&apos;t find ROOT or JOINT.
 	</string>
 	<string name="whisper">
-		whispers:
+		低語：
 	</string>
 	<string name="shout">
-		shouts:
+		吶喊：
 	</string>
 	<string name="ringing">
-		Connecting to in-world Voice Chat...
+		聯接到虛擬世界的語音功能中...
 	</string>
 	<string name="connected">
-		Connected
+		已聯接
 	</string>
 	<string name="unavailable">
-		Voice not available at your current location
+		語音聊天功能於你目前所在的位置無法使用
 	</string>
 	<string name="hang_up">
-		Disconnected from in-world Voice Chat
+		虛擬世界中的語音聊天中斷
 	</string>
 	<string name="reconnect_nearby">
-		You will now be reconnected to Nearby Voice Chat
+		現在你將重新聯接到附近的語音聊天
 	</string>
 	<string name="ScriptQuestionCautionChatGranted">
 		&apos;[OBJECTNAME]&apos;, an object owned by &apos;[OWNERNAME]&apos;, located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].
@@ -706,7 +706,7 @@
 		&apos;[OBJECTNAME]&apos;, an object owned by &apos;[OWNERNAME]&apos;, located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].
 	</string>
 	<string name="ScriptTakeMoney">
-		Take Linden dollars (L$) from you
+		由你身上拿走林登幣（L$）
 	</string>
 	<string name="ActOnControlInputs">
 		Act on your control inputs
@@ -730,25 +730,25 @@
 		Add and remove joints with other objects
 	</string>
 	<string name="ChangePermissions">
-		Change its permissions
+		變更它的權限
 	</string>
 	<string name="TrackYourCamera">
-		Track your camera
+		追蹤你的攝影機
 	</string>
 	<string name="ControlYourCamera">
-		Control your camera
+		控制你的攝影機
 	</string>
 	<string name="NotConnected">
-		Not Connected
+		未聯接
 	</string>
 	<string name="SIM_ACCESS_PG">
-		一般
+		一般普級
 	</string>
 	<string name="SIM_ACCESS_MATURE">
-		Moderate
+		適度成人
 	</string>
 	<string name="SIM_ACCESS_ADULT">
-		成人
+		完全成人
 	</string>
 	<string name="SIM_ACCESS_DOWN">
 		離線
@@ -796,16 +796,16 @@
 		Bitmap 圖像
 	</string>
 	<string name="avi_movie_file">
-		AVI 影片檔案
+		AVI 視頻檔案
 	</string>
 	<string name="xaf_animation_file">
 		XAF Anim File
 	</string>
 	<string name="xml_file">
-		XML File
+		XML 檔案
 	</string>
 	<string name="raw_file">
-		RAW File
+		RAW 檔案
 	</string>
 	<string name="compressed_image_files">
 		壓縮的圖像
@@ -868,13 +868,13 @@
 		裙子
 	</string>
 	<string name="alpha">
-		Alpha
+		半透明
 	</string>
 	<string name="tattoo">
 		刺青
 	</string>
 	<string name="physics">
-		Physics
+		身體物理
 	</string>
 	<string name="invalid">
 		無效
@@ -910,13 +910,13 @@
 		裙子未穿
 	</string>
 	<string name="alpha_not_worn">
-		Alpha not worn
+		半透明未穿
 	</string>
 	<string name="tattoo_not_worn">
 		刺青未穿
 	</string>
 	<string name="physics_not_worn">
-		Physics not worn
+		身體物理未穿
 	</string>
 	<string name="invalid_not_worn">
 		無效
@@ -961,13 +961,13 @@
 		創造新裙子
 	</string>
 	<string name="create_new_alpha">
-		Create new alpha
+		創造新半透明
 	</string>
 	<string name="create_new_tattoo">
 		創造新刺青
 	</string>
 	<string name="create_new_physics">
-		Create new physics
+		創造新身體物理
 	</string>
 	<string name="create_new_invalid">
 		無效
@@ -982,10 +982,10 @@
 		確定
 	</string>
 	<string name="GroupNotifyGroupNotice">
-		社團通知
+		群組通知
 	</string>
 	<string name="GroupNotifyGroupNotices">
-		社團通知
+		群組通知
 	</string>
 	<string name="GroupNotifySentBy">
 		送出由
@@ -1012,34 +1012,34 @@
 		你有約 %d 通知
 	</string>
 	<string name="BodyPartsRightArm">
-		Right Arm
+		右臂
 	</string>
 	<string name="BodyPartsHead">
 		頭部
 	</string>
 	<string name="BodyPartsLeftArm">
-		Left Arm
+		左臂
 	</string>
 	<string name="BodyPartsLeftLeg">
-		Left Leg
+		左腿
 	</string>
 	<string name="BodyPartsTorso">
 		軀幹
 	</string>
 	<string name="BodyPartsRightLeg">
-		Right Leg
+		右腿
 	</string>
 	<string name="GraphicsQualityLow">
-		Low
+		低
 	</string>
 	<string name="GraphicsQualityMid">
-		Mid
+		中
 	</string>
 	<string name="GraphicsQualityHigh">
-		High
+		高
 	</string>
 	<string name="LeaveMouselook">
-		Press ESC to return to World View
+		按下 ESC 鍵回復到世界的視角
 	</string>
 	<string name="InventoryNoMatchingItems">
 		Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].
@@ -1053,19 +1053,19 @@
 	<string name="InventoryNoTexture">
 		You do not have a copy of this texture in your inventory
 	</string>
-	<string name="no_transfer" value="(no transfer)"/>
-	<string name="no_modify" value="(no modify)"/>
-	<string name="no_copy" value="(no copy)"/>
-	<string name="worn" value="(worn)"/>
-	<string name="link" value="(link)"/>
-	<string name="broken_link" value="(broken_link)"/>
+	<string name="no_transfer" value="（禁止轉讓）"/>
+	<string name="no_modify" value="（禁止修改）"/>
+	<string name="no_copy" value="（禁止複製）"/>
+	<string name="worn" value="（已穿）"/>
+	<string name="link" value="（聯結）"/>
+	<string name="broken_link" value="（損壞的聯結）"/>
 	<string name="LoadingContents">
 		內容載入中...
 	</string>
 	<string name="NoContents">
-		No contents
+		無內容
 	</string>
-	<string name="WornOnAttachmentPoint" value="(worn on [ATTACHMENT_POINT])"/>
+	<string name="WornOnAttachmentPoint" value="（已穿 [ATTACHMENT_POINT]）"/>
 	<string name="ActiveGesture" value="[GESLABEL] (active)"/>
 	<string name="PermYes">
 		是
@@ -1084,7 +1084,7 @@
 	<string name="ViewAllGestures" value="察看全部 &gt;&gt;"/>
 	<string name="GetMoreGestures" value="取得更多 &gt;&gt;"/>
 	<string name="Animations" value="動作,"/>
-	<string name="Calling Cards" value="Calling Cards,"/>
+	<string name="Calling Cards" value="名片,"/>
 	<string name="Clothing" value="服裝,"/>
 	<string name="Gestures" value="姿勢,"/>
 	<string name="Landmarks" value="地標,"/>
@@ -1093,14 +1093,17 @@
 	<string name="Scripts" value="腳本,"/>
 	<string name="Sounds" value="聲音,"/>
 	<string name="Textures" value="材質,"/>
-	<string name="Snapshots" value="Snapshots,"/>
+	<string name="Snapshots" value="快照,"/>
 	<string name="No Filters" value="No"/>
 	<string name="Since Logoff" value="- 自上次登出"/>
 	<string name="InvFolder My Inventory">
 		我的收納區
 	</string>
+	<string name="InvFolder My Favorites">
+		我的最愛
+	</string>
 	<string name="InvFolder Library">
-		Library
+		資源庫
 	</string>
 	<string name="InvFolder Textures">
 		材質
@@ -1109,7 +1112,7 @@
 		聲音
 	</string>
 	<string name="InvFolder Calling Cards">
-		Calling Cards
+		名片
 	</string>
 	<string name="InvFolder Landmarks">
 		地標
@@ -1148,7 +1151,7 @@
 		Lost And Found
 	</string>
 	<string name="InvFolder Uncompressed Sounds">
-		Uncompressed Sounds
+		無壓縮聲音
 	</string>
 	<string name="InvFolder Animations">
 		動作
@@ -1157,10 +1160,10 @@
 		姿勢
 	</string>
 	<string name="InvFolder Favorite">
-		My Favorites
+		我的最愛
 	</string>
 	<string name="InvFolder favorite">
-		My Favorites
+		我的最愛
 	</string>
 	<string name="InvFolder Current Outfit">
 		目前裝扮
@@ -1217,34 +1220,34 @@
 		Ctrl
 	</string>
 	<string name="Chest">
-		Chest
+		胸部
 	</string>
 	<string name="Skull">
-		Skull
+		頭顱
 	</string>
 	<string name="Left Shoulder">
-		Left Shoulder
+		左肩
 	</string>
 	<string name="Right Shoulder">
-		Right Shoulder
+		右肩
 	</string>
 	<string name="Left Hand">
-		Left Hand
+		左手
 	</string>
 	<string name="Right Hand">
-		Right Hand
+		右手
 	</string>
 	<string name="Left Foot">
-		Left Foot
+		左腳
 	</string>
 	<string name="Right Foot">
-		Right Foot
+		右腳
 	</string>
 	<string name="Spine">
-		Spine
+		脊椎
 	</string>
 	<string name="Pelvis">
-		Pelvis
+		骨盆
 	</string>
 	<string name="Mouth">
 		嘴
@@ -1268,46 +1271,46 @@
 		鼻子
 	</string>
 	<string name="R Upper Arm">
-		R Upper Arm
+		右上臂
 	</string>
 	<string name="R Forearm">
-		R Forearm
+		右前臂
 	</string>
 	<string name="L Upper Arm">
-		L Upper Arm
+		左上臂
 	</string>
 	<string name="L Forearm">
-		L Forearm
+		左前臂
 	</string>
 	<string name="Right Hip">
-		Right Hip
+		右臀
 	</string>
 	<string name="R Upper Leg">
-		R Upper Leg
+		右大腿
 	</string>
 	<string name="R Lower Leg">
-		R Lower Leg
+		右小腿
 	</string>
 	<string name="Left Hip">
-		Left Hip
+		左臀
 	</string>
 	<string name="L Upper Leg">
-		L Upper Leg
+		左大腿
 	</string>
 	<string name="L Lower Leg">
-		L Lower Leg
+		左小腿
 	</string>
 	<string name="Stomach">
-		Stomach
+		腹肌
 	</string>
 	<string name="Left Pec">
-		Left Pec
+		左胸肌
 	</string>
 	<string name="Right Pec">
-		Right Pec
+		右胸肌
 	</string>
 	<string name="Invalid Attachment">
-		Invalid Attachment Point
+		無效的附件聯接點
 	</string>
 	<string name="YearsMonthsOld">
 		[AGEYEARS] [AGEMONTHS] old
@@ -1325,7 +1328,7 @@
 		[AGEDAYS] old
 	</string>
 	<string name="TodayOld">
-		高日剛加入
+		今日剛加入
 	</string>
 	<string name="AgeYearsA">
 		[COUNT] 年
@@ -1394,40 +1397,40 @@
 		No Payment Info On File
 	</string>
 	<string name="AgeVerified">
-		Age-verified
+		已年齡驗證
 	</string>
 	<string name="NotAgeVerified">
-		Not Age-verified
+		未年齡驗證
 	</string>
 	<string name="Center 2">
-		Center 2
+		中央 2
 	</string>
 	<string name="Top Right">
-		Top Right
+		右上
 	</string>
 	<string name="Top">
-		Top
+		上方
 	</string>
 	<string name="Top Left">
-		Top Left
+		左上
 	</string>
 	<string name="Center">
-		Center
+		中央
 	</string>
 	<string name="Bottom Left">
-		Bottom Left
+		左下
 	</string>
 	<string name="Bottom">
-		Bottom
+		下方
 	</string>
 	<string name="Bottom Right">
-		Bottom Right
+		右下
 	</string>
 	<string name="CompileQueueDownloadedCompiling">
-		Downloaded, now compiling
+		已下載，現在進行編譯中
 	</string>
 	<string name="CompileQueueScriptNotFound">
-		Script not found on server.
+		伺服器上未發現腳本。
 	</string>
 	<string name="CompileQueueProblemDownloading">
 		Problem downloading
@@ -1442,16 +1445,16 @@
 		Unknown failure to download
 	</string>
 	<string name="CompileQueueTitle">
-		Recompilation Progress
+		重新編譯進度
 	</string>
 	<string name="CompileQueueStart">
-		recompile
+		重新編譯
 	</string>
 	<string name="ResetQueueTitle">
-		Reset Progress
+		重設進度
 	</string>
 	<string name="ResetQueueStart">
-		reset
+		重設
 	</string>
 	<string name="RunQueueTitle">
 		設定執行中程序
@@ -1478,19 +1481,19 @@
 		腳本（物件超出範圍）
 	</string>
 	<string name="GodToolsObjectOwnedBy">
-		Object [OBJECT] owned by [OWNER]
+		物件 [OBJECT] 為 [OWNER] 所擁有
 	</string>
 	<string name="GroupsNone">
 		無
 	</string>
-	<string name="Group" value="（社團）"/>
+	<string name="Group" value="（群組）"/>
 	<string name="Unknown">
 		（未知）
 	</string>
 	<string name="SummaryForTheWeek" value="Summary for this week, beginning on"/>
 	<string name="NextStipendDay" value="The next stipend day is"/>
 	<string name="GroupIndividualShare" value="Group       Individual Share"/>
-	<string name="GroupColumn" value="社團"/>
+	<string name="GroupColumn" value="群組"/>
 	<string name="Balance">
 		Balance
 	</string>
@@ -1531,7 +1534,7 @@
 		Allowed Residents: ([ALLOWEDAGENTS], max [MAXACCESS])
 	</string>
 	<string name="RegionInfoAllowedGroups">
-		Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])
+		允許的群群組：（[ALLOWEDGROUPS]，最大 [MAXACCESS]）
 	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
 		地段腳本記憶體
@@ -1546,7 +1549,7 @@
 		Memory used: [COUNT] kb
 	</string>
 	<string name="ScriptLimitsParcelScriptURLs">
-		Parcel Script URLs
+		地段腳本 URLs
 	</string>
 	<string name="ScriptLimitsURLsUsed">
 		URLs used: [COUNT] out of [MAX]; [AVAILABLE] available
@@ -1558,7 +1561,7 @@
 		Error requesting information
 	</string>
 	<string name="ScriptLimitsRequestNoParcelSelected">
-		No Parcel Selected
+		無地段被選擇
 	</string>
 	<string name="ScriptLimitsRequestWrongRegion">
 		Error: script information is only available in your current region
@@ -1573,46 +1576,46 @@
 		Sitting On
 	</string>
 	<string name="ATTACH_CHEST">
-		Chest
+		胸部
 	</string>
 	<string name="ATTACH_HEAD">
 		頭部
 	</string>
 	<string name="ATTACH_LSHOULDER">
-		Left Shoulder
+		左肩
 	</string>
 	<string name="ATTACH_RSHOULDER">
-		Right Shoulder
+		右肩
 	</string>
 	<string name="ATTACH_LHAND">
-		Left Hand
+		左手
 	</string>
 	<string name="ATTACH_RHAND">
-		Right Hand
+		右手
 	</string>
 	<string name="ATTACH_LFOOT">
-		Left Foot
+		左腳
 	</string>
 	<string name="ATTACH_RFOOT">
-		Right Foot
+		右腳
 	</string>
 	<string name="ATTACH_BACK">
-		Back
+		背部
 	</string>
 	<string name="ATTACH_PELVIS">
-		Pelvis
+		骨盆
 	</string>
 	<string name="ATTACH_MOUTH">
-		Mouth
+		嘴巴
 	</string>
 	<string name="ATTACH_CHIN">
 		下巴
 	</string>
 	<string name="ATTACH_LEAR">
-		Left Ear
+		左耳
 	</string>
 	<string name="ATTACH_REAR">
-		Right Ear
+		右耳
 	</string>
 	<string name="ATTACH_LEYE">
 		左眼
@@ -1624,43 +1627,43 @@
 		鼻子
 	</string>
 	<string name="ATTACH_RUARM">
-		Right Upper Arm
+		右上臂
 	</string>
 	<string name="ATTACH_RLARM">
-		Right Lower Arm
+		右前臂
 	</string>
 	<string name="ATTACH_LUARM">
-		Left Upper Arm
+		左上臂
 	</string>
 	<string name="ATTACH_LLARM">
-		Left Lower Arm
+		左前臂
 	</string>
 	<string name="ATTACH_RHIP">
-		Right Hip
+		右臀
 	</string>
 	<string name="ATTACH_RULEG">
-		Right Upper Leg
+		右大腿
 	</string>
 	<string name="ATTACH_RLLEG">
-		Right Lower Leg
+		右小腿
 	</string>
 	<string name="ATTACH_LHIP">
-		Left Hip
+		左臀
 	</string>
 	<string name="ATTACH_LULEG">
-		Left Upper Leg
+		左大腿
 	</string>
 	<string name="ATTACH_LLLEG">
-		Left Lower Leg
+		左小腿
 	</string>
 	<string name="ATTACH_BELLY">
-		Belly
+		腹部
 	</string>
 	<string name="ATTACH_RPEC">
-		Right Pec
+		右胸肌
 	</string>
 	<string name="ATTACH_LPEC">
-		Left Pec
+		左胸肌
 	</string>
 	<string name="ATTACH_HUD_CENTER_2">
 		HUD Center 2
@@ -1699,13 +1702,13 @@
 		[mthnum,datetime,slt]/[day,datetime,slt]
 	</string>
 	<string name="PanelContentsTooltip">
-		Content of object
+		物件的內容
 	</string>
 	<string name="PanelContentsNewScript">
-		New Script
+		新腳本
 	</string>
 	<string name="BusyModeResponseDefault">
-		The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.
+		你傳送訊息的居民目前處於忙碌模式中，這意味著他要求不被打擾。你所傳的訊息仍將會留存並顯示於 IM 面板上供他稍後時查閱。
 	</string>
 	<string name="MuteByName">
 		（由名稱）
@@ -1717,22 +1720,22 @@
 		（物件）
 	</string>
 	<string name="MuteGroup">
-		（社團）
+		（群組）
 	</string>
 	<string name="MuteExternal">
-		(External)
+		（外部）
 	</string>
 	<string name="RegionNoCovenant">
-		There is no Covenant provided for this Estate.
+		此領地未提供任何契約要求。
 	</string>
 	<string name="RegionNoCovenantOtherOwner">
 		There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab.  Please contact the Estate Owner for sales details.
 	</string>
-	<string name="covenant_last_modified" value="Last Modified: "/>
+	<string name="covenant_last_modified" value="最後修改於："/>
 	<string name="none_text" value="（無）"/>
 	<string name="never_text" value="（絕不）"/>
 	<string name="GroupOwned">
-		社團所擁有
+		群組所擁有
 	</string>
 	<string name="Public">
 		公開
@@ -1741,7 +1744,7 @@
 		Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile
 	</string>
 	<string name="ClassifiedUpdateAfterPublish">
-		(will update after publish)
+		（將於發布後自動更新）
 	</string>
 	<string name="NoPicksClassifiedsText">
 		You haven&apos;t created any Picks or Classifieds. Click the Plus button below to create a Pick or Classified.
@@ -1762,10 +1765,10 @@
 		An object named
 	</string>
 	<string name="InvOfferOwnedByGroup">
-		owned by the group
+		群組所擁有
 	</string>
 	<string name="InvOfferOwnedByUnknownGroup">
-		owned by an unknown group
+		由一個未知的群組所擁有
 	</string>
 	<string name="InvOfferOwnedBy">
 		owned by
@@ -1952,7 +1955,7 @@
 		Linden Location
 	</string>
 	<string name="Adult">
-		成人
+		完全成人
 	</string>
 	<string name="Arts&amp;Culture">
 		Arts &amp; Culture
@@ -2057,7 +2060,7 @@ If this message persists, restart your computer.
 Would you like to send a crash report?
 	</string>
 	<string name="MBAlert">
-		Notification
+		通知
 	</string>
 	<string name="MBNoDirectX">
 		[APP_NAME] is unable to detect DirectX 9.0b or greater.
@@ -2066,7 +2069,7 @@ Would you like to send a crash report?
 Do you wish to continue?
 	</string>
 	<string name="MBWarning">
-		Warning
+		警告
 	</string>
 	<string name="MBNoAutoUpdate">
 		Automatic updating is not yet implemented for Linux.
@@ -2076,7 +2079,7 @@ Please download the latest version from www.secondlife.com.
 		RegisterClass failed
 	</string>
 	<string name="MBError">
-		Error
+		錯誤
 	</string>
 	<string name="MBFullScreenErr">
 		Unable to run fullscreen at [WIDTH] x [HEIGHT].
@@ -3574,13 +3577,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Health
 	</string>
 	<string name="LocationCtrlAdultIconTooltip">
-		成人地區
+		完全成人地區
 	</string>
 	<string name="LocationCtrlModerateIconTooltip">
-		Moderate Region
+		適度成人地區
 	</string>
 	<string name="LocationCtrlGeneralIconTooltip">
-		一般地區
+		一般普級地區
 	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] 更新
@@ -3637,10 +3640,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Your text chat has been disabled by a Group Moderator.
 	</string>
 	<string name="IM_default_text_label">
-		Click here to instant message.
+		點擊此處以傳送即時訊息。
 	</string>
 	<string name="IM_to_label">
-		To
+		至
 	</string>
 	<string name="IM_moderator_label">
 		(Moderator)
@@ -3739,10 +3742,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Error while moderating.
 	</string>
 	<string name="removed">
-		You have been removed from the group.
+		你已經由群組中被移除。
 	</string>
 	<string name="removed_from_group">
-		You have been removed from the group.
+		你已經由群組中被移除。
 	</string>
 	<string name="close_on_no_ability">
 		You no longer have the ability to be in the chat session.
@@ -3790,10 +3793,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		for deeding land
 	</string>
 	<string name="to create a group">
-		以創造社團
+		以創造群組
 	</string>
 	<string name="to join a group">
-		以加入社團
+		以加入群組
 	</string>
 	<string name="to upload">
 		以上傳
@@ -3823,7 +3826,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Officers
 	</string>
 	<string name="group_role_owners">
-		Owners
+		擁有者
 	</string>
 	<string name="group_member_status_online">
 		上線
@@ -3873,16 +3876,16 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		新裙子
 	</string>
 	<string name="New Alpha">
-		New Alpha
+		新半透明
 	</string>
 	<string name="New Tattoo">
 		新刺青
 	</string>
 	<string name="New Physics">
-		New Physics
+		新身體物理
 	</string>
 	<string name="Invalid Wearable">
-		Invalid Wearable
+		無效的可穿裝扮
 	</string>
 	<string name="New Gesture">
 		新姿勢
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
index b18eb4a390..ffb4c903bb 100644
--- a/indra/newview/skins/default/xui/zh/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml
@@ -3,25 +3,25 @@
 	<message_set name="errors">
 		<message name="invalid_tport">
 			Problem encountered processing your teleport request. You may need to log back in before you can teleport.
-If you continue to get this message, please check the [SUPPORT_SITE].
+如果你持續得到此訊息，請查閱 [SUPPORT_SITE]。
 		</message>
 		<message name="invalid_region_handoff">
 			Problem encountered processing your region crossing. You may need to log back in before you can cross regions.
-If you continue to get this message, please check the [SUPPORT_SITE].
+如果你持續得到此訊息，請查閱 [SUPPORT_SITE]。
 		</message>
 		<message name="blocked_tport">
-			Sorry, teleport is currently blocked. Try again in a moment.
-If you still cannot teleport, please log out and log back in to resolve the problem.
+			抱歉，目前瞬間傳送已被阻擋。請稍後再試。
+如果你仍無法進行瞬間傳送，請登出後重新入來解決此一問題。
 		</message>
 		<message name="nolandmark_tport">
-			Sorry, but system was unable to locate landmark destination.
+			抱歉，不過系統無法找到地標所在目的地。
 		</message>
 		<message name="timeout_tport">
-			Sorry, but system was unable to complete the teleport connection.
-Try again in a moment.
+			抱歉，不過系統無法完成瞬間傳送的聯接。
+請稍後再試。
 		</message>
 		<message name="noaccess_tport">
-			Sorry, you do not have access to that teleport destination.
+			抱歉，你並沒有權限進入要瞬間傳送的目的地。
 		</message>
 		<message name="missing_attach_tport">
 			Your attachments have not arrived yet. Try waiting for a few more seconds or log out and back in again before attempting to teleport.
@@ -47,7 +47,7 @@ Try again in a moment.
 			Sending to destination.
 		</message>
 		<message name="redirecting">
-			Redirecting to different location.
+			重新導向至不同位置。
 		</message>
 		<message name="relaying">
 			Relaying to destination.
-- 
cgit v1.2.3