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 71cc3fe613..764514f88d 100644
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -288,7 +288,7 @@
 			<text name="Object Owners:">
 				物件所有者：
 			</text>
-			<button label="重新整理清單" label_selected="重新整理清單" name="Refresh List" tool_tip="重新整理物件清單" />
+			<button label="更新清單" label_selected="更新清單" name="Refresh List" tool_tip="更新物件清單" />
 			<button label="退回物件" label_selected="退回物件中..." name="Return objects..." />
 			<name_list name="owner list">
 				<name_list.columns label="類型" name="type" />
diff --git a/indra/newview/skins/default/xui/zh/floater_fs_area_search.xml b/indra/newview/skins/default/xui/zh/floater_fs_area_search.xml
index bb838adf34..923c5b25e1 100644
--- a/indra/newview/skins/default/xui/zh/floater_fs_area_search.xml
+++ b/indra/newview/skins/default/xui/zh/floater_fs_area_search.xml
@@ -20,7 +20,7 @@
 				<fs_scroll_list.columns name="creator" label="創造者" width="90" />
 				<fs_scroll_list.columns name="last_owner" label="前所有者" width="90" tool_tip="物件的上一個所有者。" />
 			</fs_scroll_list>
-			<button name="Refresh" label="重新整理" />
+			<button name="Refresh" label="更新" />
 			<text name="counter" left_delta="110">
 				已列出 | 待處理 | 總計
 			</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_fs_vram_usage.xml b/indra/newview/skins/default/xui/zh/floater_fs_vram_usage.xml
index 3d317dd7a0..a9c6e968d3 100644
--- a/indra/newview/skins/default/xui/zh/floater_fs_vram_usage.xml
+++ b/indra/newview/skins/default/xui/zh/floater_fs_vram_usage.xml
@@ -10,5 +10,5 @@
 		<column name="vram_usage" label="紋理視訊記憶體佔用KB" />
 		<column name="vram_usage_vbo" label="VBO視訊記憶體佔用KB" />
 	</scroll_list>
-	<button label="重新整理" label_selected="重新整理" name="refresh_button" />
+	<button label="更新" label_selected="更新" name="refresh_button" />
 </floater>
\ No newline at end of file
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 b11636a36f..c417df74b1 100644
--- a/indra/newview/skins/default/xui/zh/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
@@ -2,7 +2,7 @@
 <floater name="godtools floater" title="神之工具">
 	<tab_container name="GodTools Tabs">
 		<panel label="類比網路" name="grid">
-			<button label="重新整理這個區域的地圖可視快取" label_selected="重新整理這個區域的地圖可視快取" name="Flush This Region's Map Visibility Caches" />
+			<button label="更新這個區域的地圖可視快取" label_selected="更新這個區域的地圖可視快取" name="Flush This Region's Map Visibility Caches" />
 		</panel>
 		<panel label="區域" name="region">
 			<text name="Region Name:">
@@ -40,7 +40,7 @@
 			<text name="land cost text">
 				每平方公尺 L$：
 			</text>
-			<button label="重新整理" label_selected="重新整理" name="Refresh" tool_tip="點擊這裡重新整理上列資料" />
+			<button label="更新" label_selected="更新" name="Refresh" tool_tip="點擊這裡更新上列資料" />
 			<button label="應用" label_selected="應用" name="Apply" tool_tip="點擊此處以接受應用上述變更" />
 			<button label="選擇區域" label_selected="選擇區域" name="Select Region" tool_tip="以土地工具選擇整個區域" />
 			<button label="立即自動儲存" label_selected="立即自動儲存" name="Autosave now" tool_tip="儲存 gzip 壓縮狀態至自動儲存目錄" />
diff --git a/indra/newview/skins/default/xui/zh/floater_linkreplace.xml b/indra/newview/skins/default/xui/zh/floater_linkreplace.xml
index 5acd5d67b1..60921980f0 100644
--- a/indra/newview/skins/default/xui/zh/floater_linkreplace.xml
+++ b/indra/newview/skins/default/xui/zh/floater_linkreplace.xml
@@ -33,6 +33,6 @@
 	<text name="status_text">
 		準備就緒...
 	</text>
-	<button name="btn_refresh" label="重新整理" />
+	<button name="btn_refresh" label="更新" />
 	<button name="btn_start" label="開始" />
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
index 56a21ead74..c42fb2ed0b 100644
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
@@ -38,7 +38,7 @@
 		<text name="messaging_status">
 			角色：
 		</text>
-		<button label="重新整理清單" name="refresh_objects_list" />
+		<button label="更新清單" name="refresh_objects_list" />
 		<button label="全選" name="select_all_objects" />
 		<button label="全都不選" name="select_none_objects" />
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
index 56c1df7e39..dfbe83cadd 100644
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
@@ -129,7 +129,7 @@
 		<text name="messaging_status">
 			聯結集：
 		</text>
-		<button label="重新整理清單" name="refresh_objects_list" />
+		<button label="更新清單" name="refresh_objects_list" />
 		<button label="全選" name="select_all_objects" />
 		<button label="全都不選" name="select_none_objects" />
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
index fef9719171..eee923770a 100644
--- a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
@@ -13,12 +13,12 @@
 		低
 	</text>
 	<slider label="最大鄰近光源數：" name="MaxLights" />
-	<check_box label="啟用垂直同步" tool_tip="將影格速率與顯示器的重新整理率同步，可能會增加卡頓和輸入延遲。" name="vsync" />
+	<check_box label="啟用垂直同步" tool_tip="將影格速率與顯示器的更新率同步，可能會導致更多的卡頓和輸入延遲。" name="vsync" />
 	<text name="AvatarText">
 		化身
 	</text>
 	<text name="AvatarComplexityModeLabel">
-		化身示：
+		化身顯示：
 	</text>
 	<combo_box name="AvatarComplexityMode">
 		<combo_box.item label="按複雜度限制" name="0" />
@@ -54,6 +54,16 @@
 	<combo_box label="反鋸齒" name="fsaa">
 		<combo_box.item label="禁用" name="FSAADisabled" />
 		<combo_box.item label="FXAA" name="FXAA" />
+		<combo_box.item label="SMAA" name="SMAA"/>
+	</combo_box>
+	<text name="antialiasing quality label">
+		反鋸齒品質：
+	</text>
+	<combo_box label="反鋸齒" name="fsaa quality">
+		<combo_box.item label="低" name="Low"/>
+		<combo_box.item label="中" name="Medium"/>
+		<combo_box.item label="高" name="High"/>
+		<combo_box.item label="超高" name="Ultra"/>
 	</combo_box>
 	<text name="MeshText">
 		網格模型
@@ -87,6 +97,7 @@
 	</text>
 	<check_box label="環境光遮蔽" name="UseSSAO" />
 	<check_box label="景深" name="UseDoF" />
+	<check_box label="HDR和自發光" name="VintageMode"/>
 	<text name="RenderShadowDetailText">
 		陰影：
 	</text>
@@ -128,6 +139,15 @@
 		<combo_box.item label="高" name="1" />
 		<combo_box.item label="超高" name="0" />
 	</combo_box>
+	<slider label="銳化：" name="RenderSharpness"/>
+	<text name="TonemapTypeText">
+		色調映射器：
+	</text>
+	<combo_box name="TonemapType">
+		<combo_box.item label="Khronos 中性" name="0"/>
+		<combo_box.item label="ACES" name="1"/>
+	</combo_box>
+	<slider label="色調映射混合：" tool_tip="在線性與色調映射顏色之間進行混合" name="TonemapMix"/>
 	<!-- End of mirror settings -->
 	<button label="重設為我們建議的設定" name="Defaults" />
 	<button label="確定" label_selected="確定" name="OK" />
diff --git a/indra/newview/skins/default/xui/zh/floater_region_tracker.xml b/indra/newview/skins/default/xui/zh/floater_region_tracker.xml
index 6525ef4ea9..622a317b4c 100644
--- a/indra/newview/skins/default/xui/zh/floater_region_tracker.xml
+++ b/indra/newview/skins/default/xui/zh/floater_region_tracker.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="region_tracker" title="區域追蹤器">
 	<text name="region_label_text" value="向地圖新增區域" />
-	<button name="refresh" tool_tip="重新整理" />
+	<button name="refresh" tool_tip="更新" />
 	<button name="remove" tool_tip="移除區域" />
 	<button name="open_map" tool_tip="顯示地圖" />
 	<scroll_list name="region_list" tool_tip="雙擊條目以在地圖上顯示區域。">
diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
index 241da0b51b..6a0d6e5826 100644
--- a/indra/newview/skins/default/xui/zh/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
@@ -40,7 +40,7 @@
 		無法存入電腦。
 	</string>
 	<view name="controls_container">
-		<button label="重新整理" name="new_snapshot_btn" />
+		<button label="更新" name="new_snapshot_btn" />
 		<panel name="advanced_options_panel">
 			<text name="layer_type_label">
 				取得快照：
@@ -54,7 +54,7 @@
 			<check_box label="L$帳戶餘額" name="currency_check" />
 			<check_box label="HUD" name="hud_check" />
 			<check_box label="將影格凍結（全螢幕）" name="freeze_frame_check" />
-			<check_box label="自動重新整理" name="auto_snapshot_check" />
+			<check_box label="自動更新" name="auto_snapshot_check" />
 			<check_box label="無後期處理" name="no_post_check" />
 			<text name="filter_list_label">
 				濾鏡：
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index b5aff584fe..ba55168a9f 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -529,8 +529,9 @@
 		<panel label="內容" name="Contents">
 			<button label="新指令碼" label_selected="新指令碼" name="button new script" />
 			<button label="權限" name="button permissions" />
-			<button label="重新整理" name="button refresh" />
+			<button label="更新" name="button refresh" />
 			<button label="重設指令碼" name="btn_reset_scripts" />
+			<filter_editor label="輸入篩選文字" name="contents_filter"/>
 		</panel>
 	</tab_container>
 	<panel name="land info panel">
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 5c605faa03..4a28aa040a 100644
--- a/indra/newview/skins/default/xui/zh/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
@@ -56,7 +56,7 @@
 		地塊：
 	</text>
 	<button label="過濾器" name="filter_parcel_btn" />
-	<button label="重新整理" name="refresh_btn" />
+	<button label="更新" name="refresh_btn" />
 	<button label="退回所選擇的" name="return_selected_btn" />
 	<button label="全部退回" name="return_all_btn" />
 	<button label="傳送到" name="teleport_to_btn" />
diff --git a/indra/newview/skins/default/xui/zh/floater_ui_preview.xml b/indra/newview/skins/default/xui/zh/floater_ui_preview.xml
index 616856a09a..d70ccddf04 100644
--- a/indra/newview/skins/default/xui/zh/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_ui_preview.xml
@@ -25,7 +25,7 @@
 		<button label="顯示" name="display_floater_2" tool_tip="顯示由選定XML檔案定義的XUI浮動視窗" />
 		<button label="隱藏" name="close_displayed_floater_2" tool_tip="關閉當前顯示的浮動視窗（如果存在）。" />
 		<button label="匯出架構" name="export_schema" />
-		<button label="重新整理" name="refresh_btn" />
+		<button label="更新" name="refresh_btn" />
 		<check_box label="顯示矩形" name="show_rectangles" />
 		<scroll_list label="名稱" name="name_list">
 			<scroll_list.columns label="標題" name="title_column" />
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 4c8eb94f3f..9f102af78b 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
@@ -30,7 +30,7 @@
 	<menu_item_call label="隱藏" name="Derender" />
 	<menu_item_call label="永久隱藏 &amp; 封鎖" name="DerenderPermanent" />
 	<menu_item_call label="修改紋理" name="Debug..." />
-	<menu_item_call label="重新整理紋理" name="Texture Refresh" />
+	<menu_item_call label="更新紋理" name="Texture Refresh" />
 	<context_menu label="另存為" name="Export Menu">
 		<menu_item_call label="備份" name="Backup" />
 		<menu_item_call label="Collada" name="Collada" />
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 af83d68ee5..d55d67f1c6 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
@@ -56,7 +56,7 @@
 	<menu_item_call label="隱藏" name="Derender" />
 	<menu_item_call label="永久隱藏 &amp; 封鎖" name="DerenderPermanent" />
 	<menu_item_call label="除錯紋理" name="Debug..." />
-	<menu_item_call label="重新整理紋理" name="Texture Refresh" />
+	<menu_item_call label="更新紋理" name="Texture Refresh" />
 	<menu_item_call label="丟在地上" name="Drop" />
 	<menu_item_call label="封鎖粒子所有者" name="Mute Particle" />
 </context_menu>
\ No newline at end of file
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 1c7950bc4d..1bc09896ce 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
@@ -27,6 +27,6 @@
 	<menu_item_call label="永久隱藏 &amp; 封鎖" name="DerenderPermanent" />
 	<menu_item_call label="指令碼資訊" name="ScriptInfo" />
 	<menu_item_call label="除錯紋理" name="Debug..." />
-	<menu_item_call label="重新整理紋理" name="Texture Refresh" />
+	<menu_item_call label="更新紋理" name="Texture Refresh" />
 	<menu_item_call label="封鎖粒子所有者" name="Mute Particle" />
 </context_menu>
\ No newline at end of file
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 29929a6dec..de30d008c6 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
@@ -39,7 +39,7 @@
 	</context_menu>
 	<menu_item_call label="指令碼資訊" name="ScriptInfo" />
 	<menu_item_call label="除錯紋理" name="Debug..." />
-	<menu_item_call label="重新整理紋理" name="Texture Refresh" />
+	<menu_item_call label="更新紋理" name="Texture Refresh" />
 	<menu_item_call label="轉儲 XML" name="Dump XML" />
 	<menu_item_call label="封鎖粒子所有者" name="Mute Particle" />
 </context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
index c83a0b7c45..1b5a7eef1c 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -2,7 +2,7 @@
 <menu name="Popup">
 	<menu_item_call label="建立刊登" name="Marketplace Create Listing" />
 	<menu_item_call label="關聯刊登" name="Marketplace Associate Listing" />
-	<menu_item_call label="取得（重新整理）刊登" name="Marketplace Get Listing" />
+	<menu_item_call label="取得（更新）刊登" name="Marketplace Get Listing" />
 	<menu_item_call label="檢查是否有誤" name="Marketplace Check Listing" />
 	<menu_item_call label="編輯刊登" name="Marketplace Edit Listing" />
 	<menu_item_call label="刊登" name="Marketplace List" />
@@ -89,7 +89,7 @@
 	<menu_item_call label="縮圖..." name="thumbnail" />
 	<menu_item_call label="鎖定檔案夾" name="ProtectFolder" />
 	<menu_item_call label="解鎖檔案夾" name="UnprotectFolder" />
-	<menu_item_call label="重新整理檔案夾" name="ReloadFolder" />
+	<menu_item_call label="更新檔案夾" name="ReloadFolder" />
 	<menu_item_call label="複製資源UUID" name="Copy Asset UUID" />
 	<menu_item_call label="還原至之前的位置" name="Restore to Last Position" />
 	<menu_item_call label="剪下" name="Cut" />
@@ -132,7 +132,7 @@
 	<menu_item_call label="打開" name="open_in_current_window" />
 	<menu_item_call label="在新視窗中打開" name="open_in_new_window" />
 	<menu_item_call label="新增" name="Wearable Add" />
-	<menu_item_call label="重新整理紋理" name="Texture Refresh Attachment" />
+	<menu_item_call label="更新紋理" name="Texture Refresh Attachment" />
 	<menu_item_call label="脫下" name="Take Off" />
 	<menu_item_call label="僅應用到我自己" name="Settings Apply Local" />
 	<menu_item_call label="應用到地塊" name="Settings Apply Parcel" />
diff --git a/indra/newview/skins/default/xui/zh/menu_object.xml b/indra/newview/skins/default/xui/zh/menu_object.xml
index 5fdb71b578..d7e341f249 100644
--- a/indra/newview/skins/default/xui/zh/menu_object.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object.xml
@@ -35,7 +35,7 @@
 		<menu_item_call label="封鎖" name="Object Mute" />
 		<menu_item_call label="解除封鎖" name="Object Unmute" />
 	</context_menu>
-	<menu_item_call label="重新整理紋理" name="Texture Refresh" />
+	<menu_item_call label="更新紋理" name="Texture Refresh" />
 	<menu_item_call label="隱藏" name="Derender" />
 	<menu_item_call label="永久隱藏&amp;封鎖" name="DerenderPermanent" />
 	<menu_item_call label="退回" name="Return..." />
diff --git a/indra/newview/skins/default/xui/zh/menu_pie_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_pie_attachment_other.xml
index 0a1128f443..83aa7d09cb 100644
--- a/indra/newview/skins/default/xui/zh/menu_pie_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_pie_attachment_other.xml
@@ -22,7 +22,7 @@
 			<pie_slice label="指令碼資訊" name="ScriptInfo" />
 			<pie_slice label="語音通話" name="Call" />
 			<pie_slice label="放大" name="Zoom In" />
-			<pie_slice label="重新整理紋理" name="Texture Refresh" />
+			<pie_slice label="更新紋理" name="Texture Refresh" />
 			<pie_menu name="ResetMenu" label="重設 &gt;">
 				<pie_slice label="骨架和動畫" name="Reset Skeleton And Animations" />
 				<pie_slice label="骨架" name="Reset Skeleton" />
diff --git a/indra/newview/skins/default/xui/zh/menu_pie_attachment_self.xml b/indra/newview/skins/default/xui/zh/menu_pie_attachment_self.xml
index 5c8df738f0..34d3ae1b08 100644
--- a/indra/newview/skins/default/xui/zh/menu_pie_attachment_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_pie_attachment_self.xml
@@ -3,7 +3,7 @@
 	<pie_slice label="檢視檔案" name="Profile..." />
 	<pie_slice label="丟在地上" name="Drop" />
 	<pie_menu name="Attachment Pie More" label="更多 &gt;">
-		<pie_slice label="重新整理紋理" name="Texture Refresh" />
+		<pie_slice label="更新紋理" name="Texture Refresh" />
 		<pie_slice label="指令碼資訊" name="ScriptInfo" />
 		<pie_slice label="觸碰" name="Attachment Object Touch" />
 		<pie_menu name="DerenderMenu" label="隱藏 &gt;">
diff --git a/indra/newview/skins/default/xui/zh/menu_pie_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_pie_avatar_other.xml
index a2d31ccce3..259dff7b92 100644
--- a/indra/newview/skins/default/xui/zh/menu_pie_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_pie_avatar_other.xml
@@ -22,7 +22,7 @@
 			<pie_slice label="指令碼資訊" name="ScriptInfo" />
 			<pie_slice label="語音通話" name="Call" />
 			<pie_slice label="放大" name="Zoom In" />
-			<pie_slice label="重新整理紋理" name="Texture Refresh" />
+			<pie_slice label="更新紋理" name="Texture Refresh" />
 			<pie_menu label="重設 &gt;" name="ResetMenu">
 				<pie_slice label="骨架和動畫" name="Reset Skeleton And Animations" />
 				<pie_slice label="骨架" name="Reset Skeleton" />
diff --git a/indra/newview/skins/default/xui/zh/menu_pie_avatar_self.xml b/indra/newview/skins/default/xui/zh/menu_pie_avatar_self.xml
index c68b490105..87ddc68bf3 100644
--- a/indra/newview/skins/default/xui/zh/menu_pie_avatar_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_pie_avatar_self.xml
@@ -55,7 +55,7 @@
 			<pie_slice label="骨架" name="Reset Skeleton" />
 			<pie_slice label="網格細節層次" name="Reset Mesh LOD" />
 		</pie_menu>
-		<pie_slice label="重新整理紋理" name="Texture Refresh" />
+		<pie_slice label="更新紋理" name="Texture Refresh" />
 		<pie_slice label="編輯我的裝扮" name="Edit My Outfit" />
 		<pie_slice label="轉儲 XML" name="Dump XML" />
 		<pie_slice label="懸浮高度" name="Hover Height" />
diff --git a/indra/newview/skins/default/xui/zh/menu_pie_object.xml b/indra/newview/skins/default/xui/zh/menu_pie_object.xml
index 4ba3145b2c..d77f995985 100644
--- a/indra/newview/skins/default/xui/zh/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/zh/menu_pie_object.xml
@@ -44,7 +44,7 @@
 		<pie_slice label="退回" name="Return..." />
 		<pie_menu label="更多 &gt;" name="Object Pie More 2">
 			<pie_menu name="ResetMenu" label="重設 &gt;">
-				<pie_slice label="重新整理紋理" name="Texture Refresh" />
+				<pie_slice label="更新紋理" name="Texture Refresh" />
 				<pie_slice label="骨架" name="Reset Skeleton" />
 			</pie_menu>
 			<pie_menu name="DerenderMenu" label="隱藏 &gt;">
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index efc2e9e786..3e35bef714 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -54,8 +54,8 @@
 			<menu_item_call label="化身不變形" name="undeform_avatar" />
 			<menu_item_call label="重設骨架" name="Reset Skeleton" />
 			<menu_item_call label="重設骨架和動畫" name="Reset Skeleton And Animations" />
-			<menu_item_call label="強制重新整理外觀(烘焙)" name="Rebake Texture" />
-			<menu_item_call label="重新整理附件" name="Refresh Attachments" />
+			<menu_item_call label="強制更新外觀(烘焙)" name="Rebake Texture" />
+			<menu_item_call label="更新附件" name="Refresh Attachments" />
 			<menu_item_call label="重設為預設男性化身" name="ResetDefaultAvM" />
 			<menu_item_call label="重設為預設女性化身" name="ResetDefaultAvF" />
 			<menu_item_check label="顯示化身複雜性資訊" name="Avatar Draw Info" />
@@ -305,7 +305,7 @@
 	</menu>
 	<menu label="進階" name="Advanced">
 		<menu_item_call label="重新烘焙紋理" name="Rebake Texture" />
-		<menu_item_call label="重新整理附件" name="Refresh Attachments" />
+		<menu_item_call label="更新附件" name="Refresh Attachments" />
 		<menu_item_call label="以預設值設定UI大小" name="Set UI Size to Default" />
 		<menu_item_call label="設定視窗大小" name="Set Window Size..." />
 		<menu_item_check label="限制選擇距離" name="Limit Select Distance" />
@@ -511,8 +511,9 @@
 			<menu_item_check label="禁用紋理" name="Disable Textures" />
 			<menu_item_call label="不顯示動畫" name="Derender Animesh" />
 			<menu_item_check label="全解析度紋理(有風險)" name="Full Res Textures" />
-			<menu_item_check label="使附著燈光彩現" name="Render Attached Lights" />
-			<menu_item_check label="使附著粒子彩現" name="Render Attached Particles" />
+			<menu_item_check label="彩現附著的燈光" name="Render Attached Lights" />
+			<menu_item_check label="彩現附著的粒子" name="Render Attached Particles" />
+			<menu_item_check label="收集字體頂點緩衝區" name="Collect Font Vertex Buffers"/>
 			<menu_item_check label="啟用著色器快取" name="Enable Shader Cache" />
 			<menu_item_call label="清除著色器快取" name="Shader Cache Clear" />
 		</menu>
@@ -587,7 +588,7 @@
 			<menu_item_call label="顯示顏色設定" name="Color Settings" />
 			<menu_item_call label="XUI 預覽工具" name="UI Preview Tool" />
 			<menu_item_call label="傳送測試訊息" name="Send Test IMs" />
-			<menu_item_call label="重新整理名稱快取" name="Flush Names Caches" />
+			<menu_item_call label="更新名稱快取" name="Flush Names Caches" />
 		</menu>
 		<menu label="化身" name="Character">
 			<menu label="抓取已烘焙紋理" name="Grab Baked Texture">
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 0218369994..c897658ee7 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -3716,6 +3716,7 @@ URL：[AUDIOURL]
 [[URL] 點擊這裡]繼續訂閱。
 
 付費使用者請[[PREMIUM_URL] 點擊這裡]領取免費變聲工具。
+		<usetemplate ignoretext="提醒我語音變聲即將過期" name="okignore" yestext="確定"/>
 	</notification>
 	<notification name="VoiceEffectsWillExpire">
 		至少一個你訂閱的變聲效果將在 [INTERVAL] 天后到期。
@@ -5044,7 +5045,7 @@ switch語句在沒有預設標籤情況下的行為不正確已被修正。
 		地形已烘焙。
 	</notification>
 	<notification name="TenObjectsDisabledPlzRefresh">
-		只成功停用前 10 個所選物件。 若有需要，請重新整理之後再選擇更多的物件。
+		只成功停用前 10 個所選物件。 若有需要，請更新之後再選擇更多的物件。
 	</notification>
 	<notification name="UpdateViewerBuyParcel">
 		你必須先更新檢視器後，才可購買這個地塊。
diff --git a/indra/newview/skins/default/xui/zh/panel_ao.xml b/indra/newview/skins/default/xui/zh/panel_ao.xml
index 418419306a..c5362339b3 100644
--- a/indra/newview/skins/default/xui/zh/panel_ao.xml
+++ b/indra/newview/skins/default/xui/zh/panel_ao.xml
@@ -33,7 +33,7 @@
 	<panel name="ao_reload_cover">
 		<panel name="ao_reload_text_panel">
 			<text name="reload_label">
-				重新整理
+				更新
 			</text>
 			<text name="wait_label">
 				請稍候
diff --git a/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml b/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml
index 2bfcdea9cd..08f0669793 100644
--- a/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml
@@ -9,9 +9,9 @@
 	</combo_box>
 	<check_box label="保持縱橫比" name="keep_aspect_ratio" />
 	<text name="working_lbl">
-		重新整理...
+		更新...
 	</text>
-	<button label="重新整理" name="new_snapshot_btn" tool_tip="點擊即可重新整理" />
+	<button label="更新" name="new_snapshot_btn" tool_tip="點擊即可更新" />
 	<button label="預覽" name="big_preview_btn" tool_tip="點擊即可切換預覽" />
 	<text name="title_label">
 		標題：
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 3dea0d3b8a..fa2f37c5ae 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
@@ -18,7 +18,7 @@
 		<scroll_list.columns label="日期" name="date" />
 	</scroll_list>
 	<button label="新通知" name="create_new_notice" tool_tip="建立一個新通知" />
-	<button name="refresh_notices" tool_tip="重新整理通知清單。" />
+	<button name="refresh_notices" tool_tip="更新通知清單。" />
 	<text name="notice_list_none_found">
 		沒發現。
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/zh/panel_performance_autoadjustments.xml
index c91a89c878..cb89a26c28 100644
--- a/indra/newview/skins/default/xui/zh/panel_performance_autoadjustments.xml
+++ b/indra/newview/skins/default/xui/zh/panel_performance_autoadjustments.xml
@@ -37,7 +37,7 @@
 	</radio_group>
 	<check_box label="啟用垂直同步" name="vsync" tool_tip="啟用垂直同步來減少螢幕撕裂和斷裂。" />
 	<text name="vsync_desc">
-		將顯示器的重新整理率與影格率同步。
+		將顯示器的更新率與影格率同步。
 	</text>
 	<text name="vsync_desc_limit">
 		注意：啟用垂直同步會將影格率限制在[FPS_LIMIT]fps。
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
index 87ce37fe8a..dc74b01331 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
@@ -68,7 +68,7 @@
 				<combo_box name="UseLegacyClienttags">
 					<combo_box.item name="Don't use a list" label=" 否" />
 					<combo_box.item name="Local Clienttags" label=" 靜態列表" />
-					<combo_box.item name="Download Clienttags" label=" 每次啟動都重新整理列表" />
+					<combo_box.item name="Download Clienttags" label=" 每次啟動都更新列表" />
 				</combo_box>
 			</panel>
 		</panel>
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 b03823a946..fb0d6014e3 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_firestorm.xml
@@ -65,14 +65,14 @@
 			<button name="BeamColor_delete" label="刪除" tool_tip="刪除此顏色預設" />
 			<combo_box name="BeamColor_combo" tool_tip="選擇光束的顏色" left_delta="80" width="160" />
 			<button name="BeamColor_new" label="建立.." tool_tip="建立新的顏色預設" />
-			<button name="BeamColor_refresh" label="重新整理" tool_tip="重新整理預設列表" />
+			<button name="BeamColor_refresh" label="更新" tool_tip="更新預設列表" />
 			<slider name="FSMaxBeamsPerSecond" label="頻率：" tool_tip="每秒更新光束的頻率。預設為 40" />
 			<check_box label="啟用選擇光束" name="SLPartBeam" />
 			<check_box label="將選擇傳送到聊天視窗" name="FSParticleChat" tool_tip="將選擇的資料（起始時間、結束時間和全域坐標）傳送到聊天頻道 9000。" />
 			<combo_box name="FSBeamShape_combo" tool_tip="選擇光束的形狀" />
 			<button name="delete_beam" label="刪除" width="75" tool_tip="刪除此形狀" />
 			<button name="custom_beam_btn" label="建立.." tool_tip="建立新的光束形狀" />
-			<button name="refresh_beams" label="重新整理" tool_tip="重新整理形狀列表" />
+			<button name="refresh_beams" label="更新" tool_tip="更新形狀列表" />
 			<slider name="FSBeamShapeScale" label="比例：" tool_tip="修改所用形狀的比例" label_width="50" width="200" />
 			<text name="BridgeProtocols">內建外部協定到 LSL 橋：</text>
 			<check_box label="允許 OpenCollar 控制內建動畫涵蓋的啟用或禁用" name="BridgeIntegrationOC" />
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 e43df96cf6..ac8f1b0c35 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -115,31 +115,60 @@
 			<button label="刪除" name="PrefDeleteButton" />
 		</panel>
 		<panel label="硬體設定" name="Hardware Settings">
-			<check_box label="各向異性過濾（啟用後速度變慢）" name="ani" tool_tip="將影格率同步到顯示器的重新整理率，可能會導致增加的卡頓和輸入延遲" />
+			<check_box label="各向異性過濾（啟用後速度變慢）" name="ani" tool_tip="將影格率同步到顯示器的更新率，可能會導致增加的卡頓和輸入延遲" />
 			<text name="tc label">
 				啟用有損紋理壓縮（S3TC）:
 			</text>
 			<check_box label="啟用無失真紋理壓縮（需要重新啟動）" name="texture compression" tool_tip="在視訊記憶體中啟用紋理壓縮可以載入更高解析度的紋理並支援更多紋理的情況下，記憶體使用效率更高。" />
 			<check_box label="啟用HiDPI螢幕支援（僅適用於Mac OSX；需要重新啟動）" name="use HiDPI" tool_tip="啟用OpenGL以支援高解析度顯示。" />
-			<text name="Antialiasing:" tool_tip="在某些硬體上更改此設定可能需要重新啟動。">
+			<text name="antialiasing label" tool_tip="在某些硬體上更改此設定可能需要重新啟動。">
 				反鋸齒（建議重新啟動）：
 			</text>
-			<combo_box label="反鋸齒" name="fsaa">
+			<text name="antialiasing quality label" tool_tip="在某些硬體上更改此設定可能需要重新啟動。">
+				反鋸齒品質：
+			</text>
+			<combo_box name="fsaa">
 				<combo_box.item label="禁用" name="FSAADisabled" />
 				<combo_box.item label="FXAA" name="FXAA" />
+				<combo_box.item label="SMAA" name="SMAA"/>
 			</combo_box>
+			<combo_box label="反鋸齒" name="fsaa quality">
+				<combo_box.item label="低" name="Low"/>
+				<combo_box.item label="中" name="Medium"/>
+				<combo_box.item label="高" name="High"/>
+				<combo_box.item label="超高" name="Ultra"/>
+			</combo_box>
+			<check_box label="限制視訊記憶體使用量 (MB)" name="FSLimitTextureVRAMUsage" tool_tip="限制用於紋理的視訊記憶體總量。整體使用量可能仍然更高，因為其他元素也會使用記憶體。"/>
+			<slider name="RenderMaxVRAMBudget" tool_tip="用於紋理的最大視訊記憶體數量（以兆字節為單位）。"/>
 			<text name="advanced_settings">
 				進階設定（需要重新啟動）：
 			</text>
-			<check_box label="涵蓋VRAM檢測" name="FSOverrideVRAMDetection" tool_tip="允許使用者涵蓋視訊記憶體檢測（極度謹慎使用）" />
+			<check_box label="涵蓋視訊記憶體檢測" name="FSOverrideVRAMDetection" tool_tip="允許使用者涵蓋視訊記憶體檢測（極度謹慎使用）" />
 			<slider label="涵蓋GPU專用視訊記憶體（GB）：" name="FSForcedVideoMemory" tool_tip="重要：極度謹慎使用。 涵蓋GPU上檢測到的視訊記憶體。 這不應包括作為系統RAM一部分的「共享」視訊記憶體。 如果您不理解這個區別，請不要使用此控制項。" />
 		</panel>
+		<text name="automatic_texture_downscale_settings">
+			自動纹理縮減：
+		</text>
+		<text name="TextureDiscardBackgroundedTime_label" tool_tip="非活動視窗時，在選定秒數後縮減纹理。">
+			在背景中（0 為停用）
+		</text>
+		<spinner name="TextureDiscardBackgroundedTime" tool_tip="非活動視窗時，在選定秒數後縮減纹理。"/>
+		<text name="TextureDiscardBackgroundedTime_seconds">
+			秒
+		</text>
+		<text name="TextureDiscardMinimizedTime_label" tool_tip="最小化時，在選定秒數後縮減纹理。">
+			最小化（0 為停用）
+		</text>
+		<spinner name="TextureDiscardMinimizedTime" tool_tip="最小化時，在選定秒數後縮減纹理。"/>
+		<text name="TextureDiscardMinimizedTime_seconds">
+			秒
+		</text>
 		<panel label="彩現" name="Rendering">
 			<text name="World Updating">世界更新：</text>
 			<check_box label="暫停世界更新 (使所有內容暫停)" tool_tip="勾選此項可暫停來自世界的所有更新- 這將暫停所有視覺操作，但不會影響書面或語音聊天" name="WorldPause" />
 			<check_box label="限制影格率" name="FSLimitFramerate" />
 			<slider label="FPS：" name="MaxFPS" />
-			<check_box label="啟用垂直同步" name="vsync" tool_tip="將影格速率與顯示器重新整理率同步，可能會導致延遲增加和圖像卡頓。" />
+			<check_box label="啟用垂直同步" name="vsync" tool_tip="將影格速率與顯示器更新率同步，可能會導致延遲增加和圖像卡頓。" />
 			<text name="Texture Rendering">紋理彩現：</text>
 			<check_box label="載入最小紋理" tool_tip="設定「紋理禁用」參數-紋理載入速度極慢，可能對GPU較慢的電腦有用" name="TexturesLoaded" />
 			<check_box label="使用HTTP載入紋理" tool_tip="啟用通過HTTP協定載入紋理-如果出現紋理載入緩慢或不正確的問題，並且要使用過時的UDP協定，則禁用此選項。" name="TexturesHTTP" />
@@ -163,9 +192,10 @@
 				<combo_box.item label="低" name="4" />
 				<combo_box.item label="無紋理" name="5" />
 			</combo_box>
+			<text name="Miscellaneous Rendering">雜項彩現：</text>
+			<check_box label="HDR與自發光" tool_tip="在較新設備上啟用額外渲染管線功能，例如HDR與在PBR內容中使用的自發光纹理。" name="VintageMode"/>
 			<text name="Alpha Mask Rendering">Alpha遮色片彩現：</text>
 			<check_box label="啟用Alpha遮色片" tool_tip="勾選此項可以使Alpha遮色片（透明部分）正確彩現" name="RenderAutoMaskAlphaDeferred" />
-			<text name="Miscellaneous Rendering">其他：</text>
 			<check_box label="光暈" tool_tip="啟用光暈。請注意，如果陰影被啟用，強度必須設為0才能禁用光暈。" name="RenderGlow" />
 			<slider label="強度：" tool_tip="光暈的強度。較高的值會使其更散射和更柔和（預設為2）" name="glow_strength" />
 			<check_box label="顯示尚未載入完成的化身" name="RenderUnloadedAvatars" />
@@ -176,6 +206,15 @@
 			<text name="PrecachingDelayText">秒</text>
 			<slider label="陰影品質" tool_tip="陰影的品質（預設為1）" name="ShadowResolution" />
 			<slider label="地形紋理彩現比例 (需要重新啟動)" name="RenderTerrainScale" tool_tip="確定地形紋理的彩現比例-較低的值更壓縮（需要重新啟動）" />
+			<slider label="銳化：" name="RenderSharpness"/>
+			<text name="TonemapTypeText">
+				色調映射器：
+			</text>
+			<combo_box name="TonemapType">
+				<combo_box.item label="Khronos中性" name="0"/>
+				<combo_box.item label="ACES" name="1"/>
+			</combo_box>
+			<slider label="色調映射混合：" tool_tip="在線性與色調映射顏色之間進行混合" name="TonemapMix"/>
 		</panel>
 		<panel label="景深" name="DOF panel">
 			<check_box label="啟用景深 (除了相機的焦點外，使視圖模糊)" name="UseDoF" />
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_opensim.xml b/indra/newview/skins/default/xui/zh/panel_preferences_opensim.xml
index f7df933c9d..582991888a 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_opensim.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_opensim.xml
@@ -11,7 +11,7 @@
 				<scroll_list.columns label="類比網路名稱" name="grid_label" />
 				<scroll_list.columns label="連線位址" name="login_uri" />
 			</scroll_list>
-			<button label="重新整理" name="refresh_grid" />
+			<button label="更新" name="refresh_grid" />
 			<button label="移除" name="remove_grid" />
 			<panel name="advanced_grid_panel">
 				<text name="grid_name_text">類比網路名稱：</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_rlv_locks.xml b/indra/newview/skins/default/xui/zh/panel_rlv_locks.xml
index 12da013b1a..1812c3fc41 100644
--- a/indra/newview/skins/default/xui/zh/panel_rlv_locks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_rlv_locks.xml
@@ -7,6 +7,6 @@
 		<scroll_list.columns label="限制源" name="lock_origin" />
 	</scroll_list>
 	<panel name="bottom_panel">
-		<button label="重新整理" name="refresh_btn" />
+		<button label="更新" name="refresh_btn" />
 	</panel>
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
index 9f6b684a68..0898578ad2 100644
--- a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
@@ -12,5 +12,5 @@
 		<scroll_list.columns label="物件名稱" width="230" name="name" />
 		<scroll_list.columns label="位置" width="170" name="location" />
 	</scroll_list>
-	<button label="重新整理清單" name="refresh_list_btn" />
+	<button label="更新清單" name="refresh_list_btn" />
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
index 1bb05d25c7..9f8c566649 100644
--- a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
@@ -14,7 +14,7 @@
 		<scroll_list.columns label="地塊" name="parcel" />
 		<scroll_list.columns label="位置" name="location" />
 	</scroll_list>
-	<button label="重新整理清單" name="refresh_list_btn" />
+	<button label="更新清單" name="refresh_list_btn" />
 	<button label="高亮顯示" name="highlight_btn" />
 	<button label="退回" name="return_btn" />
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/panel_tools_texture.xml b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
index 179644e329..2539cede61 100644
--- a/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
@@ -40,9 +40,9 @@
 		<combo_box.item label="媒體" name="Media" />
 	</combo_box>
 	<radio_group name="radio_material_type">
-		<radio_item label="紋理（漫反射圖）" name="Texture (diffuse)" />
-		<radio_item label="凹凸度（正交）" name="Bumpiness (normal)" />
-		<radio_item label="閃亮度（鏡反光）" name="Shininess (specular)" />
+		<radio_item label="紋理（漫反射）" name="Texture (diffuse)" />
+		<radio_item label="凹凸度（法線）" name="Bumpiness (normal)" />
+		<radio_item label="閃亮度（鏡反射）" name="Shininess (specular)" />
 	</radio_group>
 	<radio_group name="radio_pbr_type">
 		<radio_item label="完整材質" name="Complete material" />
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
index f7bf07754f..1ebc626e1d 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
@@ -11,7 +11,7 @@
 						收到的物件
 					</string>
 					<button label="收到的物件" name="inbox_btn" />
-					<button tool_tip="重新整理收到的物件列表" name="reload_received_items_btn" />
+					<button tool_tip="更新收到的物件列表" name="reload_received_items_btn" />
 					<text name="inbox_fresh_new_count">
 						[NUM] 項新的
 					</text>