merge

1 files changed, 104 insertions, 75 deletions

diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 262cc2440c..ac0e9e7e35 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -1,51 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
 	<menu label="我自己" name="Me">
-		<menu_item_call label="偏好設定" name="Preferences"/>
-		<menu_item_call label="我的塗鴉牆" name="Manage My Account"/>
-		<menu_item_call label="購買 L$" name="Buy and Sell L$"/>
-		<menu_item_call label="我的個人檔案" name="Profile"/>
-		<menu_item_call label="我的外觀" name="ChangeOutfit"/>
-		<menu_item_check label="我的收納區" name="Inventory"/>
-		<menu_item_check label="我的收納區" name="ShowSidetrayInventory"/>
-		<menu_item_check label="我的姿勢" name="Gestures"/>
-		<menu_item_check label="我的聲音" name="ShowVoice"/>
+		<menu_item_call label="檔案..." name="Profile"/>
+		<menu_item_call label="外觀…" name="ChangeOutfit"/>
+		<menu_item_call label="選擇一個化身…" name="Avatar Picker"/>
+		<menu_item_check label="收納區…" name="Inventory"/>
+		<menu_item_call label="新收納區視窗" name="NewInventoryWindow"/>
+		<menu_item_call label="地點…" name="Places"/>
+		<menu_item_call label="精選地點…" name="Picks"/>
+		<menu_item_call label="攝影機控制…" name="Camera Controls"/>
 		<menu label="動作" name="Movement">
 			<menu_item_call label="坐下" name="Sit Down Here"/>
 			<menu_item_check label="飛行" name="Fly"/>
 			<menu_item_check label="以跑代步" name="Always Run"/>
 			<menu_item_call label="停止我身上的動作" name="Stop Animating My Avatar"/>
+			<menu_item_call label="行走 / 跑步 / 飛行…" name="Walk / run / fly"/>
 		</menu>
-		<menu label="我的狀態" name="Status">
+		<menu label="狀態" name="Status">
 			<menu_item_call label="離開" name="Set Away"/>
 			<menu_item_call label="忙碌" name="Set Busy"/>
 		</menu>
-		<menu_item_call label="要求管理員狀態" name="Request Admin Options"/>
-		<menu_item_call label="離開管理員狀態" name="Leave Admin Options"/>
+		<menu_item_call label="購買 L$…" name="Buy and Sell L$"/>
+		<menu_item_call label="商家發件匣…" name="MerchantOutbox"/>
+		<menu_item_call label="帳戶主控臺…" name="Manage My Account"/>
+		<menu_item_call label="偏好設定…" name="Preferences"/>
+		<menu_item_call label="工具列按鈕…" name="Toolbars"/>
+		<menu_item_call label="隱藏所有控制" name="Hide UI"/>
+		<menu_item_check label="顯示 HUD 附件" name="Show HUD Attachments"/>
 		<menu_item_call label="退出 [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="溝通" name="Communicate">
-		<menu_item_call label="我的朋友" name="My Friends"/>
-		<menu_item_call label="我的群組" name="My Groups"/>
-		<menu_item_check label="附近的聊天" name="Nearby Chat"/>
+		<menu_item_check label="聊天…" name="Nearby Chat"/>
+		<menu_item_check label="說話" name="Speak"/>
+		<menu_item_check label="語音設定…" name="Nearby Voice"/>
+		<menu_item_check label="語音變聲…" name="ShowVoice"/>
+		<menu_item_check label="姿勢…" name="Gestures"/>
+		<menu_item_call label="朋友" name="My Friends"/>
+		<menu_item_call label="群組" name="My Groups"/>
 		<menu_item_call label="附近的人群" name="Active Speakers"/>
+		<menu_item_call label="封鎖清單" name="Block List"/>
 	</menu>
 	<menu label="世界" name="World">
-		<menu_item_check label="迷你地圖" name="Mini-Map"/>
+		<menu_item_call label="將此處記為地標" name="Create Landmark Here"/>
+		<menu_item_call label="目的地…" name="Destinations"/>
 		<menu_item_check label="世界地圖" name="World Map"/>
+		<menu_item_check label="迷你地圖" name="Mini-Map"/>
 		<menu_item_check label="搜尋" name="Search"/>
+		<menu_item_call label="瞬間傳送回家" name="Teleport Home"/>
+		<menu_item_call label="把這裡設為我的家" name="Set Home to Here"/>
 		<menu_item_call label="快照" name="Take Snapshot"/>
-		<menu_item_call label="將此處記為地標" name="Create Landmark Here"/>
-		<menu label="地點檔案" name="Land">
-			<menu_item_call label="地點檔案" name="Place Profile"/>
-			<menu_item_call label="土地資料" name="About Land"/>
-			<menu_item_call label="地區/領地" name="Region/Estate"/>
-		</menu>
+		<menu_item_call label="地點小檔案" name="Place Profile"/>
+		<menu_item_call label="土地資料" name="About Land"/>
+		<menu_item_call label="地區/領地" name="Region/Estate"/>
+		<menu_item_call label="我所擁有的土地…" name="My Land"/>
 		<menu_item_call label="購買這塊土地" name="Buy Land"/>
-		<menu_item_call label="我的土地" name="My Land"/>
 		<menu label="顯示" name="LandShow">
-			<menu_item_check label="移動控制" name="Movement Controls"/>
-			<menu_item_check label="視角控制" name="Camera Controls"/>
 			<menu_item_check label="禁越線" name="Ban Lines"/>
 			<menu_item_check label="指標" name="beacons"/>
 			<menu_item_check label="地產邊界" name="Property Lines"/>
@@ -54,15 +63,30 @@
 			<menu_item_check label="地段屬性" name="Parcel Properties"/>
 			<menu_item_check label="進階選單" name="Show Advanced Menu"/>
 		</menu>
-		<menu_item_call label="瞬間傳送回家" name="Teleport Home"/>
-		<menu_item_call label="設定家在此處" name="Set Home to Here"/>
-		<menu label="太陽" name="Environment Settings">
+		<menu label="太陽" name="Sun">
 			<menu_item_call label="日出" name="Sunrise"/>
 			<menu_item_call label="中午" name="Noon"/>
 			<menu_item_call label="日落" name="Sunset"/>
 			<menu_item_call label="午夜" name="Midnight"/>
-			<menu_item_call label="領地時間" name="Revert to Region Default"/>
-			<menu_item_call label="環境編輯器" name="Environment Editor"/>
+			<menu_item_call label="使用地區設定" name="Use Region Settings"/>
+		</menu>
+		<menu label="環境編輯器" name="Environment Editor">
+			<menu_item_call label="環境設定…" name="Environment Settings"/>
+			<menu label="水的自訂配置" name="Water Presets">
+				<menu_item_call label="新的自訂配置…" name="new_water_preset"/>
+				<menu_item_call label="編輯自訂配置…" name="edit_water_preset"/>
+				<menu_item_call label="刪除自訂配置…" name="delete_water_preset"/>
+			</menu>
+			<menu label="天空自訂配置" name="Sky Presets">
+				<menu_item_call label="新的自訂配置…" name="new_sky_preset"/>
+				<menu_item_call label="編輯自訂配置…" name="edit_sky_preset"/>
+				<menu_item_call label="刪除自訂配置…" name="delete_sky_preset"/>
+			</menu>
+			<menu label="日的自訂配置" name="Day Presets">
+				<menu_item_call label="新的自訂配置…" name="new_day_preset"/>
+				<menu_item_call label="編輯自訂配置…" name="edit_day_preset"/>
+				<menu_item_call label="刪除自訂配置…" name="delete_day_preset"/>
+			</menu>
 		</menu>
 	</menu>
 	<menu label="建造" name="BuildTools">
@@ -100,6 +124,11 @@
 			<menu_item_call label="設定腳本為執行中" name="Set Scripts to Running"/>
 			<menu_item_call label="設定腳本為非執行中" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="尋徑" name="Pathfinding">
+			<menu_item_call label="聯結集…" name="pathfinding_linksets_menu_item"/>
+			<menu_item_call label="角色…" name="pathfinding_characters_menu_item"/>
+			<menu_item_call label="察看 / 測試…" name="pathfinding_console_menu_item"/>
+		</menu>
 		<menu label="選項" name="Options">
 			<menu_item_check label="顯示進階權限" name="DebugPermissions"/>
 			<menu_item_check label="只選取我的物件" name="Select Only My Objects"/>
@@ -119,7 +148,6 @@
 			<menu_item_call label="聲音（L$[COST]）..." name="Upload Sound"/>
 			<menu_item_call label="動作（L$[COST]）..." name="Upload Animation"/>
 			<menu_item_call label="模型…" name="Upload Model"/>
-			<menu_item_call label="模型精靈…" name="Upload Model Wizard"/>
 			<menu_item_call label="批量（每檔案 L$[COST] ）..." name="Bulk Upload"/>
 			<menu_item_call label="設定預設上傳權限" name="perm prefs"/>
 		</menu>
@@ -127,8 +155,8 @@
 		<menu_item_call label="重做" name="Redo"/>
 	</menu>
 	<menu label="幫助" name="Help">
+		<menu_item_call label="簡易教學…" name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] 幫助" name="Second Life Help"/>
-		<menu_item_check label="啟用提示" name="Enable Hints"/>
 		<menu_item_call label="違規舉報" name="Report Abuse"/>
 		<menu_item_call label="回報臭蟲" name="Report Bug"/>
 		<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
@@ -141,37 +169,35 @@
 		<menu_item_check label="取消鏡頭限制" name="Disable Camera Distance"/>
 		<menu_item_check label="高解析度快照" name="HighResSnapshot"/>
 		<menu_item_check label="靜音拍攝快照到硬碟" name="QuietSnapshotsToDisk"/>
-		<menu_item_check label="壓縮快照存到硬碟" name="CompressSnapshotsToDisk"/>
 		<menu label="效能工具" name="Performance Tools">
 			<menu_item_call label="Lag 測量器" name="Lag Meter"/>
 			<menu_item_check label="統計列" name="Statistics Bar"/>
-			<menu_item_check label="顯示化身呈像成本" name="Avatar Rendering Cost"/>
+			<menu_item_check label="顯示化身的繪製重量" name="Avatar Rendering Cost"/>
 		</menu>
 		<menu label="高亮顯示與可見度" name="Highlighting and Visibility">
 			<menu_item_check label="Cheesy 指標" name="Cheesy Beacon"/>
 			<menu_item_check label="隱藏粒子效果" name="Hide Particles"/>
 			<menu_item_check label="隱藏所選擇的" name="Hide Selected"/>
 			<menu_item_check label="高亮顯示透明物件" name="Highlight Transparent"/>
-			<menu_item_check label="顯示 HUD 附件" name="Show HUD Attachments"/>
 			<menu_item_check label="顯示第一人稱視角準星" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="呈像類型" name="Rendering Types">
-			<menu_item_check label="簡單" name="Simple"/>
-			<menu_item_check label="半透明" name="Alpha"/>
-			<menu_item_check label="樹木" name="Tree"/>
-			<menu_item_check label="化身" name="Character"/>
-			<menu_item_check label="表面修補" name="Surface Patch"/>
-			<menu_item_check label="天空" name="Sky"/>
-			<menu_item_check label="水文" name="Water"/>
-			<menu_item_check label="地面" name="Ground"/>
-			<menu_item_check label="體積" name="Volume"/>
-			<menu_item_check label="草地" name="Grass"/>
-			<menu_item_check label="雲彩" name="Clouds"/>
-			<menu_item_check label="粒子效果" name="Particles"/>
-			<menu_item_check label="碰撞" name="Bump"/>
+			<menu_item_check label="簡單" name="Rendering Type Simple"/>
+			<menu_item_check label="半透明" name="Rendering Type Alpha"/>
+			<menu_item_check label="樹木" name="Rendering Type Tree"/>
+			<menu_item_check label="化身" name="Rendering Type Character"/>
+			<menu_item_check label="表面修補" name="Rendering Type Surface Patch"/>
+			<menu_item_check label="天空" name="Rendering Type Sky"/>
+			<menu_item_check label="水文" name="Rendering Type Water"/>
+			<menu_item_check label="地面" name="Rendering Type Ground"/>
+			<menu_item_check label="體積" name="Rendering Type Volume"/>
+			<menu_item_check label="草地" name="Rendering Type Grass"/>
+			<menu_item_check label="雲彩" name="Rendering Type Clouds"/>
+			<menu_item_check label="粒子效果" name="Rendering Type Particles"/>
+			<menu_item_check label="碰撞" name="Rendering Type Bump"/>
 		</menu>
 		<menu label="呈像功能" name="Rendering Features">
-			<menu_item_check label="使用者界面" name="UI"/>
+			<menu_item_check label="使用者界面" name="ToggleUI"/>
 			<menu_item_check label="選擇" name="Selected"/>
 			<menu_item_check label="高亮顯示" name="Highlighted"/>
 			<menu_item_check label="動態材質" name="Dynamic Textures"/>
@@ -183,11 +209,8 @@
 		<menu_item_check label="使用外卦讀取緒" name="Use Plugin Read Thread"/>
 		<menu_item_call label="清除群組快取資料" name="ClearGroupCache"/>
 		<menu_item_check label="滑鼠平滑移動" name="Mouse Smoothing"/>
+		<menu_item_call label="釋出按鍵" name="Release Keys"/>
 		<menu label="快速鍵" name="Shortcuts">
-			<menu_item_call label="圖像（L$[COST]）..." name="Upload Image"/>
-			<menu_item_check label="搜尋" name="Search"/>
-			<menu_item_call label="釋出按鍵" name="Release Keys"/>
-			<menu_item_call label="以預設值設定使用者界面大小" name="Set UI Size to Default"/>
 			<menu_item_check label="顯示進階選單 － 舊版捷徑" name="Show Advanced Menu - legacy shortcut"/>
 			<menu_item_call label="關閉視窗" name="Close Window"/>
 			<menu_item_call label="關閉全部視窗" name="Close All Windows"/>
@@ -196,13 +219,6 @@
 			<menu_item_check label="搖桿移動攝影機" name="Joystick Flycam"/>
 			<menu_item_call label="重設視角" name="Reset View"/>
 			<menu_item_call label="注視上一位聊天者" name="Look at Last Chatter"/>
-			<menu label="選擇建造工具" name="Select Tool">
-				<menu_item_call label="聚焦工具" name="Focus"/>
-				<menu_item_call label="移動工具" name="Move"/>
-				<menu_item_call label="編輯工具" name="Edit"/>
-				<menu_item_call label="創造工具" name="Create"/>
-				<menu_item_call label="土地工具" name="Land"/>
-			</menu>
 			<menu_item_call label="放大" name="Zoom In"/>
 			<menu_item_call label="縮放恢復預設" name="Zoom Default"/>
 			<menu_item_call label="縮小" name="Zoom Out"/>
@@ -215,11 +231,10 @@
 			<menu_item_check label="材質控制台" name="Texture Console"/>
 			<menu_item_check label="除錯控制台" name="Debug Console"/>
 			<menu_item_call label="通知控制台" name="Notifications"/>
-			<menu_item_check label="材質尺寸控制台" name="Texture Size"/>
-			<menu_item_check label="材質分類控制台" name="Texture Category"/>
 			<menu_item_check label="快速碼錶" name="Fast Timers"/>
 			<menu_item_check label="記憶體" name="Memory"/>
 			<menu_item_check label="場景統計資料" name="Scene Statistics"/>
+			<menu_item_call label="材質擷取除錯控制台" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="地區資訊傳至除錯控制台" name="Region Info to Debug Console"/>
 			<menu_item_call label="群組資訊至除錯控制台" name="Group Info to Debug Console"/>
 			<menu_item_call label="性能資訊傳至除錯控制台" name="Capabilities Info to Debug Console"/>
@@ -236,6 +251,7 @@
 			<menu_item_check label="顯示矩陣" name="Show Matrices"/>
 			<menu_item_check label="游標下顯示顏色" name="Show Color Under Cursor"/>
 			<menu_item_check label="顯示記憶體" name="Show Memory"/>
+			<menu_item_check label="顯示私區記憶體資訊" name="Show Private Mem Info"/>
 			<menu_item_check label="顯示更新到物件" name="Show Updates"/>
 		</menu>
 		<menu label="強制錯誤" name="Force Errors">
@@ -272,7 +288,16 @@
 			<menu_item_check label="燈光" name="Lights"/>
 			<menu_item_check label="碰撞骨架" name="Collision Skeleton"/>
 			<menu_item_check label="光線投射" name="Raycast"/>
+			<menu_item_check label="風力向量" name="Wind Vectors"/>
+			<menu_item_check label="繪出複雜度" name="rendercomplexity"/>
+			<menu_item_check label="附件位元組" name="attachment bytes"/>
 			<menu_item_check label="雕刻" name="Sculpt"/>
+			<menu label="材質密度" name="Texture Density">
+				<menu_item_check label="無" name="None"/>
+				<menu_item_check label="目前" name="Current"/>
+				<menu_item_check label="理想" name="Desired"/>
+				<menu_item_check label="完全" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="呈像" name="Rendering">
 			<menu_item_check label="軸" name="Axes"/>
@@ -283,7 +308,6 @@
 			<menu_item_check label="光線和陰影" name="Lighting and Shadows"/>
 			<menu_item_check label="來自日/月/投影物的陰影" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="屏幕空間環境光遮蔽和陰影平滑技術" name="SSAO and Shadow Smoothing"/>
-			<menu_item_check label="全域照明（實驗性質）" name="Global Illumination"/>
 			<menu_item_check label="GL 除錯" name="Debug GL"/>
 			<menu_item_check label="管線除錯" name="Debug Pipeline"/>
 			<menu_item_check label="自動半透明遮罩（遞延）" name="Automatic Alpha Masks (deferred)"/>
@@ -291,7 +315,6 @@
 			<menu_item_check label="動作材質" name="Animation Textures"/>
 			<menu_item_check label="關閉材質" name="Disable Textures"/>
 			<menu_item_check label="全解析度材質" name="Rull Res Textures"/>
-			<menu_item_check label="查驗材質" name="Audit Textures"/>
 			<menu_item_check label="材質圖集（實驗性質）" name="Texture Atlas"/>
 			<menu_item_check label="使附著燈光呈像" name="Render Attached Lights"/>
 			<menu_item_check label="使附著例子效果呈像" name="Render Attached Particles"/>
@@ -314,9 +337,8 @@
 			<menu_item_call label="開始錄製" name="Start Record"/>
 			<menu_item_call label="停止錄製" name="Stop Record"/>
 		</menu>
-		<menu label="世界" name="World">
+		<menu label="世界" name="DevelopWorld">
 			<menu_item_check label="模擬器太陽設定覆蓋" name="Sim Sun Override"/>
-			<menu_item_check label="Cheesy 指標" name="Cheesy Beacon"/>
 			<menu_item_check label="固定天氣" name="Fixed Weather"/>
 			<menu_item_call label="傾印地區物件快取" name="Dump Region Object Cache"/>
 		</menu>
@@ -348,18 +370,17 @@
 		</menu>
 		<menu label="化身" name="Character">
 			<menu label="抓取已產出材質" name="Grab Baked Texture">
-				<menu_item_call label="虹膜" name="Iris"/>
-				<menu_item_call label="頭部" name="Head"/>
-				<menu_item_call label="上半身" name="Upper Body"/>
-				<menu_item_call label="下半身" name="Lower Body"/>
-				<menu_item_call label="裙子" name="Skirt"/>
+				<menu_item_call label="虹膜" name="Grab Iris"/>
+				<menu_item_call label="頭部" name="Grab Head"/>
+				<menu_item_call label="上半身" name="Grab Upper Body"/>
+				<menu_item_call label="下半身" name="Grab Lower Body"/>
+				<menu_item_call label="裙子" name="Grab Skirt"/>
 			</menu>
 			<menu label="字元測試" name="Character Tests">
 				<menu_item_call label="將外觀轉成 XML" name="Appearance To XML"/>
 				<menu_item_call label="切換字元幾何特性" name="Toggle Character Geometry"/>
 				<menu_item_call label="男性測試" name="Test Male"/>
 				<menu_item_call label="女性測試" name="Test Female"/>
-				<menu_item_call label="PG　切換" name="Toggle PG"/>
 				<menu_item_check label="允許選擇化身" name="Allow Select Avatar"/>
 			</menu>
 			<menu_item_call label="強制參數為預設值" name="Force Params to Default"/>
@@ -380,15 +401,23 @@
 		<menu_item_check label="HTTP 材質" name="HTTP Textures"/>
 		<menu_item_check label="HTTP 收納區" name="HTTP Inventory"/>
 		<menu_item_call label="壓縮圖像" name="Compress Images"/>
+		<menu_item_call label="啟用記憶體洩漏視覺偵測器" name="Enable Visual Leak Detector"/>
 		<menu_item_check label="輸出除錯小型傾印" name="Output Debug Minidump"/>
 		<menu_item_check label="下次執行時顯示控制台視窗" name="Console Window"/>
+		<menu label="設定記錄細節" name="Set Logging Level">
+			<menu_item_check label="除錯" name="Debug"/>
+			<menu_item_check label="資訊" name="Info"/>
+			<menu_item_check label="警告" name="Warning"/>
+			<menu_item_check label="錯誤" name="Error"/>
+			<menu_item_check label="無" name="None"/>
+		</menu>
 		<menu_item_call label="要求管理員狀態" name="Request Admin Options"/>
 		<menu_item_call label="離開管理員狀態" name="Leave Admin Options"/>
 		<menu_item_check label="顯示管理員選單" name="View Admin Options"/>
 	</menu>
 	<menu label="管理員" name="Admin">
-		<menu label="Object">
-			<menu_item_call label="取得副本" name="Take Copy"/>
+		<menu label="物件" name="AdminObject">
+			<menu_item_call label="取得副本" name="Admin Take Copy"/>
 			<menu_item_call label="將所有人強設為我自己" name="Force Owner To Me"/>
 			<menu_item_call label="強設為「准許所有人」" name="Force Owner Permissive"/>
 			<menu_item_call label="刪除" name="Delete"/>
@@ -424,7 +453,7 @@
 			<menu_item_call label="身體物理" name="Physics"/>
 			<menu_item_call label="全部衣服" name="All Clothes"/>
 		</menu>
-		<menu label="幫助" name="Help">
+		<menu label="幫助" name="DeprecatedHelp">
 			<menu_item_call label="林登官方部落格" name="Official Linden Blog"/>
 			<menu_item_call label="腳本門戶" name="Scripting Portal"/>
 			<menu label="臭蟲回報" name="Bug Reporting">