From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

---
 indra/newview/skins/default/xui/zh/panel_people.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_people.xml

(limited to 'indra/newview/skins/default/xui/zh/panel_people.xml')

diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 9f56dad9582c8585a92c54baf28c928b2d3bb7d2 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 3 Apr 2013 15:35:45 -0700
Subject: FIX INTL-114 translation for 9 languages of major update from CHUI
 and other projects

---
 .../newview/skins/default/xui/zh/panel_people.xml  | 88 ++++++++--------------
 1 file changed, 30 insertions(+), 58 deletions(-)

(limited to 'indra/newview/skins/default/xui/zh/panel_people.xml')

diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 59ea7b70e2..5f7aca387a 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -14,81 +14,53 @@
 	<string name="no_filtered_friends_msg">
 		找不到你要找的嗎？ 請試試[secondlife:///app/search/people/[SEARCH_TERM] 搜尋]。
 	</string>
-	<string name="people_filter_label" value="人員過濾器"/>
-	<string name="groups_filter_label" value="群組過濾器"/>
 	<string name="no_filtered_groups_msg" value="找不到你要找的嗎？ 請試試[secondlife:///app/search/groups/[SEARCH_TERM] 搜尋]。"/>
 	<string name="no_groups_msg" value="要尋找群組考慮加入嗎？ 請試試[secondlife:///app/search/groups 搜尋]。"/>
 	<string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/>
-	<filter_editor label="過濾器" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="附近" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="人員過濾器" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="nearby_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="nearby_del_btn" tool_tip="將選取的人從朋友名單移除"/>
 			</panel>
 		</panel>
-		<panel label="我的朋友" name="friends_panel">
+		<panel label="朋友" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="人員過濾器" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="friends_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="friends_add_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="friends_del_btn" tool_tip="將選取的人從朋友名單移除"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="上線"/>
 				<accordion_tab name="tab_all" title="全部"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="顯示額外選項"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="向居民發出交友邀請"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="由你的朋友清單移除所選擇的人"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="我的群組" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="選項"/>
-				<button name="plus_btn" tool_tip="加入群組/創立新群組"/>
-				<button name="activate_btn" tool_tip="啟用所選擇的群組"/>
+		<panel label="群組" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="群組過濾器" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="對所選群組採取動作"/>
+				<menu_button name="groups_view_btn" tool_tip="檢視/排序的選項"/>
+				<menu_button name="plus_btn" tool_tip="加入群組/創立新群組"/>
+				<dnd_button name="minus_btn" tool_tip="離開所選群組"/>
 			</panel>
 		</panel>
 		<panel label="最近" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="人員過濾器" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="recent_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="recent_del_btn" tool_tip="將選取的人從朋友名單移除"/>
 			</panel>
 		</panel>
+		<panel label="已封鎖的" name="blocked_panel">
+			<panel label="被封鎖的居民與物件" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="檔案" name="view_profile_btn" tool_tip="顯示圖片、群組與其他居民資訊"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="通話" name="call_btn" tool_tip="和這位居民通話"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="瞬間傳送" name="teleport_btn" tool_tip="發出瞬間傳送邀請"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="群組檔案" name="group_info_btn" tool_tip="顯示群組資訊"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="群組聊天" name="chat_btn" tool_tip="開啟聊天會話"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="群組通話" name="group_call_btn" tool_tip="與此群組進行通話"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
-- 
cgit v1.2.3


From 80772aa1ad62a89129f24508e2005b20fec88854 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 24 Apr 2013 13:49:11 -0700
Subject: sync with viewer-development (per DRTVWR-309)

---
 .../newview/skins/default/xui/zh/panel_people.xml  | 88 ++++++++++++++--------
 1 file changed, 58 insertions(+), 30 deletions(-)

(limited to 'indra/newview/skins/default/xui/zh/panel_people.xml')

diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 5f7aca387a..59ea7b70e2 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -14,53 +14,81 @@
 	<string name="no_filtered_friends_msg">
 		找不到你要找的嗎？ 請試試[secondlife:///app/search/people/[SEARCH_TERM] 搜尋]。
 	</string>
+	<string name="people_filter_label" value="人員過濾器"/>
+	<string name="groups_filter_label" value="群組過濾器"/>
 	<string name="no_filtered_groups_msg" value="找不到你要找的嗎？ 請試試[secondlife:///app/search/groups/[SEARCH_TERM] 搜尋]。"/>
 	<string name="no_groups_msg" value="要尋找群組考慮加入嗎？ 請試試[secondlife:///app/search/groups 搜尋]。"/>
 	<string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/>
+	<filter_editor label="過濾器" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="附近" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="人員過濾器" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
-				<menu_button name="nearby_view_btn" tool_tip="檢視/排序的選項"/>
-				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
-				<dnd_button name="nearby_del_btn" tool_tip="將選取的人從朋友名單移除"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="選項"/>
+				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
 			</panel>
 		</panel>
-		<panel label="朋友" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="人員過濾器" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
-				<menu_button name="friends_view_btn" tool_tip="檢視/排序的選項"/>
-				<button name="friends_add_btn" tool_tip="向某位居民發出交友邀請"/>
-				<dnd_button name="friends_del_btn" tool_tip="將選取的人從朋友名單移除"/>
-			</panel>
+		<panel label="我的朋友" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="上線"/>
 				<accordion_tab name="tab_all" title="全部"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="顯示額外選項"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="向居民發出交友邀請"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="由你的朋友清單移除所選擇的人"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="群組" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="群組過濾器" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="對所選群組採取動作"/>
-				<menu_button name="groups_view_btn" tool_tip="檢視/排序的選項"/>
-				<menu_button name="plus_btn" tool_tip="加入群組/創立新群組"/>
-				<dnd_button name="minus_btn" tool_tip="離開所選群組"/>
+		<panel label="我的群組" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="選項"/>
+				<button name="plus_btn" tool_tip="加入群組/創立新群組"/>
+				<button name="activate_btn" tool_tip="啟用所選擇的群組"/>
 			</panel>
 		</panel>
 		<panel label="最近" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="人員過濾器" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
-				<menu_button name="recent_view_btn" tool_tip="檢視/排序的選項"/>
-				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
-				<dnd_button name="recent_del_btn" tool_tip="將選取的人從朋友名單移除"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="選項"/>
+				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
 			</panel>
 		</panel>
-		<panel label="已封鎖的" name="blocked_panel">
-			<panel label="被封鎖的居民與物件" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="檔案" name="view_profile_btn" tool_tip="顯示圖片、群組與其他居民資訊"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="通話" name="call_btn" tool_tip="和這位居民通話"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="瞬間傳送" name="teleport_btn" tool_tip="發出瞬間傳送邀請"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="群組檔案" name="group_info_btn" tool_tip="顯示群組資訊"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="群組聊天" name="chat_btn" tool_tip="開啟聊天會話"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="群組通話" name="group_call_btn" tool_tip="與此群組進行通話"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
-- 
cgit v1.2.3


From 774277e9cf3b6b55c7aaaa9dadfe2ef2ddb0b0c2 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 24 Apr 2013 13:56:53 -0700
Subject: FIX INTL-114 translation for 9 languages of major update from CHUI
 (based on latest merge with viewer-development)

---
 .../newview/skins/default/xui/zh/panel_people.xml  | 88 ++++++++--------------
 1 file changed, 30 insertions(+), 58 deletions(-)

(limited to 'indra/newview/skins/default/xui/zh/panel_people.xml')

diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 59ea7b70e2..5f7aca387a 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -14,81 +14,53 @@
 	<string name="no_filtered_friends_msg">
 		找不到你要找的嗎？ 請試試[secondlife:///app/search/people/[SEARCH_TERM] 搜尋]。
 	</string>
-	<string name="people_filter_label" value="人員過濾器"/>
-	<string name="groups_filter_label" value="群組過濾器"/>
 	<string name="no_filtered_groups_msg" value="找不到你要找的嗎？ 請試試[secondlife:///app/search/groups/[SEARCH_TERM] 搜尋]。"/>
 	<string name="no_groups_msg" value="要尋找群組考慮加入嗎？ 請試試[secondlife:///app/search/groups 搜尋]。"/>
 	<string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/>
-	<filter_editor label="過濾器" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="附近" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="人員過濾器" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="nearby_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="nearby_del_btn" tool_tip="將選取的人從朋友名單移除"/>
 			</panel>
 		</panel>
-		<panel label="我的朋友" name="friends_panel">
+		<panel label="朋友" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="人員過濾器" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="friends_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="friends_add_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="friends_del_btn" tool_tip="將選取的人從朋友名單移除"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="上線"/>
 				<accordion_tab name="tab_all" title="全部"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="顯示額外選項"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="向居民發出交友邀請"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="由你的朋友清單移除所選擇的人"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="我的群組" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="選項"/>
-				<button name="plus_btn" tool_tip="加入群組/創立新群組"/>
-				<button name="activate_btn" tool_tip="啟用所選擇的群組"/>
+		<panel label="群組" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="群組過濾器" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="對所選群組採取動作"/>
+				<menu_button name="groups_view_btn" tool_tip="檢視/排序的選項"/>
+				<menu_button name="plus_btn" tool_tip="加入群組/創立新群組"/>
+				<dnd_button name="minus_btn" tool_tip="離開所選群組"/>
 			</panel>
 		</panel>
 		<panel label="最近" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="人員過濾器" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="recent_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="recent_del_btn" tool_tip="將選取的人從朋友名單移除"/>
 			</panel>
 		</panel>
+		<panel label="已封鎖的" name="blocked_panel">
+			<panel label="被封鎖的居民與物件" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="檔案" name="view_profile_btn" tool_tip="顯示圖片、群組與其他居民資訊"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="通話" name="call_btn" tool_tip="和這位居民通話"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="瞬間傳送" name="teleport_btn" tool_tip="發出瞬間傳送邀請"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="群組檔案" name="group_info_btn" tool_tip="顯示群組資訊"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="群組聊天" name="chat_btn" tool_tip="開啟聊天會話"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="群組通話" name="group_call_btn" tool_tip="與此群組進行通話"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
-- 
cgit v1.2.3