diff --git a/indra/newview/skins/default/xui/fr/floater_NACL_explore_sounds.xml b/indra/newview/skins/default/xui/fr/floater_NACL_explore_sounds.xml
index 184316743d..32213fdd35 100644
--- a/indra/newview/skins/default/xui/fr/floater_NACL_explore_sounds.xml
+++ b/indra/newview/skins/default/xui/fr/floater_NACL_explore_sounds.xml
@@ -22,4 +22,7 @@
 	<button label="Zoomer" name="look_at_btn"/>
 	<button label="Stop" name="stop_btn"/>
 	<button label="Blacklister" name="bl_btn"/>
+	<button label="Bloquer obj. portés AV" name="block_avatar_worn_sounds_btn"/>
+	<button label="Bloquer sons rezzés AV" name="block_avatar_rezzed_sounds_btn"/>
+	<button label="Bloquer sons gestes AV" name="block_avatar_gesture_sounds_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_fs_area_search.xml b/indra/newview/skins/default/xui/fr/floater_fs_area_search.xml
index e87cda5fd1..5ebf2ed6bc 100644
--- a/indra/newview/skins/default/xui/fr/floater_fs_area_search.xml
+++ b/indra/newview/skins/default/xui/fr/floater_fs_area_search.xml
@@ -68,6 +68,7 @@
 			<check_box name="exclude_childprim" label="Prims enfant"/>
 			<check_box name="exclude_neighbor_region" label="Régions voisines"/>
 			<button name="apply" label="Appliquer"/>
+			<button name="save_as_default" label="Enr. comme défaut"/>
 		</panel>
 		<panel label="Options" name="area_search_options_panel">
 			<text name="display_column">Afficher les colonnes :</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_fs_asset_blacklist.xml b/indra/newview/skins/default/xui/fr/floater_fs_asset_blacklist.xml
index 46b567d771..525969ed81 100644
--- a/indra/newview/skins/default/xui/fr/floater_fs_asset_blacklist.xml
+++ b/indra/newview/skins/default/xui/fr/floater_fs_asset_blacklist.xml
@@ -5,6 +5,10 @@
 	<floater.string name="asset_sound">Son</floater.string>
 	<floater.string name="asset_animation">Animation</floater.string>
 	<floater.string name="asset_resident">Résident</floater.string>
+	<floater.string name="blacklist_flag_mute_avatar_worn_objects_sounds">Sons obj. portés AV</floater.string>
+	<floater.string name="blacklist_flag_mute_avatar_rezzed_objects_sounds">Sons obj. rezzés AV</floater.string>
+	<floater.string name="blacklist_flag_mute_avatar_gestures_sounds">Sons gestes AV</floater.string>
+	<floater.string name="blacklist_flag_unknown"> Drapeau inconnu </floater.string>
 	<floater.string name="asset_unknown">Inconnu</floater.string>
 	<floater.string name="unknown_object">Objet inconnu</floater.string>
 	<floater.string name="unknown_region">Région inconnue</floater.string>
@@ -13,6 +17,7 @@
 		<columns name="name" label="Nom"/>
 		<columns name="region" label="Région"/>
 		<columns name="type" label="Type"/>
+		<columns name="flags" label="Drapeaux"/>
 		<columns name="date" label="Date"/>
 	</fs_scroll_list>
 	<button name="remove_btn" label="Supprimer la sélection des éléments blacklistés" height="23" width="320"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
index 96204836fb..891c598436 100644
--- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
@@ -49,6 +49,7 @@
 <string name="ParsingErrorNoRoot">Le document n'a pas de racine</string>
 <string name="ParsingErrorNoScene">Le document n'a pas de visual_scene</string>
 <string name="ParsingErrorPositionInvalidModel">Impossible de traiter le maillage sans données de position. Modèle invalide.</string>
+<string name="ParsingErrorEmptyInvBindInvalidModel">Impossible de traiter le maillage riggé sans les données InvBind. Modèle non valide.</string>
 
 <panel name="left_panel">
 	<panel name="model_name_representation_panel">
diff --git a/indra/newview/skins/default/xui/fr/menu_fs_area_search.xml b/indra/newview/skins/default/xui/fr/menu_fs_area_search.xml
index d0cfc57b9b..8b7cb56016 100644
--- a/indra/newview/skins/default/xui/fr/menu_fs_area_search.xml
+++ b/indra/newview/skins/default/xui/fr/menu_fs_area_search.xml
@@ -2,6 +2,7 @@
 <context_menu name="Object List popup">
 	<menu_item_call label="Informations sur les scripts" name="script_info"/>
 	<menu_item_call label="Toucher" name="touch_object"/>
+	<menu_item_call label="S'asseoir" name="sit_on_object"/>
 	<menu_item_call label="Se téléporter vers" name="teleport_to_object"/>
 	<menu_item_call label="Zoomer" name="look_at_object"/>
 	<menu_item_call label="Inspecter" name="inspect_object"/>
@@ -10,4 +11,7 @@
 	<menu_item_call label="Supprimer" name="delete_object"/>
 	<menu_item_call label="Faire disparaitre &amp; Blacklister" name="blacklist_object"/>
 	<menu_item_call label="Acheter l'objet" name="object_buy"/>
+	<menu_item_call label="Filtrer mes objets" name="filter_my_objects"/>
+	<menu_item_call label="Tout sélectionner" name="select_all"/>
+	<menu_item_call label="Annuler la sélection" name="clear_selection"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 00df7d41ce..a6868c18b4 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -266,6 +266,7 @@
 		<menu_item_call label="Bibliothèque de scripts" name="Script Library"/>
 		<menu_item_call label="Communauté SL (blogs, forums, nouvelles)" name="SL Community Pages"/>
 		<menu_item_call label="Blog Firestorm" name="Firestorm Blog"/>
+		<menu_item_call label="Primfeed Firestorm" name="Firestorm Primfeed"/>
 		<menu_item_call label="Flickr Firestorm" name="Firestorm Flickr"/>
 		<menu_item_call label="YouTube Firestorm" name="Firestorm YouTube"/>
 		<menu_item_call label="Twitter Firestorm" name="Firestorm Twitter"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_model_preview.xml b/indra/newview/skins/default/xui/ru/floater_model_preview.xml
index eb9bfc594c..e4cd77c159 100644
--- a/indra/newview/skins/default/xui/ru/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_model_preview.xml
@@ -51,6 +51,7 @@
   <string name="ParsingErrorNoRoot">Документ не имеет корня</string>
   <string name="ParsingErrorNoScene">Документ не имеет visual_scene</string>
   <string name="ParsingErrorPositionInvalidModel">Невозможно обработать сетку без данных о местоположении. Недопустимая модель.</string>
+  <string name="ParsingErrorEmptyInvBindInvalidModel">Невозможно обработать оснастку без данных InvBind. Недопустимая модель.</string>
 
   <panel name="left_panel">
     <panel name="model_name_representation_panel">
diff --git a/indra/newview/skins/default/xui/zh/floater_NACL_explore_sounds.xml b/indra/newview/skins/default/xui/zh/floater_NACL_explore_sounds.xml
index 29abd270da..b4705c96d6 100644
--- a/indra/newview/skins/default/xui/zh/floater_NACL_explore_sounds.xml
+++ b/indra/newview/skins/default/xui/zh/floater_NACL_explore_sounds.xml
@@ -12,15 +12,6 @@
 	<floater.string name="Type_Avatar">
 		化身
 	</floater.string>
-	<floater.string name="Type_llTriggerSound">
-		llTriggerSound
-	</floater.string>
-	<floater.string name="Type_llLoopSound">
-		llLoopSound
-	</floater.string>
-	<floater.string name="Type_llPlaySound">
-		llPlaySound
-	</floater.string>
 	<check_box name="avatars_chk" label="化身" />
 	<check_box name="objects_chk" label="物件" />
 	<check_box name="collision_chk" label="預設碰撞聲音" />
@@ -37,4 +28,7 @@
 	<button label="聚焦" name="look_at_btn" />
 	<button label="停止" name="stop_btn" />
 	<button label="封鎖名單" name="bl_btn" />
+	<button label="封鎖化身所附著物件的聲音" name="block_avatar_worn_sounds_btn"/>
+	<button label="封鎖化身放置物件的聲音" name="block_avatar_rezzed_sounds_btn"/>
+	<button label="封鎖化身播放手勢的聲音" name="block_avatar_gesture_sounds_btn"/>
 </floater>
\ No newline at end of file
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 5d57bfcdab..8b6e2a2ae5 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_object.xml
@@ -22,7 +22,7 @@
 		內含：
 	</text>
 	<text name="buy_text">
-		購買，支付 [AMOUNT] L$ 給：
+		支付 [AMOUNT] L$ 給：
 	</text>
 	<text name="buy_name_text">
 		[NAME]？
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 5453f9ca22..61b6841dec 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
@@ -97,6 +97,7 @@
 			<check_box name="exclude_childprim" label="子元素" />
 			<check_box name="exclude_neighbor_region" label="鄰近地塊" />
 			<button name="apply" label="應用" />
+			<button name="save_as_default" label="儲存為預設"/>
 		</panel>
 		<panel label="選項" name="area_search_options_panel">
 			<text name="display_column">
diff --git a/indra/newview/skins/default/xui/zh/floater_fs_asset_blacklist.xml b/indra/newview/skins/default/xui/zh/floater_fs_asset_blacklist.xml
index 8a396357a4..95955f92ba 100644
--- a/indra/newview/skins/default/xui/zh/floater_fs_asset_blacklist.xml
+++ b/indra/newview/skins/default/xui/zh/floater_fs_asset_blacklist.xml
@@ -15,6 +15,18 @@
 	<floater.string name="asset_resident">
 		居民
 	</floater.string>
+	<floater.string name="blacklist_flag_mute_avatar_worn_objects_sounds">
+		化身所穿戴物件的聲音
+	</floater.string>
+	<floater.string name="blacklist_flag_mute_avatar_rezzed_objects_sounds">
+		化身放置物件的聲音
+	</floater.string>
+	<floater.string name="blacklist_flag_mute_avatar_gestures_sounds">
+		化身播放手勢的聲音
+	</floater.string>
+	<floater.string name="blacklist_flag_unknown">
+		未知標記
+	</floater.string>
 	<floater.string name="asset_unknown">
 		未知
 	</floater.string>
@@ -32,6 +44,7 @@
 		<columns name="name" label="名稱" />
 		<columns name="region" label="地塊" width="210" />
 		<columns name="type" label="類型" />
+		<columns name="flags" label="標記" />
 		<columns name="date" label="日期" />
 		<columns name="permanent" label="永久" width="50" />
 	</fs_scroll_list>
diff --git a/indra/newview/skins/default/xui/zh/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/zh/floater_fs_nearby_chat.xml
index ed6c6a4b80..8e0b4f9587 100644
--- a/indra/newview/skins/default/xui/zh/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/zh/floater_fs_nearby_chat.xml
@@ -27,15 +27,12 @@
 				</layout_panel>
 				<layout_panel name="chat_layout_panel">
 					<layout_stack name="input_panels">
-						<layout_panel name="input_editor_layout_panel">
-							<chat_editor name="chat_box" />
+						<layout_panel name="emoji_button_layout_panel">
+							<button name="emoji_picker_toggle_btn" tool_tip="顯示表情符號面板" />
+							<button name="emoji_recent_panel_toggle_btn" tool_tip="顯示/隱藏最近使用的表情符號" />
 						</layout_panel>
 						<layout_panel name="input_button_layout_panel">
 							<spinner name="ChatChannel" tool_tip="要傳送聊天的頻道。可以在設定 -&gt; 聊天 -&gt; Firestorm -&gt; 在聊天欄中顯示頻道選擇。" />
-							<layout_panel name="emoji_button_layout_panel">
-								<button name="emoji_picker_toggle_btn" tool_tip="顯示表情符號面板" />
-								<button name="emoji_recent_panel_toggle_btn" tool_tip="顯示/隱藏最近使用的表情符號" />
-							</layout_panel>
 						</layout_panel>
 						<layout_panel name="chat_type_layout_panel">
 							<combo_box name="chat_type" tool_tip="竊竊私語 = 10公尺，正常說話 = 20公尺，大聲呼喊 = 100公尺">
diff --git a/indra/newview/skins/default/xui/zh/floater_model_preview.xml b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
index 0db0f8230d..3909476f30 100644
--- a/indra/newview/skins/default/xui/zh/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
@@ -147,6 +147,9 @@
 	<string name="ParsingErrorPositionInvalidModel">
 		沒有位置資料的網格無法處理 - 模型無效。
 	</string>
+	<string name="ParsingErrorEmptyInvBindInvalidModel">
+		沒有InvBind資料的綁定網格無法處理 - 模型無效。
+	</string>
 	<panel name="left_panel">
 		<panel name="model_name_representation_panel">
 			<text name="name_label">
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index 1908359541..7bbfb42aab 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -131,6 +131,9 @@
 		力道
 	</text>
 	<button label="應用" label_selected="應用" name="button apply to selection" tool_tip="修改所選擇的土地" />
+	<text name="link_num_obj_count" tool_tip="聯結序號可能不準確。">
+		[DESC] [NUM]
+	</text>
 	<text name="selection_empty">
 		未做任何選擇。
 	</text>