From 5e2b781e7886c3238645b5fcff9017ed960396e9 Mon Sep 17 00:00:00 2001
From: Twisted_Laws <none@none>
Date: Thu, 14 Apr 2011 08:11:06 -0400
Subject: STORM-1103 Nearby sidebar minimap should be optional

---
 .../xui/en/menu_people_nearby_view_sort.xml        |  8 ++++
 .../newview/skins/default/xui/en/panel_people.xml  | 51 ++++++++++++----------
 2 files changed, 37 insertions(+), 22 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
index f9db64b524..65bd2793b6 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
@@ -42,6 +42,14 @@
      function="CheckControl"
      parameter="NearbyListShowIcons" />
   </menu_item_check>
+  <menu_item_check name ="view_map" label="View Map">
+    <menu_item_check.on_check
+      function="CheckControl"
+      parameter="NearbyListShowMap" />
+    <menu_item_check.on_click
+      function="ToggleControl"
+      parameter="NearbyListShowMap" />
+  </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
     <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 1a00416b2a..1869eec476 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -99,28 +99,35 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          name="nearby_panel"
          top="0"
          width="313">
-			<net_map
-			 bg_color="NetMapBackgroundColor"
-			 follows="top|left|right"
-			 layout="topleft"
-			 left="3"
-			 mouse_opaque="false"
-			 name="Net Map"
-			 width="305"
-			 height="140"
-			 top="5"/>
-			<avatar_list
-             allow_select="true"
-             follows="top|left|bottom|right"
-             height="211"
-             ignore_online_status="true"
-             layout="topleft"
-             left="3"
-             multi_select="true"
-             name="avatar_list"
-             top="145"
-             width="306" />
-            <panel
+        <layout_stack orientation="vertical" clip="false" follows="all" layout="topleft" top="0" left="0" height="355" width="313" mouse_opaque="false">
+          <layout_panel layout="topleft" top="0" left="0" height="142" width="313" user_resize="false" mouse_opaque="false" visibility_control="NearbyListShowMap">
+          <net_map
+            bg_color="NetMapBackgroundColor"
+            follows="all"
+            layout="topleft"
+            left="3"
+            mouse_opaque="false"
+            name="Net Map"
+            width="305"
+            height="140"
+            top="4"/>
+          </layout_panel>
+          <layout_panel layout="topleft" height="213" min_height="100" width="313" user_resize="false" mouse_opaque="false">
+          <avatar_list
+            allow_select="true"
+            follows="all"
+            height="211"
+            ignore_online_status="true"
+            layout="topleft"
+            left="3"
+            multi_select="true"
+            keep_one_selected="false"
+            name="avatar_list"
+            top="2"
+            width="306" />
+          </layout_panel>
+        </layout_stack>
+        <panel
              background_visible="true"
              follows="left|right|bottom"
              height="27"
-- 
cgit v1.2.3


From c3e4fd975cd6ce7af9521143d469ec9f017d47dd Mon Sep 17 00:00:00 2001
From: Twisted_Laws <none@none>
Date: Fri, 15 Apr 2011 14:32:56 -0400
Subject: STORM-1103 Nearby sidebar minimap should be optional, changes from
 review

---
 .../newview/skins/default/xui/en/panel_people.xml  | 79 ++++++++++++++--------
 1 file changed, 49 insertions(+), 30 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 1869eec476..775805ad2e 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -87,7 +87,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      width="319">
      	<panel
          background_opaque="true"
-       background_visible="true"
+         background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
          follows="all"
@@ -99,35 +99,54 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          name="nearby_panel"
          top="0"
          width="313">
-        <layout_stack orientation="vertical" clip="false" follows="all" layout="topleft" top="0" left="0" height="355" width="313" mouse_opaque="false">
-          <layout_panel layout="topleft" top="0" left="0" height="142" width="313" user_resize="false" mouse_opaque="false" visibility_control="NearbyListShowMap">
-          <net_map
-            bg_color="NetMapBackgroundColor"
-            follows="all"
-            layout="topleft"
-            left="3"
-            mouse_opaque="false"
-            name="Net Map"
-            width="305"
-            height="140"
-            top="4"/>
-          </layout_panel>
-          <layout_panel layout="topleft" height="213" min_height="100" width="313" user_resize="false" mouse_opaque="false">
-          <avatar_list
-            allow_select="true"
-            follows="all"
-            height="211"
-            ignore_online_status="true"
-            layout="topleft"
-            left="3"
-            multi_select="true"
-            keep_one_selected="false"
-            name="avatar_list"
-            top="2"
-            width="306" />
-          </layout_panel>
-        </layout_stack>
-        <panel
+         <layout_stack
+           clip="false"
+           follows="all"
+           height="355"
+           layout="topleft"
+           mouse_opaque="false"
+           orientation="vertical"
+           width="313">
+           <layout_panel
+             height="142"
+             layout="topleft"
+             mouse_opaque="false"
+             user_resize="false"
+             visibility_control="NearbyListShowMap"
+             width="313">
+             <net_map
+               bg_color="NetMapBackgroundColor"
+               follows="all"
+               height="140"
+               layout="topleft"
+               left="3"
+               mouse_opaque="false"
+               name="Net Map"
+               top="4"
+               width="305"/>
+           </layout_panel>
+           <layout_panel
+             height="213"
+             layout="topleft"
+             min_height="100"
+             mouse_opaque="false"
+             user_resize="false"
+             width="313">
+             <avatar_list
+               allow_select="true"
+               follows="all"
+               height="211"
+               ignore_online_status="true"
+               layout="topleft"
+               left="3"
+               keep_one_selected="false"
+               multi_select="true"
+               name="avatar_list"
+               top="2"
+               width="306" />
+           </layout_panel>
+         </layout_stack>
+         <panel
              background_visible="true"
              follows="left|right|bottom"
              height="27"
-- 
cgit v1.2.3


From bf8b02b1f31ac1b3959a537568b712fdf16d02e2 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 26 May 2011 09:17:14 -0400
Subject: STORM-899 'No attachments worn' text on blank 'Attachments' accordion
 remains in English for all locales

---
 indra/newview/skins/default/xui/en/panel_cof_wearables.xml | 3 ---
 indra/newview/skins/default/xui/en/strings.xml             | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index f438e3d42d..bbeb592e96 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -53,9 +53,6 @@
              name="list_attachments"
              top="0"
              width="311">
-              <flat_list_view.no_items_text
-               value="No attachments worn" />
-              </flat_list_view>
         </accordion_tab>
         <accordion_tab
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f8c90106b7..f7599c70ff 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2092,6 +2092,8 @@ Requests name of an avatar.  When data is available the dataserver event will be
 	<string name="InvFolder Friends">Friends</string>
 	<string name="InvFolder All">All</string>
 
+	<string name="no_attachments">No attachments worn</string>
+
 	<!-- inventory FVBridge -->
 	<!--  This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale  -->
 	<string name="Buy">Buy</string>
-- 
cgit v1.2.3


From ac504815137ec01767717e7c1a4c419a995f629c Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sun, 12 Jun 2011 16:00:33 -0400
Subject: STORM-787 Mute Gestures Button

---
 .../default/xui/en/panel_preferences_sound.xml     | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 91fe6f544c..1bdd2ccefb 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -123,8 +123,8 @@
          function="Pref.setControlFalse"
          parameter="MuteAmbient" />
     </slider>
-        <button
-    control_name="MuteAmbient"
+    <button
+     control_name="MuteAmbient"
      disabled_control="MuteAudio"
      follows="top|left"
      height="16"
@@ -157,7 +157,7 @@
          function="Pref.setControlFalse"
          parameter="MuteSounds" />
     </slider>
-   <button
+    <button
      control_name="MuteSounds"
      disabled_control="MuteAudio"
      follows="top|left"
@@ -169,7 +169,10 @@
      left_pad="5"
      name="mute_audio"
      tab_stop="false"
-     width="16" />
+     width="16">
+      <button.commit_callback
+      function="Pref.SetSounds"/>
+    </button>
     <slider
      control_name="AudioLevelMusic"
      disabled_control="MuteAudio"
@@ -311,6 +314,17 @@
 		name="enable_voice_check"
 		width="110"/>
 	<!-- -->
+	<check_box
+		name="gesture_audio_play_btn"
+		control_name="EnableGestureSounds"
+        disabled_control="MuteAudio"
+		value="true"
+		follows="left|bottom|right"
+		height="15"
+		tool_tip="Check this to hear sounds from gestures"
+		label="Enable sounds from gestures"
+		top_pad="1"
+		left="25"/>
 	<check_box
 		name="media_auto_play_btn"
 		control_name="ParcelMediaAutoPlayEnable"
-- 
cgit v1.2.3


From 8c998c5e8f6fee10e8bb96148db423a4020dd675 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sun, 12 Jun 2011 19:59:06 -0400
Subject: STORM-787 Mute Gestures Button

---
 indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 1bdd2ccefb..baa8d485ef 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -322,7 +322,7 @@
 		follows="left|bottom|right"
 		height="15"
 		tool_tip="Check this to hear sounds from gestures"
-		label="Enable sounds from gestures"
+		label="Play sounds from gestures"
 		top_pad="1"
 		left="25"/>
 	<check_box
-- 
cgit v1.2.3


From f1ec7a821b82df5361864ecfef49ee8cee4ba7d8 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Mon, 13 Jun 2011 15:28:24 -0700
Subject: FIX CT-636 CT-640 DA translation for Set22 and Set1

---
 .../skins/default/xui/da/floater_about_land.xml    |   4 +-
 indra/newview/skins/default/xui/da/floater_map.xml |   3 +
 .../newview/skins/default/xui/da/floater_tools.xml |   2 +
 .../skins/default/xui/da/menu_attachment_self.xml  |   2 +-
 .../skins/default/xui/da/menu_avatar_self.xml      |   2 +-
 .../skins/default/xui/da/menu_bottomtray.xml       |   2 +-
 .../default/xui/da/menu_inspect_avatar_gear.xml    |   6 +-
 .../default/xui/da/menu_inspect_self_gear.xml      |  39 ++-
 .../default/xui/da/menu_inventory_gear_default.xml |   1 +
 indra/newview/skins/default/xui/da/menu_object.xml |   4 +-
 .../default/xui/da/menu_places_gear_folder.xml     |   5 +-
 .../default/xui/da/menu_places_gear_landmark.xml   |   5 +-
 indra/newview/skins/default/xui/da/menu_viewer.xml |   8 +-
 .../newview/skins/default/xui/da/notifications.xml |  50 ++-
 indra/newview/skins/default/xui/da/panel_login.xml |   7 +
 .../skins/default/xui/da/panel_nearby_media.xml    |   2 +-
 .../newview/skins/default/xui/da/panel_people.xml  |   2 +
 .../default/xui/da/panel_preferences_sound.xml     |   4 +-
 .../newview/skins/default/xui/da/panel_profile.xml |   8 +-
 .../skins/default/xui/da/panel_script_ed.xml       |   3 +
 indra/newview/skins/default/xui/da/strings.xml     | 357 ++++++++++++++++++++-
 21 files changed, 469 insertions(+), 47 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
index 46e1eca126..5b9e618666 100644
--- a/indra/newview/skins/default/xui/da/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
@@ -346,6 +346,7 @@ Kun større parceller kan vises i søgning.
 				<combo_box.item label="Parker &amp; natur" name="item9"/>
 				<combo_box.item label="Beboelse" name="item10"/>
 				<combo_box.item label="Indkøb" name="item11"/>
+				<combo_box.item label="Leje" name="item13"/>
 				<combo_box.item label="Andet" name="item12"/>
 			</combo_box>
 			<combo_box name="land category">
@@ -360,6 +361,7 @@ Kun større parceller kan vises i søgning.
 				<combo_box.item label="Parker &amp; natur" name="item9"/>
 				<combo_box.item label="Beboelse" name="item10"/>
 				<combo_box.item label="Indkøb" name="item11"/>
+				<combo_box.item label="Leje" name="item13"/>
 				<combo_box.item label="Andet" name="item12"/>
 			</combo_box>
 			<check_box label="Mature indhold" name="MatureCheck" tool_tip=""/>
@@ -426,7 +428,7 @@ Kun større parceller kan vises i søgning.
 				(Defineret via estate)
 			</panel.string>
 			<panel.string name="allow_public_access">
-				Tillad adgang for alle ([MATURITY])
+				Tillad offentlig adgang ([MATURITY]) (Bemærk: Ellers oprettes blokeringslinier)
 			</panel.string>
 			<panel.string name="estate_override">
 				En eller flere af disse valg er indstillet på estate niveau
diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml
index 5df9bb5f6e..4912d73ba0 100644
--- a/indra/newview/skins/default/xui/da/floater_map.xml
+++ b/indra/newview/skins/default/xui/da/floater_map.xml
@@ -3,6 +3,9 @@
 	<floater.string name="ToolTipMsg">
 		[REGION](Dobbeltklik for at åbne kort, klik-og-træk for at panorere)
 	</floater.string>
+	<floater.string name="AltToolTipMsg">
+		[REGION](Dobbeltklik for at teleportere, træk for at panorere)
+	</floater.string>
 	<floater.string name="mini_map_caption">
 		MINIKORT
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml
index 9e673d0d5b..8264e366c0 100644
--- a/indra/newview/skins/default/xui/da/floater_tools.xml
+++ b/indra/newview/skins/default/xui/da/floater_tools.xml
@@ -64,6 +64,8 @@
 		<radio_item label="Vælg overflade" name="radio select face"/>
 	</radio_group>
 	<check_box label="Redigér lænkede" name="checkbox edit linked parts"/>
+	<button label="Sammenkæd" name="link_btn"/>
+	<button label="Adskil" name="unlink_btn"/>
 	<text name="RenderingCost" tool_tip="Hvis beregnede rendering omkostninger for dette objekt">
 		þ: [COUNT]
 	</text>
diff --git a/indra/newview/skins/default/xui/da/menu_attachment_self.xml b/indra/newview/skins/default/xui/da/menu_attachment_self.xml
index 1c19435f90..35ba27f9e2 100644
--- a/indra/newview/skins/default/xui/da/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/da/menu_attachment_self.xml
@@ -5,7 +5,7 @@
 	<menu_item_call label="Tag af" name="Detach"/>
 	<menu_item_call label="Sid ned" name="Sit Down Here"/>
 	<menu_item_call label="Stå op" name="Stand Up"/>
-	<menu_item_call label="Skift sæt" name="Change Outfit"/>
+	<menu_item_call label="Udseende" name="Change Outfit"/>
 	<menu_item_call label="Redigér mit sæt" name="Edit Outfit"/>
 	<menu_item_call label="Redigér min figur" name="Edit My Shape"/>
 	<menu_item_call label="Venner" name="Friends..."/>
diff --git a/indra/newview/skins/default/xui/da/menu_avatar_self.xml b/indra/newview/skins/default/xui/da/menu_avatar_self.xml
index 5a05a12b4e..0080f7a59e 100644
--- a/indra/newview/skins/default/xui/da/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/da/menu_avatar_self.xml
@@ -21,7 +21,7 @@
 		<context_menu label="Tag af" name="Object Detach"/>
 		<menu_item_call label="Tag alt af" name="Detach All"/>
 	</context_menu>
-	<menu_item_call label="Skift sæt" name="Chenge Outfit"/>
+	<menu_item_call label="Mit udseende" name="Chenge Outfit"/>
 	<menu_item_call label="Redigér mit sæt" name="Edit Outfit"/>
 	<menu_item_call label="Redigér min form" name="Edit My Shape"/>
 	<menu_item_call label="Venner" name="Friends..."/>
diff --git a/indra/newview/skins/default/xui/da/menu_bottomtray.xml b/indra/newview/skins/default/xui/da/menu_bottomtray.xml
index e979e35a91..9ac296904a 100644
--- a/indra/newview/skins/default/xui/da/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/da/menu_bottomtray.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="hide_camera_move_controls_menu">
+	<menu_item_check label="Stemme aktiveret" name="EnableVoiceChat"/>
 	<menu_item_check label="Faste bevægelser" name="ShowGestureButton"/>
 	<menu_item_check label="Bevægelse knap" name="ShowMoveButton"/>
 	<menu_item_check label="Vis knap" name="ShowCameraButton"/>
 	<menu_item_check label="Foto knap" name="ShowSnapshotButton"/>
-	<menu_item_check label="Sidepanel knap" name="ShowSidebarButton"/>
 	<menu_item_check label="Bygge knap" name="ShowBuildButton"/>
 	<menu_item_check label="Søge knap" name="ShowSearchButton"/>
 	<menu_item_check label="Kort knap" name="ShowWorldMapButton"/>
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
index 89111d49f1..8da35adb1b 100644
--- a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu name="Gear Menu">
+<toggleable_menu name="Gear Menu">
 	<menu_item_call label="Profil" name="view_profile"/>
 	<menu_item_call label="Tilføj ven" name="add_friend"/>
 	<menu_item_call label="Besked" name="im"/>
@@ -11,9 +11,11 @@
 	<menu_item_call label="Rapportér" name="report"/>
 	<menu_item_call label="Frys" name="freeze"/>
 	<menu_item_call label="Smid ud" name="eject"/>
+	<menu_item_call label="Spark" name="kick"/>
+	<menu_item_call label="CSR" name="csr"/>
 	<menu_item_call label="Debug teksturer" name="debug"/>
 	<menu_item_call label="Find på kort" name="find_on_map"/>
 	<menu_item_call label="Zoom ind" name="zoom_in"/>
 	<menu_item_call label="Betal" name="pay"/>
 	<menu_item_call label="Del" name="share"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
index a2ddd116a7..887c6484bc 100644
--- a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
@@ -1,10 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu name="Gear Menu">
-	<menu_item_call label="Sid ned" name="sit_down_here"/>
-	<menu_item_call label="Stå op" name="stand_up"/>
-	<menu_item_call label="Skift sæt" name="change_outfit"/>
-	<menu_item_call label="Profil" name="my_profile"/>
-	<menu_item_call label="Venner" name="my_friends"/>
-	<menu_item_call label="Grupper" name="my_groups"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Gear Menu">
+	<menu_item_call label="Sid ned" name="Sit Down Here"/>
+	<menu_item_call label="Stå op" name="Stand Up"/>
+	<context_menu label="Tag af" name="Take Off &gt;">
+		<context_menu label="Tøj" name="Clothes &gt;">
+			<menu_item_call label="Trøje" name="Shirt"/>
+			<menu_item_call label="Bukser" name="Pants"/>
+			<menu_item_call label="Nederdel" name="Skirt"/>
+			<menu_item_call label="Sko" name="Shoes"/>
+			<menu_item_call label="Strømper" name="Socks"/>
+			<menu_item_call label="Jakke" name="Jacket"/>
+			<menu_item_call label="Handsker" name="Gloves"/>
+			<menu_item_call label="Undertrøje" name="Self Undershirt"/>
+			<menu_item_call label="Underbukser" name="Self Underpants"/>
+			<menu_item_call label="Tatovering" name="Self Tattoo"/>
+			<menu_item_call label="Alpha" name="Self Alpha"/>
+			<menu_item_call label="Alt tøj" name="All Clothes"/>
+		</context_menu>
+		<context_menu label="HUD" name="Object Detach HUD"/>
+		<context_menu label="Tag af" name="Object Detach"/>
+		<menu_item_call label="Tag alt af" name="Detach All"/>
+	</context_menu>
+	<menu_item_call label="Skift sæt" name="Chenge Outfit"/>
+	<menu_item_call label="Redigér sæt" name="Edit Outfit"/>
+	<menu_item_call label="Redigér min figur" name="Edit My Shape"/>
+	<menu_item_call label="Mine venner" name="Friends..."/>
+	<menu_item_call label="Mine grupper" name="Groups..."/>
+	<menu_item_call label="Min profil" name="Profile..."/>
 	<menu_item_call label="Debug teksturer" name="Debug..."/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml
index b359d94f07..4809b24463 100644
--- a/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Nyt vindue" name="new_window"/>
 	<menu_item_check label="Sortér efter navn" name="sort_by_name"/>
 	<menu_item_check label="Sortér efter nyeste" name="sort_by_recent"/>
+	<menu_item_check label="Sortér altid mapper efter navn" name="sort_folders_by_name"/>
 	<menu_item_check label="Vis System mapper øverst" name="sort_system_folders_to_top"/>
 	<menu_item_call label="Vis filtre" name="show_filters"/>
 	<menu_item_call label="Nulstil filtre" name="reset_filters"/>
diff --git a/indra/newview/skins/default/xui/da/menu_object.xml b/indra/newview/skins/default/xui/da/menu_object.xml
index bc0cdde86f..ba62ccf90c 100644
--- a/indra/newview/skins/default/xui/da/menu_object.xml
+++ b/indra/newview/skins/default/xui/da/menu_object.xml
@@ -16,14 +16,14 @@
 		<context_menu label="Vedhæft" name="Object Attach"/>
 		<context_menu label="Vedhæft HUD" name="Object Attach HUD"/>
 	</context_menu>
-	<context_menu label="Fjern" name="Remove">
+	<context_menu label="Administrér" name="Remove">
 		<menu_item_call label="Rapportér misbrug" name="Report Abuse..."/>
 		<menu_item_call label="Blokér" name="Object Mute"/>
 		<menu_item_call label="Returnér" name="Return..."/>
-		<menu_item_call label="Slet" name="Delete"/>
 	</context_menu>
 	<menu_item_call label="Tag" name="Pie Object Take"/>
 	<menu_item_call label="Tag kopi" name="Take Copy"/>
 	<menu_item_call label="Betal" name="Pay..."/>
 	<menu_item_call label="Køb" name="Buy..."/>
+	<menu_item_call label="Slet" name="Delete"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml
index 3ee3c02fb1..5f573c2363 100644
--- a/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_folder_gear">
 	<menu_item_call label="Tilføj landemærke" name="add_landmark"/>
 	<menu_item_call label="Tilføj mappe" name="add_folder"/>
+	<menu_item_call label="Gendan genstand" name="restore_item"/>
 	<menu_item_call label="Klip" name="cut"/>
 	<menu_item_call label="Kopiér" name="copy_folder"/>
 	<menu_item_call label="Sæt ind" name="paste"/>
@@ -12,4 +13,4 @@
 	<menu_item_call label="Udvid alle mapper" name="expand_all"/>
 	<menu_item_call label="Luk alle mapper" name="collapse_all"/>
 	<menu_item_check label="Sortér efter dato" name="sort_by_date"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
index 21f425c49d..13dbcdd42e 100644
--- a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_ladmark_gear">
+<toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="Teleportér" name="teleport"/>
 	<menu_item_call label="Mere information" name="more_info"/>
 	<menu_item_call label="Vis på kort" name="show_on_map"/>
 	<menu_item_call label="Tilføj landemærke" name="add_landmark"/>
 	<menu_item_call label="Tilføj mappe" name="add_folder"/>
+	<menu_item_call label="Gendan genstand" name="restore_item"/>
 	<menu_item_call label="Klip" name="cut"/>
 	<menu_item_call label="Kopiér landemærke" name="copy_landmark"/>
 	<menu_item_call label="Kopiér SLurl" name="copy_slurl"/>
@@ -15,4 +16,4 @@
 	<menu_item_call label="Luk alle mapper" name="collapse_all"/>
 	<menu_item_check label="Sortér efter dato" name="sort_by_date"/>
 	<menu_item_call label="Opret favorit" name="create_pick"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
index fc32be9dc9..f59a0622be 100644
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -5,7 +5,7 @@
 		<menu_item_call label="Mit instrumentpanel" name="Manage My Account"/>
 		<menu_item_call label="Køb L$" name="Buy and Sell L$"/>
 		<menu_item_call label="Profil" name="Profile"/>
-		<menu_item_call label="Skift sæt" name="ChangeOutfit"/>
+		<menu_item_call label="Udseende" name="ChangeOutfit"/>
 		<menu_item_check label="Beholdning" name="Inventory"/>
 		<menu_item_check label="Min beholdning" name="ShowSidetrayInventory"/>
 		<menu_item_check label="Mine bevægelser" name="Gestures"/>
@@ -33,6 +33,7 @@
 	<menu label="Verden" name="World">
 		<menu_item_check label="Mini-kort" name="Mini-Map"/>
 		<menu_item_check label="Verdenskort" name="World Map"/>
+		<menu_item_check label="Søg" name="Search"/>
 		<menu_item_call label="Foto" name="Take Snapshot"/>
 		<menu_item_call label="Opret landemærke for dette sted" name="Create Landmark Here"/>
 		<menu label="Profil for sted" name="Land">
@@ -222,7 +223,9 @@
 		<menu label="Vis info" name="Display Info">
 			<menu_item_check label="Vis tid" name="Show Time"/>
 			<menu_item_check label="Vis gengivelses information" name="Show Render Info"/>
+			<menu_item_check label="Vis tekstur information" name="Show Texture Info"/>
 			<menu_item_check label="Vis farve under cursor" name="Show Color Under Cursor"/>
+			<menu_item_check label="Vis memory" name="Show Memory"/>
 			<menu_item_check label="Vis opdateringer på objekter" name="Show Updates"/>
 		</menu>
 		<menu label="Fremtving en fejl" name="Force Errors">
@@ -240,6 +243,9 @@
 			<menu_item_check label="Tilfældige framerates" name="Randomize Framerate"/>
 			<menu_item_check label="Frame test" name="Frame Test"/>
 		</menu>
+		<menu label="Render Metadata" name="Render Metadata">
+			<menu_item_check label="Opdatér type" name="Update Type"/>
+		</menu>
 		<menu label="Gengivelse" name="Rendering">
 			<menu_item_check label="Akser" name="Axes"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index 30b54d3eb2..0d2aaf45ce 100644
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -72,9 +72,9 @@ Fejl detaljer: Beskeden kaldet &apos;[_NAME]&apos; blev ikke fundet i notificati
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LoginFailedNoNetwork">
-		Kunne ikke oprette forbindelse til [SECOND_LIFE_GRID].
-&apos;[DIAGNOSTIC]&apos;
-Make sure your Internet connection is working properly.
+		Kunne ikke tilslutte til  [SECOND_LIFE_GRID].
+    &apos;[DIAGNOSTIC]&apos;
+Check at Internet forbindelsen fungerer korrekt.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="MessageTemplateNotFound">
@@ -215,13 +215,6 @@ Du skal bruge en konto for at benytte [SECOND_LIFE]. Ønsker du at oprette en ko
 	<notification name="InvalidCredentialFormat">
 		Du skal indtaste enten dit brugernavn eller både dit fornavn og efternavn for din avatar i brugernavn feltet, derefter log på igen.
 	</notification>
-	<notification name="AddClassified">
-		Annoncer vil vises i &apos;Annoncer&apos; sektionen i søge biblioteket og på [http://secondlife.com/community/classifieds secondlife.com] i en uge.
-Udfyld din annonce og klik på &apos;Udgiv...&apos; for at tilf&apos;je den til biblioteket.				
-Du vil blive spurgt om en pris når du klikker på &apos;Udgiv&apos;.
-Jo mere du betaler, jo højere oppe på listen vises annoncen, og den vil også optræde højere oppe når personer søger.
-		<usetemplate ignoretext="Hvordan man opretter en annonce" name="okcancelignore" notext="Cancel" yestext="OK"/>
-	</notification>
 	<notification name="DeleteMedia">
 		Du har valgt at slette media tilknyttet denne overflade.
 Er du sikker på at du vil fortsætte?
@@ -1664,7 +1657,7 @@ Knappen vil blive vist når der er nok plads til den.
 
 &lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
 
-Med følgende beboere:
+Me følgende beboere:
 
 [RESIDENTS]
 		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="Ok"/>
@@ -1756,9 +1749,6 @@ Sluk for alles lyd?
 	<notification label="Undersøg verden" name="HintDestinationGuide">
 		Destinationsguiden indeholder tusinder af nye steder der kan opleves. Vælg venligst et sted og vælg Teleport for at komme derhen.
 	</notification>
-	<notification label="Ændre dit udseende" name="HintAvatarPicker">
-		Kunne du tænke dig at prøve et nyt udseende? Klik på knappen nedenfor for at se flere avatarer.
-	</notification>
 	<notification label="Side panel" name="HintSidePanel">
 		Få hurtig tilgang til din beholdning, sæt, profiler og andet i dette side panel.
 	</notification>
@@ -1796,6 +1786,38 @@ Sluk for alles lyd?
 			<button name="cancel" text="Annullér"/>
 		</form>
 	</notification>
+	<notification label="" name="ModeChange">
+		For at skifte tilstand skal du genstarte programmet.
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoClassifieds">
+		Oprettelse og redigering af annoncer er kun muligt i avanceret tilstand. Ønsker du at logge ud for at skifte tilstand? Valg af tilstand findes på login skærmbilledet.
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoGroupInfo">
+		Oprettelse og redigering af grupper er kun muligt i avanceret tilstand. Ønsker du at logge ud for at skifte tilstand? Valg af tilstand findes på login skærmbilledet.
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoPicks">
+		Oprettelse og redigering af favoritter er kun mulig i avanceret tilstand. Ønsker du at logge ud for at skifte tilstand? Valg af tilstand findes på login skærmbilledet.
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoWorldMap">
+		Det er kun muligt at se verdenskortet i avanceret tilstand.Ønsker du at logge ud for at skifte tilstand? Valg af tilstand findes på login skærmbilledet.
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoVoiceCall">
+		Stemme kald kan kun benttes i avanceret tilstand. Ønsker du at logge ud for at skifte tilstand?
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoAvatarShare">
+		Det er kun mulig at dele i avanceret tilstand. Ønsker du at logge ud for at skifte tilstand?
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoAvatarPay">
+		Det er kun muligt at betale andre beboere i avanceret tilstand. Ønsker du at logge ud for at skifte tilstand?
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Det ser ikke ud til at din hardware opfylder minimumskravene til [APP_NAME]. [APP_NAME] kræver et OpenGL grafikkort som understøter &apos;multitexture&apos;. Check eventuelt om du har de nyeste drivere for grafikkortet, og de nyeste service-packs og patches til dit operativsystem.
 
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index dc8d9bc432..2e0f726e1a 100644
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -17,6 +17,13 @@
 			</text>
 			<check_box label="Husk password" name="remember_check"/>
 			<button label="Log på" name="connect_btn"/>
+			<text name="mode_selection_text">
+				Tilstand:
+			</text>
+			<combo_box name="mode_combo" tool_tip="Vælg ønsket tilstand. Vælg basis for hurtig og nem udforskning og chat. Vælg avanceret for at få adgang til flere muligheder.">
+				<combo_box.item label="Basis" name="Basic"/>
+				<combo_box.item label="Avanceret" name="Advanced"/>
+			</combo_box>
 			<text name="start_location_text">
 				Start ved:
 			</text>
diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml
index b4be70a22a..ef8ed3ad07 100644
--- a/indra/newview/skins/default/xui/da/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/da/panel_nearby_media.xml
@@ -19,7 +19,7 @@
 		<button label="Stop alt" name="all_nearby_media_disable_btn" tool_tip="Stop al media tæt på"/>
 		<button label="Start alt" name="all_nearby_media_enable_btn" tool_tip="Tænd al media tæt på"/>
 		<button name="open_prefs_btn" tool_tip="Vis media preferencer"/>
-		<button label="Mere &gt;&gt;" label_selected="Mindre &lt;&lt;" name="more_btn" tool_tip="Advancerede kontroller"/>
+		<button label="Mere &gt;&gt;" label_selected="&lt;&lt; Mindre" name="more_btn" tool_tip="Advancerede kontroller"/>
 		<button label="Mere &gt;&gt;" label_selected="Mindre &lt;&lt;" name="less_btn" tool_tip="Advancerede kontroller"/>
 	</panel>
 	<panel name="nearby_media_panel">
diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml
index b85a33279a..925492b2d7 100644
--- a/indra/newview/skins/default/xui/da/panel_people.xml
+++ b/indra/newview/skins/default/xui/da/panel_people.xml
@@ -18,6 +18,8 @@ Leder du efter nogen at være sammen med? Prøv [secondlife:///app/worldmap Verd
 	<string name="groups_filter_label" value="Filtrér grupper"/>
 	<string name="no_filtered_groups_msg" value="Fandt du ikke det du søgte? Prøv [secondlife:///app/search/groups/[SEARCH_TERM] Søg]."/>
 	<string name="no_groups_msg" value="Leder du efter grupper at være med i? Prøv [secondlife:///app/search/groups Søg]."/>
+	<string name="MiniMapToolTipMsg" value="[REGION](Dobbeltklik for at åbne kort, træk for at panorere)"/>
+	<string name="AltMiniMapToolTipMsg" value="[REGION](Dobbelt-klik fot at teleportere, træk for at panorere)"/>
 	<filter_editor label="Filtrér" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="TÆT PÅ" name="nearby_panel">
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
index 067463be02..0626976cb5 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
@@ -5,7 +5,9 @@
 	</panel.string>
 	<slider label="Generel" name="System Volume"/>
 	<check_box initial_value="true" name="mute_when_minimized"/>
-	<text name="mute_chb_label">Sluk lyd når minimeret</text>
+	<text name="mute_chb_label">
+		Sluk lyd når minimeret
+	</text>
 	<slider label="Knapper" name="UI Volume"/>
 	<slider label="Omgivelser" name="Wind Volume"/>
 	<slider label="Lyd effekter" name="SFX Volume"/>
diff --git a/indra/newview/skins/default/xui/da/panel_profile.xml b/indra/newview/skins/default/xui/da/panel_profile.xml
index b8b99a9c21..db85eb23a8 100644
--- a/indra/newview/skins/default/xui/da/panel_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_profile.xml
@@ -5,6 +5,12 @@
 	<string name="RegisterDateFormat">
 		[REG_DATE] ([AGE])
 	</string>
+	<string name="name_text_args">
+		[NAME]
+	</string>
+	<string name="display_name_text_args">
+		[DISPLAY_NAME]
+	</string>
 	<layout_stack name="layout">
 		<layout_panel name="profile_stack">
 			<scroll_container name="profile_scroll">
@@ -19,7 +25,7 @@
 					<text name="title_acc_status_text" value="Konto status:"/>
 					<text name="title_partner_text" value="Partner:"/>
 					<panel name="partner_data_panel">
-						<name_box initial_value="(henter)" name="partner_text"/>
+						<text initial_value="(henter)" name="partner_text"/>
 					</panel>
 					<text name="title_groups_text" value="Grupper:"/>
 				</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_script_ed.xml b/indra/newview/skins/default/xui/da/panel_script_ed.xml
index 8997cab30c..3dec4bf101 100644
--- a/indra/newview/skins/default/xui/da/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/da/panel_script_ed.xml
@@ -15,6 +15,9 @@
 	<panel.string name="Title">
 		Script: [NAME]
 	</panel.string>
+	<panel.string name="external_editor_not_set">
+		Vælg en editor ved at opsætte miljø-variablen LL_SCRIPT_EDITOR eller opsætning af Ekstern editor.
+	</panel.string>
 	<menu_bar name="script_menu">
 		<menu label="Filer" name="File">
 			<menu_item_call label="Gem" name="Save"/>
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index b0b4d1ccc6..afc826d6d7 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -1037,7 +1037,7 @@
 	</string>
 	<string name="WornOnAttachmentPoint" value=" (båret på [ATTACHMENT_POINT])"/>
 	<string name="ActiveGesture" value="[GESLABEL] (aktiv)"/>
-	<string name="Chat" value=" Chat : "/>
+	<string name="Chat Message" value="Chat :"/>
 	<string name="Sound" value=" Lyd : "/>
 	<string name="Wait" value=" --- Vent : "/>
 	<string name="AnimFlagStop" value=" Stop Animation :   "/>
@@ -1819,12 +1819,6 @@ Forventet .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	<string name="accel-win-shift">
 		Shift+
 	</string>
-	<string name="Esc">
-		Esc
-	</string>
-	<string name="Home">
-		Hjem
-	</string>
 	<string name="FileSaved">
 		Fil gemt
 	</string>
@@ -1942,6 +1936,9 @@ Forventet .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	<string name="Other">
 		Andet
 	</string>
+	<string name="Rental">
+		Leje
+	</string>
 	<string name="Any">
 		Enhver
 	</string>
@@ -3861,7 +3858,7 @@ Krænkelsesanmeldelse
 	<string name="Notices">
 		Beskeder
 	</string>
-	<string name="Chat">
+	<string name="Chat" value=" Chat : ">
 		Chat
 	</string>
 	<string name="DeleteItems">
@@ -3873,4 +3870,348 @@ Krænkelsesanmeldelse
 	<string name="EmptyOutfitText">
 		Der er ingen genstande i dette sæt
 	</string>
+	<string name="ExternalEditorNotSet">
+		Vælg en editor via opsætningen for Ekstern editor.
+	</string>
+	<string name="ExternalEditorNotFound">
+		Kan ikke benytte deb eksterne editor der er angivet.
+Prøv at omkrandse stien til editor med anførselstegn.				
+(f.eks. &quot;/stil til min editor&quot; &quot;%s&quot;)
+	</string>
+	<string name="ExternalEditorCommandParseError">
+		Fejl ved håndtering af kommando til ekstern editor.
+	</string>
+	<string name="ExternalEditorFailedToRun">
+		Den eksterne editor kunne ikke startes.
+	</string>
+	<string name="Esc">
+		Esc
+	</string>
+	<string name="Space">
+		Space
+	</string>
+	<string name="Enter">
+		Enter
+	</string>
+	<string name="Tab">
+		Tab
+	</string>
+	<string name="Ins">
+		Ins
+	</string>
+	<string name="Del">
+		Del
+	</string>
+	<string name="Backsp">
+		Backsp
+	</string>
+	<string name="Shift">
+		Shift
+	</string>
+	<string name="Ctrl">
+		Ctrl
+	</string>
+	<string name="Alt">
+		Alt
+	</string>
+	<string name="CapsLock">
+		CapsLock
+	</string>
+	<string name="Home">
+		Hjem
+	</string>
+	<string name="End">
+		End
+	</string>
+	<string name="PgUp">
+		PgUp
+	</string>
+	<string name="PgDn">
+		PgDn
+	</string>
+	<string name="F1">
+		F1
+	</string>
+	<string name="F2">
+		F2
+	</string>
+	<string name="F3">
+		F3
+	</string>
+	<string name="F4">
+		F4
+	</string>
+	<string name="F5">
+		F5
+	</string>
+	<string name="F6">
+		F6
+	</string>
+	<string name="F7">
+		F7
+	</string>
+	<string name="F8">
+		F8
+	</string>
+	<string name="F9">
+		F9
+	</string>
+	<string name="F10">
+		F10
+	</string>
+	<string name="F11">
+		F11
+	</string>
+	<string name="F12">
+		F12
+	</string>
+	<string name="Add">
+		Tilføj
+	</string>
+	<string name="Subtract">
+		Træk fra
+	</string>
+	<string name="Multiply">
+		Multiplicer
+	</string>
+	<string name="Divide">
+		Divider
+	</string>
+	<string name="PAD_DIVIDE">
+		PAD_DIVIDE
+	</string>
+	<string name="PAD_LEFT">
+		PAD_LEFT
+	</string>
+	<string name="PAD_RIGHT">
+		PAD_RIGHT
+	</string>
+	<string name="PAD_DOWN">
+		PAD_DOWN
+	</string>
+	<string name="PAD_UP">
+		PAD_UP
+	</string>
+	<string name="PAD_HOME">
+		PAD_HOME
+	</string>
+	<string name="PAD_END">
+		PAD_END
+	</string>
+	<string name="PAD_PGUP">
+		PAD_PGUP
+	</string>
+	<string name="PAD_PGDN">
+		PAD_PGDN
+	</string>
+	<string name="PAD_CENTER">
+		PAD_CENTER
+	</string>
+	<string name="PAD_INS">
+		PAD_INS
+	</string>
+	<string name="PAD_DEL">
+		PAD_DEL
+	</string>
+	<string name="PAD_Enter">
+		PAD_Enter
+	</string>
+	<string name="PAD_BUTTON0">
+		PAD_BUTTON0
+	</string>
+	<string name="PAD_BUTTON1">
+		PAD_BUTTON1
+	</string>
+	<string name="PAD_BUTTON2">
+		PAD_BUTTON2
+	</string>
+	<string name="PAD_BUTTON3">
+		PAD_BUTTON3
+	</string>
+	<string name="PAD_BUTTON4">
+		PAD_BUTTON4
+	</string>
+	<string name="PAD_BUTTON5">
+		PAD_BUTTON5
+	</string>
+	<string name="PAD_BUTTON6">
+		PAD_BUTTON6
+	</string>
+	<string name="PAD_BUTTON7">
+		PAD_BUTTON7
+	</string>
+	<string name="PAD_BUTTON8">
+		PAD_BUTTON8
+	</string>
+	<string name="PAD_BUTTON9">
+		PAD_BUTTON9
+	</string>
+	<string name="PAD_BUTTON10">
+		PAD_BUTTON10
+	</string>
+	<string name="PAD_BUTTON11">
+		PAD_BUTTON11
+	</string>
+	<string name="PAD_BUTTON12">
+		PAD_BUTTON12
+	</string>
+	<string name="PAD_BUTTON13">
+		PAD_BUTTON13
+	</string>
+	<string name="PAD_BUTTON14">
+		PAD_BUTTON14
+	</string>
+	<string name="PAD_BUTTON15">
+		PAD_BUTTON15
+	</string>
+	<string name="-">
+		-
+	</string>
+	<string name="=">
+		=
+	</string>
+	<string name="`">
+		`
+	</string>
+	<string name=";">
+		;
+	</string>
+	<string name="[">
+		[
+	</string>
+	<string name="]">
+		]
+	</string>
+	<string name="\">
+		\
+	</string>
+	<string name="0">
+		0
+	</string>
+	<string name="1">
+		1
+	</string>
+	<string name="2">
+		2
+	</string>
+	<string name="3">
+		3
+	</string>
+	<string name="4">
+		4
+	</string>
+	<string name="5">
+		5
+	</string>
+	<string name="6">
+		6
+	</string>
+	<string name="7">
+		7
+	</string>
+	<string name="8">
+		8
+	</string>
+	<string name="9">
+		9
+	</string>
+	<string name="A">
+		A
+	</string>
+	<string name="B">
+		B
+	</string>
+	<string name="C">
+		C
+	</string>
+	<string name="D">
+		D
+	</string>
+	<string name="E">
+		E
+	</string>
+	<string name="F">
+		F
+	</string>
+	<string name="G">
+		G
+	</string>
+	<string name="H">
+		H
+	</string>
+	<string name="I">
+		I
+	</string>
+	<string name="J">
+		J
+	</string>
+	<string name="K">
+		K
+	</string>
+	<string name="L">
+		L
+	</string>
+	<string name="M">
+		M
+	</string>
+	<string name="N">
+		N
+	</string>
+	<string name="O">
+		O
+	</string>
+	<string name="P">
+		P
+	</string>
+	<string name="Q">
+		Q
+	</string>
+	<string name="R">
+		R
+	</string>
+	<string name="S">
+		S
+	</string>
+	<string name="T">
+		T
+	</string>
+	<string name="U">
+		U
+	</string>
+	<string name="V">
+		V
+	</string>
+	<string name="W">
+		W
+	</string>
+	<string name="X">
+		X
+	</string>
+	<string name="Y">
+		Y
+	</string>
+	<string name="Z">
+		Z
+	</string>
+	<string name="BeaconParticle">
+		Viser pejlelys for for partikler (blå)
+	</string>
+	<string name="BeaconPhysical">
+		Viser pejlelys for fysiske objekter (grøn)
+	</string>
+	<string name="BeaconScripted">
+		Viser pejlelys for &quot;scriptede&quot; objekter (rød)
+	</string>
+	<string name="BeaconScriptedTouch">
+		Viser pejlelys for &quot;scriptede&quot; objekter med berøringsfunktion (rød)
+	</string>
+	<string name="BeaconSound">
+		Viser pejlelys for lyd  (gul)
+	</string>
+	<string name="BeaconMedia">
+		Viser pejlelys for media (hvid)
+	</string>
+	<string name="ParticleHiding">
+		Skjuler partikler
+	</string>
 </strings>
-- 
cgit v1.2.3


From 9fe946457098279640e2ffd477866c9878e5f635 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Mon, 13 Jun 2011 15:30:02 -0700
Subject: FIX VWR-25984

---
 indra/newview/skins/default/xui/es/notifications.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 9674f73241..b2131fc038 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -2365,6 +2365,9 @@ Por favor, dirígete a la Base de Conocimientos para más detalles sobre el acce
 	<notification name="ImproperPaymentStatus">
 		No tienes el estado de pago adecuado para entrar a esta región.
 	</notification>
+	<notification name="MustGetAgeRgion">
+		Debes tener verificada la edad para entrar a esta región
+	</notification>
 	<notification name="MustGetAgeParcel">
 		Debes haber verificado tu edad para entrar a esta parcela.
 	</notification>
-- 
cgit v1.2.3


From 0c8b3ea7448a9da069d20fdf3d48a6feec7eb33f Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 13 Jun 2011 18:35:46 -0400
Subject: STORM-787 Mute Gestures Button--moved check box down 2 lines

---
 .../default/xui/en/panel_preferences_sound.xml     | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index baa8d485ef..1745c1e4b0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -314,17 +314,6 @@
 		name="enable_voice_check"
 		width="110"/>
 	<!-- -->
-	<check_box
-		name="gesture_audio_play_btn"
-		control_name="EnableGestureSounds"
-        disabled_control="MuteAudio"
-		value="true"
-		follows="left|bottom|right"
-		height="15"
-		tool_tip="Check this to hear sounds from gestures"
-		label="Play sounds from gestures"
-		top_pad="1"
-		left="25"/>
 	<check_box
 		name="media_auto_play_btn"
 		control_name="ParcelMediaAutoPlayEnable"
@@ -346,7 +335,17 @@
 		label="Play media attached to other avatars"
 		left="25"
     width="230"/>
-
+	<check_box
+		name="gesture_audio_play_btn"
+		control_name="EnableGestureSounds"
+        disabled_control="MuteAudio"
+		value="true"
+		follows="left|bottom|right"
+		height="15"
+		tool_tip="Check this to hear sounds from gestures"
+		label="Play sounds from gestures"
+		top_pad="1"
+		left="25"/>
     <text
      type="string"
      length="1"
-- 
cgit v1.2.3


From b4bf02ae5056cf79395c178cca08795a4cddb368 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Tue, 14 Jun 2011 12:17:10 -0700
Subject: WIP INTL-46 Traditional Chinese translation update

---
 .../newview/skins/default/xui/zh/floater_about.xml |  10 +-
 .../skins/default/xui/zh/floater_about_land.xml    |  50 +--
 .../default/xui/zh/floater_animation_preview.xml   |   2 +-
 .../skins/default/xui/zh/floater_avatar_picker.xml |  12 +-
 .../skins/default/xui/zh/floater_bulk_perms.xml    |  12 +-
 .../skins/default/xui/zh/floater_buy_contents.xml  |   2 +-
 .../skins/default/xui/zh/floater_buy_currency.xml  |   2 +-
 .../skins/default/xui/zh/floater_buy_land.xml      |   8 +-
 .../skins/default/xui/zh/floater_buy_object.xml    |   2 +-
 .../skins/default/xui/zh/floater_choose_group.xml  |   2 +-
 .../skins/default/xui/zh/floater_color_picker.xml  |   2 +-
 .../skins/default/xui/zh/floater_display_name.xml  |   2 +-
 .../skins/default/xui/zh/floater_gesture.xml       |   2 +-
 .../skins/default/xui/zh/floater_god_tools.xml     |   2 +-
 .../skins/default/xui/zh/floater_image_preview.xml |  10 +-
 .../skins/default/xui/zh/floater_joystick.xml      |   2 +-
 .../skins/default/xui/zh/floater_lagmeter.xml      |   2 +-
 .../default/xui/zh/floater_live_lsleditor.xml      |   6 +-
 .../default/xui/zh/floater_media_settings.xml      |   2 +-
 .../skins/default/xui/zh/floater_mute_object.xml   |   2 +-
 .../skins/default/xui/zh/floater_openobject.xml    |   2 +-
 .../default/xui/zh/floater_outfit_save_as.xml      |   2 +-
 .../skins/default/xui/zh/floater_outgoing_call.xml |   2 +-
 indra/newview/skins/default/xui/zh/floater_pay.xml |   2 +-
 .../skins/default/xui/zh/floater_pay_object.xml    |   4 +-
 .../skins/default/xui/zh/floater_perm_prefs.xml    |   2 +-
 .../skins/default/xui/zh/floater_postcard.xml      |  20 +-
 .../skins/default/xui/zh/floater_preferences.xml   |  20 +-
 .../default/xui/zh/floater_preview_notecard.xml    |   2 +-
 .../default/xui/zh/floater_publish_classified.xml  |   2 +-
 .../skins/default/xui/zh/floater_report_abuse.xml  |   2 +-
 .../skins/default/xui/zh/floater_script_search.xml |   6 +-
 .../skins/default/xui/zh/floater_select_key.xml    |   2 +-
 .../skins/default/xui/zh/floater_sell_land.xml     |   2 +-
 .../skins/default/xui/zh/floater_snapshot.xml      |  12 +-
 .../skins/default/xui/zh/floater_sound_preview.xml |   2 +-
 .../skins/default/xui/zh/floater_sys_well.xml      |   4 +-
 .../skins/default/xui/zh/floater_texture_ctrl.xml  |   2 +-
 .../newview/skins/default/xui/zh/floater_tools.xml |  16 +-
 indra/newview/skins/default/xui/zh/floater_tos.xml |   2 +-
 .../skins/default/xui/zh/floater_url_entry.xml     |   2 +-
 .../skins/default/xui/zh/floater_voice_effect.xml  |   2 +-
 .../newview/skins/default/xui/zh/floater_water.xml |   2 +-
 .../default/xui/zh/floater_whitelist_entry.xml     |   2 +-
 .../default/xui/zh/floater_windlight_options.xml   |   4 +-
 .../skins/default/xui/zh/floater_window_size.xml   |   2 +-
 .../skins/default/xui/zh/menu_attachment_other.xml |   4 +-
 .../skins/default/xui/zh/menu_avatar_other.xml     |   4 +-
 .../skins/default/xui/zh/menu_bottomtray.xml       |  14 +-
 indra/newview/skins/default/xui/zh/menu_edit.xml   |   2 +-
 .../skins/default/xui/zh/menu_hide_navbar.xml      |   6 +-
 .../skins/default/xui/zh/menu_imchiclet_adhoc.xml  |   2 +-
 .../skins/default/xui/zh/menu_imchiclet_group.xml  |   4 +-
 .../skins/default/xui/zh/menu_imchiclet_p2p.xml    |   4 +-
 .../default/xui/zh/menu_inspect_avatar_gear.xml    |   6 +-
 .../newview/skins/default/xui/zh/menu_landmark.xml |   2 +-
 indra/newview/skins/default/xui/zh/menu_login.xml  |  10 +-
 .../skins/default/xui/zh/menu_nearby_chat.xml      |   2 +-
 indra/newview/skins/default/xui/zh/menu_object.xml |  24 +-
 .../skins/default/xui/zh/menu_profile_overflow.xml |   6 +-
 .../default/xui/zh/menu_teleport_history_tab.xml   |   2 +-
 .../skins/default/xui/zh/menu_url_agent.xml        |   2 +-
 .../skins/default/xui/zh/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/zh/menu_viewer.xml |  26 +-
 indra/newview/skins/default/xui/zh/mime_types.xml  |  20 +-
 .../skins/default/xui/zh/mime_types_linux.xml      |  22 +-
 .../skins/default/xui/zh/mime_types_mac.xml        |  20 +-
 .../newview/skins/default/xui/zh/notifications.xml | 374 ++++++++++-----------
 .../default/xui/zh/panel_body_parts_list_item.xml  |   4 +-
 .../skins/default/xui/zh/panel_bottomtray.xml      |   2 +-
 .../skins/default/xui/zh/panel_bottomtray_lite.xml |   2 +-
 .../xui/zh/panel_clothing_list_button_bar.xml      |   2 +-
 .../skins/default/xui/zh/panel_edit_classified.xml |   6 +-
 .../skins/default/xui/zh/panel_edit_pick.xml       |   4 +-
 .../skins/default/xui/zh/panel_edit_profile.xml    |  16 +-
 .../skins/default/xui/zh/panel_edit_wearable.xml   |   8 +-
 .../skins/default/xui/zh/panel_group_general.xml   |  18 +-
 .../default/xui/zh/panel_group_info_sidetray.xml   |   8 +-
 .../skins/default/xui/zh/panel_group_invite.xml    |   4 +-
 .../skins/default/xui/zh/panel_group_notices.xml   |  24 +-
 .../skins/default/xui/zh/panel_group_roles.xml     |  34 +-
 .../skins/default/xui/zh/panel_landmarks.xml       |   2 +-
 .../xui/zh/panel_media_settings_permissions.xml    |   6 +-
 .../skins/default/xui/zh/panel_navigation_bar.xml  |   8 +-
 indra/newview/skins/default/xui/zh/panel_notes.xml |   2 +-
 .../newview/skins/default/xui/zh/panel_people.xml  |   4 +-
 .../newview/skins/default/xui/zh/panel_places.xml  |   2 +-
 .../default/xui/zh/panel_preferences_advanced.xml  |   2 +-
 .../default/xui/zh/panel_preferences_chat.xml      |   4 +-
 .../default/xui/zh/panel_preferences_general.xml   |   4 +-
 .../default/xui/zh/panel_preferences_graphics1.xml |   6 +-
 .../default/xui/zh/panel_preferences_privacy.xml   |   2 +-
 .../default/xui/zh/panel_preferences_sound.xml     |   2 +-
 .../newview/skins/default/xui/zh/panel_profile.xml |   4 +-
 .../skins/default/xui/zh/panel_profile_view.xml    |   4 +-
 .../skins/default/xui/zh/panel_region_debug.xml    |   2 +-
 .../skins/default/xui/zh/panel_region_estate.xml   |  24 +-
 .../skins/default/xui/zh/panel_region_general.xml  |   2 +-
 .../skins/default/xui/zh/panel_region_terrain.xml  |   4 +-
 .../skins/default/xui/zh/panel_script_ed.xml       |   6 +-
 .../xui/zh/panel_script_limits_region_memory.xml   |  10 +-
 .../skins/default/xui/zh/panel_side_tray.xml       |  10 +-
 .../newview/skins/default/xui/zh/role_actions.xml  |  12 +-
 .../skins/default/xui/zh/sidepanel_item_info.xml   |   2 +-
 .../skins/default/xui/zh/sidepanel_task_info.xml   |   2 +-
 indra/newview/skins/default/xui/zh/strings.xml     | 128 +++----
 106 files changed, 600 insertions(+), 600 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index 229297e39b..58e8c41c38 100644
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -13,11 +13,11 @@
 [[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]
 	</floater.string>
 	<floater.string name="AboutSystem">
-		CPU: [CPU]
-Memory: [MEMORY_MB] MB
-OS Version: [OS_VERSION]
-Graphics Card Vendor: [GRAPHICS_CARD_VENDOR]
-Graphics Card: [GRAPHICS_CARD]
+		CPU：[CPU]
+記憶體：[MEMORY_MB] MB
+作業系統版本：[OS_VERSION]
+顯示卡供應商：[GRAPHICS_CARD_VENDOR]
+顯示卡：[GRAPHICS_CARD]
 	</floater.string>
 	<floater.string name="AboutDriver">
 		Windows Graphics Driver Version: [GRAPHICS_DRIVER_VERSION]
diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml
index c0c5494c91..a9142b22ad 100644
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -132,10 +132,10 @@
 				0
 			</text>
 			<button label="購買土地" name="Buy Land..."/>
-			<button label="Script Info" name="Scripts..."/>
+			<button label="腳本資訊" name="Scripts..."/>
 			<button label="Buy For Group" name="Buy For Group..."/>
-			<button label="Buy Pass" name="Buy Pass..." tool_tip="A pass gives you temporary access to this land."/>
-			<button label="Abandon Land" name="Abandon Land..."/>
+			<button label="購買通行權" name="Buy Pass..." tool_tip="A pass gives you temporary access to this land."/>
+			<button label="放棄土地" name="Abandon Land..."/>
 			<button label="Reclaim Land" name="Reclaim Land..."/>
 			<button label="Linden Sale" name="Linden Sale..." tool_tip="Land must be owned, set content, and not already for auction."/>
 		</panel>
@@ -201,7 +201,7 @@
 				Land in this region may not be joined/subdivided.
 			</text>
 		</panel>
-		<panel label="OBJECTS" name="land_objects_panel">
+		<panel label="物件" name="land_objects_panel">
 			<panel.string name="objects_available_text">
 				[COUNT] out of [MAX] ([AVAILABLE] available)
 			</panel.string>
@@ -235,24 +235,24 @@
 			<text name="owner_objects_text">
 				[COUNT]
 			</text>
-			<button label="Show" label_selected="Show" name="ShowOwner"/>
-			<button label="Return" name="ReturnOwner..." tool_tip="Return objects to their owners."/>
+			<button label="顯示" label_selected="顯示" name="ShowOwner"/>
+			<button label="退回" name="ReturnOwner..." tool_tip="Return objects to their owners."/>
 			<text name="Set to group:">
 				Set to group:
 			</text>
 			<text name="group_objects_text">
 				[COUNT]
 			</text>
-			<button label="Show" label_selected="Show" name="ShowGroup"/>
-			<button label="Return" name="ReturnGroup..." tool_tip="Return objects to their owners."/>
+			<button label="顯示" label_selected="顯示" name="ShowGroup"/>
+			<button label="退回" name="ReturnGroup..." tool_tip="Return objects to their owners."/>
 			<text name="Owned by others:">
 				Owned by others:
 			</text>
 			<text name="other_objects_text">
 				[COUNT]
 			</text>
-			<button label="Show" label_selected="Show" name="ShowOther"/>
-			<button label="Return" name="ReturnOther..." tool_tip="Return objects to their owners."/>
+			<button label="顯示" label_selected="顯示" name="ShowOther"/>
+			<button label="退回" name="ReturnOther..." tool_tip="Return objects to their owners."/>
 			<text name="Selected / sat upon:">
 				Selected / sat upon:
 			</text>
@@ -301,10 +301,10 @@ Only large parcels can be listed in search.
 				（無）
 			</panel.string>
 			<panel.string name="push_restrict_text">
-				No Pushing
+				禁止推撞
 			</panel.string>
 			<panel.string name="push_restrict_region_text">
-				No Pushing (Region Override)
+				禁止推撞（地區設定覆蓋）
 			</panel.string>
 			<text name="allow_label">
 				Allow other Residents to:
@@ -314,26 +314,26 @@ Only large parcels can be listed in search.
 			<text name="allow_label2">
 				建造：
 			</text>
-			<check_box label="Everyone" name="edit objects check"/>
+			<check_box label="任何人" name="edit objects check"/>
 			<check_box label="社團" name="edit group objects check"/>
 			<text name="allow_label3">
 				Object Entry:
 			</text>
-			<check_box label="Everyone" name="all object entry check"/>
+			<check_box label="任何人" name="all object entry check"/>
 			<check_box label="社團" name="group object entry check"/>
 			<text name="allow_label4">
 				Run Scripts:
 			</text>
-			<check_box label="Everyone" name="check other scripts"/>
+			<check_box label="任何人" name="check other scripts"/>
 			<check_box label="社團" name="check group scripts"/>
 			<text name="land_options_label">
 				Land Options:
 			</text>
-			<check_box label="Safe (no damage)" name="check safe" tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."/>
-			<check_box label="No Pushing" name="PushRestrictCheck" tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land."/>
-			<check_box label="Show Place in Search (L$30/week)" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results"/>
+			<check_box label="安全（無傷害）" name="check safe" tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."/>
+			<check_box label="禁止推撞" name="PushRestrictCheck" tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land."/>
+			<check_box label="將地點刊登顯示在搜尋中（L$30 / 每週）" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results"/>
 			<combo_box name="land category with adult">
-				<combo_box.item label="Any Category" name="item0"/>
+				<combo_box.item label="任何類別" name="item0"/>
 				<combo_box.item label="Linden Location" name="item1"/>
 				<combo_box.item label="Adult" name="item2"/>
 				<combo_box.item label="Arts &amp; Culture" name="item3"/>
@@ -349,7 +349,7 @@ Only large parcels can be listed in search.
 				<combo_box.item label="Other" name="item12"/>
 			</combo_box>
 			<combo_box name="land category">
-				<combo_box.item label="Any Category" name="item0"/>
+				<combo_box.item label="任何類別" name="item0"/>
 				<combo_box.item label="Linden Location" name="item1"/>
 				<combo_box.item label="Arts &amp; Culture" name="item3"/>
 				<combo_box.item label="Business" name="item4"/>
@@ -365,11 +365,11 @@ Only large parcels can be listed in search.
 			</combo_box>
 			<check_box label="Moderate Content" name="MatureCheck" tool_tip=" "/>
 			<text name="Snapshot:">
-				Snapshot:
+				快照：
 			</text>
 			<texture_picker name="snapshot_ctrl" tool_tip="點擊以挑選圖片"/>
 			<text name="landing_point">
-				Landing Point: [LANDING]
+				登陸點：[LANDING]
 			</text>
 			<button label="設定" label_selected="設定" name="Set" tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."/>
 			<button label="清除" label_selected="清除" name="Clear" tool_tip="清除登陸點"/>
@@ -409,7 +409,7 @@ Only large parcels can be listed in search.
 			<spinner name="media_size_width" tool_tip="Size to render Web media, leave 0 for default."/>
 			<spinner name="media_size_height" tool_tip="Size to render Web media, leave 0 for default."/>
 			<text name="pixels">
-				pixels
+				像素
 			</text>
 			<text name="Options:">
 				Options:
@@ -470,8 +470,8 @@ Only large parcels can be listed in search.
 					Banned Residents
 				</text>
 				<name_list name="BannedList" tool_tip="([LISTED] listed, [MAX] max)"/>
-				<button label="Add" name="add_banned"/>
-				<button label="Remove" label_selected="Remove" name="remove_banned"/>
+				<button label="添加" name="add_banned"/>
+				<button label="移除" label_selected="移除" name="remove_banned"/>
 			</panel>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
index bcb5606b60..b4d7f71eec 100644
--- a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
@@ -182,5 +182,5 @@ Maximum animation length is [MAX_LENGTH] seconds.
 We recommend BVH files exported from Poser 4.
 	</text>
 	<button label="上傳（L$[AMOUNT]）" name="ok_btn"/>
-	<button label="取銷" name="cancel_btn"/>
+	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
index 2ffcaf5b55..90fd7c029e 100644
--- a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
@@ -10,23 +10,23 @@
 		No results
 	</floater.string>
 	<floater.string name="searching">
-		Searching...
+		搜尋中...
 	</floater.string>
 	<string name="Select">
-		Select
+		選擇
 	</string>
 	<string name="Close">
 		關閉
 	</string>
 	<tab_container name="ResidentChooserTabs">
-		<panel label="Search" name="SearchPanel">
+		<panel label="搜尋" name="SearchPanel">
 			<text name="InstructSearchResidentName">
 				Type part of a person&apos;s name:
 			</text>
 			<button label="Go" label_selected="Go" name="Find"/>
 			<scroll_list name="SearchResults">
 				<columns label="名稱" name="name"/>
-				<columns label="Username" name="username"/>
+				<columns label="使用者名稱" name="username"/>
 			</scroll_list>
 		</panel>
 		<panel label="Friends" name="FriendsPanel">
@@ -44,10 +44,10 @@
 			</text>
 			<scroll_list name="NearMe">
 				<columns label="名稱" name="name"/>
-				<columns label="Username" name="username"/>
+				<columns label="使用者名稱" name="username"/>
 			</scroll_list>
 		</panel>
 	</tab_container>
 	<button label="確定" label_selected="確定" name="ok_btn"/>
-	<button label="取銷" label_selected="取銷" name="cancel_btn"/>
+	<button label="取消" label_selected="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
index ffdd957f91..629b0d17d5 100644
--- a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
@@ -12,14 +12,14 @@
 	<floater.string name="done_text">
 		Finished permission change requests.
 	</floater.string>
-	<icon name="icon_animation" tool_tip="Animation"/>
+	<icon name="icon_animation" tool_tip="動作"/>
 	<icon name="icon_bodypart" tool_tip="身體部位"/>
 	<icon name="icon_clothing" tool_tip="服裝"/>
 	<icon name="icon_gesture" tool_tip="姿勢"/>
-	<icon name="icon_notecard" tool_tip="Notecards"/>
-	<icon name="icon_object" tool_tip="Objects"/>
-	<icon name="icon_script" tool_tip="Scripts"/>
-	<icon name="icon_sound" tool_tip="Sounds"/>
+	<icon name="icon_notecard" tool_tip="記事卡"/>
+	<icon name="icon_object" tool_tip="物件"/>
+	<icon name="icon_script" tool_tip="腳本"/>
+	<icon name="icon_sound" tool_tip="聲音"/>
 	<icon name="icon_texture" tool_tip="材質"/>
 	<button label="√ 全部" name="check_all"/>
 	<button label="清除" label_selected="無" name="check_none"/>
@@ -41,5 +41,5 @@
 	<check_box label="覆製" name="next_owner_copy"/>
 	<check_box initial_value="true" label="轉移" name="next_owner_transfer" tool_tip="Next owner can give away or resell this object"/>
 	<button label="確定" name="apply"/>
-	<button label="取銷" name="close"/>
+	<button label="取消" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
index a00f069e6c..44d3394a52 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
@@ -17,5 +17,5 @@
 	</text>
 	<check_box label="立即穿上服裝" name="wear_check"/>
 	<button label="購買" label_selected="購買" name="buy_btn"/>
-	<button label="取銷" label_selected="取銷" name="cancel_btn"/>
+	<button label="取消" label_selected="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
index bebc17a5cc..0c4514600f 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
@@ -58,7 +58,7 @@
 		You aren&apos;t buying enough L$. Please increase the amount.
 	</text>
 	<button label="立即購買" name="buy_btn"/>
-	<button label="取銷" name="cancel_btn"/>
+	<button label="取消" name="cancel_btn"/>
 	<text name="info_cannot_buy">
 		Unable to Buy
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
index a75d33136d..023c531692 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
@@ -71,10 +71,10 @@ Try selecting a smaller area.
 		Your account must be upgraded to own land.
 	</floater.string>
 	<floater.string name="cant_own_land">
-		Your account can own land.
+		你的帳戶能擁有土地。
 	</floater.string>
 	<floater.string name="land_holdings">
-		You hold [BUYER] m² of land.
+		你持有 [BUYER] m² 土地。
 	</floater.string>
 	<floater.string name="pay_to_for_land">
 		Pay L$ [AMOUNT] to [SELLER] for this land
@@ -190,7 +190,7 @@ sold with objects
 	<text name="error_message">
 		Something ain&apos;t right.
 	</text>
-	<button label="Go to website" name="error_web"/>
+	<button label="前往網站" name="error_web"/>
 	<text name="account_action">
 		Upgrade you to premium membership.
 	</text>
@@ -229,5 +229,5 @@ This parcel is 512 m² of land.
 	</text>
 	<check_box label="Remove [AMOUNT] m² of contribution from group." name="remove_contribution"/>
 	<button label="Purchase" name="buy_btn"/>
-	<button label="取銷" name="cancel_btn"/>
+	<button label="取消" name="cancel_btn"/>
 </floater>
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 559982b6c9..ef8bc183a4 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_object.xml
@@ -25,5 +25,5 @@
 		[NAME]?
 	</text>
 	<button label="購買" label_selected="購買" name="buy_btn"/>
-	<button label="取銷" label_selected="取銷" name="cancel_btn"/>
+	<button label="取消" label_selected="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_choose_group.xml b/indra/newview/skins/default/xui/zh/floater_choose_group.xml
index dea0a7c318..9968565bf2 100644
--- a/indra/newview/skins/default/xui/zh/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/zh/floater_choose_group.xml
@@ -4,5 +4,5 @@
 		選擇一個社團：
 	</text>
 	<button label="確定" label_selected="確定" name="OK"/>
-	<button label="取銷" label_selected="取銷" name="Cancel"/>
+	<button label="取消" label_selected="取消" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_color_picker.xml b/indra/newview/skins/default/xui/zh/floater_color_picker.xml
index f6f2f0187d..a7ac78e419 100644
--- a/indra/newview/skins/default/xui/zh/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/zh/floater_color_picker.xml
@@ -20,7 +20,7 @@
 	</text>
 	<check_box label="立即套用" name="apply_immediate"/>
 	<button label="確定" label_selected="確定" name="select_btn"/>
-	<button label="取銷" label_selected="取銷" name="cancel_btn"/>
+	<button label="取消" label_selected="取消" name="cancel_btn"/>
 	<text name="Current color:">
 		目前顏色：
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_display_name.xml b/indra/newview/skins/default/xui/zh/floater_display_name.xml
index 5a89ecaa82..e12fc21166 100644
--- a/indra/newview/skins/default/xui/zh/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/zh/floater_display_name.xml
@@ -14,5 +14,5 @@
 	</text>
 	<button label="儲存" name="save_btn" tool_tip="Save your new Display Name"/>
 	<button label="Reset" name="reset_btn" tool_tip="Make Display Name the same as Username"/>
-	<button label="取銷" name="cancel_btn"/>
+	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_gesture.xml b/indra/newview/skins/default/xui/zh/floater_gesture.xml
index 901770586a..2dcb46fb77 100644
--- a/indra/newview/skins/default/xui/zh/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_gesture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Places" name="gestures" title="姿勢">
+<floater label="地點" name="gestures" title="姿勢">
 	<floater.string name="loading">
 		載入中...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/zh/floater_god_tools.xml b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
index a501a4257a..86403494e0 100644
--- a/indra/newview/skins/default/xui/zh/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
@@ -55,7 +55,7 @@
 			<text name="region name">
 				Welsh
 			</text>
-			<check_box label="Disable Scripts" name="disable scripts" tool_tip="Set this to disable all scripts in this region"/>
+			<check_box label="關閉腳本" name="disable scripts" tool_tip="關閉這個地區現在的全部腳本"/>
 			<check_box label="Disable Collisions" name="disable collisions" tool_tip="Set this to disable non-agent collisions in this region"/>
 			<check_box label="Disable Physics" name="disable physics" tool_tip="Set this to disable all physics in this region"/>
 			<button label="套用" label_selected="套用" name="Apply" tool_tip="Click here to apply any changes from above"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_image_preview.xml b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
index 98e4e5c2cd..7eef0177ef 100644
--- a/indra/newview/skins/default/xui/zh/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
@@ -7,10 +7,10 @@
 		描述：
 	</text>
 	<text name="preview_label">
-		Preview image as:
+		預覽圖像為：
 	</text>
 	<combo_box label="服裝類型" name="clothing_type_combo">
-		<item label="Image" name="Image" value="Image"/>
+		<item label="圖像" name="Image" value="圖像"/>
 		<item label="Hair" name="Hair" value="Hair"/>
 		<item label="Female Head" name="FemaleHead" value="Female Head"/>
 		<item label="Female Upper Body" name="FemaleUpperBody" value="Female Upper Body"/>
@@ -22,11 +22,11 @@
 		<item label="Sculpted Prim" name="SculptedPrim" value="Sculpted Prim"/>
 	</combo_box>
 	<text name="bad_image_text">
-		Unable to read image.
+		無法讀取圖像。
 
-Try saving image as 24 bit Targa (.tga).
+請嘗試儲存圖像為 24 位元 Targa（.tga）格式。
 	</text>
 	<check_box label="Use lossless compression" name="lossless_check"/>
-	<button label="取銷" name="cancel_btn"/>
+	<button label="取消" name="cancel_btn"/>
 	<button label="上傳（L$[AMOUNT]）" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_joystick.xml b/indra/newview/skins/default/xui/zh/floater_joystick.xml
index 83bd4e2bca..1721f7cd1e 100644
--- a/indra/newview/skins/default/xui/zh/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/zh/floater_joystick.xml
@@ -75,5 +75,5 @@
 	</text>
 	<button label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults"/>
 	<button label="確定" label_selected="確定" name="ok_btn"/>
-	<button label="取銷" label_selected="取銷" name="cancel_btn"/>
+	<button label="取消" label_selected="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
index 261ba8ebc3..6e58e7332f 100644
--- a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
@@ -115,7 +115,7 @@
 		可能原因：地區有太多移動的人
 	</floater.string>
 	<floater.string name="server_images_cause_msg">
-		可能原因：太多影像計算
+		可能原因：太多圖像計算
 	</floater.string>
 	<floater.string name="server_generic_cause_msg">
 		可能原因：模擬器負載過重
diff --git a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
index 6c8bd76a8a..e6f6e32352 100644
--- a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="SCRIPT: NEW SCRIPT">
+<floater name="script ed float" title="腳本：　新腳本">
 	<floater.string name="not_allowed">
 		You can not view or edit this script, since it has been set as &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
 	</floater.string>
 	<floater.string name="script_running">
-		Running
+		執行中
 	</floater.string>
 	<floater.string name="Title">
-		SCRIPT: [NAME]
+		腳本：[NAME]
 	</floater.string>
 	<button label="Reset" label_selected="Reset" name="Reset"/>
 	<check_box initial_value="true" label="Running" name="running"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_media_settings.xml b/indra/newview/skins/default/xui/zh/floater_media_settings.xml
index 821b93c06f..f42c0af3d9 100644
--- a/indra/newview/skins/default/xui/zh/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_media_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="media_settings" title="MEDIA SETTINGS">
 	<button label="確定" label_selected="確定" name="OK"/>
-	<button label="取銷" label_selected="取銷" name="Cancel"/>
+	<button label="取消" label_selected="取消" name="Cancel"/>
 	<button label="套用" label_selected="套用" name="Apply"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_mute_object.xml b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
index a2a56f769e..7d76f4de08 100644
--- a/indra/newview/skins/default/xui/zh/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
@@ -10,5 +10,5 @@
 		* Only blocks object text, not sounds
 	</text>
 	<button label="確定" name="OK"/>
-	<button label="取銷" name="Cancel"/>
+	<button label="取消" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_openobject.xml b/indra/newview/skins/default/xui/zh/floater_openobject.xml
index 024ef0b102..61ac3cb1fc 100644
--- a/indra/newview/skins/default/xui/zh/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/zh/floater_openobject.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="objectcontents" title="OBJECT CONTENTS">
+<floater name="objectcontents" title="物件內容">
 	<text name="object_name">
 		[DESC]:
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
index feb68f2b0f..e33183a0dc 100644
--- a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" title="儲存裝扮">
 	<button label="儲存" label_selected="儲存" name="Save"/>
-	<button label="取銷" label_selected="取銷" name="Cancel"/>
+	<button label="取消" label_selected="取消" name="Cancel"/>
 	<text name="Save item as:">
 		儲存我正在穿的為新裝扮：
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
index 0cc7bbcfe0..8b15668e3b 100644
--- a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
@@ -36,5 +36,5 @@
 	<text name="leaving">
 		Leaving [CURRENT_CHAT].
 	</text>
-	<button label="取銷" label_selected="取銷" name="Cancel"/>
+	<button label="取消" label_selected="取消" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pay.xml b/indra/newview/skins/default/xui/zh/floater_pay.xml
index 9374ac3f3b..eeaaf0ab7d 100644
--- a/indra/newview/skins/default/xui/zh/floater_pay.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay.xml
@@ -17,5 +17,5 @@
 		Or, choose amount:
 	</text>
 	<button label="Pay" label_selected="Pay" name="pay btn"/>
-	<button label="取銷" label_selected="取銷" name="cancel btn"/>
+	<button label="取消" label_selected="取消" name="cancel btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pay_object.xml b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
index fbb6a8ab36..234aa9f7af 100644
--- a/indra/newview/skins/default/xui/zh/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
@@ -12,7 +12,7 @@
 	<text name="object_name_label">
 		Via object:
 	</text>
-	<icon name="icon_object" tool_tip="Objects"/>
+	<icon name="icon_object" tool_tip="物件"/>
 	<text name="object_name_text">
 		My awesome object with a really damn long name
 	</text>
@@ -24,5 +24,5 @@
 		或者，選擇一個金額：
 	</text>
 	<button label="Pay" label_selected="Pay" name="pay btn"/>
-	<button label="取銷" label_selected="取銷" name="cancel btn"/>
+	<button label="取消" label_selected="取消" name="cancel btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
index 8d44d474c0..31b8133a18 100644
--- a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
@@ -11,5 +11,5 @@
 		<check_box initial_value="true" label="轉售 / 送人" name="next_owner_transfer"/>
 	</panel>
 	<button label="確定" label_selected="確定" name="ok"/>
-	<button label="取銷" label_selected="取銷" name="cancel"/>
+	<button label="取消" label_selected="取消" name="cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_postcard.xml b/indra/newview/skins/default/xui/zh/floater_postcard.xml
index c85ca93e85..6f6b75f468 100644
--- a/indra/newview/skins/default/xui/zh/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/zh/floater_postcard.xml
@@ -7,27 +7,27 @@
 		Check this out!
 	</floater.string>
 	<floater.string name="upload_message">
-		Sending...
+		傳送中...
 	</floater.string>
 	<text name="to_label">
-		Recipient&apos;s Email:
+		收件人電子郵件地址：
 	</text>
 	<text name="from_label">
-		Your Email:
+		你的電子郵件地址：
 	</text>
 	<text name="name_label">
-		Your Name:
+		你的名稱：
 	</text>
 	<text name="subject_label">
-		Subject:
+		主旨：
 	</text>
-	<line_editor label="Type your subject here." name="subject_form"/>
+	<line_editor label="在此輸入你的主旨。" name="subject_form"/>
 	<text name="msg_label">
-		Message:
+		訓息：
 	</text>
 	<text_editor name="msg_form">
-		Type your message here.
+		在此輸入你的訊息。
 	</text_editor>
-	<button label="取銷" name="cancel_btn"/>
-	<button label="Send" name="send_btn"/>
+	<button label="取消" name="cancel_btn"/>
+	<button label="送出" name="send_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences.xml b/indra/newview/skins/default/xui/zh/floater_preferences.xml
index 777425ba30..396a4893e0 100644
--- a/indra/newview/skins/default/xui/zh/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preferences.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Preferences" title="PREFERENCES">
+<floater name="Preferences" title="偏好設定">
 	<button label="確定" label_selected="確定" name="OK"/>
-	<button label="取銷" label_selected="取銷" name="Cancel"/>
+	<button label="取消" label_selected="取消" name="Cancel"/>
 	<tab_container name="pref core">
 		<panel label="一般" name="general"/>
-		<panel label="Graphics" name="display"/>
-		<panel label="Sound &amp; Media" name="audio"/>
+		<panel label="圖形" name="display"/>
+		<panel label="聲音與媒體" name="audio"/>
 		<panel label="聊天" name="chat"/>
-		<panel label="Move &amp; View" name="move"/>
-		<panel label="Notifications" name="msgs"/>
-		<panel label="Colors" name="colors"/>
-		<panel label="Privacy" name="im"/>
-		<panel label="Setup" name="input"/>
-		<panel label="Advanced" name="advanced1"/>
+		<panel label="移動與視角" name="move"/>
+		<panel label="通知" name="msgs"/>
+		<panel label="顏色" name="colors"/>
+		<panel label="隱私" name="im"/>
+		<panel label="設定" name="input"/>
+		<panel label="進階" name="advanced1"/>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
index 08d56be302..3c2f913a6d 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
@@ -7,7 +7,7 @@
 		You do not have permission to view this notecard.
 	</floater.string>
 	<floater.string name="Title">
-		Notecard: [NAME]
+		記事卡： [NAME]
 	</floater.string>
 	<text name="desc txt">
 		描述：
diff --git a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
index 45bbe7b979..acec1efcb0 100644
--- a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
@@ -7,5 +7,5 @@ Remember, Classified fees are non-refundable.
 	</text>
 	<spinner label="價格： L$" name="price_for_listing" tool_tip="Price for listing." value="50"/>
 	<button label="Publish" name="publish_btn"/>
-	<button label="取銷" name="cancel_btn"/>
+	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
index da89cd80ad..436f5cdcc5 100644
--- a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
@@ -90,5 +90,5 @@
 		* Incomplete reports won&apos;t be investigated
 	</text>
 	<button label="舉報濫用" label_selected="舉報濫用" name="send_btn"/>
-	<button label="取銷" label_selected="取銷" name="cancel_btn"/>
+	<button label="取消" label_selected="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_script_search.xml b/indra/newview/skins/default/xui/zh/floater_script_search.xml
index b6671df0e2..400ef4be81 100644
--- a/indra/newview/skins/default/xui/zh/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_search.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script search" title="SCRIPT SEARCH">
+<floater name="script search" title="腳本搜尋">
 	<check_box label="Case Insensitive" name="case_text"/>
-	<button label="Search" label_selected="Search" name="search_btn"/>
+	<button label="搜尋" label_selected="搜尋" name="search_btn"/>
 	<button label="取代" label_selected="取代" name="replace_btn"/>
 	<button label="全部取代" label_selected="全部取代" name="replace_all_btn"/>
 	<text name="txt">
-		Search
+		搜尋
 	</text>
 	<text name="txt2">
 		取代
diff --git a/indra/newview/skins/default/xui/zh/floater_select_key.xml b/indra/newview/skins/default/xui/zh/floater_select_key.xml
index 1452f744da..c1661635f1 100644
--- a/indra/newview/skins/default/xui/zh/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/zh/floater_select_key.xml
@@ -3,5 +3,5 @@
 	<text name="Save item as:">
 		Press a key to set your Speak button trigger.
 	</text>
-	<button label="取銷" label_selected="取銷" name="Cancel"/>
+	<button label="取消" label_selected="取消" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_sell_land.xml b/indra/newview/skins/default/xui/zh/floater_sell_land.xml
index 2d3f5066bc..b6a929caeb 100644
--- a/indra/newview/skins/default/xui/zh/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_sell_land.xml
@@ -59,7 +59,7 @@
 				REMEMBER: All sales are final.
 			</text>
 			<button label="Set Land For Sale" name="sell_btn"/>
-			<button label="取銷" name="cancel_btn"/>
+			<button label="取消" name="cancel_btn"/>
 		</panel>
 	</scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
index b4216cf5b2..c9a66c1644 100644
--- a/indra/newview/skins/default/xui/zh/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
@@ -12,14 +12,14 @@
 		[SIZE] KB
 	</text>
 	<button label="Send" name="send_btn"/>
-	<button label="Save (L$[AMOUNT])" name="upload_btn"/>
-	<flyout_button label="儲存" name="save_btn" tool_tip="Save image to a file">
+	<button label="儲存（L$[AMOUNT]）" name="upload_btn"/>
+	<flyout_button label="儲存" name="save_btn" tool_tip="儲存圖像到檔案">
 		<flyout_button.item label="儲存" name="save_item"/>
 		<flyout_button.item label="另存..." name="saveas_item"/>
 	</flyout_button>
 	<button label="更多" name="more_btn" tool_tip="進階選項"/>
 	<button label="更少" name="less_btn" tool_tip="進階選項"/>
-	<button label="取銷" name="discard_btn"/>
+	<button label="取消" name="discard_btn"/>
 	<text name="type_label2">
 		尺寸
 	</text>
@@ -58,17 +58,17 @@
 	<spinner label="Width" name="snapshot_width"/>
 	<spinner label="Height" name="snapshot_height"/>
 	<check_box label="Constrain proportions" name="keep_aspect_check"/>
-	<slider label="Image quality" name="image_quality_slider"/>
+	<slider label="圖像品質" name="image_quality_slider"/>
 	<text name="layer_type_label">
 		Capture:
 	</text>
-	<combo_box label="Image Layers" name="layer_types">
+	<combo_box label="圖層" name="layer_types">
 		<combo_box.item label="Colors" name="Colors"/>
 		<combo_box.item label="Depth" name="Depth"/>
 	</combo_box>
 	<check_box label="Interface" name="ui_check"/>
 	<check_box label="HUDs" name="hud_check"/>
 	<check_box label="Keep open after saving" name="keep_open_check"/>
-	<check_box label="Freeze frame (fullscreen)" name="freeze_frame_check"/>
+	<check_box label="凍結框架（全螢幕）" name="freeze_frame_check"/>
 	<check_box label="Auto-refresh" name="auto_snapshot_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
index 269cd5db08..c942ba1cfb 100644
--- a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
@@ -7,5 +7,5 @@
 		描述：
 	</text>
 	<button label="上傳（L$[AMOUNT]）" name="ok_btn"/>
-	<button label="取銷" label_selected="取銷" name="cancel_btn"/>
+	<button label="取消" label_selected="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_sys_well.xml b/indra/newview/skins/default/xui/zh/floater_sys_well.xml
index dbdd32974c..fd27e944ac 100644
--- a/indra/newview/skins/default/xui/zh/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/zh/floater_sys_well.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="sys_well_window" title="NOTIFICATIONS">
+<floater name="sys_well_window" title="通知">
 	<string name="title_im_well_window">
 		CONVERSATIONS
 	</string>
 	<string name="title_notification_well_window">
-		NOTIFICATIONS
+		通知
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index aaf6ecd7cf..fc00b0b4a2 100644
--- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -19,5 +19,5 @@
 	<filter_editor label="材質過濾器" name="inventory search editor"/>
 	<check_box initial_value="false" label="顯示資料夾" name="show_folders_check"/>
 	<button label="確定" label_selected="確定" name="Select"/>
-	<button label="取銷" label_selected="取銷" name="Cancel"/>
+	<button label="取消" label_selected="取消" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index feee659736..7ba1a0d6c4 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" short_title="BUILD TOOLS">
+<floater name="toolbox floater" short_title="建造工具">
 	<floater.string name="status_rotate">
 		Drag colored bands to rotate object
 	</floater.string>
@@ -60,7 +60,7 @@
 	</radio_group>
 	<radio_group name="edit_radio_group">
 		<radio_item label="移動" name="radio position"/>
-		<radio_item label="Rotate (Ctrl)" name="radio rotate"/>
+		<radio_item label="旋轉（Ctrl）" name="radio rotate"/>
 		<radio_item label="Stretch (Ctrl+Shift)" name="radio stretch"/>
 		<radio_item label="Select Face" name="radio select face"/>
 	</radio_group>
@@ -202,10 +202,10 @@
 				<combo_box.item label="原件" name="Original"/>
 			</combo_box>
 			<spinner label="價格： L$" name="Edit Cost"/>
-			<check_box label="Show in search" name="search_check" tool_tip="Let people see this object in search results"/>
+			<check_box label="顯示在搜尋中" name="search_check" tool_tip="Let people see this object in search results"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
-					You can modify this object
+					你可以修改這個物件
 				</text>
 				<text name="Anyone can:">
 					任何人：
@@ -239,10 +239,10 @@
 			</panel>
 		</panel>
 		<panel label="Object" name="Object">
-			<check_box label="Locked" name="checkbox locked" tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."/>
-			<check_box label="Physical" name="Physical Checkbox Ctrl" tool_tip="Allows object to be pushed and affected by gravity"/>
-			<check_box label="Temporary" name="Temporary Checkbox Ctrl" tool_tip="Causes object to be deleted 1 minute after creation"/>
-			<check_box label="Phantom" name="Phantom Checkbox Ctrl" tool_tip="Causes object to not collide with other objects or avatars"/>
+			<check_box label="鎖定" name="checkbox locked" tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."/>
+			<check_box label="物理性" name="Physical Checkbox Ctrl" tool_tip="Allows object to be pushed and affected by gravity"/>
+			<check_box label="暫時性" name="Temporary Checkbox Ctrl" tool_tip="Causes object to be deleted 1 minute after creation"/>
+			<check_box label="幻影性" name="Phantom Checkbox Ctrl" tool_tip="Causes object to not collide with other objects or avatars"/>
 			<text name="label position">
 				Position (meters)
 			</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_tos.xml b/indra/newview/skins/default/xui/zh/floater_tos.xml
index acc61a7961..5f9e16afe1 100644
--- a/indra/newview/skins/default/xui/zh/floater_tos.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tos.xml
@@ -7,7 +7,7 @@
 		data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E
 	</floater.string>
 	<button label="繼續" label_selected="繼續" name="Continue"/>
-	<button label="取銷" label_selected="取銷" name="Cancel"/>
+	<button label="取消" label_selected="取消" name="Cancel"/>
 	<check_box label="我同意接受服務條款及隱私政策" name="agree_chk"/>
 	<text name="tos_heading">
 		請謹慎閱讀以下的服務條款及隱私政策。要繼續登入到 [SECOND_LIFE]，你必須接受這些協議。
diff --git a/indra/newview/skins/default/xui/zh/floater_url_entry.xml b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
index 2b4f5ea11d..04945ac83b 100644
--- a/indra/newview/skins/default/xui/zh/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
@@ -4,7 +4,7 @@
 		Media URL:
 	</text>
 	<button label="" name="ok_btn"/>
-	<button label="取銷" name="cancel_btn"/>
+	<button label="取消" name="cancel_btn"/>
 	<button label="清除" name="clear_btn"/>
 	<text name="loading_label">
 		載入中...
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
index b9021d25d9..e45c7c59ac 100644
--- a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Places" name="voice_effects" title="語音變聲">
+<floater label="地點" name="voice_effects" title="語音變聲">
 	<string name="no_voice_effect">
 		(No Voice Morph)
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/floater_water.xml b/indra/newview/skins/default/xui/zh/floater_water.xml
index 8e790f8dad..fba0415967 100644
--- a/indra/newview/skins/default/xui/zh/floater_water.xml
+++ b/indra/newview/skins/default/xui/zh/floater_water.xml
@@ -43,7 +43,7 @@
 				Blur Multiplier
 			</text>
 		</panel>
-		<panel label="IMAGE" name="Waves">
+		<panel label="圖像" name="Waves">
 			<text name="BHText">
 				Big Wave Direction
 			</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
index ea360be6c9..36e00049f0 100644
--- a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
@@ -5,5 +5,5 @@
 	</text>
 	<line_editor name="whitelist_entry" tool_tip="Enter a URL or URL pattern to White List"/>
 	<button label="確定" name="ok_btn"/>
-	<button label="取銷" name="cancel_btn"/>
+	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
index d292386323..fce851cc90 100644
--- a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="ADVANCED SKY EDITOR">
+<floater name="WindLight floater" title="進階天空編輯器">
 	<floater.string name="WLDefaultSkyNames">
 		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
 	</floater.string>
 	<text name="KeyFramePresetsText">
 		Sky Presets:
 	</text>
-	<button label="New" label_selected="New" name="WLNewPreset"/>
+	<button label="新增" label_selected="新增" name="WLNewPreset"/>
 	<button label="儲存" label_selected="儲存" name="WLSavePreset"/>
 	<button label="刪除" label_selected="刪除" name="WLDeletePreset"/>
 	<button label="Day Cycle Editor" label_selected="Day Cycle Editor" name="WLDayCycleMenuButton"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_window_size.xml b/indra/newview/skins/default/xui/zh/floater_window_size.xml
index 167d4cb858..e47238482f 100644
--- a/indra/newview/skins/default/xui/zh/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/zh/floater_window_size.xml
@@ -13,5 +13,5 @@
 		<combo_box.item label="1920 x 1080 （1080p）" name="item3"/>
 	</combo_box>
 	<button label="設定" name="set_btn"/>
-	<button label="取銷" name="cancel_btn"/>
+	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
index aa803cc49d..cba82e7dce 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
@@ -8,8 +8,8 @@
 	<menu_item_call label="邀請加入社團" name="Invite..."/>
 	<menu_item_call label="封鎖" name="Avatar Mute"/>
 	<menu_item_call label="回報" name="abuse"/>
-	<menu_item_call label="Freeze" name="Freeze..."/>
-	<menu_item_call label="Eject" name="Eject..."/>
+	<menu_item_call label="凍結" name="Freeze..."/>
+	<menu_item_call label="踢出" name="Eject..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
 	<menu_item_call label="Zoom In" name="Zoom In"/>
 	<menu_item_call label="Pay" name="Pay..."/>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
index 281d357fd3..283367708b 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
@@ -8,8 +8,8 @@
 	<menu_item_call label="邀請加入社團" name="Invite..."/>
 	<menu_item_call label="Block" name="Avatar Mute"/>
 	<menu_item_call label="回報" name="abuse"/>
-	<menu_item_call label="Freeze" name="Freeze..."/>
-	<menu_item_call label="Eject" name="Eject..."/>
+	<menu_item_call label="凍結" name="Freeze..."/>
+	<menu_item_call label="踢出" name="Eject..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
 	<menu_item_call label="Zoom In" name="Zoom In"/>
 	<menu_item_call label="Pay" name="Pay..."/>
diff --git a/indra/newview/skins/default/xui/zh/menu_bottomtray.xml b/indra/newview/skins/default/xui/zh/menu_bottomtray.xml
index d55b3afc95..a00aa7cd35 100644
--- a/indra/newview/skins/default/xui/zh/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/zh/menu_bottomtray.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Speak Button" name="EnableVoiceChat"/>
-	<menu_item_check label="Gesture button" name="ShowGestureButton"/>
-	<menu_item_check label="Move button" name="ShowMoveButton"/>
-	<menu_item_check label="View button" name="ShowCameraButton"/>
-	<menu_item_check label="Snapshot button" name="ShowSnapshotButton"/>
-	<menu_item_check label="Build button" name="ShowBuildButton"/>
-	<menu_item_check label="Search button" name="ShowSearchButton"/>
+	<menu_item_check label="講話按鈕" name="EnableVoiceChat"/>
+	<menu_item_check label="姿勢按鈕" name="ShowGestureButton"/>
+	<menu_item_check label="移動按鈕" name="ShowMoveButton"/>
+	<menu_item_check label="視角按鈕" name="ShowCameraButton"/>
+	<menu_item_check label="快照按鈕" name="ShowSnapshotButton"/>
+	<menu_item_check label="建造按鈕" name="ShowBuildButton"/>
+	<menu_item_check label="搜尋按鈕" name="ShowSearchButton"/>
 	<menu_item_check label="地圖按鈕" name="ShowWorldMapButton"/>
 	<menu_item_check label="迷你地圖按鈕" name="ShowMiniMapButton"/>
 	<menu_item_call label="剪下" name="NearbyChatBar_Cut"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_edit.xml b/indra/newview/skins/default/xui/zh/menu_edit.xml
index 5c5c225c59..d6eb87a6b0 100644
--- a/indra/newview/skins/default/xui/zh/menu_edit.xml
+++ b/indra/newview/skins/default/xui/zh/menu_edit.xml
@@ -8,5 +8,5 @@
 	<menu_item_call label="刪除" name="Delete"/>
 	<menu_item_call label="覆製貼上" name="Duplicate"/>
 	<menu_item_call label="全選" name="Select All"/>
-	<menu_item_call label="取銷選擇" name="Deselect"/>
+	<menu_item_call label="取消選擇" name="Deselect"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml b/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml
index f03749533e..dbb8ececaa 100644
--- a/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="hide_navbar_menu">
-	<menu_item_check label="Show Navigation Bar" name="ShowNavbarNavigationPanel"/>
-	<menu_item_check label="Show Favorites Bar" name="ShowNavbarFavoritesPanel"/>
-	<menu_item_check label="Show Mini-Location Bar" name="ShowMiniLocationPanel"/>
+	<menu_item_check label="顯示導覽列" name="ShowNavbarNavigationPanel"/>
+	<menu_item_check label="顯示最愛列" name="ShowNavbarFavoritesPanel"/>
+	<menu_item_check label="顯示迷你位置列" name="ShowMiniLocationPanel"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml
index 6cf86327be..85417d554e 100644
--- a/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet AdHoc Menu">
-	<menu_item_call label="End Session" name="End Session"/>
+	<menu_item_call label="結束會話" name="End Session"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
index c208a146d2..2577c582a7 100644
--- a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet Group Menu">
 	<menu_item_call label="社團資訊" name="Show Profile"/>
-	<menu_item_call label="Show Session" name="Chat"/>
-	<menu_item_call label="End Session" name="End Session"/>
+	<menu_item_call label="顯示會話" name="Chat"/>
+	<menu_item_call label="結束會話" name="End Session"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
index dc933518c0..636bdaae09 100644
--- a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
@@ -2,6 +2,6 @@
 <menu name="IMChiclet P2P Menu">
 	<menu_item_call label="察看檔案" name="Show Profile"/>
 	<menu_item_call label="加為朋友" name="Add Friend"/>
-	<menu_item_call label="Show Session" name="Send IM"/>
-	<menu_item_call label="End Session" name="End Session"/>
+	<menu_item_call label="顯示會話" name="Send IM"/>
+	<menu_item_call label="結束會話" name="End Session"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
index 6d8fbba503..bae7cf3f05 100644
--- a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
@@ -9,9 +9,9 @@
 	<menu_item_call label="Block" name="block"/>
 	<menu_item_call label="Unblock" name="unblock"/>
 	<menu_item_call label="回報" name="report"/>
-	<menu_item_call label="Freeze" name="freeze"/>
-	<menu_item_call label="Eject" name="eject"/>
-	<menu_item_call label="踢除" name="kick"/>
+	<menu_item_call label="凍結" name="freeze"/>
+	<menu_item_call label="踢出" name="eject"/>
+	<menu_item_call label="踢出" name="kick"/>
 	<menu_item_call label="CSR" name="csr"/>
 	<menu_item_call label="材質除錯" name="debug"/>
 	<menu_item_call label="Find On Map" name="find_on_map"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_landmark.xml b/indra/newview/skins/default/xui/zh/menu_landmark.xml
index 97b115151e..5f7657db79 100644
--- a/indra/newview/skins/default/xui/zh/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/zh/menu_landmark.xml
@@ -3,5 +3,5 @@
 	<menu_item_call label="覆製 SLurl" name="copy"/>
 	<menu_item_call label="刪除" name="delete"/>
 	<menu_item_call label="Create Pick" name="pick"/>
-	<menu_item_call label="Add to Favorites Bar" name="add_to_favbar"/>
+	<menu_item_call label="添加到最愛列" name="add_to_favbar"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml
index 436e86cb74..27a0baf560 100644
--- a/indra/newview/skins/default/xui/zh/menu_login.xml
+++ b/indra/newview/skins/default/xui/zh/menu_login.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Login Menu">
 	<menu label="自己" name="File">
-		<menu_item_call label="Preferences" name="Preferences..."/>
-		<menu_item_call label="Exit [APP_NAME]" name="Quit"/>
+		<menu_item_call label="偏好設定" name="Preferences..."/>
+		<menu_item_call label="結束退出 [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="幫助" name="Help">
 		<menu_item_call label="[SECOND_LIFE] 幫助" name="Second Life Help"/>
@@ -10,12 +10,12 @@
 	</menu>
 	<menu_item_check label="顯示除錯選單" name="Show Debug Menu"/>
 	<menu label="除錯" name="Debug">
-		<menu_item_call label="Show Debug Settings" name="Debug Settings"/>
+		<menu_item_call label="顯示除錯設定" name="Debug Settings"/>
 		<menu_item_call label="UI/Color Settings" name="UI/Color Settings"/>
 		<menu_item_call label="XUI Preview Tool" name="UI Preview Tool"/>
-		<menu label="UI Tests" name="UI Tests"/>
+		<menu label="UI 測試" name="UI Tests"/>
 		<menu_item_call label="設定視窗尺寸大小..." name="Set Window Size..."/>
-		<menu_item_call label="Show TOS" name="TOS"/>
+		<menu_item_call label="顯示 TOS" name="TOS"/>
 		<menu_item_call label="Show Critical Message" name="Critical"/>
 		<menu_item_call label="Media Browser Test" name="Web Browser Test"/>
 		<menu_item_call label="Web Content Floater Test" name="Web Content Floater Test"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
index 7d8997fafe..cad462eebb 100644
--- a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="NearBy Chat Menu">
-	<menu_item_call label="Show Nearby People..." name="nearby_people"/>
+	<menu_item_call label="顯示附近的人..." name="nearby_people"/>
 	<menu_item_check label="Show Blocked Text" name="muted_text"/>
 	<menu_item_check label="Show Buddy Icons" name="show_buddy_icons"/>
 	<menu_item_check label="Show Names" name="show_names"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_object.xml b/indra/newview/skins/default/xui/zh/menu_object.xml
index 869c5f66fe..ed41a4f0bf 100644
--- a/indra/newview/skins/default/xui/zh/menu_object.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Object Pie">
-	<menu_item_call label="Touch" name="Object Touch"/>
+	<menu_item_call label="觸碰" name="Object Touch"/>
 	<menu_item_call label="編輯" name="Edit..."/>
-	<menu_item_call label="Build" name="Build"/>
-	<menu_item_call label="Open" name="Open"/>
-	<menu_item_call label="Sit Here" name="Object Sit"/>
+	<menu_item_call label="建造" name="Build"/>
+	<menu_item_call label="開啟" name="Open"/>
+	<menu_item_call label="坐下" name="Object Sit"/>
 	<menu_item_call label="起立" name="Object Stand Up"/>
 	<menu_item_call label="物件檔案" name="Object Inspect"/>
 	<menu_item_call label="Zoom In" name="Zoom In"/>
-	<context_menu label="Put On" name="Put On">
-		<menu_item_call label="Wear" name="Wear"/>
-		<menu_item_call label="Add" name="Add"/>
+	<context_menu label="穿上" name="Put On">
+		<menu_item_call label="穿上" name="Wear"/>
+		<menu_item_call label="添加" name="Add"/>
 		<context_menu label="Attach" name="Object Attach"/>
 		<context_menu label="Attach HUD" name="Object Attach HUD"/>
 	</context_menu>
-	<context_menu label="Manage" name="Remove">
+	<context_menu label="管理" name="Remove">
 		<menu_item_call label="舉報濫用" name="Report Abuse..."/>
-		<menu_item_call label="Block" name="Object Mute"/>
-		<menu_item_call label="Return" name="Return..."/>
+		<menu_item_call label="封鎖" name="Object Mute"/>
+		<menu_item_call label="退回" name="Return..."/>
 	</context_menu>
-	<menu_item_call label="Take" name="Pie Object Take"/>
+	<menu_item_call label="取得" name="Pie Object Take"/>
 	<menu_item_call label="取得副本" name="Take Copy"/>
-	<menu_item_call label="Pay" name="Pay..."/>
+	<menu_item_call label="支付" name="Pay..."/>
 	<menu_item_call label="購買" name="Buy..."/>
 	<menu_item_call label="刪除" name="Delete"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
index 2c5e3153bf..c06b7dc039 100644
--- a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
@@ -5,8 +5,8 @@
 	<menu_item_call label="分享" name="share"/>
 	<menu_item_call label="Block" name="block"/>
 	<menu_item_call label="Unblock" name="unblock"/>
-	<menu_item_call label="踢除" name="kick"/>
-	<menu_item_call label="Freeze" name="freeze"/>
-	<menu_item_call label="Unfreeze" name="unfreeze"/>
+	<menu_item_call label="踢出" name="kick"/>
+	<menu_item_call label="凍結" name="freeze"/>
+	<menu_item_call label="解凍" name="unfreeze"/>
 	<menu_item_call label="CSR" name="csr"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml
index 423ba64aa7..f9107a96ed 100644
--- a/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Teleport History Item Context Menu">
-	<menu_item_call label="Open" name="TabOpen"/>
+	<menu_item_call label="開啟" name="TabOpen"/>
 	<menu_item_call label="關閉" name="TabClose"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
index 3b667d429c..592bb6561e 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Show Resident Profile" name="show_agent"/>
+	<menu_item_call label="顯示居民檔案" name="show_agent"/>
 	<menu_item_call label="覆製名稱到剪貼簿" name="url_copy_label"/>
 	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
index d2f0b81a9d..b344b21c62 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Show Object Information" name="show_object"/>
+	<menu_item_call label="顯示物件資訊" name="show_object"/>
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
 	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
 	<menu_item_call label="覆製物件名稱到剪貼簿" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 6f6ca064c8..e7016dc663 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -22,7 +22,7 @@
 		</menu>
 		<menu_item_call label="要求 Admin 狀態" name="Request Admin Options"/>
 		<menu_item_call label="離開 Admin 狀態" name="Leave Admin Options"/>
-		<menu_item_call label="結束離開 [APP_NAME]" name="Quit"/>
+		<menu_item_call label="結束退出 [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="溝通" name="Communicate">
 		<menu_item_call label="我的朋友" name="My Friends"/>
@@ -75,7 +75,7 @@
 			<menu_item_call label="土地工具" name="Land"/>
 		</menu>
 		<menu_item_call label="聯結" name="Link"/>
-		<menu_item_call label="取銷聯結" name="Unlink"/>
+		<menu_item_call label="取消聯結" name="Unlink"/>
 		<menu_item_check label="編輯聯結部位" name="Edit Linked Parts"/>
 		<menu label="選擇聯結部位" name="Select Linked Parts">
 			<menu_item_call label="選擇下一部位" name="Select Next Part"/>
@@ -93,7 +93,7 @@
 			<menu_item_call label="Save Back to Object Contents" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="退回物件" name="Return Object back to Owner"/>
 		</menu>
-		<menu label="Scripts" name="Scripts">
+		<menu label="腳本" name="Scripts">
 			<menu_item_call label="Recompile Scripts (Mono)" name="Mono"/>
 			<menu_item_call label="Recompile Scripts (LSL)" name="LSL"/>
 			<menu_item_call label="Reset Scripts" name="Reset Scripts"/>
@@ -115,7 +115,7 @@
 			<menu_item_call label="格線選項" name="Grid Options"/>
 		</menu>
 		<menu label="上傳" name="Upload">
-			<menu_item_call label="Image (L$[COST])..." name="Upload Image"/>
+			<menu_item_call label="圖像（L$[COST]）..." name="Upload Image"/>
 			<menu_item_call label="Sound (L$[COST])..." name="Upload Sound"/>
 			<menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/>
 			<menu_item_call label="Bulk (L$[COST] per file)..." name="Bulk Upload"/>
@@ -137,12 +137,12 @@
 		<menu_item_call label="設定視窗尺寸大小..." name="Set Window Size..."/>
 		<menu_item_check label="Limit Select Distance" name="Limit Select Distance"/>
 		<menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/>
-		<menu_item_check label="High-res Snapshot" name="HighResSnapshot"/>
+		<menu_item_check label="高解析度快照" name="HighResSnapshot"/>
 		<menu_item_check label="Quiet Snapshots to Disk" name="QuietSnapshotsToDisk"/>
 		<menu_item_check label="Compress Snapshots to Disk" name="CompressSnapshotsToDisk"/>
 		<menu label="Performance Tools" name="Performance Tools">
 			<menu_item_call label="Lag Meter" name="Lag Meter"/>
-			<menu_item_check label="Statistics Bar" name="Statistics Bar"/>
+			<menu_item_check label="統計列" name="Statistics Bar"/>
 			<menu_item_check label="Show Avatar Rendering Cost" name="Avatar Rendering Cost"/>
 		</menu>
 		<menu label="Highlighting and Visibility" name="Highlighting and Visibility">
@@ -181,10 +181,10 @@
 		<menu_item_check label="Use Plugin Read Thread" name="Use Plugin Read Thread"/>
 		<menu_item_call label="Clear Group Cache" name="ClearGroupCache"/>
 		<menu_item_check label="Mouse Smoothing" name="Mouse Smoothing"/>
-		<menu label="Shortcuts" name="Shortcuts">
-			<menu_item_call label="Image (L$[COST])..." name="Upload Image"/>
-			<menu_item_check label="Search" name="Search"/>
-			<menu_item_call label="Release Keys" 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="Show Advanced Menu - legacy shortcut" name="Show Advanced Menu - legacy shortcut"/>
 			<menu_item_call label="關閉視窗" name="Close Window"/>
@@ -209,10 +209,10 @@
 		<menu_item_check label="顯示開發選單" name="Debug Mode"/>
 	</menu>
 	<menu label="開發" name="Develop">
-		<menu label="Consoles" name="Consoles">
+		<menu label="控制台" name="Consoles">
 			<menu_item_check label="材質控制台" name="Texture Console"/>
-			<menu_item_check label="Debug Console" name="Debug Console"/>
-			<menu_item_call label="Notifications Console" name="Notifications"/>
+			<menu_item_check label="除錯控制台" name="Debug Console"/>
+			<menu_item_call label="通知控制台" name="Notifications"/>
 			<menu_item_check label="材質尺寸控制台" name="Texture Size"/>
 			<menu_item_check label="Texture Category Console" name="Texture Category"/>
 			<menu_item_check label="Fast Timers" name="Fast Timers"/>
diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml
index ecc14867b8..d2d1321c2a 100644
--- a/indra/newview/skins/default/xui/zh/mime_types.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -24,7 +24,7 @@
 	</widgetset>
 	<widgetset name="image">
 		<label name="image_label">
-			Image
+			圖像
 		</label>
 		<tooltip name="image_tooltip">
 			There is an image at this location
@@ -71,7 +71,7 @@
 	</mimetype>
 	<mimetype name="image/*">
 		<label name="image2_label">
-			Image
+			圖像
 		</label>
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
@@ -91,12 +91,12 @@
 	</mimetype>
 	<mimetype name="application/pdf">
 		<label name="application/pdf_label">
-			PDF Document
+			PDF 文件
 		</label>
 	</mimetype>
 	<mimetype name="application/postscript">
 		<label name="application/postscript_label">
-			Postscript Document
+			Postscript 文件
 		</label>
 	</mimetype>
 	<mimetype name="application/rtf">
@@ -141,32 +141,32 @@
 	</mimetype>
 	<mimetype name="image/bmp">
 		<label name="image/bmp_label">
-			Image (BMP)
+			圖像（BMP）
 		</label>
 	</mimetype>
 	<mimetype name="image/gif">
 		<label name="image/gif_label">
-			Image (GIF)
+			圖像（GIF）
 		</label>
 	</mimetype>
 	<mimetype name="image/jpeg">
 		<label name="image/jpeg_label">
-			Image (JPEG)
+			圖像（JPEG）
 		</label>
 	</mimetype>
 	<mimetype name="image/png">
 		<label name="image/png_label">
-			Image (PNG)
+			圖像（PNG）
 		</label>
 	</mimetype>
 	<mimetype name="image/svg+xml">
 		<label name="image/svg+xml_label">
-			Image (SVG)
+			圖像（SVG）
 		</label>
 	</mimetype>
 	<mimetype name="image/tiff">
 		<label name="image/tiff_label">
-			Image (TIFF)
+			圖像（TIFF）
 		</label>
 	</mimetype>
 	<mimetype name="text/html">
diff --git a/indra/newview/skins/default/xui/zh/mime_types_linux.xml b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
index ecc14867b8..3498942f9b 100644
--- a/indra/newview/skins/default/xui/zh/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
@@ -24,7 +24,7 @@
 	</widgetset>
 	<widgetset name="image">
 		<label name="image_label">
-			Image
+			圖像
 		</label>
 		<tooltip name="image_tooltip">
 			There is an image at this location
@@ -71,7 +71,7 @@
 	</mimetype>
 	<mimetype name="image/*">
 		<label name="image2_label">
-			Image
+			圖像
 		</label>
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
@@ -91,12 +91,12 @@
 	</mimetype>
 	<mimetype name="application/pdf">
 		<label name="application/pdf_label">
-			PDF Document
+			PDF 文件
 		</label>
 	</mimetype>
 	<mimetype name="application/postscript">
 		<label name="application/postscript_label">
-			Postscript Document
+			Postscript 文件
 		</label>
 	</mimetype>
 	<mimetype name="application/rtf">
@@ -141,32 +141,32 @@
 	</mimetype>
 	<mimetype name="image/bmp">
 		<label name="image/bmp_label">
-			Image (BMP)
+			圖像（BMP）
 		</label>
 	</mimetype>
 	<mimetype name="image/gif">
 		<label name="image/gif_label">
-			Image (GIF)
+			圖像（GIF）
 		</label>
 	</mimetype>
 	<mimetype name="image/jpeg">
 		<label name="image/jpeg_label">
-			Image (JPEG)
+			圖像（JPEG）
 		</label>
 	</mimetype>
 	<mimetype name="image/png">
 		<label name="image/png_label">
-			Image (PNG)
+			圖像（PNG）
 		</label>
 	</mimetype>
 	<mimetype name="image/svg+xml">
 		<label name="image/svg+xml_label">
-			Image (SVG)
+			圖像（SVG）
 		</label>
 	</mimetype>
 	<mimetype name="image/tiff">
 		<label name="image/tiff_label">
-			Image (TIFF)
+			圖像（TIFF）
 		</label>
 	</mimetype>
 	<mimetype name="text/html">
@@ -176,7 +176,7 @@
 	</mimetype>
 	<mimetype name="text/plain">
 		<label name="text/plain_label">
-			Text
+			文字
 		</label>
 	</mimetype>
 	<mimetype name="text/xml">
diff --git a/indra/newview/skins/default/xui/zh/mime_types_mac.xml b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
index 51f242a1c2..3f38c528a6 100644
--- a/indra/newview/skins/default/xui/zh/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
@@ -24,7 +24,7 @@
 	</widgetset>
 	<widgetset name="image">
 		<label name="image_label">
-			Image
+			圖像
 		</label>
 		<tooltip name="image_tooltip">
 			There is an image at this location
@@ -71,7 +71,7 @@
 	</mimetype>
 	<mimetype name="image/*">
 		<label name="image2_label">
-			Image
+			圖像
 		</label>
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
@@ -91,12 +91,12 @@
 	</mimetype>
 	<mimetype name="application/pdf">
 		<label name="application/pdf_label">
-			PDF Document
+			PDF 文件
 		</label>
 	</mimetype>
 	<mimetype name="application/postscript">
 		<label name="application/postscript_label">
-			Postscript Document
+			Postscript 文件
 		</label>
 	</mimetype>
 	<mimetype name="application/rtf">
@@ -141,32 +141,32 @@
 	</mimetype>
 	<mimetype name="image/bmp">
 		<label name="image/bmp_label">
-			Image (BMP)
+			圖像（BMP）
 		</label>
 	</mimetype>
 	<mimetype name="image/gif">
 		<label name="image/gif_label">
-			Image (GIF)
+			圖像（GIF）
 		</label>
 	</mimetype>
 	<mimetype name="image/jpeg">
 		<label name="image/jpeg_label">
-			Image (JPEG)
+			圖像（JPEG）
 		</label>
 	</mimetype>
 	<mimetype name="image/png">
 		<label name="image/png_label">
-			Image (PNG)
+			圖像（PNG）
 		</label>
 	</mimetype>
 	<mimetype name="image/svg+xml">
 		<label name="image/svg+xml_label">
-			Image (SVG)
+			圖像（SVG）
 		</label>
 	</mimetype>
 	<mimetype name="image/tiff">
 		<label name="image/tiff_label">
-			Image (TIFF)
+			圖像（TIFF）
 		</label>
 	</mimetype>
 	<mimetype name="text/html">
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 7652c1a1d0..16d4965d5a 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -65,7 +65,7 @@ Error details: The notification called &apos;[_NAME]&apos; was not found in noti
 	</notification>
 	<notification name="GenericAlertYesCancel">
 		[MESSAGE]
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="是"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="是"/>
 	</notification>
 	<notification name="BadInstallation">
 		An error occurred while updating [APP_NAME].  Please [http://get.secondlife.com download the latest version] of the Viewer.
@@ -83,7 +83,7 @@ Make sure your Internet connection is working properly.
 	</notification>
 	<notification name="WearableSave">
 		Save changes to current clothing/body part?
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="不要儲存" yestext="儲存"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="不要儲存" yestext="儲存"/>
 	</notification>
 	<notification name="CompileQueueSaveText">
 		There was a problem uploading the text for a script due to the following reason: [REASON]. Please try again later.
@@ -103,7 +103,7 @@ Please select only one object and try again.
 	</notification>
 	<notification name="SaveClothingBodyChanges">
 		儲存全部服裝或身體部位的變更？
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="不要儲存" yestext="全部儲存"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="不要儲存" yestext="全部儲存"/>
 	</notification>
 	<notification name="FriendsAndGroupsOnly">
 		Non-friends won&apos;t know that you&apos;ve choosen to ignore their calls and instant messages.
@@ -139,7 +139,7 @@ Do you want to grant modify rights for the selected Residents?
 	<notification name="PanelGroupApply">
 		[NEEDS_APPLY_MESSAGE]
 [WANT_APPLY_MESSAGE]
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="忽視變更" yestext="套用變更"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="忽視變更" yestext="套用變更"/>
 	</notification>
 	<notification name="MustSpecifyGroupNoticeSubject">
 		You must specify a subject to send a group notice.
@@ -178,12 +178,12 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
 	<notification name="JoinGroupCanAfford">
 		Joining this group costs L$[COST].
 Do you wish to proceed?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="Join"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="Join"/>
 	</notification>
 	<notification name="JoinGroupNoCost">
 		You are joining group [NAME].
 Do you wish to proceed?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="Join"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="Join"/>
 	</notification>
 	<notification name="JoinGroupCannotAfford">
 		Joining this group costs L$[COST].
@@ -193,11 +193,11 @@ You do not have enough L$ to join this group.
 		Creating this group will cost L$100.
 Groups need more than one member, or they are deleted forever.
 Please invite members within 48 hours.
-		<usetemplate canceltext="取銷" name="okcancelbuttons" notext="取銷" yestext="Create group for L$100"/>
+		<usetemplate canceltext="取消" name="okcancelbuttons" notext="取消" yestext="Create group for L$100"/>
 	</notification>
 	<notification name="LandBuyPass">
 		For L$[COST] you can enter this land (&apos;[PARCEL_NAME]&apos;) for [TIME] hours.  Buy a pass?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="SalePriceRestriction">
 		Sale price must be set to more than L$0 if selling to anyone.
@@ -206,14 +206,14 @@ Please select an individual to sell to if selling for L$0.
 	<notification name="ConfirmLandSaleChange">
 		The selected [LAND_SIZE] m² land is being set for sale.
 Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmLandSaleToAnyoneChange">
 		ATTENTION: Clicking &apos;sell to anyone&apos; makes your land available to the entire [SECOND_LIFE] community, even those not in this region.
 
 The selected [LAND_SIZE] m² land is being set for sale.
 Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnObjectsDeededToGroup">
 		Are you sure you want to return all objects shared with the group &apos;[NAME]&apos; on this parcel of land back to their previous owner&apos;s inventory?
@@ -221,19 +221,19 @@ Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NA
 *WARNING* This will delete the non-transferable objects deeded to the group!
 
 Objects: [N]
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnObjectsOwnedByUser">
 		Are you sure you want to return all objects owned by the Resident &apos;[NAME]&apos; on this parcel of land back to their inventory?
 
 Objects: [N]
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnObjectsOwnedBySelf">
 		Are you sure you want to return all objects owned by you on this parcel of land back to your inventory?
 
 Objects: [N]
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnObjectsNotOwnedBySelf">
 		Are you sure you want to return all objects NOT owned by you on this parcel of land back to their owner&apos;s inventory?
@@ -242,7 +242,7 @@ Transferable objects deeded to a group will be returned to their previous owners
 *WARNING* This will delete the non-transferable objects deeded to the group!
 
 Objects: [N]
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnObjectsNotOwnedByUser">
 		Are you sure you want to return all objects NOT owned by [NAME] on this parcel of land back to their owner&apos;s inventory?
@@ -251,21 +251,21 @@ Transferable objects deeded to a group will be returned to their previous owners
 *WARNING* This will delete the non-transferable objects deeded to the group!
 
 Objects: [N]
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnAllTopObjects">
 		Are you sure you want to return all listed objects back to their owner&apos;s inventory?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="DisableAllTopObjects">
 		Are you sure you want to disable all objects in this region?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnObjectsNotOwnedByGroup">
 		Return the objects on this parcel of land that are NOT shared with the group [NAME] back to their owners?
 
 Objects: [N]
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="UnableToDisableOutsideScripts">
 		Can not disable scripts.
@@ -276,7 +276,7 @@ Scripts must be allowed to run for weapons to work.
 		Multiple faces are currently selected.
 If you continue this action, separate instances of media will be set on multiple faces of the object.
 To place the media on only one face, choose Select Face and click on the desired face of that object then click Add.
-		<usetemplate ignoretext="Media will be set on multiple selected faces" name="okcancelignore" notext="取銷" yestext="確定"/>
+		<usetemplate ignoretext="Media will be set on multiple selected faces" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="MustBeInParcel">
 		You must be standing inside the land parcel to set its Landing Point.
@@ -289,7 +289,7 @@ To place the media on only one face, choose Select Face and click on the desired
 	</notification>
 	<notification name="PromptMissingSubjMsg">
 		Email snapshot with the default subject or message?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ErrorProcessingSnapshot">
 		Error processing snapshot data
@@ -328,7 +328,7 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now?
 		<url name="url">
 			http://join.secondlife.com/
 		</url>
-		<usetemplate name="okcancelbuttons" notext="Try again" yestext="Create a new account"/>
+		<usetemplate name="okcancelbuttons" notext="再試一次" yestext="創造新帳戶"/>
 	</notification>
 	<notification name="InvalidCredentialFormat">
 		You need to enter either the Username or both the First and Last name of your avatar into the Username field, then login again.
@@ -336,7 +336,7 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now?
 	<notification name="DeleteClassified">
 		Delete classified &apos;[NAME]&apos;?
 There is no reimbursement for fees paid.
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="DeleteMedia">
 		You have selected to delete the media associated with this face.
@@ -345,7 +345,7 @@ Are you sure you want to continue?
 	</notification>
 	<notification name="ClassifiedSave">
 		Save changes to classified [NAME]?
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="不要儲存" yestext="儲存"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="不要儲存" yestext="儲存"/>
 	</notification>
 	<notification name="ClassifiedInsufficientFunds">
 		Insufficient funds to create classified.
@@ -353,18 +353,18 @@ Are you sure you want to continue?
 	</notification>
 	<notification name="DeleteAvatarPick">
 		Delete pick &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="DeleteOutfits">
 		刪除所選擇的裝扮？
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="PromptGoToEventsPage">
 		前往 [SECOND_LIFE] 事件網頁？
 		<url name="url">
 			http://secondlife.com/events/
 		</url>
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="SelectProposalToView">
 		Please select a proposal to view.
@@ -393,11 +393,11 @@ Note: This will clear the cache.
 		<url name="url">
 			http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID]
 		</url>
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="SaveChanges">
 		Save Changes?
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="不要儲存" yestext="儲存"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="不要儲存" yestext="儲存"/>
 	</notification>
 	<notification name="GestureSaveFailedTooManySteps">
 		Gesture save failed.
@@ -425,7 +425,7 @@ The object may be out of range or may have been deleted.
 		Could not undo all changes in your version of the script.
 Would you like to load the server&apos;s last saved version?
 (**Warning** This operation cannot be undone.)
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="SaveScriptFailReason">
 		There was a problem saving a script due to the following reason: [REASON].  Please try re-saving the script later.
@@ -459,14 +459,14 @@ Visit [_URL] for more information?
 		<url name="url">
 			http://www.secondlife.com/corporate/sysreqs.php
 		</url>
-		<usetemplate ignoretext="My computer hardware is not supported" name="okcancelignore" notext="否" yestext="是"/>
+		<usetemplate ignoretext="我的電腦硬體並不支援" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="UnknownGPU">
 		Your system contains a graphics card that [APP_NAME] doesn&apos;t recognize.
 This is often the case with new hardware that hasn&apos;t been tested yet with [APP_NAME].  It will probably be ok, but you may need to adjust your graphics settings.
 (Me &gt; Preferences &gt; Graphics).
 		<form name="form">
-			<ignore name="ignore" text="My graphics card could not be identified"/>
+			<ignore name="ignore" text="我的顯示卡無法辨識"/>
 		</form>
 	</notification>
 	<notification name="DisplaySettingsNoShaders">
@@ -476,7 +476,7 @@ We recommend updating your graphics card drivers.
 Graphics Quality can be raised in Preferences &gt; Graphics.
 	</notification>
 	<notification name="RegionNoTerraforming">
-		The region [REGION] does not allow terraforming.
+		這個 [REGION] 地區並不允許變更地形。
 	</notification>
 	<notification name="CannotCopyWarning">
 		You do not have permission to copy the following items:
@@ -488,7 +488,7 @@ and will lose it from your inventory if you give it away. Do you really want to
 		無法給予收納區物品。
 	</notification>
 	<notification name="TransactionCancelled">
-		交易已取銷。
+		交易已取消。
 	</notification>
 	<notification name="TooManyItems">
 		Cannot give more than 42 items in a single inventory transfer.
@@ -505,29 +505,29 @@ Do you really want to give these items?
 		You do not have permission to transfer the selected folder.
 	</notification>
 	<notification name="FreezeAvatar">
-		Freeze this avatar?
-He or she will temporarily be unable to move, chat, or interact with the world.
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="Unfreeze" yestext="Freeze"/>
+		凍結這位化身？
+他將暫時無法移動、聊天或這個世界互動。
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="解凍" yestext="凍結"/>
 	</notification>
 	<notification name="FreezeAvatarFullname">
-		Freeze [AVATAR_NAME]?
-He or she will temporarily be unable to move, chat, or interact with the world.
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="Unfreeze" yestext="Freeze"/>
+		凍結 [AVATAR_NAME]？
+他將暫時無法移動、聊天或這個世界互動。
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="解凍" yestext="凍結"/>
 	</notification>
 	<notification name="EjectAvatarFullname">
-		Eject [AVATAR_NAME] from your land?
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="Eject and Ban" yestext="Eject"/>
+		將 [AVATAR_NAME] 由你的土地踢出？
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="踢出並封鎖" yestext="踢出"/>
 	</notification>
 	<notification name="EjectAvatarNoBan">
-		Eject this avatar from your land?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="Eject"/>
+		將這一位化身由你的土地踢出？
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="踢出"/>
 	</notification>
 	<notification name="EjectAvatarFullnameNoBan">
-		Eject [AVATAR_NAME] from your land?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="Eject"/>
+		將 [AVATAR_NAME] 由你的土地踢出？
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="踢出"/>
 	</notification>
 	<notification name="EjectAvatarFromGroup">
-		You ejected [AVATAR_NAME] from group [GROUP_NAME]
+		你已將 [AVATAR_NAME] 由社團 [GROUP_NAME]　中踢出
 	</notification>
 	<notification name="AcquireErrorTooManyObjects">
 		ACQUIRE ERROR: Too many objects selected.
@@ -543,7 +543,7 @@ Go to [_URL] for information on purchasing L$?
 		<url name="url">
 			http://secondlife.com/app/currency/
 		</url>
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="UnableToLinkObjects">
 		Unable to link these [COUNT] objects.
@@ -747,7 +747,7 @@ No parcel selected.
 	<notification name="ForceOwnerAuctionWarning">
 		This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some Residents unhappy if bidding has begun.
 Force ownership?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="CannotContentifyNothingSelected">
 		Unable to contentify:
@@ -840,7 +840,7 @@ Select an entire parcel, or divide your parcel first.
 Releasing this parcel will remove it from your land holdings, but will not grant any L$.
 
 Release this land?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="CannotDivideLandNothingSelected">
 		Unable to divide land:
@@ -857,7 +857,7 @@ Try selecting a part of the parcel.
 		Dividing this land will split this parcel into two and each parcel can have its own settings. Some settings will be reset to defaults after the operation.
 
 Divide land?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="CannotDivideLandNoRegion">
 		Unable to divide land:
@@ -888,15 +888,15 @@ Select land across both parcels.
 You will need to reset the name and options of the new parcel.
 
 Join land?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmNotecardSave">
 		This notecard needs to be saved before the item can be copied or viewed. Save notecard?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmItemCopy">
 		覆製這個物品到你的收納區？
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="覆製"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="覆製"/>
 	</notification>
 	<notification name="ResolutionSwitchFail">
 		Failed to switch resolution to [RESX] by [RESY]
@@ -917,7 +917,7 @@ This is usually a temporary failure. Please customize and save the wearable agai
 	<notification name="YouHaveBeenLoggedOut">
 		Darn. You have been logged out of [SECOND_LIFE]
             [MESSAGE]
-		<usetemplate name="okcancelbuttons" notext="Quit" yestext="View IM &amp; Chat"/>
+		<usetemplate name="okcancelbuttons" notext="結束退出" yestext="View IM &amp; Chat"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
 		Unable to buy land for the group:
@@ -932,7 +932,7 @@ Offer friendship to [NAME]?
 				你願意成為我的朋友嗎？
 			</input>
 			<button name="Offer" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification label="儲存裝扮" name="SaveOutfitAs">
@@ -942,7 +942,7 @@ Offer friendship to [NAME]?
 				[DESC] （新）
 			</input>
 			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification label="Save Wearable" name="SaveWearableAs">
@@ -952,7 +952,7 @@ Offer friendship to [NAME]?
 				[DESC] （新）
 			</input>
 			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification label="裝扮更名" name="RenameOutfit">
@@ -962,34 +962,34 @@ Offer friendship to [NAME]?
 				[NAME]
 			</input>
 			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="RemoveFromFriends">
 		Do you want to remove [NAME] from your Friends List?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="RemoveMultipleFromFriends">
 		你確定要由朋友清單中移除多個朋友嗎？
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="GodDeleteAllScriptedPublicObjectsByUser">
 		Are you sure you want to delete all scripted objects owned by
 ** [AVATAR_NAME] **
 on all others land in this sim?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="GodDeleteAllScriptedObjectsByUser">
 		Are you sure you want to DELETE ALL scripted objects owned by
 ** [AVATAR_NAME] **
 on ALL LAND in this sim?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="GodDeleteAllObjectsByUser">
 		Are you sure you want to DELETE ALL objects (scripted or not) owned by
 ** [AVATAR_NAME] **
 on ALL LAND in this sim?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BlankClassifiedName">
 		You must specify a name for your classified.
@@ -1003,46 +1003,46 @@ Please enter a higher price.
 		At least one of the items you has link items that point to it.  If you delete this item, its links will permanently stop working.  It is strongly advised to delete the links first.
 
 Are you sure you want to delete these items?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLock">
 		At least one of the items you have selected is locked.
 
 Are you sure you want to delete these items?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopy">
 		At least one of the items you have selected is not copyable.
 
 Are you sure you want to delete these items?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoOwn">
 		You do not own least one of the items you have selected.
 
 Are you sure you want to delete these items?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
 		At least one object is locked.
 At least one object is not copyable.
 
 Are you sure you want to delete these items?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoOwn">
 		At least one object is locked.
 You do not own least one object.
 
 Are you sure you want to delete these items?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
 		At least one object is not copyable.
 You do not own least one object.
 
 Are you sure you want to delete these items?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
 		At least one object is locked.
@@ -1050,20 +1050,20 @@ At least one object is not copyable.
 You do not own least one object.
 
 Are you sure you want to delete these items?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
 		At least one object is locked.
 
 Are you sure you want to take these items?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectTakeNoOwn">
 		You do not own all of the objects you are taking.
 If you continue, next owner permissions will be applied and possibly restrict your ability to modify or copy them.
 
 Are you sure you want to take these items?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLockNoOwn">
 		At least one object is locked.
@@ -1072,7 +1072,7 @@ If you continue, next owner permissions will be applied and possibly restrict yo
 However, you can take the current selection.
 
 Are you sure you want to take these items?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="CantBuyLandAcrossMultipleRegions">
 		Unable to buy land because selection spans multiple regions.
@@ -1084,7 +1084,7 @@ Please select a smaller area and try again.
 The purchase price of the land is not refunded to the owner. If a deeded parcel is sold, the sale price will be divided evenly among group members.
 
 Deed this [AREA] m² of land to the group &apos;[GROUP_NAME]&apos;?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="DeedLandToGroupWithContribution">
 		By deeding this parcel, the group will be required to have and maintain sufficient land use credits.
@@ -1092,7 +1092,7 @@ The deed will include a simultaneous land contribution to the group from &apos;[
 The purchase price of the land is not refunded to the owner. If a deeded parcel is sold, the sale price will be divided evenly among group members.
 
 Deed this [AREA] m² of land to the group &apos;[GROUP_NAME]&apos;?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="DisplaySetToSafe">
 		Display settings have been set to safe levels because you have specified the -safe option.
@@ -1129,7 +1129,7 @@ You may want to set a new home location.
 
 If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in.
 Return to [http://join.secondlife.com secondlife.com] to create a new account?
-		<usetemplate name="okcancelbuttons" notext="繼續" yestext="New Account..."/>
+		<usetemplate name="okcancelbuttons" notext="繼續" yestext="新帳戶..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
 		We&apos;re having trouble connecting. There may be a problem with your Internet connection or the [SECOND_LIFE_GRID].
@@ -1186,7 +1186,7 @@ Extended Key Usage: [EXTENDEDKEYUSAGE]
 Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
 
 Would you like to trust this authority?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="Trust"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="Trust"/>
 	</notification>
 	<notification name="NotEnoughCurrency">
 		[NAME] L$ [PRICE] You don&apos;t have enough L$ to do that.
@@ -1201,7 +1201,7 @@ Would you like to trust this authority?
 		This will flush the map caches on this region.
 This is really only useful for debugging.
 (In production, wait 5 minutes, then everyone&apos;s map will update after they relog.)
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BuyOneObjectOnly">
 		Unable to buy more than one object at a time.  Please select only one object and try again.
@@ -1209,15 +1209,15 @@ This is really only useful for debugging.
 	<notification name="OnlyCopyContentsOfSingleItem">
 		Unable to copy the contents of more than one item at a time.
 Please select only one object and try again.
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="KickUsersFromRegion">
 		確定要強制瞬間傳送這地區所有居民回家？
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="EstateObjectReturn">
 		Are you sure you want to return objects owned by [USER_NAME]?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="InvalidTerrainBitDepth">
 		Couldn&apos;t set region textures:
@@ -1236,7 +1236,7 @@ Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click
 	</notification>
 	<notification name="ConfirmBakeTerrain">
 		Do you really want to bake the current terrain, make it the center for terrain raise/lower limits and the default for the &apos;Revert&apos; tool?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="MaxAllowedAgentOnRegion">
 		You can only have [MAX_AGENTS] Allowed Residents.
@@ -1250,7 +1250,7 @@ Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS].
 	</notification>
 	<notification name="MaxAllowedGroupsOnRegion">
 		You can only have [MAX_GROUPS] Allowed Groups.
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="Bake"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="Bake"/>
 	</notification>
 	<notification name="MaxManagersOnRegion">
 		You can only have [MAX_MANAGER] Estate Managers.
@@ -1276,7 +1276,7 @@ Please set the object for sale and try again.
 		A new version of [APP_NAME] is available.
 [MESSAGE]
 You must download this update to use [APP_NAME].
-		<usetemplate name="okcancelbuttons" notext="Quit" yestext="下載"/>
+		<usetemplate name="okcancelbuttons" notext="結束退出" yestext="下載"/>
 	</notification>
 	<notification name="DownloadWindows">
 		An updated version of [APP_NAME] is available.
@@ -1294,7 +1294,7 @@ This update is not required, but we suggest you install it to improve performanc
 		A new version of [APP_NAME] is available.
 [MESSAGE]
 You must download this update to use [APP_NAME].
-		<usetemplate name="okcancelbuttons" notext="Quit" yestext="下載"/>
+		<usetemplate name="okcancelbuttons" notext="結束退出" yestext="下載"/>
 	</notification>
 	<notification name="DownloadLinux">
 		An updated version of [APP_NAME] is available.
@@ -1314,7 +1314,7 @@ This update is not required, but we suggest you install it to improve performanc
 You must download this update to use [APP_NAME].
 
 Download to your Applications folder?
-		<usetemplate name="okcancelbuttons" notext="Quit" yestext="下載"/>
+		<usetemplate name="okcancelbuttons" notext="結束退出" yestext="下載"/>
 	</notification>
 	<notification name="DownloadMac">
 		An updated version of [APP_NAME] is available.
@@ -1344,14 +1344,14 @@ You will be unable to log in until [APP_NAME] has been updated.
 
 Please download and install the latest viewer from
 http://secondlife.com/download.
-		<usetemplate name="okbutton" yestext="Quit"/>
+		<usetemplate name="okbutton" yestext="結束退出"/>
 	</notification>
 	<notification name="UpdaterServiceNotRunning">
 		There is a required update for your Second Life Installation.
 
 You may download this update from http://www.secondlife.com/downloads
 or you can install it now.
-		<usetemplate name="okcancelbuttons" notext="Quit Second Life" yestext="立即下載及安裝"/>
+		<usetemplate name="okcancelbuttons" notext="結束退出第二人生" yestext="立即下載及安裝"/>
 	</notification>
 	<notification name="DownloadBackgroundTip">
 		We have downloaded an update to your [APP_NAME] installation.
@@ -1377,54 +1377,54 @@ We must restart [APP_NAME] to install the update.
 	<notification name="DeedObjectToGroup">
 		Deeding this object will cause the group to:
 * Receive L$ paid into the object
-		<usetemplate ignoretext="Confirm before I deed an object to a group" name="okcancelignore" notext="取銷" yestext="Deed"/>
+		<usetemplate ignoretext="Confirm before I deed an object to a group" name="okcancelignore" notext="取消" yestext="Deed"/>
 	</notification>
 	<notification name="WebLaunchExternalTarget">
 		Do you want to open your Web browser to view this content?
-		<usetemplate ignoretext="Launch my browser to view a web page" name="okcancelignore" notext="取銷" yestext="確定"/>
+		<usetemplate ignoretext="Launch my browser to view a web page" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchJoinNow">
-		Go to your [http://secondlife.com/account/ Dashboard] to manage your account?
-		<usetemplate ignoretext="Launch my browser to manage my account" name="okcancelignore" notext="取銷" yestext="確定"/>
+		前往你的[http://secondlife.com/account/ 塗鴉牆]以進行管理你的帳戶？
+		<usetemplate ignoretext="啟動我的瀏覽器以管理我的帳戶" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchSecurityIssues">
 		Visit the [SECOND_LIFE] Wiki for details of how to report a security issue.
-		<usetemplate ignoretext="Launch my browser to learn how to report a Security Issue" name="okcancelignore" notext="取銷" yestext="確定"/>
+		<usetemplate ignoretext="Launch my browser to learn how to report a Security Issue" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchQAWiki">
 		Visit the [SECOND_LIFE] QA Wiki.
-		<usetemplate ignoretext="Launch my browser to view the QA Wiki" name="okcancelignore" notext="取銷" yestext="確定"/>
+		<usetemplate ignoretext="Launch my browser to view the QA Wiki" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchPublicIssue">
 		Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and other issues.
-		<usetemplate ignoretext="Launch my browser to use the Public Issue Tracker" name="okcancelignore" notext="取銷" yestext="前往頁面"/>
+		<usetemplate ignoretext="Launch my browser to use the Public Issue Tracker" name="okcancelignore" notext="取消" yestext="前往頁面"/>
 	</notification>
 	<notification name="WebLaunchSupportWiki">
-		Go to the Official Linden Blog, for the latest news and information.
-		<usetemplate ignoretext="Launch my browser to view the blog" name="okcancelignore" notext="取銷" yestext="確定"/>
+		前往林登官方部落格，以取得最新的新聞與資訊。
+		<usetemplate ignoretext="Launch my browser to view the blog" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchLSLGuide">
 		Do you want to open the Scripting Guide for help with scripting?
-		<usetemplate ignoretext="Launch my browser to view the Scripting Guide" name="okcancelignore" notext="取銷" yestext="確定"/>
+		<usetemplate ignoretext="Launch my browser to view the Scripting Guide" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchLSLWiki">
 		Do you want to visit the LSL Portal for help with scripting?
-		<usetemplate ignoretext="Launch my browser to view the LSL Portal" name="okcancelignore" notext="取銷" yestext="Go to page"/>
+		<usetemplate ignoretext="Launch my browser to view the LSL Portal" name="okcancelignore" notext="取消" yestext="前往頁面"/>
 	</notification>
 	<notification name="ReturnToOwner">
 		Are you sure you want to return the selected objects to their owners? Transferable deeded objects will be returned to their previous owners.
 
 *WARNING* No-transfer deeded objects will be deleted!
-		<usetemplate ignoretext="Confirm before I return objects to their owners" name="okcancelignore" notext="取銷" yestext="確定"/>
+		<usetemplate ignoretext="Confirm before I return objects to their owners" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="GroupLeaveConfirmMember">
 		You are currently a member of the group [GROUP].
 Leave Group?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmKick">
-		你確定要踢除這網格內的全部居民？
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="踢除全部居民"/>
+		你確定要踢出這網格內的全部居民？
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="踢出全部居民"/>
 	</notification>
 	<notification name="MuteLinden">
 		Sorry, you cannot block a Linden.
@@ -1439,7 +1439,7 @@ Leave Group?
 	</notification>
 	<notification name="RemoveItemWarn">
 		Though permitted, deleting contents may damage the object. Do you want to delete that item?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="CantOfferCallingCard">
 		Cannot offer a calling card at this time. Please try again in a moment.
@@ -1464,13 +1464,13 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="KickUser">
-		踢除這個居民並留給他什麼訊息？
+		踢出這個居民並留給他什麼訊息？
 		<form name="form">
 			<input name="message">
 				An administrator has logged you off.
 			</input>
 			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="KickAllUsers">
@@ -1480,27 +1480,27 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo
 				An administrator has logged you off.
 			</input>
 			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="FreezeUser">
-		Freeze this Resident with what message?
+		凍結這位居民時同時留下什麼訊息？
 		<form name="form">
 			<input name="message">
-				You have been frozen. You cannot move or chat. An administrator will contact you via instant message (IM).
+				你已經被凍結了。你將不能移動或聊天。管理員將會以即時訊息聯繫你（IM）。
 			</input>
 			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="UnFreezeUser">
-		Unfreeze this Resident with what message?
+		將這位居民解凍並同時留下什麼訊息？
 		<form name="form">
 			<input name="message">
 				You are no longer frozen.
 			</input>
 			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="SetDisplayNameSuccess">
@@ -1550,7 +1550,7 @@ Please try again later.
 				加入我到 [REGION]
 			</input>
 			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="OfferTeleportFromGod">
@@ -1560,30 +1560,30 @@ Please try again later.
 				Join me in [REGION]
 			</input>
 			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="TeleportFromLandmark">
 		Are you sure you want to teleport to &lt;nolink&gt;[LOCATION]&lt;/nolink&gt;?
-		<usetemplate ignoretext="Confirm that I want to teleport to a landmark" name="okcancelignore" notext="取銷" yestext="瞬間傳送"/>
+		<usetemplate ignoretext="Confirm that I want to teleport to a landmark" name="okcancelignore" notext="取消" yestext="瞬間傳送"/>
 	</notification>
 	<notification name="TeleportToPick">
 		瞬間傳送到 [PICK]?
-		<usetemplate ignoretext="Confirm that I want to teleport to a location in Picks" name="okcancelignore" notext="取銷" yestext="Teleport"/>
+		<usetemplate ignoretext="Confirm that I want to teleport to a location in Picks" name="okcancelignore" notext="取消" yestext="Teleport"/>
 	</notification>
 	<notification name="TeleportToClassified">
 		瞬間傳送到 [CLASSIFIED]?
-		<usetemplate ignoretext="Confirm that I want to teleport to a location in Classifieds" name="okcancelignore" notext="取銷" yestext="瞬間傳送"/>
+		<usetemplate ignoretext="Confirm that I want to teleport to a location in Classifieds" name="okcancelignore" notext="取消" yestext="瞬間傳送"/>
 	</notification>
 	<notification name="TeleportToHistoryEntry">
 		瞬間傳送到 [HISTORY_ENTRY]?
-		<usetemplate ignoretext="Confirm that I want to teleport to a history location" name="okcancelignore" notext="取銷" yestext="瞬間傳送"/>
+		<usetemplate ignoretext="Confirm that I want to teleport to a history location" name="okcancelignore" notext="取消" yestext="瞬間傳送"/>
 	</notification>
 	<notification label="Message everyone in your Estate" name="MessageEstate">
 		Type a short announcement which will be sent to everyone currently in your estate.
 		<form name="form">
 			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification label="Change Linden Estate" name="ChangeLindenEstate">
@@ -1592,54 +1592,54 @@ Please try again later.
 This is EXTREMELY DANGEROUS because it can fundamentally affect the Resident experience.  On the mainland, it will change thousands of regions and make the spaceserver hiccup.
 
 Proceed?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification label="Change Linden Estate Access" name="ChangeLindenAccess">
 		You are about to change the access list for a Linden owned estate (mainland, teen grid, orientation, etc.).
 
 This is DANGEROUS and should only be done to invoke the hack allowing objects/L$ to be transfered in/out of a grid.
 It will change thousands of regions and make the spaceserver hiccup.
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification label="選擇領地" name="EstateAllowedAgentAdd">
 		Add to allowed list for this estate only or for [ALL_ESTATES]?
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateAllowedAgentRemove">
 		Remove from allowed list for this estate only or for [ALL_ESTATES]?
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateAllowedGroupAdd">
 		Add to group allowed list for this estate only or for [ALL_ESTATES]?
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateAllowedGroupRemove">
 		Remove from group allowed list for this estate only or [ALL_ESTATES]?
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateBannedAgentAdd">
 		Deny access for this estate only or for [ALL_ESTATES]?
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateBannedAgentRemove">
 		Remove this Resident from the ban list for  access for this estate only or for [ALL_ESTATES]?
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateManagerAdd">
 		Add estate manager for this estate only or for [ALL_ESTATES]?
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateManagerRemove">
 		Remove estate manager for this estate only or for [ALL_ESTATES]?
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
-	<notification label="確認踢除" name="EstateKickUser">
-		將 [EVIL_USER] 由這領地踢除？
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+	<notification label="確認踢出" name="EstateKickUser">
+		將 [EVIL_USER] 由這領地踢出？
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="EstateChangeCovenant">
 		Are you sure you want to change the Estate Covenant?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
 		You are not allowed in that Region due to your maturity Rating. This may be a result of a lack of information validating your age.
@@ -1750,25 +1750,25 @@ You can click &apos;Change Preference&apos; to raise your maturity Rating prefer
 		Remember: Classified ad fees are non-refundable.
 
 Publish this classified now for L$[AMOUNT]?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="SetClassifiedMature">
 		Does this classified contain Moderate content?
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="否" yestext="是"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="SetGroupMature">
 		Does this group contain Moderate content?
-		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="否" yestext="是"/>
+		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification label="Confirm restart" name="ConfirmRestart">
 		Do you really want to restart this region in 2 minutes?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification label="Message everyone in this region" name="MessageRegion">
 		Type a short announcement which will be sent to everyone in this region.
 		<form name="form">
 			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification label="Changed Region Maturity" name="RegionMaturityChange">
@@ -1799,7 +1799,7 @@ You will be able to:
  Modify: [MODIFYPERM]
  Copy: [COPYPERM]
  Resell or Give Away: [RESELLPERM]
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BuyOriginalNoOwner">
 		Buy original object for L$[PRICE]?
@@ -1808,7 +1808,7 @@ You will be able to:
  Modify: [MODIFYPERM]
  Copy: [COPYPERM]
  Resell or Give Away: [RESELLPERM]
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BuyCopy">
 		Buy a copy from [OWNER] for L$[PRICE]?
@@ -1817,7 +1817,7 @@ You will be able to:
  Modify: [MODIFYPERM]
  Copy: [COPYPERM]
  Resell or Give Away: [RESELLPERM]
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BuyCopyNoOwner">
 		Buy a copy for L$[PRICE]?
@@ -1826,24 +1826,24 @@ You will be able to:
  Modify: [MODIFYPERM]
  Copy: [COPYPERM]
  Resell or Give Away: [RESELLPERM]
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BuyContents">
 		Buy contents from [OWNER] for L$[PRICE]?
 They will be copied to your inventory.
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BuyContentsNoOwner">
 		Buy contents for L$[PRICE]?
 They will be copied to your inventory.
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmPurchase">
 		This transaction will:
 [ACTION]
 
 Are you sure you want to proceed with this purchase?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmPurchasePassword">
 		This transaction will:
@@ -1853,7 +1853,7 @@ Are you sure you want to proceed with this purchase?
 Please re-enter your password and click OK.
 		<form name="form">
 			<button name="ConfirmPurchase" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="SetPickLocation">
@@ -1866,14 +1866,14 @@ You have updated the location of this pick but the other details will retain the
 These items will be moved to your inventory, not copied.
 
 Move the inventory item(s)?
-		<usetemplate ignoretext="Warn me before I move &apos;no-copy&apos; items from an object" name="okcancelignore" notext="取銷" yestext="確定"/>
+		<usetemplate ignoretext="Warn me before I move &apos;no-copy&apos; items from an object" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="MoveInventoryFromScriptedObject">
 		You have selected &apos;no copy&apos; inventory items.  These items will be moved to your inventory, not copied.
 Because this object is scripted, moving these items to your inventory may cause the script to malfunction.
 
 Move the inventory item(s)?
-		<usetemplate ignoretext="Warn me before I move &apos;no-copy&apos; items which might break a scripted object" name="okcancelignore" notext="取銷" yestext="確定"/>
+		<usetemplate ignoretext="Warn me before I move &apos;no-copy&apos; items which might break a scripted object" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ClickActionNotPayable">
 		Warning: The &apos;Pay object&apos; click action has been set, but it will only work if a script is added with a money() event.
@@ -1885,16 +1885,16 @@ Move the inventory item(s)?
 		There are no items in this object that you are allowed to copy.
 	</notification>
 	<notification name="WebLaunchAccountHistory">
-		Go to your [http://secondlife.com/account/ Dashboard] to see your account history?
-		<usetemplate ignoretext="Launch my browser to see my account history" name="okcancelignore" notext="取銷" yestext="Go to page"/>
+		前往你的[http://secondlife.com/account/ 塗鴉牆]以察看你的帳戶歷史紀錄？
+		<usetemplate ignoretext="啟動我的瀏覽器以察看我的帳戶歷史紀錄" name="okcancelignore" notext="取消" yestext="前往頁面"/>
 	</notification>
 	<notification name="ConfirmQuit">
-		Are you sure you want to quit?
-		<usetemplate ignoretext="Confirm before I quit" name="okcancelignore" notext="Don&apos;t Quit" yestext="Quit"/>
+		你確定你要結束退出？
+		<usetemplate ignoretext="當我結束退出時進行確認" name="okcancelignore" notext="不結束退出" yestext="結束退出"/>
 	</notification>
 	<notification name="DeleteItems">
 		[QUESTION]
-		<usetemplate ignoretext="Confirm before deleting items" name="okcancelignore" notext="取銷" yestext="確定"/>
+		<usetemplate ignoretext="Confirm before deleting items" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="HelpReportAbuseEmailLL">
 		Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards].
@@ -1947,7 +1947,7 @@ Do you want to replace it with the selected object?
 		<form name="form">
 			<ignore name="ignore" text="Replace an existing attachment with the selected item"/>
 			<button ignore="自動取代" name="Yes" text="確定"/>
-			<button ignore="絕不取代" name="No" text="取銷"/>
+			<button ignore="絕不取代" name="No" text="取消"/>
 		</form>
 	</notification>
 	<notification label="Busy Mode Warning" name="BusyModePay">
@@ -1957,28 +1957,28 @@ Would you like to leave Busy Mode before completing this transaction?
 		<form name="form">
 			<ignore name="ignore" text="I am about to pay a person or object while I am in Busy mode"/>
 			<button ignore="Always leave Busy Mode" name="Yes" text="確定"/>
-			<button ignore="Never leave Busy Mode" name="No" text="取銷"/>
+			<button ignore="Never leave Busy Mode" name="No" text="取消"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
 		The folder &apos;[FOLDERNAME]&apos; is a system folder. Deleting system folders can cause instability.  Are you sure you want to delete it?
-		<usetemplate ignoretext="Confirm before I delete a system folder" name="okcancelignore" notext="取銷" yestext="確定"/>
+		<usetemplate ignoretext="Confirm before I delete a system folder" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmEmptyTrash">
 		Are you sure you want to permanently delete the contents of your Trash?
-		<usetemplate ignoretext="Confirm before I empty the inventory Trash folder" name="okcancelignore" notext="取銷" yestext="確定"/>
+		<usetemplate ignoretext="Confirm before I empty the inventory Trash folder" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		Are you sure you want to delete your travel, web, and search history?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmClearCookies">
 		Are you sure you want to clear your cookies?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="是"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="是"/>
 	</notification>
 	<notification name="ConfirmClearMediaUrlList">
 		Are you sure you want to clear your list of saved URLs?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="是"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="是"/>
 	</notification>
 	<notification name="ConfirmEmptyLostAndFound">
 		Are you sure you want to permanently delete the contents of your Lost And Found?
@@ -2018,7 +2018,7 @@ Link to this from a web page to give others easy access to this location, or try
 				New Preset
 			</input>
 			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="ExistsSkyPresetAlert">
@@ -2031,7 +2031,7 @@ Link to this from a web page to give others easy access to this location, or try
 				New Preset
 			</input>
 			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="ExistsWaterPresetAlert">
@@ -2041,7 +2041,7 @@ Link to this from a web page to give others easy access to this location, or try
 		You cannot edit or delete a default preset.
 	</notification>
 	<notification name="ChatterBoxSessionStartError">
-		Unable to start a new chat session with [RECIPIENT].
+		無法開始一個與　[RECIPIENT]　他的新聊天會話。
 [REASON]
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
@@ -2051,7 +2051,7 @@ Link to this from a web page to give others easy access to this location, or try
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="ForceCloseChatterBoxSession">
-		Your chat session with [NAME] must close.
+		你與 [NAME] 的聊天會話必須關閉。
 [REASON]
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
@@ -2255,7 +2255,7 @@ Try selecting a smaller piece of land.
 [DATE]
 		<form name="form">
 			<button name="Details" text="Details"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="TransferObjectsHighlighted">
@@ -2374,7 +2374,7 @@ Please go to the Knowledge Base for details on accessing areas with this maturit
 		Could not teleport closer to destination.
 	</notification>
 	<notification name="TPCancelled">
-		瞬間傳送已取銷。
+		瞬間傳送已取消。
 	</notification>
 	<notification name="FullRegionTryAgain">
 		The region you are attempting to enter is currently full.
@@ -2453,7 +2453,7 @@ Please try again in a few moments.
 [MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
 		<form name="form">
 			<button name="Teleport" text="瞬間傳送"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="TeleportOfferSent">
@@ -2463,8 +2463,8 @@ Please try again in a few moments.
 		[MESSAGE]
 [URL]
 		<form name="form">
-			<button name="Later" text="Later"/>
-			<button name="GoNow..." text="Go Now..."/>
+			<button name="Later" text="稍候"/>
+			<button name="GoNow..." text="立即前往..."/>
 		</form>
 	</notification>
 	<notification name="OfferFriendship">
@@ -2525,8 +2525,8 @@ If you stay in this region you will be logged out.
 
 From object: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, owner: [NAME]?
 		<form name="form">
-			<button name="Gotopage" text="Go to page"/>
-			<button name="Cancel" text="取銷"/>
+			<button name="Gotopage" text="前往頁面"/>
+			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="FailedToFindWearableUnnamed">
@@ -2714,7 +2714,7 @@ They will be blocked for a few seconds for your security.
 	</notification>
 	<notification name="ConfirmCloseAll">
 		Are you sure you want to close all IMs?
-		<usetemplate ignoretext="Confirm before I close all IMs" name="okcancelignore" notext="取銷" yestext="確定"/>
+		<usetemplate ignoretext="Confirm before I close all IMs" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="AttachmentSaved">
 		Attachment has been saved.
@@ -2737,7 +2737,7 @@ They will be blocked for a few seconds for your security.
 	</notification>
 	<notification name="ConfirmClearTeleportHistory">
 		Are you sure you want to delete your teleport history?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BottomTrayButtonCanNotBeShown">
 		Selected button can not be shown right now.
@@ -2754,7 +2754,7 @@ The button will be shown when there is enough space for it.
 With the following Residents:
 
 [RESIDENTS]
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ItemsShared">
 		Items successfully shared.
@@ -2831,7 +2831,7 @@ This will also cause all residents that later join the call to be
 muted, even after you have left the call.
 
 Mute everyone?
-		<usetemplate ignoretext="Confirm before I mute all participants in a group call" name="okcancelignore" notext="取銷" yestext="確定"/>
+		<usetemplate ignoretext="Confirm before I mute all participants in a group call" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification label="聊天" name="HintChat">
 		To join the conversation, type into the chat field below.
@@ -2887,40 +2887,40 @@ Click and drag anywhere on the world to rotate your view
 			<input name="username" text="User Name"/>
 			<input name="password" text="Password"/>
 			<button name="ok" text="Submit"/>
-			<button name="cancel" text="取銷"/>
+			<button name="cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification label="" name="ModeChange">
-		Changing modes requires you to quit and restart.
-		<usetemplate name="okcancelbuttons" notext="Don&apos;t Quit" yestext="Quit"/>
+		改變劉覽器模式要求你必須結束退出並重新啟動。
+		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoClassifieds">
 		Creation and editing of Classifieds is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
-		<usetemplate name="okcancelbuttons" notext="Don&apos;t Quit" yestext="Quit"/>
+		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoGroupInfo">
 		Creation and editing of Groups is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
-		<usetemplate name="okcancelbuttons" notext="Don&apos;t Quit" yestext="Quit"/>
+		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoPicks">
 		Creation and editing of Picks is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
-		<usetemplate name="okcancelbuttons" notext="Don&apos;t Quit" yestext="Quit"/>
+		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoWorldMap">
 		Viewing of the world map is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
-		<usetemplate name="okcancelbuttons" notext="Don&apos;t Quit" yestext="Quit"/>
+		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoVoiceCall">
 		Voice calls are only available in Advanced mode. Would you like to logout and change modes?
-		<usetemplate name="okcancelbuttons" notext="Don&apos;t Quit" yestext="Quit"/>
+		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoAvatarShare">
 		Sharing is only available in Advanced mode. Would you like to logout and change modes?
-		<usetemplate name="okcancelbuttons" notext="Don&apos;t Quit" yestext="Quit"/>
+		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoAvatarPay">
 		Paying other residents is only available in Advanced mode. Would you like to logout and change modes?
-		<usetemplate name="okcancelbuttons" notext="Don&apos;t Quit" yestext="Quit"/>
+		<usetemplate name="okcancelbuttons" notext="不結束退出" yestext="結束退出"/>
 	</notification>
 	<global name="UnsupportedCPU">
 		- Your CPU speed does not meet the minimum requirements.
@@ -2937,7 +2937,7 @@ If you continue to have problems, please visit the [SUPPORT_SITE].
 		510
 	</global>
 	<global name="UnsupportedGPU">
-		- Your graphics card does not meet the minimum requirements.
+		- 你的顯示卡未達系統最低配備要求。
 	</global>
 	<global name="UnsupportedRAM">
 		- Your system memory does not meet the minimum requirements.
diff --git a/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml
index 1fb0f210fe..550868e5e5 100644
--- a/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="wearable_item">
 	<text name="item_name" value="..."/>
-	<panel name="btn_lock" tool_tip="You don&apos;t have permission to edit"/>
+	<panel name="btn_lock" tool_tip="你並沒有權限進行編輯"/>
 	<panel name="btn_edit_panel">
-		<button name="btn_edit" tool_tip="Edit this shape"/>
+		<button name="btn_edit" tool_tip="編輯這個體形"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_bottomtray.xml b/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
index 4c0174559e..2b0cd7c0a6 100644
--- a/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
@@ -10,7 +10,7 @@
 			</talk_button>
 		</layout_panel>
 		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Gesture" name="Gesture" tool_tip="顯示 / 隱藏 姿勢"/>
+			<gesture_combo_list label="姿勢" name="Gesture" tool_tip="顯示 / 隱藏 姿勢"/>
 		</layout_panel>
 		<layout_panel name="movement_panel">
 			<bottomtray_button label="移動" name="movement_btn" tool_tip="顯示 / 隱藏 移動控制"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml
index 22f3731a6f..9833e9ef8b 100644
--- a/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml
@@ -2,7 +2,7 @@
 <panel name="bottom_tray_lite">
 	<layout_stack name="toolbar_stack_lite">
 		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Gesture" name="Gesture" tool_tip="顯示 / 隱藏 姿勢"/>
+			<gesture_combo_list label="姿勢" name="Gesture" tool_tip="顯示 / 隱藏 姿勢"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml
index 7a74f07743..ba63dada76 100644
--- a/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="clothing_list_button_bar_panel">
-	<button label="Add +" name="add_btn"/>
+	<button label="添加 +" name="add_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
index 9478ec49a6..e749d9e3e7 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Edit Classified" name="panel_edit_classified">
 	<panel.string name="location_notice">
-		(will update after save)
+		（儲存後將會更新）
 	</panel.string>
 	<string name="publish_label">
 		Publish
@@ -15,7 +15,7 @@
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<panel name="snapshot_panel">
-				<icon label="" name="edit_icon" tool_tip="Click to select an image"/>
+				<icon label="" name="edit_icon" tool_tip="點擊以選擇圖像"/>
 			</panel>
 			<text name="Name:">
 				Title:
@@ -47,7 +47,7 @@
 				<button label="[LABEL]" name="save_changes_btn"/>
 			</layout_panel>
 			<layout_panel name="show_on_map_btn_lp">
-				<button label="取銷" name="cancel_btn"/>
+				<button label="取消" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
index 2dd0ed2015..0f1f72ceb9 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
@@ -8,7 +8,7 @@
 	</text>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
-			<icon label="" name="edit_icon" tool_tip="Click to select an image"/>
+			<icon label="" name="edit_icon" tool_tip="點擊以選擇圖像"/>
 			<text name="Name:">
 				Title:
 			</text>
@@ -30,7 +30,7 @@
 				<button label="Save Pick" name="save_changes_btn"/>
 			</layout_panel>
 			<layout_panel name="layout_panel1">
-				<button label="取銷" name="cancel_btn"/>
+				<button label="取消" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
index 7fb8392836..2258e51b85 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
@@ -27,31 +27,31 @@
 		<panel name="scroll_content_panel">
 			<panel name="data_panel">
 				<text name="display_name_label" value="Display Name:"/>
-				<text name="solo_username_label" value="Username:"/>
+				<text name="solo_username_label" value="使用者名稱："/>
 				<button name="set_name" tool_tip="Set Display Name"/>
-				<text name="user_label" value="Username:"/>
+				<text name="user_label" value="使用者名稱："/>
 				<panel name="lifes_images_panel">
 					<panel name="second_life_image_panel">
 						<text name="second_life_photo_title_text" value="[SECOND_LIFE]:"/>
 					</panel>
-					<icon label="" name="2nd_life_edit_icon" tool_tip="Click to select an image"/>
+					<icon label="" name="2nd_life_edit_icon" tool_tip="點擊以選擇圖像"/>
 				</panel>
 				<panel name="first_life_image_panel">
 					<text name="real_world_photo_title_text" value="真實世界："/>
 				</panel>
-				<icon label="" name="real_world_edit_icon" tool_tip="Click to select an image"/>
+				<icon label="" name="real_world_edit_icon" tool_tip="點擊以選擇圖像"/>
 				<text name="title_homepage_text">
 					首頁：
 				</text>
 				<line_editor name="homepage_edit" value="http://"/>
-				<text name="title_acc_status_text" value="My Account:"/>
+				<text name="title_acc_status_text" value="我的帳戶："/>
 				<text_editor name="acc_status_text" value="Resident. No payment info on file."/>
-				<text name="my_account_link" value="[[URL] Go to My Dashboard]"/>
+				<text name="my_account_link" value="[[URL] 前往我的塗鴉牆]"/>
 				<text name="title_partner_text" value="我的配偶："/>
 				<panel name="partner_data_panel">
 					<text initial_value="(retrieving)" name="partner_text"/>
 				</panel>
-				<text name="partner_edit_link" value="[[URL] Edit]"/>
+				<text name="partner_edit_link" value="[[URL] 編輯]"/>
 			</panel>
 		</panel>
 	</scroll_container>
@@ -61,7 +61,7 @@
 				<button label="儲存變更" name="save_btn"/>
 			</layout_panel>
 			<layout_panel name="show_on_map_btn_lp">
-				<button label="取銷" name="cancel_btn"/>
+				<button label="取消" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
index 21b5c1c698..d741ed70df 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
@@ -97,15 +97,15 @@
 		Physics:
 	</string>
 	<labeled_back_button label="儲存" name="back_btn" tool_tip="回到編輯裝扮"/>
-	<text name="edit_wearable_title" value="Editing Shape"/>
+	<text name="edit_wearable_title" value="體形編輯中"/>
 	<panel label="襯衫" name="wearable_type_panel">
-		<text name="description_text" value="Shape:"/>
+		<text name="description_text" value="體形："/>
 		<radio_group name="sex_radio">
 			<radio_item label="" name="sex_male" tool_tip="男性" value="1"/>
-			<radio_item label="" name="sex_female" tool_tip="Female" value="0"/>
+			<radio_item label="" name="sex_female" tool_tip="女性" value="0"/>
 		</radio_group>
 		<icon name="male_icon" tool_tip="男性"/>
-		<icon name="female_icon" tool_tip="Female"/>
+		<icon name="female_icon" tool_tip="女性"/>
 	</panel>
 	<panel name="button_panel">
 		<layout_stack name="button_panel_ls">
diff --git a/indra/newview/skins/default/xui/zh/panel_group_general.xml b/indra/newview/skins/default/xui/zh/panel_group_general.xml
index 2873d4cabb..1706541f2b 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_general.xml
@@ -25,33 +25,33 @@ Hover your mouse over the options for more help.
 		Group Charter
 	</text_editor>
 	<name_list name="visible_members">
-		<name_list.columns label="Member" name="name"/>
-		<name_list.columns label="Title" name="title"/>
-		<name_list.columns label="Status" name="status"/>
+		<name_list.columns label="成員" name="name"/>
+		<name_list.columns label="頭銜" name="title"/>
+		<name_list.columns label="狀態" name="status"/>
 	</name_list>
 	<text name="my_group_settngs_label">
 		自己
 	</text>
 	<text name="active_title_label">
-		My title:
+		我的頭銜：
 	</text>
 	<combo_box name="active_title" tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active."/>
-	<check_box label="Receive group notices" name="receive_notices" tool_tip="Sets whether you want to receive Notices from this group.  Uncheck this box if this group is spamming you."/>
+	<check_box label="接受社團通知" name="receive_notices" tool_tip="Sets whether you want to receive Notices from this group.  Uncheck this box if this group is spamming you."/>
 	<check_box label="顯示在我的檔案中" name="list_groups_in_profile" tool_tip="Sets whether you want to show this group in your profile"/>
 	<panel name="preferences_container">
 		<text name="group_settngs_label">
 			社團
 		</text>
-		<check_box label="Anyone can join" name="open_enrollement" tool_tip="Sets whether this group allows new members to join without being invited."/>
-		<check_box label="Cost to join" name="check_enrollment_fee" tool_tip="Sets whether to require an enrollment fee to join the group"/>
+		<check_box label="任何人都可以加入" name="open_enrollement" tool_tip="Sets whether this group allows new members to join without being invited."/>
+		<check_box label="加入費用" name="check_enrollment_fee" tool_tip="Sets whether to require an enrollment fee to join the group"/>
 		<spinner label="L$" name="spin_enrollment_fee" tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked."/>
 		<combo_box name="group_mature_check" tool_tip="Sets whether your group contains information rated as Moderate">
 			<combo_item name="select_mature">
-				- Select maturity rating -
+				- 選擇內容分級 -
 			</combo_item>
 			<combo_box.item label="Moderate Content" name="mature"/>
 			<combo_box.item label="General Content" name="pg"/>
 		</combo_box>
-		<check_box initial_value="true" label="Show in search" name="show_in_group_list" tool_tip="Let people see this group in search results"/>
+		<check_box initial_value="true" label="顯示在搜尋中" name="show_in_group_list" tool_tip="Let people see this group in search results"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
index 4c65d2484c..320645ea5e 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
@@ -20,9 +20,9 @@
 		<layout_panel name="group_accordions">
 			<accordion name="groups_accordion">
 				<accordion_tab name="group_general_tab" title="一般"/>
-				<accordion_tab name="group_roles_tab" title="Roles"/>
-				<accordion_tab name="group_notices_tab" title="Notices"/>
-				<accordion_tab name="group_land_tab" title="Land/Assets"/>
+				<accordion_tab name="group_roles_tab" title="角色"/>
+				<accordion_tab name="group_notices_tab" title="通知"/>
+				<accordion_tab name="group_land_tab" title="土地 / 資產"/>
 			</accordion>
 		</layout_panel>
 	</layout_stack>
@@ -35,7 +35,7 @@
 		</layout_panel>
 		<layout_panel name="btn_apply_lp">
 			<button label="儲存" label_selected="儲存" name="btn_apply"/>
-			<button label="Create Group" name="btn_create" tool_tip="Create a new Group"/>
+			<button label="創造社團" name="btn_create" tool_tip="創造一個新社團"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_invite.xml b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
index c9b17b5d67..0a0a1f1941 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Invite a Member" name="invite_panel">
+<panel label="邀請一個成員" name="invite_panel">
 	<panel.string name="confirm_invite_owner_str">
 		Are you sure you want to invite new owner(s)? This action is permanent!
 	</panel.string>
@@ -20,7 +20,7 @@
 	</text>
 	<combo_box name="role_name" tool_tip="Choose from the list of Roles you are allowed to assign members to"/>
 	<button label="Send Invitations" name="ok_button"/>
-	<button label="取銷" name="cancel_button"/>
+	<button label="取消" name="cancel_button"/>
 	<string name="GroupInvitation">
 		社團邀請
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notices.xml b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
index b4d7e3608e..5fed96dbd9 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Notices" name="notices_tab">
+<panel label="通知" name="notices_tab">
 	<panel.string name="help_text">
 		Notices let you send a message and an optionally attached item.
 Notices only go to group members in Roles with the ability to receive Notices.
@@ -13,18 +13,18 @@ You can turn off Notices on the General tab.
 Maximum 200 per group daily
 	</text>
 	<scroll_list name="notice_list">
-		<scroll_list.columns label="Subject" name="subject"/>
-		<scroll_list.columns label="From" name="from"/>
-		<scroll_list.columns label="Date" name="date"/>
+		<scroll_list.columns label="主旨" name="subject"/>
+		<scroll_list.columns label="由" name="from"/>
+		<scroll_list.columns label="日期" name="date"/>
 	</scroll_list>
 	<text name="notice_list_none_found">
 		None found
 	</text>
-	<button label="New Notice" name="create_new_notice" tool_tip="Create a new notice"/>
+	<button label="新通知" name="create_new_notice" tool_tip="建立一個新通知"/>
 	<button name="refresh_notices" tool_tip="Refresh list of notices"/>
-	<panel label="Create New Notice" name="panel_create_new_notice">
+	<panel label="建立新通知" name="panel_create_new_notice">
 		<text name="lbl">
-			Create a Notice
+			建立一個通知
 		</text>
 		<text name="lbl3">
 			主旨：
@@ -36,14 +36,14 @@ Maximum 200 per group daily
 			附件：
 		</text>
 		<text name="string">
-			Drag and drop item here to attach it:
+			將物品拖曳並丟於此處以添加為附件：
 		</text>
 		<button label="收納區" name="open_inventory" tool_tip="開啟收納區"/>
 		<button name="remove_attachment" tool_tip="Remove attachment from your notification"/>
 		<button label="Send" label_selected="Send" name="send_notice"/>
 		<group_drop_target name="drop_target" tool_tip="Drag an inventory item onto this target box to send it with this notice. You must have permission to copy and transfer the item in order to attach it."/>
 	</panel>
-	<panel label="View Past Notice" name="panel_view_past_notice">
+	<panel label="察看過去的通知" name="panel_view_past_notice">
 		<text name="lbl">
 			Archived Notice
 		</text>
@@ -51,11 +51,11 @@ Maximum 200 per group daily
 			To send a new notice, click the + button
 		</text>
 		<text name="lbl3">
-			Subject:
+			主旨：
 		</text>
 		<text name="lbl4">
-			Message:
+			訊息：
 		</text>
-		<button label="Open Attachment" name="open_attachment"/>
+		<button label="開啟附件" name="open_attachment"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
index 91f0f4125f..8947ab6e45 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Members &amp; Roles" name="roles_tab">
+<panel label="成員與角色" name="roles_tab">
 	<panel.string name="default_needs_apply_text">
 		There are unsaved changes
 	</panel.string>
@@ -7,7 +7,7 @@
 		Do you want to save your changes?
 	</panel.string>
 	<tab_container name="roles_tab_container">
-		<panel label="MEMBERS" name="members_sub_tab" tool_tip="Members">
+		<panel label="成員" name="members_sub_tab" tool_tip="成員">
 			<panel.string name="help_text">
 				You can add or remove Roles assigned to Members.
 Select multiple Members by holding the Ctrl key and
@@ -16,16 +16,16 @@ clicking on their names.
 			<panel.string name="donation_area">
 				[AREA] m²
 			</panel.string>
-			<filter_editor label="Filter Members" name="filter_input"/>
+			<filter_editor label="成員過濾器" name="filter_input"/>
 			<name_list name="member_list">
-				<name_list.columns label="Member" name="name"/>
+				<name_list.columns label="成員" name="name"/>
 				<name_list.columns label="Donation" name="donated"/>
-				<name_list.columns label="Status" name="online"/>
+				<name_list.columns label="狀態" name="online"/>
 			</name_list>
-			<button label="Invite" name="member_invite"/>
-			<button label="Eject" name="member_eject"/>
+			<button label="邀請" name="member_invite"/>
+			<button label="踢出" name="member_eject"/>
 		</panel>
-		<panel label="ROLES" name="roles_sub_tab">
+		<panel label="角色" name="roles_sub_tab">
 			<panel.string name="help_text">
 				Roles have a title and an allowed list of Abilities
 that Members can perform. Members can belong to
@@ -35,21 +35,21 @@ including the Everyone and Owner Roles.
 			<panel.string name="cant_delete_role">
 				The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and can&apos;t be deleted.
 			</panel.string>
-			<filter_editor label="Filter Roles" name="filter_input"/>
+			<filter_editor label="角色過濾器" name="filter_input"/>
 			<scroll_list name="role_list">
-				<scroll_list.columns label="Role" name="name"/>
-				<scroll_list.columns label="Title" name="title"/>
+				<scroll_list.columns label="角色" name="name"/>
+				<scroll_list.columns label="頭銜" name="title"/>
 				<scroll_list.columns label="#" name="members"/>
 			</scroll_list>
-			<button label="New Role" name="role_create"/>
-			<button label="Delete Role" name="role_delete"/>
+			<button label="新角色" name="role_create"/>
+			<button label="刪除角色" name="role_delete"/>
 		</panel>
-		<panel label="ABILITIES" name="actions_sub_tab" tool_tip="You can view an Ability&apos;s Description and which Roles and Members can execute the Ability.">
+		<panel label="能力" name="actions_sub_tab" tool_tip="You can view an Ability&apos;s Description and which Roles and Members can execute the Ability.">
 			<panel.string name="help_text">
 				Abilities allow Members in Roles to do specific
 things in this group. There&apos;s a broad variety of Abilities.
 			</panel.string>
-			<filter_editor label="Filter Abilities" name="filter_input"/>
+			<filter_editor label="能力過濾器" name="filter_input"/>
 			<scroll_list name="action_list" tool_tip="Select an Ability to view more details"/>
 		</panel>
 	</tab_container>
@@ -67,10 +67,10 @@ things in this group. There&apos;s a broad variety of Abilities.
 			角色名稱
 		</text>
 		<text name="static3">
-			Role Title
+			角色頭銜
 		</text>
 		<text name="static2">
-			Description
+			描述
 		</text>
 		<text name="static4">
 			Assigned Members
diff --git a/indra/newview/skins/default/xui/zh/panel_landmarks.xml b/indra/newview/skins/default/xui/zh/panel_landmarks.xml
index 0ea3ea2226..fa907e3d90 100644
--- a/indra/newview/skins/default/xui/zh/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_landmarks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Landmarks">
 	<accordion name="landmarks_accordion">
-		<accordion_tab name="tab_favorites" title="Favorites bar"/>
+		<accordion_tab name="tab_favorites" title="最愛列"/>
 		<accordion_tab name="tab_landmarks" title="我的地標"/>
 		<accordion_tab name="tab_inventory" title="我的收納區"/>
 		<accordion_tab name="tab_library" title="Library"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
index be9711c8a6..6e2d47c09e 100644
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
@@ -15,15 +15,15 @@
 		Owner
 	</text>
 	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_owner_interact"/>
-	<check_box initial_value="false" label="Show Control Bar" name="perms_owner_control"/>
+	<check_box initial_value="false" label="顯示控制列" name="perms_owner_control"/>
 	<text name="group_label">
 		社團：
 	</text>
 	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_group_interact"/>
-	<check_box initial_value="false" label="Show Control Bar" name="perms_group_control"/>
+	<check_box initial_value="false" label="顯示控制列" name="perms_group_control"/>
 	<text name="anyone_label">
 		Anyone
 	</text>
 	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_anyone_interact"/>
-	<check_box initial_value="false" label="Show Control Bar" name="perms_anyone_control"/>
+	<check_box initial_value="false" label="顯示控制列" name="perms_anyone_control"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
index 26e03c9b3b..1748d117f4 100644
--- a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="navigation_bar">
 	<panel name="navigation_panel">
-		<pull_button name="back_btn" tool_tip="Go back to previous location"/>
-		<pull_button name="forward_btn" tool_tip="Go forward one location"/>
+		<pull_button name="back_btn" tool_tip="前往上一個位置"/>
+		<pull_button name="forward_btn" tool_tip="前往下一個位置"/>
 		<button name="home_btn" tool_tip="瞬間傳送到我家的位置"/>
 		<location_input label="位置" name="location_combo"/>
 		<search_combo_box label="搜尋" name="search_combo_box" tool_tip="搜尋">
@@ -11,8 +11,8 @@
 	</panel>
 	<favorites_bar name="favorite" tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!">
 		<label name="favorites_bar_label" tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!">
-			Favorites Bar
+			最愛列
 		</label>
-		<chevron_button name="&gt;&gt;" tool_tip="Show more of My Favorites"/>
+		<chevron_button name="&gt;&gt;" tool_tip="顯示更多我的最愛"/>
 	</favorites_bar>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_notes.xml b/indra/newview/skins/default/xui/zh/panel_notes.xml
index cf804b517d..f68fd74d1f 100644
--- a/indra/newview/skins/default/xui/zh/panel_notes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_notes.xml
@@ -18,7 +18,7 @@
 					<button label="加為朋友" name="add_friend" tool_tip="Offer friendship to the Resident"/>
 				</layout_panel>
 				<layout_panel name="im_btn_lp">
-					<button label="IM" name="im" tool_tip="Open instant message session"/>
+					<button label="IM" name="im" tool_tip="開啟即時訊息會話"/>
 				</layout_panel>
 				<layout_panel name="call_btn_lp">
 					<button label="通話" name="call" tool_tip="與這位居民通話"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index a1fec08940..8da75e334e 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -67,7 +67,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 				<button label="檔案" name="view_profile_btn" tool_tip="Show picture, groups, and other Residents information"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Open instant message session"/>
+				<button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
 				<button label="通話" name="call_btn" tool_tip="Call this Resident"/>
@@ -84,7 +84,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 				<button label="社團檔案" name="group_info_btn" tool_tip="顯示社團資訊"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
-				<button label="Group Chat" name="chat_btn" tool_tip="Open chat session"/>
+				<button label="Group Chat" name="chat_btn" tool_tip="開啟聊天會話"/>
 			</layout_panel>
 			<layout_panel name="group_call_btn_lp">
 				<button label="Group Call" name="group_call_btn" tool_tip="Call this group"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_places.xml b/indra/newview/skins/default/xui/zh/panel_places.xml
index 10524bc5f0..c141201ab2 100644
--- a/indra/newview/skins/default/xui/zh/panel_places.xml
+++ b/indra/newview/skins/default/xui/zh/panel_places.xml
@@ -41,7 +41,7 @@
 				<button label="儲存" name="save_btn"/>
 			</layout_panel>
 			<layout_panel name="cancel_btn_lp">
-				<button label="取銷" name="cancel_btn"/>
+				<button label="取消" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
index ad137e9dd4..c5dce10d63 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
@@ -9,7 +9,7 @@
 	<check_box label="顯示腳本錯誤訊息於：" name="show_script_errors"/>
 	<radio_group name="show_location">
 		<radio_item label="附近的聊天中" name="0"/>
-		<radio_item label="分開的試窗中" name="1"/>
+		<radio_item label="分開的視窗中" name="1"/>
 	</radio_group>
 	<check_box label="允許同時執行多個瀏覽器" name="allow_multiple_viewer_check"/>
 	<check_box label="登入時顯示網格選擇" name="show_grid_selection_check"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index 34b0e3800f..a39402c858 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -9,7 +9,7 @@
 		<radio_item label="大" name="radio3" value="2"/>
 	</radio_group>
 	<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
-	<check_box label="Email me IMs when I&apos;m offline" name="send_im_to_email"/>
+	<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
 	<check_box label="Enable plain text IM and chat history" name="plain_text_chat_history"/>
 	<check_box label="聊天泡泡" name="bubble_text_chat"/>
 	<text name="show_ims_in_label">
@@ -18,7 +18,7 @@
 	<text name="requires_restart_label">
 		（須重新啟動）
 	</text>
-	<radio_group name="chat_window" tool_tip="Show your Instant Messages in separate floaters, or in one floater with many tabs (Requires restart)">
+	<radio_group name="chat_window" tool_tip="顯示你的即時訊息在分開的浮動視窗，或是使用很多頁籤的單一浮動視窗（須重新啟動）">
 		<radio_item label="分開視窗" name="radio" value="0"/>
 		<radio_item label="頁籤" name="radio2" value="1"/>
 	</radio_group>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index e53d2a8c06..c7299ad8a9 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -44,8 +44,8 @@
 		<radio_item label="Show briefly" name="radio3" value="2"/>
 	</radio_group>
 	<check_box label="My name" name="show_my_name_checkbox1"/>
-	<check_box label="Usernames" name="show_slids" tool_tip="Show username, like bobsmith123"/>
-	<check_box label="Group titles" name="show_all_title_checkbox1" tool_tip="Show group titles, like Officer or Member"/>
+	<check_box label="使用者名稱" name="show_slids" tool_tip="Show username, like bobsmith123"/>
+	<check_box label="社團頭銜" name="show_all_title_checkbox1" tool_tip="Show group titles, like Officer or Member"/>
 	<check_box label="高亮顯示朋友" name="show_friends" tool_tip="高亮顯示你朋友的名稱標籤"/>
 	<check_box label="View Display Names" name="display_names_check" tool_tip="Check to use display names in chat, IM, name tags, etc."/>
 	<text name="inworld_typing_rg_label">
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 68e149d866..8c728bf779 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Graphics" name="Display panel">
+<panel label="圖形" name="Display panel">
 	<text name="QualitySpeed">
 		Quality and speed:
 	</text>
@@ -21,7 +21,7 @@
 	<text name="ShadersPrefText4">
 		Ultra
 	</text>
-	<panel label="CustomGraphics" name="CustomGraphics Panel">
+	<panel label="自訂圖形" name="CustomGraphics Panel">
 		<text name="ShadersText">
 			Shaders:
 		</text>
@@ -43,7 +43,7 @@
 		<text name="AvatarPhysicsDetailText">
 			Low
 		</text>
-		<slider label="Draw distance:" name="DrawDistance"/>
+		<slider label="描繪距離：" name="DrawDistance"/>
 		<text name="DrawDistanceMeterText2">
 			m
 		</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
index e0e0911872..89a1a48abf 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
@@ -5,7 +5,7 @@
 	</panel.string>
 	<button label="清除歷史紀錄" name="clear_cache" tool_tip="清除登入圖像、最後位置、瞬間傳送紀錄、網頁及材質快取"/>
 	<text name="cache_size_label_l">
-		（位置、圖像、網頁、搜尋的歷使紀錄）
+		（位置、圖像、網頁、搜尋的歷史紀錄）
 	</text>
 	<check_box label="將我顯示在搜尋的結果中" name="online_searchresults"/>
 	<check_box label="只有我的朋友和社團知道我在線上" name="online_visibility"/>
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 0c6d8386e4..2cab05e2ad 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
@@ -53,7 +53,7 @@
 		</text>
 		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Change the volume using this slider"/>
 		<text name="wait_text">
-			Please wait
+			請稍候
 		</text>
 		<text name="Output">
 			輸出
diff --git a/indra/newview/skins/default/xui/zh/panel_profile.xml b/indra/newview/skins/default/xui/zh/panel_profile.xml
index fafbf855de..7536311daf 100644
--- a/indra/newview/skins/default/xui/zh/panel_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_profile.xml
@@ -33,7 +33,7 @@
 						<text name="title_rw_descr_text" value="真實世界："/>
 					</panel>
 					<text name="title_member_text" value="Resident Since:"/>
-					<text name="title_acc_status_text" value="Account Status:"/>
+					<text name="title_acc_status_text" value="帳戶狀態："/>
 					<text name="title_partner_text" value="配偶："/>
 					<panel name="partner_data_panel">
 						<text initial_value="(retrieving)" name="partner_text"/>
@@ -50,7 +50,7 @@
 					<button label="加為朋友" name="add_friend" tool_tip="Offer friendship to the Resident"/>
 				</layout_panel>
 				<layout_panel name="im_btn_lp">
-					<button label="IM" name="im" tool_tip="Open instant message session"/>
+					<button label="IM" name="im" tool_tip="開啟即時訊息會話"/>
 				</layout_panel>
 				<layout_panel name="call_btn_lp">
 					<button label="通話" name="call" tool_tip="與這位居民通話"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_view.xml b/indra/newview/skins/default/xui/zh/panel_profile_view.xml
index a8d7c8d6d1..ac8c7cad3d 100644
--- a/indra/newview/skins/default/xui/zh/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/zh/panel_profile_view.xml
@@ -7,11 +7,11 @@
 		Offline
 	</string>
 	<text name="display_name_label" value="Display Name:"/>
-	<text name="solo_username_label" value="Username:"/>
+	<text name="solo_username_label" value="使用者名稱："/>
 	<text name="status" value="Online"/>
 	<text name="user_name_small" value="Jack oh look at me this is a super duper long name"/>
 	<button name="copy_to_clipboard" tool_tip="覆製到剪貼簿"/>
-	<text name="user_label" value="Username:"/>
+	<text name="user_label" value="使用者名稱："/>
 	<tab_container name="tabs">
 		<panel label="檔案" name="panel_profile"/>
 		<panel label="PICKS" name="panel_picks"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_debug.xml b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
index dee3e3045f..798831bc84 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
@@ -6,7 +6,7 @@
 	<text name="region_text">
 		未知
 	</text>
-	<check_box label="Disable Scripts" name="disable_scripts_check" tool_tip="Disable all scripts in this region"/>
+	<check_box label="關閉腳本" name="disable_scripts_check" tool_tip="關閉這個地區現在的全部腳本"/>
 	<check_box label="Disable Collisions" name="disable_collisions_check" tool_tip="Disable non-avatar collisions in this region"/>
 	<check_box label="Disable Physics" name="disable_physics_check" tool_tip="Disable all physics in this region"/>
 	<button label="套用" name="apply_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_estate.xml b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
index c1e43cef48..899191c3f0 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
@@ -28,25 +28,25 @@
 	<check_box label="允許直接瞬間傳送" name="allow_direct_teleport"/>
 	<button label="套用" name="apply_btn"/>
 	<button label="瞬間傳送訊息到領地..." name="message_estate_btn"/>
-	<button label="由領地將居民踢除..." name="kick_user_from_estate_btn"/>
+	<button label="由領地將居民踢出..." name="kick_user_from_estate_btn"/>
 	<text name="estate_manager_label">
 		領地管理員：
 	</text>
-	<button label="Remove..." name="remove_estate_manager_btn"/>
-	<button label="Add..." name="add_estate_manager_btn"/>
+	<button label="移除..." name="remove_estate_manager_btn"/>
+	<button label="添加..." name="add_estate_manager_btn"/>
 	<text name="allow_resident_label">
-		Allowed Residents:
+		允許的居民：
 	</text>
-	<button label="Remove..." name="remove_allowed_avatar_btn"/>
-	<button label="Add..." name="add_allowed_avatar_btn"/>
+	<button label="移除..." name="remove_allowed_avatar_btn"/>
+	<button label="添加..." name="add_allowed_avatar_btn"/>
 	<text name="allow_group_label">
-		Allowed Groups:
+		允許的社團：
 	</text>
-	<button label="Remove..." name="remove_allowed_group_btn"/>
-	<button label="Add..." name="add_allowed_group_btn"/>
+	<button label="移除..." name="remove_allowed_group_btn"/>
+	<button label="添加..." name="add_allowed_group_btn"/>
 	<text name="ban_resident_label">
-		Banned Residents:
+		被封鎖的居民：
 	</text>
-	<button label="Remove..." name="remove_banned_avatar_btn"/>
-	<button label="Add..." name="add_banned_avatar_btn"/>
+	<button label="移除..." name="remove_banned_avatar_btn"/>
+	<button label="添加..." name="add_banned_avatar_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_general.xml b/indra/newview/skins/default/xui/zh/panel_region_general.xml
index f2ccb6e1cf..71caaf1144 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml
@@ -24,7 +24,7 @@
 	<check_box label="Restrict Pushing" name="restrict_pushobject"/>
 	<check_box label="Allow Land Resell" name="allow_land_resell_check"/>
 	<check_box label="Allow Land Join/Divide" name="allow_parcel_changes_check"/>
-	<check_box label="Block Land Show in Search" name="block_parcel_search_check" tool_tip="Let people see this region and its parcels in search results"/>
+	<check_box label="阻擋土地顯示於搜尋中" name="block_parcel_search_check" tool_tip="Let people see this region and its parcels in search results"/>
 	<spinner label="Agent Limit" name="agent_limit_spin"/>
 	<spinner label="Object Bonus" name="object_bonus_spin"/>
 	<text label="Maturity" name="access_text">
diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
index 0269c8f734..0622cb4e73 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Terrain" name="Terrain">
+<panel label="地形" name="Terrain">
 	<text name="region_text_lbl">
 		地區：
 	</text>
@@ -14,6 +14,6 @@
 	<slider label="Phase" name="sun_hour_slider"/>
 	<button label="套用" name="apply_btn"/>
 	<button label="Download RAW terrain..." name="download_raw_btn" tool_tip="Available only to estate owners, not managers"/>
-	<button label="Upload RAW terrain..." name="upload_raw_btn" tool_tip="Available only to estate owners, not managers"/>
+	<button label="上傳 RAW 地形檔..." name="upload_raw_btn" tool_tip="Available only to estate owners, not managers"/>
 	<button label="Bake Terrain" name="bake_terrain_btn" tool_tip="Set current terrain as mid-point for raise/lower limits"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
index 03b845a76c..e42d904f32 100644
--- a/indra/newview/skins/default/xui/zh/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
@@ -10,10 +10,10 @@
 		Public Objects cannot run scripts
 	</panel.string>
 	<panel.string name="script_running">
-		Running
+		執行中
 	</panel.string>
 	<panel.string name="Title">
-		Script: [NAME]
+		腳本：[NAME]
 	</panel.string>
 	<panel.string name="external_editor_not_set">
 		Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.
@@ -30,7 +30,7 @@
 			<menu_item_call label="覆製" name="Copy"/>
 			<menu_item_call label="貼上" name="Paste"/>
 			<menu_item_call label="全選" name="Select All"/>
-			<menu_item_call label="取銷選擇" name="Deselect"/>
+			<menu_item_call label="取消選擇" name="Deselect"/>
 			<menu_item_call label="搜尋 / 取代..." name="Search / Replace..."/>
 		</menu>
 		<menu label="幫助" name="Help">
diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
index cbb40e52de..950abbfb4c 100644
--- a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="REGION MEMORY" name="script_limits_region_memory_panel">
+<panel label="地區記憶體" name="script_limits_region_memory_panel">
 	<text name="script_memory">
-		Parcel Script Memory
+		地段腳本記憶體
 	</text>
 	<text name="loading_text">
 		載入中...
@@ -10,11 +10,11 @@
 		<scroll_list.columns label="尺寸（kb）" name="size"/>
 		<scroll_list.columns label="URLs" name="urls"/>
 		<scroll_list.columns label="物件名稱" name="name"/>
-		<scroll_list.columns label="Object Owner" name="owner"/>
+		<scroll_list.columns label="物件擁有者" name="owner"/>
 		<scroll_list.columns label="地段" name="parcel"/>
-		<scroll_list.columns label="Location" name="location"/>
+		<scroll_list.columns label="位置" name="location"/>
 	</scroll_list>
 	<button label="Refresh List" name="refresh_list_btn"/>
 	<button label="Highlight" name="highlight_btn"/>
-	<button label="Return" name="return_btn"/>
+	<button label="退回" name="return_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray.xml b/indra/newview/skins/default/xui/zh/panel_side_tray.xml
index d0169b7c2d..85ac4613dd 100644
--- a/indra/newview/skins/default/xui/zh/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_side_tray.xml
@@ -2,11 +2,11 @@
 <!-- Side tray cannot show background because it is always
 	partially on screen to hold tab buttons. -->
 <side_tray name="sidebar">
-	<sidetray_tab description="Toggle Sidebar." name="sidebar_openclose" tab_title="Toggle Sidebar"/>
+	<sidetray_tab description="側邊欄切換。" name="sidebar_openclose" tab_title="側邊欄切換"/>
 	<sidetray_tab description="首頁。" name="sidebar_home" tab_title="首頁">
 		<panel label="首頁" name="panel_home"/>
 	</sidetray_tab>
-	<sidetray_tab description="Edit your public profile and Picks." name="sidebar_me" tab_title="我的檔案">
+	<sidetray_tab description="編輯你的公開檔案及精選。" name="sidebar_me" tab_title="我的檔案">
 		<panel_container name="panel_container">
 			<panel label="自己" name="panel_me"/>
 		</panel_container>
@@ -17,13 +17,13 @@
 			<panel label="Blocked Residents &amp; Objects" name="panel_block_list_sidetray"/>
 		</panel_container>
 	</sidetray_tab>
-	<sidetray_tab description="Find places to go and places you&apos;ve visited before." label="Places" name="sidebar_places" tab_title="Places">
-		<panel label="Places" name="panel_places"/>
+	<sidetray_tab description="Find places to go and places you&apos;ve visited before." label="地點" name="sidebar_places" tab_title="地點">
+		<panel label="地點" name="panel_places"/>
 	</sidetray_tab>
 	<sidetray_tab description="瀏覽你的收納區。" name="sidebar_inventory" tab_title="我的收納區">
 		<panel label="編輯收納區" name="sidepanel_inventory"/>
 	</sidetray_tab>
 	<sidetray_tab description="變更你的外觀與目前樣貌。" name="sidebar_appearance" tab_title="我的外觀">
-		<panel label="Edit Appearance" name="sidepanel_appearance"/>
+		<panel label="編輯外觀" name="sidepanel_appearance"/>
 	</sidetray_tab>
 </side_tray>
diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml
index 91015bb8b0..534c0f39fc 100644
--- a/indra/newview/skins/default/xui/zh/role_actions.xml
+++ b/indra/newview/skins/default/xui/zh/role_actions.xml
@@ -2,16 +2,16 @@
 <role_actions>
 	<action_set description="These Abilities include powers to add and remove group Members, and allow new Members to join without an invitation." name="Membership">
 		<action description="Invite People to this Group" longdescription="Invite People to this Group using the &apos;Invite&apos; button in the Roles section &gt; Members tab." name="member invite" value="1"/>
-		<action description="Eject Members from this Group" longdescription="Eject Members from this Group using the &apos;Eject&apos; button in the Roles section &gt; Members tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability." name="member eject" value="2"/>
+		<action description="將會員由這個社團中踢出" longdescription="Eject Members from this Group using the &apos;Eject&apos; button in the Roles section &gt; Members tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability." name="member eject" value="2"/>
 		<action description="Toggle &apos;Open Enrollment&apos; and change &apos;Enrollment fee&apos;" longdescription="Toggle &apos;Open Enrollment&apos; to let new Members join without an invitation, and change the &apos;Enrollment fee&apos; in the General section." name="member options" value="3"/>
 	</action_set>
 	<action_set description="These Abilities include powers to add, remove, and change group Roles, add and remove Members in Roles, and assign Abilities to Roles." name="Roles">
 		<action description="Create new Roles" longdescription="Create new Roles in the Roles section &gt; Roles tab." name="role create" value="4"/>
-		<action description="Delete Roles" longdescription="Delete Roles in the Roles section &gt; Roles tab." name="role delete" value="5"/>
+		<action description="刪除角色" longdescription="Delete Roles in the Roles section &gt; Roles tab." name="role delete" value="5"/>
 		<action description="Change Role names, titles, descriptions, and whether Role members are publicly revealed" longdescription="Change Role names, titles, descriptions, and whether Role members are publicly revealed. This is done at the bottom of the the Roles section &gt; Roles tab after selecting a Role." name="role properties" value="6"/>
 		<action description="Assign Members to Assigner&apos;s Roles" longdescription="Assign Members to Roles in the list of Assigned Roles (Roles section &gt; Members tab). A Member with this Ability can only add Members to a Role that the assigner is already in." name="role assign member limited" value="7"/>
 		<action description="Assign Members to Any Role" longdescription="Assign Members to Any Role in the list of Assigned Roles (Roles section &gt; Members tab). *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability." name="role assign member" value="8"/>
-		<action description="Remove Members from Roles" longdescription="Remove Members from Roles in the list of Assigned Roles (Roles section &gt; Members tab). Owners can&apos;t be removed." name="role remove member" value="9"/>
+		<action description="由角色中移除成員" longdescription="Remove Members from Roles in the list of Assigned Roles (Roles section &gt; Members tab). Owners can&apos;t be removed." name="role remove member" value="9"/>
 		<action description="Assign and Remove Abilities in Roles" longdescription="Assign and Remove Abilities for each Role in the list of Allowed Abilities (Roles section &gt; Roles tab). *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability." name="role change actions" value="10"/>
 	</action_set>
 	<action_set description="These Abilities include powers to modify this group&apos;s identity, such as changing public visibility, charter, and insignia." name="Group Identity">
@@ -45,7 +45,7 @@
 		<action description="Manage parcel Access lists" longdescription="Manage parcel Access lists in About Land &gt; Access tab." name="land manage allowed" value="29"/>
 		<action description="Manage parcel Ban lists" longdescription="Manage parcel Ban lists in About Land &gt; Access tab." name="land manage banned" value="30"/>
 		<action description="Change parcel &apos;Sell passes to&apos; settings" longdescription="Change parcel &apos;Sell passes to&apos; settings in About Land &gt; Access tab." name="land manage passes" value="31"/>
-		<action description="Eject and freeze Residents on parcels" longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, then selecting &apos;Eject&apos; or &apos;Freeze&apos;." name="land admin" value="32"/>
+		<action description="將地段內的居民踢出及凍結" longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, then selecting &apos;Eject&apos; or &apos;Freeze&apos;." name="land admin" value="32"/>
 	</action_set>
 	<action_set description="These Abilities include powers to allow members to return objects and place and move Linden plants. This is useful for Members to clean up litter and do landscaping, but it should also be used with care, because there&apos;s no undo for returning objects." name="Parcel Content">
 		<action description="Return objects owned by group" longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab." name="land return group owned" value="48"/>
@@ -62,8 +62,8 @@
 		<action description="Pay group liabilities and receive group dividends" longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees." name="accounting accountable" value="40"/>
 	</action_set>
 	<action_set description="These Abilities include powers to allow Members to send, receive, and view group Notices." name="Notices">
-		<action description="Send Notices" longdescription="Members in a Role with this Ability can send Notices via the Group &gt; Notices section." name="notices send" value="42"/>
-		<action description="Receive Notices and view past Notices" longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group &gt; Notices section." name="notices receive" value="43"/>
+		<action description="送出通知" longdescription="Members in a Role with this Ability can send Notices via the Group &gt; Notices section." name="notices send" value="42"/>
+		<action description="接收通知與察看過去通知" longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group &gt; Notices section." name="notices receive" value="43"/>
 	</action_set>
 	<action_set description="These Abilities include powers to allow or restrict access to group chat sessions and group voice chat." name="Chat">
 		<action description="Join Group Chat" longdescription="Members in a Role with this Ability can join group chat sessions, for text and voice." name="join group chat" value="16"/>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
index 15437e3624..f28638d93d 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
@@ -71,6 +71,6 @@
 		</panel>
 	</scroll_container>
 	<panel name="button_panel">
-		<button label="取銷" name="cancel_btn"/>
+		<button label="取消" name="cancel_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
index a011e29184..de5a10ba51 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -94,7 +94,7 @@
 			<combo_box.item label="Original" name="Original"/>
 		</combo_box>
 		<spinner label="價格： L$" name="Edit Cost"/>
-		<check_box label="Show in search" name="search_check" tool_tip="Let people see this object in search results"/>
+		<check_box label="顯示在搜尋中" name="search_check" tool_tip="Let people see this object in search results"/>
 		<text name="B:">
 			B:
 		</text>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index c3f669c686..211d91a707 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -59,37 +59,37 @@
 		Previous login attempt failed. Logging in, attempt [NUMBER]
 	</string>
 	<string name="LoginPrecaching">
-		Loading world...
+		世界載入中...
 	</string>
 	<string name="LoginInitializingBrowser">
-		Initializing embedded web browser...
+		內嵌式網頁瀏覽器初始化中...
 	</string>
 	<string name="LoginInitializingMultimedia">
-		Initializing multimedia...
+		多媒體初始化中...
 	</string>
 	<string name="LoginInitializingFonts">
-		Loading fonts...
+		字型載入中...
 	</string>
 	<string name="LoginVerifyingCache">
-		Verifying cache files (can take 60-90 seconds)...
+		驗證快取檔案（約需 60-90 秒左右）...
 	</string>
 	<string name="LoginProcessingResponse">
-		Processing Response...
+		回應處理中...
 	</string>
 	<string name="LoginInitializingWorld">
-		Initializing World...
+		世界初始化中...
 	</string>
 	<string name="LoginDecodingImages">
-		Decoding images...
+		圖像解碼中...
 	</string>
 	<string name="LoginInitializingQuicktime">
-		Initializing QuickTime...
+		QuickTime 初始化中...
 	</string>
 	<string name="LoginQuicktimeNotFound">
-		QuickTime not found - unable to initialize.
+		QuickTime 未發現 - 無法進行初始化。
 	</string>
 	<string name="LoginQuicktimeOK">
-		QuickTime initialized successfully.
+		QuickTime 已成功初始化。
 	</string>
 	<string name="LoginWaitingForRegionHandshake">
 		地區交握等待中...
@@ -125,7 +125,7 @@
 		登入失敗。
 	</string>
 	<string name="Quit">
-		Quit
+		結束退出
 	</string>
 	<string name="create_account_url">
 		http://join.secondlife.com/
@@ -191,7 +191,7 @@
 		No Scripts
 	</string>
 	<string name="TooltipLand">
-		Land:
+		土地：
 	</string>
 	<string name="TooltipMustSingleDrop">
 		Only a single item can be dragged here
@@ -382,10 +382,10 @@
 		服裝
 	</string>
 	<string name="object">
-		object
+		物件
 	</string>
 	<string name="note card">
-		notecard
+		記事卡
 	</string>
 	<string name="folder">
 		資料夾
@@ -403,28 +403,28 @@
 		tga 材質
 	</string>
 	<string name="body part">
-		body part
+		身體部位
 	</string>
 	<string name="snapshot">
-		snapshot
+		快照
 	</string>
 	<string name="lost and found">
 		Lost and Found
 	</string>
 	<string name="targa image">
-		targa image
+		targa 圖像
 	</string>
 	<string name="trash">
-		Trash
+		垃圾桶
 	</string>
 	<string name="jpeg image">
-		jpeg image
+		jpeg 圖像
 	</string>
 	<string name="animation">
-		animation
+		動作
 	</string>
 	<string name="gesture">
-		gesture
+		姿勢
 	</string>
 	<string name="simstate">
 		simstate
@@ -439,13 +439,13 @@
 		folder link
 	</string>
 	<string name="AvatarEditingAppearance">
-		(Editing Appearance)
+		（外觀編輯中）
 	</string>
 	<string name="AvatarAway">
-		Away
+		離開
 	</string>
 	<string name="AvatarBusy">
-		Busy
+		忙碌
 	</string>
 	<string name="AvatarMuted">
 		Blocked
@@ -781,7 +781,7 @@
 		Animations
 	</string>
 	<string name="image_files">
-		Images
+		圖像
 	</string>
 	<string name="save_file_verb">
 		Save
@@ -790,10 +790,10 @@
 		Load
 	</string>
 	<string name="targa_image_files">
-		Targa Images
+		Targa 圖像
 	</string>
 	<string name="bitmap_image_files">
-		Bitmap Images
+		Bitmap 圖像
 	</string>
 	<string name="avi_movie_file">
 		AVI 影片檔案
@@ -1367,16 +1367,16 @@
 		[COUNT] 天
 	</string>
 	<string name="GroupMembersA">
-		[COUNT] member
+		[COUNT] 成員
 	</string>
 	<string name="GroupMembersB">
-		[COUNT] members
+		[COUNT] 成員
 	</string>
 	<string name="GroupMembersC">
-		[COUNT] members
+		[COUNT] 成員
 	</string>
 	<string name="AcctTypeResident">
-		Resident
+		居民
 	</string>
 	<string name="AcctTypeTrial">
 		Trial
@@ -1457,28 +1457,28 @@
 		reset
 	</string>
 	<string name="RunQueueTitle">
-		Set Running Progress
+		設定執行中程序
 	</string>
 	<string name="RunQueueStart">
-		set running
+		設為執行中
 	</string>
 	<string name="NotRunQueueTitle">
-		Set Not Running Progress
+		設定非執行中程序
 	</string>
 	<string name="NotRunQueueStart">
-		set not running
+		設為非執行中
 	</string>
 	<string name="CompileSuccessful">
-		Compile successful!
+		編譯成功!
 	</string>
 	<string name="CompileSuccessfulSaving">
-		Compile successful, saving...
+		編譯成功，儲存中...
 	</string>
 	<string name="SaveComplete">
-		Save complete.
+		儲存完畢。
 	</string>
 	<string name="ObjectOutOfRange">
-		Script (object out of range)
+		腳本（物件超出範圍）
 	</string>
 	<string name="GodToolsObjectOwnedBy">
 		Object [OBJECT] owned by [OWNER]
@@ -1537,7 +1537,7 @@
 		Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])
 	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
-		Parcel Script Memory
+		地段腳本記憶體
 	</string>
 	<string name="ScriptLimitsParcelsOwned">
 		Parcels Listed: [PARCELS]
@@ -1819,7 +1819,7 @@
 		Acquired Items
 	</string>
 	<string name="Cancel">
-		取銷
+		取消
 	</string>
 	<string name="UploadingCosts">
 		花費 L$ [AMOUNT] 上傳 [NAME]
@@ -1919,7 +1919,7 @@
 		Down
 	</string>
 	<string name="Any Category">
-		Any Category
+		任何類別
 	</string>
 	<string name="Shopping">
 		Shopping
@@ -3565,7 +3565,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		不允許飛行
 	</string>
 	<string name="LocationCtrlPushTooltip">
-		No pushing
+		禁止推撞
 	</string>
 	<string name="LocationCtrlBuildTooltip">
 		Building/dropping objects not allowed
@@ -3586,34 +3586,34 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		General Region
 	</string>
 	<string name="UpdaterWindowTitle">
-		[APP_NAME] Update
+		[APP_NAME] 更新
 	</string>
 	<string name="UpdaterNowUpdating">
-		Now updating [APP_NAME]...
+		[APP_NAME] 現更新中...
 	</string>
 	<string name="UpdaterNowInstalling">
-		Installing [APP_NAME]...
+		[APP_NAME] 安裝中...
 	</string>
 	<string name="UpdaterUpdatingDescriptive">
 		Your [APP_NAME] Viewer is being updated to the latest release.  This may take some time, so please be patient.
 	</string>
 	<string name="UpdaterProgressBarTextWithEllipses">
-		Downloading update...
+		更新下載中...
 	</string>
 	<string name="UpdaterProgressBarText">
-		Downloading update
+		更新下載
 	</string>
 	<string name="UpdaterFailDownloadTitle">
-		Failed to download update
+		夏載更新失敗
 	</string>
 	<string name="UpdaterFailUpdateDescriptive">
 		An error occurred while updating [APP_NAME]. Please download the latest version from www.secondlife.com.
 	</string>
 	<string name="UpdaterFailInstallTitle">
-		Failed to install update
+		安裝更新失敗
 	</string>
 	<string name="UpdaterFailStartTitle">
-		Failed to start viewer
+		啟動瀏覽器失敗
 	</string>
 	<string name="ItemsComingInTooFastFrom">
 		[APP_NAME]: Items coming in too fast from [FROM_NAME], automatic preview disabled for [TIME] seconds
@@ -3625,7 +3625,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		-- Instant message logging enabled --
 	</string>
 	<string name="IM_typing_start_string">
-		[NAME] is typing...
+		[NAME] 正在輸入...
 	</string>
 	<string name="Unnamed">
 		(Unnamed)
@@ -3688,13 +3688,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Drag items from inventory here
 	</string>
 	<string name="no_session_message">
-		(IM Session Doesn&apos;t Exist)
+		（IM 會話不存在）
 	</string>
 	<string name="only_user_message">
 		You are the only user in this session.
 	</string>
 	<string name="offline_message">
-		[NAME] is offline.
+		[NAME] 離線。
 	</string>
 	<string name="invite_message">
 		Click the [BUTTON NAME] button to accept/connect to this voice chat.
@@ -3712,7 +3712,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		You do not have sufficient permissions.
 	</string>
 	<string name="session_does_not_exist_error">
-		The session no longer exists
+		此會話不再存在
 	</string>
 	<string name="no_ability_error">
 		You do not have that ability.
@@ -3793,13 +3793,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		for deeding land
 	</string>
 	<string name="to create a group">
-		to create a group
+		以創造社團
 	</string>
 	<string name="to join a group">
-		to join a group
+		以加入社團
 	</string>
 	<string name="to upload">
-		to upload
+		以上傳
 	</string>
 	<string name="to publish a classified ad">
 		to publish a classified ad
@@ -3820,7 +3820,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		This object costs L$ [AMOUNT]
 	</string>
 	<string name="group_role_everyone">
-		Everyone
+		任何人
 	</string>
 	<string name="group_role_officers">
 		Officers
@@ -3829,7 +3829,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Owners
 	</string>
 	<string name="group_member_status_online">
-		Online
+		上線
 	</string>
 	<string name="uploading_abuse_report">
 		上傳中...
@@ -4014,7 +4014,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		無/無
 	</string>
 	<string name="texture_load_dimensions_error">
-		Can&apos;t load images larger than [WIDTH]*[HEIGHT]
+		無法載入圖像大於 [WIDTH]*[HEIGHT]
 	</string>
 	<string name="words_separator" value=","/>
 	<string name="server_is_down">
@@ -4051,7 +4051,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Membership
 	</string>
 	<string name="Roles">
-		Roles
+		角色
 	</string>
 	<string name="Group Identity">
 		Group Identity
@@ -4081,7 +4081,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Accounting
 	</string>
 	<string name="Notices">
-		Notices
+		通知
 	</string>
 	<string name="Chat">
 		聊天
-- 
cgit v1.2.3