diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_welcome_pack.xml b/indra/newview/skins/default/xui/zh/floater_avatar_welcome_pack.xml
new file mode 100644
index 0000000000..8867f070e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_welcome_pack.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Avatar Welcome Pack" title="化身入門禮包" />
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_chat_mention_picker.xml b/indra/newview/skins/default/xui/zh/floater_chat_mention_picker.xml
new file mode 100644
index 0000000000..03e43f97de
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_chat_mention_picker.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="chat_mention_picker" title="選擇居民" />
\ 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 3daaed641e..b6e51d8d18 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -19,6 +19,7 @@
 	<menu_item_call label="清空失物招領" name="Empty Lost And Found" />
 	<menu_item_call label="新檔案夾" name="New Folder" />
 	<menu_item_call label="新檔案夾" name="New Listing Folder" />
+	<menu_item_call label="新檔案夾" name="New Outfit Folder" />
 	<menu_item_call label="新裝扮" name="New Outfit" />
 	<menu_item_call label="新指令碼" name="New Script" />
 	<menu_item_call label="新記事卡" name="New Note" />
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index f44bf00e46..b9d059227d 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="全部卸下" name="Detach All" />
 		</menu>
 		<menu_item_call label="移除選定的附件" name="Remove Selected Attachments" />
+		<menu_item_call label="化身入門禮包" name="Avatar Welcome Pack"/>
 		<menu_item_call label="選擇化身" name="Avatar Picker" />
 		<menu_item_call label="懸浮高度" name="HoverHeight" />
 		<menu label="動作" name="Movement">
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 4bb123867a..03570f23ea 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -4573,7 +4573,10 @@ switch語句在沒有預設標籤情況下的行為不正確已被修正。
 		抱歉，無法凍結該使用者。
 	</notification>
 	<notification name="NowOwnObject">
-		你現在是物件 [OBJECT_NAME] 的所有者
+		你現在是物件 [OBJECT_NAME] 的所有者。
+	</notification>
+	<notification name="NowOwnObjectInv">
+		你現在是物件 [OBJECT_NAME] 的所有者 - 它已被放入您的庫存。
 	</notification>
 	<notification name="CantRezOnLand">
 		無法在 [OBJECT_POS] 產生物件，因為這土地的所有者不允許。  請用土地工具檢視所有者。
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 d88c118872..63e242b944 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
@@ -19,6 +19,10 @@
 			<text name="header_colors">發件人：</text>
 			<text name="chat_name_label">化身</text>
 			<text name="object_name_header_label">物件</text>
+			<text name="mention_colors">聊天中的提及:</text>
+			<text name="font_mention_label">字型</text>
+			<text name="resident_mention_label">居民</text>
+			<text name="self_mention_label">我</text>
 			<slider label="聊天超出範圍顏色衰減：" name="FSBeyondNearbyChatColorDiminishFactor" tool_tip="如果訊息的發件人不在附近，訊息的顏色衰減。" />
 			<check_box name="FSColorIMsDistinctly" label="在控制台中分別為私聊和群組聊天著色：" />
 			<panel name="im_color_panel">
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 242231723c..6145a827da 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -192,6 +192,15 @@
 			</combo_box>
 			<text name="Miscellaneous Rendering">雜項彩現：</text>
 			<check_box label="HDR與自發光" tool_tip="在較新設備上啟用額外彩現管線功能，例如HDR與在PBR內容中使用的自發光纹理。" name="VintageMode"/>
+			<text name="ExcludeAnimeshImposterLabel">
+				精簡化身時排除動畫網格(Animesh)：
+			</text>
+			<combo_box tool_tip="將動畫網格使用者或被操控的化身從精簡渲染機制中排除。" name="FSImpostorAvatarExclude">
+				<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>
 			<text name="Alpha Mask Rendering">Alpha遮色片彩現：</text>
 			<check_box label="啟用Alpha遮色片" tool_tip="勾選此項可以使Alpha遮色片（透明部分）正確彩現" name="RenderAutoMaskAlphaDeferred" />
 			<check_box label="光暈" tool_tip="啟用光暈。請注意，如果陰影被啟用，強度必須設為0才能禁用光暈。" name="RenderGlow" />
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 91204b3f86..57fded19ad 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
@@ -177,6 +177,10 @@
 			<button name="Prev_UISndStartIM" label="▶" tool_tip="播放此聲音。" />
 			<button name="Def_UISndStartIM" label="↻" tool_tip="重設。" />
 			<check_box label="啟用" name="PlayModeUISndStartIM" />
+			<text tool_tip="聊天中被提及音效的UUID。" name="textChatMention">聊天中提及：</text>
+			<button name="Prev_UISndChatMention" label="▶" tool_tip="播放此聲音。"/>
+			<button name="Def_UISndChatMention" label="↻" tool_tip="重設。"/>
+			<check_box label="啟用" name="PlayModeUISndChatMention"/>
 			<text tool_tip="建立新物件音效的UUID。" name="textFSObjectCreate">建立物件：</text>
 			<button name="Prev_UISndObjectCreate" label="▶" tool_tip="播放此聲音。" />
 			<button name="Def_UISndObjectCreate" label="↻" tool_tip="重設。" />
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 4e5b3be2b4..1453baa90f 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -29,10 +29,6 @@
 	<string name="APP_NAME_ABBR">
 		FS
 	</string>
-	<!-- starting up -->
-	<string name="StartupDetectingHardware">
-		硬體檢測中...
-	</string>
 	<string name="StartupLoading">
 		[APP_NAME]載入中...
 	</string>
@@ -682,6 +678,9 @@ support@secondlife.com.
 	<string name="TooltipCantCreateOutfit">
 		一個或者多個物件不能在"服裝目錄"中使用
 	</string>
+	<string name="TooltipCantMoveOutfitIntoOutfit">
+		無法將一套服裝移動到另一套服裝中
+	</string>
 	<string name="TooltipDragOntoOwnChild">
 		你不能將檔案夾移動到其子檔案夾內
 	</string>
@@ -6113,7 +6112,7 @@ support@secondlife.com.
 		編輯外觀
 	</string>
 	<string name="Command_Avatar_Label">
-		化身
+		化身入門禮包
 	</string>
 	<string name="Command_Build_Label">
 		建造