diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index 7eb2f2e341..705296889f 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -503,6 +503,7 @@ Bas ↔ + bas
 		</panel>
 		<panel label="Contenu" name="Contents">
 			<button label="Nouveau script" label_selected="Nouveau script" name="button new script"/>
+			<button label="Nouvelle notice" label_selected="Nouvelle notice" name="button new notecard"/>
 			<button label="Droits" name="button permissions"/>
 			<button label="Rafraîchir" name="button refresh"/>
 			<button label="Réinit. scripts" name="btn_reset_scripts"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_custom_tab.xml b/indra/newview/skins/default/xui/fr/menu_inventory_custom_tab.xml
index e5bfa827ce..53b2823a2c 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory_custom_tab.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory_custom_tab.xml
@@ -2,5 +2,6 @@
 <menu name="menu_inventory_custom_tab">
 	<menu_item_call label="Renommer..." name="rename_tab" />
 	<menu_item_call label="Dupliquer" name="clone_tab" />
+	 <menu_item_cal label="Masquer" name="hide_tab"/>
 	<menu_item_call label="Fermer" name="close_tab" />
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 0e6c951b65..d0c1279bf0 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1643,9 +1643,15 @@ http://secondlife.com/support pour vous aider à résoudre ce problème.
 	<string name="InventoryNoMatchingRecentItems">
 		Avez-vous trouvé ce que vous cherchiez ? Essayez [secondlife:///app/inventory/filters Show filters].
 	</string>
+	<string name="InventoryNoMatchingFavorites">
+		Vous n'avez ajouté aucun article à vos favoris.
+	</string>
 	<string name="FSInventoryCustomTabDefaultName">
 		Filtre
 	</string>
+	<string name="FSInventoryCustomTabShowHidden">
+		Afficher les onglets masqués
+	</string>
 	<string name="PlacesNoMatchingItems">
 		Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/places/[SEARCH_TERM] Rechercher].
 	</string>
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index 81cd91ab9f..695f887c0f 100644
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -490,6 +490,7 @@ Nis ↔ Najniż
 		<!-- <panel label="Tekstura" name="Texture"/> -->
 		<panel label="Zawart." name="Contents">
 			<button label="Nowy skrypt" label_selected="Nowy skrypt" name="button new script"/>
+			<button label="Nowa notka" label_selected="Nowa notka" name="button new notecard" />
 			<button label="Prawa" name="button permissions"/>
 			<button label="Odśwież" name="button refresh"/>
 			<button label="Resetuj skrypty" name="btn_reset_scripts"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index 2f4b428cf9..c33488290f 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -489,9 +489,9 @@
 			<spinner label="密度（100公斤/立方公尺）" name="Physics Density" />
 			<spinner label="彈性" name="Physics Restitution" />
 		</panel>
-		<!--<panel label="紋理" name="Texture"/>-->
 		<panel label="內容" name="Contents">
 			<button label="新指令碼" label_selected="新指令碼" name="button new script" />
+			<button label="新記事卡" label_selected="新記事卡" name="button new notecard" />
 			<button label="權限" name="button permissions" />
 			<button label="更新" name="button refresh" />
 			<button label="重設指令碼" name="btn_reset_scripts" />
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_custom_tab.xml b/indra/newview/skins/default/xui/zh/menu_inventory_custom_tab.xml
index e0c000d0e0..04e5a4b940 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory_custom_tab.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_custom_tab.xml
@@ -2,5 +2,6 @@
 <menu name="menu_inventory_custom_tab">
 	<menu_item_call label="重新命名..." name="rename_tab" />
 	<menu_item_call label="複製" name="clone_tab" />
+	<menu_item_call label="隱藏" name="hide_tab" />
 	<menu_item_call label="關閉" name="close_tab" />
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml
index 7e820bafdd..c715b6ff33 100644
--- a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_activeim_row">
-	<string name="unknown_obj">
-		未知物件
-	</string>
 	<text name="object_name">
 		未命名物件
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml b/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml
deleted file mode 100644
index 3750b17e00..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="avatar_tag_notification">
-	<panel name="msg_caption">
-		<text name="sender_tag_name">
-			Angela Tester
-		</text>
-	</panel>
-	<text_editor name="msg_text">
-		棕色的靈活狐貍跳過懶惰的狗。
-	</text_editor>
-</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/panel_chat_header.xml b/indra/newview/skins/default/xui/zh/panel_chat_header.xml
deleted file mode 100644
index 7916bf5155..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_chat_header.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="im_header" name="im_header">
-	<text name="time_box" value="23:30"/>
-</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 ee304f347f..5e858c83c6 100644
--- a/indra/newview/skins/default/xui/zh/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_classified_info.xml
@@ -4,10 +4,10 @@
 		適度成人
 	</panel.string>
 	<panel.string name="type_pg">
-		般普級內容
+		一般普級內容
 	</panel.string>
 	<panel.string name="l$_price">
-		[PRICE] L$
+		[PRICE]L$
 	</panel.string>
 	<panel.string name="click_through_text_fmt">
 		[TELEPORT]瞬間傳送，[MAP]地圖，[PROFILE]檔案
@@ -24,21 +24,17 @@
 	<text name="title" value="個人廣告資訊" />
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
-			<text_editor name="classified_name" value="[name]" />
 			<text name="classified_location_label" value="位置：" />
-			<text_editor name="classified_location" value="[loading...]" />
 			<text name="content_type_label" value="內容類型：" />
-			<text_editor name="content_type" value="[content type]" />
 			<text name="category_label" value="分類：" />
-			<text_editor name="category" value="[category]" />
 			<text name="creation_date_label" value="建立日期：" />
-			<text_editor name="creation_date" tool_tip="建立日期" value="[date]" />
+			<text_editor name="creation_date" tool_tip="建立日期"/>
 			<text name="price_for_listing_label" value="刊登費：" />
-			<text_editor name="price_for_listing" tool_tip="刊登費。" value="[price]" />
+			<text_editor name="price_for_listing" tool_tip="刊登費。"/>
 			<layout_stack name="descr_stack">
 				<layout_panel name="clickthrough_layout_panel">
 					<text name="click_through_label" value="點擊：" />
-					<text_editor name="click_through_text" tool_tip="點閱率" value="[clicks]" />
+					<text_editor name="click_through_text" tool_tip="點閱率"/>
 				</layout_panel>
 				<layout_panel name="price_layout_panel">
 					<text name="auto_renew_label" value="自動續訂：" />
@@ -46,7 +42,6 @@
 				</layout_panel>
 				<layout_panel name="descr_layout_panel">
 					<text name="classified_desc_label" value="描述：" />
-					<text_editor name="classified_desc" value="[description]" />
 				</layout_panel>
 			</layout_stack>
 		</panel>
@@ -59,9 +54,6 @@
 			<layout_panel name="show_on_map_btn_lp">
 				<button label="地圖" name="show_on_map_btn" />
 			</layout_panel>
-			<layout_panel name="edit_btn_lp">
-				<button label="編輯" name="edit_btn" />
-			</layout_panel>
 		</layout_stack>
 	</panel>
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/panel_dir_events.xml b/indra/newview/skins/default/xui/zh/panel_dir_events.xml
index 014db5b359..373c578b01 100644
--- a/indra/newview/skins/default/xui/zh/panel_dir_events.xml
+++ b/indra/newview/skins/default/xui/zh/panel_dir_events.xml
@@ -31,7 +31,8 @@
 	<icon tool_tip="完全成人" name="rating_icon_adult"/>
 	<scroll_list name="results">
 		<column label="名稱" name="name" />
-		<column label="時間 (PT)" name="date"/>
+		<column label="時間(PT)" name="date"/>
+		<column label="時間" name="time" />
 	</scroll_list>
 	<button tool_tip="上一頁" name="prev_btn"/>
 	<button tool_tip="下一頁" name="next_btn"/>
@@ -39,6 +40,6 @@
 		<radio_item name="current" label="目前及即將開始"/>
 		<radio_item name="date" label="日期"/>
 	</radio_group>
-	<button label="&lt;&lt;" label_selected="&lt;&lt;" name="back_btn" tool_tip="後退一天"/>
-	<button label="&gt;&gt;" label_selected="&gt;&gt;" name="forward_btn" tool_tip="前進一天"/>
+	<button name="back_btn" tool_tip="後退一天"/>
+	<button name="forward_btn" tool_tip="前進一天"/>
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/panel_dir_groups.xml b/indra/newview/skins/default/xui/zh/panel_dir_groups.xml
index 123d610bc9..210598d342 100644
--- a/indra/newview/skins/default/xui/zh/panel_dir_groups.xml
+++ b/indra/newview/skins/default/xui/zh/panel_dir_groups.xml
@@ -13,7 +13,7 @@
 	<text name="find">
 		輸入搜尋關鍵字：
 	</text>
-	<check_box label="包含適度成人內容的群組" name="incmature"/>
+	<!-- <check_box label="包含適度成人內容的群組" name="incmature"/> -->
 	<combo_box name="groups_maturity">
 		<combo_box.item label="普級" name="Desired_PG"/>
 		<combo_box.item label="普級與適度成人" name="Desired_Mature"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_dir_land.xml b/indra/newview/skins/default/xui/zh/panel_dir_land.xml
index 521c3063c2..2c7cf904c8 100644
--- a/indra/newview/skins/default/xui/zh/panel_dir_land.xml
+++ b/indra/newview/skins/default/xui/zh/panel_dir_land.xml
@@ -21,9 +21,6 @@
 	<icon tool_tip="適度成人" name="rating_icon_moderate"/>
 	<icon tool_tip="完全成人" name="rating_icon_adult"/>
 	<check_box label="價格 &#8804; " name="pricecheck"/>
-	<text name="pricecheck_symbol">
-		L$
-	</text>
 	<check_box label="面積 &#8805; " name="areacheck"/>
 	<text name="areacheck_symbol">
 		平方米
diff --git a/indra/newview/skins/default/xui/zh/panel_dir_places.xml b/indra/newview/skins/default/xui/zh/panel_dir_places.xml
index fbfe2020b2..846f3fe697 100644
--- a/indra/newview/skins/default/xui/zh/panel_dir_places.xml
+++ b/indra/newview/skins/default/xui/zh/panel_dir_places.xml
@@ -13,12 +13,12 @@
 	</text>
 	<combo_box name="Category">
 		<combo_item name="AnyCategory" label="所有分類"/>
-		<combo_item name="LindenLocation" vlabel="Linden地點"/>
+		<combo_item name="LindenLocation" label="Linden地點"/>
 		<combo_item name="Arts&amp;Culture" label="藝術與文化"/>
 		<combo_item name="Business" label="公司"/>
 		<combo_item name="Educational" label="教育"/>
 		<combo_item name="Gaming" label="遊戲"/>
-		<combo_item name="Hangout" label="聚會點"/>
+		<combo_item name="Hangout" label="聚會地點"/>
 		<combo_item name="NewcomerFriendly" label="適合新手"/>
 		<combo_item name="Parks&amp;Nature" label="公園與自然"/>
 		<combo_item name="Residential" label="住宅區"/>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index f4d400a485..8e34550075 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -1812,6 +1812,9 @@ support@secondlife.com.
 	<string name="FSInventoryCustomTabDefaultName">
 		自訂
 	</string>
+	<string name="FSInventoryCustomTabShowHidden">
+		顯示隱藏分頁
+	</string>
 	<string name="PlacesNoMatchingItems">
 		要將地點添加到您的地標，請點擊地點名稱右側的星形圖標。
 	</string>