diff --git a/indra/newview/skins/ansastorm/xui/zh/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/zh/panel_main_inventory.xml
index 21f086793b..ea54ef6a70 100644
--- a/indra/newview/skins/ansastorm/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/zh/panel_main_inventory.xml
@@ -125,6 +125,7 @@
 			<inventory_panel label="庫存" name="All Items"/>
 			<recent_inventory_panel label="最近" name="Recent Items" />
 			<worn_inventory_panel label="裝扮" name="Worn Items" />
+			<favorites_inventory_panel label="收藏" name="Favorites"/>
 		</tab_container>
 	</panel>
 	<panel name="bottom_panel">
diff --git a/indra/newview/skins/default/xui/zh/floater_fs_poser.xml b/indra/newview/skins/default/xui/zh/floater_fs_poser.xml
index 0e47991256..f906b4142e 100644
--- a/indra/newview/skins/default/xui/zh/floater_fs_poser.xml
+++ b/indra/newview/skins/default/xui/zh/floater_fs_poser.xml
@@ -194,6 +194,7 @@
 								前/後：
 							</text>
 							<slider name="av_position_inout" tool_tip="前後移動選中的化身"/>
+							<check_box name="unlock_pelvis_for_bvh_save_checkbox" label="在BVH中解鎖骨盆" tool_tip="將此姿勢儲存為BVH時，骨盆不會被「鎖定」，因此其他動畫可移動整個化身。若希望將此姿勢疊加播放，請啟用此選項。"/>
 							<scroll_list name="entireAv_joint_scroll">
 								<scroll_list.columns label="身體部位" name="joint"/>
 							</scroll_list>
@@ -247,11 +248,11 @@
 						</text>
 						<slider name="trackpad_sensitivity_slider" tool_tip="設定觸控板的敏感度"/>
 						<check_box name="stop_posing_on_close_checkbox" label="關閉時停止" tool_tip="關閉時不停止姿勢可有助於保留目前工作。"/>
-						<check_box name="reset_base_rotation_on_edit_checkbox" label="編輯時重設基礎旋轉" tool_tip="首次編輯旋轉時，將其重設為零。這意味著可以保存完整的姿勢（而不僅僅是差異，請參閱載入/保存）。每個以零為基準匯出的關節旁都會顯示綠色勾選標誌。" />
 						<check_box name="also_save_bvh_checkbox" label="儲存時也儲存BHV" tool_tip="當姿勢被儲存時，將同時創建一個BHV檔案，該檔案可以透過建造 > 上傳 > 動畫上傳，並用於自己或其他化身的姿勢。為了實現此功能，關節的基礎位置必須設為零，因為BHV無法從其他姿勢推導出來。"/>
 						<check_box name="confirm_overwrite_on_save_checkbox" label="確認覆蓋" tool_tip="儲存姿勢時，如果檔案已存在，您需要再次點擊保存按鈕以確認覆蓋。" />
 						<check_box name="natural_direction_checkbox" label="使用自然對齊" tool_tip="骨骼預設具有不自然的關節旋轉，這可能會讓姿勢調整變得更複雜。選取此選項後，關節將以更自然的方式旋轉。" />
 						<check_box name="show_joint_markers_checkbox" label="顯示關節標記" tool_tip="顯示關節標記，以便在姿勢編輯時更輕鬆地選擇關節。" />
+						<check_box name="dof_edit_mode_checkbox" label="在編輯模式中啟用景深" tool_tip="使用操控器時，景深通常會自動關閉。啟用此選項可在編輯姿勢或元素時保持景深效果。"/>
 					</panel>
 				</tab_container>
 				<button name="toggleVisualManipulators" tool_tip="啟用 / 停用可視操控器。" />
@@ -296,6 +297,7 @@
 					<button name="button_redo_change" tool_tip="重做上一次變更"/>
 					<button name="poser_joint_reset" tool_tip="點選將選取的身體部位重設為最初開始調整姿勢時的狀態。"/>
 					<button name="delta_mode_toggle" tool_tip="如果改變多個關節，則改變它們相同的值而不是相同的角度。這也用於解決萬向節鎖定的問題。"/>
+					<button name="toggle_LockWorldRotation" tool_tip="鎖定所選肢體在全域座標系下的旋轉。被全域鎖定的肢體在父肢體移動時仍保持相同的全域旋轉。例如：鎖定眼睛後轉動頭部，眼睛仍會（大致）保持原始朝向。"/>
 					<button label="鏡像" name="button_toggleMirrorRotation" tool_tip="將變更鏡像到對側關節。"/>
 					<button label="複製" name="button_toggleSympatheticRotation" tool_tip="將變更複製到對側關節。"/>
 					<button label="複製左側&gt;右" name="button_symmetrize_left_to_right" tool_tip="點選將變更從左側複製到右側。" />
diff --git a/indra/newview/skins/default/xui/zh/floater_im_container.xml b/indra/newview/skins/default/xui/zh/floater_im_container.xml
index 73e34c656e..ad22556dbe 100644
--- a/indra/newview/skins/default/xui/zh/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_container.xml
@@ -11,14 +11,14 @@
 					<button name="speak_btn" tool_tip="用麥克風和大家聊天" />
 				</layout_panel>
 				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="摺疊/展開這個選單" />
+					<button name="expand_collapse_btn" tool_tip="收起/展開這個選單" />
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 		<layout_panel name="messages_layout_panel">
 			<panel_container name="im_box_tab_container">
 				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="摺疊這個視窗" />
+					<button name="stub_collapse_btn" tool_tip="收起這個視窗" />
 					<text name="stub_textbox">
 						這個聊天另開了新視窗。   [secondlife:/// 把它收回來]
 					</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml
index 3f27cde46d..a12517e392 100644
--- a/indra/newview/skins/default/xui/zh/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_session.xml
@@ -12,8 +12,8 @@
 	<floater.string name="tooltip_to_main_window" value="將這個聊天移回到主視窗" />
 	<floater.string name="start_call_button_tooltip" value="建立語音通話" />
 	<floater.string name="end_call_button_tooltip" value="切斷語音通話" />
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="摺疊這個視窗" />
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="摺疊參與者清單" />
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="收起這個視窗" />
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="收起參與者清單" />
 	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="展開參與者清單" />
 	<view name="contents_view">
 		<layout_stack name="main_stack">
@@ -23,7 +23,7 @@
 				<button name="add_btn" tool_tip="新增某人到聊天" />
 				<button name="voice_call_btn" tool_tip="建立語音通話" />
 				<button name="close_btn" tool_tip="結束該聊天" />
-				<button name="expand_collapse_btn" tool_tip="摺疊/展開這個視窗" />
+				<button name="expand_collapse_btn" tool_tip="收起/展開這個視窗" />
 			</layout_panel>
 			<layout_panel name="chat_layout_panel">
 				<layout_stack name="input_panels">
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_settings.xml b/indra/newview/skins/default/xui/zh/floater_inventory_settings.xml
index f852be237c..a0be5f740b 100644
--- a/indra/newview/skins/default/xui/zh/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_settings.xml
@@ -4,7 +4,7 @@
 		在多檔案夾視圖中雙擊一個檔案夾:
 	</text>
 	<radio_group name="multi_double_click_setting">
-		<radio_item label="展開和摺疊檔案夾" name="0" />
+		<radio_item label="展開和收起檔案夾" name="0" />
 		<radio_item label="打開一個新視窗" name="1" />
 		<radio_item label="切換視圖" name="2" />
 	</radio_group>
@@ -22,5 +22,17 @@
 		<radio_item label="在主庫存視窗中顯示" name="false" />
 		<radio_item label="打開一個新的單檔案夾視窗" name="true" />
 	</radio_group>
-	<button label="確定" name="ok_btn" />
+	<text name="favorites_txt">
+		收藏
+	</text>
+	<check_box label="在收藏物件旁顯示星標" name="favorite_star" />
+	<check_box label="在收藏資料夾旁顯示空心星標" name="favorite_hollow_star" />
+	<check_box label="文字顏色" name="favorites_color" />
+	<text name="attachment_return_txt">
+		在化身附件上按下“Enter”鍵
+	</text>
+	<combo_box name="attach_combo">
+		<combo_box.item label="添加附件（推薦）" name="0" />
+		<combo_box.item label="穿上（替換附著點上的物件）" name="1" />
+	</combo_box>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/zh/floater_new_feature_notification.xml
index 4999bc5ff1..90794e1451 100644
--- a/indra/newview/skins/default/xui/zh/floater_new_feature_notification.xml
+++ b/indra/newview/skins/default/xui/zh/floater_new_feature_notification.xml
@@ -4,17 +4,7 @@
 		庫存的新功能
 	</floater.string>
 	<floater.string name="description_txt_inventory">
-		您現在可以為庫存中的物件新增預覽圖像，並在單獨的視窗中顯示一個檔案夾。
-瞭解更多 [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ 部落格文章]
-	</floater.string>
-	<floater.string name="title_txt_gltf">
-	新的 GLTF PBR 材質支援
-	</floater.string>
-	<floater.string name="description_txt_gltf">
-	你現在可以使用擴充的材質支援，能夠匯入和編輯 GLTF 基於物理的彩現 (PBR) 材質。
-為了支援新增 GLTF 格式，檢視器中的某些區域可能看起來比平常更暗。
-
-瞭解更多關於 [https://wiki.secondlife.com/wiki/PBR_Materials 基於物理的彩現(PBR)]
+		您現在可以將物件和資料夾標記為收藏。已收藏的項目會出現在庫存的“收藏”選項卡中，並在主庫存視圖中預設以星標突出顯示。
 	</floater.string>
 	<text name="title_txt">
 		新功能
diff --git a/indra/newview/skins/default/xui/zh/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/zh/floater_notifications_tabbed.xml
index abdd0b763a..cb776af61a 100644
--- a/indra/newview/skins/default/xui/zh/floater_notifications_tabbed.xml
+++ b/indra/newview/skins/default/xui/zh/floater_notifications_tabbed.xml
@@ -25,7 +25,7 @@
 			</tab_container>
 			<layout_stack name="ButtonsStack">
 				<layout_panel name="CondenseAllButtonPanel">
-					<button label="全部摺疊" name="collapse_all_button" />
+					<button label="全部收起" name="collapse_all_button" />
 				</layout_panel>
 				<layout_panel name="GapLayoutPanel">
 					<panel label="間隙佈局" name="GapPanel" />
diff --git a/indra/newview/skins/default/xui/zh/floater_object_weights.xml b/indra/newview/skins/default/xui/zh/floater_object_weights.xml
index 68e2bd782a..ef69c094f3 100644
--- a/indra/newview/skins/default/xui/zh/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/zh/floater_object_weights.xml
@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="object_weights" title="進階">
-	<floater.string name="nothing_selected" value="--" />
+	<floater.string name="lowest_lod" value="最低" />
+	<floater.string name="low_lod" value="低" />
+	<floater.string name="medium_lod" value="中" />
+	<floater.string name="high_lod" value="高" />
+	<floater.string name="multiple_lods" value="多個" />
 	<text name="selected_text" value="已選" />
-	<text name="objects" value="--" />
 	<text name="objects_label" value="物件" />
-	<text name="prims" value="--" />
 	<text name="prims_label" value="元素" />
 	<text name="weights_of_selected_text" value="所選物重量" />
-	<text name="download" value="--" />
 	<text name="download_label" value="下載" />
-	<text name="physics" value="--" />
 	<text name="physics_label" value="物理" />
-	<text name="server" value="--" />
 	<text name="server_label" value="伺服器" />
-	<text name="display" value="--" />
 	<text name="display_label" value="顯示" />
 	<text name="land_impacts_text" value="土地影響" />
-	<text name="selected" value="--" />
 	<text name="selected_label" value="選擇" />
-	<text name="rezzed_on_land" value="--" />
 	<text name="rezzed_on_land_label" value="已產生到土地上" />
-	<text name="remaining_capacity" value="--" />
 	<text name="remaining_capacity_label" value="剩餘容納量" />
-	<text name="total_capacity" value="--" />
 	<text name="total_capacity_label" value="總容納量" />
-	<text name="help_SLURL" value="[secondlife:///app/help/object_weights 這是什麼？]" />
+	<text name="rendering_info_text" value="彩現" />
+	<text name="lod_level_label" value="LOD（細節層次）" />
+	<text name="triangles_shown_label" value="顯示的三角形" />
+	<text name="pixel_area_label" value="像素面積" />
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml
index 2cfb122fe6..81693d74a8 100644
--- a/indra/newview/skins/default/xui/zh/floater_stats.xml
+++ b/indra/newview/skins/default/xui/zh/floater_stats.xml
@@ -8,6 +8,8 @@
 				<stat_bar label="影格（中位數）" name="frame_median" />
 				<stat_bar label="抖動" name="framet_jitter" />
 				<stat_bar label="標準會話抖動" name="normalized_cumulative_frametime"/>
+				<stat_bar label="歸一化週期抖動" name="normalized_period_jitter"/>
+				<stat_bar label="歸一化影格時間波動" name="normalized_frametime_variation"/>
 				<stat_bar label="每分鐘影格事件數" name="frame_events_per_minute"/>
 				<stat_bar label="最近1分鐘影格事件數" name="frame_events_last_minute"/>
 				<stat_bar label="接收到的UDP資料" name="bandwidth" />
diff --git a/indra/newview/skins/default/xui/zh/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/zh/menu_gallery_inventory.xml
index cd6efe064e..f3a8dfe553 100644
--- a/indra/newview/skins/default/xui/zh/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_gallery_inventory.xml
@@ -84,11 +84,22 @@
 	</menu>
 	<menu_item_call label="從所選中建立新檔案夾" name="New folder from selected" />
 	<menu_item_call label="取消檔案夾分組" name="Ungroup folder items" />
-	<menu label="預設附著到" name="upload_def">
-		<menu_item_call label="圖像上傳" name="Image uploads" />
-		<menu_item_call label="聲音上傳" name="Sound uploads" />
-		<menu_item_call label="動畫上傳" name="Animation uploads" />
-		<menu_item_call label="模型上傳" name="Model uploads" />
+	<menu_item_call label="添加到收藏" name="Add to Favorites" />
+	<menu_item_call label="從收藏中移除" name="Remove from Favorites" />
+	<menu label="上傳到資料夾" name="upload_options">
+		<menu_item_call label="上傳紋理..." name="Upload Image" />
+		<menu_item_call label="上傳聲音 ([COST]L$)..." name="Upload Sound" />
+		<menu_item_call label="上傳動畫 ([COST]L$)..." name="Upload Animation" />
+		<menu_item_call label="上傳網格模型..." name="Upload Model" />
+		<menu_item_call label="上傳材質..." name="Upload Material" />
+		<menu_item_call label="批量上傳..." name="Bulk Upload" />
+	</menu>
+	<menu label="預設用作" name="upload_def">
+		<menu_item_call label="上傳圖像" name="Image uploads" />
+		<menu_item_call label="上傳聲音" name="Sound uploads" />
+		<menu_item_call label="上傳動畫" name="Animation uploads" />
+		<menu_item_call label="上傳模型" name="Model uploads" />
+		<menu_item_call label="上傳PBR材質" name="PBR uploads" />
 	</menu>
 	<menu_item_call label="複製到市場刊登" name="Marketplace Copy" />
 	<menu_item_call label="移到市場刊登" name="Marketplace Move" />
diff --git a/indra/newview/skins/default/xui/zh/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/zh/menu_gallery_outfit_tab.xml
index eebec6977c..af300d6dd5 100644
--- a/indra/newview/skins/default/xui/zh/menu_gallery_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/zh/menu_gallery_outfit_tab.xml
@@ -4,6 +4,8 @@
 	<menu_item_call label="新增到當前裝扮" name="wear_add" />
 	<menu_item_call label="從當前裝扮移除" name="take_off" />
 	<menu_item_call label="縮圖..." name="thumbnail" />
+	<menu_item_call label="添加到收藏" name="favorites_add" />
+	<menu_item_call label="從收藏中移除" name="favorites_remove" />
 	<menu_item_call label="編輯裝扮" name="edit" />
 	<menu_item_call label="重新命名裝扮" name="rename" />
 	<menu_item_call label="儲存到此裝扮" name="save" />
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
index b6e51d8d18..42db8a6338 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -51,7 +51,7 @@
 		<menu_item_call label="新的水文" name="New Water" />
 		<menu_item_call label="新的晝夜循環" name="New Day Cycle" />
 	</menu>
-	<menu label="作這一用途的預設值：" name="upload_def">
+	<menu label="預設用作" name="upload_def">
 		<menu_item_call label="圖像上傳" name="Image uploads" />
 		<menu_item_call label="聲音上傳" name="Sound uploads" />
 		<menu_item_call label="動畫上傳" name="Animation uploads" />
@@ -107,6 +107,8 @@
 	<menu_item_call label="刪除系統檔案夾" name="Delete System Folder" />
 	<menu_item_call label="從所選內容建立新檔案夾" name="New folder from selected" />
 	<menu_item_call label="取消檔案夾中的物件分組" name="Ungroup folder items" />
+	<menu_item_call label="添加到收藏" name="Add to Favorites" />
+	<menu_item_call label="從收藏中移除" name="Remove from Favorites" />
 	<menu_item_call label="發起多方通話" name="Conference Chat Folder" />
 	<menu_item_call label="播放" name="Sound Play" />
 	<menu_item_call label="複製 SLurl" name="url_copy" />
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/zh/menu_inventory_view_default.xml
index cd07b01cf9..293ce55f86 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_view_default.xml
@@ -7,5 +7,4 @@
 	<menu_item_check label="列表視圖" name="list_view" />
 	<menu_item_check label="圖片視圖" name="gallery_view" />
 	<menu_item_check label="組合視圖" name="combination_view" />
-	<menu_item_check label="庫存設定" name="inv_settings" />
 </toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gallery_sort.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gallery_sort.xml
new file mode 100644
index 0000000000..57a61116a6
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_gallery_sort.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Sort Outfit">
+	<menu_item_check label="收藏置頂" name="sort_favorites_to_top" />
+	<menu_item_check label="圖片置頂" name="sort_images_to_top" />
+	<menu_item_check label="按名稱排序" name="sort_by_name" />
+</toggleable_menu>
\ No newline at end of file
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 9c1bb6e695..c7f1bf7b29 100644
--- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
@@ -3,13 +3,12 @@
 	<menu_item_call label="替換當前裝扮" name="wear" />
 	<menu_item_call label="新增到當前裝扮" name="wear_add" />
 	<menu_item_call label="從當前裝扮移除" name="take_off" />
-	<menu_item_call label="圖像" name="thumbnail" />
+	<menu_item_call label="縮圖..." name="thumbnail" />
+	<menu_item_call label="添加到收藏" name="favorites_add" />
+	<menu_item_call label="從收藏中移除" name="favorites_remove" />
 	<menu_item_call label="儲存到此裝扮" name="save" />
 	<menu_item_call label="裝扮重新命名" name="rename" />
 	<menu_item_call label="刪除裝扮" name="delete_outfit" />
-	<menu_item_check label="總是按名稱排序檔案夾" name="sort_folders_by_name" />
-	<menu_item_call label="展開全部檔案夾" name="expand" />
-	<menu_item_call label="摺疊全部檔案夾" name="collapse" />
 	<context_menu label="新服裝" name="New Clothes">
 		<menu_item_call label="新襯衫" name="New Shirt" />
 		<menu_item_call label="新褲子" name="New Pants" />
@@ -31,4 +30,5 @@
 		<menu_item_call label="新頭髮" name="New Hair" />
 		<menu_item_call label="新眼睛" name="New Eyes" />
 	</context_menu>
+	<menu_item_check label="庫存設定..." name="inventory_settings" />
 </toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
index fbe042c739..14b7fc5ecc 100644
--- a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
@@ -3,7 +3,9 @@
 	<menu_item_call label="替換當前裝扮" name="wear_replace" />
 	<menu_item_call label="新增到當前裝扮" name="wear_add" />
 	<menu_item_call label="從當前裝扮移除" name="take_off" />
-	<menu_item_call label="圖像" name="thumbnail" />
+	<menu_item_call label="縮圖..." name="thumbnail" />
+	<menu_item_call label="添加到收藏" name="favorites_add" />
+	<menu_item_call label="從收藏中移除" name="favorites_remove" />
 	<menu_item_call label="編輯裝扮" name="edit" />
 	<menu_item_call label="裝扮重新命名" name="rename" />
 	<menu_item_call label="儲存到此裝扮" name="save" />
diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
index b383f62980..9e63a93265 100644
--- a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
@@ -9,5 +9,5 @@
 	<menu_item_call label="重新命名" name="rename" />
 	<menu_item_call label="刪除" name="delete" />
 	<menu_item_call label="展開" name="expand" />
-	<menu_item_call label="摺疊" name="collapse" />
+	<menu_item_call label="收起" name="collapse" />
 </toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_sorting.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_sorting.xml
index 22588cdf63..5af6a43ccd 100644
--- a/indra/newview/skins/default/xui/zh/menu_places_gear_sorting.xml
+++ b/indra/newview/skins/default/xui/zh/menu_places_gear_sorting.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_sorter_gear">
 	<menu_item_call label="展開全部檔案夾" name="expand_all" />
-	<menu_item_call label="摺疊全部檔案夾" name="collapse_all" />
+	<menu_item_call label="收起全部檔案夾" name="collapse_all" />
 	<menu_item_check label="按時間排序" name="sort_by_date" />
 </toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
index d7505e4fdb..46fa8007aa 100644
--- a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Teleport History Gear Context Menu">
 	<menu_item_call label="展開全部檔案夾" name="Expand all folders" />
-	<menu_item_call label="摺疊全部檔案夾" name="Collapse all folders" />
+	<menu_item_call label="收起全部檔案夾" name="Collapse all folders" />
 	<menu name="TPHistoryTimeZone" label="時區">
 		<menu_item_check name="teleport_history_tz_utc" label="協調世界時" />
 		<menu_item_check name="teleport_history_tz_slt" label="SL時間" />
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index e7bdd5a3bf..7a13ec1a95 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -238,6 +238,13 @@
 			<menu_item_check label="突出顯示透明物件" name="Highlight Transparent" />
 			<menu_item_check label="-包括已綁定骨骼的透明物件" name="Include Transparent Rigged" />
 			<menu_item_check label="無後期處理" name="No Post" />
+			<menu label="選擇細節層次等級" name="Selection level of detail">
+				<menu_item_check label="預設" name="Default lod setting" />
+				<menu_item_check label="高" name="High lod setting" />
+				<menu_item_check label="中" name="Medium lod setting" />
+				<menu_item_check label="低" name="Low lod setting" />
+				<menu_item_check label="最低" name="Lowest lod setting" />
+			</menu>
 			<menu_item_check label="對齊到網格" name="Snap to Grid" />
 			<menu_item_call label="將物件XY對齊到網格" name="Snap Object XY to Grid" />
 			<menu_item_call label="使用選區為網格" name="Use Selection for Grid" />
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 2ea83d40eb..db001d6df9 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
@@ -11,6 +11,8 @@
 	<menu_item_call label="卸下" name="detach" />
 	<menu_item_call label="脫下" name="take_off" />
 	<menu_item_call label="物件檔案" name="object_profile" />
+	<menu_item_call label="添加到收藏" name="favorites_add" />
+	<menu_item_call label="從收藏中移除" name="favorites_remove" />
 	<menu_item_call label="顯示原件" name="show_original" />
 	<menu_item_call label="從此裝扮中移除" name="delete_from_outfit"/>
 	<menu_item_call label="建立" name="create_new" />
diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
index 8e6692a08a..2d39f868ba 100644
--- a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
@@ -5,6 +5,8 @@
 	<menu_item_call label="脫下" name="take_off" />
 	<menu_item_call label="卸下" name="detach" />
 	<menu_item_call label="脫下/卸下" name="take_off_or_detach" />
+	<menu_item_call label="添加到收藏" name="favorites_add" />
+	<menu_item_call label="從收藏中移除" name="favorites_remove" />
 	<menu_item_call label="顯示原件" name="show_original" />
 	<menu_item_call label="編輯裝扮" name="edit_outfit" />
 </context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index e1e7648f69..3669e581f9 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -527,8 +527,11 @@
 	<notification name="ErrorCannotAffordUpload">
 		上傳這個物件需要花費[COSTL$]。
 	</notification>
+	<notification name="ErrorEncodingImage">
+		無法對圖像進行編碼，原因：[REASON]
+	</notification>
 	<notification name="ErrorTextureCannotAfford">
-		你需要[COST] L$才能把紋理存入你的庫存。 你可以購買L$，或者不存入庫存，而把相片存到你的電腦。
+		你需要[COST]L$才能把紋理存入你的庫存。 你可以購買L$，或者不存入庫存，而把相片存到你的電腦。
 	</notification>
 	<notification name="ErrorUploadingPostcard">
 		傳送快照時出問題，原因：[REASON]
@@ -1318,6 +1321,15 @@
 			<button name="SetName" text="使用新名稱"/>
 		</form>
 	</notification>
+	<notification label="刪除自動替換清單" name="RemoveAutoReplaceList">
+		'[LIST_NAME]'包含[MAP_SIZE]個條目。
+
+您確定要刪除此清單嗎？
+		<form name="form">
+			<button name="DeleteList" text="刪除" />
+			<button name="Cancel" text="取消" />
+		</form>
+	</notification>
 	<notification name="InvalidAutoReplaceEntry">
 		關鍵字必須是一個字，替換字不得空白。
 	</notification>
@@ -1904,9 +1916,9 @@ URL:[UNTRUSTED_URL]
 		你已經封鎖/靜音了這個名稱。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification name="RemoveItemWarn">
-		雖然允許這麼做，刪除內容可能會破壞物件。 你要刪除該物件嗎？
-		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
+	<notification name="CantModifyContentInNoModTask">
+		您沒有權限修改此物件的內容
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CantOfferCallingCard">
 		此時無法提供名片。 請稍候再試。
@@ -5709,6 +5721,13 @@ gzip級別6壓縮的測試結果，對[FILE]檔案大小[SIZE] KB：
 		選中「隱藏水」複選框將覆蓋所選的紋理、凹凸和光澤圖選項。
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="繼續" />
 	</notification>
+	<notification name="WaterExclusionNoMaterial">
+		無法在水面隱藏的表面上應用材質。
+	</notification>
+	<notification name="ImageUploadResized">
+		您上傳的紋理已從[ORIGINAL_WIDTH]x[ORIGINAL_HEIGHT]調整為[NEW_WIDTH]x[NEW_HEIGHT]，以適配最大尺寸[MAX_WIDTH]x[MAX_HEIGHT]像素。
+		<usetemplate ignoretext="上傳時的圖像縮放" name="okignore" />
+	</notification>
 	<notification name="EnableAutoFPSWarning">
 		你即將啟用自動影格率。所有未儲存的圖形設定將會丟失。
 
diff --git a/indra/newview/skins/default/xui/zh/panel_login_first.xml b/indra/newview/skins/default/xui/zh/panel_login_first.xml
index 4d72fcdd03..eacb21de38 100644
--- a/indra/newview/skins/default/xui/zh/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/zh/panel_login_first.xml
@@ -13,7 +13,7 @@
 					<combo_box label="使用者名稱" name="username_combo" tool_tip="使用者名稱是你註冊時所挑選的，例如 bobsmith12 或 Steller Sunshine"/>
 					<line_editor label="密碼" name="password_edit"/>
 					<button label="登入" name="connect_btn"/>
-					<check_box label="記得我" name="remember_check"/>
+					<check_box label="記住我" name="remember_check"/>
 					<text name="forgot_password_text">
 						忘記密碼
 					</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
index 73ac6a0c2a..c1d50eae49 100644
--- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
@@ -56,7 +56,7 @@
 			<inventory_panel label="庫存" name="All Items" sort_order_setting="InventorySortOrder" />
 			<recent_inventory_panel label="最近" sort_order_setting="RecentItemsSortOrder" name="Recent Items" />
 			<worn_inventory_panel label="裝扮" name="Worn Items" />
-			<favorites_inventory_panel label="收藏夾" name="Favorite Items" />
+			<favorites_inventory_panel label="收藏" name="Favorites" />
 		</tab_container>
 	</panel>
 	<panel name="bottom_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/zh/panel_outfit_gallery.xml
index 76c5affbc2..bb2bb39ed6 100644
--- a/indra/newview/skins/default/xui/zh/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfit_gallery.xml
@@ -13,13 +13,11 @@
 		搜尋中...
 	</text>
 	<panel name="bottom_panel">
-		<menu_button name="options_gear_btn" tool_tip="顯示額外選項" />
 		<text name="OutfitcountText">
 			[COUNT] 件裝扮
 		</text>
 		<text name="avatar_complexity_label">
 			複雜度：[WEIGHT]
 		</text>
-		<button name="trash_btn" tool_tip="刪除選定的裝扮" />
 	</panel>
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml
index 1e4048a8b3..4c5986f014 100644
--- a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml
@@ -5,13 +5,11 @@
 		<no_visible_tabs_text name="no_outfits_msg" value="你還沒有任何裝扮。 請試試[secondlife:///app/search/all/ 搜尋]" />
 	</accordion>
 	<panel name="bottom_panel">
-		<menu_button name="options_gear_btn" tool_tip="顯示額外選項" />
 		<text name="OutfitcountText">
 			[COUNT] 套裝扮
 		</text>
 		<text name="avatar_complexity_label">
 			複雜度：[WEIGHT]
 		</text>
-		<button name="trash_btn" tool_tip="刪除所選擇的裝扮" />
 	</panel>
 </panel>
\ No newline at end of file
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 2911d32c2f..16829471bf 100644
--- a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Wearing">
 	<panel.string name="no_attachments">
-		未裝扮任何附件。
+		未穿戴任何附件。
 	</panel.string>
 	<accordion name="wearables_accordion">
 		<accordion_tab name="tab_wearables" title="可穿裝扮" />
 		<accordion_tab name="tab_temp_attachments" title="臨時附件" />
 	</accordion>
 	<panel name="bottom_panel">
-		<menu_button name="options_gear_btn" tool_tip="顯示額外選項" />
 		<text name="avatar_complexity_label">
 			複雜度: [WEIGHT]
 		</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/zh/panel_preferences_firestorm.xml
index 8262852d0a..0bfd1ebf4c 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_firestorm.xml
@@ -12,6 +12,7 @@
 			<check_box label="當指令碼通訊時建立粒子效果" name="EffectScriptChatParticles" tool_tip="啟用此選項會在與通訊的物件周圍顯示一個小的旋轉雲。" />
 			<check_box label="當您接近特定人物時關閉追蹤標籤 (&lt;= 3m)" name="FSDisableAvatarTrackerAtCloseIn" tool_tip="啟用此選項將在您接近人物時自動關閉追蹤標籤 (&lt;= 3m 預設)" />
 			<check_box label="設定閒置便當動畫" name="play_default_bento_idle_animation_toggle" tool_tip="如果啟用此選項，檢視器將在沒有其他便當動畫正在運行時播放預設的便當動畫， 優先度為0，將手、翅膀、嘴和尾巴放在自然位置。" />
+			<check_box label="站立後重置化身骨骼" name="FSResetSkeletonOnStandUp" tool_tip="啟用此選項後，當你站起時，檢視器會自動重置您的化身骨骼，並將重置訊息發送給周圍的其他居民，以便讓他們的用戶端同時更你您的外觀。" />
 			<check_box label="登入時禁用載入螢幕" name="login_screen_toggle" tool_tip="禁用登入時的載入螢幕" />
 			<check_box label="登出時禁用載入螢幕" name="logout_screen_toggle" tool_tip="禁用登出時的載入螢幕" />
 			<check_box label="啟用漸進式遠景剪裁距離" name="FSRenderFarClipStepping" tool_tip="如果啟用，Firestorm 將在傳送後使用逐步遠景剪裁距離。" />
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 d9ed4b82f4..7baab89d2d 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
@@ -41,7 +41,7 @@
 			<check_box label="反轉Y軸" name="invert_mouse" />
 		</panel>
 		<panel label="移動" name="tab-movement">
-			<check_box label="始終用方向鍵移動我的化身" name="arrow_keys_move_avatar_check" tool_tip="僅適用於在檢視器底部的本地聊天輸入欄位中，而不適用於聊天索引標籤中的本地聊天。" />
+			<check_box label="在聊天時按方向鍵會移動我的化身" name="arrow_keys_move_avatar_check" tool_tip="僅適用於在檢視器底部的本地聊天輸入欄位中，而不適用於聊天索引標籤中的本地聊天。" />
 			<check_box label="按字母鍵移動我的化身 (WASD)" name="LetterKeysAffectsMovementNotFocusChatBar" />
 			<check_box label="雙擊方向鍵以跑步" name="tap_tap_hold_to_run" />
 			<check_box label="按住跳躍/下蹲鍵可以起飛/降落" name="automatic_fly" />
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
index 8d8ae38e71..c04829c0af 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
@@ -11,7 +11,20 @@
 		<text name="currentlook_name">
 			(載入中)
 		</text>
-		<button name="edit_outfit_btn" tool_tip="編輯這裝扮" />
+		<button name="edit_outfit_btn" tool_tip="編輯這套裝扮" />
 	</panel>
-	<search_editor label="裝扮過濾器" name="Filter" />
+	<layout_stack name="top_menu_panel">
+		<layout_panel name="filter_panel">
+			<filter_editor label="裝扮過濾器" name="Filter" />
+		</layout_panel>
+		<layout_panel name="options_gear_btn_panel">
+			<menu_button tool_tip="顯示更多選項" name="options_gear_btn" />
+		</layout_panel>
+		<layout_panel name="options_sort_btn_panel">
+			<menu_button tool_tip="顯示排序選項" name="sorting_menu_btn" />
+		</layout_panel>
+		<layout_panel name="trash_btn_panel">
+			<dnd_button name="trash_btn" tool_tip="刪除選中的裝扮" />
+		</layout_panel>
+	</layout_stack>
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 66cd13c32d..498705fc31 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -1494,13 +1494,16 @@ support@secondlife.com.
 		字典
 	</string>
 	<string name="backup_files">
-		備份物件
+		物件備份
 	</string>
 	<string name="collada_files">
 		collada模型
 	</string>
+	<string name="model_files">
+		網格模型
+	</string>
 	<string name="csv_files">
-		英文逗號分隔
+		CSV檔案
 	</string>
 	<string name="recompile_script_verb">
 		重編譯
@@ -1810,8 +1813,11 @@ support@secondlife.com.
 	<string name="InventoryNoMatchingRecentItems">
 		未找到你想要的？ 嘗試 [secondlife:///app/inventory/filters 更改過濾器].
 	</string>
+	<string name="InventoryNoMatchingFavorites">
+		您尚未將任何物件標記為收藏。
+	</string>
 	<string name="PlacesNoMatchingItems">
-		未找到你想要的？ 嘗試 [secondlife:///app/search/places/[SEARCH_TERM] 搜尋].
+		要將地點添加到您的地標，請點擊地點名稱右側的星形圖標。
 	</string>
 	<string name="FavoritesNoMatchingItems">
 		將地標拖入此處便可加入「收藏夾」
@@ -2123,17 +2129,20 @@ support@secondlife.com.
 	<string name="InvFolder Gestures">
 		手勢
 	</string>
-	<string name="InvFolder Favorites">
-		收藏夾
+	<string name="InvFolder Favorite">
+		收藏
 	</string>
 	<!-- historically default name of the Favorites folder can start from either "f" or "F" letter.
       Also, it can be written as "Favorite" or "Favorites".
   We should localize all variants of them with the same value -->
 	<string name="InvFolder favorite">
-		收藏夾
+		收藏
+	</string>
+	<string name="InvFolder Favorites">
+		收藏
 	</string>
 	<string name="InvFolder favorites">
-		收藏夾
+		收藏
 	</string>
 	<string name="InvFolder Current Outfit">
 		當前裝扮
@@ -5575,8 +5584,11 @@ support@secondlife.com.
 	<string name="DefaultMimeType">
 		無/無
 	</string>
+	<string name="texture_load_area_error">
+		無法載入大於[PIXELS]像素的圖像。
+	</string>
 	<string name="texture_load_dimensions_error">
-		無法載入大於 [WIDTH]*[HEIGHT] 的圖像
+		無法載入大於 [WIDTH]*[HEIGHT]的圖像
 	</string>
 	<string name="texture_load_format_error">
 		圖像格式不正確。