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')

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')

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')

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 fa76b8992c6c636303d398bd25d34c39ae23419e Mon Sep 17 00:00:00 2001
From: Seraph Linden <none@none>
Date: Mon, 30 May 2011 16:49:43 -0400
Subject: SH-1592 FIXED Advanced model uploader needs an IP checkbox like the
 wizard uploader has

---
 .../newview/skins/default/xui/en/floater_model_preview.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index dce55dae12..4677d014b8 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -83,6 +83,20 @@
     </text>
   </panel>
 
+  <check_box
+	height="16"
+	left_delta="0"
+	name="confirm_checkbox"
+	top_pad="15"
+	follows="bottom|left"
+	width="16" />
+
+  <text
+	height="30"
+	width="570"
+	word_wrap="true" 
+	left_delta="25"
+	top_delta="0">I confirm that I have the appropriate rights to the material contained in this model. [secondlife:///app/floater/learn_more Learn more]</text>
   <text left="10" bottom="540" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text>
 
   
-- 
cgit v1.2.3


From faef58a9b91ecbbffd93fa90347f1b8bd5856902 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 2 Jun 2011 01:36:28 -0500
Subject: SH-1666 Remove "Mesh" stitching type from sculpt combo box.

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 40bf7bfed7..f5f6b990d1 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2098,11 +2098,7 @@ even though the user gets a free copy.
                  label="Cylinder"
                  name="Cylinder"
                  value="Cylinder" />
-              <combo_box.item
-                 label="Mesh"
-                 name="Mesh"
-                 value="Mesh" />
-            </combo_box>
+              </combo_box>
         </panel>
         <panel
          border="false"
-- 
cgit v1.2.3


From dbd619508ba45292c2cebe096494c28e74941643 Mon Sep 17 00:00:00 2001
From: prep linden <prep@lindenlab.com>
Date: Tue, 7 Jun 2011 16:53:29 -0400
Subject: Fix for importer crashes, sh-1698. Added checks for handling bad
 elements in the dae.

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 1 +
 indra/newview/skins/default/xui/en/floater_model_wizard.xml  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 4677d014b8..9d46e1eec5 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -7,6 +7,7 @@
   <string name="status_reading_file">Loading...</string>
   <string name="status_generating_meshes">Generating Meshes...</string>
   <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
+  <string name="bad_element">Error: element is invalid</string>
   <string name="high">High</string>
   <string name="medium">Medium</string>
   <string name="low">Low</string>
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 47b2e5fd79..3dd16f8eb1 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -1021,7 +1021,8 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 	<string name="status_idle">Idle</string>
 	<string name="status_reading_file">Loading...</string>
 	<string name="status_generating_meshes">Generating Meshes...</string>
-  <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
+	<string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
+	<string name="bad_element">Error: element is invalid</string>
 	<string name="high">High</string>
 	<string name="medium">Medium</string>
 	<string name="low">Low</string>
-- 
cgit v1.2.3


From 0c3de98056bde49a18c40469b3d3e3a43be3d209 Mon Sep 17 00:00:00 2001
From: paul_productengine <none@none>
Date: Wed, 8 Jun 2011 18:23:31 +0300
Subject: SH-1588 FIXED (Build tools does not specify units for prim density
 value) - Changed label of the Density spinner - Added ability to LLSpinCtrl
 to set wrap property form XML

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index f5f6b990d1..7441b2cd9c 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2457,8 +2457,9 @@ even though the user gets a free copy.
              height="19"
              increment="0.1"
              initial_value="0"
-             label="Density"
+             label="Density in 100 kg/m^3"
              label_width="70"
+             label_wrap="true"
              layout="topleft"
              left_delta="0"
              max_val="22587"
@@ -2479,7 +2480,7 @@ even though the user gets a free copy.
              max_val="1"
              min_val="0"
              name="Physics Restitution"
-             top_pad="4"
+             top_pad="8"
              width="132" />
         </panel>
          <panel
-- 
cgit v1.2.3


From cd7de2dfe7b837a7000e05606793cbbaec4d475e Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Wed, 8 Jun 2011 15:29:52 -0400
Subject: Fix for sh-815: Added support for verifying a controllers skin weight
 count against the geometries vertex count

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 1 +
 indra/newview/skins/default/xui/en/floater_model_wizard.xml  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 9d46e1eec5..f58595b3c5 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -4,6 +4,7 @@
      name="Model Preview" title="Upload Model" width="620">
 
   <string name="status_idle">Idle</string>
+  <string name="status_parse_error">Dae parsing issue - see log for details.</string>
   <string name="status_reading_file">Loading...</string>
   <string name="status_generating_meshes">Generating Meshes...</string>
   <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 3dd16f8eb1..8603682e3a 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -1019,6 +1019,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 	<spinner visible="false" left="10" height="20" follows="top|left" width="80" top_pad="-50" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>
 
 	<string name="status_idle">Idle</string>
+  <string name="status_parse_error">Dae parsing issue - see log for details.</string>
 	<string name="status_reading_file">Loading...</string>
 	<string name="status_generating_meshes">Generating Meshes...</string>
 	<string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</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')

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')

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 +++-
 .../skins/minimal/xui/da/floater_camera.xml        |   65 +
 .../skins/minimal/xui/da/floater_help_browser.xml  |    9 +
 .../skins/minimal/xui/da/floater_media_browser.xml |   19 +
 .../skins/minimal/xui/da/floater_nearby_chat.xml   |    4 +
 .../skins/minimal/xui/da/floater_web_content.xml   |   14 +
 .../skins/minimal/xui/da/inspect_avatar.xml        |   24 +
 .../skins/minimal/xui/da/inspect_object.xml        |   41 +
 .../minimal/xui/da/menu_add_wearable_gear.xml      |    6 +
 .../skins/minimal/xui/da/menu_attachment_other.xml |   17 +
 .../skins/minimal/xui/da/menu_attachment_self.xml  |   16 +
 .../skins/minimal/xui/da/menu_avatar_icon.xml      |    7 +
 .../skins/minimal/xui/da/menu_avatar_other.xml     |   16 +
 .../skins/minimal/xui/da/menu_avatar_self.xml      |   31 +
 .../skins/minimal/xui/da/menu_bottomtray.xml       |   17 +
 .../skins/minimal/xui/da/menu_cof_attachment.xml   |    4 +
 .../skins/minimal/xui/da/menu_cof_body_part.xml    |    5 +
 .../skins/minimal/xui/da/menu_cof_clothing.xml     |    6 +
 .../newview/skins/minimal/xui/da/menu_cof_gear.xml |    5 +
 indra/newview/skins/minimal/xui/da/menu_edit.xml   |   12 +
 .../skins/minimal/xui/da/menu_favorites.xml        |   10 +
 .../skins/minimal/xui/da/menu_gesture_gear.xml     |   10 +
 .../skins/minimal/xui/da/menu_group_plus.xml       |    5 +
 .../skins/minimal/xui/da/menu_hide_navbar.xml      |    6 +
 .../skins/minimal/xui/da/menu_im_well_button.xml   |    4 +
 .../skins/minimal/xui/da/menu_imchiclet_adhoc.xml  |    4 +
 .../skins/minimal/xui/da/menu_imchiclet_group.xml  |    6 +
 .../skins/minimal/xui/da/menu_imchiclet_p2p.xml    |    7 +
 .../minimal/xui/da/menu_inspect_avatar_gear.xml    |   21 +
 .../minimal/xui/da/menu_inspect_object_gear.xml    |   18 +
 .../minimal/xui/da/menu_inspect_self_gear.xml      |   31 +
 .../minimal/xui/da/menu_inv_offer_chiclet.xml      |    4 +
 .../skins/minimal/xui/da/menu_inventory.xml        |   84 +
 .../skins/minimal/xui/da/menu_inventory_add.xml    |   33 +
 .../minimal/xui/da/menu_inventory_gear_default.xml |   17 +
 indra/newview/skins/minimal/xui/da/menu_land.xml   |    9 +
 .../newview/skins/minimal/xui/da/menu_landmark.xml |    7 +
 indra/newview/skins/minimal/xui/da/menu_login.xml  |   24 +
 .../newview/skins/minimal/xui/da/menu_mini_map.xml |   11 +
 indra/newview/skins/minimal/xui/da/menu_navbar.xml |   11 +
 .../skins/minimal/xui/da/menu_nearby_chat.xml      |    9 +
 .../xui/da/menu_notification_well_button.xml       |    4 +
 indra/newview/skins/minimal/xui/da/menu_object.xml |   29 +
 .../skins/minimal/xui/da/menu_object_icon.xml      |    5 +
 .../skins/minimal/xui/da/menu_outfit_gear.xml      |   27 +
 .../skins/minimal/xui/da/menu_outfit_tab.xml       |    9 +
 .../skins/minimal/xui/da/menu_participant_list.xml |   21 +
 .../xui/da/menu_people_friends_view_sort.xml       |    8 +
 .../skins/minimal/xui/da/menu_people_groups.xml    |    8 +
 .../xui/da/menu_people_groups_view_sort.xml        |    5 +
 .../skins/minimal/xui/da/menu_people_nearby.xml    |   13 +
 .../xui/da/menu_people_nearby_multiselect.xml      |   10 +
 .../xui/da/menu_people_nearby_view_sort.xml        |    8 +
 .../xui/da/menu_people_recent_view_sort.xml        |    7 +
 indra/newview/skins/minimal/xui/da/menu_picks.xml  |    8 +
 .../skins/minimal/xui/da/menu_picks_plus.xml       |    5 +
 indra/newview/skins/minimal/xui/da/menu_place.xml  |    7 +
 .../skins/minimal/xui/da/menu_place_add_button.xml |    5 +
 .../minimal/xui/da/menu_places_gear_folder.xml     |   16 +
 .../minimal/xui/da/menu_places_gear_landmark.xml   |   19 +
 .../skins/minimal/xui/da/menu_profile_overflow.xml |   12 +
 .../skins/minimal/xui/da/menu_save_outfit.xml      |    5 +
 .../skins/minimal/xui/da/menu_script_chiclet.xml   |    4 +
 indra/newview/skins/minimal/xui/da/menu_slurl.xml  |    6 +
 .../minimal/xui/da/menu_teleport_history_gear.xml  |    6 +
 .../minimal/xui/da/menu_teleport_history_item.xml  |    6 +
 .../minimal/xui/da/menu_teleport_history_tab.xml   |    5 +
 .../skins/minimal/xui/da/menu_text_editor.xml      |    8 +
 .../skins/minimal/xui/da/menu_topinfobar.xml       |    7 +
 .../skins/minimal/xui/da/menu_url_agent.xml        |    6 +
 .../skins/minimal/xui/da/menu_url_group.xml        |    6 +
 .../newview/skins/minimal/xui/da/menu_url_http.xml |    7 +
 .../skins/minimal/xui/da/menu_url_inventory.xml    |    6 +
 .../newview/skins/minimal/xui/da/menu_url_map.xml  |    6 +
 .../skins/minimal/xui/da/menu_url_objectim.xml     |    8 +
 .../skins/minimal/xui/da/menu_url_parcel.xml       |    6 +
 .../skins/minimal/xui/da/menu_url_slapp.xml        |    5 +
 .../skins/minimal/xui/da/menu_url_slurl.xml        |    7 +
 .../skins/minimal/xui/da/menu_url_teleport.xml     |    6 +
 indra/newview/skins/minimal/xui/da/menu_viewer.xml |   14 +
 .../minimal/xui/da/menu_wearable_list_item.xml     |   14 +
 .../skins/minimal/xui/da/menu_wearing_gear.xml     |    5 +
 .../skins/minimal/xui/da/menu_wearing_tab.xml      |    6 +
 .../newview/skins/minimal/xui/da/notifications.xml | 1833 ++++++++++++++++++++
 .../minimal/xui/da/panel_adhoc_control_panel.xml   |   14 +
 .../skins/minimal/xui/da/panel_bottomtray.xml      |   39 +
 .../minimal/xui/da/panel_group_control_panel.xml   |   17 +
 .../minimal/xui/da/panel_im_control_panel.xml      |   29 +
 indra/newview/skins/minimal/xui/da/panel_login.xml |   48 +
 .../skins/minimal/xui/da/panel_navigation_bar.xml  |   18 +
 .../newview/skins/minimal/xui/da/panel_people.xml  |   94 +
 .../minimal/xui/da/panel_side_tray_tab_caption.xml |    7 +
 .../skins/minimal/xui/da/panel_status_bar.xml      |   33 +
 113 files changed, 3625 insertions(+), 47 deletions(-)
 create mode 100644 indra/newview/skins/minimal/xui/da/floater_camera.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/floater_help_browser.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/floater_media_browser.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/floater_nearby_chat.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/floater_web_content.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/inspect_avatar.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/inspect_object.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_add_wearable_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_attachment_other.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_attachment_self.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_avatar_icon.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_avatar_other.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_avatar_self.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_bottomtray.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_cof_attachment.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_cof_body_part.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_cof_clothing.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_cof_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_edit.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_favorites.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_gesture_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_group_plus.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_hide_navbar.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_im_well_button.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_imchiclet_adhoc.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_imchiclet_group.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_imchiclet_p2p.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_inspect_avatar_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_inspect_object_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_inspect_self_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_inv_offer_chiclet.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_inventory.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_inventory_add.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_inventory_gear_default.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_land.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_landmark.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_login.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_mini_map.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_navbar.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_nearby_chat.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_notification_well_button.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_object.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_object_icon.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_outfit_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_outfit_tab.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_participant_list.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_people_friends_view_sort.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_people_groups.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_people_groups_view_sort.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_people_nearby.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_people_nearby_multiselect.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_people_nearby_view_sort.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_people_recent_view_sort.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_picks.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_picks_plus.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_place.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_place_add_button.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_places_gear_folder.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_places_gear_landmark.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_profile_overflow.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_save_outfit.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_script_chiclet.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_slurl.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_teleport_history_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_teleport_history_item.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_teleport_history_tab.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_text_editor.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_topinfobar.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_url_agent.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_url_group.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_url_http.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_url_inventory.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_url_map.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_url_objectim.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_url_parcel.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_url_slapp.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_url_slurl.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_url_teleport.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_viewer.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_wearable_list_item.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_wearing_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/menu_wearing_tab.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/notifications.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/panel_adhoc_control_panel.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/panel_bottomtray.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/panel_group_control_panel.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/panel_im_control_panel.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/panel_login.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/panel_navigation_bar.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/panel_people.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/panel_side_tray_tab_caption.xml
 create mode 100644 indra/newview/skins/minimal/xui/da/panel_status_bar.xml

(limited to 'indra/newview/skins')

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>
diff --git a/indra/newview/skins/minimal/xui/da/floater_camera.xml b/indra/newview/skins/minimal/xui/da/floater_camera.xml
new file mode 100644
index 0000000000..5b7ef6db54
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/floater_camera.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="camera_floater" title="">
+	<floater.string name="rotate_tooltip">
+		Roter kamera omkring fokus
+	</floater.string>
+	<floater.string name="zoom_tooltip">
+		Zoom kamera mod fokus
+	</floater.string>
+	<floater.string name="move_tooltip">
+		Flyt kamera op og ned, til venstre og højre
+	</floater.string>
+	<floater.string name="camera_modes_title">
+		Kamera valg
+	</floater.string>
+	<floater.string name="pan_mode_title">
+		Kredsløb zoom panorering
+	</floater.string>
+	<floater.string name="presets_mode_title">
+		Forvalg
+	</floater.string>
+	<floater.string name="free_mode_title">
+		Se objekt
+	</floater.string>
+	<panel name="controls">
+		<panel name="preset_views_list">
+			<panel_camera_item name="front_view">
+				<panel_camera_item.text name="front_view_text">
+					Se forfra
+				</panel_camera_item.text>
+			</panel_camera_item>
+			<panel_camera_item name="group_view">
+				<panel_camera_item.text name="side_view_text">
+					Se fra siden
+				</panel_camera_item.text>
+			</panel_camera_item>
+			<panel_camera_item name="rear_view">
+				<panel_camera_item.text name="rear_view_text">
+					Se bagfra
+				</panel_camera_item.text>
+			</panel_camera_item>
+		</panel>
+		<panel name="camera_modes_list">
+			<panel_camera_item name="object_view">
+				<panel_camera_item.text name="object_view_text">
+					Se fra objekt
+				</panel_camera_item.text>
+			</panel_camera_item>
+			<panel_camera_item name="mouselook_view">
+				<panel_camera_item.text name="mouselook_view_text">
+					Førsteperson
+				</panel_camera_item.text>
+			</panel_camera_item>
+		</panel>
+		<panel name="zoom" tool_tip="Zoom kamera mod fokus">
+			<joystick_rotate name="cam_rotate_stick" tool_tip="Kamera kredser rundt om fokus"/>
+			<slider_bar name="zoom_slider" tool_tip="Zoom kamera mod fokus"/>
+			<joystick_track name="cam_track_stick" tool_tip="Flyt kamera op og ned, venstre og højre"/>
+		</panel>
+	</panel>
+	<panel name="buttons">
+		<button label="" name="presets_btn" tool_tip="Forvalg"/>
+		<button label="" name="pan_btn" tool_tip="Kredsløb zoom panorering"/>
+		<button label="" name="avatarview_btn" tool_tip="Kamera valg"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/minimal/xui/da/floater_help_browser.xml b/indra/newview/skins/minimal/xui/da/floater_help_browser.xml
new file mode 100644
index 0000000000..0e2918e4e2
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/floater_help_browser.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_help_browser" title="HVORDAN">
+	<floater.string name="loading_text">
+		Henter...
+	</floater.string>
+	<layout_stack name="stack1">
+		<layout_panel name="external_controls"/>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/minimal/xui/da/floater_media_browser.xml b/indra/newview/skins/minimal/xui/da/floater_media_browser.xml
new file mode 100644
index 0000000000..d3028c32f9
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/floater_media_browser.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_about" title="MEDIE VÆLGER">
+	<layout_stack name="stack1">
+		<layout_panel name="nav_controls">
+			<button label="Tilbage" name="back"/>
+			<button label="Frem" name="forward"/>
+			<button label="Opdater" name="reload"/>
+			<button label="Gå til" name="go"/>
+		</layout_panel>
+		<layout_panel name="parcel_owner_controls">
+			<button label="Send denne side til parcel" name="assign"/>
+		</layout_panel>
+		<layout_panel name="external_controls">
+			<button label="Åben i min browser" name="open_browser"/>
+			<check_box label="Åben altid i min browser" name="open_always"/>
+			<button label="Luk" name="close"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/minimal/xui/da/floater_nearby_chat.xml b/indra/newview/skins/minimal/xui/da/floater_nearby_chat.xml
new file mode 100644
index 0000000000..bd17224259
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/floater_nearby_chat.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="nearby_chat" title="CHAT NÆRVED">
+	<check_box label="Oversæt chat (håndteret af Google)" name="translate_chat_checkbox"/>
+</floater>
diff --git a/indra/newview/skins/minimal/xui/da/floater_web_content.xml b/indra/newview/skins/minimal/xui/da/floater_web_content.xml
new file mode 100644
index 0000000000..74092e88ec
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/floater_web_content.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_web_content" title="">
+	<layout_stack name="stack1">
+		<layout_panel name="nav_controls">
+			<button name="back" tool_tip="Navigér tilbage"/>
+			<button name="forward" tool_tip="Navigér frem"/>
+			<button name="stop" tool_tip="Stop navigering"/>
+			<button name="reload" tool_tip="Genindlæs side"/>
+			<combo_box name="address" tool_tip="Indtast URL her"/>
+			<icon name="media_secure_lock_flag" tool_tip="Sikker browsing"/>
+			<button name="popexternal" tool_tip="Åben denne URL i din normale browser"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/minimal/xui/da/inspect_avatar.xml b/indra/newview/skins/minimal/xui/da/inspect_avatar.xml
new file mode 100644
index 0000000000..dc1ed562eb
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/inspect_avatar.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_avatar">
+	<string name="Subtitle">
+		[AGE]
+	</string>
+	<string name="Details">
+		[SL_PROFILE]
+	</string>
+	<text name="user_details">
+		Dette er min second life beskrivelse og jeg synes den er rigtig god. Men af en eller ande grund er min beskrivelse meget lang fordi jeg taler en hel masse
+	</text>
+	<slider name="volume_slider" tool_tip="Stemme lydstyrke" value="0.5"/>
+	<button label="Tilføj ven" name="add_friend_btn"/>
+	<button label="IM" name="im_btn"/>
+	<button label="Profil" name="view_profile_btn"/>
+	<panel name="moderator_panel">
+		<button label="Slå stemme-chat fra" name="disable_voice"/>
+		<button label="Slå stemme-chat til" name="enable_voice"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/minimal/xui/da/inspect_object.xml b/indra/newview/skins/minimal/xui/da/inspect_object.xml
new file mode 100644
index 0000000000..78ccc5b869
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/inspect_object.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_object">
+	<string name="Creator">
+		Af [CREATOR]
+	</string>
+	<string name="CreatorAndOwner">
+		Af [CREATOR]
+Owner [OWNER]
+	</string>
+	<string name="Price">
+		L$[AMOUNT]
+	</string>
+	<string name="PriceFree">
+		Gratis!
+	</string>
+	<string name="Touch">
+		Berør
+	</string>
+	<string name="Sit">
+		Sid
+	</string>
+	<text name="object_name" value="Test objekt navn der reelt er to linier og meget lang"/>
+	<text name="price_text">
+		L$30,000
+	</text>
+	<text name="object_description">
+		Dette er en meget lang beskrivelse af et objekt udformet så den fylder mindst 80 karakterer i længden eller endda nærmere 120 på dette sted. Man kan aldrig vide....
+	</text>
+	<button label="Køb" name="buy_btn"/>
+	<button label="Betal" name="pay_btn"/>
+	<button label="Tag kopi" name="take_free_copy_btn"/>
+	<button label="Berør" name="touch_btn"/>
+	<button label="Sid" name="sit_btn"/>
+	<button label="Åben" name="open_btn"/>
+	<icon name="secure_browsing" tool_tip="Sikker Browsing"/>
+	<button label="Mere" name="more_info_btn"/>
+</floater>
diff --git a/indra/newview/skins/minimal/xui/da/menu_add_wearable_gear.xml b/indra/newview/skins/minimal/xui/da/menu_add_wearable_gear.xml
new file mode 100644
index 0000000000..1e8301dc4c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_add_wearable_gear.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Add Wearable Gear Menu">
+	<menu_item_check label="Sortér efter nyeste" name="sort_by_most_recent"/>
+	<menu_item_check label="Sortér efter navn" name="sort_by_name"/>
+	<menu_item_check label="Sortér efter type" name="sort_by_type"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_attachment_other.xml b/indra/newview/skins/minimal/xui/da/menu_attachment_other.xml
new file mode 100644
index 0000000000..ca7b184942
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_attachment_other.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_avatar_other.xml -->
+<context_menu name="Avatar Pie">
+	<menu_item_call label="Profil" name="Profile..."/>
+	<menu_item_call label="Tilføj ven" name="Add Friend"/>
+	<menu_item_call label="Send besked" name="Send IM..."/>
+	<menu_item_call label="Opkald" name="Call"/>
+	<menu_item_call label="Invitér til gruppe" name="Invite..."/>
+	<menu_item_call label="Blokér" name="Avatar Mute"/>
+	<menu_item_call label="Rapportér" name="abuse"/>
+	<menu_item_call label="Frys" name="Freeze..."/>
+	<menu_item_call label="Smid ud" name="Eject..."/>
+	<menu_item_call label="Debug teksturer" name="Debug..."/>
+	<menu_item_call label="Zoom ind" name="Zoom In"/>
+	<menu_item_call label="Betal" name="Pay..."/>
+	<menu_item_call label="Objekt profil" name="Object Inspect"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_attachment_self.xml b/indra/newview/skins/minimal/xui/da/menu_attachment_self.xml
new file mode 100644
index 0000000000..35ba27f9e2
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_attachment_self.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Attachment Pie">
+	<menu_item_call label="Berør" name="Attachment Object Touch"/>
+	<menu_item_call label="Redigér" name="Edit..."/>
+	<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="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..."/>
+	<menu_item_call label="Grupper" name="Groups..."/>
+	<menu_item_call label="Profil" name="Profile..."/>
+	<menu_item_call label="Debug teksturer" name="Debug..."/>
+	<menu_item_call label="Smid" name="Drop"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_avatar_icon.xml b/indra/newview/skins/minimal/xui/da/menu_avatar_icon.xml
new file mode 100644
index 0000000000..26b58ce1ab
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_avatar_icon.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Avatar Icon Menu">
+	<menu_item_call label="Profil" name="Show Profile"/>
+	<menu_item_call label="Send besked..." name="Send IM"/>
+	<menu_item_call label="Tilføj ven..." name="Add Friend"/>
+	<menu_item_call label="Fjern ven..." name="Remove Friend"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_avatar_other.xml b/indra/newview/skins/minimal/xui/da/menu_avatar_other.xml
new file mode 100644
index 0000000000..a778dedf0b
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_avatar_other.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Avatar Pie">
+	<menu_item_call label="Profil" name="Profile..."/>
+	<menu_item_call label="Tilføj ven" name="Add Friend"/>
+	<menu_item_call label="Besked" name="Send IM..."/>
+	<menu_item_call label="Opkald" name="Call"/>
+	<menu_item_call label="Invitér til gruppe" name="Invite..."/>
+	<menu_item_call label="Blokér" name="Avatar Mute"/>
+	<menu_item_call label="Rapportér" name="abuse"/>
+	<menu_item_call label="Frys" name="Freeze..."/>
+	<menu_item_call label="Smid ud" name="Eject..."/>
+	<menu_item_call label="Debug Teksturer" name="Debug..."/>
+	<menu_item_call label="Zoom ind" name="Zoom In"/>
+	<menu_item_call label="Betal" name="Pay..."/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_avatar_self.xml b/indra/newview/skins/minimal/xui/da/menu_avatar_self.xml
new file mode 100644
index 0000000000..0080f7a59e
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_avatar_self.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Self Pie">
+	<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="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..."/>
+	<menu_item_call label="Grupper" name="Groups..."/>
+	<menu_item_call label="Profil" name="Profile..."/>
+	<menu_item_call label="Debug teksturer" name="Debug..."/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_bottomtray.xml b/indra/newview/skins/minimal/xui/da/menu_bottomtray.xml
new file mode 100644
index 0000000000..9ac296904a
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_bottomtray.xml
@@ -0,0 +1,17 @@
+<?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="Bygge knap" name="ShowBuildButton"/>
+	<menu_item_check label="Søge knap" name="ShowSearchButton"/>
+	<menu_item_check label="Kort knap" name="ShowWorldMapButton"/>
+	<menu_item_check label="Mini-Map button" name="ShowMiniMapButton"/>
+	<menu_item_call label="Klip" name="NearbyChatBar_Cut"/>
+	<menu_item_call label="Kopiér" name="NearbyChatBar_Copy"/>
+	<menu_item_call label="Sæt ind" name="NearbyChatBar_Paste"/>
+	<menu_item_call label="Slet" name="NearbyChatBar_Delete"/>
+	<menu_item_call label="Vælg alt" name="NearbyChatBar_Select_All"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_cof_attachment.xml b/indra/newview/skins/minimal/xui/da/menu_cof_attachment.xml
new file mode 100644
index 0000000000..9d7fc0f223
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_cof_attachment.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="COF Attachment">
+	<menu_item_call label="Tag af" name="detach"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_cof_body_part.xml b/indra/newview/skins/minimal/xui/da/menu_cof_body_part.xml
new file mode 100644
index 0000000000..0e90d5a3ae
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_cof_body_part.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="COF Body">
+	<menu_item_call label="Erstat" name="replace"/>
+	<menu_item_call label="Redigér" name="edit"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_cof_clothing.xml b/indra/newview/skins/minimal/xui/da/menu_cof_clothing.xml
new file mode 100644
index 0000000000..16c225b7d9
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_cof_clothing.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="COF Clothing">
+	<menu_item_call label="Tag af" name="take_off"/>
+	<menu_item_call label="Redigér" name="edit"/>
+	<menu_item_call label="Erstat" name="replace"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_cof_gear.xml b/indra/newview/skins/minimal/xui/da/menu_cof_gear.xml
new file mode 100644
index 0000000000..f44369fd84
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_cof_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Gear COF">
+	<menu label="Nyt tøj" name="COF.Gear.New_Clothes"/>
+	<menu label="Nye kropsdele" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_edit.xml b/indra/newview/skins/minimal/xui/da/menu_edit.xml
new file mode 100644
index 0000000000..3752f42b1c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_edit.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu label="Redigér" name="Edit">
+	<menu_item_call label="Fortryd" name="Undo"/>
+	<menu_item_call label="Gendan" name="Redo"/>
+	<menu_item_call label="Klip" name="Cut"/>
+	<menu_item_call label="Kopiér" name="Copy"/>
+	<menu_item_call label="Sæt ind" name="Paste"/>
+	<menu_item_call label="Slet" name="Delete"/>
+	<menu_item_call label="Duplikér" name="Duplicate"/>
+	<menu_item_call label="Marker alt" name="Select All"/>
+	<menu_item_call label="Fjern markering" name="Deselect"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_favorites.xml b/indra/newview/skins/minimal/xui/da/menu_favorites.xml
new file mode 100644
index 0000000000..a4793e294c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_favorites.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Popup">
+	<menu_item_call label="Teleportér" name="Teleport To Landmark"/>
+	<menu_item_call label="Vis/ret landemærke" name="Landmark Open"/>
+	<menu_item_call label="Kopiér SLurl" name="Copy slurl"/>
+	<menu_item_call label="Vis på kort" name="Show On Map"/>
+	<menu_item_call label="Kopiér" name="Landmark Copy"/>
+	<menu_item_call label="Sæt ind" name="Landmark Paste"/>
+	<menu_item_call label="Slet" name="Delete"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_gesture_gear.xml b/indra/newview/skins/minimal/xui/da/menu_gesture_gear.xml
new file mode 100644
index 0000000000..a9010e99b6
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_gesture_gear.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_gesture_gear">
+	<menu_item_call label="Tilføj/fjern fra favoritter" name="activate"/>
+	<menu_item_call label="Kopiér" name="copy_gesture"/>
+	<menu_item_call label="Sæt ind" name="paste"/>
+	<menu_item_call label="Kopiér UUID" name="copy_uuid"/>
+	<menu_item_call label="Gem til nuværende sæt" name="save_to_outfit"/>
+	<menu_item_call label="Editér" name="edit_gesture"/>
+	<menu_item_call label="Undersøg" name="inspect"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_group_plus.xml b/indra/newview/skins/minimal/xui/da/menu_group_plus.xml
new file mode 100644
index 0000000000..97fbec1ed1
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_group_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_call label="Meld ind i gruppe..." name="item_join"/>
+	<menu_item_call label="Ny gruppe..." name="item_new"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_hide_navbar.xml b/indra/newview/skins/minimal/xui/da/menu_hide_navbar.xml
new file mode 100644
index 0000000000..d96a8a8a17
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_hide_navbar.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="hide_navbar_menu">
+	<menu_item_check label="Vis navigationsbjælke" name="ShowNavbarNavigationPanel"/>
+	<menu_item_check label="Vis favoritbjælke" name="ShowNavbarFavoritesPanel"/>
+	<menu_item_check label="Vis min lokation bjælke" name="ShowMiniLocationPanel"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_im_well_button.xml b/indra/newview/skins/minimal/xui/da/menu_im_well_button.xml
new file mode 100644
index 0000000000..4889230919
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_im_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="IM Well Button Context Menu">
+	<menu_item_call label="Luk alle" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_imchiclet_adhoc.xml b/indra/newview/skins/minimal/xui/da/menu_imchiclet_adhoc.xml
new file mode 100644
index 0000000000..f64a6ad455
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_imchiclet_adhoc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="IMChiclet AdHoc Menu">
+	<menu_item_call label="Afslut" name="End Session"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_imchiclet_group.xml b/indra/newview/skins/minimal/xui/da/menu_imchiclet_group.xml
new file mode 100644
index 0000000000..b89d9a5789
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_imchiclet_group.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="IMChiclet Group Menu">
+	<menu_item_call label="Gruppe info" name="Show Profile"/>
+	<menu_item_call label="Vis session" name="Chat"/>
+	<menu_item_call label="Afslut session" name="End Session"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_imchiclet_p2p.xml b/indra/newview/skins/minimal/xui/da/menu_imchiclet_p2p.xml
new file mode 100644
index 0000000000..6ebc40a8dd
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_imchiclet_p2p.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="IMChiclet P2P Menu">
+	<menu_item_call label="Profil" name="Show Profile"/>
+	<menu_item_call label="Tilføj ven" name="Add Friend"/>
+	<menu_item_call label="Vis session" name="Send IM"/>
+	<menu_item_call label="Afslut session" name="End Session"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_inspect_avatar_gear.xml b/indra/newview/skins/minimal/xui/da/menu_inspect_avatar_gear.xml
new file mode 100644
index 0000000000..8da35adb1b
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_inspect_avatar_gear.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"/>
+	<menu_item_call label="Opkald" name="call"/>
+	<menu_item_call label="Teleportér" name="teleport"/>
+	<menu_item_call label="Invitér til gruppe" name="invite_to_group"/>
+	<menu_item_call label="Blokér" name="block"/>
+	<menu_item_call label="Fjern blokering" name="unblock"/>
+	<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"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_inspect_object_gear.xml b/indra/newview/skins/minimal/xui/da/menu_inspect_object_gear.xml
new file mode 100644
index 0000000000..e28842836d
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_inspect_object_gear.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu name="Gear Menu">
+	<menu_item_call label="Berør" name="touch"/>
+	<menu_item_call label="Sid her" name="sit"/>
+	<menu_item_call label="betal" name="pay"/>
+	<menu_item_call label="Køb" name="buy"/>
+	<menu_item_call label="Tag" name="take"/>
+	<menu_item_call label="tag kopi" name="take_copy"/>
+	<menu_item_call label="Åben" name="open"/>
+	<menu_item_call label="Redigér" name="edit"/>
+	<menu_item_call label="Tag på" name="wear"/>
+	<menu_item_call label="Tilføj" name="add"/>
+	<menu_item_call label="Rapportér" name="report"/>
+	<menu_item_call label="Blokér" name="block"/>
+	<menu_item_call label="Zoom ind" name="zoom_in"/>
+	<menu_item_call label="Fjern" name="remove"/>
+	<menu_item_call label="Mere info" name="more_info"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_inspect_self_gear.xml b/indra/newview/skins/minimal/xui/da/menu_inspect_self_gear.xml
new file mode 100644
index 0000000000..887c6484bc
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_inspect_self_gear.xml
@@ -0,0 +1,31 @@
+<?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..."/>
+</toggleable_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_inv_offer_chiclet.xml b/indra/newview/skins/minimal/xui/da/menu_inv_offer_chiclet.xml
new file mode 100644
index 0000000000..c3b03232bf
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_inv_offer_chiclet.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="InvOfferChiclet Menu">
+	<menu_item_call label="Luk" name="Close"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_inventory.xml b/indra/newview/skins/minimal/xui/da/menu_inventory.xml
new file mode 100644
index 0000000000..35551318d1
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_inventory.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Popup">
+	<menu_item_call label="Del" name="Share"/>
+	<menu_item_call label="Køb" name="Task Buy"/>
+	<menu_item_call label="åben" name="Task Open"/>
+	<menu_item_call label="Afspil" name="Task Play"/>
+	<menu_item_call label="Egenskaber" name="Task Properties"/>
+	<menu_item_call label="Omdøb" name="Task Rename"/>
+	<menu_item_call label="Slet" name="Task Remove"/>
+	<menu_item_call label="Tøm papirkurv" name="Empty Trash"/>
+	<menu_item_call label="Tøm &apos;Lost and found&apos;" name="Empty Lost And Found"/>
+	<menu_item_call label="Ny mappe" name="New Folder"/>
+	<menu_item_call label="Nyt script" name="New Script"/>
+	<menu_item_call label="Ny note" name="New Note"/>
+	<menu_item_call label="Ny bevægelse" name="New Gesture"/>
+	<menu label="Nyt tøj" name="New Clothes">
+		<menu_item_call label="Ny trøje" name="New Shirt"/>
+		<menu_item_call label="Nye bukser" name="New Pants"/>
+		<menu_item_call label="Nye sko" name="New Shoes"/>
+		<menu_item_call label="Nye strømper" name="New Socks"/>
+		<menu_item_call label="Ny jakke" name="New Jacket"/>
+		<menu_item_call label="Ny nederdel" name="New Skirt"/>
+		<menu_item_call label="Nye handsker" name="New Gloves"/>
+		<menu_item_call label="Ny undertrøje" name="New Undershirt"/>
+		<menu_item_call label="Nye underbukser" name="New Underpants"/>
+		<menu_item_call label="Nyt alpha lag" name="New Alpha Mask"/>
+		<menu_item_call label="Ny tatovering" name="New Tattoo"/>
+	</menu>
+	<menu label="Nye kropsdele" name="New Body Parts">
+		<menu_item_call label="Ny figur" name="New Shape"/>
+		<menu_item_call label="Nyt hud" name="New Skin"/>
+		<menu_item_call label="Nyt hår" name="New Hair"/>
+		<menu_item_call label="Nye øjne" name="New Eyes"/>
+	</menu>
+	<menu label="Ændre type" name="Change Type">
+		<menu_item_call label="Standard" name="Default"/>
+		<menu_item_call label="Handsker" name="Gloves"/>
+		<menu_item_call label="Jakke" name="Jacket"/>
+		<menu_item_call label="Bukser" name="Pants"/>
+		<menu_item_call label="Kropsbygning" name="Shape"/>
+		<menu_item_call label="Sko" name="Shoes"/>
+		<menu_item_call label="Trøje" name="Shirt"/>
+		<menu_item_call label="Nederdel" name="Skirt"/>
+		<menu_item_call label="Underbukser" name="Underpants"/>
+		<menu_item_call label="Undertrøje" name="Undershirt"/>
+	</menu>
+	<menu_item_call label="Teleport" name="Landmark Open"/>
+	<menu_item_call label="åben" name="Animation Open"/>
+	<menu_item_call label="åben" name="Sound Open"/>
+	<menu_item_call label="Erstat påklædning" name="Replace Outfit"/>
+	<menu_item_call label="Tilføj til påklædning" name="Add To Outfit"/>
+	<menu_item_call label="Slet ting" name="Purge Item"/>
+	<menu_item_call label="Genskab ting" name="Restore Item"/>
+	<menu_item_call label="åben" name="Open"/>
+	<menu_item_call label="Åben original" name="Open Original"/>
+	<menu_item_call label="Egenskaber" name="Properties"/>
+	<menu_item_call label="Omdøb" name="Rename"/>
+	<menu_item_call label="Kopiér asset UUID" name="Copy Asset UUID"/>
+	<menu_item_call label="Kopiér" name="Copy"/>
+	<menu_item_call label="Indsæt" name="Paste"/>
+	<menu_item_call label="Sæt ind som link" name="Paste As Link"/>
+	<menu_item_call label="Slet" name="Remove Link"/>
+	<menu_item_call label="Slet" name="Delete"/>
+	<menu_item_call label="Slet systemfolder" name="Delete System Folder"/>
+	<menu_item_call label="start konference chat" name="Conference Chat Folder"/>
+	<menu_item_call label="Afspil" name="Sound Play"/>
+	<menu_item_call label="Om landemærke" name="About Landmark"/>
+	<menu_item_call label="Afspil i verden" name="Animation Play"/>
+	<menu_item_call label="Afspil lokalt" name="Animation Audition"/>
+	<menu_item_call label="Send privat besked (IM)" name="Send Instant Message"/>
+	<menu_item_call label="Tilbyd teleport..." name="Offer Teleport..."/>
+	<menu_item_call label="start konference Chat" name="Conference Chat"/>
+	<menu_item_call label="Aktivér" name="Activate"/>
+	<menu_item_call label="Deaktivér" name="Deactivate"/>
+	<menu_item_call label="Gem som" name="Save As"/>
+	<menu_item_call label="Tag af dig selv" name="Detach From Yourself"/>
+	<menu_item_call label="Tag på" name="Wearable And Object Wear"/>
+	<menu label="Vedhæft" name="Attach To"/>
+	<menu label="Vedhæft til HUD" name="Attach To HUD"/>
+	<menu_item_call label="Redigér" name="Wearable Edit"/>
+	<menu_item_call label="Tilføj" name="Wearable Add"/>
+	<menu_item_call label="Tag af" name="Take Off"/>
+	<menu_item_call label="--ingen valg--" name="--no options--"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_inventory_add.xml b/indra/newview/skins/minimal/xui/da/menu_inventory_add.xml
new file mode 100644
index 0000000000..07f70d7190
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_inventory_add.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_inventory_add">
+	<menu label="Hent" name="upload">
+		<menu_item_call label="Billede (L$[COST])..." name="Upload Image"/>
+		<menu_item_call label="Lyd (L$[COST])..." name="Upload Sound"/>
+		<menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/>
+		<menu_item_call label="Hent mange (L$[COST] pr. fil)..." name="Bulk Upload"/>
+		<menu_item_call label="Sæt standardværdier for upload rettigheder" name="perm prefs"/>
+	</menu>
+	<menu_item_call label="Ny mappe" name="New Folder"/>
+	<menu_item_call label="Nyt script" name="New Script"/>
+	<menu_item_call label="Ny note" name="New Note"/>
+	<menu_item_call label="Ny bevægelse" name="New Gesture"/>
+	<menu label="Nyt tøj" name="New Clothes">
+		<menu_item_call label="Ny trøje" name="New Shirt"/>
+		<menu_item_call label="Nye bukser" name="New Pants"/>
+		<menu_item_call label="Nye sko" name="New Shoes"/>
+		<menu_item_call label="Nye strømper" name="New Socks"/>
+		<menu_item_call label="Ny jakke" name="New Jacket"/>
+		<menu_item_call label="Ny nederdel" name="New Skirt"/>
+		<menu_item_call label="Nye handsker" name="New Gloves"/>
+		<menu_item_call label="Ny undertrøje" name="New Undershirt"/>
+		<menu_item_call label="Nye underbukser" name="New Underpants"/>
+		<menu_item_call label="Nyt alpha lag" name="New Alpha"/>
+		<menu_item_call label="Ny tatovering" name="New Tattoo"/>
+	</menu>
+	<menu label="Nye kropsdele" name="New Body Parts">
+		<menu_item_call label="Ny kropsbygning" name="New Shape"/>
+		<menu_item_call label="Ny hud" name="New Skin"/>
+		<menu_item_call label="Nyt hår" name="New Hair"/>
+		<menu_item_call label="Nye øjne" name="New Eyes"/>
+	</menu>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_inventory_gear_default.xml b/indra/newview/skins/minimal/xui/da/menu_inventory_gear_default.xml
new file mode 100644
index 0000000000..4809b24463
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_inventory_gear_default.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_gear_default">
+	<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"/>
+	<menu_item_call label="Luk alle mapper" name="close_folders"/>
+	<menu_item_call label="Tøm &quot;fundne genstande&quot;" name="empty_lostnfound"/>
+	<menu_item_call label="Gem tekstur som" name="Save Texture As"/>
+	<menu_item_call label="Del" name="Share"/>
+	<menu_item_call label="Find original" name="Find Original"/>
+	<menu_item_call label="Find alle links" name="Find All Links"/>
+	<menu_item_call label="Tøm papirkurv" name="empty_trash"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_land.xml b/indra/newview/skins/minimal/xui/da/menu_land.xml
new file mode 100644
index 0000000000..1548f18f89
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_land.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Land Pie">
+	<menu_item_call label="Om land" name="Place Information..."/>
+	<menu_item_call label="Sid her" name="Sit Here"/>
+	<menu_item_call label="Køb" name="Land Buy"/>
+	<menu_item_call label="Køb adgang" name="Land Buy Pass"/>
+	<menu_item_call label="Byg" name="Create"/>
+	<menu_item_call label="Tilpas terræn" name="Edit Terrain"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_landmark.xml b/indra/newview/skins/minimal/xui/da/menu_landmark.xml
new file mode 100644
index 0000000000..3cf2ffe375
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_landmark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="landmark_overflow_menu">
+	<menu_item_call label="Kopiér SLurl" name="copy"/>
+	<menu_item_call label="Slet" name="delete"/>
+	<menu_item_call label="Opret favorit" name="pick"/>
+	<menu_item_call label="Tilføj til favorit bjælke" name="add_to_favbar"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_login.xml b/indra/newview/skins/minimal/xui/da/menu_login.xml
new file mode 100644
index 0000000000..0b7a5040ae
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_login.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu_bar name="Login Menu">
+	<menu label="Mig" name="File">
+		<menu_item_call label="Indstillinger" name="Preferences..."/>
+		<menu_item_call label="Afslut [APP_NAME]" name="Quit"/>
+	</menu>
+	<menu label="Hjælp" name="Help">
+		<menu_item_call label="[SECOND_LIFE] hjælp" name="Second Life Help"/>
+		<menu_item_call label="Om [APP_NAME]" name="About Second Life"/>
+	</menu>
+	<menu_item_check label="Vis debug menu" name="Show Debug Menu"/>
+	<menu label="Debug" name="Debug">
+		<menu_item_call label="Vis debug opsætning" name="Debug Settings"/>
+		<menu_item_call label="UI/farve opsætning" name="UI/Color Settings"/>
+		<menu label="UI tests" name="UI Tests"/>
+		<menu_item_call label="Sæt vinduesstørrelse" name="Set Window Size..."/>
+		<menu_item_call label="Vis betingelser" name="TOS"/>
+		<menu_item_call label="Vis vigtig besked" 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"/>
+		<menu_item_check label="Vis gitter vælger" name="Show Grid Picker"/>
+		<menu_item_call label="Vis notifikationskonsol" name="Show Notifications Console"/>
+	</menu>
+</menu_bar>
diff --git a/indra/newview/skins/minimal/xui/da/menu_mini_map.xml b/indra/newview/skins/minimal/xui/da/menu_mini_map.xml
new file mode 100644
index 0000000000..186dbd476a
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_mini_map.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Popup">
+	<menu_item_call label="Zoom tæt" name="Zoom Close"/>
+	<menu_item_call label="Zoom mellem" name="Zoom Medium"/>
+	<menu_item_call label="Zoom langt" name="Zoom Far"/>
+	<menu_item_call label="Zoom standard" name="Zoom Default"/>
+	<menu_item_check label="Rotér kort" name="Rotate Map"/>
+	<menu_item_check label="Auto centrér" name="Auto Center"/>
+	<menu_item_call label="Fjern ref." name="Stop Tracking"/>
+	<menu_item_call label="Verdenskort" name="World Map"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_navbar.xml b/indra/newview/skins/minimal/xui/da/menu_navbar.xml
new file mode 100644
index 0000000000..c04206824a
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_navbar.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Navbar Menu">
+	<menu_item_check label="Vis koordinater" name="Show Coordinates"/>
+	<menu_item_check label="Vis oplysninger om parcel" name="Show Parcel Properties"/>
+	<menu_item_call label="Landemærke" name="Landmark"/>
+	<menu_item_call label="Klip" name="Cut"/>
+	<menu_item_call label="Kopiér" name="Copy"/>
+	<menu_item_call label="Sæt ind" name="Paste"/>
+	<menu_item_call label="Slet" name="Delete"/>
+	<menu_item_call label="Vælg alt" name="Select All"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_nearby_chat.xml b/indra/newview/skins/minimal/xui/da/menu_nearby_chat.xml
new file mode 100644
index 0000000000..be532ad406
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_nearby_chat.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="NearBy Chat Menu">
+	<menu_item_call label="Vis personer tæt på..." name="nearby_people"/>
+	<menu_item_check label="Vis blokeret tekst" name="muted_text"/>
+	<menu_item_check label="Vis venne-ikoner" name="show_buddy_icons"/>
+	<menu_item_check label="Vis navne" name="show_names"/>
+	<menu_item_check label="Vis ikoner og navne" name="show_icons_and_names"/>
+	<menu_item_call label="Font størrelse" name="font_size"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_notification_well_button.xml b/indra/newview/skins/minimal/xui/da/menu_notification_well_button.xml
new file mode 100644
index 0000000000..40b35b5fdd
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+	<menu_item_call label="Luk alle" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_object.xml b/indra/newview/skins/minimal/xui/da/menu_object.xml
new file mode 100644
index 0000000000..ba62ccf90c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_object.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Object Pie">
+	<menu_item_call label="Berør" name="Object Touch">
+		<menu_item_call.on_enable name="EnableTouch" parameter="Berør"/>
+	</menu_item_call>
+	<menu_item_call label="Redigér" name="Edit..."/>
+	<menu_item_call label="Byg" name="Build"/>
+	<menu_item_call label="Åben" name="Open"/>
+	<menu_item_call label="Sid her" name="Object Sit"/>
+	<menu_item_call label="Stå op" name="Object Stand Up"/>
+	<menu_item_call label="Objekt profil" name="Object Inspect"/>
+	<menu_item_call label="Zoom In" name="Zoom In"/>
+	<context_menu label="Tag på" name="Put On">
+		<menu_item_call label="Tag på" name="Wear"/>
+		<menu_item_call label="Tilføj" name="Add"/>
+		<context_menu label="Vedhæft" name="Object Attach"/>
+		<context_menu label="Vedhæft HUD" name="Object Attach HUD"/>
+	</context_menu>
+	<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..."/>
+	</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/minimal/xui/da/menu_object_icon.xml b/indra/newview/skins/minimal/xui/da/menu_object_icon.xml
new file mode 100644
index 0000000000..08aeb633b6
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_object_icon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Object Icon Menu">
+	<menu_item_call label="Objekt Profil..." name="Object Profile"/>
+	<menu_item_call label="Blokér..." name="Block"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_outfit_gear.xml b/indra/newview/skins/minimal/xui/da/menu_outfit_gear.xml
new file mode 100644
index 0000000000..8b4c776496
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_outfit_gear.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Gear Outfit">
+	<menu_item_call label="Tag på - Erstat nuværende sæt" name="wear"/>
+	<menu_item_call label="Tag på - Tilføj til nuværende sæt" name="wear_add"/>
+	<menu_item_call label="Tag af - Fjern fra nuværende sæt" name="take_off"/>
+	<menu label="Nyt tøj" name="New Clothes">
+		<menu_item_call label="Ny trøje" name="New Shirt"/>
+		<menu_item_call label="Nye bukser" name="New Pants"/>
+		<menu_item_call label="Nye sko" name="New Shoes"/>
+		<menu_item_call label="Nye strømper" name="New Socks"/>
+		<menu_item_call label="Ny jakke" name="New Jacket"/>
+		<menu_item_call label="Ny nederdel" name="New Skirt"/>
+		<menu_item_call label="Nye handsker" name="New Gloves"/>
+		<menu_item_call label="Ny undertrøje" name="New Undershirt"/>
+		<menu_item_call label="Nye underbukser" name="New Underpants"/>
+		<menu_item_call label="Ny alpha" name="New Alpha"/>
+		<menu_item_call label="Ny tatovering" name="New Tattoo"/>
+	</menu>
+	<menu label="Nye kropsdele" name="New Body Parts">
+		<menu_item_call label="Ny figur" name="New Shape"/>
+		<menu_item_call label="Nyt hud" name="New Skin"/>
+		<menu_item_call label="Nyt hår" name="New Hair"/>
+		<menu_item_call label="Nye øjne" name="New Eyes"/>
+	</menu>
+	<menu_item_call label="Omdøb sæt" name="rename"/>
+	<menu_item_call label="Slet sæt" name="delete_outfit"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_outfit_tab.xml b/indra/newview/skins/minimal/xui/da/menu_outfit_tab.xml
new file mode 100644
index 0000000000..d6a6f2724f
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_outfit_tab.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Outfit">
+	<menu_item_call label="Tag på - Erstat nuværende sæt" name="wear_replace"/>
+	<menu_item_call label="Tag på - Tilføj til nuværende sæt" name="wear_add"/>
+	<menu_item_call label="Tag af - Fjern fra nuværende sæt" name="take_off"/>
+	<menu_item_call label="Redigér sæt" name="edit"/>
+	<menu_item_call label="Omdøb sæt" name="rename"/>
+	<menu_item_call label="Slet sæt" name="delete"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_participant_list.xml b/indra/newview/skins/minimal/xui/da/menu_participant_list.xml
new file mode 100644
index 0000000000..5951d3ffb9
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_participant_list.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Participant List Context Menu">
+	<menu_item_check label="Sortér efter navn" name="SortByName"/>
+	<menu_item_check label="Sortér efter nylige talere" name="SortByRecentSpeakers"/>
+	<menu_item_call label="Profil" name="View Profile"/>
+	<menu_item_call label="Tilføj ven" name="Add Friend"/>
+	<menu_item_call label="Send besked" name="IM"/>
+	<menu_item_call label="Opkald" name="Call"/>
+	<menu_item_call label="Del" name="Share"/>
+	<menu_item_call label="Betal" name="Pay"/>
+	<menu_item_check label="Se person ikoner" name="View Icons"/>
+	<menu_item_check label="Blokér stemme" name="Block/Unblock"/>
+	<menu_item_check label="Blokér tekst" name="MuteText"/>
+	<context_menu label="Moderator valg" name="Moderator Options">
+		<menu_item_check label="Tillad tekst chat" name="AllowTextChat"/>
+		<menu_item_call label="Sluk for denne deltager" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Fjern slukning for denne deltager" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Sluk lyd for alle" name="ModerateVoiceMute"/>
+		<menu_item_call label="Tænd lyd for alle" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_people_friends_view_sort.xml b/indra/newview/skins/minimal/xui/da/menu_people_friends_view_sort.xml
new file mode 100644
index 0000000000..32c5e6a6c7
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_people_friends_view_sort.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="Sortér efter navn" name="sort_name"/>
+	<menu_item_check label="Sortér efter status" name="sort_status"/>
+	<menu_item_check label="Vis person ikoner" name="view_icons"/>
+	<menu_item_check label="Vis tildelte rettigheder" name="view_permissions"/>
+	<menu_item_call label="Vis blokerede beboere og objekter" name="show_blocked_list"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_people_groups.xml b/indra/newview/skins/minimal/xui/da/menu_people_groups.xml
new file mode 100644
index 0000000000..841f58b619
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_people_groups.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_call label="Se info" name="View Info"/>
+	<menu_item_call label="Chat" name="Chat"/>
+	<menu_item_call label="Opkald" name="Call"/>
+	<menu_item_call label="Aktivér" name="Activate"/>
+	<menu_item_call label="Forlad" name="Leave"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_people_groups_view_sort.xml b/indra/newview/skins/minimal/xui/da/menu_people_groups_view_sort.xml
new file mode 100644
index 0000000000..0b9a791530
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_people_groups_view_sort.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="Vis gruppe ikoner" name="Display Group Icons"/>
+	<menu_item_call label="Forlad valgte gruppe" name="Leave Selected Group"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_people_nearby.xml b/indra/newview/skins/minimal/xui/da/menu_people_nearby.xml
new file mode 100644
index 0000000000..5470c32761
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_people_nearby.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Avatar Context Menu">
+	<menu_item_call label="Profil" name="View Profile"/>
+	<menu_item_call label="Tilføj ven" name="Add Friend"/>
+	<menu_item_call label="Fjern ven" name="Remove Friend"/>
+	<menu_item_call label="Besked" name="IM"/>
+	<menu_item_call label="Opkald" name="Call"/>
+	<menu_item_call label="Kort" name="Map"/>
+	<menu_item_call label="Del" name="Share"/>
+	<menu_item_call label="Betal" name="Pay"/>
+	<menu_item_check label="Blokér/Fjern blokering" name="Block/Unblock"/>
+	<menu_item_call label="Tilbyd teleport" name="teleport"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_people_nearby_multiselect.xml b/indra/newview/skins/minimal/xui/da/menu_people_nearby_multiselect.xml
new file mode 100644
index 0000000000..9318a0e340
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_people_nearby_multiselect.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Multi-Selected People Context Menu">
+	<menu_item_call label="Tilføj venner" name="Add Friends"/>
+	<menu_item_call label="Fjern venner" name="Remove Friend"/>
+	<menu_item_call label="Besked" name="IM"/>
+	<menu_item_call label="Opkald" name="Call"/>
+	<menu_item_call label="Del" name="Share"/>
+	<menu_item_call label="Betal" name="Pay"/>
+	<menu_item_call label="tilbyd teleport" name="teleport"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_people_nearby_view_sort.xml b/indra/newview/skins/minimal/xui/da/menu_people_nearby_view_sort.xml
new file mode 100644
index 0000000000..2f35ff3c92
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_people_nearby_view_sort.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="Sortér efter tidligere talere" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Sortér efter navn" name="sort_name"/>
+	<menu_item_check label="Sortér efter afstand" name="sort_distance"/>
+	<menu_item_check label="Se ikoner for personer" name="view_icons"/>
+	<menu_item_call label="Vis blokerede beboere og objekter" name="show_blocked_list"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_people_recent_view_sort.xml b/indra/newview/skins/minimal/xui/da/menu_people_recent_view_sort.xml
new file mode 100644
index 0000000000..d081f637f2
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_people_recent_view_sort.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="Sortér efter nyeste" name="sort_most"/>
+	<menu_item_check label="Sortér efter navn" name="sort_name"/>
+	<menu_item_check label="Vis person ikoner" name="view_icons"/>
+	<menu_item_call label="Vis blokerede beboere og objekter" name="show_blocked_list"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_picks.xml b/indra/newview/skins/minimal/xui/da/menu_picks.xml
new file mode 100644
index 0000000000..81ee900773
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_picks.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Picks">
+	<menu_item_call label="Info" name="pick_info"/>
+	<menu_item_call label="Redigér" name="pick_edit"/>
+	<menu_item_call label="Teleportér" name="pick_teleport"/>
+	<menu_item_call label="Vis på kort" name="pick_map"/>
+	<menu_item_call label="Slet" name="pick_delete"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_picks_plus.xml b/indra/newview/skins/minimal/xui/da/menu_picks_plus.xml
new file mode 100644
index 0000000000..d95071fbbb
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_picks_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="picks_plus_menu">
+	<menu_item_call label="Ny favorit" name="create_pick"/>
+	<menu_item_call label="Ny annonce" name="create_classified"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_place.xml b/indra/newview/skins/minimal/xui/da/menu_place.xml
new file mode 100644
index 0000000000..b87964ac14
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_place.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="place_overflow_menu">
+	<menu_item_call label="Opret et landemærke" name="landmark"/>
+	<menu_item_call label="Opret favorit" name="pick"/>
+	<menu_item_call label="Køb adgang" name="pass"/>
+	<menu_item_call label="Redigér" name="edit"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_place_add_button.xml b/indra/newview/skins/minimal/xui/da/menu_place_add_button.xml
new file mode 100644
index 0000000000..7ad2253550
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_place_add_button.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_folder_gear">
+	<menu_item_call label="Opret mappe" name="add_folder"/>
+	<menu_item_call label="Tilføj landemærke" name="add_landmark"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_places_gear_folder.xml b/indra/newview/skins/minimal/xui/da/menu_places_gear_folder.xml
new file mode 100644
index 0000000000..5f573c2363
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_places_gear_folder.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<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"/>
+	<menu_item_call label="Omdøb" name="rename"/>
+	<menu_item_call label="Slet" name="delete"/>
+	<menu_item_call label="Udvid" name="expand"/>
+	<menu_item_call label="Luk" name="collapse"/>
+	<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"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_places_gear_landmark.xml b/indra/newview/skins/minimal/xui/da/menu_places_gear_landmark.xml
new file mode 100644
index 0000000000..13dbcdd42e
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_places_gear_landmark.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<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"/>
+	<menu_item_call label="Sæt ind" name="paste"/>
+	<menu_item_call label="Omdøb" name="rename"/>
+	<menu_item_call label="Slet" name="delete"/>
+	<menu_item_call label="Åben 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_item_call label="Opret favorit" name="create_pick"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_profile_overflow.xml b/indra/newview/skins/minimal/xui/da/menu_profile_overflow.xml
new file mode 100644
index 0000000000..6745007c99
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_profile_overflow.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="profile_overflow_menu">
+	<menu_item_call label="Kort" name="show_on_map"/>
+	<menu_item_call label="Betal" name="pay"/>
+	<menu_item_call label="Del" name="share"/>
+	<menu_item_call label="Blokér" name="block"/>
+	<menu_item_call label="Fjern blokering" name="unblock"/>
+	<menu_item_call label="Spark" name="kick"/>
+	<menu_item_call label="Frys" name="freeze"/>
+	<menu_item_call label="Fjern frys" name="unfreeze"/>
+	<menu_item_call label="Kundeservicemedarbejder (CSR)" name="csr"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_save_outfit.xml b/indra/newview/skins/minimal/xui/da/menu_save_outfit.xml
new file mode 100644
index 0000000000..188229b586
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_save_outfit.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="save_outfit_menu">
+	<menu_item_call label="Gem" name="save_outfit"/>
+	<menu_item_call label="Gem som" name="save_as_new_outfit"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_script_chiclet.xml b/indra/newview/skins/minimal/xui/da/menu_script_chiclet.xml
new file mode 100644
index 0000000000..cdd3212373
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_script_chiclet.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="ScriptChiclet Menu">
+	<menu_item_call label="Luk" name="Close"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_slurl.xml b/indra/newview/skins/minimal/xui/da/menu_slurl.xml
new file mode 100644
index 0000000000..a9302e111e
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_slurl.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Popup">
+	<menu_item_call label="Om URL" name="about_url"/>
+	<menu_item_call label="Teleportér til URL" name="teleport_to_url"/>
+	<menu_item_call label="Kort" name="show_on_map"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_teleport_history_gear.xml b/indra/newview/skins/minimal/xui/da/menu_teleport_history_gear.xml
new file mode 100644
index 0000000000..a1c25fea69
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_teleport_history_gear.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Teleport History Gear Context Menu">
+	<menu_item_call label="Udvid alle mapper" name="Expand all folders"/>
+	<menu_item_call label="Luk alle mapper" name="Collapse all folders"/>
+	<menu_item_call label="Nulstil teleport historik" name="Clear Teleport History"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_teleport_history_item.xml b/indra/newview/skins/minimal/xui/da/menu_teleport_history_item.xml
new file mode 100644
index 0000000000..dbaec62087
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_teleport_history_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Teleport History Item Context Menu">
+	<menu_item_call label="Teleportér" name="Teleport"/>
+	<menu_item_call label="Mere information" name="More Information"/>
+	<menu_item_call label="Kopiér til udklipsholder" name="CopyToClipboard"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_teleport_history_tab.xml b/indra/newview/skins/minimal/xui/da/menu_teleport_history_tab.xml
new file mode 100644
index 0000000000..c4d4bb4b5b
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_teleport_history_tab.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Teleport History Item Context Menu">
+	<menu_item_call label="Åben" name="TabOpen"/>
+	<menu_item_call label="Luk" name="TabClose"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_text_editor.xml b/indra/newview/skins/minimal/xui/da/menu_text_editor.xml
new file mode 100644
index 0000000000..3ff31ea232
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_text_editor.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Text editor context menu">
+	<menu_item_call label="Klip" name="Cut"/>
+	<menu_item_call label="Kopiér" name="Copy"/>
+	<menu_item_call label="Sæt ind" name="Paste"/>
+	<menu_item_call label="Slet" name="Delete"/>
+	<menu_item_call label="Vælg alt" name="Select All"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_topinfobar.xml b/indra/newview/skins/minimal/xui/da/menu_topinfobar.xml
new file mode 100644
index 0000000000..08d1c25d6f
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_topinfobar.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_topinfobar">
+	<menu_item_check label="Vis koordinater" name="Show Coordinates"/>
+	<menu_item_check label="Vis egenskaber for parcel" name="Show Parcel Properties"/>
+	<menu_item_call label="Landemærke" name="Landmark"/>
+	<menu_item_call label="Kopi" name="Copy"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_url_agent.xml b/indra/newview/skins/minimal/xui/da/menu_url_agent.xml
new file mode 100644
index 0000000000..491586f3b4
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_url_agent.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Vis beboer profil" name="show_agent"/>
+	<menu_item_call label="Kopiér navn til udklipsholder" name="url_copy_label"/>
+	<menu_item_call label="Kopiér  SLurl til udklipsholder" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_url_group.xml b/indra/newview/skins/minimal/xui/da/menu_url_group.xml
new file mode 100644
index 0000000000..c776159b0a
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_url_group.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Vis gruppeinformation" name="show_group"/>
+	<menu_item_call label="Kopiér gruppe til udklipsholder" name="url_copy_label"/>
+	<menu_item_call label="Kopiér SLurl til udklipsholder" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_url_http.xml b/indra/newview/skins/minimal/xui/da/menu_url_http.xml
new file mode 100644
index 0000000000..4398777a39
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_url_http.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Indlæs" name="url_open"/>
+	<menu_item_call label="Åben i intern browser" name="url_open_internal"/>
+	<menu_item_call label="Åben i ekstern browser" name="url_open_external"/>
+	<menu_item_call label="Kopiér URL til udklipsholder" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_url_inventory.xml b/indra/newview/skins/minimal/xui/da/menu_url_inventory.xml
new file mode 100644
index 0000000000..9a7de23e06
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_url_inventory.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Vis beholdningsgenstand" name="show_item"/>
+	<menu_item_call label="Kopiér navn til udklipsholder" name="url_copy_label"/>
+	<menu_item_call label="Kopiér SLurl til udklipsholder" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_url_map.xml b/indra/newview/skins/minimal/xui/da/menu_url_map.xml
new file mode 100644
index 0000000000..ff4a4d5174
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_url_map.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Vis på kort" name="show_on_map"/>
+	<menu_item_call label="Teleport til lokation" name="teleport_to_location"/>
+	<menu_item_call label="Kopiér SLurl til udklipsholder" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_url_objectim.xml b/indra/newview/skins/minimal/xui/da/menu_url_objectim.xml
new file mode 100644
index 0000000000..e27cf84959
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_url_objectim.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Vis objekt information" name="show_object"/>
+	<menu_item_call label="Vis på kort" name="show_on_map"/>
+	<menu_item_call label="Teleportér til objekt lokation" name="teleport_to_object"/>
+	<menu_item_call label="Kopiér objekt navn til udklipsholder" name="url_copy_label"/>
+	<menu_item_call label="Kopiér SLurl til udklipsholder" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_url_parcel.xml b/indra/newview/skins/minimal/xui/da/menu_url_parcel.xml
new file mode 100644
index 0000000000..0f21e14f66
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_url_parcel.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Vis information om parcel" name="show_parcel"/>
+	<menu_item_call label="Vis på kort" name="show_on_map"/>
+	<menu_item_call label="Kopiér SLurl til udklipsholder" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_url_slapp.xml b/indra/newview/skins/minimal/xui/da/menu_url_slapp.xml
new file mode 100644
index 0000000000..dd25db2aa7
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_url_slapp.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Kør denne kommando" name="run_slapp"/>
+	<menu_item_call label="Kopiér SLurl til udklipsholder" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_url_slurl.xml b/indra/newview/skins/minimal/xui/da/menu_url_slurl.xml
new file mode 100644
index 0000000000..8d84a138bb
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_url_slurl.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Vis information" name="show_place"/>
+	<menu_item_call label="Vis på kort" name="show_on_map"/>
+	<menu_item_call label="Teleportér til lokation" name="teleport_to_location"/>
+	<menu_item_call label="Kopiér SLurl til udklipsholder" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_url_teleport.xml b/indra/newview/skins/minimal/xui/da/menu_url_teleport.xml
new file mode 100644
index 0000000000..e0ca7b920d
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_url_teleport.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Teleport" name="teleport"/>
+	<menu_item_call label="Vis på kort" name="show_on_map"/>
+	<menu_item_call label="Kopiér SLurl til udklipsholder" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_viewer.xml b/indra/newview/skins/minimal/xui/da/menu_viewer.xml
new file mode 100644
index 0000000000..93b247f841
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_viewer.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu_bar name="Main Menu">
+	<menu label="Hjælp" name="Help">
+		<menu_item_call label="[SECOND_LIFE] Help" name="Second Life Help"/>
+	</menu>
+	<menu label="Avanceret" name="Advanced">
+		<menu label="Shortcuts" name="Shortcuts">
+			<menu_item_check label="Flyv" name="Fly"/>
+			<menu_item_call label="Luk vindue" name="Close Window"/>
+			<menu_item_call label="Luk alle vinduer" name="Close All Windows"/>
+			<menu_item_call label="Nulstil udsyn" name="Reset View"/>
+		</menu>
+	</menu>
+</menu_bar>
diff --git a/indra/newview/skins/minimal/xui/da/menu_wearable_list_item.xml b/indra/newview/skins/minimal/xui/da/menu_wearable_list_item.xml
new file mode 100644
index 0000000000..63f4b0b388
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_wearable_list_item.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Outfit Wearable Context Menu">
+	<menu_item_call label="Erstat" name="wear_replace"/>
+	<menu_item_call label="Tag på" name="wear_wear"/>
+	<menu_item_call label="Tilføj" name="wear_add"/>
+	<menu_item_call label="Tag af" name="take_off_or_detach"/>
+	<menu_item_call label="Tag af" name="detach"/>
+	<context_menu label="Vedhæft til" name="wearable_attach_to"/>
+	<context_menu label="Vedhæft til HUD" name="wearable_attach_to_hud"/>
+	<menu_item_call label="Tag af" name="take_off"/>
+	<menu_item_call label="Redigér" name="edit"/>
+	<menu_item_call label="Genstandsprofil" name="object_profile"/>
+	<menu_item_call label="Vis original" name="show_original"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_wearing_gear.xml b/indra/newview/skins/minimal/xui/da/menu_wearing_gear.xml
new file mode 100644
index 0000000000..515a15b287
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_wearing_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Gear Wearing">
+	<menu_item_call label="Redigér sæt" name="edit"/>
+	<menu_item_call label="Tag af" name="takeoff"/>
+</menu>
diff --git a/indra/newview/skins/minimal/xui/da/menu_wearing_tab.xml b/indra/newview/skins/minimal/xui/da/menu_wearing_tab.xml
new file mode 100644
index 0000000000..c0db7b6842
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/menu_wearing_tab.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Wearing">
+	<menu_item_call label="Tag af" name="take_off"/>
+	<menu_item_call label="Tag af" name="detach"/>
+	<menu_item_call label="Redigér sæt" name="edit"/>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/da/notifications.xml b/indra/newview/skins/minimal/xui/da/notifications.xml
new file mode 100644
index 0000000000..0d2aaf45ce
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/notifications.xml
@@ -0,0 +1,1833 @@
+<?xml version="1.0" encoding="utf-8"?>
+<notifications>
+	<global name="skipnexttime">
+		Vis ikke dette igen
+	</global>
+	<global name="alwayschoose">
+		Vælg altid dette
+	</global>
+	<global name="implicitclosebutton">
+		Luk
+	</global>
+	<template name="okbutton">
+		<form>
+			<button name="OK_okbutton" text="$yestext"/>
+		</form>
+	</template>
+	<template name="okignore">
+		<form>
+			<button name="OK_okignore" text="$yestext"/>
+		</form>
+	</template>
+	<template name="okcancelbuttons">
+		<form>
+			<button name="OK_okcancelbuttons" text="$yestext"/>
+			<button name="Cancel_okcancelbuttons" text="$notext"/>
+		</form>
+	</template>
+	<template name="okcancelignore">
+		<form>
+			<button name="OK_okcancelignore" text="$yestext"/>
+			<button name="Cancel_okcancelignore" text="$notext"/>
+		</form>
+	</template>
+	<template name="okhelpbuttons">
+		<form>
+			<button name="OK_okhelpbuttons" text="$yestext"/>
+			<button name="Help" text="$helptext"/>
+		</form>
+	</template>
+	<template name="yesnocancelbuttons">
+		<form>
+			<button name="Yes" text="$yestext"/>
+			<button name="No" text="$notext"/>
+			<button name="Cancel_yesnocancelbuttons" text="$canceltext"/>
+		</form>
+	</template>
+	<notification functor="GenericAcknowledge" label="Ukendt notificeringsbesked" name="MissingAlert">
+		Din version af [APP_NAME] kan ikke vise den besked den lige modtog.  Undersøg venligst at du har den nyester version af klienten installeret.
+
+Fejl detaljer: Beskeden kaldet &apos;[_NAME]&apos; blev ikke fundet i notifications.xml.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="FloaterNotFound">
+		Floater error: Kunne ikke finde følgende kontrol:
+
+[CONTROLS]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TutorialNotFound">
+		Der er i øjeblikket ingen tilgængelig guide.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="GenericAlert">
+		[MESSAGE]
+	</notification>
+	<notification name="GenericAlertYesCancel">
+		[MESSAGE]
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="Ja"/>
+	</notification>
+	<notification name="BadInstallation">
+		Der opstod en fejl ved opdatering af [APP_NAME].  Please [http://get.secondlife.com download the latest version] of the Viewer.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="LoginFailedNoNetwork">
+		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">
+		Besked template [PATH] kunne ikke findes.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="WearableSave">
+		Gem ændringer til nuværende tøj/krops del?
+		<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Gem ikke" yestext="Gem"/>
+	</notification>
+	<notification name="CompileQueueSaveText">
+		Der var problemer med upload af teksten til et script af følgende årsager: [REASON]. Prøv igen senere.
+	</notification>
+	<notification name="CompileQueueSaveBytecode">
+		Der var problemer med at uploade den kompileret script af følgende årsager: [REASON]. Prøv igen senere.
+	</notification>
+	<notification name="WriteAnimationFail">
+		Der var et problem med skrivning af animations data. Prøv igen senere.
+	</notification>
+	<notification name="UploadAuctionSnapshotFail">
+		Der var problemer med at uploade billedet til auktionen af følgende årsager: [REASON]
+	</notification>
+	<notification name="UnableToViewContentsMoreThanOne">
+		Ude af stand til at se indholdet af mere end ét element ad gangen.
+Vælg kun en genstand, og prøv igen.
+	</notification>
+	<notification name="SaveClothingBodyChanges">
+		Gem alle ændringer til tøj/krops dele?
+		<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Gem Ikke" yestext="Gem Alt"/>
+	</notification>
+	<notification name="FriendsAndGroupsOnly">
+		&apos;Ikke-venner&apos; vil ikke vide, at du har valgt at ignorere deres opkald og personlige beskeder (IM)
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="FavoritesOnLogin">
+		Bemærk: Når du aktiverer dette valg, kan enhver der bruger denne computer se dine favorit lokationer.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="GrantModifyRights">
+		Tildeling af ændre-rettigheder til andre beboere, tillader dem at ændre, slette eller tage ETHVERT objekt du måtte have. Vær MEGET forsigtig ved tildeling af denne rettighed.
+Ønsker du at give ændre-rettgheder til [NAME]?
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="GrantModifyRightsMultiple">
+		At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage ALLE genstande, du måtte have i verden. Vær MEGET forsigtig når uddeler denne tilladelse.
+Ønsker du at ændre rettigheder for de valgte beboere?
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="RevokeModifyRights">
+		Ønsker du at tilbagekalder ændre-rettigheder for [NAME]?
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="RevokeModifyRightsMultiple">
+		Vil du tilbagekalde rettighederne for de valgte beboere?
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="UnableToCreateGroup">
+		Kunne ikke oprette gruppe.
+[MESSAGE]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PanelGroupApply">
+		[NEEDS_APPLY_MESSAGE]
+[WANT_APPLY_MESSAGE]
+		<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Ignorer Ændringer" yestext="Godkend Ændringer"/>
+	</notification>
+	<notification name="MustSpecifyGroupNoticeSubject">
+		Du skal angive et emne for at sende en gruppe besked.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="AddGroupOwnerWarning">
+		Du er ved at tilføje medlemmer til rollen som [ROLE_NAME].
+Medlemmer ikke kan fjernes fra denne rolle.
+Medlemmerne skal fratræde sin rolle selv.
+Er du sikker på du vil fortsætte?
+		<usetemplate ignoretext="Bekræft, før jeg tilføjer en ny gruppe ejer" name="okcancelignore" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="AssignDangerousActionWarning">
+		Du er ved at tilføje muligheden for &apos;[ACTION_NAME]&apos; til
+rollen &apos;[ROLE_NAME]&apos;.
+
+*ADVARSEL*
+Ethvert medlem i en rolle med denne evne kan tildele sig selv -- og et andet medlem - roller med flere beføjelser, end de har i øjeblikket, potentielt kan de ophøje sig selv til nær-Ejer magt. Være sikker på, at du ved, hvad du laver, før tildeling af denne evne.
+
+Add this Ability to &apos;[ROLE_NAME]&apos;?
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="AttachmentDrop">
+		Du er ved at smide et vedhæng.
+    Er du sikker på at du vil fortsætte?
+		<usetemplate ignoretext="Bekræft før vedhæng smides" name="okcancelignore" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="JoinGroupNoCost">
+		Du melder dig ind i gruppen [NAME].
+Ønsker du at fortsætte?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="Bliv medlem"/>
+	</notification>
+	<notification name="JoinGroupCannotAfford">
+		Tilmelding til denne gruppe koster L$[COST].
+Du har ikke nok L$ til denne tilmelding.
+	</notification>
+	<notification name="CreateGroupCost">
+		Oprettelse af denne gruppe vil koste L$100.
+Grupper skal have mindst 2 medlemmer, ellers slettes de for altid.
+Invitér venligst medlemmer indenfor 48 timer.
+		<usetemplate canceltext="Annullér" name="okcancelbuttons" notext="Annullér" yestext="Oprete en gruppe for L$100"/>
+	</notification>
+	<notification name="ConfirmLandSaleToAnyoneChange">
+		ADVARSEL: Ved at vælge &apos;sælg til enhver&apos; bliver til land tilgængeligt for alle i hele [SECOND_LIFE], også de som ikke er i denne region.
+
+Det valgte antal [LAND_SIZE] m² land bliver sat til salg.
+Salgprisen vil være [SALE_PRICE]L$ og vil være til salg til [NAME].
+	</notification>
+	<notification name="MultipleFacesSelected">
+		Flere overflader er valgt for øjeblikket.
+Hvis du fortsætter med denne aktion, vil flere instanser af media blive vist på overfladerne på objektet.
+Hvis media kun skal vises på en overflade, vælg &apos;Vælg overflade&apos; og klik på den relevante overflade  og klik på tilføj.
+		<usetemplate ignoretext="Media vil blive sat på flere valgte overflader" name="okcancelignore" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification name="PromptMissingSubjMsg">
+		E-mail dette billede med standard emne eller besked?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification name="ErrorUploadingPostcard">
+		Der var et problem med at sende billedet på grund af følgende: [REASON]
+	</notification>
+	<notification name="MaxAttachmentsOnOutfit">
+		Kunne ikke vedhæfte objekt.
+Overskrider vedhæftnings begrænsning på [MAX_ATTACHMENTS] objekter. Tag venligst en anden vedhæftning af først.
+	</notification>
+	<notification name="MustHaveAccountToLogIn">
+		Ups. Noget mangler at blive udfyldt.
+Du skal indtaste brugernavnet for din avatar.
+
+Du skal bruge en konto for at benytte [SECOND_LIFE]. Ønsker du at oprette en konto nu?
+		<usetemplate name="okcancelbuttons" notext="Prøv igen" yestext="Lav ny konto"/>
+	</notification>
+	<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="DeleteMedia">
+		Du har valgt at slette media tilknyttet denne overflade.
+Er du sikker på at du vil fortsætte?
+		<usetemplate ignoretext="Bekræft før jeg slette media i et objekt" name="okcancelignore" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="ClassifiedInsufficientFunds">
+		Ikke nok penge til at oprette annonce.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="DeleteAvatarPick">
+		Slet favorit &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
+	</notification>
+	<notification name="DeleteOutfits">
+		Slet valgte sæt?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification name="CacheWillClear">
+		Cache vil blive tømt ved næste genstart af [APP_NAME].
+	</notification>
+	<notification name="CacheWillBeMoved">
+		Cache vil blive fjernet ved næste genstart af [APP_NAME].
+Note: This will clear the cache.
+	</notification>
+	<notification name="ChangeConnectionPort">
+		Port ændringer vil blive effektueret ved næste genstart af [APP_NAME].
+	</notification>
+	<notification name="ChangeSkin">
+		Den nye hud vil blive vist ved næste genstart af [APP_NAME].
+	</notification>
+	<notification name="ChangeLanguage">
+		Ændring af sprog vil først have effekt efter genstart af [APP_NAME].
+	</notification>
+	<notification name="StartRegionEmpty">
+		Ups, din start region er ikke angivet.
+Indtast venligst navn på region i Start lokation feltet eller vælg &quot;Min sidste lokation&quot; eller &quot;Hjem&quot;.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UnsupportedHardware">
+		Din computer opfylder ikke minimumskravene til [APP_NAME]. Du kan risikere nedsat hastighed. Desværre kan [SUPPORT_SITE] ikke tilbyde teknisk support til konfigurationer der ikke er understøttet.
+
+Besøg [_URL] for yderligere information?
+		<usetemplate ignoretext="Din computer hardware understøttes ikke" name="okcancelignore" notext="No" yestext="Yes"/>
+	</notification>
+	<notification name="UnknownGPU">
+		Dit system indeholder et grafikkort som [APP_NAME] ikke kan genkende.
+Dette skyldes ofte nyt hardware som endnu ikke er blevet testet med [APP_NAME].  Kortet vil sandsynligvis virke fint, med det kan være nødvendigt at justere grafik opsætningen.
+(Mig &gt; Indstillinger &gt; Grafik).
+		<form name="form">
+			<ignore name="ignore" text="Dit grafikkort kunne ikke identificeres"/>
+		</form>
+	</notification>
+	<notification name="DisplaySettingsNoShaders">
+		[APP_NAME] gik ned ved inititalisering af grafik drivere.
+Grafik kvaliteten sættes til &apos;lav&apos; for at undgå typiske problemer med drivere. Dette vil slå visse grafik funktioner fra.
+Vi anbefaler at opdatere driverne til dit grafikkort.
+Grafik kvaliteten kan forbedres i indstillinger &gt; Grafik.
+	</notification>
+	<notification name="CannotCopyWarning">
+		Du har ikke rettigheder til at kopiere følgende genstande:
+[ITEMS]
+og du vil miste dem fra din beholdning hvis du forærer dem væk. Er du sikker på at du vil tilbyde disse genstande?
+	</notification>
+	<notification name="CannotGiveCategory">
+		Du har ikke tilladelse til at videreføre den valgte mappe.
+	</notification>
+	<notification name="EjectAvatarFromGroup">
+		Du har smidt [AVATAR_NAME] ud af gruppen [GROUP_NAME]
+	</notification>
+	<notification name="PromptGoToCurrencyPage">
+		[EXTRA]
+
+Gå til [_URL] for information om køb af L$?
+	</notification>
+	<notification name="SoundFileInvalidChunkSize">
+		Fejl i WAV fil (chunk size):
+[FILE]
+	</notification>
+	<notification name="CannotEncodeFile">
+		Kunne ikke &apos;forstå&apos; filen: [FILE]
+	</notification>
+	<notification name="CorruptedProtectedDataStore">
+		Vi kan ikke udfylde dit brugernavn og password.  Dette kan ske hvis du ændrer netværksopsætning
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="DoNotSupportBulkAnimationUpload">
+		[APP_NAME] understøtter p.t. ikke at send flere animationsfiler ad gangen.
+	</notification>
+	<notification name="LandmarkCreated">
+		Du har tilføjet &quot;[LANDMARK_NAME]&quot; til din [FOLDER_NAME] mappe.
+	</notification>
+	<notification name="LandmarkAlreadyExists">
+		Du har allerede et landemærke for denne lokation.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="CannotOpenScriptObjectNoMod">
+		Ikke muligt at åbne script i objekt uden &apos;Redigére&apos; rettigheder.
+	</notification>
+	<notification name="CouldNotTeleportReason">
+		Teleport fejlede.
+[REASON]
+	</notification>
+	<notification name="invalid_tport">
+		Der opstod et problem ved din teleport. Det kan være nødvendigt at logge ind igen, før du kan teleporte.
+Hvis du bliver ved med at få denne fejl, check venligst [SUPPORT_SITE].
+	</notification>
+	<notification name="invalid_region_handoff">
+		Der opstod et problem ved skift til ny region. Det kan være nødvendigt at logge ind igen, før du kan skifte til andre regioner.
+Hvis du bliver ved med at få denne fejl, check venligst [SUPPORT_SITE].
+	</notification>
+	<notification name="blocked_tport">
+		Beklager, teleport er blokeret lige nu. Prøv igen senere.
+Hvis du stadig ikke kan teleporte, prøv venligst at logge ud og ligge ind for at løse dette problem.
+	</notification>
+	<notification name="nolandmark_tport">
+		Beklager, systemet kunne ikke finde landmærke destinationen.
+	</notification>
+	<notification name="timeout_tport">
+		Beklager, systemet kunne ikke fuldføre teleport forbindelse.
+Prøv igen om lidt.
+	</notification>
+	<notification name="noaccess_tport">
+		Beklager, du har ikke adgang til denne teleport destination.
+	</notification>
+	<notification name="missing_attach_tport">
+		Dine vedhæng er ikke ankommet endnu. Prøv at vente lidt endnu eller log ud og ind igen før du prøver at teleporte igen.
+	</notification>
+	<notification name="too_many_uploads_tport">
+		Tekniske problemer hindrer at din teleport kan gennemføres.
+Prøv venligst igen om lidt eller vælg et mindre travlt område.
+	</notification>
+	<notification name="expired_tport">
+		Beklager, men systemet kunne ikke fuldføre din teleport i rimelig tid. Prøv venligst igen om lidt.
+	</notification>
+	<notification name="expired_region_handoff">
+		Beklager, men systemet kunne ikke fuldføre skift til anden region i rimelig tid. Prøv venligst igen om lidt.
+	</notification>
+	<notification name="no_host">
+		Ikke muligt at fine teleport destination. Destinationen kan være midlertidig utilgængelig eller findes ikke mere. 
+Prøv evt. igen om lidt.
+	</notification>
+	<notification name="no_inventory_host">
+		Beholdningssystemet er ikke tilgængelig lige nu.
+	</notification>
+	<notification name="ForceOwnerAuctionWarning">
+		Denne parcel er sat på auktion. Gennemtving ejerskab vil annullere denne auktion og måske irritere nogen beboere hvis bud allerede er afgivet.
+Gennemtving ejerskab?
+	</notification>
+	<notification name="CannotBuyLandNoRegion">
+		Ikke i stand til at købe land:
+Kan ikke finde region som dette land er i.
+	</notification>
+	<notification name="CannotCloseFloaterBuyLand">
+		Du kan ikke lukke &apos;Køb land&apos; vinduet før [APP_NAME] har vurderet en pris på denne transaktion.
+	</notification>
+	<notification name="CannotDeedLandNoRegion">
+		Land kunne ikke dedikeres:
+Kunne ikke finde den region land ligger i.
+	</notification>
+	<notification name="CannotReleaseLandRegionNotFound">
+		Kunne ikke efterlade land:
+Kan ikke finde den region landet ligger i.
+	</notification>
+	<notification name="CannotDivideLandNoRegion">
+		Kunne ikke opdele land:
+Kan ikke finde den region landet ligger i.
+	</notification>
+	<notification name="CannotJoinLandNoRegion">
+		Kunne ikke opdele land:
+Kan ikke finde den region landet ligger i.
+	</notification>
+	<notification name="CannotSaveToAssetStore">
+		Kunne ikke gemme [NAME] i den centrale database.
+Dette er typisk en midlertidig fejl. Venligst rediger og gem igen om et par minutter.
+	</notification>
+	<notification name="YouHaveBeenLoggedOut">
+		Du er blevet logget af [SECOND_LIFE]
+            [MESSAGE]
+		<usetemplate name="okcancelbuttons" notext="Afslut" yestext="Se PB &amp; Chat"/>
+	</notification>
+	<notification label="Tilføj ven" name="AddFriendWithMessage">
+		Venner kan give tilladelse til at følge hinanden
+på Verdenskortet eller modtage status opdateringer.
+
+Tilbyd venskab til [NAME]?
+		<form name="form">
+			<input name="message">
+				Vil du være min ven?
+			</input>
+			<button name="Offer" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification label="Gem sæt" name="SaveOutfitAs">
+		Gem det som jeg har på som nyt sæt:
+		<form name="form">
+			<input name="message">
+				[DESC] (ny)
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification label="Gem" name="SaveWearableAs">
+		Gem genstand til beholdning som:
+		<form name="form">
+			<input name="message">
+				[DESC] (ny)
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification label="Omdøb sæt" name="RenameOutfit">
+		Nyt navn til sæt:
+		<form name="form">
+			<input name="new_name">
+				[NAME]
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="RemoveFromFriends">
+		Ønsker du at fjerne [NAME] fra din venneliste?
+	</notification>
+	<notification name="ConfirmItemDeleteHasLinks">
+		Mindst en af genstandene har lænkede genstande der peger på den. Hvis du sletter denne genstand, vil lænkninger ikke virke mere.  Det anbefales kraftigt at fjerne lænkninger først.
+
+Er du sikker på at du vil slette disse genstande?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification name="DeedLandToGroupWithContribution">
+		Ved at dedikere denne parcel, vil gruppen skulle have og vedblive med at have nok kreditter til brug af land.
+Dedikeringen vil inkludere samtidige bidrag til gruppen fra &apos;[NAME]&apos;.
+Købsprisen for dette land er ikke refunderet til ejeren. Hvis en dedikeret parvel sælges, vil salgsprisen blive delt ligeligt mellem gruppe medlemmerne.
+
+Dediker disse [AREA] m² land til gruppen &apos;[GROUP_NAME]&apos;?
+	</notification>
+	<notification name="ErrorMessage">
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="AvatarMovedDesired">
+		Den ønskede lokation er ikke tilgængelig lige nu.
+Du er blevet flyttet til en region in nærheden.
+	</notification>
+	<notification name="AvatarMovedLast">
+		Din sidste lokation er ikke tilgængelig for øjeblikket.
+Du er blevet flyttet til en region in nærheden.
+	</notification>
+	<notification name="AvatarMovedHome">
+		Din hjemme lokation er ikke tilgængelig for øjeblikket.
+Du er blevet flyttet til en region in nærheden.
+Du kan måske ønske at sætte en ny hjemme lokation.
+	</notification>
+	<notification name="ClothingLoading">
+		Dit tøj hentes stadig ned.
+Du kan bruge [SECOND_LIFE] normalt og andre personer vil se dig korrekt.
+		<form name="form">
+			<ignore name="ignore" text="Det tager lang tid at hente tøj"/>
+		</form>
+	</notification>
+	<notification name="FirstRun">
+		[APP_NAME] installationen er færdig.
+
+Hvis det er første gang du bruger [SECOND_LIFE], skal du først oprette en konto for at logge på.
+Vend tilbage til [http://join.secondlife.com secondlife.com] for at oprette en ny konto?
+	</notification>
+	<notification name="LoginPacketNeverReceived">
+		Der er problemer med at koble på.  Der kan være et problem med din Internet forbindelse eller [SECOND_LIFE_GRID].
+
+Du kan enten checke din Internet forbindelse og prøve igen om lidt, klikke på Hjælp for at se [SUPPORT_SITE] siden, eller klikke på Teleport for at forsøge at teleportere hjem.
+	</notification>
+	<notification name="CantTeleportToGrid">
+		Kunne ikke teleportere til [SLURL] da den er på et andet net ([GRID]) end det nuværende net ([CURRENT_GRID]).  Luk venligst din klient og prøv igen.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="GeneralCertificateError">
+		Kunne ikke opnå forbindelse til server.
+[REASON]
+
+Vedrørende: [SUBJECT_NAME_STRING]
+Fra: [ISSUER_NAME_STRING]
+Valid fra: [VALID_FROM]
+Valid til: [VALID_TO]
+MD5 Fingerprint: [SHA1_DIGEST]
+SHA1 Fingerprint: [MD5_DIGEST]
+Key Usage: [KEYUSAGE]
+Extended Key Usage: [EXTENDEDKEYUSAGE]
+Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TrustCertificateError">
+		Certifikationsmyndighed for denne server er ikke kendt.
+
+Certifikat information:
+Vedrørende: [SUBJECT_NAME_STRING]
+Fra: [ISSUER_NAME_STRING]
+Valid fra: [VALID_FROM]
+Valid til: [VALID_TO]
+MD5 Fingerprint: [SHA1_DIGEST]
+SHA1 Fingerprint: [MD5_DIGEST]
+Key Usage: [KEYUSAGE]
+Extended Key Usage: [EXTENDEDKEYUSAGE]
+Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
+
+Ønsker du at stole på denne myndighed?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="Stol på"/>
+	</notification>
+	<notification name="NotEnoughCurrency">
+		[NAME] L$ [PRICE] Du har ikke nok L$ til dette.
+	</notification>
+	<notification name="GrantedModifyRights">
+		[NAME] har givet dig rettighed til at redigere sine objekter.
+	</notification>
+	<notification name="RevokedModifyRights">
+		Dinne rettigheder til at redigere objekter ejet af [NAME] er fjernet
+	</notification>
+	<notification name="BuyOneObjectOnly">
+		Ikke muligt at købe mere end et objekt ad gangen. Vælg kun ét objekt og prøv igen.
+	</notification>
+	<notification name="DownloadWindowsMandatory">
+		En ny version af [APP_NAME] er tilgængelig.
+[MESSAGE]
+Du skal hente denne version for at bruge [APP_NAME].
+	</notification>
+	<notification name="DownloadWindows">
+		En opdateret version af [APP_NAME] er tilgængelig.
+[MESSAGE]
+Denne opdatering er ikke påkrævet, men det anbefales at installere den for at opnå øget hastighed og forbedret stabilitet.
+	</notification>
+	<notification name="DownloadWindowsReleaseForDownload">
+		En opdateret version af [APP_NAME] er tilgængelig.
+[MESSAGE]
+Denne opdatering er ikke påkrævet, men det anbefales at installere den for at opnå øget hastighed og forbedret stabilitet.
+	</notification>
+	<notification name="DownloadLinuxMandatory">
+		En ny version af [APP_NAME] er tilgængelig.
+[MESSAGE]
+Du skal hente denne version for at kunne benytte [APP_NAME].
+		<usetemplate name="okcancelbuttons" notext="Afslut" yestext="Hent"/>
+	</notification>
+	<notification name="DownloadLinux">
+		En opdateret version af [APP_NAME] er tilgængelig.
+[MESSAGE]
+Denne opdatering er ikke påkrævet, men det anbefales at installere den for at opnå øget hastighed og forbedret stabilitet.
+		<usetemplate name="okcancelbuttons" notext="Fortsæt" yestext="Hent"/>
+	</notification>
+	<notification name="DownloadLinuxReleaseForDownload">
+		En opdateret version af [APP_NAME] er tilgængelig.
+[MESSAGE]
+Denne opdatering er ikke påkrævet, men det anbefales at installere den for at opnå øget hastighed og forbedret stabilitet.
+		<usetemplate name="okcancelbuttons" notext="Fortsæt" yestext="Hent"/>
+	</notification>
+	<notification name="DownloadMacMandatory">
+		En ny version af [APP_NAME] er tilgængelig.
+[MESSAGE]
+Du skal hente denne opdatering for at bruge [APP_NAME].
+
+Download til dit Program bibliotek?
+	</notification>
+	<notification name="DownloadMac">
+		En opdateret version af [APP_NAME] er tilgængelig.
+[MESSAGE]
+Denne opdatering er ikke påkrævet, men det anbefales at installere den for at opnå øget hastighed og forbedret stabilitet.
+
+Download til dit Program bibliotek?
+	</notification>
+	<notification name="DownloadMacReleaseForDownload">
+		En opdateret version af [APP_NAME] er tilgængelig.
+[MESSAGE]
+Denne opdatering er ikke påkrævet, men det anbefales at installere den for at opnå øget hastighed og forbedret stabilitet.
+
+Download til dit Program bibliotek?
+	</notification>
+	<notification name="FailedUpdateInstall">
+		Der opstod en fejl ved installation af opdatering.
+Hent og installér venligst den nyeste version fra
+http://secondlife.com/download.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="FailedRequiredUpdateInstall">
+		Vi kunne ikke installere en påkrævet opdatering.
+Du kan ikke logge på før [APP_NAME] er blevet opdateret.
+
+Hent og installer venligst den nyeste klien fra
+http://secondlife.com/download.
+		<usetemplate name="okbutton" yestext="Afslut"/>
+	</notification>
+	<notification name="UpdaterServiceNotRunning">
+		Dette er en påkrævet opdatering af din Second Life installation.
+
+Du kan downloade opdateringen fra http://www.secondlife.com/downloads
+eller du kan installere den nu.
+		<usetemplate name="okcancelbuttons" notext="Afslut Second Life" yestext="Hent og installér nu"/>
+	</notification>
+	<notification name="DownloadBackgroundTip">
+		Vi har hentet en opdatering til din [APP_NAME] installation.
+Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
+		<usetemplate name="okcancelbuttons" notext="Senere..." yestext="Installér nu og genstart [APP_NAME]"/>
+	</notification>
+	<notification name="DownloadBackgroundDialog">
+		Vi har hentet en opdatering til din [APP_NAME] installation.
+Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
+		<usetemplate name="okcancelbuttons" notext="Senere..." yestext="Installér nu og genstart [APP_NAME]"/>
+	</notification>
+	<notification name="RequiredUpdateDownloadedVerboseDialog">
+		Vi har hentet en påkrævet opdatering.
+Version [VERSION]
+
+Du skal genstarte [APP_NAME] for at installere denne opdatering.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="RequiredUpdateDownloadedDialog">
+		Du skal genstarte [APP_NAME] for at installere opdateringen.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="DeedObjectToGroup">
+		<usetemplate ignoretext="Bekræft før jeg dedikerer et objekt til en gruppe" name="okcancelignore" notext="Cancel" yestext="Deed"/>
+	</notification>
+	<notification name="WebLaunchExternalTarget">
+		Ønsker du at åbne din web browser for at se dette indhold?
+		<usetemplate ignoretext="Start min browser for at se hjemmesider" name="okcancelignore" notext="Cancel" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchJoinNow">
+		Gå til [http://secondlife.com/account/ Dashboard] for at administrere din konto?
+		<usetemplate ignoretext="Start min browser for at administrere min konto" name="okcancelignore" notext="Cancel" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchSecurityIssues">
+		<usetemplate ignoretext="Start min browser for at lære hvordan man rapporterer sikkerhedsproblemer" name="okcancelignore" notext="Cancel" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchQAWiki">
+		<usetemplate ignoretext="Start min browser for at se QA Wiki" name="okcancelignore" notext="Cancel" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchPublicIssue">
+		<usetemplate ignoretext="Start min browser for at bruge det Linden Labs sagsstyring" name="okcancelignore" notext="Cancel" yestext="Go to page"/>
+	</notification>
+	<notification name="WebLaunchSupportWiki">
+		<usetemplate ignoretext="Start min browser for at se bloggen" name="okcancelignore" notext="Cancel" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchLSLGuide">
+		Ønsker du at åbne &apos;Scripting Guide&apos; for hjælp til scripting?
+		<usetemplate ignoretext="Start min browser for at se Scripting Guide" name="okcancelignore" notext="Cancel" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchLSLWiki">
+		Ønsker du at besøge LSL portalen for hjælp til scripting?
+		<usetemplate ignoretext="Start min browser for at besøge LSL Portalen" name="okcancelignore" notext="Cancel" yestext="Go to page"/>
+	</notification>
+	<notification name="ReturnToOwner">
+		<usetemplate ignoretext="Bekræft før objekter returneres til deres ejere" name="okcancelignore" notext="Cancel" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmKick">
+		Er du SIKKER på at du vil sparke alle beboere ud?
+		<usetemplate name="okcancelbuttons" notext="Cancel" yestext="Spark alle beboere ud"/>
+	</notification>
+	<notification name="MuteLinden">
+		Beklager, men du kan ikke blokere en Linden.
+	</notification>
+	<notification name="CannotStartAuctionAlreadyForSale">
+		Du kan ikke starte en auktion på en parcel som allerede er sat til salg. Fjern &apos;til salg&apos; muligheden hvis du ønsker at starte en auktion.
+	</notification>
+	<notification label="Blokering af objekt via navn mislykkedes" name="MuteByNameFailed">
+		Du har allerede blokeret dette navn.
+	</notification>
+	<notification name="BusyModeSet">
+		Sat til &apos;optaget&apos;.
+Chat og personlige beskeder vil blive skjult. Personlige beskeder vil få din &apos;optaget&apos; besked. Alle teleport invitationer vil blive afvist. Alle objekter sendt til dig vil ende i papirkurven.
+		<usetemplate ignoretext="Jeg skrifter min status til &apos;optaget" name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="JoinedTooManyGroupsMember">
+		Du er oppe på det maksimale antal grupper. Forlad venligst en anden gruppe inden du melder dig ind i denne, eller afvis tilbuddet.
+[NAME] har inviteret dig til en gruppe.
+	</notification>
+	<notification name="JoinedTooManyGroups">
+		Du er oppe på det maksimale antal grupper. Forlad venligst en gruppe inden du melder dig ind i enndnu en gruppe eller opretter en ny.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="KickUser">
+		Spark beboere ud med hvilken besked?
+	</notification>
+	<notification name="FreezeUser">
+		Frys beboeren med hvilken besked?
+	</notification>
+	<notification name="UnFreezeUser">
+		Fjern frysning af beboeren med hvilken besked?
+	</notification>
+	<notification name="SetDisplayNameSuccess">
+		Hej [DISPLAY_NAME]!
+
+Præcist som i virkeligheden tager det et stykke tid at vænne sig til et nyt navn. Det kan tage flere dage for [http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update] i objekter, scripts, søgninger m.v.
+	</notification>
+	<notification name="SetDisplayNameBlocked">
+		Beklager, du kan ikke ændre dit visningsnavn. Hvis du mener dette skyldes en fejl, kontakt venligst support.
+	</notification>
+	<notification name="SetDisplayNameFailedLength">
+		Beklager, mavnet er for langt. Visningsnavne kan ikke indholde mere end [LENGTH] karakterer.
+
+Prøv venligst med et kortere navn.
+	</notification>
+	<notification name="SetDisplayNameFailedGeneric">
+		Beklager, vi kunne ikke sætte dit visningsnavn.  Prøv venligst igen senere.
+	</notification>
+	<notification name="SetDisplayNameMismatch">
+		Visningsnavnene du angav matcher ikke. Prøv at taste ind igen.
+	</notification>
+	<notification name="AgentDisplayNameUpdateThresholdExceeded">
+		Beklager, du er nødt til at vente længere, inden du kan ændre visningsnavn.
+
+Se mere under http://wiki.secondlife.com/wiki/Setting_your_display_name
+
+Prøv venligst igen senere.
+	</notification>
+	<notification name="AgentDisplayNameSetBlocked">
+		Beklager, vi kunne ikke sætte dit valgte navn da det indholder et ikke tilladt ord.
+
+ Prøv med et andet navn.
+	</notification>
+	<notification name="AgentDisplayNameSetInvalidUnicode">
+		Visningsnavnet du prøver at angive indeholder ugyldige karakterer.
+	</notification>
+	<notification name="AgentDisplayNameSetOnlyPunctuation">
+		Dit vinsningsnavn skal indeholde andre bogstaver end tegnsætningstegn.
+	</notification>
+	<notification name="DisplayNameUpdate">
+		[OLD_NAME] ([SLID]) er nu kendt som [NEW_NAME].
+	</notification>
+	<notification name="OfferTeleport">
+		Tilbyd en teleport til din position med følgende besked?
+		<form name="form">
+			<input name="message">
+				Mød mig i [REGION]
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="OfferTeleportFromGod">
+		Tilkald beboer til din lokation?
+	</notification>
+	<notification name="TeleportFromLandmark">
+		Er du sikker på at du vil teleportere til &lt;nolink&gt;[LOCATION]&lt;/nolink&gt;?
+		<usetemplate ignoretext="Bekræft at jeg vil teleportere til et landemærke" name="okcancelignore" notext="Cancel" yestext="Teleport"/>
+	</notification>
+	<notification name="TeleportToPick">
+		Teleport til [PICK]?
+		<usetemplate ignoretext="Bekræft at jeg ønsker at teleportere til et sted i favoritter" name="okcancelignore" notext="Annullér" yestext="Teleport"/>
+	</notification>
+	<notification name="TeleportToClassified">
+		Teleport til [CLASSIFIED]?
+		<usetemplate ignoretext="Bekræft at du ønsker at teleportere til lokation in annoncer" name="okcancelignore" notext="Annullér" yestext="Teleport"/>
+	</notification>
+	<notification name="TeleportToHistoryEntry">
+		Teleport til [HISTORY_ENTRY]?
+		<usetemplate ignoretext="Bekræft at du ønsker at teleportere til en lokation i din historik" name="okcancelignore" notext="Annullér" yestext="Teleport"/>
+	</notification>
+	<notification label="Change Linden Estate" name="ChangeLindenEstate">
+		Du er i færd med at ændre et Linden ejet estate (mainland, teeen grid, orientation etc.).
+
+Dette er EKSTREMT FARLIGT da det kan ændre beboernes oplevelse fundamentalt. På mainland vil dette betyde ændring af tusinder af regioner og få spaceserveren til at kløjs i det.
+
+Fortsæt?
+	</notification>
+	<notification name="RegionEntryAccessBlocked">
+		Du har ikke adgang til denne region på grund af din valgte indholdsrating. Dette kan skyldes manglende validering af din alder.
+
+Undersøg venligst om du har installeret den nyeste [APP_NAME] klient, og gå til &apos;Knowledge Base&apos; for yderligere detaljer om adgang til områder med denne indholdsrating.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_KB">
+		Du har ikke adgang til denne region på grund af din valgte indholdsrating.
+
+Gå til &apos;Knowledge Base&apos; for mere information om indholdsratings.
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+		</url>
+		<usetemplate ignoretext="Ikke adgang til denne region på grund af begrænsninger i min indholdsrating" name="okcancelignore" notext="Luk" yestext="Gå til &apos;Knowledge Base&apos;"/>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_Notify">
+		Du har ikke adgang til denne region på grund af din valgte indholdsrating.
+	</notification>
+	<notification name="RegionEntryAccessBlocked_Change">
+		Du har ikke adgang til denne region på grund af din opsætning af indholdsrating.
+
+For at få adgang til den ønskede region skal du ændre din indholdsrating. Dette vil give dig ret til at søge og får tilgang til indhold af typen [REGIONMATURITY]. For at omgøre ændringer gå til Mig &gt; Indstillinger &gt; Generelt.
+		<form name="form">
+			<button name="OK" text="Ændre indstillinger"/>
+			<button name="Cancel" text="Luk"/>
+			<ignore name="ignore" text="Din valgte indholdsrating forhindrer dig i at kommer til en region"/>
+		</form>
+	</notification>
+	<notification name="PreferredMaturityChanged">
+		Din indholdsrating er nu [RATING].
+	</notification>
+	<notification name="LandClaimAccessBlocked">
+		Du kan ikke kræve dette land på grund af din nuværende indholdsrating indstillinge . Dette kan skyldes manglende validering af din alder.
+
+Undersøg om du har den nyeste [APP_NAME] klient og gå venligst til &apos;Knowledge Base&apos; for yderligere detaljer om adgang til områder med denne indholdsrating.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="LandClaimAccessBlocked_KB">
+		Du kan ikke kræve dette land på grund af din nuværende indholdsrating indstilling..
+
+Gå venligst til &apos;Knowledge Base&apos; for yderligere information om indholdsrating.
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+		</url>
+		<usetemplate ignoretext="Du kan ikke kræve dette land, på grund af begrænsninger i indholdsrating" name="okcancelignore" notext="Luk" yestext="Gå til &apos;Knowledge Base&apos;"/>
+	</notification>
+	<notification name="LandClaimAccessBlocked_Notify">
+		Du kan ikke kræve dette land på grund af din indholdsrating.
+	</notification>
+	<notification name="LandClaimAccessBlocked_Change">
+		Du kan ikke kræve dette land, på grund af begrænsninger i din opsætning af indholdsrating.
+
+Du kan klikke på &apos;Ændre præference&apos; for at ændre din indholdsrating nu og dermed opnå adgang. Du vil så få mulighed for at søge og tilgå [REGIONMATURITY] fra da af. Hvis du senere ønsker at ændre denne opsætning tilbage, gå til Mig &gt; Indstillinger &gt; Generelt.
+		<usetemplate ignoretext="Din valgte indholdsrating forhindrer dig i at kræve land" name="okcancelignore" notext="Luk" yestext="Ændre præferencer"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked">
+		Du kan ikke købe dette land på grund af din nuværende indholdsrating indstillinge . Dette kan skyldes manglende validering af din alder.
+
+Undersøg om du har den nyeste [APP_NAME] klient og gå venligst til &apos;Knowledge Base&apos; for yderligere detaljer om adgang til områder med denne indholdsrating.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked_KB">
+		Du kan ikke købe dette land på grund af din nuværende indholdsrating. 
+
+Gå til &apos;Knowledge Base&apos; for yderligere detaljer om indholdsrating.
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+		</url>
+		<usetemplate ignoretext="Du kan ikke købe dette land, på grund af begrænsninger i indholdsrating" name="okcancelignore" notext="Luk" yestext="Gå til &apos;Knowledge Base&apos;"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked_Notify">
+		Du kan ikke købe dette land på grund af din nuværende indholdsrating indstilling.
+	</notification>
+	<notification name="LandBuyAccessBlocked_Change">
+		Du kan ikke købe dette land, på grund af begrænsninger i din opsætning af indholdsrating.
+
+Du kan klikke på &apos;Ændre præference&apos; for at ændre din indholdsrating nu og dermed opnå adgang. Du vil så få mulighed for at søge og tilgå [REGIONMATURITY] fra da af. Hvis du senere ønsker at ændre denne opsætning tilbage, gå til Mig &gt; Indstillinger &gt; Generelt.
+		<usetemplate ignoretext="Din valgte rating forhindrer dig i at købe land" name="okcancelignore" notext="Luk" yestext="Ændre præferencer"/>
+	</notification>
+	<notification name="TooManyPrimsSelected">
+		Der er valgt for mange prims. Vælg venligst [MAX_PRIM_COUNT] eller færre og prøv igen
+	</notification>
+	<notification name="UnableToLoadNotecardAsset">
+		Kunne ikke hente notecard indhold.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SetClassifiedMature">
+		Indeholder denne annonce &apos;Mature&apos; indhold?
+		<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="SetGroupMature">
+		Indeholder denne gruppe &apos;Mature&apos; indhold?
+		<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification label="Changed Region Maturity" name="RegionMaturityChange">
+		Ratingen for denne region er ændret.
+Det kan tage noget tid inden ændringen slår igennem på kortet.
+
+For at få adgang til voksen regioner, skal beboere være alders-checket, enten via aldersverifikation eller  betalingsverifikation.
+	</notification>
+	<notification label="Voice Version Mismatch" name="VoiceVersionMismatch">
+		Denne version af [APP_NAME] er ikke kompatibel med stemme chat funktionen i denne region. For at kunne få stemme chat til at fungere skal du opdatere [APP_NAME].
+	</notification>
+	<notification name="MoveInventoryFromObject">
+		<usetemplate ignoretext="Advar mig før jeg flytter &apos;ikke-kopiérbare&apos; genstande fra et objekt" name="okcancelignore" notext="Cancel" yestext="OK"/>
+	</notification>
+	<notification name="MoveInventoryFromScriptedObject">
+		<usetemplate ignoretext="Advar mig før jeg flytter &apos;ikke-kopiérbare&apos; genstande, hvor det kan medføre at ødelægge et scriptet objekt" name="okcancelignore" notext="Cancel" yestext="OK"/>
+	</notification>
+	<notification name="ClickActionNotPayable">
+		Advarsel: &apos;Betal objekt&apos; klik-aktionen er blevet aktiveret, men det vil kun virke, hvis et script med et &apos;money()&apos; event er tilføjet.
+		<form name="form">
+			<ignore name="ignore" text="I set the action &apos;Pay object&apos; when building an object without a money() script"/>
+		</form>
+	</notification>
+	<notification name="WebLaunchAccountHistory">
+		Gå til [http://secondlife.com/account/ Dashboard] for at se konto-historik?
+		<usetemplate ignoretext="Start min browser for at se min konto historik" name="okcancelignore" notext="Cancel" yestext="Go to page"/>
+	</notification>
+	<notification name="ConfirmQuit">
+		Er du sikker på at du vil afslutte?
+		<usetemplate ignoretext="Bekræft før jeg afslutter" name="okcancelignore" notext="Afslut ikke" yestext="Quit"/>
+	</notification>
+	<notification name="DeleteItems">
+		[QUESTION]
+		<usetemplate ignoretext="Bekræft før sletning af genstande" name="okcancelignore" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification name="HelpReportAbuseEmailLL">
+		Benyt dette værktøj til at rapportere krænkninger af [http://secondlife.com/corporate/tos.php Terms of Service] og [http://secondlife.com/corporate/cs.php Community Standards].
+
+Alle rapporter om krænkninger vil blive undersøgt og behandlet.
+	</notification>
+	<notification name="HelpReportAbuseContainsCopyright">
+		Kære beboer,
+
+Det ser ud til at du indrapporterer krænkelse af ophavsret. Check venligst at du rapporterer korrekt:
+
+(1) Krænkelsesproces. Du må sende en rapport, hvis du mener at en beboer udnytter [SECOND_LIFE] rettighedssystemet, for eksempel via CopyBot eller lignende værktøjer, til at overtræde ophavsretten til objekter.
+
+(2) DCMA (”Digital Millennium Copyright Act”) eller fjernelsesproces. For at kræve at indhold fjernes fra [SECOND_LIFE], SKAL du sende en gyldig besked om overtrædelse som beskrevet i [http://secondlife.com/corporate/dmca.php DMCA Policy].
+
+Hvis du stadig ønsker at fortsætte med rapportering om overtrædelse, luk venligst dette vindue og afslut afsendelse af rapporten. Du skal muligvis vælge en specifik kategori &apos;CopyBot or Permissions Exploit&apos;.
+
+Mange tak
+
+Linden Lab
+	</notification>
+	<notification label="Replace Existing Attachment" name="ReplaceAttachment">
+		<form name="form">
+			<ignore name="ignore" text="Erstat et eksisterende vedhæng med den valgte genstand"/>
+		</form>
+	</notification>
+	<notification label="Busy Mode Warning" name="BusyModePay">
+		<form name="form">
+			<ignore name="ignore" text="Jeg er ved at betale en person eller et objekt mens jeg er &apos;optaget&apos;"/>
+		</form>
+	</notification>
+	<notification name="ConfirmDeleteProtectedCategory">
+		Mappen &apos;[FOLDERNAME]&apos; er en system mappe. At slette denne mappe kan medføre ustabilitet. Er du sikker på at du vil slette den?
+		<usetemplate ignoretext="Bekræft, inden en system mappe slettes" name="okcancelignore" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmEmptyTrash">
+		Er du sikker på at du ønsker at tømme papirkurven?
+		<usetemplate ignoretext="Bekræft før papirkurv i beholdning tømmes" name="okcancelignore" notext="Cancel" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmClearBrowserCache">
+		Er du sikker på at du ønsker at slette din historik om besøg, web og søgninger?
+		<usetemplate name="okcancelbuttons" notext="Cancel" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmClearCookies">
+		Er du sikker på du vil slette alle cookies?
+	</notification>
+	<notification name="ConfirmEmptyLostAndFound">
+		Er du sikker på at du vil slette indholdet i din &apos;Fundne genstande&apos;?
+		<usetemplate ignoretext="Bekræft før sletning af &apos;Fundne genstande&apos; mappe i beholdning" name="okcancelignore" notext="No" yestext="Yes"/>
+	</notification>
+	<notification name="CopySLURL">
+		Følgende SLurl er blevet kopieret til din udklipsholder:
+ [SLURL]
+
+Henvis til dette fra en hjemmeside for at give andre nem adgang til denne lokation, eller prøv det selv ved at indsætte det i adresselinien i en web-browser.
+		<form name="form">
+			<ignore name="ignore" text="SLurl er kopieret til min udklipsholder"/>
+		</form>
+	</notification>
+	<notification name="NewSkyPreset">
+		<form name="form">
+			<input name="message">
+				Ny forudindstilling
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="NewWaterPreset">
+		<form name="form">
+			<input name="message">
+				Ny forudindstilling
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="ChatterBoxSessionStartError">
+		Ikke i stand til at start chat med [RECIPIENT].
+[REASON]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="Cannot_Purchase_an_Attachment">
+		Du kan ikke købe en genstand mens den er vedhæftet.
+	</notification>
+	<notification name="AutoWearNewClothing">
+		Vil du automatisk tage det tøj på du er ved at lave?
+		<usetemplate ignoretext="Tag det tøj på jeg laver, mens jeg ændrer udseende" name="okcancelignore" notext="No" yestext="Yes"/>
+	</notification>
+	<notification name="NotAgeVerified">
+		Du skal være alders-checket for at besøge dette område.  Ønsker du at gå til [SECOND_LIFE] hjemmesiden og bekræfte din alder?
+
+[_URL]
+		<usetemplate ignoretext="Jeg har ikke bekræftet min alder" name="okcancelignore" notext="No" yestext="Yes"/>
+	</notification>
+	<notification name="Cannot enter parcel: no payment info on file">
+		Du skal være betalende medlem for at besøge dette område.  Ønsker du at gå til [SECOND_LIFE] hjemmesiden for at blive dette?
+
+[_URL]
+		<usetemplate ignoretext="Du mangler at være betalende medlem" name="okcancelignore" notext="No" yestext="Yes"/>
+	</notification>
+	<notification name="SystemMessageTip">
+		[MESSAGE]
+	</notification>
+	<notification name="IMSystemMessageTip">
+		[MESSAGE]
+	</notification>
+	<notification name="Cancelled">
+		Annulléret
+	</notification>
+	<notification name="CancelledSit">
+		Annulléret sid
+	</notification>
+	<notification name="CancelledAttach">
+		Annulléreret vedhæft
+	</notification>
+	<notification name="ReplacedMissingWearable">
+		Erstattet manglende tøj/kropsdele med standard.
+	</notification>
+	<notification name="FriendOnline">
+		[NAME] er logget på
+	</notification>
+	<notification name="FriendOffline">
+		[NAME] er logget af
+	</notification>
+	<notification name="AddSelfFriend">
+		Selvom du nok er meget sød, kan du ikke tilføje dig selv som ven.
+	</notification>
+	<notification name="UploadingAuctionSnapshot">
+		Uploader billeder fra verdenen og www...
+(Tager omkring 5 minutter.)
+	</notification>
+	<notification name="UploadPayment">
+		Du betalte L$[AMOUNT] for at uploade.
+	</notification>
+	<notification name="UploadWebSnapshotDone">
+		Billeder fra www er uploadet.
+	</notification>
+	<notification name="UploadSnapshotDone">
+		Billeder fra verdenen er uploadet
+	</notification>
+	<notification name="TerrainDownloaded">
+		Terrain.raw downloadet
+	</notification>
+	<notification name="GestureMissing">
+		Bevægelsen [NAME] mangler i databasen.
+	</notification>
+	<notification name="UnableToLoadGesture">
+		Kunne ikke indlæse læse bevægelse [NAME].
+	</notification>
+	<notification name="LandmarkMissing">
+		Landmærke mangler i databasen.
+	</notification>
+	<notification name="UnableToLoadLandmark">
+		Ikke muligt at indlæse landmærke.  Prøv venligst igen.
+	</notification>
+	<notification name="CapsKeyOn">
+		Din Caps Lock er aktiveret.
+Det kan påvirke din indtastning af password.
+	</notification>
+	<notification name="NotecardMissing">
+		Note mangler i databasen.
+	</notification>
+	<notification name="NotecardNoPermissions">
+		Du har ikke rettigheder til at se denne note.
+	</notification>
+	<notification name="RezItemNoPermissions">
+		Utilstrækkelige tilladelser til at danne genstanden.
+	</notification>
+	<notification name="UnableToLoadNotecard">
+		Ikke muligt at indlæse note.
+Prøv venligst igen.
+	</notification>
+	<notification name="ScriptMissing">
+		Script mangler i databasen.
+	</notification>
+	<notification name="ScriptNoPermissions">
+		Utilstrækkelige tilladelser til at se script.
+	</notification>
+	<notification name="UnableToLoadScript">
+		Ikke muligt at indlæse script.  Prøv venligst igen.
+	</notification>
+	<notification name="IncompleteInventory">
+		Det komplette indhold, du tilbyder, er ikke endnu tilgængelig lokalt. Prøv venligst at tilbyde tingene igen om lidt.
+	</notification>
+	<notification name="CannotModifyProtectedCategories">
+		Du kan ikke ændre beskyttede kategorier.
+	</notification>
+	<notification name="CannotRemoveProtectedCategories">
+		Du kan ikke fjerne beskyttede kategorier.
+	</notification>
+	<notification name="UnableToBuyWhileDownloading">
+		Ikke muligt at købe, imens genstandens data hentes.
+Prøv venligst igen.
+	</notification>
+	<notification name="UnableToLinkWhileDownloading">
+		Ikke muligt at lænke imens genstandens data hentes.
+Prøv venligst igen.
+	</notification>
+	<notification name="CannotBuyObjectsFromDifferentOwners">
+		Du kan kun købe objekter fra én ejer ad gangen.
+Vælg venligst et enkelt objekt.
+	</notification>
+	<notification name="ObjectNotForSale">
+		Dette objekt er ikke til salg.
+	</notification>
+	<notification name="EnteringGodMode">
+		Starter gud-tilstand, niveau [LEVEL]
+	</notification>
+	<notification name="LeavingGodMode">
+		Stopper gud-tilstand, niveau [LEVEL]
+	</notification>
+	<notification name="CopyFailed">
+		Du har ikke rettigheder til at kopiere dette.
+	</notification>
+	<notification name="InventoryAccepted">
+		[NAME] modtog dit tilbud til hans/hendes beholdning.
+	</notification>
+	<notification name="InventoryDeclined">
+		[NAME] afviste det du tilbød fra din beholdning.
+	</notification>
+	<notification name="ObjectMessage">
+		[NAME]: [MESSAGE]
+	</notification>
+	<notification name="CallingCardAccepted">
+		Dit visitkort blev accepteret.
+	</notification>
+	<notification name="CallingCardDeclined">
+		Dit visitkort blev afvist.
+	</notification>
+	<notification name="TeleportToLandmark">
+		Du kan teleportere til lokationer som &apos;[NAME]&apos; ved at åbne Steder panelet til højre på skærmen, og her vælge landemærker fanen.
+Klik på et landemærke og vælg den, derefter 
+Click on any landmark to select it, then click &apos;Teleport&apos; at the bottom of the panel.
+(You can also double-click on the landmark, or right-click it and choose &apos;Teleport&apos;.)
+	</notification>
+	<notification name="TeleportToPerson">
+		Du kan kontakte beboere som &apos;[NAME]&apos; ved at åbne Personer panelet til højre på skærmen.
+Vælg beboeren fra listen og klik så &apos;IM&apos; i bundet af panelet.
+(Du kan også dobbelt-klikke på navnet i listen, eller højre-klikke og vælge &apos;IM&apos;).
+	</notification>
+	<notification name="CantSelectLandFromMultipleRegions">
+		Kan ikke vælge land på tværs af grænser.
+Prøv at vælge mindre stykker land.
+	</notification>
+	<notification name="SearchWordBanned">
+		Visse ord er fjernet fra din søge-sætning på grund af at disse strider mod de generelle &apos;Community Standards&apos;.
+	</notification>
+	<notification name="NoContentToSearch">
+		Vælg venligst mindst en indholdstype for at søge (PG, Mature, or Adult).
+	</notification>
+	<notification name="SystemMessage">
+		[MESSAGE]
+	</notification>
+	<notification name="PaymentReceived">
+		[MESSAGE]
+	</notification>
+	<notification name="PaymentSent">
+		[MESSAGE]
+	</notification>
+	<notification name="EventNotification">
+		Besked om begivenhed:
+
+[NAME]
+[DATE]
+		<form name="form">
+			<button name="Details" text="Detaljer"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="TransferObjectsHighlighted">
+		Alle genstande på denne grund, som vil blive overført til køberen af denne grund, er nu oplyst.
+
+* Træer og græs, der vil blive overført, er ikke fremhævet.
+		<form name="form">
+			<button name="Done" text="Færdig"/>
+		</form>
+	</notification>
+	<notification name="DeactivatedGesturesTrigger">
+		Deaktiverede bevægelser med samme udløser: [NAMES]
+	</notification>
+	<notification name="NoQuickTime">
+		Det ser ikke ud til at Apples QuickTime software er installeret på dit system.
+Hvis du ønsker at se streaming media på parceller der understøtter dette skal du besøge siden [http://www.apple.com/quicktime QuickTime site] og installere QuickTime Player.
+	</notification>
+	<notification name="NoPlugin">
+		Ingen Media Plugin blev fundet til at håndtere mime af typen &quot;[MIME_TYPE]&quot;.  Media af denne type vil ikke være tilgængelig.
+	</notification>
+	<notification name="MediaPluginFailed">
+		Følgende Media Plugin has fejlede:
+    [PLUGIN]
+
+Prøv venligst at geninstallere plugin eller kontakt leverandøren hvis problemerne bliver ved.
+		<form name="form">
+			<ignore name="ignore" text="En Media Plugin kunne ikke afvikles"/>
+		</form>
+	</notification>
+	<notification name="OwnedObjectsReturned">
+		De genstande du ejer på det valgte stykke land er blevet returneret til din beholdning.
+	</notification>
+	<notification name="OtherObjectsReturned">
+		Objekterne på den valgte parcel, ejet af [NAME], er blevet returneret til vedkommendes beholdning.
+	</notification>
+	<notification name="OtherObjectsReturned2">
+		Objekterne i den valgte parcel, ejet af beboeren &apos;[NAME]&apos;, er blevet returneret til deres ejer.
+	</notification>
+	<notification name="GroupObjectsReturned">
+		Genstandene på det valgte stykke land, delt med gruppen [GROUPNAME], er blevet returneret til deres ejeres beholdninger.
+Genstande, som er dedikerede og som kan overføres, er blevet returneret til deres forrige ejere.
+Genstande, der ikke kan overføres og som er dedikeret til gruppen, er blevet slettet.
+	</notification>
+	<notification name="UnOwnedObjectsReturned">
+		Genstandene på det valgte stykke land, der IKKE er ejet af dig, er blevet returneret til deres ejere.
+	</notification>
+	<notification name="ServerObjectMessage">
+		Besked fra [NAME]:
+&lt;nolink&gt;[MSG]&lt;/nolink&gt;
+	</notification>
+	<notification name="NotSafe">
+		Dette land er åbnet for &apos;skade&apos;.
+Du kan blive skadet her. Hvis du dør, vil du blive teleporteret til din hjemme lokation.
+	</notification>
+	<notification name="NoFly">
+		Dette sted har ikke aktiveret ret til flyvning.
+Du kan ikke flyve her.
+	</notification>
+	<notification name="PushRestricted">
+		Dette sted tillader ikke skubning. Du kan ikke skubbe andre, med mindre du ejer dette land.
+	</notification>
+	<notification name="NoVoice">
+		Dette sted har ikke aktiveret stemme-chat. Du vil ikke kunne høre nogen tale.
+	</notification>
+	<notification name="NoBuild">
+		Dette sted har ikke aktiveret bygge-ret. Du kan ikke bygge eller &apos;rezze&apos; objekter her.
+	</notification>
+	<notification name="ScriptsStopped">
+		En administrator har midlertidig stoppet scripts i denne region.
+	</notification>
+	<notification name="ScriptsNotRunning">
+		Denne region kører ikke nogen scripts.
+	</notification>
+	<notification name="NoOutsideScripts">
+		Dette sted tillader ikke udefra kommende scripts.
+
+Ingen scripts vil virke her, udover de som tilhører ejeren af landet.
+	</notification>
+	<notification name="ClaimPublicLand">
+		Du kan kun kræve land i den region du befinder dig i.
+	</notification>
+	<notification name="RegionTPAccessBlocked">
+		Du har ikke adgang til denne region på grund af din valgte indholdsrating. Dette kan skyldes manglende validering af din alder eller at du ikke benytter den nyeste [APP_NAME] klient.
+
+Gå venligst til &apos;Knowledge Base&apos; for yderligere detaljer om adgang til områder med denne indholdsrating.
+	</notification>
+	<notification name="URBannedFromRegion">
+		Du er blokeret i denne region.
+	</notification>
+	<notification name="NoTeenGridAccess">
+		Du kan ikke tilslutte dig denne &apos;Teen&apos; region.
+	</notification>
+	<notification name="ImproperPaymentStatus">
+		Du har ikke de rette betalingsoplysninger til at komme ind i denne region.
+	</notification>
+	<notification name="MustGetAgeParcel">
+		Du skal være aldersgodkendt for at komme ind på denne parcel.
+	</notification>
+	<notification name="NoDestRegion">
+		Destinations region ikke fundet.
+	</notification>
+	<notification name="NotAllowedInDest">
+		Du har ikke adgang til denne destination.
+	</notification>
+	<notification name="RegionParcelBan">
+		Kan ikke skifte til ny region via en blokeret parcel. Prøv en anden vej ind.
+	</notification>
+	<notification name="TelehubRedirect">
+		Du er blevet omdirigeret til en telehub.
+	</notification>
+	<notification name="CouldntTPCloser">
+		Kunne ikke teleportere nærmere til destination.
+	</notification>
+	<notification name="TPCancelled">
+		Teleport afbrudt.
+	</notification>
+	<notification name="FullRegionTryAgain">
+		Den region du prøver at komme ind i er fuld for øjeblikket.
+Prøv igen om lidt.
+	</notification>
+	<notification name="GeneralFailure">
+		Generel fejl.
+	</notification>
+	<notification name="RoutedWrongRegion">
+		Du blev sendt til en forkert region. Prøv igen.
+	</notification>
+	<notification name="NoValidAgentID">
+		Ikke en gyldig agent ID.
+	</notification>
+	<notification name="NoValidSession">
+		Ikke noget gyldig sessions-ID
+	</notification>
+	<notification name="NoValidCircuit">
+		Ingen gyldig kode for kredsløb.
+	</notification>
+	<notification name="NoValidTimestamp">
+		Ikke et gyldigt klokkeslæt.
+	</notification>
+	<notification name="NoPendingConnection">
+		Kunne ikke skabe fast forbindelse.
+	</notification>
+	<notification name="InternalUsherError">
+		Der opstod en intern fejl ved teleportering til din teleport destination.. Der kan være generelle problemer med [SECOND_LIFE] lige nu.
+	</notification>
+	<notification name="NoGoodTPDestination">
+		Kunne ikke finde et egnet teleport sted i denne region.
+	</notification>
+	<notification name="InternalErrorRegionResolver">
+		Der opstod en intern fejl ved beregning af globale koordinater for din teleport forespørgsel. Der kan være generelle problemer med [SECOND_LIFE] lige nu.
+	</notification>
+	<notification name="NoValidLanding">
+		Kunne ikke finde et gyldigt landingspunkt.
+	</notification>
+	<notification name="NoValidParcel">
+		No valid parcel could be found.
+	</notification>
+	<notification name="ObjectGiveItem">
+		Et object med navnet &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; ejet af [NAME_SLURL] har givet dig denne [OBJECTTYPE]:
+[ITEM_SLURL]
+		<form name="form">
+			<button name="Keep" text="Behold"/>
+			<button name="Discard" text="Smid væk"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="UserGiveItem">
+		[NAME_SLURL] har givet dig denne/dette [OBJECTTYPE]:
+[ITEM_SLURL]
+		<form name="form">
+			<button name="Show" text="Vis"/>
+			<button name="Discard" text="Smid væk"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="GodMessage">
+		[NAME]
+
+[MESSAGE]
+	</notification>
+	<notification name="JoinGroup">
+		[MESSAGE]
+		<form name="form">
+			<button name="Join" text="Indmeld"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Info" text="Information"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered">
+		[NAME_SLURL] har tilbudt en teleport til deres lokation:
+
+[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+		<form name="form">
+			<button name="Teleport" text="Teleportér"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="TeleportOfferSent">
+		Tilbud om teleport sendt til [TO_NAME]
+	</notification>
+	<notification name="GotoURL">
+		[MESSAGE]
+[URL]
+		<form name="form">
+			<button name="Later" text="Senere"/>
+			<button name="GoNow..." text="Gå nu..."/>
+		</form>
+	</notification>
+	<notification name="OfferFriendship">
+		[NAME_SLURL] tilbyder venskab.
+
+[MESSAGE]
+
+(Som udgangspunkt vil I være i stand til at se hinandens online status.)
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+		</form>
+	</notification>
+	<notification name="FriendshipOffered">
+		Du har tilbudt venskab til [TO_NAME]
+	</notification>
+	<notification name="OfferFriendshipNoMessage">
+		[NAME_SLURL] tilbyder venskab.
+
+(Som udgangspunkt, vil du være i stand til at se den andens online status)
+	</notification>
+	<notification name="FriendshipAccepted">
+		[NAME] accepterede dit tilbud om venskab.
+	</notification>
+	<notification name="FriendshipDeclined">
+		[NAME] afviste dit tilbud om venskab.
+	</notification>
+	<notification name="FriendshipAcceptedByMe">
+		Tilbud om venskab accepteret.
+	</notification>
+	<notification name="FriendshipDeclinedByMe">
+		Tilbud om venskab afvist.
+	</notification>
+	<notification name="OfferCallingCard">
+		[NAME] tilbyder sit visitkort.
+Dette vil tilføje et bogmærke i din beholdning, så du hurtigt kan sende en personlig besked til denne beboer.
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+		</form>
+	</notification>
+	<notification name="RegionRestartMinutes">
+		Denne region vil genstarte om [MINUTES] minutter.
+Hvis du ikke forlader regionen, vil du blive logget af.
+	</notification>
+	<notification name="RegionRestartSeconds">
+		Denne region genstartes om [SECONDS] sekunder.
+Hvis du ikke forlader regionen, vil du blive logget af.
+	</notification>
+	<notification name="LoadWebPage">
+		Indlæas websiden [URL]?
+
+[MESSAGE]
+
+Fra objekt: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, ejer: [NAME]?
+		<form name="form">
+			<button name="Gotopage" text="Gå til side"/>
+			<button name="Cancel" text="Afbryd"/>
+		</form>
+	</notification>
+	<notification name="FailedToFindWearableUnnamed">
+		Det lykkedes ikke at finde [TYPE] i databasen.
+	</notification>
+	<notification name="FailedToFindWearable">
+		Det lykkedes ikke at finde [TYPE] med navnet [DESC] i databasen.
+	</notification>
+	<notification name="InvalidWearable">
+		Den genstand du prøver at tage på benytter en funktion din klient ikke kan forstå. Upgradér venligst din version af [APP_NAME] for at kunne tage denne genstand på.
+	</notification>
+	<notification name="ScriptQuestion">
+		&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, et objekt ved ejet af &apos;[NAME]&apos;, ønsker at:
+
+[QUESTIONS]
+Er dette OK?
+		<form name="form">
+			<button name="Yes" text="Ja"/>
+			<button name="No" text="Nej"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="ScriptQuestionCaution">
+		Et objeckt med navn &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, ejet af  &apos;[NAME]&apos; ønsker at:
+
+[QUESTIONS]
+Hvis du ikke stoler på dette objekt og dets skaber, bør du afvise dette ønske.
+
+Opfyld dette ønske?
+		<form name="form">
+			<button name="Grant" text="Imødekom"/>
+			<button name="Deny" text="Afvis"/>
+			<button name="Details" text="Detaljer..."/>
+		</form>
+	</notification>
+	<notification name="ScriptDialog">
+		[NAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
+[MESSAGE]
+		<form name="form">
+			<button name="Ignore" text="Ignorér"/>
+		</form>
+	</notification>
+	<notification name="ScriptDialogGroup">
+		[GROUPNAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
+[MESSAGE]
+		<form name="form">
+			<button name="Ignore" text="Ignorér"/>
+		</form>
+	</notification>
+	<notification name="BuyLindenDollarSuccess">
+		Tak for din betaling!
+
+Din L$ balance vil blive opdateret når transaktionen er gennemført. Ved transaktionen tager mere end 20 min., vil den blive annulleret. I så fald vil beløbet blive krediteret din US$ balance.
+
+Status for din betaling kan ses i din &apos;Transaction History&apos; side på din [http://secondlife.com/account/ Dashboard]
+	</notification>
+	<notification name="FirstOverrideKeys">
+		Dine bevælgelsestaster bliver nu håndteret af et objekt.
+Brug piletasterne eller AWSD for at se, hvad de gør.
+Nogle genstande (som skydevåben) kræver at du går ind i musevisning for at bruge dem.
+Tryk på &apos;M&apos; for at gåre det.
+	</notification>
+	<notification name="FirstSandbox">
+		Dette er et sandkasse område. Her kan beboere lære ast bygge.
+
+De ting du bygger vil blive slettet senere, så glem ikke at højre-klikke og vælge &quot;Tag&quot; for at tage en kopi af din kreation til din beholdning.
+	</notification>
+	<notification name="MaxListSelectMessage">
+		Du må kun vælge op til [MAX_SELECT] genstande på denne liste.
+	</notification>
+	<notification name="VoiceInviteP2P">
+		[NAME] inviterer dig til en stemme-chat samtale.
+Klik på Acceptér for at deltage eller Afvis for at afvise invitationen. Klik på Blokér for at blokere personen.
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="AutoUnmuteByIM">
+		[NAME] har fået sendt en besked og blokering er derfor automatisk blevet fjernet.
+	</notification>
+	<notification name="AutoUnmuteByMoney">
+		[NAME] har fået givet penge og blokering er derfor automatisk blevet fjernet.
+	</notification>
+	<notification name="AutoUnmuteByInventory">
+		[NAME] er blevet tilbud noget fra beholdning og blokering er derfor automatisk blevet fjernet.
+	</notification>
+	<notification name="VoiceInviteGroup">
+		[NAME] har has sluttet sig til stemme-chaten i gruppen [GROUP].
+Klik på Acceptér for at deltage eller Afvis for at afvise invitationen. Klik på Blokér for at blokere personen.
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="VoiceInviteAdHoc">
+		[NAME] har sluttet sig til en stemme-chat med en konference chat.
+Klik på Acceptér for at deltage eller Afvis for at afvise invitationen. Klik på Blokér for at blokere personen.
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="InviteAdHoc">
+		[NAME] inviterer dig til en konference chat.
+Klik på Acceptér for at deltage eller Afvis for at afvise invitationen. Klik på Blokér for at blokere personen.
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="VoiceChannelFull">
+		Den stemme-chat, du prøver at tilslutte dig, [VOICE_CHANNEL_NAME], har nået maksiumum kapacitet. Prøv venligst igen senere.
+	</notification>
+	<notification name="ProximalVoiceChannelFull">
+		Vi beklager.  Dette område har nået sin maksimale kapacitet for stemme-chat.  Prøv venligst at benytte stemme i et andet område.
+	</notification>
+	<notification name="VoiceChannelDisconnected">
+		Du er blevet koblet fra [VOICE_CHANNEL_NAME].  Du vil nu blive koblet til almindelig voice-chat.
+	</notification>
+	<notification name="VoiceChannelDisconnectedP2P">
+		[VOICE_CHANNEL_NAME] har afsluttet samtalen.  Du vil nu blive koblet til almindelig voice-chat.
+	</notification>
+	<notification name="P2PCallDeclined">
+		[VOICE_CHANNEL_NAME] har avist dit opkald.  Du vil nu blive koblet til almindelig voice-chat.
+	</notification>
+	<notification name="P2PCallNoAnswer">
+		[VOICE_CHANNEL_NAME] er ikke tilgængelig til at modtage dit opkald.  Du vil nu blive koblet til almindelig voice-chat.
+	</notification>
+	<notification name="VoiceChannelJoinFailed">
+		Det lykkedes ikke at forbinde til [VOICE_CHANNEL_NAME], prøv venligst igen senere.  Du vil nu blive koblet til almindelig voice-chat.
+	</notification>
+	<notification name="VoiceLoginRetry">
+		Vi laver en stemmekanal til dig. Det kan tage op til et minut.
+	</notification>
+	<notification name="VoiceEffectsExpired">
+		En eller flere af dine stemme &quot;morphs&quot; er udløbet.
+[[URL] Click here] for at forny dit abbonnement.
+	</notification>
+	<notification name="VoiceEffectsExpiredInUse">
+		Den aktive stemme &quot;morph&quot; er udløbet og din normale stemme opsætning er genaktiveret.
+[[URL] Click here] for at forny dit abbonnement.
+	</notification>
+	<notification name="VoiceEffectsWillExpire">
+		En eller flere af dine stemme &quot;morphs&quot; vil udløbe om mindre end [INTERVAL] dage.
+[[URL] Click here] for at forny dit abbonnement.
+	</notification>
+	<notification name="VoiceEffectsNew">
+		Nye stemme &quot;morphs&quot; er tilgængelige!
+	</notification>
+	<notification name="Cannot enter parcel: not a group member">
+		Kun medlemmer af en bestemt gruppe kan besøge dette område.
+	</notification>
+	<notification name="Cannot enter parcel: banned">
+		Du kan ikke komme ind på området. Du er blevet udelukket.
+	</notification>
+	<notification name="Cannot enter parcel: not on access list">
+		Du kan ikke komme ind på området. Du er ikke på adgangslisten.
+	</notification>
+	<notification name="VoiceNotAllowed">
+		Du har ikke tilladelse til at tilslutte dig stemme-chat på [VOICE_CHANNEL_NAME].
+	</notification>
+	<notification name="VoiceCallGenericError">
+		En fejl er opstået under forsøget på at koble sig på stemme chatten [VOICE_CHANNEL_NAME].  Pråv venligst senere.
+	</notification>
+	<notification name="UnsupportedCommandSLURL">
+		Den SLurl du klikkede på understøttes ikke.
+	</notification>
+	<notification name="BlockedSLURL">
+		En SLurl blev modtaget en ikke sikret browser og den er blevet blokeret af sikkerhedsmæssige årsager.
+	</notification>
+	<notification name="ThrottledSLURL">
+		Flere SLurls blev modtaget fra en browser i et kort tidsrum.
+De vil blive blokeret nogle få sekunder af sikkerhedsmæssige årsager.
+	</notification>
+	<notification name="IMToast">
+		[MESSAGE]
+		<form name="form">
+			<button name="respondbutton" text="Svar"/>
+		</form>
+	</notification>
+	<notification name="ConfirmCloseAll">
+		Er du sikker på at du vil lukke alle personlige samtaler (IM)?
+		<usetemplate ignoretext="Bekræft før du lukker alle IMer" name="okcancelignore" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification name="AttachmentSaved">
+		Vedhæng er blevet gemt.
+	</notification>
+	<notification name="UnableToFindHelpTopic">
+		Ikke muligt at finde hjælp om dette element.
+	</notification>
+	<notification name="ObjectMediaFailure">
+		Server fejl: Media opdatering eller &quot;get&quot; fejlede.
+&apos;[ERROR]&apos;
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TextChatIsMutedByModerator">
+		Din tekst chat er blevet slukket af moderator.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="VoiceIsMutedByModerator">
+		Din stemme er blevet slukket af moderatoren.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmClearTeleportHistory">
+		Er du sikker på at du vil slette teleport historikken?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification name="BottomTrayButtonCanNotBeShown">
+		Den valgte knap kan ikke vises lige nu.
+Knappen vil blive vist når der er nok plads til den.
+	</notification>
+	<notification name="ShareNotification">
+		Vælg beboere at dele med.
+	</notification>
+	<notification name="ShareItemsConfirmation">
+		Er du sikker på at du vil dele følgende genstande:
+
+&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+
+Me følgende beboere:
+
+[RESIDENTS]
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="Ok"/>
+	</notification>
+	<notification name="ItemsShared">
+		Genstande er nu delt.
+	</notification>
+	<notification name="DeedToGroupFail">
+		Dedikering til gruppe fejlede.
+	</notification>
+	<notification name="AvatarRezNotification">
+		( [EXISTENCE] sekunder i live )
+Avatar &apos;[NAME]&apos; var ikke sky mere, efter [TIME] sekunder.
+	</notification>
+	<notification name="AvatarRezSelfBakedDoneNotification">
+		( [EXISTENCE] seconds alive )
+Du blev færdig med at fremvise dit sæt efter [TIME] sekunder.
+	</notification>
+	<notification name="AvatarRezSelfBakedUpdateNotification">
+		( [EXISTENCE] seconds alive )
+Du sendte en opdatering af dit udseende efter [TIME] sekunder.
+[STATUS]
+	</notification>
+	<notification name="AvatarRezCloudNotification">
+		( [EXISTENCE] sekunder i live )
+Avatar &apos;[NAME]&apos; blev til &quot;sky&quot;.
+	</notification>
+	<notification name="AvatarRezArrivedNotification">
+		( [EXISTENCE] sekunder i live )
+Avatar &apos;[NAME]&apos; appeared.
+	</notification>
+	<notification name="AvatarRezLeftCloudNotification">
+		( [EXISTENCE] sekunder i live )
+Avatar &apos;[NAME]&apos; forsvandt efter [TIME] sekunder som &quot;sky&quot;.
+	</notification>
+	<notification name="AvatarRezEnteredAppearanceNotification">
+		( [EXISTENCE] sekunder i live )
+Avatar &apos;[NAME]&apos; skiftede til udseende modus.
+	</notification>
+	<notification name="AvatarRezLeftAppearanceNotification">
+		( [EXISTENCE] sekunder i live )
+Avatar &apos;[NAME]&apos; har forladt udseende modus.
+	</notification>
+	<notification name="NoConnect">
+		Vi har problemer med at oprette forbindelse via [PROTOCOL] [HOSTID].
+Check venligst din netværks- og firewallsetup.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="NoVoiceConnect">
+		Vi har problemer med at oprette forbindelse til din stemme server:
+
+[HOSTID]
+
+Stemme kommunikation vil ikke være tilgængelig.
+Check venligst din netværks- og firewall setup.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="AvatarRezLeftNotification">
+		( [EXISTENCE] sekunder i live )
+Avatar &apos;[NAME]&apos; forsvandt helt &quot;uploaded&quot;.
+	</notification>
+	<notification name="AvatarRezSelfBakedTextureUploadNotification">
+		( [EXISTENCE] sekunder i live )
+Du uploadede en [RESOLUTION] &quot;bagt&quot; tekstur til &apos;[BODYREGION]&apos; efter [TIME] sekunder.
+	</notification>
+	<notification name="AvatarRezSelfBakedTextureUpdateNotification">
+		( [EXISTENCE] sekunder i live )
+Du opdaterede en [RESOLUTION] &quot;bagt&quot; tekstur for &apos;[BODYREGION]&apos; efter [TIME] sekunder.
+	</notification>
+	<notification name="ConfirmLeaveCall">
+		Er du sikker på at du vil forlade dette opkald?
+		<usetemplate ignoretext="Bekræft før jeg forlader opkald" name="okcancelignore" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="ConfirmMuteAll">
+		Du har valgt at slukke for lyden for alle deltagere i gruppeopkaldet.
+Dette vil også betyde, at alle beboere der slutter sig til opkaldet
+vil have lyden slukket - selv efter de har forladt kaldet.
+
+
+Sluk for alles lyd?
+		<usetemplate ignoretext="Bekræft før jeg slukker for alle deltageres lyd i gruppe-kald" name="okcancelignore" notext="Annullér" yestext="Ok"/>
+	</notification>
+	<notification label="Chat" name="HintChat">
+		For at deltage i samtalen tast tekst ind i chat feltet nedenfor.
+	</notification>
+	<notification label="Stå op" name="HintSit">
+		For at rejse dig op og forlad siddeposition, tryk på &quot;Stå op&quot; knappen.
+	</notification>
+	<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="Side panel" name="HintSidePanel">
+		Få hurtig tilgang til din beholdning, sæt, profiler og andet i dette side panel.
+	</notification>
+	<notification label="Flyt" name="HintMove">
+		For at gå eller løbe, åben Flyt panelet for neden og brug pilene til at navigere. Du kan også bruge pile-tasterne på dit tastatur.
+	</notification>
+	<notification label="Visningsnavn" name="HintDisplayName">
+		Angiv dit konfigurérbare visningsnavn her. Dette er i tillæg til dit unikke brugernavn, som ikke kan ændres. Du kan ændre hvordan du ser andre beboeres navne i dine indstillinger.
+	</notification>
+	<notification label="Flyt" name="HintMoveArrows">
+		For at gå, brug piletasterne på tastaturet. Du kan løbe ved at trykke to gange på Pil-Op
+	</notification>
+	<notification label="Se" name="HintView">
+		For at ændre dit kamera-view, benyt kredsløbs og panoreringskontrollerne. Nulstil view ved at trykke Esc eller ved at gå.
+	</notification>
+	<notification label="Beholdning" name="HintInventory">
+		Undersøg din beholdning for at finde ting. Nyeste genstand findes lettes under fanen &quot;Nye ting&quot;
+	</notification>
+	<notification label="Der er kommet Linden Dollars" name="HintLindenDollar">
+		Her er din nuværende balance af L$. Klik på Køb L$ for at købe flere Linden dollars.
+	</notification>
+	<notification name="PopupAttempt">
+		En pop-up blev hindret i at blive vist.
+		<form name="form">
+			<ignore name="ignore" text="Tillad alle pop-ups"/>
+			<button name="open" text="Åben pop-up vindue"/>
+		</form>
+	</notification>
+	<notification name="AuthRequest">
+		Hjemmesiden på  &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;[REALM]&apos; kræver et brugernavn og password.
+		<form name="form">
+			<input name="username" text="Brugernavn"/>
+			<input name="password" text="Password"/>
+			<button name="ok" text="Send"/>
+			<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.
+
+Hvis du bliver ved med at have problemer, besøg venligst [SUPPORT_SITE].
+	</global>
+	<global name="You can only set your &apos;Home Location&apos; on your land or at a mainland Infohub.">
+		Hvis du selv ejer land, kan du benytte det til hjemme lokation.
+Ellers kan du se på verdenskortet og finde steder markeret med &quot;Infohub&quot;.
+	</global>
+	<global name="You died and have been teleported to your home location">
+		Du døde og er blevet teleporteret til din hjemmelokation.
+	</global>
+</notifications>
diff --git a/indra/newview/skins/minimal/xui/da/panel_adhoc_control_panel.xml b/indra/newview/skins/minimal/xui/da/panel_adhoc_control_panel.xml
new file mode 100644
index 0000000000..1953fad31f
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/panel_adhoc_control_panel.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<layout_stack name="vertical_stack">
+		<layout_panel name="call_btn_panel">
+			<button label="Opkald" name="call_btn"/>
+		</layout_panel>
+		<layout_panel name="end_call_btn_panel">
+			<button label="Forlad opkald" name="end_call_btn"/>
+		</layout_panel>
+		<layout_panel name="voice_ctrls_btn_panel">
+			<button label="Stemmekontroller" name="voice_ctrls_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/da/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/da/panel_bottomtray.xml
new file mode 100644
index 0000000000..53a30136ae
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/panel_bottomtray.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="bottom_tray">
+	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
+	<string name="SpeakBtnToolTip" value="Slå mikrofon til/fra"/>
+	<string name="VoiceControlBtnToolTip" value="Vis/skjul stemme kontrolpanel"/>
+	<layout_stack name="toolbar_stack">
+		<layout_panel name="gesture_panel">
+			<gesture_combo_list label="Bevægelse" name="Gesture" tool_tip="Skjuler/viser bevægelser"/>
+		</layout_panel>
+		<layout_panel name="cam_panel">
+			<bottomtray_button label="Vis" name="camera_btn" tool_tip="Vis/Skjul kamerakontroller"/>
+		</layout_panel>
+		<layout_panel name="avatar_and_destinations_panel">
+			<radio_group name="avatar_and_destination_btns">
+				<radio_item name="destination_btn" value="0"/>
+				<radio_item name="avatar_btn" value="1"/>
+			</radio_group>
+		</layout_panel>
+		<layout_panel name="people_panel">
+			<bottomtray_button label="Personer" name="show_people_button" tool_tip="Vis person-vindue"/>
+		</layout_panel>
+		<layout_panel name="profile_panel">
+			<bottomtray_button label="Profil" name="show_profile_btn" tool_tip="Vis profil vindue"/>
+		</layout_panel>
+		<layout_panel name="howto_panel">
+			<bottomtray_button label="Hvordan" name="show_help_btn" tool_tip="Åben Second Life &quot;How To topics&quot;"/>
+		</layout_panel>
+		<layout_panel name="im_well_panel">
+			<chiclet_im_well name="im_well">
+				<button name="Unread IM messages" tool_tip="Konversationer"/>
+			</chiclet_im_well>
+		</layout_panel>
+		<layout_panel name="notification_well_panel">
+			<chiclet_notification name="notification_well">
+				<button name="Unread" tool_tip="Notifikationer"/>
+			</chiclet_notification>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/da/panel_group_control_panel.xml b/indra/newview/skins/minimal/xui/da/panel_group_control_panel.xml
new file mode 100644
index 0000000000..26fe4f6ebe
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/panel_group_control_panel.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<layout_stack name="vertical_stack">
+		<layout_panel name="group_info_btn_panel">
+			<button label="Gruppe profil" name="group_info_btn"/>
+		</layout_panel>
+		<layout_panel name="call_btn_panel">
+			<button label="Opkald gruppe" name="call_btn"/>
+		</layout_panel>
+		<layout_panel name="end_call_btn_panel">
+			<button label="Forlad opkald" name="end_call_btn"/>
+		</layout_panel>
+		<layout_panel name="voice_ctrls_btn_panel">
+			<button label="Åben stemmekontroller" name="voice_ctrls_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/da/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/da/panel_im_control_panel.xml
new file mode 100644
index 0000000000..5cecb93d40
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/panel_im_control_panel.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<layout_stack name="button_stack">
+		<layout_panel name="view_profile_btn_panel">
+			<button label="Profil" name="view_profile_btn"/>
+		</layout_panel>
+		<layout_panel name="add_friend_btn_panel">
+			<button label="Tilføj ven" name="add_friend_btn"/>
+		</layout_panel>
+		<layout_panel name="teleport_btn_panel">
+			<button label="Teleport" name="teleport_btn" tool_tip="Tilbyd teleport til denne person"/>
+		</layout_panel>
+		<layout_panel name="share_btn_panel">
+			<button label="Del" name="share_btn"/>
+		</layout_panel>
+		<layout_panel name="pay_btn_panel">
+			<button label="Betal" name="pay_btn"/>
+		</layout_panel>
+		<layout_panel name="call_btn_panel">
+			<button label="Opkald" name="call_btn"/>
+		</layout_panel>
+		<layout_panel name="end_call_btn_panel">
+			<button label="Afslut kald" name="end_call_btn"/>
+		</layout_panel>
+		<layout_panel name="voice_ctrls_btn_panel">
+			<button label="Stemme kontroller" name="voice_ctrls_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/da/panel_login.xml b/indra/newview/skins/minimal/xui/da/panel_login.xml
new file mode 100644
index 0000000000..fdcc550d82
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/panel_login.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_login">
+	<panel.string name="create_account_url">
+		http://join.secondlife.com/
+	</panel.string>
+	<panel.string name="forgot_password_url">
+		http://secondlife.com/account/request.php
+	</panel.string>
+	<layout_stack name="login_widgets">
+		<layout_panel name="login">
+			<text name="username_text">
+				Brugernavn:
+			</text>
+			<combo_box name="username_combo" tool_tip="Brugernavnet du valgte da du registrerde dig, som f.eks. bobsmith12 or Steller Sunshine"/>
+			<text name="password_text">
+				Password:
+			</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 (Standard)" name="Basic"/>
+				<combo_box.item label="Avanceret" name="Advanced"/>
+			</combo_box>
+			<text name="start_location_text">
+				Start ved:
+			</text>
+			<combo_box name="start_location_combo">
+				<combo_box.item label="Min sidste lokation" name="MyLastLocation"/>
+				<combo_box.item label="Hjem" name="MyHome"/>
+				<combo_box.item label="&lt;Indtast regionnavn&gt;" name="Typeregionname"/>
+			</combo_box>
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_new_account_text">
+				Opret bruger
+			</text>
+			<text name="forgot_password_text">
+				Har du glemt brugernavn eller password?
+			</text>
+			<text name="login_help">
+				Hjælp til login
+			</text>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/da/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/da/panel_navigation_bar.xml
new file mode 100644
index 0000000000..2ee87433a4
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/panel_navigation_bar.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="navigation_bar">
+	<panel name="navigation_panel">
+		<pull_button name="back_btn" tool_tip="Gå tilbage til min forrige lokation"/>
+		<pull_button name="forward_btn" tool_tip="Gå en lokation fremad"/>
+		<button name="home_btn" tool_tip="Teleport til min hjemme lokation"/>
+		<location_input label="Lokation" name="location_combo"/>
+		<search_combo_box label="Søg" name="search_combo_box" tool_tip="Søg">
+			<combo_editor label="Søg [SECOND_LIFE]" name="search_combo_editor"/>
+		</search_combo_box>
+	</panel>
+	<favorites_bar name="favorite" tool_tip="Træk landemærker hertil for at få hurtig adgang til dine favoritsteder i Second Life!">
+		<label name="favorites_bar_label" tool_tip="Træk landemærker hertil for at få hurtig adgang til dine favoritsteder i Second Life!">
+			Favoritter
+		</label>
+		<chevron_button name="&gt;&gt;" tool_tip="Søg mere af mine favoritter"/>
+	</favorites_bar>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/da/panel_people.xml b/indra/newview/skins/minimal/xui/da/panel_people.xml
new file mode 100644
index 0000000000..a540025343
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/panel_people.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Side tray panel -->
+<panel label="Personer" name="people_panel">
+	<string name="no_recent_people" value="Ingen nylige personer. Leder du efter personer at være sammen med? Prøv destinationsknappen nedenfor."/>
+	<string name="no_filtered_recent_people" value="Ingen nylige personer med det navn."/>
+	<string name="no_one_near" value="Ingen i nærheden. Leder du efter personer at være sammen med? Prøv destinationsknappen nedenfor."/>
+	<string name="no_one_filtered_near" value="Ingen i nærheden med det navn."/>
+	<string name="no_friends_online" value="Ingen venner online"/>
+	<string name="no_friends" value="Ingen venner"/>
+	<string name="no_friends_msg">
+		Højre-klik på en person for at tilføje som ven.
+Leder du efter personer at være sammen med? Prøv destinationsknappen nedenfor.
+	</string>
+	<string name="no_filtered_friends_msg">
+		Fandt du ikke hvad du søgte? Prøv destinationsknappen nedenfor.
+	</string>
+	<string name="people_filter_label" value="Filtrér personer"/>
+	<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](Dobbelt-klik for at åbne kort, træk for at panorere)"/>
+	<string name="AltMiniMapToolTipMsg" value="[REGION](Dobbelt-klik for 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">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Valg"/>
+				<button name="add_friend_btn" tool_tip="Tilføj valgte beboer til din venneliste"/>
+			</panel>
+		</panel>
+		<panel label="MINE VENNER" name="friends_panel">
+			<accordion name="friends_accordion">
+				<accordion_tab name="tab_online" title="Online"/>
+				<accordion_tab name="tab_all" title="Alle"/>
+			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="Vis flere valg"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Tilbyd venskab til en beboer"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Fjern valgte person fra din venneliste"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
+		</panel>
+		<panel label="MINE GRUPPER" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Valg"/>
+				<button name="plus_btn" tool_tip="Bliv medlem af gruppe/Opret ny gruppe"/>
+				<button name="activate_btn" tool_tip="Activér valgte gruppe"/>
+			</panel>
+		</panel>
+		<panel label="NYLIGE" name="recent_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Valg"/>
+				<button name="add_friend_btn" tool_tip="Tilføj valgte beboer til din venneliste"/>
+			</panel>
+		</panel>
+	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Profil" name="view_profile_btn" tool_tip="Vis billeder, grupper og anden beboer information"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="Åben session med privat besked (IM)"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Kald" name="call_btn" tool_tip="Opkald til denne beboer"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Del" name="share_btn" tool_tip="Del en genstand fra beholdning"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Teleportér" name="teleport_btn" tool_tip="Tilbyd teleport"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Gruppe profil" name="group_info_btn" tool_tip="Vis gruppe information"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Gruppe chat" name="chat_btn" tool_tip="Åben chat session"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Gruppe kald" name="group_call_btn" tool_tip="Opkald til denne gruppe"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/da/panel_side_tray_tab_caption.xml b/indra/newview/skins/minimal/xui/da/panel_side_tray_tab_caption.xml
new file mode 100644
index 0000000000..ce3a1d8b4e
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/panel_side_tray_tab_caption.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="sidetray_tab_panel">
+	<text name="sidetray_tab_title" value="Side bjælke"/>
+	<button name="undock" tool_tip="Løsriv"/>
+	<button name="dock" tool_tip="Fastgør"/>
+	<button name="show_help" tool_tip="Vis hjælp"/>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/da/panel_status_bar.xml b/indra/newview/skins/minimal/xui/da/panel_status_bar.xml
new file mode 100644
index 0000000000..6e7bdfc188
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/da/panel_status_bar.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="status">
+	<panel.string name="StatBarDaysOfWeek">
+		Søndag:Mandag:Tirsdag:Onsdag:Torsdag:Fredag:Lørdag
+	</panel.string>
+	<panel.string name="StatBarMonthsOfYear">
+		Januar:Februar:Marts:April:Maj:Juni:Juli:August:September:Oktober:November:December
+	</panel.string>
+	<panel.string name="packet_loss_tooltip">
+		Packet Loss
+	</panel.string>
+	<panel.string name="bandwidth_tooltip">
+		Båndbredde
+	</panel.string>
+	<panel.string name="time">
+		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
+	</panel.string>
+	<panel.string name="timeTooltip">
+		[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
+	</panel.string>
+	<panel.string name="buycurrencylabel">
+		L$ [AMT]
+	</panel.string>
+	<panel name="balance_bg">
+		<text name="balance" tool_tip="Klik for at opdaterer din L$ balance" value="L$20"/>
+		<button label="KØB L$" name="buyL" tool_tip="Klik for at købe flere L$"/>
+	</panel>
+	<text name="TimeText" tool_tip="Nuværende tid (Pacific)">
+		24:00 PST
+	</text>
+	<button name="media_toggle_btn" tool_tip="Start/Stop Alle medier (musik, video, hjemmesider)"/>
+	<button name="volume_btn" tool_tip="Kontrol for generel lydstyrke"/>
+</panel>
-- 
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')

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')

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')

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


From 51d6870572c83cec9c2968b68f47dea118cf6fd7 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Tue, 14 Jun 2011 12:24:32 -0700
Subject: FIX CT-637 DA translation for Basic Set2

---
 .../skins/minimal/xui/da/floater_media_browser.xml  | 21 ++++++++++++++++-----
 .../skins/minimal/xui/da/floater_web_content.xml    |  8 ++++----
 .../skins/minimal/xui/da/menu_people_nearby.xml     |  8 ++++----
 .../newview/skins/minimal/xui/da/notifications.xml  | 18 ++++++++----------
 .../skins/minimal/xui/da/panel_bottomtray.xml       |  8 ++++----
 .../minimal/xui/da/panel_group_control_panel.xml    |  4 ++--
 indra/newview/skins/minimal/xui/da/panel_login.xml  |  2 +-
 7 files changed, 39 insertions(+), 30 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/minimal/xui/da/floater_media_browser.xml b/indra/newview/skins/minimal/xui/da/floater_media_browser.xml
index d3028c32f9..42fbdeaa9e 100644
--- a/indra/newview/skins/minimal/xui/da/floater_media_browser.xml
+++ b/indra/newview/skins/minimal/xui/da/floater_media_browser.xml
@@ -1,18 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="MEDIE VÆLGER">
+<floater name="floater_about" title="MEDIA BROWSER">
+	<floater.string name="home_page_url">
+		http://www.secondlife.com
+	</floater.string>
+	<floater.string name="support_page_url">
+		http://support.secondlife.com
+	</floater.string>
 	<layout_stack name="stack1">
 		<layout_panel name="nav_controls">
 			<button label="Tilbage" name="back"/>
 			<button label="Frem" name="forward"/>
-			<button label="Opdater" name="reload"/>
-			<button label="Gå til" name="go"/>
+			<button label="Genlæs" name="reload"/>
+			<button label="Go" name="go"/>
+		</layout_panel>
+		<layout_panel name="time_controls">
+			<button label="tilbage" name="rewind"/>
+			<button label="stop" name="stop"/>
+			<button label="fremad" name="seek"/>
 		</layout_panel>
 		<layout_panel name="parcel_owner_controls">
 			<button label="Send denne side til parcel" name="assign"/>
 		</layout_panel>
 		<layout_panel name="external_controls">
-			<button label="Åben i min browser" name="open_browser"/>
-			<check_box label="Åben altid i min browser" name="open_always"/>
+			<button label="Åben i min internetbrowser" name="open_browser"/>
+			<check_box label="Åben altid i min internetbrowser" name="open_always"/>
 			<button label="Luk" name="close"/>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/minimal/xui/da/floater_web_content.xml b/indra/newview/skins/minimal/xui/da/floater_web_content.xml
index 74092e88ec..0410f74324 100644
--- a/indra/newview/skins/minimal/xui/da/floater_web_content.xml
+++ b/indra/newview/skins/minimal/xui/da/floater_web_content.xml
@@ -2,13 +2,13 @@
 <floater name="floater_web_content" title="">
 	<layout_stack name="stack1">
 		<layout_panel name="nav_controls">
-			<button name="back" tool_tip="Navigér tilbage"/>
-			<button name="forward" tool_tip="Navigér frem"/>
-			<button name="stop" tool_tip="Stop navigering"/>
+			<button name="back" tool_tip="Gå bagud"/>
+			<button name="forward" tool_tip="Gå frem"/>
+			<button name="stop" tool_tip="Stop"/>
 			<button name="reload" tool_tip="Genindlæs side"/>
 			<combo_box name="address" tool_tip="Indtast URL her"/>
 			<icon name="media_secure_lock_flag" tool_tip="Sikker browsing"/>
-			<button name="popexternal" tool_tip="Åben denne URL i din normale browser"/>
+			<button name="popexternal" tool_tip="Åben denne URL i din normale internet browser"/>
 		</layout_panel>
 	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/minimal/xui/da/menu_people_nearby.xml b/indra/newview/skins/minimal/xui/da/menu_people_nearby.xml
index 5470c32761..220ab8724f 100644
--- a/indra/newview/skins/minimal/xui/da/menu_people_nearby.xml
+++ b/indra/newview/skins/minimal/xui/da/menu_people_nearby.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Profil" name="View Profile"/>
-	<menu_item_call label="Tilføj ven" name="Add Friend"/>
-	<menu_item_call label="Fjern ven" name="Remove Friend"/>
-	<menu_item_call label="Besked" name="IM"/>
+	<menu_item_call label="Vis profil" name="View Profile"/>
+	<menu_item_call label="Tilføj som ven" name="Add Friend"/>
+	<menu_item_call label="Fjern venskab" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
 	<menu_item_call label="Opkald" name="Call"/>
 	<menu_item_call label="Kort" name="Map"/>
 	<menu_item_call label="Del" name="Share"/>
diff --git a/indra/newview/skins/minimal/xui/da/notifications.xml b/indra/newview/skins/minimal/xui/da/notifications.xml
index 0d2aaf45ce..e77eeee8df 100644
--- a/indra/newview/skins/minimal/xui/da/notifications.xml
+++ b/indra/newview/skins/minimal/xui/da/notifications.xml
@@ -1327,21 +1327,19 @@ Prøv igen om lidt.
 		No valid parcel could be found.
 	</notification>
 	<notification name="ObjectGiveItem">
-		Et object med navnet &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; ejet af [NAME_SLURL] har givet dig denne [OBJECTTYPE]:
-[ITEM_SLURL]
+		Et objekt ved navn &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; ejet af [NAME_SLURL] tilbyder dig [ITEM_SLURL].  For at bruge denne genstand skal du skifte til avanceret tilstand, hvor du kan finde genstanden i din beholdning. Ønsker du at logge ud for at skifte tilstand? Valg af tilstand findes på login skærmbilledet.
 		<form name="form">
-			<button name="Keep" text="Behold"/>
-			<button name="Discard" text="Smid væk"/>
-			<button name="Mute" text="Blokér"/>
+			<button name="Keep" text="Behold genstand"/>
+			<button name="Discard" text="Afvis genstand"/>
+			<button name="Mute" text="Blokér objekt"/>
 		</form>
 	</notification>
 	<notification name="UserGiveItem">
-		[NAME_SLURL] har givet dig denne/dette [OBJECTTYPE]:
-[ITEM_SLURL]
+		[NAME_SLURL] tilbyder dig [ITEM_SLURL].  For at bruge denne genstand skal du skifte til avanceret tilstand, hvor du kan finde genstanden i din beholdning. Ønsker du at logge ud for at skifte tilstand? Valg af tilstand findes på login skærmbilledet.
 		<form name="form">
-			<button name="Show" text="Vis"/>
-			<button name="Discard" text="Smid væk"/>
-			<button name="Mute" text="Blokér"/>
+			<button name="Show" text="Behold genstand"/>
+			<button name="Discard" text="Afvis genstand"/>
+			<button name="Mute" text="Blokér bruger"/>
 		</form>
 	</notification>
 	<notification name="GodMessage">
diff --git a/indra/newview/skins/minimal/xui/da/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/da/panel_bottomtray.xml
index 53a30136ae..d5d8c3cf7f 100644
--- a/indra/newview/skins/minimal/xui/da/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/da/panel_bottomtray.xml
@@ -11,10 +11,10 @@
 			<bottomtray_button label="Vis" name="camera_btn" tool_tip="Vis/Skjul kamerakontroller"/>
 		</layout_panel>
 		<layout_panel name="avatar_and_destinations_panel">
-			<radio_group name="avatar_and_destination_btns">
-				<radio_item name="destination_btn" value="0"/>
-				<radio_item name="avatar_btn" value="1"/>
-			</radio_group>
+			<bottomtray_button label="Destinationer" name="destination_btn" tool_tip="Vis person vindue"/>
+		</layout_panel>
+		<layout_panel name="avatar_and_destinations_panel">
+			<bottomtray_button label="Min avatar" name="avatar_btn"/>
 		</layout_panel>
 		<layout_panel name="people_panel">
 			<bottomtray_button label="Personer" name="show_people_button" tool_tip="Vis person-vindue"/>
diff --git a/indra/newview/skins/minimal/xui/da/panel_group_control_panel.xml b/indra/newview/skins/minimal/xui/da/panel_group_control_panel.xml
index 26fe4f6ebe..23a5e79e22 100644
--- a/indra/newview/skins/minimal/xui/da/panel_group_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/da/panel_group_control_panel.xml
@@ -8,10 +8,10 @@
 			<button label="Opkald gruppe" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
-			<button label="Forlad opkald" name="end_call_btn"/>
+			<button label="Forlad samtale" name="end_call_btn"/>
 		</layout_panel>
 		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Åben stemmekontroller" name="voice_ctrls_btn"/>
+			<button label="Åben stemme indstillinger" name="voice_ctrls_btn"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/minimal/xui/da/panel_login.xml b/indra/newview/skins/minimal/xui/da/panel_login.xml
index fdcc550d82..2e0f726e1a 100644
--- a/indra/newview/skins/minimal/xui/da/panel_login.xml
+++ b/indra/newview/skins/minimal/xui/da/panel_login.xml
@@ -21,7 +21,7 @@
 				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 (Standard)" name="Basic"/>
+				<combo_box.item label="Basis" name="Basic"/>
 				<combo_box.item label="Avanceret" name="Advanced"/>
 			</combo_box>
 			<text name="start_location_text">
-- 
cgit v1.2.3


From 9899e2e7dd52924f40092b70a2071a9272d0bb1d Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Tue, 14 Jun 2011 12:28:05 -0700
Subject: FIX CT-641 DA translation for Set23

---
 .../skins/default/xui/da/floater_beacons.xml       |   1 +
 .../skins/default/xui/da/menu_avatar_self.xml      |   1 +
 .../skins/default/xui/da/menu_bottomtray.xml       |   2 +-
 .../skins/default/xui/da/menu_inventory.xml        |   1 +
 .../skins/default/xui/da/menu_inventory_add.xml    |   1 +
 .../skins/default/xui/da/menu_media_ctrl.xml       |   6 +
 .../skins/default/xui/da/menu_outfit_gear.xml      |   5 +-
 indra/newview/skins/default/xui/da/menu_viewer.xml |   5 +
 .../newview/skins/default/xui/da/notifications.xml |  17 ++-
 .../skins/default/xui/da/panel_edit_physics.xml    |  14 +++
 .../skins/default/xui/da/panel_edit_wearable.xml   |   6 +
 .../default/xui/da/panel_preferences_chat.xml      |   4 +-
 .../default/xui/da/panel_preferences_colors.xml    |  14 +--
 .../default/xui/da/panel_preferences_graphics1.xml |   6 +-
 .../default/xui/da/panel_preferences_sound.xml     |   2 +-
 .../default/xui/da/panel_scrolling_param_base.xml  |   4 +
 indra/newview/skins/default/xui/da/strings.xml     | 123 +++++++++++++++++++++
 17 files changed, 196 insertions(+), 16 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/da/menu_media_ctrl.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_edit_physics.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/da/floater_beacons.xml b/indra/newview/skins/default/xui/da/floater_beacons.xml
index 8049b072ce..5100a6df1f 100644
--- a/indra/newview/skins/default/xui/da/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/da/floater_beacons.xml
@@ -17,5 +17,6 @@
 		<check_box label="Kun berøring" name="touch_only"/>
 		<check_box label="Lydkilder" name="sounds"/>
 		<check_box label="Partikel kilder" name="particles"/>
+		<check_box label="Medie kilder" name="moapbeacon"/>
 	</panel>
 </floater>
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 0080f7a59e..4e6b42a744 100644
--- a/indra/newview/skins/default/xui/da/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/da/menu_avatar_self.xml
@@ -14,6 +14,7 @@
 			<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="Fysik" name="Self Physics"/>
 			<menu_item_call label="Alpha" name="Self Alpha"/>
 			<menu_item_call label="Alt tøj" name="All Clothes"/>
 		</context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_bottomtray.xml b/indra/newview/skins/default/xui/da/menu_bottomtray.xml
index 9ac296904a..a0d74db36d 100644
--- a/indra/newview/skins/default/xui/da/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/da/menu_bottomtray.xml
@@ -1,6 +1,6 @@
 <?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="Tal knap" 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"/>
diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml
index 35551318d1..f9bdf36f1f 100644
--- a/indra/newview/skins/default/xui/da/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory.xml
@@ -25,6 +25,7 @@
 		<menu_item_call label="Nye underbukser" name="New Underpants"/>
 		<menu_item_call label="Nyt alpha lag" name="New Alpha Mask"/>
 		<menu_item_call label="Ny tatovering" name="New Tattoo"/>
+		<menu_item_call label="Ny fysik" name="New Physics"/>
 	</menu>
 	<menu label="Nye kropsdele" name="New Body Parts">
 		<menu_item_call label="Ny figur" name="New Shape"/>
diff --git a/indra/newview/skins/default/xui/da/menu_inventory_add.xml b/indra/newview/skins/default/xui/da/menu_inventory_add.xml
index 07f70d7190..2f953ab9f7 100644
--- a/indra/newview/skins/default/xui/da/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory_add.xml
@@ -23,6 +23,7 @@
 		<menu_item_call label="Nye underbukser" name="New Underpants"/>
 		<menu_item_call label="Nyt alpha lag" name="New Alpha"/>
 		<menu_item_call label="Ny tatovering" name="New Tattoo"/>
+		<menu_item_call label="Ny fysik" name="New Physics"/>
 	</menu>
 	<menu label="Nye kropsdele" name="New Body Parts">
 		<menu_item_call label="Ny kropsbygning" name="New Shape"/>
diff --git a/indra/newview/skins/default/xui/da/menu_media_ctrl.xml b/indra/newview/skins/default/xui/da/menu_media_ctrl.xml
new file mode 100644
index 0000000000..788b1c4b59
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_media_ctrl.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="media ctrl context menu">
+	<menu_item_call label="Klip" name="Cut"/>
+	<menu_item_call label="Kopier" name="Copy"/>
+	<menu_item_call label="Sæt ind" name="Paste"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_outfit_gear.xml b/indra/newview/skins/default/xui/da/menu_outfit_gear.xml
index 8b4c776496..0b0fff3b93 100644
--- a/indra/newview/skins/default/xui/da/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_outfit_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear Outfit">
+<toggleable_menu name="Gear Outfit">
 	<menu_item_call label="Tag på - Erstat nuværende sæt" name="wear"/>
 	<menu_item_call label="Tag på - Tilføj til nuværende sæt" name="wear_add"/>
 	<menu_item_call label="Tag af - Fjern fra nuværende sæt" name="take_off"/>
@@ -14,6 +14,7 @@
 		<menu_item_call label="Ny undertrøje" name="New Undershirt"/>
 		<menu_item_call label="Nye underbukser" name="New Underpants"/>
 		<menu_item_call label="Ny alpha" name="New Alpha"/>
+		<menu_item_call label="Ny fysik" name="New Physics"/>
 		<menu_item_call label="Ny tatovering" name="New Tattoo"/>
 	</menu>
 	<menu label="Nye kropsdele" name="New Body Parts">
@@ -24,4 +25,4 @@
 	</menu>
 	<menu_item_call label="Omdøb sæt" name="rename"/>
 	<menu_item_call label="Slet sæt" name="delete_outfit"/>
-</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 f59a0622be..0c1892e58d 100644
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -334,4 +334,9 @@
 		</menu>
 		<menu_item_call label="&quot;God Tools&quot;" name="God Tools"/>
 	</menu>
+	<menu label="Admin" name="Deprecated">
+		<menu label="Take Off Clothing" name="Take Off Clothing">
+			<menu_item_call label="Fysik" name="Physics"/>
+		</menu>
+	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index 0d2aaf45ce..52f0574476 100644
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -1746,6 +1746,13 @@ Sluk for alles lyd?
 	<notification label="Stå op" name="HintSit">
 		For at rejse dig op og forlad siddeposition, tryk på &quot;Stå op&quot; knappen.
 	</notification>
+	<notification label="Tal" name="HintSpeak">
+		Klik på tal knappen for at tænde og slukke for din mikrofon.
+
+Klik på den lille pil-op for at se stemme kontrolpanelet.
+
+Skjules tale knappen, vil stemmechat ikke være mulig.
+	</notification>
 	<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>
@@ -1755,12 +1762,16 @@ Sluk for alles lyd?
 	<notification label="Flyt" name="HintMove">
 		For at gå eller løbe, åben Flyt panelet for neden og brug pilene til at navigere. Du kan også bruge pile-tasterne på dit tastatur.
 	</notification>
+	<notification label="" name="HintMoveClick">
+		1. Klik for at gå
+Klik et hvorsomhelst på jorden for at gå til dette sted.
+
+2. Klik og træk for at rotere visning
+Klik hvorsomhelst i verden for at rotere din visning
+	</notification>
 	<notification label="Visningsnavn" name="HintDisplayName">
 		Angiv dit konfigurérbare visningsnavn her. Dette er i tillæg til dit unikke brugernavn, som ikke kan ændres. Du kan ændre hvordan du ser andre beboeres navne i dine indstillinger.
 	</notification>
-	<notification label="Flyt" name="HintMoveArrows">
-		For at gå, brug piletasterne på tastaturet. Du kan løbe ved at trykke to gange på Pil-Op
-	</notification>
 	<notification label="Se" name="HintView">
 		For at ændre dit kamera-view, benyt kredsløbs og panoreringskontrollerne. Nulstil view ved at trykke Esc eller ved at gå.
 	</notification>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_physics.xml b/indra/newview/skins/default/xui/da/panel_edit_physics.xml
new file mode 100644
index 0000000000..16c9b16fa3
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_edit_physics.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_physics_panel">
+	<panel label="" name="accordion_panel">
+		<accordion name="physics_accordion">
+			<accordion_tab name="physics_breasts_updown_tab" title="Bryst fasthed"/>
+			<accordion_tab name="physics_breasts_inout_tab" title="Kavalergang"/>
+			<accordion_tab name="physics_breasts_leftright_tab" title="Bryst sving"/>
+			<accordion_tab name="physics_belly_tab" title="Mave fasthed"/>
+			<accordion_tab name="physics_butt_tab" title="Bagdel fasthed"/>
+			<accordion_tab name="physics_butt_leftright_tab" title="Bagdel sving"/>
+			<accordion_tab name="physics_advanced_tab" title="Avancerede parametre"/>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
index 4b9360f0d1..906870e6d9 100644
--- a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
@@ -45,6 +45,9 @@
 	<string name="edit_tattoo_title">
 		Redigerer tatovering
 	</string>
+	<string name="edit_physics_title">
+		Redigering af fysik
+	</string>
 	<string name="shape_desc_text">
 		Kropsbygning:
 	</string>
@@ -90,6 +93,9 @@
 	<string name="tattoo_desc_text">
 		Tatovering:
 	</string>
+	<string name="physics_desc_text">
+		Fysik:
+	</string>
 	<labeled_back_button label="Gem" name="back_btn" tool_tip="Tilbage til redigering"/>
 	<text name="edit_wearable_title" value="Redigerer kropsbygning"/>
 	<panel label="Trøje" name="wearable_type_panel">
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
index ed499619f6..19c82509cd 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
@@ -30,7 +30,9 @@
 	<spinner label="Tid før chatvisning forsvinder:" name="nearby_toasts_lifetime"/>
 	<spinner label="Tid før chatvisning forsvinder:" name="nearby_toasts_fadingtime"/>
 	<check_box name="translate_chat_checkbox"/>
-	<text name="translate_chb_label" >Benyt maskin-oversættelse ved chat (håndteret af Google)</text>
+	<text name="translate_chb_label">
+		Benyt maskinel oversættelse ved chat (håndteret af Google)
+	</text>
 	<text name="translate_language_text" width="110">
 		Oversæt chat til :
 	</text>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_colors.xml b/indra/newview/skins/default/xui/da/panel_preferences_colors.xml
index b2b00db769..1e024aa647 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_colors.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Farver" name="colors_panel">
 	<text name="effects_color_textbox">
-		Mine effekter (selektions-stråle):
+		Mine effekter (selektions pejlelys):
 	</text>
-	<color_swatch name="effect_color_swatch" tool_tip="Klik for at åbne farve-vælger"/>
+	<color_swatch name="effect_color_swatch" tool_tip="Klik for at åbne farvevælger"/>
 	<text name="font_colors">
-		Chat bogstavsfarver:
+		Vælg font farver:
 	</text>
 	<text name="text_box1">
 		Mig
@@ -29,12 +29,12 @@
 		URL&apos;er
 	</text>
 	<text name="bubble_chat">
-		Baggrundsfarve til navne-skilt (berører også Bubble Chat):
+		Navneskilt baggrundsfarve (påvirker også chat talebobler):
 	</text>
-	<color_swatch name="background" tool_tip="Vælg farve til navne-skilt"/>
-	<slider label="Uigennemsigtighed:" name="bubble_chat_opacity" tool_tip="Vælg gennemsigtighed for navneskilt"/>
+	<color_swatch name="background" tool_tip="Vælg navneskilt farve"/>
+	<slider label="Gennemsigtighed:" name="bubble_chat_opacity" tool_tip="Vælg navneskilt gennemsigtighed"/>
 	<text name="floater_opacity">
-		Vindue uigennemsigtighed:
+		Floater gennemsigtighed:
 	</text>
 	<slider label="Aktiv:" name="active"/>
 	<slider label="Inaktiv:" name="inactive"/>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
index 15da1f9ec5..d7b4ce3883 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
@@ -40,6 +40,10 @@
 			<combo_box.item label="Alle avatarer og objekter" name="3"/>
 			<combo_box.item label="Alt" name="4"/>
 		</combo_box>
+		<slider label="Avatar fysik:" name="AvatarPhysicsDetail"/>
+		<text name="AvatarPhysicsDetailText">
+			Lav
+		</text>
 		<slider label="Maks. visnings-afstand:" name="DrawDistance"/>
 		<text name="DrawDistanceMeterText2">
 			m
@@ -78,7 +82,7 @@
 			Lav
 		</text>
 		<text name="AvatarRenderingText">
-			Avatar gengivelse
+			Avatar rendering:
 		</text>
 		<check_box initial_value="true" label="Mini-figurer på lang afstand" name="AvatarImpostors"/>
 		<check_box initial_value="true" label="Hardware Skinning" name="AvatarVertexProgram"/>
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 0626976cb5..26d2ae4abd 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
@@ -6,7 +6,7 @@
 	<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
+		Sluk for lyd når minimeret
 	</text>
 	<slider label="Knapper" name="UI Volume"/>
 	<slider label="Omgivelser" name="Wind Volume"/>
diff --git a/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml
new file mode 100644
index 0000000000..fa659040ea
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="LLScrollingPanelParamBase">
+	<slider label="[DESC]" name="param slider"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index afc826d6d7..7fd8d8a106 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -852,6 +852,9 @@
 	<string name="tattoo">
 		Tatovering
 	</string>
+	<string name="physics">
+		Fysik
+	</string>
 	<string name="invalid">
 		ugyldig
 	</string>
@@ -891,6 +894,9 @@
 	<string name="tattoo_not_worn">
 		Tatovering ikke benyttet
 	</string>
+	<string name="physics_not_worn">
+		Ikke noget fysisk båret
+	</string>
 	<string name="invalid_not_worn">
 		ugyldig
 	</string>
@@ -939,6 +945,9 @@
 	<string name="create_new_tattoo">
 		Opret ny tatovering
 	</string>
+	<string name="create_new_physics">
+		Opret ny fysik
+	</string>
 	<string name="create_new_invalid">
 		ugyldig
 	</string>
@@ -2175,6 +2184,114 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Bulbous Nose">
 		Kartoffelnæse
 	</string>
+	<string name="Breast Physics Mass">
+		Bryst fylde
+	</string>
+	<string name="Breast Physics Smoothing">
+		Brystudjævning
+	</string>
+	<string name="Breast Physics Gravity">
+		Bryst tyngde
+	</string>
+	<string name="Breast Physics Drag">
+		Bryst inerti
+	</string>
+	<string name="Breast Physics InOut Max Effect">
+		Maks. effekt
+	</string>
+	<string name="Breast Physics InOut Spring">
+		Fjeder
+	</string>
+	<string name="Breast Physics InOut Gain">
+		Øg
+	</string>
+	<string name="Breast Physics InOut Damping">
+		Dæmpning
+	</string>
+	<string name="Breast Physics UpDown Max Effect">
+		Maks. effekt
+	</string>
+	<string name="Breast Physics UpDown Spring">
+		Fjeder
+	</string>
+	<string name="Breast Physics UpDown Gain">
+		Øg
+	</string>
+	<string name="Breast Physics UpDown Damping">
+		Dæmpning
+	</string>
+	<string name="Breast Physics LeftRight Max Effect">
+		Maks. effekt
+	</string>
+	<string name="Breast Physics LeftRight Spring">
+		Fjeder
+	</string>
+	<string name="Breast Physics LeftRight Gain">
+		Øg
+	</string>
+	<string name="Breast Physics LeftRight Damping">
+		Dæmpning
+	</string>
+	<string name="Belly Physics Mass">
+		Mave omfang
+	</string>
+	<string name="Belly Physics Smoothing">
+		maveudjævning
+	</string>
+	<string name="Belly Physics Gravity">
+		Mave tyngde
+	</string>
+	<string name="Belly Physics Drag">
+		Mave inerti
+	</string>
+	<string name="Belly Physics UpDown Max Effect">
+		Maks. effekt
+	</string>
+	<string name="Belly Physics UpDown Spring">
+		Fjeder
+	</string>
+	<string name="Belly Physics UpDown Gain">
+		Øg
+	</string>
+	<string name="Belly Physics UpDown Damping">
+		Dæmpning
+	</string>
+	<string name="Butt Physics Mass">
+		Bagdel omfang
+	</string>
+	<string name="Butt Physics Smoothing">
+		Bagdelsudjævning
+	</string>
+	<string name="Butt Physics Gravity">
+		Bagdel tyngde
+	</string>
+	<string name="Butt Physics Drag">
+		Bagdel modstand
+	</string>
+	<string name="Butt Physics UpDown Max Effect">
+		Maks. effekt
+	</string>
+	<string name="Butt Physics UpDown Spring">
+		Fjeder
+	</string>
+	<string name="Butt Physics UpDown Gain">
+		Øg
+	</string>
+	<string name="Butt Physics UpDown Damping">
+		Dæmpning
+	</string>
+	<string name="Butt Physics LeftRight Max Effect">
+		Maks. effekt
+	</string>
+	<string name="Butt Physics LeftRight Spring">
+		Fjeder
+	</string>
+	<string name="Butt Physics LeftRight Gain">
+		Øg
+	</string>
+	<string name="Butt Physics LeftRight Damping">
+		Dæmpning
+	</string>
 	<string name="Bushy Eyebrows">
 		Buskede øjenbryn
 	</string>
@@ -2184,6 +2301,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Butt Size">
 		Størrelse bagdel
 	</string>
+	<string name="Butt Gravity">
+		Bagdel tyngde
+	</string>
 	<string name="bustle skirt">
 		Tournure
 	</string>
@@ -3659,6 +3779,9 @@ Krænkelsesanmeldelse
 	<string name="New Tattoo">
 		Ny tatovering
 	</string>
+	<string name="New Physics">
+		Ny fysik
+	</string>
 	<string name="Invalid Wearable">
 		Kan ikke tages på
 	</string>
-- 
cgit v1.2.3


From 155cda7e829070b5f4c5f75acbbcef02967aeeef Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Tue, 14 Jun 2011 12:33:41 -0700
Subject: WIP CT-648 DA translation for Set24, Basic Set3

---
 .../newview/skins/default/xui/da/floater_about.xml |  40 ++--
 .../skins/default/xui/da/floater_buy_contents.xml  |   2 +-
 .../default/xui/da/floater_import_collada.xml      |  23 ++
 .../xui/da/floater_inventory_view_finder.xml       |  39 ++--
 .../skins/default/xui/da/floater_model_preview.xml | 231 ++++++++++++++++++++
 .../skins/default/xui/da/floater_model_wizard.xml  | 241 +++++++++++++++++++++
 .../default/xui/da/floater_price_for_listing.xml   |  18 ++
 .../skins/default/xui/da/floater_sound_devices.xml |   7 +
 .../newview/skins/default/xui/da/floater_tools.xml |  48 +++-
 .../skins/default/xui/da/menu_inventory_add.xml    |   2 +
 .../xui/da/menu_model_import_gear_default.xml      |   8 +
 indra/newview/skins/default/xui/da/menu_viewer.xml |  12 +-
 .../newview/skins/default/xui/da/notifications.xml |  42 ++++
 .../default/xui/da/panel_preferences_colors.xml    |   3 +
 .../default/xui/da/panel_preferences_graphics1.xml |  12 +
 .../skins/default/xui/da/panel_region_general.xml  |   1 +
 .../skins/default/xui/da/panel_sound_devices.xml   |  19 ++
 indra/newview/skins/default/xui/da/strings.xml     | 143 ++++++++++++
 .../minimal/xui/da/panel_adhoc_control_panel.xml   |   2 +-
 .../skins/minimal/xui/da/panel_bottomtray.xml      |  24 +-
 .../minimal/xui/da/panel_im_control_panel.xml      |   2 +-
 .../newview/skins/minimal/xui/da/panel_people.xml  |   2 +-
 22 files changed, 862 insertions(+), 59 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/da/floater_import_collada.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_model_preview.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_model_wizard.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_price_for_listing.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_sound_devices.xml
 create mode 100644 indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_sound_devices.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index 9b1df65d1b..0ccaab73ba 100644
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -56,24 +56,30 @@ Tak til følgende beboere: Drew Dwi, Zai Lynch, Latif Khalifa, Ellla McMahon, Ha
 		<panel label="Licenser" name="licenses_panel">
 			<text_editor name="credits_editor">
 				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-  APR Copyright (C) 2000-2004 The Apache Software Foundation
-  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
-  DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
-  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
-  GL Copyright (C) 1999-2004 Brian Paul.
-  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-  ogg/vorbis Copyright (C) 2001, Xiphophorus
-  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-  google-perftools Copyright (c) 2005, Google Inc.
+APR Copyright (C) 2000-2004 The Apache Software Foundation
+Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
+cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
+expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+GL Copyright (C) 1999-2004 Brian Paul.
+GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
+google-perftools Copyright (c) 2005, Google Inc.
+Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+ogg/vorbis Copyright (C) 2001, Xiphophorus
+OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+PCRE Copyright (c) 1997-2008 University of Cambridge
+SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
+google-perftools Copyright (c) 2005, Google Inc.
 
-Alle rettigheder forbeholdes.  Se licenses.txt for detaljer.
+Second Life Viewer uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.
+
+All rights reserved.  See licenses.txt for details.
 
 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 			</text_editor>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_contents.xml b/indra/newview/skins/default/xui/da/floater_buy_contents.xml
index c2b2ccc244..085fa2f9cc 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_contents.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_buy_contents" title="KØB INDHOLD">
 	<text name="contains_text">
-		[NAME] indeholder:
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; contains:
 	</text>
 	<text name="buy_text">
 		Køb for L$[AMOUNT] fra [NAME]?
diff --git a/indra/newview/skins/default/xui/da/floater_import_collada.xml b/indra/newview/skins/default/xui/da/floater_import_collada.xml
new file mode 100644
index 0000000000..ebc7c86388
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_import_collada.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Import Collada" title="Import Scene">
+	<text name="mesh count">
+		Meshes: [COUNT]
+	</text>
+	<text name="texture count">
+		Textures: [COUNT]
+	</text>
+	<text name="status">
+		Status: [STATUS]
+	</text>
+	<button label="Cancel" name="cancel"/>
+	<button label="OK" name="ok"/>
+	<string name="status_idle">
+		Idle
+	</string>
+	<string name="status_uploading">
+		Uploading [NAME]
+	</string>
+	<string name="status_creating">
+		Creating object [NAME]
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml
index af2910fe58..655701bb96 100644
--- a/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml
@@ -1,24 +1,25 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory Finder" title="INVENTORY_RECENT_ITEMS">
-	<check_box label="Animation" name="check_animation" />
-	<check_box label="Visitkort" name="check_calling_card" />
-	<check_box label="Tøj" name="check_clothing" />
-	<check_box label="Bevægelser" name="check_gesture" />
-	<check_box label="Landemærke" name="check_landmark" />
-	<check_box label="Note" name="check_notecard" />
-	<check_box label="Objekter" name="check_object" />
-	<check_box label="Scripts" name="check_script" />
-	<check_box label="Lyde" name="check_sound" />
-	<check_box label="Teksturer" name="check_texture" />
-	<check_box label="Foto&apos;s" name="check_snapshot" />
-	<button label="Alle" label_selected="Alle" name="All" />
-	<button label="Ingen" label_selected="Ingen" name="None" />
-	<check_box label="Vis altid mapper" name="check_show_empty" />
-	<check_box label="Siden sidste logoff" name="check_since_logoff" />
+	<check_box label="Animation" name="check_animation"/>
+	<check_box label="Visitkort" name="check_calling_card"/>
+	<check_box label="Tøj" name="check_clothing"/>
+	<check_box label="Bevægelser" name="check_gesture"/>
+	<check_box label="Landemærke" name="check_landmark"/>
+	<check_box label="Meshes" name="check_mesh"/>
+	<check_box label="Note" name="check_notecard"/>
+	<check_box label="Objekter" name="check_object"/>
+	<check_box label="Scripts" name="check_script"/>
+	<check_box label="Lyde" name="check_sound"/>
+	<check_box label="Teksturer" name="check_texture"/>
+	<check_box label="Foto&apos;s" name="check_snapshot"/>
+	<button label="Alle" label_selected="Alle" name="All"/>
+	<button label="Ingen" label_selected="Ingen" name="None"/>
+	<check_box label="Vis altid mapper" name="check_show_empty"/>
+	<check_box label="Siden sidste logoff" name="check_since_logoff"/>
 	<text name="- OR -">
 		- ELLER -
 	</text>
-	<spinner label="Timer siden" name="spin_hours_ago" />
-	<spinner label="Dage siden" name="spin_days_ago" />
-	<button label="Luk" label_selected="Luk" name="Close" />
+	<spinner label="Timer siden" name="spin_hours_ago"/>
+	<spinner label="Dage siden" name="spin_days_ago"/>
+	<button label="Luk" label_selected="Luk" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_model_preview.xml b/indra/newview/skins/default/xui/da/floater_model_preview.xml
new file mode 100644
index 0000000000..a98c70ff52
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_model_preview.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Preview" title="Upload Model">
+	<string name="status_idle">
+		Idle
+	</string>
+	<string name="status_reading_file">
+		Loading...
+	</string>
+	<string name="status_generating_meshes">
+		Generating Meshes...
+	</string>
+	<string name="status_vertex_number_overflow">
+		Error: Vertex number is more than 65534, aborted!
+	</string>
+	<string name="high">
+		High
+	</string>
+	<string name="medium">
+		Medium
+	</string>
+	<string name="low">
+		Low
+	</string>
+	<string name="lowest">
+		Lowest
+	</string>
+	<string name="mesh_status_good">
+		Ship it!
+	</string>
+	<string name="mesh_status_na">
+		N/A
+	</string>
+	<string name="mesh_status_none">
+		None
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		Levels of detail have a different number of textureable faces.
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		Levels of detail have a different number of mesh instances.
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		Level of detail has too many vertices.
+	</string>
+	<string name="mesh_status_missing_lod">
+		Missing required level of detail.
+	</string>
+	<string name="layer_all">
+		All
+	</string>
+	<string name="decomposing">
+		Analyzing...
+	</string>
+	<string name="simplifying">
+		Simplifying...
+	</string>
+	<text name="name_label">
+		Name:
+	</text>
+	<text name="lod_label">
+		Preview:
+	</text>
+	<combo_box name="preview_lod_combo" tool_tip="LOD to view in preview render">
+		<combo_item name="high">
+			Level of Detail: High
+		</combo_item>
+		<combo_item name="medium">
+			Level of Detail: Medium
+		</combo_item>
+		<combo_item name="low">
+			Level of Detail: Low
+		</combo_item>
+		<combo_item name="lowest">
+			Level of Detail: Lowest
+		</combo_item>
+	</combo_box>
+	<panel>
+		<text name="streaming cost">
+			Resource Cost: [COST]
+		</text>
+		<text name="physics cost">
+			Physics Cost: [COST]
+		</text>
+		<text name="upload fee">
+			Upload Fee: N/A
+		</text>
+	</panel>
+	<text name="status">
+		[STATUS]
+	</text>
+	<button label="Defaults" name="reset_btn" tool_tip="Reset to defaults"/>
+	<button label="Upload" name="ok_btn" tool_tip="Upload to simulator"/>
+	<button label="Cancel" name="cancel_btn"/>
+	<tab_container name="import_tab">
+		<panel label="Level of Detail" name="lod_panel">
+			<text name="lod_table_header">
+				Select Level of Detail:
+			</text>
+			<text name="high_label" value="High"/>
+			<text name="high_triangles" value="0"/>
+			<text name="high_vertices" value="0"/>
+			<text name="medium_label" value="Medium"/>
+			<text name="medium_triangles" value="0"/>
+			<text name="medium_vertices" value="0"/>
+			<text name="low_label" value="Low"/>
+			<text name="low_triangles" value="0"/>
+			<text name="low_vertices" value="0"/>
+			<text name="lowest_label" value="Lowest"/>
+			<text name="lowest_triangles" value="0"/>
+			<text name="lowest_vertices" value="0"/>
+			<text name="lod_table_footer">
+				Level of Detail: [DETAIL]
+			</text>
+			<radio_group name="lod_file_or_limit" value="lod_from_file">
+				<radio_item label="Load from file" name="lod_from_file"/>
+				<radio_item label="Auto generate" name="lod_auto_generate"/>
+				<radio_item label="None" name="lod_none"/>
+			</radio_group>
+			<button label="Browse..." name="lod_browse"/>
+			<combo_box name="lod_mode">
+				<combo_item name="triangle_limit">
+					Triangle Limit
+				</combo_item>
+				<combo_item name="error_threshold">
+					Error Threshold
+				</combo_item>
+			</combo_box>
+			<text name="build_operator_text">
+				Build Operator:
+			</text>
+			<text name="queue_mode_text">
+				Queue Mode:
+			</text>
+			<combo_box name="build_operator">
+				<combo_item name="edge_collapse">
+					Edge Collapse
+				</combo_item>
+				<combo_item name="half_edge_collapse">
+					Half Edge Collapse
+				</combo_item>
+			</combo_box>
+			<combo_box name="queue_mode">
+				<combo_item name="greedy">
+					Greedy
+				</combo_item>
+				<combo_item name="lazy">
+					Lazy
+				</combo_item>
+				<combo_item name="independent">
+					Independent
+				</combo_item>
+			</combo_box>
+			<text name="border_mode_text">
+				Border Mode:
+			</text>
+			<text name="share_tolderance_text">
+				Share Tolerance:
+			</text>
+			<combo_box name="border_mode">
+				<combo_item name="border_unlock">
+					Unlock
+				</combo_item>
+				<combo_item name="border_lock">
+					Lock
+				</combo_item>
+			</combo_box>
+			<text name="crease_label">
+				Crease Angle:
+			</text>
+			<spinner name="crease_angle" value="75"/>
+		</panel>
+		<panel label="Physics" name="physics_panel">
+			<panel name="physics geometry">
+				<radio_group name="physics_load_radio" value="physics_load_from_file">
+					<radio_item label="File:" name="physics_load_from_file"/>
+					<radio_item label="Use Level of Detail:" name="physics_use_lod"/>
+				</radio_group>
+				<combo_box name="physics_lod_combo" tool_tip="LOD to use for physics shape">
+					<combo_item name="physics_lowest">
+						Lowest
+					</combo_item>
+					<combo_item name="physics_low">
+						Low
+					</combo_item>
+					<combo_item name="physics_medium">
+						Medium
+					</combo_item>
+					<combo_item name="physics_high">
+						High
+					</combo_item>
+				</combo_box>
+				<button label="Browse..." name="physics_browse"/>
+			</panel>
+			<panel name="physics analysis">
+				<slider label="Smooth:" name="Smooth"/>
+				<check_box label="Close Holes (slow)" name="Close Holes (Slow)"/>
+				<button label="Analyze" name="Decompose"/>
+				<button label="Cancel" name="decompose_cancel"/>
+			</panel>
+			<panel name="physics simplification">
+				<slider label="Passes:" name="Combine Quality"/>
+				<slider label="Detail Scale:" name="Detail Scale"/>
+				<slider label="Retain:" name="Retain%"/>
+				<button label="Simplify" name="Simplify"/>
+				<button label="Cancel" name="simplify_cancel"/>
+			</panel>
+			<panel name="physics info">
+				<slider label="Preview Spread:" name="physics_explode"/>
+				<text name="physics_triangles">
+					Triangles: [TRIANGLES]
+				</text>
+				<text name="physics_points">
+					Vertices: [POINTS]
+				</text>
+				<text name="physics_hulls">
+					Hulls: [HULLS]
+				</text>
+			</panel>
+		</panel>
+		<panel label="Modifiers" name="modifiers_panel">
+			<spinner name="import_scale" value="1.0"/>
+			<text name="import_dimensions">
+				[X] x [Y] x [Z] m
+			</text>
+			<check_box label="Textures" name="upload_textures"/>
+			<check_box label="Skin weight" name="upload_skin"/>
+			<check_box label="Joint positions" name="upload_joints"/>
+			<spinner name="pelvis_offset" value="0.0"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_model_wizard.xml b/indra/newview/skins/default/xui/da/floater_model_wizard.xml
new file mode 100644
index 0000000000..8ad443581a
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_model_wizard.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Wizard" title="UPLOAD MODEL WIZARD">
+	<button label="5. Upload" name="upload_btn"/>
+	<button label="4. Review" name="review_btn"/>
+	<button label="3. Physics" name="physics2_btn"/>
+	<button label="3. Physics" name="physics_btn"/>
+	<button label="2. Optimize" name="optimize_btn"/>
+	<button label="1. Choose File" name="choose_file_btn"/>
+	<panel name="choose_file_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Upload Model
+			</text>
+		</panel>
+		<text name="description">
+			This wizard will help you import mesh models to Second Life.  First specify a file containing the model you wish to import.  Second Life supports COLLADA (.dae) files.
+		</text>
+		<panel name="content">
+			<text name="Cache location">
+				Filename:
+			</text>
+			<button label="Browse..." label_selected="Browse..." name="browse"/>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+	</panel>
+	<panel name="optimize_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Optimize
+			</text>
+		</panel>
+		<text name="description">
+			This wizard has optimized your model to improve performance. You may adjust the results of the optimization process bellow or click Next to continue.
+		</text>
+		<panel name="content">
+			<text name="high_detail_text">
+				Generate Level of Detail: High
+			</text>
+			<text name="medium_detail_text">
+				Generate Level of Detail: Medium
+			</text>
+			<text name="low_detail_text">
+				Generate Level of Detail: Low
+			</text>
+			<text name="lowest_detail_text">
+				Generate Level of Detail: Lowest
+			</text>
+		</panel>
+		<panel name="content2">
+			<text name="lod_label">
+				Model Preview:
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="LOD to view in preview render">
+				<combo_item name="high">
+					High
+				</combo_item>
+				<combo_item name="medium">
+					Medium
+				</combo_item>
+				<combo_item name="low">
+					Low
+				</combo_item>
+				<combo_item name="lowest">
+					Lowest
+				</combo_item>
+			</combo_box>
+			<text name="streaming cost">
+				Resource Cost:    [COST]
+			</text>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+	</panel>
+	<panel name="physics_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Physics
+			</text>
+		</panel>
+		<text name="description">
+			The wizard will create a physical shape, which determines how the object interacts with other objects and avatars. Set the slider to the detail level most appropriate for how your object will be used:
+		</text>
+		<panel name="content">
+			<text name="streaming cost">
+				Resource Cost:       [COST]
+			</text>
+		</panel>
+	</panel>
+	<panel name="physics2_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Physics
+			</text>
+		</panel>
+		<text name="description">
+			Preview the physics shape below then click Next to continue.  To modify the physics shape, click the Back button.
+		</text>
+		<panel name="content">
+			<text name="lod_label">
+				Model Preview:
+			</text>
+			<combo_box name="preview_lod_combo3" tool_tip="LOD to view in preview render">
+				<combo_item name="high">
+					High
+				</combo_item>
+				<combo_item name="medium">
+					Medium
+				</combo_item>
+				<combo_item name="low">
+					Low
+				</combo_item>
+				<combo_item name="lowest">
+					Lowest
+				</combo_item>
+			</combo_box>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+			<text name="streaming cost">
+				Resource Cost:       [COST]
+			</text>
+		</panel>
+	</panel>
+	<panel name="review_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Review
+			</text>
+		</panel>
+		<text name="description">
+			Review the details below then click. Upload to upload your model. Your L$ balance will be charged when you click Upload.
+		</text>
+		<panel name="content">
+			<text name="lod_label">
+				Model Preview:
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="LOD to view in preview render">
+				<combo_item name="high">
+					High
+				</combo_item>
+				<combo_item name="medium">
+					Medium
+				</combo_item>
+				<combo_item name="low">
+					Low
+				</combo_item>
+				<combo_item name="lowest">
+					Lowest
+				</combo_item>
+			</combo_box>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+		<text name="streaming cost">
+			Resource Cost:         [COST]
+		</text>
+		<text name="physics cost">
+			Physics Cost:        [COST]
+		</text>
+	</panel>
+	<panel name="upload_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Upload Complete!
+			</text>
+		</panel>
+		<text name="description">
+			Congratulations! Your model has been sucessfully uploaded.  You will find the model in the Objects folder in your inventory.
+		</text>
+	</panel>
+	<button label="&lt;&lt; Back" name="back"/>
+	<button label="Next &gt;&gt;" name="next"/>
+	<button label="Upload" name="upload" tool_tip="Upload to simulator"/>
+	<button label="Cancel" name="cancel"/>
+	<button label="Close" name="close"/>
+	<spinner name="import_scale" value="1.0"/>
+	<string name="status_idle">
+		Idle
+	</string>
+	<string name="status_reading_file">
+		Loading...
+	</string>
+	<string name="status_generating_meshes">
+		Generating Meshes...
+	</string>
+	<string name="status_vertex_number_overflow">
+		Error: Vertex number is more than 65534, aborted!
+	</string>
+	<string name="high">
+		High
+	</string>
+	<string name="medium">
+		Medium
+	</string>
+	<string name="low">
+		Low
+	</string>
+	<string name="lowest">
+		Lowest
+	</string>
+	<string name="mesh_status_good">
+		Ship it!
+	</string>
+	<string name="mesh_status_na">
+		N/A
+	</string>
+	<string name="mesh_status_none">
+		None
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		Levels of detail have a different number of textureable faces.
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		Levels of detail have a different number of mesh instances.
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		Level of detail has too many vertices.
+	</string>
+	<string name="mesh_status_missing_lod">
+		Missing required level of detail.
+	</string>
+	<string name="layer_all">
+		All
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_price_for_listing.xml b/indra/newview/skins/default/xui/da/floater_price_for_listing.xml
new file mode 100644
index 0000000000..b091fa09b5
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_price_for_listing.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="price_for_listing" title="PUBLISH CLASSIFIED AD">
+	<text name="explanation_text">
+		Din annonce vil løbe en uge fra udgivelsesdatoen.
+
+Placeringen af din annonce i listerne er afhængig af hvor meget du har valgt at betale.
+
+De annoncer der betales mest for vises øverst i lister og højere i søgeresultater.
+	</text>
+	<text name="price_text">
+		Pris for annonce:
+	</text>
+	<text name="price_symbol">
+		L$
+	</text>
+	<button label="OK" name="set_price_btn"/>
+	<button label="Annullér" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_sound_devices.xml b/indra/newview/skins/default/xui/da/floater_sound_devices.xml
new file mode 100644
index 0000000000..cb4cbba570
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_sound_devices.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_sound_devices" title="Lyd enheder">
+	<text name="voice_label">
+		Stemme chat
+	</text>
+	<check_box label="Aktiveret" name="enable_voice"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml
index 8264e366c0..815bde456e 100644
--- a/indra/newview/skins/default/xui/da/floater_tools.xml
+++ b/indra/newview/skins/default/xui/da/floater_tools.xml
@@ -122,6 +122,18 @@
 	<text name="prim_count">
 		Prims: [COUNT]
 	</text>
+	<text name="linked_set_count">
+		Lænkede sæt: [COUNT]
+	</text>
+	<text name="linked_set_cost" tool_tip="Pris for nuværende valgte lænkede sæt som [prims] / [physics complexity]">
+		Pris: [COST] / [PHYSICS]
+	</text>
+	<text name="object_count">
+		Objekter: [COUNT]
+	</text>
+	<text name="object_cost" tool_tip="Pris for nuværende valgte objekter som [prims] / [physics complexity]">
+		Pris: [COST] / [PHYSICS]
+	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Generelt" name="General">
 			<panel.string name="text deed continued">
@@ -266,15 +278,6 @@
 				<combo_box.item label="Ring" name="Ring"/>
 				<combo_box.item label="Sculpted" name="Sculpted"/>
 			</combo_box>
-			<combo_box name="material">
-				<combo_box.item label="Sten" name="Stone"/>
-				<combo_box.item label="Metal" name="Metal"/>
-				<combo_box.item label="Glas" name="Glass"/>
-				<combo_box.item label="Træ" name="Wood"/>
-				<combo_box.item label="Kød" name="Flesh"/>
-				<combo_box.item label="Plastik" name="Plastic"/>
-				<combo_box.item label="Gummi" name="Rubber"/>
-			</combo_box>
 			<text name="text cut">
 				Snit Z-akse (start/slut)
 			</text>
@@ -347,9 +350,19 @@
 				<combo_box.item label="Kuglering" name="Torus"/>
 				<combo_box.item label="Plan" name="Plane"/>
 				<combo_box.item label="Cylinder" name="Cylinder"/>
+				<combo_box.item label="Mesh" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Features" name="Features">
+			<panel.string name="None">
+				Ingen
+			</panel.string>
+			<panel.string name="Prim">
+				Prim
+			</panel.string>
+			<panel.string name="Convex Hull">
+				Konveks skrog
+			</panel.string>
 			<text name="select_single">
 				Vælg kun én prim for at ændre egenskaber.
 			</text>
@@ -374,6 +387,23 @@
 			<spinner label="Fokus" name="Light Focus"/>
 			<spinner label="Udfasning" name="Light Falloff"/>
 			<spinner label="Omgivelser" name="Light Ambiance"/>
+			<text name="label physicsshapetype">
+				Fysisk form type:
+			</text>
+			<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="Vælg fysisk form type"/>
+			<combo_box name="material">
+				<combo_box.item label="Sten" name="Stone"/>
+				<combo_box.item label="Metal" name="Metal"/>
+				<combo_box.item label="Glas" name="Glass"/>
+				<combo_box.item label="Træ" name="Wood"/>
+				<combo_box.item label="Kød" name="Flesh"/>
+				<combo_box.item label="Plastik" name="Plastic"/>
+				<combo_box.item label="Gummi" name="Rubber"/>
+			</combo_box>
+			<spinner label="Tyngde" name="Physics Gravity"/>
+			<spinner label="Friktion" name="Physics Friction"/>
+			<spinner label="Tæthed" name="Physics Density"/>
+			<spinner label="Restitution" name="Physics Restitution"/>
 		</panel>
 		<panel label="Tekstur" name="Texture">
 			<panel.string name="string repeats per meter">
diff --git a/indra/newview/skins/default/xui/da/menu_inventory_add.xml b/indra/newview/skins/default/xui/da/menu_inventory_add.xml
index 2f953ab9f7..eca03d3ee9 100644
--- a/indra/newview/skins/default/xui/da/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory_add.xml
@@ -4,6 +4,8 @@
 		<menu_item_call label="Billede (L$[COST])..." name="Upload Image"/>
 		<menu_item_call label="Lyd (L$[COST])..." name="Upload Sound"/>
 		<menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/>
+		<menu_item_call label="Model..." name="Upload Model"/>
+		<menu_item_call label="Model Wizard..." name="Upload Model Wizard"/>
 		<menu_item_call label="Hent mange (L$[COST] pr. fil)..." name="Bulk Upload"/>
 		<menu_item_call label="Sæt standardværdier for upload rettigheder" name="perm prefs"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml
new file mode 100644
index 0000000000..d9626692d5
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="model_menu_gear_default">
+	<menu_item_check label="Show edges" name="show_edges"/>
+	<menu_item_check label="Show physics" name="show_physics"/>
+	<menu_item_check label="Show textures" name="show_textures"/>
+	<menu_item_check label="Show skin weight" name="show_skin_weight"/>
+	<menu_item_check label="Show joint positions" name="show_joint_positions"/>
+</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 0c1892e58d..d352312d15 100644
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -118,6 +118,8 @@
 			<menu_item_call label="Billede (L$[COST])..." name="Upload Image"/>
 			<menu_item_call label="Lyd (L$[COST])..." name="Upload Sound"/>
 			<menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/>
+			<menu_item_call label="Model..." name="Upload Model"/>
+			<menu_item_call label="Model Wizard..." name="Upload Model Wizard"/>
 			<menu_item_call label="Mange (L$[COST] pr. fil)..." name="Bulk Upload"/>
 		</menu>
 		<menu_item_call label="Fortyd" name="Undo"/>
@@ -157,7 +159,7 @@
 			<menu_item_check label="Alpha" name="Alpha"/>
 			<menu_item_check label="Træer" name="Tree"/>
 			<menu_item_check label="Avatarer" name="Character"/>
-			<menu_item_check label="Overflade" name="SurfacePath"/>
+			<menu_item_check label="Surface Patch" name="Surface Patch"/>
 			<menu_item_check label="Himmel" name="Sky"/>
 			<menu_item_check label="Vand" name="Water"/>
 			<menu_item_check label="Jord" name="Ground"/>
@@ -215,6 +217,7 @@
 			<menu_item_check label="Konsol med tekstur kategorier" name="Texture Category"/>
 			<menu_item_check label="Hurtig-timere" name="Fast Timers"/>
 			<menu_item_check label="Hukommelse" name="Memory"/>
+			<menu_item_check label="Scene Statistics" name="Scene Statistics"/>
 			<menu_item_call label="Vis Regionsinfo i debug-konsol" name="Region Info to Debug Console"/>
 			<menu_item_check label="Kamera" name="Camera"/>
 			<menu_item_check label="Vind" name="Wind"/>
@@ -222,6 +225,7 @@
 		</menu>
 		<menu label="Vis info" name="Display Info">
 			<menu_item_check label="Vis tid" name="Show Time"/>
+			<menu_item_check label="Show Upload Cost" name="Show Upload Cost"/>
 			<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"/>
@@ -244,7 +248,12 @@
 			<menu_item_check label="Frame test" name="Frame Test"/>
 		</menu>
 		<menu label="Render Metadata" name="Render Metadata">
+			<menu_item_check label="Normals" name="Normals"/>
+			<menu_item_check label="Physics Shapes" name="Physics Shapes"/>
 			<menu_item_check label="Opdatér type" name="Update Type"/>
+			<menu_item_check label="LOD Info" name="LOD Info"/>
+			<menu_item_check label="Build Queue" name="Build Queue"/>
+			<menu_item_check label="Sculpt" name="Sculpt"/>
 		</menu>
 		<menu label="Gengivelse" name="Rendering">
 			<menu_item_check label="Akser" name="Axes"/>
@@ -310,6 +319,7 @@
 			<menu_item_call label="Debug avatar teksturer" name="Debug Avatar Textures"/>
 		</menu>
 		<menu_item_check label="HTTP teksturer" name="HTTP Textures"/>
+		<menu_item_check label="HTTP Inventory" name="HTTP Inventory"/>
 		<menu_item_check label="Benyt consol vindue ved næste opstart" name="Console Window"/>
 		<menu_item_call label="Anmod om administrator status" name="Request Admin Options"/>
 		<menu_item_call label="Forlad administrationsstatus" name="Leave Admin Options"/>
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index 52f0574476..4c0fbd280b 100644
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -1071,6 +1071,12 @@ Det kan påvirke din indtastning af password.
 	<notification name="RezItemNoPermissions">
 		Utilstrækkelige tilladelser til at danne genstanden.
 	</notification>
+	<notification name="IMAcrossParentEstates">
+		Ikke muligt at sende IM over forældre estates.
+	</notification>
+	<notification name="TransferInventoryAcrossParentEstates">
+		Ikke muligt at overføre din beholdning over forældre parceller.
+	</notification>
 	<notification name="UnableToLoadNotecard">
 		Ikke muligt at indlæse note.
 Prøv venligst igen.
@@ -1641,6 +1647,10 @@ De vil blive blokeret nogle få sekunder af sikkerhedsmæssige årsager.
 		Din stemme er blevet slukket af moderatoren.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="UploadCostConfirmation">
+		Dette upload vil koste L$[PRICE], ønsker du at sende?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="Send"/>
+	</notification>
 	<notification name="ConfirmClearTeleportHistory">
 		Er du sikker på at du vil slette teleport historikken?
 		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
@@ -1652,6 +1662,9 @@ Knappen vil blive vist når der er nok plads til den.
 	<notification name="ShareNotification">
 		Vælg beboere at dele med.
 	</notification>
+	<notification name="MeshUploadError">
+		[LABEL] kunne ikke sendes: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+	</notification>
 	<notification name="ShareItemsConfirmation">
 		Er du sikker på at du vil dele følgende genstande:
 
@@ -1668,6 +1681,19 @@ Me følgende beboere:
 	<notification name="DeedToGroupFail">
 		Dedikering til gruppe fejlede.
 	</notification>
+	<notification name="ReleaseLandThrottled">
+		Parcellen [PARCEL_NAME] kan ikke efterlades på nuværende tidspunkt.
+	</notification>
+	<notification name="ReleasedLandWithReclaim">
+		[AREA] m² parcellen &apos;[PARCEL_NAME]&apos; er blevet frigivet.
+
+Du har [RECLAIM_PERIOD] timer til at få den tilbage for L$0 før den udbydes til salg til andre beboere.
+	</notification>
+	<notification name="ReleasedLandNoReclaim">
+		[AREA] m² parcel &apos;[PARCEL_NAME]&apos; er blevet frigivet.
+
+Parcellen kan nu købes af enhver beboer.
+	</notification>
 	<notification name="AvatarRezNotification">
 		( [EXISTENCE] sekunder i live )
 Avatar &apos;[NAME]&apos; var ikke sky mere, efter [TIME] sekunder.
@@ -1809,6 +1835,10 @@ Klik hvorsomhelst i verden for at rotere din visning
 		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="NoPlaceInfo">
+		Det er kun muligt at vise profil for stedet i avanceret opsætning. Ø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"/>
@@ -1829,6 +1859,18 @@ Klik hvorsomhelst i verden for at rotere din visning
 		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>
+	<notification label="" name="NoInventory">
+		Det er kun muligt at vise beholdning i avanceret tilstand. Ønsker du at logge ud og logge på i avanceret tilstand.
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoAppearance">
+		Udseende opsætning er kun tilgængelig i avanceret tilstand. Ønsker du at logge ud og logge på i avanceret tilstand.
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoSearch">
+		Søgning er kun mulig i avanceret tilstand. Ønsker du at logge ud og logge på i avanceret 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_preferences_colors.xml b/indra/newview/skins/default/xui/da/panel_preferences_colors.xml
index 1e024aa647..cc3dc480bc 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_colors.xml
@@ -22,6 +22,9 @@
 	<text name="text_box5">
 		Fejl
 	</text>
+	<text name="text_box10">
+		Direkte
+	</text>
 	<text name="text_box7">
 		Ejer
 	</text>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
index d7b4ce3883..72200a07ad 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
@@ -28,8 +28,20 @@
 		</text>
 		<check_box initial_value="sand" label="Gennemsigtig vand" name="TransparentWater"/>
 		<check_box initial_value="true" label="Glatte flader og skin" name="BumpShiny"/>
+		<check_box initial_value="sand" label="Lokale lys" name="LocalLights"/>
 		<check_box initial_value="true" label="Basale flader" name="BasicShaders" tool_tip="Ved at slå dette valg fra, kan det forhindres at visse grafikkort drivere crasher."/>
 		<check_box initial_value="true" label="Atmosfæriske flader" name="WindLightUseAtmosShaders"/>
+		<check_box initial_value="sand" label="Lys og skygger" name="UseLightShaders"/>
+		<check_box initial_value="sand" label="&quot;Ambient Occlusion&quot;" name="UseSSAO"/>
+		<check_box initial_value="sand" label="Skarphedsdybde" name="UseDoF"/>
+		<text name="shadows_label">
+			Skygger:
+		</text>
+		<combo_box name="ShadowDetail">
+			<combo_box.item label="Ingen" name="0"/>
+			<combo_box.item label="Sol/Måne" name="1"/>
+			<combo_box.item label="Sol/Måne + Projektorer" name="2"/>
+		</combo_box>
 		<text name="reflection_label">
 			Reflektioner i vand:
 		</text>
diff --git a/indra/newview/skins/default/xui/da/panel_region_general.xml b/indra/newview/skins/default/xui/da/panel_region_general.xml
index 5b5dd411ac..667c88c5b1 100644
--- a/indra/newview/skins/default/xui/da/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_general.xml
@@ -25,6 +25,7 @@
 	<check_box label="Tillad at sælge land" name="allow_land_resell_check"/>
 	<check_box label="Tillad at samle/dele land" name="allow_parcel_changes_check"/>
 	<check_box label="Blokér visning af land i Søgning" name="block_parcel_search_check" tool_tip="Lad beboere se denne region og dens parceller i søgeresultater"/>
+	<check_box label="Til &quot;mesh&quot; objekter" name="mesh_rez_enabled_check" tool_tip="Lad personer rezze mesh objekter i denne region"/>
 	<spinner label="Max besøgende" name="agent_limit_spin"/>
 	<spinner label="Objekt bonus" name="object_bonus_spin"/>
 	<text label="Indhold" name="access_text">
diff --git a/indra/newview/skins/default/xui/da/panel_sound_devices.xml b/indra/newview/skins/default/xui/da/panel_sound_devices.xml
new file mode 100644
index 0000000000..27b7666a1f
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_sound_devices.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="Opsætning for udstyr" name="device_settings_panel">
+	<panel.string name="default_text">
+		Standard
+	</panel.string>
+	<text name="Input">
+		Input
+	</text>
+	<text name="My volume label">
+		Min lydstyrke:
+	</text>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Ændre lydstyrke med denne skyder"/>
+	<text name="wait_text">
+		Vent venligst
+	</text>
+	<text name="Output">
+		Output
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index 7fd8d8a106..68b861fe92 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -115,6 +115,140 @@
 	<string name="Quit">
 		Afslut
 	</string>
+	<string name="LoginFailedViewerNotPermitted">
+		Den klient du benytter kan ikke længere få adgang til Second Life. Besøg venligst denne side for at hente en ny klient:
+http://secondlife.com/download
+
+For mere information, se denne FAQ:
+http://secondlife.com/viewer-access-faq
+	</string>
+	<string name="LoginIntermediateOptionalUpdateAvailable">
+		Valgfri klient opdatering tilgængelig: [VERSION]
+	</string>
+	<string name="LoginFailedRequiredUpdate">
+		Påkrævet opdatering a klient: [VERSION]
+	</string>
+	<string name="LoginFailedAlreadyLoggedIn">
+		Din avatar er allerede logget på.
+	</string>
+	<string name="LoginFailedAuthenticationFailed">
+		Beklager! vi kunne ikke logge dig på.
+Undersøg venligst at du har indtastet det rette				
+Please check to make sure you entered the right
+    * Brugernavn (like bobsmith12 or steller.sunshine)
+    * Password
+Check også at Caps Lock ikke er aktiveret.
+	</string>
+	<string name="LoginFailedPasswordChanged">
+		Som en sikkerhedsforanstaltning er dit password blevet ændret.
+Går venligst til din konto-side på http://secondlife.com/password
+og besvar sikkerhedsspørgsmål for at nulstille dit password.
+Vi undskylder besværet.
+	</string>
+	<string name="LoginFailedPasswordReset">
+		vi har lavet nogle ændringer i vores system og det er nødvendigt at nulstille dit password.
+Går venligst til din konto-side på http://secondlife.com/password
+og besvar sikkerhedsspørgsmål for at nulstille dit password.
+Vi undskylder besværet.
+	</string>
+	<string name="LoginFailedEmployeesOnly">
+		Second Life er midlertidig lukket ned for vedligeholdelse.
+Kun medarbejdere kan logge på for øjeblikket.
+Check www.secondlife.com/status for opdateringer.
+	</string>
+	<string name="LoginFailedPremiumOnly">
+		Second Life har midlertidig begrænset muligheden for log-in for at sikre, at brugere på systemet ikke får dårlige svartider.
+
+ Brugere med gratis-konti vil ikke kunne logge på Second Life på dette tidspunkt.
+	</string>
+	<string name="LoginFailedComputerProhibited">
+		Second Life kan ikke tilgås fra dennecomputer.
+Hvis du mener dette er en fejl, kontakt venligst support@secondlife.com.
+	</string>
+	<string name="LoginFailedAcountSuspended">
+		Din konto vil ikke være tilgængelig før 
+[TIME] Pacific Time.
+	</string>
+	<string name="LoginFailedAccountDisabled">
+		Vi kan desværre ikke behandle forespøgsel lige nu.
+Kontakt venligst Second Life supper for assitance via http://secondlife.com/support.
+Hvis du ikke kan ændre dit password ring venligst +1 (866) 476-9763.
+	</string>
+	<string name="LoginFailedTransformError">
+		Data inkonsistens registret ved login.
+Kontakt venligst support@secondlife.com.
+	</string>
+	<string name="LoginFailedAccountMaintenance">
+		Der foretages vedligehold på din konto lige nu.
+Din konto vil ikke være tilgængelig før 
+[TIME] Pacific Time.
+Hvis du mener dette er en fejl, kontakt venligst support@secondlife.com.
+	</string>
+	<string name="LoginFailedPendingLogoutFault">
+		Forespøgsel på logout blev besvaret med en fejl fra simulatoren.
+	</string>
+	<string name="LoginFailedPendingLogout">
+		Systemet er i gang med at logge dig ud netop nu.
+Din konto vil ikke være tilgængelig før 
+[TIME] Pacific Time.
+	</string>
+	<string name="LoginFailedUnableToCreateSession">
+		Ikke muligt at oprette gyldig session.
+	</string>
+	<string name="LoginFailedUnableToConnectToSimulator">
+		Ikke muligt at koble til en simulator.
+	</string>
+	<string name="LoginFailedRestrictedHours">
+		Din konto kan kun tilgå Second Life
+mellem [START] [END] Pacific Time.
+Kom venligst tilbage i dette tidsrum.
+
+Hvis du mener dette er en fejl, kontakt venligst support@secondlife.com.
+	</string>
+	<string name="LoginFailedIncorrectParameters">
+		Ugyldig parametre.
+Hvis du mener dette er en fejl, kontakt venligst support@secondlife.com.
+	</string>
+	<string name="LoginFailedFirstNameNotAlphanumeric">
+		Fornavn parameter skal være alfanumerisk
+Hvis du mener dette er en fejl, kontakt venligst support@secondlife.com.
+	</string>
+	<string name="LoginFailedLastNameNotAlphanumeric">
+		Efternavn parameter skal være alfanumerisk
+Hvis du mener dette er en fejl, kontakt venligst support@secondlife.com.
+	</string>
+	<string name="LogoutFailedRegionGoingOffline">
+		Regionen er lukket ned.
+Prøv at logge på om lidt igen.
+	</string>
+	<string name="LogoutFailedAgentNotInRegion">
+		Avatar ikke i en region.
+Prøv venligst om lidt igen.
+	</string>
+	<string name="LogoutFailedPendingLogin">
+		The region was logging in another session.
+Please try logging in again in a minute.
+	</string>
+	<string name="LogoutFailedLoggingOut">
+		Region har lukket sidste session ned.
+Prøv venligst om lidt igen.
+	</string>
+	<string name="LogoutFailedStillLoggingOut">
+		Regionen er stadig ved at lukke forrige session ud.
+Prøv venligst om lidt igen.
+	</string>
+	<string name="LogoutSucceeded">
+		Region har lukket sidste session ned.
+Prøv venligst om lidt igen.
+	</string>
+	<string name="LogoutFailedLogoutBegun">
+		Region er i gang med at logge ud.
+Prøv venligst om lidt igen.
+	</string>
+	<string name="LoginFailedLoggingOutSession">
+		Region er i gang med at lukket sidste session ned.
+Prøv venligst om lidt igen.
+	</string>
 	<string name="AgentLostConnection">
 		Denne region kan have problemer. Tjek venligst din forbindelse til internettet.
 	</string>
@@ -423,6 +557,9 @@
 	<string name="symbolic folder link">
 		link til mappe
 	</string>
+	<string name="mesh">
+		mesh
+	</string>
 	<string name="AvatarAway">
 		Væk
 	</string>
@@ -1150,6 +1287,9 @@
 	<string name="InvFolder Accessories">
 		Tilbehør
 	</string>
+	<string name="InvFolder Meshes">
+		Meshes
+	</string>
 	<string name="InvFolder Friends">
 		Venner
 	</string>
@@ -3657,6 +3797,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="session_initialization_timed_out_error">
 		Initialisering af session er &quot;timed out&quot;
 	</string>
+	<string name="Home position set.">
+		Hjemmeposition sat.
+	</string>
 	<string name="voice_morphing_url">
 		http://secondlife.com/landing/voicemorphing
 	</string>
diff --git a/indra/newview/skins/minimal/xui/da/panel_adhoc_control_panel.xml b/indra/newview/skins/minimal/xui/da/panel_adhoc_control_panel.xml
index 1953fad31f..14250453eb 100644
--- a/indra/newview/skins/minimal/xui/da/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/da/panel_adhoc_control_panel.xml
@@ -5,7 +5,7 @@
 			<button label="Opkald" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
-			<button label="Forlad opkald" name="end_call_btn"/>
+			<button label="Forlad samtale" name="end_call_btn"/>
 		</layout_panel>
 		<layout_panel name="voice_ctrls_btn_panel">
 			<button label="Stemmekontroller" name="voice_ctrls_btn"/>
diff --git a/indra/newview/skins/minimal/xui/da/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/da/panel_bottomtray.xml
index d5d8c3cf7f..bd20ece764 100644
--- a/indra/newview/skins/minimal/xui/da/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/da/panel_bottomtray.xml
@@ -4,26 +4,32 @@
 	<string name="SpeakBtnToolTip" value="Slå mikrofon til/fra"/>
 	<string name="VoiceControlBtnToolTip" value="Vis/skjul stemme kontrolpanel"/>
 	<layout_stack name="toolbar_stack">
+		<layout_panel name="speak_panel">
+			<button label="Tal" name="speak_btn" tool_tip="Tænd og sluk for mikrofon"/>
+		</layout_panel>
+		<layout_panel name="speak_flyout_panel">
+			<button label="" name="flyout_btn" tool_tip="Ændring af opsætning for lyd"/>
+		</layout_panel>
 		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Bevægelse" name="Gesture" tool_tip="Skjuler/viser bevægelser"/>
+			<gesture_combo_list label="Bevægelse" name="Gesture" tool_tip="Lad din avatar gøre ting"/>
 		</layout_panel>
 		<layout_panel name="cam_panel">
-			<bottomtray_button label="Vis" name="camera_btn" tool_tip="Vis/Skjul kamerakontroller"/>
+			<bottomtray_button label="Vis" name="camera_btn" tool_tip="Kontrollér kameravinkel"/>
 		</layout_panel>
-		<layout_panel name="avatar_and_destinations_panel">
-			<bottomtray_button label="Destinationer" name="destination_btn" tool_tip="Vis person vindue"/>
+		<layout_panel name="destinations_panel">
+			<bottomtray_button label="Destinationer" name="destination_btn" tool_tip="Rejs i Second Life"/>
 		</layout_panel>
-		<layout_panel name="avatar_and_destinations_panel">
-			<bottomtray_button label="Min avatar" name="avatar_btn"/>
+		<layout_panel name="avatar_panel">
+			<bottomtray_button label="Min avatar" name="avatar_btn" tool_tip="Ændre dit udseende"/>
 		</layout_panel>
 		<layout_panel name="people_panel">
-			<bottomtray_button label="Personer" name="show_people_button" tool_tip="Vis person-vindue"/>
+			<bottomtray_button label="Personer" name="show_people_button" tool_tip="Find personer i Second Life"/>
 		</layout_panel>
 		<layout_panel name="profile_panel">
-			<bottomtray_button label="Profil" name="show_profile_btn" tool_tip="Vis profil vindue"/>
+			<bottomtray_button label="Profil" name="show_profile_btn" tool_tip="Se og rediger din profil"/>
 		</layout_panel>
 		<layout_panel name="howto_panel">
-			<bottomtray_button label="Hvordan" name="show_help_btn" tool_tip="Åben Second Life &quot;How To topics&quot;"/>
+			<bottomtray_button label="Hvordan" name="show_help_btn" tool_tip="Vis hjælpeinformation for Second Life"/>
 		</layout_panel>
 		<layout_panel name="im_well_panel">
 			<chiclet_im_well name="im_well">
diff --git a/indra/newview/skins/minimal/xui/da/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/da/panel_im_control_panel.xml
index 5cecb93d40..b8a7ec0b34 100644
--- a/indra/newview/skins/minimal/xui/da/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/da/panel_im_control_panel.xml
@@ -20,7 +20,7 @@
 			<button label="Opkald" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
-			<button label="Afslut kald" name="end_call_btn"/>
+			<button label="Afslut samtale" name="end_call_btn"/>
 		</layout_panel>
 		<layout_panel name="voice_ctrls_btn_panel">
 			<button label="Stemme kontroller" name="voice_ctrls_btn"/>
diff --git a/indra/newview/skins/minimal/xui/da/panel_people.xml b/indra/newview/skins/minimal/xui/da/panel_people.xml
index a540025343..49cd2c71f2 100644
--- a/indra/newview/skins/minimal/xui/da/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/da/panel_people.xml
@@ -70,7 +70,7 @@ Leder du efter personer at være sammen med? Prøv destinationsknappen nedenfor.
 				<button label="IM" name="im_btn" tool_tip="Åben session med privat besked (IM)"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
-				<button label="Kald" name="call_btn" tool_tip="Opkald til denne beboer"/>
+				<button label="Opkald" name="call_btn" tool_tip="Kald til denne beboer"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
 				<button label="Del" name="share_btn" tool_tip="Del en genstand fra beholdning"/>
-- 
cgit v1.2.3


From e2a531791ed2c311e6e95061175ce2a9151ccf9d Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 15 Jun 2011 07:02:28 -0400
Subject: STORM-1334 Console debug data scrolls away too quickly and is hard to
 read

---
 indra/newview/skins/default/xui/en/main_view.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 3ead67ca57..a7d1aa963c 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -135,6 +135,14 @@
          name="login_panel_holder"
          width="1024"/>
 
+      <debug_view follows="all"
+                  left="0"
+                  top="0"
+                  mouse_opaque="false"
+                  height="500"
+                  name="DebugView"
+                  width="1024"/>
+
       <panel follows="all"
                     height="500"
                     left="0"
@@ -154,13 +162,6 @@
                       top="0"
                       width="1024"/>
       </panel>
-      <debug_view follows="all"
-                  left="0"
-                  top="0"
-                  mouse_opaque="false"
-                  height="500"
-                  name="DebugView"
-                  width="1024"/>
     </layout_panel>
   </layout_stack>
   <panel mouse_opaque="false"
-- 
cgit v1.2.3


From 6f1fabf0e09662a2d0467fcc487ff6189fc5133c Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Wed, 15 Jun 2011 09:23:46 -0700
Subject: Fix VWR-24099: warn user when trying to send too many teleport offers
 at one time.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ce96c488b4..21680772ba 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3696,6 +3696,19 @@ Join me in [REGION]
     </form>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="TooManyTeleportOffers"
+   type="alertmodal">
+You attempted to make [OFFERS] teleport offers; 
+250 are the most that can be done at one time
+    <tag>group</tag>
+    <tag>fail</tag>
+  <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="OfferTeleportFromGod"
-- 
cgit v1.2.3


From cd51c7e01a0b5eb51fec514cb5a10540c49c2aef Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Wed, 15 Jun 2011 11:29:55 -0700
Subject: FIX INTL-50 DE translation for Set24 and Basic Set3

---
 .../newview/skins/default/xui/de/floater_about.xml |  26 ++-
 .../skins/default/xui/de/floater_buy_contents.xml  |   2 +-
 .../default/xui/de/floater_import_collada.xml      |  23 ++
 .../xui/de/floater_inventory_view_finder.xml       |   1 +
 .../skins/default/xui/de/floater_model_preview.xml | 231 ++++++++++++++++++++
 .../skins/default/xui/de/floater_model_wizard.xml  | 241 +++++++++++++++++++++
 .../default/xui/de/floater_price_for_listing.xml   |  18 ++
 .../skins/default/xui/de/floater_sound_devices.xml |   7 +
 .../newview/skins/default/xui/de/floater_tools.xml |  48 +++-
 .../skins/default/xui/de/menu_inventory_add.xml    |   2 +
 .../xui/de/menu_model_import_gear_default.xml      |   8 +
 indra/newview/skins/default/xui/de/menu_viewer.xml |  13 +-
 .../newview/skins/default/xui/de/notifications.xml |  45 +++-
 .../default/xui/de/panel_preferences_colors.xml    |   3 +
 .../default/xui/de/panel_preferences_graphics1.xml |  12 +
 .../skins/default/xui/de/panel_region_general.xml  |   1 +
 .../skins/default/xui/de/panel_sound_devices.xml   |  19 ++
 indra/newview/skins/default/xui/de/strings.xml     | 142 ++++++++++++
 .../minimal/xui/de/menu_inspect_avatar_gear.xml    |   1 +
 .../minimal/xui/de/panel_adhoc_control_panel.xml   |  11 +
 .../skins/minimal/xui/de/panel_bottomtray.xml      |  24 +-
 .../minimal/xui/de/panel_im_control_panel.xml      |   2 +-
 .../newview/skins/minimal/xui/de/panel_people.xml  |   3 +
 23 files changed, 848 insertions(+), 35 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/de/floater_import_collada.xml
 create mode 100644 indra/newview/skins/default/xui/de/floater_model_preview.xml
 create mode 100644 indra/newview/skins/default/xui/de/floater_model_wizard.xml
 create mode 100644 indra/newview/skins/default/xui/de/floater_price_for_listing.xml
 create mode 100644 indra/newview/skins/default/xui/de/floater_sound_devices.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_sound_devices.xml
 create mode 100644 indra/newview/skins/minimal/xui/de/panel_adhoc_control_panel.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index d15ab105c2..578dcd50e5 100644
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -55,27 +55,33 @@ Wir bedanken uns bei folgenden Einwohnern, die uns geholfen haben, dies zur bish
 		</panel>
 		<panel label="Lizenzen" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-APR Copyright (C) 2000-2004 The Apache Software Foundation
-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion.
+APR Copyright (C) 2000-2004 The Apache Software Foundation.
+Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
+cURL Copyright (C) 1996-2002, Daniel Stenberg (daniel@haxx.se).
+DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
 expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
 FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
 GL Copyright (C) 1999-2004 Brian Paul.
+GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University sowie David Luebke, Brenden Schubert, University of Virginia.
+google-perftools Copyright (c) 2005, Google Inc.
 Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW).
 jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-ogg/vorbis Copyright (C) 2001, Xiphophorus
+ogg/vorbis Copyright (C) 2001, Xiphophorus.
 OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+PCRE Copyright (c) 1997-2008 University of Cambridge.
+SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga.
+SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com).
 xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
 zlib Copyright (C) 1995-2002 Jean-loup Gailly und Mark Adler.
 google-perftools Copyright (c) 2005, Google Inc.
 
-Alle Rechte vorbehalten. Details siehe licenses.txt.
+Second Life Viewer verwendet Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (und Lizenzgeber). Alle Rechte vorbehalten. Details siehe www.havok.com.
+
+Alle Rechte vorbehalten.  Details siehe licenses.txt.
 
-Voice-Chat-Audiocoding: Polycom(R) Siren14(TM)
-(ITU-T Empf.G.722.1 Anhang C)
+Audiocodierung für Voice-Chat: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 			</text_editor>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/de/floater_buy_contents.xml b/indra/newview/skins/default/xui/de/floater_buy_contents.xml
index ccafa11cf4..bd6ace6bda 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_contents.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater min_width="300" name="floater_buy_contents" title="INHALT KAUFEN">
 	<text name="contains_text">
-		[NAME] enthält:
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; enthält:
 	</text>
 	<text name="buy_text">
 		[AMOUNT] L$ von [NAME] kaufen?
diff --git a/indra/newview/skins/default/xui/de/floater_import_collada.xml b/indra/newview/skins/default/xui/de/floater_import_collada.xml
new file mode 100644
index 0000000000..8b1313c7b5
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_import_collada.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Import Collada" title="Szene importieren">
+	<text name="mesh count">
+		Netze: [COUNT]
+	</text>
+	<text name="texture count">
+		Texturen: [COUNT]
+	</text>
+	<text name="status">
+		Status: [STATUS]
+	</text>
+	<button label="Abbrechen" name="cancel"/>
+	<button label="OK" name="ok"/>
+	<string name="status_idle">
+		Inaktiv
+	</string>
+	<string name="status_uploading">
+		[NAME] wird hochgeladen
+	</string>
+	<string name="status_creating">
+		Objektname [NAME] wird erstellt
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
index 9cc5b92daf..d63426d684 100644
--- a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
@@ -5,6 +5,7 @@
 	<check_box label="Kleidung" name="check_clothing"/>
 	<check_box label="Gesten" name="check_gesture"/>
 	<check_box label="Landmarken" name="check_landmark"/>
+	<check_box label="Netze" name="check_mesh"/>
 	<check_box label="Notizkarten" name="check_notecard"/>
 	<check_box label="Objekte" name="check_object"/>
 	<check_box label="Skripts" name="check_script"/>
diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml
new file mode 100644
index 0000000000..83c51132ee
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Preview" title="Modell hochladen">
+	<string name="status_idle">
+		Inaktiv
+	</string>
+	<string name="status_reading_file">
+		Laden...
+	</string>
+	<string name="status_generating_meshes">
+		Netze werden generiert...
+	</string>
+	<string name="status_vertex_number_overflow">
+		Fehler: Anzahl von Vertices überschreitet 65534. Operation abgebrochen.
+	</string>
+	<string name="high">
+		Hoch
+	</string>
+	<string name="medium">
+		Mittel
+	</string>
+	<string name="low">
+		Niedrig
+	</string>
+	<string name="lowest">
+		Niedrigste
+	</string>
+	<string name="mesh_status_good">
+		Ausliefern
+	</string>
+	<string name="mesh_status_na">
+		--
+	</string>
+	<string name="mesh_status_none">
+		Keine
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		Detailstufen haben unterschiedliche Anzahl texturfähiger Flächen.
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		Detailstufen haben unterschiedliche Anzahl von Netzinstanzen.
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		Detailstufe hat zu viele Vertices.
+	</string>
+	<string name="mesh_status_missing_lod">
+		Erforderliche Detailstufe fehlt.
+	</string>
+	<string name="layer_all">
+		Alle
+	</string>
+	<string name="decomposing">
+		Analyse läuft...
+	</string>
+	<string name="simplifying">
+		Vereinfachung läuft...
+	</string>
+	<text name="name_label">
+		Name:
+	</text>
+	<text name="lod_label">
+		Vorschau:
+	</text>
+	<combo_box name="preview_lod_combo" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
+		<combo_item name="high">
+			Detailstufe: Hoch
+		</combo_item>
+		<combo_item name="medium">
+			Detailstufe: Mittel
+		</combo_item>
+		<combo_item name="low">
+			Detailstufe: Niedrig
+		</combo_item>
+		<combo_item name="lowest">
+			Detailstufe: Niedrigste
+		</combo_item>
+	</combo_box>
+	<panel>
+		<text name="streaming cost">
+			Ressourcenkosten: [COST]
+		</text>
+		<text name="physics cost">
+			Physikkosten: [COST]
+		</text>
+		<text name="upload fee">
+			Gebühr für Hochladen: --
+		</text>
+	</panel>
+	<text name="status">
+		[STATUS]
+	</text>
+	<button label="Standardwerte" name="reset_btn" tool_tip="Standardwerte wiederherstellen"/>
+	<button label="Hochladen" name="ok_btn" tool_tip="An Simulator hochladen"/>
+	<button label="Abbrechen" name="cancel_btn"/>
+	<tab_container name="import_tab">
+		<panel label="Detailstufe" name="lod_panel">
+			<text name="lod_table_header">
+				Detailstufe auswählen
+			</text>
+			<text name="high_label" value="Hoch"/>
+			<text name="high_triangles" value="0"/>
+			<text name="high_vertices" value="0"/>
+			<text name="medium_label" value="Mittel"/>
+			<text name="medium_triangles" value="0"/>
+			<text name="medium_vertices" value="0"/>
+			<text name="low_label" value="Niedrig"/>
+			<text name="low_triangles" value="0"/>
+			<text name="low_vertices" value="0"/>
+			<text name="lowest_label" value="Niedrigste"/>
+			<text name="lowest_triangles" value="0"/>
+			<text name="lowest_vertices" value="0"/>
+			<text name="lod_table_footer">
+				Detailstufe: [DETAIL]
+			</text>
+			<radio_group name="lod_file_or_limit" value="lod_from_file">
+				<radio_item label="Aus Datei laden" name="lod_from_file"/>
+				<radio_item label="Automatisch generieren" name="lod_auto_generate"/>
+				<radio_item label="Keine" name="lod_none"/>
+			</radio_group>
+			<button label="Durchsuchen..." name="lod_browse"/>
+			<combo_box name="lod_mode">
+				<combo_item name="triangle_limit">
+					Dreiecklimit
+				</combo_item>
+				<combo_item name="error_threshold">
+					Fehlerschwelle
+				</combo_item>
+			</combo_box>
+			<text name="build_operator_text">
+				Konstruktionsoperator:
+			</text>
+			<text name="queue_mode_text">
+				Warteschlangenmodus:
+			</text>
+			<combo_box name="build_operator">
+				<combo_item name="edge_collapse">
+					Kantenkollaps
+				</combo_item>
+				<combo_item name="half_edge_collapse">
+					Halbkantenkollaps
+				</combo_item>
+			</combo_box>
+			<combo_box name="queue_mode">
+				<combo_item name="greedy">
+					Strikt
+				</combo_item>
+				<combo_item name="lazy">
+					Locker
+				</combo_item>
+				<combo_item name="independent">
+					Unabhängig
+				</combo_item>
+			</combo_box>
+			<text name="border_mode_text">
+				Grenzenmodus:
+			</text>
+			<text name="share_tolderance_text">
+				Sharetoleranz:
+			</text>
+			<combo_box name="border_mode">
+				<combo_item name="border_unlock">
+					Freigeben
+				</combo_item>
+				<combo_item name="border_lock">
+					Sperren
+				</combo_item>
+			</combo_box>
+			<text name="crease_label">
+				Knitterwinkel:
+			</text>
+			<spinner name="crease_angle" value="75"/>
+		</panel>
+		<panel label="Physik" name="physics_panel">
+			<panel name="physics geometry">
+				<radio_group name="physics_load_radio" value="physics_load_from_file">
+					<radio_item label="Datei:" name="physics_load_from_file"/>
+					<radio_item label="Detailstufe verwenden:" name="physics_use_lod"/>
+				</radio_group>
+				<combo_box name="physics_lod_combo" tool_tip="Detailstufe für physische Form">
+					<combo_item name="physics_lowest">
+						Niedrigste
+					</combo_item>
+					<combo_item name="physics_low">
+						Niedrig
+					</combo_item>
+					<combo_item name="physics_medium">
+						Mittel
+					</combo_item>
+					<combo_item name="physics_high">
+						Hoch
+					</combo_item>
+				</combo_box>
+				<button label="Durchsuchen..." name="physics_browse"/>
+			</panel>
+			<panel name="physics analysis">
+				<slider label="Glätten:" name="Smooth"/>
+				<check_box label="Löcher schließen (langsam)" name="Close Holes (Slow)"/>
+				<button label="Analysieren" name="Decompose"/>
+				<button label="Abbrechen" name="decompose_cancel"/>
+			</panel>
+			<panel name="physics simplification">
+				<slider label="Durchläufe:" name="Combine Quality"/>
+				<slider label="Detailskala:" name="Detail Scale"/>
+				<slider label="Beibehalten:" name="Retain%"/>
+				<button label="Vereinfachen" name="Simplify"/>
+				<button label="Abbrechen" name="simplify_cancel"/>
+			</panel>
+			<panel name="physics info">
+				<slider label="Vorschaudehnung:" name="physics_explode"/>
+				<text name="physics_triangles">
+					Dreiecke: [TRIANGLES]
+				</text>
+				<text name="physics_points">
+					Vertices: [POINTS]
+				</text>
+				<text name="physics_hulls">
+					Hüllen: [HULLS]
+				</text>
+			</panel>
+		</panel>
+		<panel label="Modifizierer" name="modifiers_panel">
+			<spinner name="import_scale" value="1,0"/>
+			<text name="import_dimensions">
+				[X] x [Y] x [Z] m
+			</text>
+			<check_box label="Texturen" name="upload_textures"/>
+			<check_box label="Skingewicht" name="upload_skin"/>
+			<check_box label="Gelenkpositionen" name="upload_joints"/>
+			<spinner name="pelvis_offset" value="0,0"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_model_wizard.xml b/indra/newview/skins/default/xui/de/floater_model_wizard.xml
new file mode 100644
index 0000000000..2c7b45906e
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_model_wizard.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Wizard" title="ASSISTENT ZUM HOCHLADEN VON MODELLEN">
+	<button label="5. Hochladen" name="upload_btn"/>
+	<button label="4. Überprüfen" name="review_btn"/>
+	<button label="3. Physik" name="physics2_btn"/>
+	<button label="3. Physik" name="physics_btn"/>
+	<button label="2. Optimieren" name="optimize_btn"/>
+	<button label="1. Datei auswählen" name="choose_file_btn"/>
+	<panel name="choose_file_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Modell hochladen
+			</text>
+		</panel>
+		<text name="description">
+			Mit diesem Assistenten können Sie Netzmodelle in Second Life hochladen.  Geben Sie zuerst die Datei mit dem zu importierenden Modell an.  Second Life unterstützt COLLADA-Dateien (.dae).
+		</text>
+		<panel name="content">
+			<text name="Cache location">
+				Dateiname:
+			</text>
+			<button label="Durchsuchen..." label_selected="Durchsuchen..." name="browse"/>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+	</panel>
+	<panel name="optimize_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Optimieren
+			</text>
+		</panel>
+		<text name="description">
+			Dieser Assistent hat Ihr Modell optimiert, um die Leistung zu erhöhen. Sie können die Optimierungsergebnisse unten ändern oder zum Fortfahren auf „Weiter“ klicken.
+		</text>
+		<panel name="content">
+			<text name="high_detail_text">
+				Detailstufe generieren: Hoch
+			</text>
+			<text name="medium_detail_text">
+				Detailstufe generieren: Mittel
+			</text>
+			<text name="low_detail_text">
+				Detailstufe generieren: Niedrig
+			</text>
+			<text name="lowest_detail_text">
+				Detailstufe generieren: Niedrigste
+			</text>
+		</panel>
+		<panel name="content2">
+			<text name="lod_label">
+				Modellvorschau:
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
+				<combo_item name="high">
+					Hoch
+				</combo_item>
+				<combo_item name="medium">
+					Mittel
+				</combo_item>
+				<combo_item name="low">
+					Niedrig
+				</combo_item>
+				<combo_item name="lowest">
+					Niedrigste
+				</combo_item>
+			</combo_box>
+			<text name="streaming cost">
+				Ressourcenkosten:    [COST]
+			</text>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+	</panel>
+	<panel name="physics_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Physik
+			</text>
+		</panel>
+		<text name="description">
+			Der Assistent erstellt eine physische Form, die die Interaktionen des Objekts mit anderen Objekten und Avataren bestimmt. Setzen Sie den Schieber auf die Detailstufe, die für Ihr Objekt am besten geeignet ist:
+		</text>
+		<panel name="content">
+			<text name="streaming cost">
+				Ressourcenkosten:       [COST]
+			</text>
+		</panel>
+	</panel>
+	<panel name="physics2_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Physik
+			</text>
+		</panel>
+		<text name="description">
+			Überprüfen Sie die physische Form unten und klicken Sie dann auf „Weiter“.  Um die physische Form zu ändern, klicken Sie auf „Zurück“.
+		</text>
+		<panel name="content">
+			<text name="lod_label">
+				Modellvorschau:
+			</text>
+			<combo_box name="preview_lod_combo3" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
+				<combo_item name="high">
+					Hoch
+				</combo_item>
+				<combo_item name="medium">
+					Mittel
+				</combo_item>
+				<combo_item name="low">
+					Niedrig
+				</combo_item>
+				<combo_item name="lowest">
+					Niedrigste
+				</combo_item>
+			</combo_box>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+			<text name="streaming cost">
+				Ressourcenkosten:       [COST]
+			</text>
+		</panel>
+	</panel>
+	<panel name="review_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Überprüfen
+			</text>
+		</panel>
+		<text name="description">
+			Überprüfen Sie die Details unten und klicken Sie dann auf „Hochladen“, um das Modell hochzuladen. Die Kosten werden von Ihrem L$-Kontostand abgezogen.
+		</text>
+		<panel name="content">
+			<text name="lod_label">
+				Modellvorschau:
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
+				<combo_item name="high">
+					Hoch
+				</combo_item>
+				<combo_item name="medium">
+					Mittel
+				</combo_item>
+				<combo_item name="low">
+					Niedrig
+				</combo_item>
+				<combo_item name="lowest">
+					Niedrigste
+				</combo_item>
+			</combo_box>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+		<text name="streaming cost">
+			Ressourcenkosten:         [COST]
+		</text>
+		<text name="physics cost">
+			Physikkosten:        [COST]
+		</text>
+	</panel>
+	<panel name="upload_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Upload abgeschlossen
+			</text>
+		</panel>
+		<text name="description">
+			Herzlichen Glückwunsch! Ihr Modell wurde erfolgreich hochgeladen.  Sie finden das Modell im Objektordner Ihres Inventars.
+		</text>
+	</panel>
+	<button label="&lt;&lt; Zurück" name="back"/>
+	<button label="Weiter &gt;&gt;" name="next"/>
+	<button label="Hochladen" name="upload" tool_tip="An Simulator hochladen"/>
+	<button label="Abbrechen" name="cancel"/>
+	<button label="Schließen" name="close"/>
+	<spinner name="import_scale" value="1,0"/>
+	<string name="status_idle">
+		Inaktiv
+	</string>
+	<string name="status_reading_file">
+		Laden...
+	</string>
+	<string name="status_generating_meshes">
+		Netze werden generiert...
+	</string>
+	<string name="status_vertex_number_overflow">
+		Fehler: Anzahl von Vertices überschreitet 65534. Operation abgebrochen.
+	</string>
+	<string name="high">
+		Hoch
+	</string>
+	<string name="medium">
+		Mittel
+	</string>
+	<string name="low">
+		Niedrig
+	</string>
+	<string name="lowest">
+		Niedrigste
+	</string>
+	<string name="mesh_status_good">
+		Ausliefern
+	</string>
+	<string name="mesh_status_na">
+		--
+	</string>
+	<string name="mesh_status_none">
+		Keine
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		Detailstufen haben unterschiedliche Anzahl texturfähiger Flächen.
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		Detailstufen haben unterschiedliche Anzahl von Netzinstanzen.
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		Detailstufe hat zu viele Vertices.
+	</string>
+	<string name="mesh_status_missing_lod">
+		Erforderliche Detailstufe fehlt.
+	</string>
+	<string name="layer_all">
+		Alle
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_price_for_listing.xml b/indra/newview/skins/default/xui/de/floater_price_for_listing.xml
new file mode 100644
index 0000000000..bdd772a9c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_price_for_listing.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="price_for_listing" title="ANZEIGE VERÖFFENTLICHEN">
+	<text name="explanation_text">
+		Ihre Anzeige wird für eine Woche veröffentlicht.
+
+Die Position Ihrer Anzeige hängt davon ab, wie viel Sie dafür bezahlen möchten.
+
+Die Anzeigen, für die am meisten bezahlt wird, werden am Anfang der Liste angezeigt und erscheinen in Suchergebnissen weiter oben.
+	</text>
+	<text name="price_text">
+		Anzeigenpreis:
+	</text>
+	<text name="price_symbol">
+		L$
+	</text>
+	<button label="OK" name="set_price_btn"/>
+	<button label="Abbrechen" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_sound_devices.xml b/indra/newview/skins/default/xui/de/floater_sound_devices.xml
new file mode 100644
index 0000000000..7575ad9e2a
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_sound_devices.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_sound_devices" title="Audiogeräte">
+	<text name="voice_label">
+		Voice-Chat
+	</text>
+	<check_box label="Aktiviert" name="enable_voice"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index d95d674df2..258e67a138 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -125,6 +125,18 @@
 	<text name="prim_count">
 		Primitive: [COUNT]
 	</text>
+	<text name="linked_set_count">
+		Verknüpfte Sätze: [COUNT]
+	</text>
+	<text name="linked_set_cost" tool_tip="Kosten der gegenwärtig ausgewählten verknüpften Sätze als [Prims],[Komplexität der Physik]">
+		Kosten: [COST] / [PHYSICS]
+	</text>
+	<text name="object_count">
+		Objekte: [COUNT]
+	</text>
+	<text name="object_cost" tool_tip="Kosten der gegenwärtig ausgewählten Objekte als [Prims] / [Komplexität der Physik]">
+		Kosten: [COST] / [PHYSICS]
+	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Allgemein" name="General">
 			<panel.string name="text deed continued">
@@ -269,15 +281,6 @@
 				<combo_box.item label="Ring" name="Ring"/>
 				<combo_box.item label="Geformt" name="Sculpted"/>
 			</combo_box>
-			<combo_box name="material">
-				<combo_box.item label="Stein" name="Stone"/>
-				<combo_box.item label="Metall" name="Metal"/>
-				<combo_box.item label="Glas" name="Glass"/>
-				<combo_box.item label="Holz" name="Wood"/>
-				<combo_box.item label="Fleisch" name="Flesh"/>
-				<combo_box.item label="Kunststoff" name="Plastic"/>
-				<combo_box.item label="Gummi" name="Rubber"/>
-			</combo_box>
 			<text name="text cut">
 				Pfadschnitt (Anfang/Ende)
 			</text>
@@ -353,9 +356,19 @@
 				<combo_box.item label="Torus" name="Torus"/>
 				<combo_box.item label="Fläche" name="Plane"/>
 				<combo_box.item label="Zylinder" name="Cylinder"/>
+				<combo_box.item label="Netz" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Eigenschaften" name="Features">
+			<panel.string name="None">
+				Keine
+			</panel.string>
+			<panel.string name="Prim">
+				Prim
+			</panel.string>
+			<panel.string name="Convex Hull">
+				Konvexe Hülle
+			</panel.string>
 			<text name="select_single">
 				Wählen Sie nur einen einzelnen Baustein aus, um Eigenschaften zu bearbeiten.
 			</text>
@@ -380,6 +393,23 @@
 			<spinner label="Fokus" name="Light Focus"/>
 			<spinner label="Abnehmend" name="Light Falloff"/>
 			<spinner label="Ambiente" name="Light Ambiance"/>
+			<text name="label physicsshapetype">
+				Art der physischen Form:
+			</text>
+			<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="Art der physischen Form auswählen"/>
+			<combo_box name="material">
+				<combo_box.item label="Stein" name="Stone"/>
+				<combo_box.item label="Metall" name="Metal"/>
+				<combo_box.item label="Glas" name="Glass"/>
+				<combo_box.item label="Holz" name="Wood"/>
+				<combo_box.item label="Fleisch" name="Flesh"/>
+				<combo_box.item label="Plastik" name="Plastic"/>
+				<combo_box.item label="Gummi" name="Rubber"/>
+			</combo_box>
+			<spinner label="Schwerkraft" name="Physics Gravity"/>
+			<spinner label="Reibung" name="Physics Friction"/>
+			<spinner label="Dichte" name="Physics Density"/>
+			<spinner label="Restitution" name="Physics Restitution"/>
 		</panel>
 		<panel label="Textur" name="Texture">
 			<panel.string name="string repeats per meter">
diff --git a/indra/newview/skins/default/xui/de/menu_inventory_add.xml b/indra/newview/skins/default/xui/de/menu_inventory_add.xml
index 165e9a9264..af70c08ba1 100644
--- a/indra/newview/skins/default/xui/de/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory_add.xml
@@ -4,6 +4,8 @@
 		<menu_item_call label="Bild ([COST] L$)..." name="Upload Image"/>
 		<menu_item_call label="Sound ([COST] L$)..." name="Upload Sound"/>
 		<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
+		<menu_item_call label="Modell..." name="Upload Model"/>
+		<menu_item_call label="Modellassistent..." name="Upload Model Wizard"/>
 		<menu_item_call label="Mehrfach-Upload ([COST] L$ pro Datei)..." name="Bulk Upload"/>
 		<menu_item_call label="Hochlade-Berechtigungen (Standard) festlegen" name="perm prefs"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml
new file mode 100644
index 0000000000..e1faeedcde
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="model_menu_gear_default">
+	<menu_item_check label="Kanten anzeigen" name="show_edges"/>
+	<menu_item_check label="Physik anzeigen" name="show_physics"/>
+	<menu_item_check label="Texturen anzeigen" name="show_textures"/>
+	<menu_item_check label="Skingewicht anzeigen" name="show_skin_weight"/>
+	<menu_item_check label="Gelenkpositionen anzeigen" name="show_joint_positions"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 9d5a69105d..05f9f94c8a 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -120,6 +120,8 @@
 			<menu_item_call label="Bild ([COST] L$)..." name="Upload Image"/>
 			<menu_item_call label="Sound ([COST] L$)..." name="Upload Sound"/>
 			<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
+			<menu_item_call label="Modell..." name="Upload Model"/>
+			<menu_item_call label="Modellassistent..." name="Upload Model Wizard"/>
 			<menu_item_call label="Mehrfach-Upload ([COST] L$ pro Datei)..." name="Bulk Upload"/>
 		</menu>
 		<menu_item_call label="Rückgängig" name="Undo"/>
@@ -159,7 +161,7 @@
 			<menu_item_check label="Alpha" name="Alpha"/>
 			<menu_item_check label="Baum" name="Tree"/>
 			<menu_item_check label="Avatare" name="Character"/>
-			<menu_item_check label="SurfacePath" name="SurfacePath"/>
+			<menu_item_check label="Flächenpatch" name="Surface Patch"/>
 			<menu_item_check label="Himmel" name="Sky"/>
 			<menu_item_check label="Wasser" name="Water"/>
 			<menu_item_check label="Boden" name="Ground"/>
@@ -218,6 +220,7 @@
 			<menu_item_check label="Texture-Kategorie" name="Texture Category"/>
 			<menu_item_check label="Schnelle Timer" name="Fast Timers"/>
 			<menu_item_check label="Speicher" name="Memory"/>
+			<menu_item_check label="Szenestatistiken" name="Scene Statistics"/>
 			<menu_item_call label="Info zu Region in Fenster Fehler beseitigen" name="Region Info to Debug Console"/>
 			<menu_item_call label="Gruppeninfo in Fenster Fehler beseitigen" name="Group Info to Debug Console"/>
 			<menu_item_call label="Info zu Fähigkeiten in Fenster Fehler beseitigen" name="Capabilities Info to Debug Console"/>
@@ -228,6 +231,7 @@
 		</menu>
 		<menu label="Info anzeigen" name="Display Info">
 			<menu_item_check label="Zeit anzeigen" name="Show Time"/>
+			<menu_item_check label="Kosten für Hochladen anzeigen" name="Show Upload Cost"/>
 			<menu_item_check label="Render-Info anzeigen" name="Show Render Info"/>
 			<menu_item_check label="Texturinfos anzeigen" name="Show Texture Info"/>
 			<menu_item_check label="Matrizen anzeigen" name="Show Matrices"/>
@@ -253,8 +257,10 @@
 		</menu>
 		<menu label="Metadaten darstellen" name="Render Metadata">
 			<menu_item_check label="Bonding Boxes" name="Bounding Boxes"/>
+			<menu_item_check label="Normalen" name="Normals"/>
 			<menu_item_check label="Octree" name="Octree"/>
 			<menu_item_check label="Shadow Frusta" name="Shadow Frusta"/>
+			<menu_item_check label="Physische Formen" name="Physics Shapes"/>
 			<menu_item_check label="Okklusion" name="Occlusion"/>
 			<menu_item_check label="Bündel rendern" name="Render Batches"/>
 			<menu_item_check label="Typ aktualisieren" name="Update Type"/>
@@ -262,9 +268,12 @@
 			<menu_item_check label="Textur-Priorität" name="Texture Priority"/>
 			<menu_item_check label="Texturbereich" name="Texture Area"/>
 			<menu_item_check label="Oberflächenbereich" name="Face Area"/>
+			<menu_item_check label="Detailstufeninfos" name="LOD Info"/>
+			<menu_item_check label="Konstruktionswarteschlange" name="Build Queue"/>
 			<menu_item_check label="Lichter" name="Lights"/>
 			<menu_item_check label="Gelenkpunkte" name="Collision Skeleton"/>
 			<menu_item_check label="Raycast" name="Raycast"/>
+			<menu_item_check label="Formen" name="Sculpt"/>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Achsen" name="Axes"/>
@@ -272,7 +281,6 @@
 			<menu_item_call label="Texturinfo für ausgewähltes Objekt" name="Selected Texture Info Basis"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
 			<menu_item_check label="Objekt-Objekt Okklusion" name="Object-Object Occlusion"/>
-			<menu_item_check label="Framebuffer-Objekte" name="Framebuffer Objects"/>
 			<menu_item_check label="Licht und Schatten" name="Lighting and Shadows"/>
 			<menu_item_check label="Schatten von Sonne-/Mond-Projektoren" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO und Schattenglättung" name="SSAO and Shadow Smoothing"/>
@@ -371,6 +379,7 @@
 			<menu_item_call label="Lokale Texturen ausgeben" name="Dump Local Textures"/>
 		</menu>
 		<menu_item_check label="HTTP-Texturen" name="HTTP Textures"/>
+		<menu_item_check label="HTTP-Inventar" name="HTTP Inventory"/>
 		<menu_item_call label="Bilder komprimieren" name="Compress Images"/>
 		<menu_item_check label="Ausgabe Fehlerbeseitigung ausgeben" name="Output Debug Minidump"/>
 		<menu_item_check label="Bei nächster Ausführung Fenster öffnen" name="Console Window"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index c172f7ea2d..75f26c6990 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -2172,6 +2172,12 @@ Dies kann die Eingabe Ihres Passworts beeinflussen.
 	<notification name="RezItemNoPermissions">
 		Keine Berechtigung zum Rezzen von Objekten.
 	</notification>
+	<notification name="IMAcrossParentEstates">
+		Senden von IMs über übergeordnete Grundbesitze hinweg nicht möglich.
+	</notification>
+	<notification name="TransferInventoryAcrossParentEstates">
+		Inventarübertragung über übergeordnete Grundbesitze hinweg nicht möglich.
+	</notification>
 	<notification name="UnableToLoadNotecard">
 		Notizkarten-Asset konnte nicht geladen werden.
 	</notification>
@@ -2749,6 +2755,10 @@ Diese werden für ein paar Sekunden sicherheitshalber gesperrt.
 		Sie wurden vom Moderator stummgeschaltet.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="UploadCostConfirmation">
+		Das Hochladen kostet [PRICE] L$. Möchten Sie fortfahren?
+		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Hochladen"/>
+	</notification>
 	<notification name="ConfirmClearTeleportHistory">
 		Möchten Sie Ihre Teleport-Liste löschen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
@@ -2760,6 +2770,9 @@ Die Schaltfläche wird angezeigt, wenn genügend Platz vorhanden ist.
 	<notification name="ShareNotification">
 		Wählen Sie Einwohner aus, für die Sie das Objekt freigeben möchten.
 	</notification>
+	<notification name="MeshUploadError">
+		[LABEL] konnte nicht hochgeladen werden: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+	</notification>
 	<notification name="ShareItemsConfirmation">
 		Möchten Sie wirklich die folgenden Objekte:
 
@@ -2776,6 +2789,19 @@ für folgende Einwohner freigeben:
 	<notification name="DeedToGroupFail">
 		Übertragung an Gruppe ist fehlgeschlagen.
 	</notification>
+	<notification name="ReleaseLandThrottled">
+		Die Parzelle [PARCEL_NAME] kann zurzeit nicht aufgegeben werden.
+	</notification>
+	<notification name="ReleasedLandWithReclaim">
+		Die [AREA] m² große Parzelle „[PARCEL_NAME]“ wurde freigegeben.
+
+Sie haben [RECLAIM_PERIOD] Stunden, um die Parzelle für 0 L$ zurückzufordern, bevor sie zum Verkauf an alle freigegeben wird.
+	</notification>
+	<notification name="ReleasedLandNoReclaim">
+		Die [AREA] m² große Parzelle „[PARCEL_NAME]“ wurde freigegeben.
+
+Sie steht jetzt zum Verkauf an alle zur Verfügung.
+	</notification>
 	<notification name="AvatarRezNotification">
 		(Seit [EXISTENCE] Sekunden inworld )
 Avatar &apos;[NAME]&apos; wurde in [TIME] Sekunden gerezzt.
@@ -2914,6 +2940,10 @@ Durch Ausblenden der Schaltfläche „Sprechen“ wird die Sprechfunktion deakti
 		Die Erstellung und Bearbeitung von Gruppen ist nur im Modus „Erweitert“ möglich. Möchten Sie das Programm beenden und den Modus wechseln? Die Modusauswahl ist auf dem Anmeldebildschirm zu finden.
 		<usetemplate name="okcancelbuttons" notext="Nicht beenden" yestext="Beenden"/>
 	</notification>
+	<notification label="" name="NoPlaceInfo">
+		Die Anzeige des Ortsprofils ist nur im Modus „Erweitert“ möglich. Möchten Sie das Programm beenden und den Modus wechseln? Die Modusauswahl ist auf dem Anmeldebildschirm zu finden.
+		<usetemplate name="okcancelbuttons" notext="Nicht beenden" yestext="Beenden"/>
+	</notification>
 	<notification label="" name="NoPicks">
 		Die Erstellung und Bearbeitung von Auswahlen ist nur im Modus „Erweitert“ möglich. Möchten Sie das Programm beenden und den Modus wechseln? Die Modusauswahl ist auf dem Anmeldebildschirm zu finden.
 		<usetemplate name="okcancelbuttons" notext="Nicht beenden" yestext="Beenden"/>
@@ -2934,9 +2964,18 @@ Durch Ausblenden der Schaltfläche „Sprechen“ wird die Sprechfunktion deakti
 		Die Bezahlung anderer Einwohner ist nur im Modus „Erweitert“ möglich. Möchten Sie sich abmelden und den Modus wechseln?
 		<usetemplate name="okcancelbuttons" notext="Nicht beenden" yestext="Beenden"/>
 	</notification>
-	<global name="UnsupportedCPU">
-		- Ihre CPU-Geschwindigkeit entspricht nicht den Mindestanforderungen.
-	</global>
+	<notification label="" name="NoInventory">
+		Die Inventaranzeige ist nur im Modus „Erweitert“ möglich. Möchten Sie sich abmelden und den Modus wechseln?
+		<usetemplate name="okcancelbuttons" notext="Nicht beenden" yestext="Beenden"/>
+	</notification>
+	<notification label="" name="NoAppearance">
+		Das Fenster zum Bearbeiten des Aussehens ist nur im Modus „Erweitert“ verfügbar. Möchten Sie sich abmelden und den Modus wechseln?
+		<usetemplate name="okcancelbuttons" notext="Nicht beenden" yestext="Beenden"/>
+	</notification>
+	<notification label="" name="NoSearch">
+		Die Suche ist nur im Modus „Erweitert“ möglich. Möchten Sie sich abmelden und den Modus wechseln?
+		<usetemplate name="okcancelbuttons" notext="Nicht beenden" yestext="Beenden"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Ihr Computer entspricht nicht den Hardwareanforderungen von [APP_NAME]. [APP_NAME] setzt eine OpenGL-Grafikkarte mit Multitextur-Unterstützung voraus. Falls Ihre Grafikkarte diese Funktion unterstützt, installieren Sie die neuesten Treiber sowie die aktuellen Service Packs und Patches für Ihr Betriebssystem.
 
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
index 22681ffdf2..19c5efcb05 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
@@ -22,6 +22,9 @@
 	<text name="text_box5">
 		Fehler
 	</text>
+	<text name="text_box10">
+		Direkt
+	</text>
 	<text name="text_box7">
 		Eigentümer
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index 78cb03a50a..b874074c79 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -27,8 +27,20 @@
 		</text>
 		<check_box initial_value="true" label="Transparentes Wasser" name="TransparentWater"/>
 		<check_box initial_value="true" label="Bumpmapping und Glanz" name="BumpShiny"/>
+		<check_box initial_value="true" label="Lokale Lichtquellen" name="LocalLights"/>
 		<check_box initial_value="true" label="Einfache Shader" name="BasicShaders" tool_tip="Deaktivieren Sie diese Option, wenn der Grafikkartentreiber Abstürze verursacht"/>
 		<check_box initial_value="true" label="Atmosphären-Shader" name="WindLightUseAtmosShaders"/>
+		<check_box initial_value="true" label="Licht und Schatten" name="UseLightShaders"/>
+		<check_box initial_value="true" label="Ambient Occlusion" name="UseSSAO"/>
+		<check_box initial_value="true" label="Schärfentiefe" name="UseDoF"/>
+		<text name="shadows_label">
+			Schatten:
+		</text>
+		<combo_box name="ShadowDetail">
+			<combo_box.item label="Keine" name="0"/>
+			<combo_box.item label="Sonne/Mond" name="1"/>
+			<combo_box.item label="Sonne/Mond + Projektoren" name="2"/>
+		</combo_box>
 		<text name="reflection_label">
 			Wasserreflexionen:
 		</text>
diff --git a/indra/newview/skins/default/xui/de/panel_region_general.xml b/indra/newview/skins/default/xui/de/panel_region_general.xml
index be8507ebbd..f383be992b 100644
--- a/indra/newview/skins/default/xui/de/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_general.xml
@@ -25,6 +25,7 @@
 	<check_box label="Landwiederverkauf zulassen" name="allow_land_resell_check"/>
 	<check_box label="Landumverteilung zulassen" name="allow_parcel_changes_check"/>
 	<check_box label="Landanzeige in Suche blockieren" name="block_parcel_search_check" tool_tip="Diese Region und ihre Parzellen in Suchergebnissen anzeigen"/>
+	<check_box label="Netzobjekte zulassen" name="mesh_rez_enabled_check" tool_tip="Anderen das Rezzen von Netzobjekten in dieser Region gestatten"/>
 	<spinner label="Avatar-Limit" name="agent_limit_spin"/>
 	<spinner label="Objektbonus" name="object_bonus_spin"/>
 	<text label="Inhaltseinstufung" name="access_text">
diff --git a/indra/newview/skins/default/xui/de/panel_sound_devices.xml b/indra/newview/skins/default/xui/de/panel_sound_devices.xml
new file mode 100644
index 0000000000..da20f7e214
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_sound_devices.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="Geräteeinstellungen" name="device_settings_panel">
+	<panel.string name="default_text">
+		Standard
+	</panel.string>
+	<text name="Input">
+		Eingabe
+	</text>
+	<text name="My volume label">
+		Meine Lautstärke:
+	</text>
+	<slider_bar initial_value="1,0" name="mic_volume_slider" tool_tip="Lautstärke mit diesem Regler ändern"/>
+	<text name="wait_text">
+		Bitte warten
+	</text>
+	<text name="Output">
+		Ausgabe
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index f32eb21dd3..d77b4a1e44 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -130,6 +130,139 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/index.php?lang=de-DE
 	</string>
+	<string name="LoginFailedViewerNotPermitted">
+		Mit dem von Ihnen verwendeten Viewer ist der Zugriff auf Second Life nicht mehr möglich. Laden Sie von den folgenden Seite einen neuen Viewer herunter:
+http://secondlife.com/download
+
+Weitere Informationen finden Sie auf der folgenden FAQ-Seite: 
+http://secondlife.com/viewer-access-faq
+	</string>
+	<string name="LoginIntermediateOptionalUpdateAvailable">
+		Optionales Viewer-Update verfügbar: [VERSION]
+	</string>
+	<string name="LoginFailedRequiredUpdate">
+		Erforderliches Viewer-Update: [VERSION]
+	</string>
+	<string name="LoginFailedAlreadyLoggedIn">
+		Dieser Agent ist bereits angemeldet.
+	</string>
+	<string name="LoginFailedAuthenticationFailed">
+		Wir bitten um Entschuldigung! Wir konnten Sie nicht anmelden.
+Stellen Sie sicher, dass Sie die richtigen Informationen eingegeben haben:
+    * Benutzername (wie robertschmidt12 oder warme.sonne)
+    * Kennwort
+Stellen Sie außerdem sicher, dass die Umschaltsperre deaktiviert ist.
+	</string>
+	<string name="LoginFailedPasswordChanged">
+		Ihr Kennwort wurde aus Sicherheitsgründen geändert.
+Gehen Sie zur Seite „Mein Account“ unter http://secondlife.com/password
+und beantworten Sie die Sicherheitsfrage, um Ihr Kennwort zurückzusetzen.
+Wir entschuldigen uns für eventuell enstandene Unannehmlichkeiten.
+	</string>
+	<string name="LoginFailedPasswordReset">
+		Aufgrund von Systemänderungen müssen Sie Ihr Kennwort zurücksetzen.
+Gehen Sie zur Seite „Mein Account“ unter http://secondlife.com/password
+und beantworten Sie die Sicherheitsfrage, um Ihr Kennwort zurückzusetzen.
+Wir entschuldigen uns für eventuell enstandene Unannehmlichkeiten.
+	</string>
+	<string name="LoginFailedEmployeesOnly">
+		Second Life ist vorübergehend wegen Wartung geschlossen.
+Nur Mitarbeiter können sich anmelden.
+Aktuelle Informationen finden Sie unter www.secondlife.com/status.
+	</string>
+	<string name="LoginFailedPremiumOnly">
+		Die Anmeldung bei Second Life ist vorübergehend eingeschränkt, um sicherzustellen, dass Einwohner, die sich bereits inworld aufhalten, das bestmögliche Erlebnis haben.
+	 	
+Benutzer mit kostenlosen Konten können sich während dieses Zeitraums nicht bei Second Life anmelden, damit die Kapazität den Benutzern zur Verfügung steht, die ein gebührenpflichtiges Premium-Konto besitzen.
+	</string>
+	<string name="LoginFailedComputerProhibited">
+		Der Zugriff auf Second Life ist von diesem Computer aus nicht möglich.
+Wenn Sie der Ansicht sind, dass Sie diese Meldung fälschlicherweise erhalten haben, wenden Sie sich an
+support@secondlife.com.
+	</string>
+	<string name="LoginFailedAcountSuspended">
+		Ihr Konto ist erst ab
+[TIME] Pacific Time wieder verfügbar.
+	</string>
+	<string name="LoginFailedAccountDisabled">
+		Ihre Anfrage kann derzeit nicht bearbeitet werden.
+Wenden Sie sich unter http://secondlife.com/support an den Second Life-Support.
+Wenn Sie Ihr Kennwort nicht ändern können, rufen Sie die US-Nummer (866) 476-9763 an.
+	</string>
+	<string name="LoginFailedTransformError">
+		Nicht übereinstimmende Daten bei der Anmeldung festgestellt.
+Wenden Sie sich an support@secondlife.com.
+	</string>
+	<string name="LoginFailedAccountMaintenance">
+		An Ihrem Konto werden gerade kleinere Wartungsarbeiten durchgeführt.
+Ihr Konto ist erst ab
+[TIME] Pacific Time wieder verfügbar.
+Wenn Sie der Ansicht sind, dass Sie diese Meldung fälschlicherweise erhalten haben, wenden Sie sich an support@secondlife.com.
+	</string>
+	<string name="LoginFailedPendingLogoutFault">
+		Abmeldeanforderung führte zu einem Simulatorfehler.
+	</string>
+	<string name="LoginFailedPendingLogout">
+		Das System meldet Sie gerade ab.
+Ihr Konto ist erst ab
+[TIME] Pacific Time wieder verfügbar.
+	</string>
+	<string name="LoginFailedUnableToCreateSession">
+		Es kann keine gültige Sitzung erstellt werden.
+	</string>
+	<string name="LoginFailedUnableToConnectToSimulator">
+		Es kann keine Simulatorverbindung hergestellt werden.
+	</string>
+	<string name="LoginFailedRestrictedHours">
+		Mit Ihrem Konto ist der Zugriff auf Second Life
+nur zwischen [START] und [END] Pacific Time möglich.
+Schauen Sie während dieses Zeitraums vorbei.
+Wenn Sie der Ansicht sind, dass Sie diese Meldung fälschlicherweise erhalten haben, wenden Sie sich an support@secondlife.com.
+	</string>
+	<string name="LoginFailedIncorrectParameters">
+		Falsche Parameter.
+Wenn Sie der Ansicht sind, dass Sie diese Meldung fälschlicherweise erhalten haben, wenden Sie sich an support@secondlife.com.
+	</string>
+	<string name="LoginFailedFirstNameNotAlphanumeric">
+		Vorname muss alphanumerisch sein.
+Wenn Sie der Ansicht sind, dass Sie diese Meldung fälschlicherweise erhalten haben, wenden Sie sich an support@secondlife.com.
+	</string>
+	<string name="LoginFailedLastNameNotAlphanumeric">
+		Nachname muss alphanumerisch sein.
+Wenn Sie der Ansicht sind, dass Sie diese Meldung fälschlicherweise erhalten haben, wenden Sie sich an support@secondlife.com.
+	</string>
+	<string name="LogoutFailedRegionGoingOffline">
+		Die Region wird gerade offline geschaltet.
+Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
+	</string>
+	<string name="LogoutFailedAgentNotInRegion">
+		Agent nicht in Region.
+Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
+	</string>
+	<string name="LogoutFailedPendingLogin">
+		Die Region war gerade dabei, eine andere Sitzung anzumelden.
+Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
+	</string>
+	<string name="LogoutFailedLoggingOut">
+		Die Region war gerade dabei, die vorherige Sitzung abzumelden.
+Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
+	</string>
+	<string name="LogoutFailedStillLoggingOut">
+		Die Region ist noch immer dabei, die vorherige Sitzung abzumelden.
+Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
+	</string>
+	<string name="LogoutSucceeded">
+		Die Region hat soeben die letzte Sitzung abgemeldet.
+Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
+	</string>
+	<string name="LogoutFailedLogoutBegun">
+		Die Region hat den Abmeldevorgang gestartet.
+Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
+	</string>
+	<string name="LoginFailedLoggingOutSession">
+		Das System hat begonnen, Ihre letzte Sitzung abzumelden.
+Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
+	</string>
 	<string name="AgentLostConnection">
 		In dieser Region kann es zu Problemen kommen.  Bitte überprüfen Sie Ihre Internetverbindung.
 	</string>
@@ -441,6 +574,9 @@
 	<string name="symbolic folder link">
 		Link zu Ordner
 	</string>
+	<string name="mesh">
+		mesh
+	</string>
 	<string name="AvatarEditingAppearance">
 		(Aussehen wird bearbeitet)
 	</string>
@@ -1180,6 +1316,9 @@
 	<string name="InvFolder Accessories">
 		Zubehör
 	</string>
+	<string name="InvFolder Meshes">
+		Netze
+	</string>
 	<string name="InvFolder Friends">
 		Freunde
 	</string>
@@ -3762,6 +3901,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="session_initialization_timed_out_error">
 		Die Initialisierung der Sitzung ist fehlgeschlagen
 	</string>
+	<string name="Home position set.">
+		Position für Zuhause festgelegt.
+	</string>
 	<string name="voice_morphing_url">
 		http://secondlife.com/landing/voicemorphing
 	</string>
diff --git a/indra/newview/skins/minimal/xui/de/menu_inspect_avatar_gear.xml b/indra/newview/skins/minimal/xui/de/menu_inspect_avatar_gear.xml
index fbc119c483..72ba7fe41d 100644
--- a/indra/newview/skins/minimal/xui/de/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/minimal/xui/de/menu_inspect_avatar_gear.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Profil anzeigen" name="view_profile"/>
 	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
 	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Anrufen" name="call"/>
 	<menu_item_call label="Teleportieren" name="teleport"/>
 	<menu_item_call label="Ignorieren" name="block"/>
 	<menu_item_call label="Freischalten" name="unblock"/>
diff --git a/indra/newview/skins/minimal/xui/de/panel_adhoc_control_panel.xml b/indra/newview/skins/minimal/xui/de/panel_adhoc_control_panel.xml
new file mode 100644
index 0000000000..cc45f42169
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/de/panel_adhoc_control_panel.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<layout_stack name="vertical_stack">
+		<layout_panel name="call_btn_panel">
+			<button label="Anrufen" name="call_btn"/>
+		</layout_panel>
+		<layout_panel name="end_call_btn_panel">
+			<button label="Anruf beenden" name="end_call_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/de/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/de/panel_bottomtray.xml
index a4d80921ec..2278bfb699 100644
--- a/indra/newview/skins/minimal/xui/de/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/de/panel_bottomtray.xml
@@ -4,26 +4,32 @@
 	<string name="SpeakBtnToolTip" value="Schaltet Mikrofon ein/aus"/>
 	<string name="VoiceControlBtnToolTip" value="Voice-Chat-Steuerung anzeigen/ausblenden"/>
 	<layout_stack name="toolbar_stack">
+		<layout_panel name="speak_panel">
+			<button label="Sprechen" name="speak_btn" tool_tip="Mikrofon ein- und ausschalten"/>
+		</layout_panel>
+		<layout_panel name="speak_flyout_panel">
+			<button label="" name="flyout_btn" tool_tip="Soundeinstellungen ändern"/>
+		</layout_panel>
 		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Gesten" name="Gesture" tool_tip="Gesten anzeigen/ausblenden"/>
+			<gesture_combo_list label="Gesten" name="Gesture" tool_tip="Ihren Avatar bestimmte Aktionen durchführen lassen"/>
 		</layout_panel>
 		<layout_panel name="cam_panel">
-			<bottomtray_button label="Ansicht" name="camera_btn" tool_tip="Kamerasteuerung anzeigen/ausblenden"/>
+			<bottomtray_button label="Ansicht" name="camera_btn" tool_tip="Kamerawinkel steuern"/>
 		</layout_panel>
-		<layout_panel name="avatar_and_destinations_panel">
-			<bottomtray_button label="Ziele" name="destination_btn" tool_tip="Zeigt Leutefenster an"/>
+		<layout_panel name="destinations_panel">
+			<bottomtray_button label="Ziele" name="destination_btn" tool_tip="Durch Second Life reisen"/>
 		</layout_panel>
-		<layout_panel name="avatar_and_destinations_panel">
-			<bottomtray_button label="Mein Avatar" name="avatar_btn"/>
+		<layout_panel name="avatar_panel">
+			<bottomtray_button label="Mein Avatar" name="avatar_btn" tool_tip="Eigenes Aussehen verändern"/>
 		</layout_panel>
 		<layout_panel name="people_panel">
-			<bottomtray_button label="Leute" name="show_people_button" tool_tip="Zeigt Leutefenster an"/>
+			<bottomtray_button label="Leute" name="show_people_button" tool_tip="Personen in Second Life suchen"/>
 		</layout_panel>
 		<layout_panel name="profile_panel">
-			<bottomtray_button label="Profil" name="show_profile_btn" tool_tip="Zeigt Profilfenster an"/>
+			<bottomtray_button label="Profil" name="show_profile_btn" tool_tip="Eigenes Profil anzeigen und bearbeiten"/>
 		</layout_panel>
 		<layout_panel name="howto_panel">
-			<bottomtray_button label="Anweisungen" name="show_help_btn" tool_tip="Second Life-Anweisungsthemen öffnen"/>
+			<bottomtray_button label="Anweisungen" name="show_help_btn" tool_tip="Hilfeinfos zu Second Life anzeigen"/>
 		</layout_panel>
 		<layout_panel name="im_well_panel">
 			<chiclet_im_well name="im_well">
diff --git a/indra/newview/skins/minimal/xui/de/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/de/panel_im_control_panel.xml
index abf8011d9d..0ef2234fec 100644
--- a/indra/newview/skins/minimal/xui/de/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/de/panel_im_control_panel.xml
@@ -9,7 +9,7 @@
 			<button label="Freund hinzufügen" name="add_friend_btn"/>
 		</layout_panel>
 		<layout_panel name="teleport_btn_panel">
-			<button label="Teleportieren" name="teleport_btn" tool_tip="Dieser Person einen Teleport anbieten."/>
+			<button label="Teleportieren" name="teleport_btn" tool_tip="Dieser Person einen Teleport anbieten"/>
 		</layout_panel>
 		<layout_panel name="share_btn_panel">
 			<button label="Teilen" name="share_btn"/>
diff --git a/indra/newview/skins/minimal/xui/de/panel_people.xml b/indra/newview/skins/minimal/xui/de/panel_people.xml
index c6253e17de..4f8f70ad17 100644
--- a/indra/newview/skins/minimal/xui/de/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/de/panel_people.xml
@@ -51,6 +51,9 @@
 			<layout_panel name="chat_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="Instant Messenger öffnen"/>
 			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/>
+			</layout_panel>
 			<layout_panel name="chat_btn_lp">
 				<button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/>
 			</layout_panel>
-- 
cgit v1.2.3


From 0fb93246b36b356362e1899eab2d67c8931d9471 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Wed, 15 Jun 2011 15:12:42 -0700
Subject: Fix VWR-24099: disable teleport button when too many friends are
 selected; we keep the warning dialog as a failsafe.

---
 indra/newview/skins/default/xui/en/notifications.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 21680772ba..6707a09ddf 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3700,8 +3700,8 @@ Join me in [REGION]
    icon="alertmodal.tga"
    name="TooManyTeleportOffers"
    type="alertmodal">
-You attempted to make [OFFERS] teleport offers; 
-250 are the most that can be done at one time
+You attempted to make [OFFERS] teleport offers
+which exceeds the limit of [LIMIT].
     <tag>group</tag>
     <tag>fail</tag>
   <usetemplate
-- 
cgit v1.2.3


From 6532d5db2dc450295d7ee4272600aaf79188ebc1 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 15 Jun 2011 18:38:30 -0400
Subject: SH-1166 WIP

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/notifications.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
old mode 100644
new mode 100755
index ce96c488b4..c8d1d6c9fd
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6823,7 +6823,7 @@ Select residents to share with.
     name="MeshUploadError"
     icon="alert.tga"
     type="alert">
-    [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+    [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] 
   </notification>
    
   <notification
-- 
cgit v1.2.3


From 9d0351550eb94e6bf4a925928c5433de3904b7e9 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Thu, 16 Jun 2011 12:32:30 -0700
Subject: sync with viewer-development

---
 .../xui/en/menu_people_nearby_view_sort.xml        |  8 +++
 .../skins/default/xui/en/panel_cof_wearables.xml   |  3 -
 .../newview/skins/default/xui/en/panel_people.xml  | 70 +++++++++++++++-------
 .../default/xui/en/panel_preferences_sound.xml     | 23 +++++--
 indra/newview/skins/default/xui/en/strings.xml     |  2 +
 5 files changed, 76 insertions(+), 30 deletions(-)

(limited to 'indra/newview/skins')

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_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/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 1a00416b2a..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,28 +99,54 @@ 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_stack
+           clip="false"
+           follows="all"
+           height="355"
+           layout="topleft"
+           mouse_opaque="false"
+           orientation="vertical"
+           width="313">
+           <layout_panel
+             height="142"
              layout="topleft"
-             left="3"
-             multi_select="true"
-             name="avatar_list"
-             top="145"
-             width="306" />
-            <panel
+             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"
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..1745c1e4b0 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"
@@ -332,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"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 339f14eacb..71f48c833d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2101,6 +2101,8 @@ Returns a string with the requested data about the region
 	<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 cc6e80412949639f52138adde5b909a298cd2242 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 16 Jun 2011 15:58:34 -0400
Subject: SH-1166 FIX

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c8d1d6c9fd..09105c1d28 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6824,6 +6824,8 @@ Select residents to share with.
     icon="alert.tga"
     type="alert">
     [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] 
+
+See the log file for details.
   </notification>
    
   <notification
-- 
cgit v1.2.3


From c4d37c3cae78ee785043c022344e1c4a68239dc8 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Fri, 17 Jun 2011 11:34:11 -0700
Subject: WIP INTL-46 Traditional Chinese translation update 6/17

---
 .../newview/skins/default/xui/zh/floater_about.xml |  10 +-
 .../skins/default/xui/zh/floater_about_land.xml    |  26 +--
 .../default/xui/zh/floater_animation_preview.xml   |   6 +-
 .../skins/default/xui/zh/floater_avatar_picker.xml |   8 +-
 .../default/xui/zh/floater_avatar_textures.xml     |   8 +-
 .../skins/default/xui/zh/floater_buy_currency.xml  |   2 +-
 .../skins/default/xui/zh/floater_buy_land.xml      |   6 +-
 .../default/xui/zh/floater_day_cycle_options.xml   |   2 +-
 .../skins/default/xui/zh/floater_gesture.xml       |   8 +-
 .../skins/default/xui/zh/floater_god_tools.xml     |   2 +-
 .../skins/default/xui/zh/floater_image_preview.xml |   2 +-
 .../skins/default/xui/zh/floater_incoming_call.xml |   6 +-
 .../xui/zh/floater_inventory_view_finder.xml       |   4 +-
 .../skins/default/xui/zh/floater_media_browser.xml |  18 +-
 .../skins/default/xui/zh/floater_mem_leaking.xml   |   2 +-
 .../skins/default/xui/zh/floater_nearby_chat.xml   |   2 +-
 indra/newview/skins/default/xui/zh/floater_pay.xml |   8 +-
 .../skins/default/xui/zh/floater_pay_object.xml    |   8 +-
 .../default/xui/zh/floater_preview_animation.xml   |   6 +-
 .../default/xui/zh/floater_preview_gesture.xml     |  14 +-
 .../skins/default/xui/zh/floater_script_debug.xml  |   2 +-
 .../skins/default/xui/zh/floater_sell_land.xml     |   2 +-
 .../skins/default/xui/zh/floater_snapshot.xml      |   2 +-
 .../newview/skins/default/xui/zh/floater_stats.xml |  28 +--
 .../newview/skins/default/xui/zh/floater_tools.xml | 204 ++++++++++-----------
 .../skins/default/xui/zh/floater_top_objects.xml   |  16 +-
 .../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 +-
 .../skins/default/xui/zh/floater_web_content.xml   |   4 +-
 .../skins/default/xui/zh/floater_window_size.xml   |   2 +-
 .../skins/default/xui/zh/floater_world_map.xml     |   4 +-
 .../newview/skins/default/xui/zh/inspect_group.xml |   6 +-
 .../skins/default/xui/zh/inspect_object.xml        |   2 +-
 .../skins/default/xui/zh/menu_attachment_other.xml |   2 +-
 .../skins/default/xui/zh/menu_avatar_icon.xml      |   2 +-
 .../skins/default/xui/zh/menu_avatar_other.xml     |   2 +-
 .../skins/default/xui/zh/menu_gesture_gear.xml     |   2 +-
 .../default/xui/zh/menu_inspect_avatar_gear.xml    |   2 +-
 .../default/xui/zh/menu_inspect_object_gear.xml    |  14 +-
 .../skins/default/xui/zh/menu_inventory.xml        |  24 +--
 .../default/xui/zh/menu_inventory_gear_default.xml |   8 +-
 .../newview/skins/default/xui/zh/menu_landmark.xml |   2 +-
 indra/newview/skins/default/xui/zh/menu_login.xml  |  14 +-
 .../skins/default/xui/zh/menu_outfit_gear.xml      |   8 +-
 .../skins/default/xui/zh/menu_participant_list.xml |   2 +-
 .../xui/zh/menu_people_groups_view_sort.xml        |   2 +-
 .../skins/default/xui/zh/menu_people_nearby.xml    |   2 +-
 .../xui/zh/menu_people_nearby_multiselect.xml      |   2 +-
 .../skins/default/xui/zh/menu_picks_plus.xml       |   2 +-
 indra/newview/skins/default/xui/zh/menu_place.xml  |   2 +-
 .../default/xui/zh/menu_places_gear_folder.xml     |   2 +-
 .../default/xui/zh/menu_places_gear_landmark.xml   |   2 +-
 .../skins/default/xui/zh/menu_profile_overflow.xml |   2 +-
 indra/newview/skins/default/xui/zh/menu_viewer.xml |  52 +++---
 indra/newview/skins/default/xui/zh/mime_types.xml  |   2 +-
 .../newview/skins/default/xui/zh/notifications.xml |  36 ++--
 .../default/xui/zh/panel_adhoc_control_panel.xml   |   2 +-
 .../default/xui/zh/panel_avatar_list_item.xml      |   2 +-
 .../skins/default/xui/zh/panel_edit_hair.xml       |   2 +-
 .../skins/default/xui/zh/panel_edit_pants.xml      |   2 +-
 .../skins/default/xui/zh/panel_edit_pick.xml       |  12 +-
 .../skins/default/xui/zh/panel_edit_shape.xml      |  22 +--
 .../skins/default/xui/zh/panel_edit_shirt.xml      |   2 +-
 .../skins/default/xui/zh/panel_edit_skirt.xml      |   2 +-
 .../skins/default/xui/zh/panel_edit_socks.xml      |   2 +-
 .../skins/default/xui/zh/panel_edit_tattoo.xml     |   8 +-
 .../skins/default/xui/zh/panel_edit_wearable.xml   |   8 +-
 .../skins/default/xui/zh/panel_group_general.xml   |   6 +-
 .../skins/default/xui/zh/panel_group_invite.xml    |   2 +-
 .../default/xui/zh/panel_group_land_money.xml      |   6 +-
 .../skins/default/xui/zh/panel_group_notices.xml   |  16 +-
 .../skins/default/xui/zh/panel_group_roles.xml     |   2 +-
 .../default/xui/zh/panel_im_control_panel.xml      |   2 +-
 indra/newview/skins/default/xui/zh/panel_me.xml    |   2 +-
 .../xui/zh/panel_media_settings_general.xml        |   2 +-
 .../xui/zh/panel_media_settings_permissions.xml    |  10 +-
 .../skins/default/xui/zh/panel_nearby_chat_bar.xml |   4 +-
 .../skins/default/xui/zh/panel_nearby_media.xml    |   6 +-
 .../skins/default/xui/zh/panel_notify_textbox.xml  |   6 +-
 .../skins/default/xui/zh/panel_outfit_edit.xml     |   6 +-
 .../skins/default/xui/zh/panel_pick_info.xml       |   2 +-
 indra/newview/skins/default/xui/zh/panel_picks.xml |  14 +-
 .../skins/default/xui/zh/panel_place_profile.xml   |  12 +-
 .../default/xui/zh/panel_preferences_chat.xml      |   2 +-
 .../default/xui/zh/panel_preferences_general.xml   |  34 ++--
 .../default/xui/zh/panel_preferences_move.xml      |   4 +-
 .../default/xui/zh/panel_preferences_sound.xml     |  32 ++--
 .../default/xui/zh/panel_prim_media_controls.xml   |   2 +-
 .../newview/skins/default/xui/zh/panel_profile.xml |   4 +-
 .../skins/default/xui/zh/panel_profile_view.xml    |   2 +-
 .../skins/default/xui/zh/panel_region_covenant.xml |  10 +-
 .../skins/default/xui/zh/panel_region_debug.xml    |  14 +-
 .../skins/default/xui/zh/panel_region_estate.xml   |   2 +-
 .../skins/default/xui/zh/panel_region_general.xml  |  12 +-
 .../skins/default/xui/zh/panel_side_tray.xml       |   2 +-
 .../default/xui/zh/panel_teleport_history.xml      |   2 +-
 .../skins/default/xui/zh/sidepanel_appearance.xml  |   2 +-
 .../skins/default/xui/zh/sidepanel_task_info.xml   |  20 +-
 indra/newview/skins/default/xui/zh/strings.xml     | 176 +++++++++---------
 .../skins/default/xui/zh/teleport_strings.xml      |   2 +-
 101 files changed, 549 insertions(+), 549 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index 58e8c41c38..bee940ddc1 100644
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -25,11 +25,11 @@
 	<floater.string name="AboutLibs">
 		OpenGL Version: [OPENGL_VERSION]
 
-libcurl Version: [LIBCURL_VERSION]
-J2C Decoder Version: [J2C_VERSION]
-Audio Driver Version: [AUDIO_DRIVER_VERSION]
-Qt Webkit Version: [QT_WEBKIT_VERSION]
-Voice Server Version: [VOICE_VERSION]
+libcurl 版本： [LIBCURL_VERSION]
+J2C 解碼器版本： [J2C_VERSION]
+音效驅動程式版本： [AUDIO_DRIVER_VERSION]
+Qt Webkit 版本： [QT_WEBKIT_VERSION]
+語音伺服器版本： [VOICE_VERSION]
 	</floater.string>
 	<floater.string name="none">
 		（無）
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 a9142b22ad..efd8909e67 100644
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -81,7 +81,7 @@
 				分級：
 			</text>
 			<text name="ContentRatingText">
-				Adult
+				成人
 			</text>
 			<text name="Owner:">
 				擁有者：
@@ -186,7 +186,7 @@
 				分級：
 			</text>
 			<text name="region_maturity_text">
-				Adult
+				成人
 			</text>
 			<text name="resellable_lbl">
 				Resale:
@@ -289,7 +289,7 @@ Only large parcels can be listed in search.
 				Moderate Content
 			</panel.string>
 			<panel.string name="mature_check_adult">
-				Adult Content
+				成人內容
 			</panel.string>
 			<panel.string name="mature_check_mature_tooltip">
 				Your parcel information or content is considered moderate.
@@ -307,35 +307,35 @@ Only large parcels can be listed in search.
 				禁止推撞（地區設定覆蓋）
 			</panel.string>
 			<text name="allow_label">
-				Allow other Residents to:
+				允許其他居民去：
 			</text>
-			<check_box label="Edit Terrain" name="edit land check" tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land."/>
-			<check_box label="飛行" name="check fly" tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land."/>
+			<check_box label="編輯地形" name="edit land check" tool_tip="若勾選則任何人將可以變形你的土地，最好是保持未勾選，因為你隨時可以編輯變更你的土地。"/>
+			<check_box label="飛行" name="check fly" tool_tip="逤勾選則居民可以在你飛行，不然就只能由外面飛入或飛越你的土地。"/>
 			<text name="allow_label2">
 				建造：
 			</text>
 			<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="任何人" name="all object entry check"/>
 			<check_box label="社團" name="group object entry check"/>
 			<text name="allow_label4">
-				Run Scripts:
+				執行腳本：
 			</text>
 			<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="安全（無傷害）" 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="安全（無傷害）" name="check safe" tool_tip="若勾選則設應土地為安全的，傷害性的戰鬥將被關閉。清除勾選後才能進行傷害性的戰鬥。"/>
+			<check_box label="禁止推撞" name="PushRestrictCheck" tool_tip="防止使用腳本推撞。勾選這個選項將可以有效防止你土地上的破壞行為。"/>
 			<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="任何類別" name="item0"/>
 				<combo_box.item label="Linden Location" name="item1"/>
-				<combo_box.item label="Adult" name="item2"/>
+				<combo_box.item label="成人" name="item2"/>
 				<combo_box.item label="Arts &amp; Culture" name="item3"/>
 				<combo_box.item label="Business" name="item4"/>
 				<combo_box.item label="Educational" name="item5"/>
@@ -467,7 +467,7 @@ Only large parcels can be listed in search.
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Ban" name="BanCheck">
-					Banned Residents
+					被封鎖的居民
 				</text>
 				<name_list name="BannedList" tool_tip="([LISTED] listed, [MAX] max)"/>
 				<button label="添加" name="add_banned"/>
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 b4d7f71eec..b5d65119f7 100644
--- a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
@@ -9,7 +9,7 @@
 Maximum animation length is [MAX_LENGTH] seconds.
 	</floater.string>
 	<floater.string name="failed_file_read">
-		Unable to read animation file.
+		無法讀取動作檔。
 
 [STATUS]
 	</floater.string>
@@ -23,7 +23,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
 		Cannot read constraint definition.
 	</floater.string>
 	<floater.string name="E_ST_NO_FILE">
-		Cannot open BVH file.
+		無法開啟 BVH 檔案。
 	</floater.string>
 	<floater.string name="E_ST_NO_HIER">
 		Invalid HIERARCHY header.
@@ -115,7 +115,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
 	<text name="description_label">
 		描述：
 	</text>
-	<spinner label="Priority" name="priority" tool_tip="Controls which other animations can be overridden by this animation"/>
+	<spinner label="優先度" name="priority" tool_tip="Controls which other animations can be overridden by this animation"/>
 	<check_box label="Loop" name="loop_check" tool_tip="Makes this animation loop"/>
 	<spinner label="In(%)" name="loop_in_point" tool_tip="Sets point in animation that looping returns to"/>
 	<spinner label="Out(%)" name="loop_out_point" tool_tip="Sets point in animation that ends a loop"/>
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 90fd7c029e..27a4199f8c 100644
--- a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
@@ -29,18 +29,18 @@
 				<columns label="使用者名稱" name="username"/>
 			</scroll_list>
 		</panel>
-		<panel label="Friends" name="FriendsPanel">
+		<panel label="朋友" name="FriendsPanel">
 			<text name="InstructSelectFriend">
 				選擇一個人：
 			</text>
 		</panel>
 		<panel label="接近我" name="NearMePanel">
 			<text name="InstructSelectResident">
-				Select a person nearby:
+				選擇一位附近的人：
 			</text>
-			<slider label="Range" name="near_me_range"/>
+			<slider label="範圍" name="near_me_range"/>
 			<text name="meters">
-				Meters
+				公尺
 			</text>
 			<scroll_list name="NearMe">
 				<columns label="名稱" name="name"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
index fb17c0bb8a..b1dc081f04 100644
--- a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
@@ -15,13 +15,13 @@ Textures
 			</text>
 			<button label="Dump IDs to Console" label_selected="Dump" name="Dump"/>
 			<panel name="scroll_content_panel">
-				<texture_picker label="Hair" name="hair-baked"/>
-				<texture_picker label="Hair" name="hair_grain"/>
+				<texture_picker label="頭髮" name="hair-baked"/>
+				<texture_picker label="頭髮" name="hair_grain"/>
 				<texture_picker label="Hair Alpha" name="hair_alpha"/>
-				<texture_picker label="Head" name="head-baked"/>
+				<texture_picker label="頭部" name="head-baked"/>
 				<texture_picker label="Makeup" name="head_bodypaint"/>
 				<texture_picker label="Head Alpha" name="head_alpha"/>
-				<texture_picker label="Head Tattoo" name="head_tattoo"/>
+				<texture_picker label="頭部刺青" name="head_tattoo"/>
 				<texture_picker label="眼睛" name="eyes-baked"/>
 				<texture_picker label="眼睛" name="eyes_iris"/>
 				<texture_picker label="Eyes Alpha" name="eyes_alpha"/>
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 0c4514600f..d8e9fb0ecc 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
@@ -40,7 +40,7 @@
 		[ACTION]
 	</text>
 	<text name="total_label">
-		My new balance will be
+		我的帳戶餘額將為
 	</text>
 	<text name="total_amount">
 		L$ [AMT]
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 023c531692..34401c11d0 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
@@ -68,7 +68,7 @@ Try selecting a smaller area.
 		none needed
 	</floater.string>
 	<floater.string name="must_upgrade">
-		Your account must be upgraded to own land.
+		你的帳戶必須要升級才能擁有土地。
 	</floater.string>
 	<floater.string name="cant_own_land">
 		你的帳戶能擁有土地。
@@ -83,7 +83,7 @@ Try selecting a smaller area.
 		Buy L$ [AMOUNT] for approx. [LOCAL_AMOUNT],
 	</floater.string>
 	<floater.string name="parcel_meters">
-		This parcel is [AMOUNT] m²
+		這個地段為 [AMOUNT] m²
 	</floater.string>
 	<floater.string name="premium_land">
 		This land is premium, and will charge as [AMOUNT] m².
@@ -122,7 +122,7 @@ supports [AMOUNT2] objects
 		You need to buy at least L$ [AMOUNT] to afford this land.
 	</floater.string>
 	<floater.string name="no_parcel_selected">
-		(no parcel selected)
+		（無地段被選擇）
 	</floater.string>
 	<text name="region_name_label">
 		地區：
diff --git a/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
index 8adc094fca..28d2ba6ed4 100644
--- a/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
@@ -86,7 +86,7 @@
 				預覽：
 			</text>
 			<button label="Play" label_selected="Play" name="WLAnimSky"/>
-			<button label="Stop!" label_selected="Stop" name="WLStopAnimSky"/>
+			<button label="停止!" label_selected="停止" name="WLStopAnimSky"/>
 			<button label="Use Estate Time" label_selected="Go to Estate Time" name="WLUseLindenTime"/>
 			<button label="Save Test Day" label_selected="Save Test Day" name="WLSaveDayCycle"/>
 			<button label="Load Test Day" label_selected="Load Test Day" name="WLLoadDayCycle"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_gesture.xml b/indra/newview/skins/default/xui/zh/floater_gesture.xml
index 2dcb46fb77..651a976774 100644
--- a/indra/newview/skins/default/xui/zh/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_gesture.xml
@@ -16,11 +16,11 @@
 	</scroll_list>
 	<panel label="bottom_panel" name="bottom_panel">
 		<menu_button name="gear_btn" tool_tip="更多選項"/>
-		<button name="new_gesture_btn" tool_tip="Make new gesture"/>
+		<button name="new_gesture_btn" tool_tip="製作新姿勢e"/>
 		<button name="activate_btn" tool_tip="Activate/Deactivate selected gesture"/>
-		<button name="del_btn" tool_tip="Delete this gesture"/>
+		<button name="del_btn" tool_tip="刪除這個姿勢"/>
 	</panel>
 	<button label="編輯" name="edit_btn"/>
-	<button label="Play" name="play_btn"/>
-	<button label="Stop" name="stop_btn"/>
+	<button label="播放" name="play_btn"/>
+	<button label="停止" name="stop_btn"/>
 </floater>
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 86403494e0..fbe89ab2a6 100644
--- a/indra/newview/skins/default/xui/zh/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="godtools floater" title="GOD TOOLS">
+<floater name="godtools floater" title="神之工具">
 	<tab_container name="GodTools Tabs">
 		<panel label="網格" name="grid">
 			<button label="Flush This Region&apos;s Map Visibility Caches" label_selected="Flush This Region&apos;s Map Visibility Caches" name="Flush This Region&apos;s Map Visibility Caches"/>
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 7eef0177ef..d7e9a7704c 100644
--- a/indra/newview/skins/default/xui/zh/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
@@ -11,7 +11,7 @@
 	</text>
 	<combo_box label="服裝類型" name="clothing_type_combo">
 		<item label="圖像" name="Image" value="圖像"/>
-		<item label="Hair" name="Hair" value="Hair"/>
+		<item label="頭髮" name="Hair" value="頭髮"/>
 		<item label="Female Head" name="FemaleHead" value="Female Head"/>
 		<item label="Female Upper Body" name="FemaleUpperBody" value="Female Upper Body"/>
 		<item label="Female Lower Body" name="FemaleLowerBody" value="Female Lower Body"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
index 4f678dbd9d..123cdd9f2c 100644
--- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
@@ -4,10 +4,10 @@
 		5
 	</floater.string>
 	<floater.string name="localchat">
-		Nearby Voice Chat
+		附近的音聊天
 	</floater.string>
 	<floater.string name="anonymous">
-		anonymous
+		匿名
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
 		通話中。
@@ -28,6 +28,6 @@
 		Do you want to leave [CURRENT_CHAT] and join this voice chat?
 	</text>
 	<button label="接受" label_selected="接受" name="Accept"/>
-	<button label="Reject" label_selected="Reject" name="Reject"/>
+	<button label="拒絕" label_selected="拒絕" name="Reject"/>
 	<button label="開始 IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
index a442eb9cbc..a4ede92ab1 100644
--- a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory Finder" title="最近_收納區_物品">
-	<check_box label="Animation" name="check_animation"/>
+	<check_box label="動作" name="check_animation"/>
 	<check_box label="Calling Cards" name="check_calling_card"/>
 	<check_box label="服裝" name="check_clothing"/>
 	<check_box label="姿勢" name="check_gesture"/>
 	<check_box label="地標" name="check_landmark"/>
 	<check_box label="Notecards" name="check_notecard"/>
 	<check_box label="Objects" name="check_object"/>
-	<check_box label="Scripts" name="check_script"/>
+	<check_box label="腳本" name="check_script"/>
 	<check_box label="Sounds" name="check_sound"/>
 	<check_box label="材質" name="check_texture"/>
 	<check_box label="Snapshots" name="check_snapshot"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_media_browser.xml b/indra/newview/skins/default/xui/zh/floater_media_browser.xml
index 616c326d6b..6e75016fad 100644
--- a/indra/newview/skins/default/xui/zh/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/zh/floater_media_browser.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="MEDIA BROWSER">
+<floater name="floater_about" title="媒體劉覽器">
 	<floater.string name="home_page_url">
 		http://www.secondlife.com
 	</floater.string>
@@ -8,22 +8,22 @@
 	</floater.string>
 	<layout_stack name="stack1">
 		<layout_panel name="nav_controls">
-			<button label="Back" name="back"/>
-			<button label="Forward" name="forward"/>
-			<button label="Reload" name="reload"/>
+			<button label="向後" name="back"/>
+			<button label="向前" name="forward"/>
+			<button label="重載" name="reload"/>
 			<button label="Go" name="go"/>
 		</layout_panel>
 		<layout_panel name="time_controls">
 			<button label="rewind" name="rewind"/>
-			<button label="stop" name="stop"/>
-			<button label="forward" name="seek"/>
+			<button label="停止" name="stop"/>
+			<button label="向前" name="seek"/>
 		</layout_panel>
 		<layout_panel name="parcel_owner_controls">
-			<button label="Send Current Page to Parcel" name="assign"/>
+			<button label="送出目前頁面到地段" name="assign"/>
 		</layout_panel>
 		<layout_panel name="external_controls">
-			<button label="Open in My Web Browser" name="open_browser"/>
-			<check_box label="Always open in my web browser" name="open_always"/>
+			<button label="在我的網頁瀏覽器中開啟" name="open_browser"/>
+			<check_box label="總是在我的網頁瀏覽器中開啟" name="open_always"/>
 			<button label="關閉" name="close"/>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
index 3fa62b1b60..93c1b58df6 100644
--- a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
@@ -12,7 +12,7 @@
 		[NOTE2]
 	</text>
 	<button label="Start" name="start_btn"/>
-	<button label="Stop" name="stop_btn"/>
+	<button label="停止" name="stop_btn"/>
 	<button label="Release" name="release_btn"/>
 	<button label="關閉" name="close_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml b/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml
index bed7c20ba5..f0c34acb06 100644
--- a/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="NEARBY CHAT">
+<floater name="nearby_chat" title="附近的聊天">
 	<check_box label="Translate chat (powered by Google)" name="translate_chat_checkbox"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pay.xml b/indra/newview/skins/default/xui/zh/floater_pay.xml
index eeaaf0ab7d..b4841df0ff 100644
--- a/indra/newview/skins/default/xui/zh/floater_pay.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money">
 	<string name="payee_group">
-		Pay Group
+		支付社團
 	</string>
 	<string name="payee_resident">
-		Pay Resident
+		支付居民
 	</string>
 	<text name="payee_name">
 		Test Name That Is Extremely Long To Check Clipping
@@ -14,8 +14,8 @@
 	<button label="L$10" label_selected="L$10" name="fastpay 10"/>
 	<button label="L$20" label_selected="L$20" name="fastpay 20"/>
 	<text name="amount text">
-		Or, choose amount:
+		或，選擇一個金額：
 	</text>
-	<button label="Pay" label_selected="Pay" name="pay btn"/>
+	<button label="支付" label_selected="支付" name="pay 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 234aa9f7af..2a2aec93b9 100644
--- a/indra/newview/skins/default/xui/zh/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money">
 	<string name="payee_group">
-		Pay Group
+		支付社團
 	</string>
 	<string name="payee_resident">
-		Pay Resident
+		支付居民
 	</string>
 	<text name="payee_name">
 		Ericacita Moostopolison
 	</text>
 	<text name="object_name_label">
-		Via object:
+		經由物件：
 	</text>
 	<icon name="icon_object" tool_tip="物件"/>
 	<text name="object_name_text">
@@ -23,6 +23,6 @@
 	<text name="amount text">
 		或者，選擇一個金額：
 	</text>
-	<button label="Pay" label_selected="Pay" name="pay btn"/>
+	<button label="支付" label_selected="支付" name="pay btn"/>
 	<button label="取消" label_selected="取消" name="cancel btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
index 5ac2de4dc5..ead8dc49a6 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_anim">
 	<floater.string name="Title">
-		Animation: [NAME]
+		動作： [NAME]
 	</floater.string>
 	<text name="desc txt">
 		描述：
 	</text>
-	<button label="Play Inworld" label_selected="Stop" name="Anim play btn" tool_tip="Play this animation so that others can see it"/>
-	<button label="Play Locally" label_selected="Stop" name="Anim audition btn" tool_tip="Play this animation so that only you can see it"/>
+	<button label="Play Inworld" label_selected="停止" name="Anim play btn" tool_tip="Play this animation so that others can see it"/>
+	<button label="Play Locally" label_selected="停止" name="Anim audition btn" tool_tip="Play this animation so that only you can see it"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
index 52e6a9d8e4..0649ecb791 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
@@ -13,7 +13,7 @@
 		Wait:
 	</floater.string>
 	<floater.string name="stop_txt">
-		Stop
+		停止
 	</floater.string>
 	<floater.string name="preview_txt">
 		預覽
@@ -43,10 +43,10 @@
 		Library:
 	</text>
 	<scroll_list name="library_list">
-		<scroll_list.rows name="action_animation" value="Animation"/>
-		<scroll_list.rows name="action_sound" value="Sound"/>
+		<scroll_list.rows name="action_animation" value="動作"/>
+		<scroll_list.rows name="action_sound" value="聲音"/>
 		<scroll_list.rows name="action_chat" value="聊天"/>
-		<scroll_list.rows name="action_wait" value="Wait"/>
+		<scroll_list.rows name="action_wait" value="等待"/>
 	</scroll_list>
 	<button label="Add &gt;&gt;" name="add_btn"/>
 	<text name="steps_label">
@@ -59,10 +59,10 @@
 		（選項）
 	</text>
 	<radio_group name="animation_trigger_type">
-		<radio_item label="Start" name="start"/>
-		<radio_item label="Stop" name="stop"/>
+		<radio_item label="開始" name="start"/>
+		<radio_item label="停止" name="stop"/>
 	</radio_group>
-	<check_box label="until animations are done" name="wait_anim_check"/>
+	<check_box label="直到動作結束。" name="wait_anim_check"/>
 	<check_box label="time in seconds:" name="wait_time_check"/>
 	<text name="help_label">
 		All steps happen simultaneously, unless you add wait steps.
diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug.xml b/indra/newview/skins/default/xui/zh/floater_script_debug.xml
index 12e646785d..5b3500c018 100644
--- a/indra/newview/skins/default/xui/zh/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_debug.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="script debug floater" title="Script Warning/Error"/>
+<multi_floater name="script debug floater" title="腳本 警告/錯誤"/>
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 b6a929caeb..19580c99a1 100644
--- a/indra/newview/skins/default/xui/zh/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_sell_land.xml
@@ -41,7 +41,7 @@
 			<combo_box name="sell_to">
 				<combo_box.item label="- 選擇一個 -" name="--selectone--"/>
 				<combo_box.item label="任何人" name="Anyone"/>
-				<combo_box.item label="Specific person:" name="Specificuser:"/>
+				<combo_box.item label="指定人：" name="Specificuser:"/>
 			</combo_box>
 			<button label="選擇" name="sell_to_select_agent"/>
 			<text name="sell_objects_label">
diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
index c9a66c1644..9edc19969f 100644
--- a/indra/newview/skins/default/xui/zh/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
@@ -11,7 +11,7 @@
 	<text name="file_size_label">
 		[SIZE] KB
 	</text>
-	<button label="Send" name="send_btn"/>
+	<button label="送出" name="send_btn"/>
 	<button label="儲存（L$[AMOUNT]）" name="upload_btn"/>
 	<flyout_button label="儲存" name="save_btn" tool_tip="儲存圖像到檔案">
 		<flyout_button.item label="儲存" name="save_item"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml
index 54c5ba5cc0..eebd5df3f7 100644
--- a/indra/newview/skins/default/xui/zh/floater_stats.xml
+++ b/indra/newview/skins/default/xui/zh/floater_stats.xml
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Statistics" title="STATISTICS">
+<floater name="Statistics" title="統計">
 	<scroll_container name="statistics_scroll">
 		<container_view name="statistics_view">
-			<stat_view label="Basic" name="basic">
+			<stat_view label="基本" name="basic">
 				<stat_bar label="FPS" name="fps"/>
-				<stat_bar label="Bandwidth" name="bandwidth"/>
+				<stat_bar label="頻寬" name="bandwidth"/>
 				<stat_bar label="封包損失" name="packet_loss"/>
 				<stat_bar label="Ping Sim" name="ping"/>
 			</stat_view>
-			<stat_view label="Advanced" name="advanced">
+			<stat_view label="進階" name="advanced">
 				<stat_view label="Render" name="render">
 					<stat_bar label="KTris Drawn" name="ktrisframe"/>
 					<stat_bar label="KTris Drawn" name="ktrissec"/>
-					<stat_bar label="Total Objects" name="objs"/>
-					<stat_bar label="New Objects" name="newobjs"/>
+					<stat_bar label="物件總計" name="objs"/>
+					<stat_bar label="新物件" name="newobjs"/>
 				</stat_view>
 				<stat_view label="材質" name="texture">
-					<stat_bar label="Count" name="numimagesstat"/>
+					<stat_bar label="計數" name="numimagesstat"/>
 					<stat_bar label="Raw Count" name="numrawimagesstat"/>
 					<stat_bar label="GL Mem" name="gltexmemstat"/>
 					<stat_bar label="Formatted Mem" name="formattedmemstat"/>
 					<stat_bar label="Raw Mem" name="rawmemstat"/>
 					<stat_bar label="Bound Mem" name="glboundmemstat"/>
 				</stat_view>
-				<stat_view label="Network" name="network">
+				<stat_view label="網路" name="network">
 					<stat_bar label="Packets In" name="packetsinstat"/>
 					<stat_bar label="Packets Out" name="packetsoutstat"/>
-					<stat_bar label="Objects" name="objectkbitstat"/>
+					<stat_bar label="物件" name="objectkbitstat"/>
 					<stat_bar label="材質" name="texturekbitstat"/>
-					<stat_bar label="Asset" name="assetkbitstat"/>
+					<stat_bar label="資產" name="assetkbitstat"/>
 					<stat_bar label="Layers" name="layerskbitstat"/>
 					<stat_bar label="Actual In" name="actualinkbitstat"/>
 					<stat_bar label="Actual Out" name="actualoutkbitstat"/>
 					<stat_bar label="VFS Pending Ops" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
-			<stat_view label="Simulator" name="sim">
+			<stat_view label="模擬器" name="sim">
 				<stat_bar label="Time Dilation" name="simtimedilation"/>
 				<stat_bar label="Sim FPS" name="simfps"/>
 				<stat_bar label="Physics FPS" name="simphysicsfps"/>
 				<stat_view label="Physics Details" name="physicsdetail">
 					<stat_bar label="Pinned Objects" name="physicspinnedtasks"/>
 					<stat_bar label="Low LOD Objects" name="physicslodtasks"/>
-					<stat_bar label="Memory Allocated" name="physicsmemoryallocated"/>
+					<stat_bar label="記憶體配置" name="physicsmemoryallocated"/>
 				</stat_view>
 				<stat_bar label="Agent Updates/Sec" name="simagentups"/>
 				<stat_bar label="Main Agents" name="simmainagents"/>
 				<stat_bar label="Child Agents" name="simchildagents"/>
-				<stat_bar label="Objects" name="simobjects"/>
+				<stat_bar label="物件" name="simobjects"/>
 				<stat_bar label="Active Objects" name="simactiveobjects"/>
 				<stat_bar label="Active Scripts" name="simactivescripts"/>
 				<stat_bar label="Script Events" name="simscripteps"/>
@@ -63,7 +63,7 @@
 					<stat_bar label="Simulation Time" name="simsimothermsec"/>
 					<stat_bar label="Agent Time" name="simagentmsec"/>
 					<stat_bar label="Images Time" name="simimagesmsec"/>
-					<stat_bar label="Script Time" name="simscriptmsec"/>
+					<stat_bar label="腳本時間" name="simscriptmsec"/>
 				</stat_view>
 			</stat_view>
 		</container_view>
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index 7ba1a0d6c4..300d7ee63b 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -39,11 +39,11 @@
 	<floater.string name="grid_attachment_text">
 		Attachment
 	</floater.string>
-	<button name="button focus" tool_tip="Focus"/>
+	<button name="button focus" tool_tip="聚焦"/>
 	<button name="button move" tool_tip="移動"/>
 	<button name="button edit" tool_tip="編輯"/>
-	<button name="button create" tool_tip="Create"/>
-	<button name="button land" tool_tip="Land"/>
+	<button name="button create" tool_tip="創造"/>
+	<button name="button land" tool_tip="土地"/>
 	<text name="text status">
 		Drag to move, shift-drag to copy
 	</text>
@@ -61,17 +61,17 @@
 	<radio_group name="edit_radio_group">
 		<radio_item label="移動" name="radio position"/>
 		<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_item label="伸展（Ctrl+Shift）" name="radio stretch"/>
+		<radio_item label="選擇面" name="radio select face"/>
 	</radio_group>
-	<check_box label="Edit linked" name="checkbox edit linked parts"/>
-	<button label="Link" name="link_btn"/>
-	<button label="Unlink" name="unlink_btn"/>
+	<check_box label="編輯聯結部分" name="checkbox edit linked parts"/>
+	<button label="聯結" name="link_btn"/>
+	<button label="取消聯結" name="unlink_btn"/>
 	<text name="RenderingCost" tool_tip="Shows the rendering cost calculated for this object">
 		þ: [COUNT]
 	</text>
-	<text label="Stretch Both Sides" name="checkbox uniform label">
-		Stretch Both Sides
+	<text label="同時伸展兩側" name="checkbox uniform label">
+		同時伸展兩側
 	</text>
 	<check_box initial_value="true" label="伸展材質" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="貼齊格線" name="checkbox snap to grid"/>
@@ -80,7 +80,7 @@
 		<combo_box.item label="Local grid" name="Local"/>
 		<combo_box.item label="Reference grid" name="Reference"/>
 	</combo_box>
-	<button name="Options..." tool_tip="See more grid options"/>
+	<button name="Options..." tool_tip="察看更多格線選項"/>
 	<button name="ToolCube" tool_tip="Cube"/>
 	<button name="ToolPrism" tool_tip="Prism"/>
 	<button name="ToolPyramid" tool_tip="Pyramid"/>
@@ -96,33 +96,33 @@
 	<button name="ToolRing" tool_tip="Ring"/>
 	<button name="ToolTree" tool_tip="Tree"/>
 	<button name="ToolGrass" tool_tip="Grass"/>
-	<check_box label="Keep Tool selected" name="checkbox sticky"/>
-	<check_box label="Copy selection" name="checkbox copy selection"/>
+	<check_box label="保持已選擇的工具" name="checkbox sticky"/>
+	<check_box label="覆製選擇" name="checkbox copy selection"/>
 	<check_box initial_value="true" label="Center Copy" name="checkbox copy centers"/>
 	<check_box label="Rotate Copy" name="checkbox copy rotates"/>
 	<radio_group name="land_radio_group">
-		<radio_item label="Select Land" name="radio select land"/>
-		<radio_item label="Flatten" name="radio flatten"/>
-		<radio_item label="Raise" name="radio raise"/>
-		<radio_item label="Lower" name="radio lower"/>
-		<radio_item label="Smooth" name="radio smooth"/>
-		<radio_item label="Roughen" name="radio noise"/>
-		<radio_item label="Revert" name="radio revert"/>
+		<radio_item label="選擇土地" name="radio select land"/>
+		<radio_item label="攤平" name="radio flatten"/>
+		<radio_item label="提高" name="radio raise"/>
+		<radio_item label="降低" name="radio lower"/>
+		<radio_item label="平滑" name="radio smooth"/>
+		<radio_item label="粗糙" name="radio noise"/>
+		<radio_item label="還原" name="radio revert"/>
 	</radio_group>
 	<text name="Bulldozer:">
-		Bulldozer:
+		推土機：
 	</text>
 	<text name="Dozer Size:">
 		尺寸
 	</text>
 	<slider_bar initial_value="2.0" name="slider brush size"/>
 	<text name="Strength:">
-		Strength
+		力道
 	</text>
 	<slider_bar initial_value="0.00" name="slider force"/>
-	<button label="套用" label_selected="套用" name="button apply to selection" tool_tip="Modify selected land"/>
+	<button label="套用" label_selected="套用" name="button apply to selection" tool_tip="修改所選擇的土地"/>
 	<text name="obj_count">
-		Objects: [COUNT]
+		物件： [COUNT]
 	</text>
 	<text name="prim_count">
 		Prims: [COUNT]
@@ -136,19 +136,19 @@
 				Deed
 			</panel.string>
 			<panel.string name="text modify info 1">
-				You can modify this object
+				你能修改這個物件
 			</panel.string>
 			<panel.string name="text modify info 2">
-				You can modify these objects
+				你能修改這些物件
 			</panel.string>
 			<panel.string name="text modify info 3">
-				You can&apos;t modify this object
+				你不能修改這個物件
 			</panel.string>
 			<panel.string name="text modify info 4">
-				You can&apos;t modify these objects
+				你不能修改這些物件
 			</panel.string>
 			<panel.string name="text modify warning">
-				You must select entire object to set permissions
+				你必須選取整個物件以設定權限
 			</panel.string>
 			<panel.string name="Cost Default">
 				價格： L$
@@ -157,7 +157,7 @@
 				總價： L$
 			</panel.string>
 			<panel.string name="Cost Per Unit">
-				Price Per: L$
+				單價每個： L$
 			</panel.string>
 			<panel.string name="Cost Mixed">
 				Mixed Price
@@ -181,19 +181,19 @@
 				社團：
 			</text>
 			<name_box initial_value="載入中..." name="Group Name Proxy"/>
-			<button name="button set group" tool_tip="Choose a group to share this object&apos;s permissions"/>
+			<button name="button set group" tool_tip="選擇一個社團以分享這物件權限"/>
 			<check_box label="分享" name="checkbox share with group" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."/>
 			<button label="Deed" label_selected="Deed" name="button deed" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."/>
 			<text name="label click action">
-				Click to:
+				點擊以：
 			</text>
 			<combo_box name="clickaction">
-				<combo_box.item label="Touch  (default)" name="Touch/grab(default)"/>
-				<combo_box.item label="Sit on object" name="Sitonobject"/>
-				<combo_box.item label="Buy object" name="Buyobject"/>
-				<combo_box.item label="Pay object" name="Payobject"/>
-				<combo_box.item label="Open" name="Open"/>
-				<combo_box.item label="Zoom" name="Zoom"/>
+				<combo_box.item label="觸碰（預設）" name="Touch/grab(default)"/>
+				<combo_box.item label="坐在物件上" name="Sitonobject"/>
+				<combo_box.item label="購買物件" name="Buyobject"/>
+				<combo_box.item label="支付物件" name="Payobject"/>
+				<combo_box.item label="開啟" name="Open"/>
+				<combo_box.item label="縮放" name="Zoom"/>
 			</combo_box>
 			<check_box label="出售：" name="checkbox for sale"/>
 			<combo_box name="sale type">
@@ -202,7 +202,7 @@
 				<combo_box.item label="原件" name="Original"/>
 			</combo_box>
 			<spinner label="價格： L$" name="Edit Cost"/>
-			<check_box label="顯示在搜尋中" name="search_check" tool_tip="Let people see this object in search results"/>
+			<check_box label="顯示在搜尋中" name="search_check" tool_tip="讓其他人可以在搜尋結果中看到這物件"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
 					你可以修改這個物件
@@ -238,13 +238,13 @@
 				</text>
 			</panel>
 		</panel>
-		<panel label="Object" name="Object">
-			<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"/>
+		<panel label="物件" name="Object">
+			<check_box label="鎖定" name="checkbox locked" tool_tip="預防物件被移動或刪除，最常使用的狀況是在建造過程中避免被意外的編輯。"/>
+			<check_box label="物理性" name="Physical Checkbox Ctrl" tool_tip="允許物件被推撞與受重力影響"/>
+			<check_box label="暫時性" name="Temporary Checkbox Ctrl" tool_tip="使物件在建造後的一分鐘自動刪除"/>
+			<check_box label="幻影性" name="Phantom Checkbox Ctrl" tool_tip="使物件不會與其他物件或化身產生碰撞"/>
 			<text name="label position">
-				Position (meters)
+				位置（公尺）
 			</text>
 			<spinner label="X" name="Pos X"/>
 			<spinner label="Y" name="Pos Y"/>
@@ -256,7 +256,7 @@
 			<spinner label="Y" name="Scale Y"/>
 			<spinner label="Z" name="Scale Z"/>
 			<text name="label rotation">
-				Rotation (degrees)
+				旋轉（角度）
 			</text>
 			<spinner label="X" name="Rot X"/>
 			<spinner label="Y" name="Rot Y"/>
@@ -273,12 +273,12 @@
 			</combo_box>
 			<combo_box name="material">
 				<combo_box.item label="Stone" name="Stone"/>
-				<combo_box.item label="Metal" name="Metal"/>
-				<combo_box.item label="Glass" name="Glass"/>
-				<combo_box.item label="Wood" name="Wood"/>
-				<combo_box.item label="Flesh" name="Flesh"/>
-				<combo_box.item label="Plastic" name="Plastic"/>
-				<combo_box.item label="Rubber" name="Rubber"/>
+				<combo_box.item label="金屬" name="Metal"/>
+				<combo_box.item label="玻璃" name="Glass"/>
+				<combo_box.item label="木頭" name="Wood"/>
+				<combo_box.item label="肌肉" name="Flesh"/>
+				<combo_box.item label="塑膠" name="Plastic"/>
+				<combo_box.item label="橡膠" name="Rubber"/>
 			</combo_box>
 			<text name="text cut">
 				Path Cut (begin/end)
@@ -286,13 +286,13 @@
 			<spinner label="B" name="cut begin"/>
 			<spinner label="E" name="cut end"/>
 			<text name="text hollow">
-				Hollow
+				中空
 			</text>
 			<text name="text skew">
 				Skew
 			</text>
 			<text name="Hollow Shape">
-				Hollow Shape
+				中空形狀
 			</text>
 			<combo_box name="hole">
 				<combo_box.item label="預設" name="Default"/>
@@ -354,12 +354,12 @@
 				<combo_box.item label="Cylinder" name="Cylinder"/>
 			</combo_box>
 		</panel>
-		<panel label="Features" name="Features">
+		<panel label="特性" name="Features">
 			<text name="select_single">
 				Select only one primitive to edit features.
 			</text>
 			<text name="edit_object">
-				Edit object features:
+				編輯物件特性：
 			</text>
 			<check_box label="Flexible Path" name="Flexible1D Checkbox Ctrl" tool_tip="Allows object to flex about the Z axis (Client-side only)"/>
 			<spinner label="Softness" name="FlexNumSections"/>
@@ -371,7 +371,7 @@
 			<spinner label="Force Y" name="FlexForceY"/>
 			<spinner label="Force Z" name="FlexForceZ"/>
 			<check_box label="Light" name="Light Checkbox Ctrl" tool_tip="Causes object to emit light"/>
-			<color_swatch name="colorswatch" tool_tip="Click to open color picker"/>
+			<color_swatch name="colorswatch" tool_tip="點擊以開啟顏色挑選器"/>
 			<texture_picker label="" name="light texture control" tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)"/>
 			<spinner label="Intensity" name="Light Intensity"/>
 			<spinner label="FOV" name="Light FOV"/>
@@ -382,38 +382,38 @@
 		</panel>
 		<panel label="材質" name="Texture">
 			<panel.string name="string repeats per meter">
-				Repeats Per Meter
+				每公尺重覆次數
 			</panel.string>
 			<panel.string name="string repeats per face">
-				Repeats Per Face
+				每一面重覆次數
 			</panel.string>
 			<texture_picker label="材質" name="texture control" tool_tip="點擊以挑選圖片"/>
-			<color_swatch label="Color" name="colorswatch" tool_tip="Click to open color picker"/>
+			<color_swatch label="顏色" name="colorswatch" tool_tip="點擊以開啟顏色挑選器"/>
 			<text name="color trans">
-				Transparency %
+				透明度 %
 			</text>
 			<text name="glow label">
-				Glow
+				光暈
 			</text>
-			<check_box label="Full Bright" name="checkbox fullbright"/>
+			<check_box label="全亮" name="checkbox fullbright"/>
 			<text name="tex gen">
-				Mapping
+				映射方式
 			</text>
 			<combo_box name="combobox texgen">
 				<combo_box.item label="預設" name="Default"/>
-				<combo_box.item label="Planar" name="Planar"/>
+				<combo_box.item label="平面" name="Planar"/>
 			</combo_box>
 			<text name="label shininess">
-				Shininess
+				光澤
 			</text>
 			<combo_box name="combobox shininess">
 				<combo_box.item label="無" name="None"/>
-				<combo_box.item label="Low" name="Low"/>
-				<combo_box.item label="Medium" name="Medium"/>
-				<combo_box.item label="High" name="High"/>
+				<combo_box.item label="低" name="Low"/>
+				<combo_box.item label="中" name="Medium"/>
+				<combo_box.item label="高" name="High"/>
 			</combo_box>
 			<text name="label bumpiness">
-				Bumpiness
+				凹凸貼圖
 			</text>
 			<combo_box name="combobox bumpiness">
 				<combo_box.item label="無" name="None"/>
@@ -435,65 +435,65 @@
 				<combo_box.item label="suction" name="suction"/>
 				<combo_box.item label="weave" name="weave"/>
 			</combo_box>
-			<check_box initial_value="false" label="Align planar faces" name="checkbox planar align" tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."/>
+			<check_box initial_value="false" label="對齊平面" name="checkbox planar align" tool_tip="以最後所選擇的面為基準，對齊全部所選擇的面上的材質。這必須使用平面材質映射方式。"/>
 			<text name="rpt">
-				Repeats / Face
-			</text>
-			<spinner label="Horizontal (U)" name="TexScaleU"/>
-			<check_box label="Flip" name="checkbox flip s"/>
-			<spinner label="Vertical (V)" name="TexScaleV"/>
-			<check_box label="Flip" name="checkbox flip t"/>
-			<spinner label="Rotation˚" name="TexRot"/>
-			<spinner label="Repeats / Meter" name="rptctrl"/>
+				重覆次數 / 面
+			</text>
+			<spinner label="水平（U）" name="TexScaleU"/>
+			<check_box label="翻轉" name="checkbox flip s"/>
+			<spinner label="垂直（V）" name="TexScaleV"/>
+			<check_box label="翻轉" name="checkbox flip t"/>
+			<spinner label="旋轉˚" name="TexRot"/>
+			<spinner label="重覆次數 / 公尺" name="rptctrl"/>
 			<button label="套用" label_selected="套用" name="button apply"/>
 			<text name="tex offset">
 				材質位移
 			</text>
-			<spinner label="Horizontal (U)" name="TexOffsetU"/>
-			<spinner label="Vertical (V)" name="TexOffsetV"/>
+			<spinner label="水平（U）" name="TexOffsetU"/>
+			<spinner label="垂直（V）" name="TexOffsetV"/>
 			<panel name="Add_Media">
 				<text name="media_tex">
-					Media
+					媒體
 				</text>
-				<button name="add_media" tool_tip="Add Media"/>
+				<button name="add_media" tool_tip="添加媒體"/>
 				<button name="delete_media" tool_tip="刪除這個媒體材質"/>
-				<button name="edit_media" tool_tip="Edit this Media"/>
-				<button label="Align" label_selected="Align Media" name="button align" tool_tip="Align media texture (must load first)"/>
+				<button name="edit_media" tool_tip="編輯這個媒體"/>
+				<button label="對齊" label_selected="對齊媒體" name="button align" tool_tip="對齊媒體材質（須先載入）"/>
 			</panel>
 		</panel>
-		<panel label="Content" name="Contents">
-			<button label="New Script" label_selected="New Script" name="button new script"/>
-			<button label="Permissions" name="button permissions"/>
+		<panel label="內容" name="Contents">
+			<button label="新腳本" label_selected="新腳本" name="button new script"/>
+			<button label="權限" name="button permissions"/>
 		</panel>
 	</tab_container>
 	<panel name="land info panel">
 		<text name="label_parcel_info">
-			Parcel Information
+			地段資訊
 		</text>
 		<text name="label_area_price">
-			Price: L$[PRICE] for [AREA] m²
+			價格： L$[PRICE] 購買 [AREA] m²
 		</text>
 		<text name="label_area">
 			面積： [AREA] m²
 		</text>
 		<button label="關於土地" label_selected="關於土地" name="button about land"/>
-		<check_box label="顯示擁有主" name="checkbox show owners" tool_tip="Colorize the parcels according to the type of owner: 
+		<check_box label="顯示擁有者" name="checkbox show owners" tool_tip="Colorize the parcels according to the type of owner: 
 
-Green = Your land 
-Aqua = Your group&apos;s land 
-Red = Owned by others 
-Yellow = For sale 
-Purple = For auction 
-Grey = Public"/>
+綠色 = 你的土地 
+水藍 = 你社團的土地 
+紅色 = 其他人所有 
+黃色 = 出售 
+紫色 = 拍賣 
+灰色 = 公有地"/>
 		<text name="label_parcel_modify">
-			Modify Parcel
+			修改地段
 		</text>
-		<button label="Subdivide" label_selected="Subdivide" name="button subdivide land"/>
-		<button label="Join" label_selected="Join" name="button join land"/>
+		<button label="分割" label_selected="分割" name="button subdivide land"/>
+		<button label="合併" label_selected="合併" name="button join land"/>
 		<text name="label_parcel_trans">
-			Land Transactions
+			土地交易
 		</text>
 		<button label="購買土地" label_selected="購買土地" name="button buy land"/>
-		<button label="Abandon Land" label_selected="Abandon Land" name="button abandon land"/>
+		<button label="放棄土地" label_selected="放棄土地" name="button abandon land"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_top_objects.xml b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
index c1ad927bbb..074a4a1881 100644
--- a/indra/newview/skins/default/xui/zh/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
@@ -19,7 +19,7 @@
 		Top [COUNT] objects experiencing many potential collisions
 	</floater.string>
 	<floater.string name="colliders_score_label">
-		Score
+		積分
 	</floater.string>
 	<floater.string name="none_descriptor">
 		None found.
@@ -28,7 +28,7 @@
 		載入中...
 	</text>
 	<scroll_list name="objects_list">
-		<scroll_list.columns label="Score" name="score"/>
+		<scroll_list.columns label="積分" name="score"/>
 		<scroll_list.columns label="名稱" name="name"/>
 		<scroll_list.columns label="擁有者" name="owner"/>
 		<scroll_list.columns label="位置" name="location"/>
@@ -37,19 +37,19 @@
 		<scroll_list.columns label="URLs" name="URLs"/>
 	</scroll_list>
 	<text name="id_text">
-		Object ID:
+		物件 ID:
 	</text>
 	<button label="Show Beacon" name="show_beacon_btn"/>
 	<text name="obj_name_text">
 		物件名稱：
 	</text>
-	<button label="Filter" name="filter_object_btn"/>
+	<button label="過濾器" name="filter_object_btn"/>
 	<text name="owner_name_text">
 		擁有者：
 	</text>
-	<button label="Filter" name="filter_owner_btn"/>
-	<button label="Return Selected" name="return_selected_btn"/>
+	<button label="過濾器" name="filter_owner_btn"/>
+	<button label="退回所選擇的" name="return_selected_btn"/>
 	<button label="全部退回" name="return_all_btn"/>
-	<button label="Disable Selected" name="disable_selected_btn"/>
-	<button label="Disable All" name="disable_all_btn"/>
+	<button label="關閉所選擇的" name="disable_selected_btn"/>
+	<button label="全部關閉" name="disable_all_btn"/>
 </floater>
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 04945ac83b..65f6a9cb95 100644
--- a/indra/newview/skins/default/xui/zh/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="url_entry">
 	<text name="media_label">
-		Media URL:
+		媒體 URL：
 	</text>
 	<button label="" name="ok_btn"/>
 	<button label="取消" name="cancel_btn"/>
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 e45c7c59ac..36efe20b65 100644
--- a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
@@ -19,7 +19,7 @@
 		Record a sample, then click on a voice to hear how it will sound.
 	</text>
 	<button label="Record" name="record_btn" tool_tip="Record a sample of your voice."/>
-	<button label="Stop" name="record_stop_btn"/>
+	<button label="停止" name="record_stop_btn"/>
 	<text name="voice_morphing_link">
 		[[URL] Subscribe Now]
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_water.xml b/indra/newview/skins/default/xui/zh/floater_water.xml
index fba0415967..5fb57272af 100644
--- a/indra/newview/skins/default/xui/zh/floater_water.xml
+++ b/indra/newview/skins/default/xui/zh/floater_water.xml
@@ -14,7 +14,7 @@
 			<text name="BHText">
 				Water Fog Color
 			</text>
-			<color_swatch name="WaterFogColor" tool_tip="Click to open color picker"/>
+			<color_swatch name="WaterFogColor" tool_tip="點擊以開啟顏色挑選器"/>
 			<text name="WaterFogDensText">
 				Fog Density Exponent
 			</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_web_content.xml b/indra/newview/skins/default/xui/zh/floater_web_content.xml
index 2670e223d3..a756498b81 100644
--- a/indra/newview/skins/default/xui/zh/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/zh/floater_web_content.xml
@@ -4,9 +4,9 @@
 		<layout_panel name="nav_controls">
 			<button name="back" tool_tip="Navigate back"/>
 			<button name="forward" tool_tip="Navigate forward"/>
-			<button name="stop" tool_tip="Stop navigation"/>
+			<button name="stop" tool_tip="停止導覽"/>
 			<button name="reload" tool_tip="重載頁面"/>
-			<combo_box name="address" tool_tip="Enter URL here"/>
+			<combo_box name="address" tool_tip="在此輸入 URL 位置"/>
 			<icon name="media_secure_lock_flag" tool_tip="Secured Browsing"/>
 			<button name="popexternal" tool_tip="Open current URL in your desktop browser"/>
 		</layout_panel>
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 e47238482f..54b72afccc 100644
--- a/indra/newview/skins/default/xui/zh/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/zh/floater_window_size.xml
@@ -6,7 +6,7 @@
 	<text name="windowsize_text">
 		設定視窗尺寸大小：
 	</text>
-	<combo_box name="window_size_combo" tool_tip="width x height">
+	<combo_box name="window_size_combo" tool_tip="寬度 x 高度">
 		<combo_box.item label="1000 x 700 （預設）" name="item0"/>
 		<combo_box.item label="1024 x 768" name="item1"/>
 		<combo_box.item label="1280 x 720 （720p）" name="item2"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_world_map.xml b/indra/newview/skins/default/xui/zh/floater_world_map.xml
index 47038e3b3d..552bb02582 100644
--- a/indra/newview/skins/default/xui/zh/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/zh/floater_world_map.xml
@@ -11,7 +11,7 @@
 			Me
 		</text>
 		<text name="person_label">
-			Person
+			人
 		</text>
 		<text name="infohub_label">
 			Infohub
@@ -40,7 +40,7 @@
 			Moderate
 		</text>
 		<text name="events_adult_label">
-			Adult
+			成人
 		</text>
 	</panel>
 	<panel name="layout_panel_3">
diff --git a/indra/newview/skins/default/xui/zh/inspect_group.xml b/indra/newview/skins/default/xui/zh/inspect_group.xml
index 01649496bc..3583976646 100644
--- a/indra/newview/skins/default/xui/zh/inspect_group.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_group.xml
@@ -8,7 +8,7 @@
 		私人社團
 	</string>
 	<string name="FreeToJoin">
-		Free to join
+		免費加入
 	</string>
 	<string name="CostToJoin">
 		L$[AMOUNT] to join
@@ -26,7 +26,7 @@ Fear the moose!  Fear it!  And the mongoose too!
 	<text name="group_cost">
 		L$123 to join
 	</text>
-	<button label="Join" name="join_btn"/>
-	<button label="Leave" name="leave_btn"/>
+	<button label="加入" name="join_btn"/>
+	<button label="退出" name="leave_btn"/>
 	<button label="察看檔案" name="view_profile_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/inspect_object.xml b/indra/newview/skins/default/xui/zh/inspect_object.xml
index f1fe037087..58091b3aef 100644
--- a/indra/newview/skins/default/xui/zh/inspect_object.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_object.xml
@@ -35,7 +35,7 @@ owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
 		http://www.superdupertest.com
 	</text>
 	<button label="購買" name="buy_btn"/>
-	<button label="Pay" name="pay_btn"/>
+	<button label="支付" name="pay_btn"/>
 	<button label="取得副本" name="take_free_copy_btn"/>
 	<button label="Touch" name="touch_btn"/>
 	<button label="Sit" name="sit_btn"/>
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 cba82e7dce..a04d59bc81 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
@@ -12,6 +12,6 @@
 	<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..."/>
+	<menu_item_call label="支付" name="Pay..."/>
 	<menu_item_call label="物件檔案" name="Object Inspect"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
index 1da583b3d0..ef0986a13b 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
@@ -3,5 +3,5 @@
 	<menu_item_call label="察看檔案" name="Show Profile"/>
 	<menu_item_call label="送出 IM..." name="Send IM"/>
 	<menu_item_call label="加為朋友..." name="Add Friend"/>
-	<menu_item_call label="Remove Friend..." name="Remove Friend"/>
+	<menu_item_call label="移除朋友..." name="Remove Friend"/>
 </menu>
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 283367708b..acf98dfdfa 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
@@ -12,5 +12,5 @@
 	<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..."/>
+	<menu_item_call label="支付" name="Pay..."/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
index 8e30a15562..e053eb2388 100644
--- a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
@@ -3,7 +3,7 @@
 	<menu_item_call label="Add/Remove from Favorites" name="activate"/>
 	<menu_item_call label="覆製" name="copy_gesture"/>
 	<menu_item_call label="貼上" name="paste"/>
-	<menu_item_call label="Copy UUID" name="copy_uuid"/>
+	<menu_item_call label="覆製 UUID" name="copy_uuid"/>
 	<menu_item_call label="儲存到目前裝扮" name="save_to_outfit"/>
 	<menu_item_call label="編輯" name="edit_gesture"/>
 </toggleable_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 bae7cf3f05..0f14057c07 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
@@ -16,6 +16,6 @@
 	<menu_item_call label="材質除錯" name="debug"/>
 	<menu_item_call label="Find On Map" name="find_on_map"/>
 	<menu_item_call label="Zoom In" name="zoom_in"/>
-	<menu_item_call label="Pay" name="pay"/>
+	<menu_item_call label="支付" name="pay"/>
 	<menu_item_call label="分享" name="share"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
index dab95fcadc..94ab82b8a9 100644
--- a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <toggleable_menu name="Gear Menu">
-	<menu_item_call label="Touch" name="touch"/>
-	<menu_item_call label="Sit" name="sit"/>
+	<menu_item_call label="觸碰" name="touch"/>
+	<menu_item_call label="坐下" name="sit"/>
 	<menu_item_call label="Pay" name="pay"/>
 	<menu_item_call label="購買" name="buy"/>
-	<menu_item_call label="Take" name="take"/>
+	<menu_item_call label="取得" name="take"/>
 	<menu_item_call label="取得副本" name="take_copy"/>
-	<menu_item_call label="Open" name="open"/>
+	<menu_item_call label="開啟" name="open"/>
 	<menu_item_call label="編輯" name="edit"/>
-	<menu_item_call label="Wear" name="wear"/>
-	<menu_item_call label="Add" name="add"/>
+	<menu_item_call label="穿上" name="wear"/>
+	<menu_item_call label="添加" name="add"/>
 	<menu_item_call label="回報" name="report"/>
 	<menu_item_call label="Block" name="block"/>
 	<menu_item_call label="Zoom In" name="zoom_in"/>
-	<menu_item_call label="Remove" name="remove"/>
+	<menu_item_call label="移除" name="remove"/>
 	<menu_item_call label="更多資訊" name="more_info"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
index fd8f73e4ea..a93e8be149 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -28,17 +28,17 @@
 		<menu_item_call label="New Physics" name="New Physics"/>
 	</menu>
 	<menu label="新身體部位" name="New Body Parts">
-		<menu_item_call label="New Shape" name="New Shape"/>
-		<menu_item_call label="New Skin" name="New Skin"/>
-		<menu_item_call label="New Hair" name="New Hair"/>
-		<menu_item_call label="New Eyes" name="New Eyes"/>
+		<menu_item_call label="新體形" name="New Shape"/>
+		<menu_item_call label="新皮膚" name="New Skin"/>
+		<menu_item_call label="新頭髮" name="New Hair"/>
+		<menu_item_call label="新眼睛" name="New Eyes"/>
 	</menu>
-	<menu label="Change Type" name="Change Type">
+	<menu label="變更類型" name="Change Type">
 		<menu_item_call label="預設" name="Default"/>
 		<menu_item_call label="手套" name="Gloves"/>
 		<menu_item_call label="夾克" name="Jacket"/>
 		<menu_item_call label="褲子" name="Pants"/>
-		<menu_item_call label="Shape" name="Shape"/>
+		<menu_item_call label="體形" name="Shape"/>
 		<menu_item_call label="鞋子" name="Shoes"/>
 		<menu_item_call label="襯衫" name="Shirt"/>
 		<menu_item_call label="裙子" name="Skirt"/>
@@ -46,19 +46,19 @@
 		<menu_item_call label="內衣" name="Undershirt"/>
 	</menu>
 	<menu_item_call label="瞬間傳送" name="Landmark Open"/>
-	<menu_item_call label="Open" name="Animation Open"/>
-	<menu_item_call label="Open" name="Sound Open"/>
+	<menu_item_call label="開啟" name="Animation Open"/>
+	<menu_item_call label="開啟" name="Sound Open"/>
 	<menu_item_call label="取代目前的裝扮" name="Replace Outfit"/>
 	<menu_item_call label="添加到目前裝扮" name="Add To Outfit"/>
 	<menu_item_call label="由目前的裝扮移除" name="Remove From Outfit"/>
 	<menu_item_call label="Find Original" name="Find Original"/>
 	<menu_item_call label="Purge Item" name="Purge Item"/>
 	<menu_item_call label="Restore Item" name="Restore Item"/>
-	<menu_item_call label="Open" name="Open"/>
+	<menu_item_call label="開啟" name="Open"/>
 	<menu_item_call label="Open Original" name="Open Original"/>
 	<menu_item_call label="Properties" name="Properties"/>
 	<menu_item_call label="更名" name="Rename"/>
-	<menu_item_call label="Copy Asset UUID" name="Copy Asset UUID"/>
+	<menu_item_call label="覆製資產 UUID" name="Copy Asset UUID"/>
 	<menu_item_call label="覆製" name="Copy"/>
 	<menu_item_call label="貼上" name="Paste"/>
 	<menu_item_call label="Paste As Link" name="Paste As Link"/>
@@ -66,11 +66,11 @@
 	<menu_item_call label="刪除" name="Delete"/>
 	<menu_item_call label="刪除系統資料夾" name="Delete System Folder"/>
 	<menu_item_call label="Start Conference Chat" name="Conference Chat Folder"/>
-	<menu_item_call label="Play" name="Sound Play"/>
+	<menu_item_call label="播放" name="Sound Play"/>
 	<menu_item_call label="添加地標" name="About Landmark"/>
 	<menu_item_call label="Play Inworld" name="Animation Play"/>
 	<menu_item_call label="Play Locally" name="Animation Audition"/>
-	<menu_item_call label="Send Instant Message" name="Send Instant Message"/>
+	<menu_item_call label="送出即時訊息" name="Send Instant Message"/>
 	<menu_item_call label="Offer Teleport..." name="Offer Teleport..."/>
 	<menu_item_call label="Start Conference Chat" name="Conference Chat"/>
 	<menu_item_call label="Activate" name="Activate"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
index 8c938222e7..f51b27d9ce 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
@@ -3,12 +3,12 @@
 	<menu_item_call label="新收納區視窗" name="new_window"/>
 	<menu_item_check label="依名稱排序" name="sort_by_name"/>
 	<menu_item_check label="依最近排序" name="sort_by_recent"/>
-	<menu_item_check label="Sort Folders Always by Name" name="sort_folders_by_name"/>
-	<menu_item_check label="Sort System Folders to Top" name="sort_system_folders_to_top"/>
-	<menu_item_call label="Show Filters" name="show_filters"/>
+	<menu_item_check label="總是由名稱排序資料夾" name="sort_folders_by_name"/>
+	<menu_item_check label="系統資料夾排序到最上方" name="sort_system_folders_to_top"/>
+	<menu_item_call label="顯示過濾器" name="show_filters"/>
 	<menu_item_call label="Reset Filters" name="reset_filters"/>
 	<menu_item_call label="關閉全部資料夾" name="close_folders"/>
-	<menu_item_call label="Empty Lost and Found" name="empty_lostnfound"/>
+	<menu_item_call label="清空 Lost and Found" name="empty_lostnfound"/>
 	<menu_item_call label="儲存材質為" name="Save Texture As"/>
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="Find Original" name="Find Original"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_landmark.xml b/indra/newview/skins/default/xui/zh/menu_landmark.xml
index 5f7657db79..7372b223cf 100644
--- a/indra/newview/skins/default/xui/zh/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/zh/menu_landmark.xml
@@ -2,6 +2,6 @@
 <toggleable_menu name="landmark_overflow_menu">
 	<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="建立精選地點" name="pick"/>
 	<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 27a0baf560..d6bf34c66e 100644
--- a/indra/newview/skins/default/xui/zh/menu_login.xml
+++ b/indra/newview/skins/default/xui/zh/menu_login.xml
@@ -11,15 +11,15 @@
 	<menu_item_check label="顯示除錯選單" name="Show Debug Menu"/>
 	<menu label="除錯" name="Debug">
 		<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_item_call label="UI / 顏色 設定" name="UI/Color Settings"/>
+		<menu_item_call label="XUI 預覽工具" name="UI Preview Tool"/>
 		<menu label="UI 測試" name="UI Tests"/>
 		<menu_item_call label="設定視窗尺寸大小..." name="Set Window Size..."/>
 		<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"/>
-		<menu_item_check label="Show Grid Picker" name="Show Grid Picker"/>
-		<menu_item_call label="Show Notifications Console" name="Show Notifications Console"/>
+		<menu_item_call label="顯示嚴重訊息" name="Critical"/>
+		<menu_item_call label="媒體瀏覽器測試" name="Web Browser Test"/>
+		<menu_item_call label="網頁內容浮動視窗測試" name="Web Content Floater Test"/>
+		<menu_item_check label="顯示網格挑選器" name="Show Grid Picker"/>
+		<menu_item_call label="顯示通知控制台" name="Show Notifications Console"/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
index 169dbf2187..cf47020bd9 100644
--- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
@@ -18,10 +18,10 @@
 		<menu_item_call label="新刺青" name="New Tattoo"/>
 	</menu>
 	<menu label="新身體部位" name="New Body Parts">
-		<menu_item_call label="New Shape" name="New Shape"/>
-		<menu_item_call label="New Skin" name="New Skin"/>
-		<menu_item_call label="New Hair" name="New Hair"/>
-		<menu_item_call label="New Eyes" name="New Eyes"/>
+		<menu_item_call label="新體形" name="New Shape"/>
+		<menu_item_call label="新皮膚" name="New Skin"/>
+		<menu_item_call label="新頭髮" name="New Hair"/>
+		<menu_item_call label="新眼睛" name="New Eyes"/>
 	</menu>
 	<menu_item_call label="裝扮更名" name="rename"/>
 	<menu_item_call label="刪除裝扮" name="delete_outfit"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_list.xml b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
index 7b6f6f954e..3737e3d041 100644
--- a/indra/newview/skins/default/xui/zh/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
@@ -7,7 +7,7 @@
 	<menu_item_call label="IM" name="IM"/>
 	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="Pay" name="Pay"/>
+	<menu_item_call label="支付" name="Pay"/>
 	<menu_item_check label="View People Icons" name="View Icons"/>
 	<menu_item_check label="Block Voice" name="Block/Unblock"/>
 	<menu_item_check label="Block Text" name="MuteText"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
index 06247ab249..cf36507d74 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Display Group Icons" name="Display Group Icons"/>
+	<menu_item_check label="顯示社團圖示" name="Display Group Icons"/>
 	<menu_item_call label="脫離所選擇的社團" name="Leave Selected Group"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
index 73b754e059..49fa775424 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
@@ -7,7 +7,7 @@
 	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="地圖" name="Map"/>
 	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="Pay" name="Pay"/>
+	<menu_item_call label="支付" name="Pay"/>
 	<menu_item_check label="Block/Unblock" name="Block/Unblock"/>
 	<menu_item_call label="Offer Teleport" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
index 4ffbcaff83..c7aff48df4 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
@@ -5,6 +5,6 @@
 	<menu_item_call label="IM" name="IM"/>
 	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="Pay" name="Pay"/>
+	<menu_item_call label="支付" name="Pay"/>
 	<menu_item_call label="Offer Teleport" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_picks_plus.xml b/indra/newview/skins/default/xui/zh/menu_picks_plus.xml
index 9e55c633f9..e962bd90d5 100644
--- a/indra/newview/skins/default/xui/zh/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/zh/menu_picks_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="picks_plus_menu">
-	<menu_item_call label="New Pick" name="create_pick"/>
+	<menu_item_call label="新精選地點" name="create_pick"/>
 	<menu_item_call label="New Classified" name="create_classified"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_place.xml b/indra/newview/skins/default/xui/zh/menu_place.xml
index 6ffdf329df..3733baf119 100644
--- a/indra/newview/skins/default/xui/zh/menu_place.xml
+++ b/indra/newview/skins/default/xui/zh/menu_place.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="place_overflow_menu">
 	<menu_item_call label="製作一個地標" name="landmark"/>
-	<menu_item_call label="Create Pick" name="pick"/>
+	<menu_item_call label="建立精選地點" name="pick"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
index 7f1d091f44..7f4144d14d 100644
--- a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
@@ -2,7 +2,7 @@
 <toggleable_menu name="menu_folder_gear">
 	<menu_item_call label="添加地標" name="add_landmark"/>
 	<menu_item_call label="添加資料夾" name="add_folder"/>
-	<menu_item_call label="Restore Item" name="restore_item"/>
+	<menu_item_call label="還原物品" name="restore_item"/>
 	<menu_item_call label="剪下" name="cut"/>
 	<menu_item_call label="覆製" name="copy_folder"/>
 	<menu_item_call label="貼上" name="paste"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
index 8578751a28..f23d970b78 100644
--- a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
@@ -15,5 +15,5 @@
 	<menu_item_call label="展開全部資料夾" name="expand_all"/>
 	<menu_item_call label="摺疊全部資料夾" name="collapse_all"/>
 	<menu_item_check label="依日期排序" name="sort_by_date"/>
-	<menu_item_call label="Create Pick" name="create_pick"/>
+	<menu_item_call label="建立精選地點" name="create_pick"/>
 </toggleable_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 c06b7dc039..ca637ae54d 100644
--- a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="profile_overflow_menu">
 	<menu_item_call label="地圖" name="show_on_map"/>
-	<menu_item_call label="Pay" name="pay"/>
+	<menu_item_call label="支付" name="pay"/>
 	<menu_item_call label="分享" name="share"/>
 	<menu_item_call label="Block" name="block"/>
 	<menu_item_call label="Unblock" name="unblock"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index e7016dc663..6d70ac4c1f 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -54,7 +54,7 @@
 			<menu_item_check label="地段屬性" name="Parcel Properties"/>
 			<menu_item_check label="進階選單" name="Show Advanced Menu"/>
 		</menu>
-		<menu_item_call label="瞬間傳送回家" name="Teleport Home"/>
+		<menu_item_call label="瞬間瞬間傳送回家" name="Teleport Home"/>
 		<menu_item_call label="設定家在此處" name="Set Home to Here"/>
 		<menu label="太陽" name="Environment Settings">
 			<menu_item_call label="日出" name="Sunrise"/>
@@ -84,21 +84,21 @@
 			<menu_item_call label="包括上一部位" name="Include Previous Part"/>
 		</menu>
 		<menu_item_call label="聚焦於所選部位" name="Focus on Selection"/>
-		<menu_item_call label="Zoom to Selection" name="Zoom to Selection"/>
+		<menu_item_call label="縮放至所選部位" name="Zoom to Selection"/>
 		<menu label="物件" name="Object">
 			<menu_item_call label="購買" name="Menu Object Buy"/>
 			<menu_item_call label="取得" name="Menu Object Take"/>
 			<menu_item_call label="取得副本" name="Take Copy"/>
 			<menu_item_call label="回存到我的收納區" name="Save Object Back to My Inventory"/>
-			<menu_item_call label="Save Back to Object Contents" name="Save Object Back to Object Contents"/>
+			<menu_item_call label="回存到物件內容" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="退回物件" name="Return Object back to Owner"/>
 		</menu>
 		<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="重新編譯腳本（Mono）" name="Mono"/>
+			<menu_item_call label="重新編譯腳本（LSL）" name="LSL"/>
 			<menu_item_call label="Reset Scripts" name="Reset Scripts"/>
-			<menu_item_call label="Set Scripts to Running" name="Set Scripts to Running"/>
-			<menu_item_call label="Set Scripts to Not Running" name="Set Scripts to Not Running"/>
+			<menu_item_call label="設定腳本為執行中" name="Set Scripts to Running"/>
+			<menu_item_call label="設定腳本為非執行中" name="Set Scripts to Not Running"/>
 		</menu>
 		<menu label="選項" name="Options">
 			<menu_item_check label="顯示進階權限" name="DebugPermissions"/>
@@ -110,16 +110,16 @@
 			<menu_item_check label="Show Light Radius for Selection" name="Show Light Radius for Selection"/>
 			<menu_item_check label="Show Selection Beam" name="Show Selection Beam"/>
 			<menu_item_check label="貼齊格線" name="Snap to Grid"/>
-			<menu_item_call label="Snap Object XY to Grid" name="Snap Object XY to Grid"/>
+			<menu_item_call label="貼齊物件 XY 軸到格線" name="Snap Object XY to Grid"/>
 			<menu_item_call label="Use Selection for Grid" name="Use Selection for Grid"/>
 			<menu_item_call label="格線選項" name="Grid Options"/>
 		</menu>
 		<menu label="上傳" name="Upload">
 			<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"/>
-			<menu_item_call label="Set Default Upload Permissions" name="perm prefs"/>
+			<menu_item_call label="聲音（L$[COST]）..." name="Upload Sound"/>
+			<menu_item_call label="動作（L$[COST]）..." name="Upload Animation"/>
+			<menu_item_call label="大量上傳（每檔案 L$[COST] ）..." name="Bulk Upload"/>
+			<menu_item_call label="設定預設上傳權限" name="perm prefs"/>
 		</menu>
 		<menu_item_call label="復原" name="Undo"/>
 		<menu_item_call label="重做" name="Redo"/>
@@ -135,12 +135,12 @@
 		<menu_item_call label="Rebake Textures" name="Rebake Texture"/>
 		<menu_item_call label="設定使用者界面大小至預設值" name="Set UI Size to Default"/>
 		<menu_item_call label="設定視窗尺寸大小..." name="Set Window Size..."/>
-		<menu_item_check label="Limit Select Distance" name="Limit Select Distance"/>
+		<menu_item_check label="限制選擇距離" name="Limit Select Distance"/>
 		<menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/>
 		<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_check label="靜音拍攝快照到硬碟" name="QuietSnapshotsToDisk"/>
+		<menu_item_check label="壓縮快照存到硬碟" name="CompressSnapshotsToDisk"/>
+		<menu label="效能工具" name="Performance Tools">
 			<menu_item_call label="Lag Meter" name="Lag Meter"/>
 			<menu_item_check label="統計列" name="Statistics Bar"/>
 			<menu_item_check label="Show Avatar Rendering Cost" name="Avatar Rendering Cost"/>
@@ -149,8 +149,8 @@
 			<menu_item_check label="Cheesy Beacon" name="Cheesy Beacon"/>
 			<menu_item_check label="Hide Particles" name="Hide Particles"/>
 			<menu_item_check label="Hide Selected" name="Hide Selected"/>
-			<menu_item_check label="Highlight Transparent" name="Highlight Transparent"/>
-			<menu_item_check label="Show HUD Attachments" name="Show HUD Attachments"/>
+			<menu_item_check label="高亮顯示透明物件" name="Highlight Transparent"/>
+			<menu_item_check label="顯示 HUD 附件" name="Show HUD Attachments"/>
 			<menu_item_check label="Show Mouselook Crosshairs" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Rendering Types" name="Rendering Types">
@@ -190,7 +190,7 @@
 			<menu_item_call label="關閉視窗" name="Close Window"/>
 			<menu_item_call label="關閉全部視窗" name="Close All Windows"/>
 			<menu_item_call label="Snapshot to Disk" name="Snapshot to Disk"/>
-			<menu_item_call label="Mouselook" name="Mouselook"/>
+			<menu_item_call label="第一人稱視角" name="Mouselook"/>
 			<menu_item_check label="Joystick Flycam" name="Joystick Flycam"/>
 			<menu_item_call label="Reset View" name="Reset View"/>
 			<menu_item_call label="Look at Last Chatter" name="Look at Last Chatter"/>
@@ -226,7 +226,7 @@
 			<menu_item_check label="Badge" name="Badge"/>
 		</menu>
 		<menu label="顯示資訊" name="Display Info">
-			<menu_item_check label="Show Time" name="Show Time"/>
+			<menu_item_check label="顯示時間" name="Show Time"/>
 			<menu_item_check label="Show Render Info" name="Show Render Info"/>
 			<menu_item_check label="顯示材質資訊" name="Show Texture Info"/>
 			<menu_item_check label="Show Matrices" name="Show Matrices"/>
@@ -338,10 +338,10 @@
 			<menu_item_call label="送出測試 IMs" name="Send Test IMs"/>
 			<menu_item_call label="Flush Names Caches" name="Flush Names Caches"/>
 		</menu>
-		<menu label="Avatar" name="Character">
+		<menu label="化身" name="Character">
 			<menu label="Grab Baked Texture" name="Grab Baked Texture">
 				<menu_item_call label="Iris" name="Iris"/>
-				<menu_item_call label="Head" name="Head"/>
+				<menu_item_call label="頭部" name="Head"/>
 				<menu_item_call label="Upper Body" name="Upper Body"/>
 				<menu_item_call label="Lower Body" name="Lower Body"/>
 				<menu_item_call label="裙子" name="Skirt"/>
@@ -355,10 +355,10 @@
 				<menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/>
 			</menu>
 			<menu_item_call label="Force Params to Default" name="Force Params to Default"/>
-			<menu_item_check label="Animation Info" name="Animation Info"/>
-			<menu_item_check label="Slow Motion Animations" name="Slow Motion Animations"/>
-			<menu_item_check label="Show Look At" name="Show Look At"/>
-			<menu_item_check label="Show Point At" name="Show Point At"/>
+			<menu_item_check label="動作資訊" name="Animation Info"/>
+			<menu_item_check label="慢動作" name="Slow Motion Animations"/>
+			<menu_item_check label="顯示注視在" name="Show Look At"/>
+			<menu_item_check label="顯示指向在" name="Show Point At"/>
 			<menu_item_check label="Debug Joint Updates" name="Debug Joint Updates"/>
 			<menu_item_check label="Disable LOD" name="Disable LOD"/>
 			<menu_item_check label="Debug Character Vis" name="Debug Character Vis"/>
diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml
index d2d1321c2a..3498942f9b 100644
--- a/indra/newview/skins/default/xui/zh/mime_types.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -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/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 16d4965d5a..65bb8ce517 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -1242,7 +1242,7 @@ Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click
 		You can only have [MAX_AGENTS] Allowed Residents.
 	</notification>
 	<notification name="MaxBannedAgentsOnRegion">
-		You can only have [MAX_BANNED] Banned Residents.
+		你只可以有最多 [MAX_BANNED] 位被封鎖的居民。
 	</notification>
 	<notification name="MaxAgentOnRegionBatch">
 		Failure while attempting to add [NUM_ADDED] agents:
@@ -1253,10 +1253,10 @@ Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS].
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="Bake"/>
 	</notification>
 	<notification name="MaxManagersOnRegion">
-		You can only have [MAX_MANAGER] Estate Managers.
+		你只可以有最多 [MAX_MANAGER] 位領地經理。
 	</notification>
 	<notification name="OwnerCanNotBeDenied">
-		Can&apos;t add estate owner to estate &apos;Banned Resident&apos; list.
+		無法添加領地擁有者到領地的 &apos;被封鎖的居民&apos; 名單中。
 	</notification>
 	<notification name="CanNotChangeAppearanceUntilLoaded">
 		無法變更外觀，直到服裝與體形下載完畢。
@@ -1273,15 +1273,15 @@ Please set the object for sale and try again.
 [DOWNLOAD_PATH].
 	</notification>
 	<notification name="DownloadWindowsMandatory">
-		A new version of [APP_NAME] is available.
+		一個新版本的 [APP_NAME] 已經可用。
 [MESSAGE]
-You must download this update to use [APP_NAME].
+你必須下載這個更新以使用 [APP_NAME]。
 		<usetemplate name="okcancelbuttons" notext="結束退出" yestext="下載"/>
 	</notification>
 	<notification name="DownloadWindows">
-		An updated version of [APP_NAME] is available.
+		一個 [APP_NAME] 更新過的版本已經可用。
 [MESSAGE]
-This update is not required, but we suggest you install it to improve performance and stability.
+這個更新並非強制更新，但我們建議你安裝以增強效能及穩定性。
 		<usetemplate name="okcancelbuttons" notext="繼續" yestext="下載"/>
 	</notification>
 	<notification name="DownloadWindowsReleaseForDownload">
@@ -1356,12 +1356,12 @@ or you can install it now.
 	<notification name="DownloadBackgroundTip">
 		We have downloaded an update to your [APP_NAME] installation.
 Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
-		<usetemplate name="okcancelbuttons" notext="Later..." yestext="Install now and restart [APP_NAME]"/>
+		<usetemplate name="okcancelbuttons" notext="稍候..." yestext="立即安裝及重新啟動 [APP_NAME]"/>
 	</notification>
 	<notification name="DownloadBackgroundDialog">
 		We have downloaded an update to your [APP_NAME] installation.
 Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
-		<usetemplate name="okcancelbuttons" notext="Later..." yestext="Install now and restart [APP_NAME]"/>
+		<usetemplate name="okcancelbuttons" notext="梢候..." yestext="立即安裝及重新啟動 [APP_NAME]"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		We have downloaded a required software update.
@@ -1371,7 +1371,7 @@ We must restart [APP_NAME] to install the update.
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
-		We must restart [APP_NAME] to install the update.
+		我門必須重新啟動 [APP_NAME] 以安裝更新。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1569,17 +1569,17 @@ Please try again later.
 	</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="確認我要瞬間傳送到精選地點的所在位置" name="okcancelignore" notext="取消" yestext="瞬間傳送"/>
 	</notification>
 	<notification name="TeleportToClassified">
 		瞬間傳送到 [CLASSIFIED]?
-		<usetemplate ignoretext="Confirm that I want to teleport to a location in Classifieds" name="okcancelignore" notext="取消" yestext="瞬間傳送"/>
+		<usetemplate ignoretext="確認我要瞬間傳送到個人廣告的所在位置" 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="確認我要瞬間傳送到歷史紀錄中的位置" name="okcancelignore" notext="取消" yestext="瞬間傳送"/>
 	</notification>
-	<notification label="Message everyone in your Estate" name="MessageEstate">
+	<notification label="送出訊息給你領地內的每一個人" name="MessageEstate">
 		Type a short announcement which will be sent to everyone currently in your estate.
 		<form name="form">
 			<button name="OK" text="確定"/>
@@ -1780,15 +1780,15 @@ To enter Adult regions, Residents must be Account Verified, either by age-verifi
 	<notification label="Voice Version Mismatch" name="VoiceVersionMismatch">
 		This version of [APP_NAME] is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update [APP_NAME].
 	</notification>
-	<notification label="Can&apos;t Buy Objects" name="BuyObjectOneOwner">
+	<notification label="無法購買物件" name="BuyObjectOneOwner">
 		Cannot buy objects from different owners at the same time.
 Please select only one object and try again.
 	</notification>
-	<notification label="Can&apos;t Buy Contents" name="BuyContentsOneOnly">
+	<notification label="無法購買內容物" name="BuyContentsOneOnly">
 		Unable to buy the contents of more than one object at a time.
 Please select only one object and try again.
 	</notification>
-	<notification label="Can&apos;t Buy Contents" name="BuyContentsOneOwner">
+	<notification label="無法購買內容物" name="BuyContentsOneOwner">
 		Cannot buy objects from different owners at the same time.
 Please select only one object and try again.
 	</notification>
@@ -1950,7 +1950,7 @@ Do you want to replace it with the selected object?
 			<button ignore="絕不取代" name="No" text="取消"/>
 		</form>
 	</notification>
-	<notification label="Busy Mode Warning" name="BusyModePay">
+	<notification label="忙碌模式警告" name="BusyModePay">
 		You are in Busy Mode, which means you will not receive any items offered in exchange for this payment.
 
 Would you like to leave Busy Mode before completing this transaction?
diff --git a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
index c9e47984e2..7d16ac4129 100644
--- a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
@@ -5,7 +5,7 @@
 			<button label="通話" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
-			<button label="Leave Call" name="end_call_btn"/>
+			<button label="離開通話" name="end_call_btn"/>
 		</layout_panel>
 		<layout_panel name="voice_ctrls_btn_panel">
 			<button label="語音控制" name="voice_ctrls_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
index 23b76eea9b..eccb938f15 100644
--- a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
@@ -21,7 +21,7 @@
 	<string name="FormatYears">
 		[COUNT]y
 	</string>
-	<text name="avatar_name" value="(loading)"/>
+	<text name="avatar_name" value="（載入）"/>
 	<text name="last_interaction" value="0s"/>
 	<icon name="permission_edit_theirs_icon" tool_tip="你不能編輯這位朋友的物件"/>
 	<icon name="permission_edit_mine_icon" tool_tip="這位朋友能編輯、刪除或取得你的物件"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
index 0578fe9ef1..d9ddafac3b 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
@@ -5,7 +5,7 @@
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
-			<accordion_tab name="hair_color_tab" title="Color"/>
+			<accordion_tab name="hair_color_tab" title="顏色"/>
 			<accordion_tab name="hair_style_tab" title="Style"/>
 			<accordion_tab name="hair_eyebrows_tab" title="Eyebrows"/>
 			<accordion_tab name="hair_facial_tab" title="Facial"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
index b453fdc758..76560256f7 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
@@ -2,7 +2,7 @@
 <panel name="edit_pants_panel">
 	<panel name="avatar_pants_color_panel">
 		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
+		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
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 0f1f72ceb9..6ac7226185 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Edit Pick" name="panel_edit_pick">
+<panel label="編輯精選地點" name="panel_edit_pick">
 	<panel.string name="location_notice">
-		(will update after save)
+		（將在儲存後更新）
 	</panel.string>
 	<text name="title">
-		Edit Pick
+		編輯精選地點
 	</text>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<icon label="" name="edit_icon" tool_tip="點擊以選擇圖像"/>
 			<text name="Name:">
-				Title:
+				標題：
 			</text>
 			<text name="description_label">
 				描述：
@@ -21,13 +21,13 @@
 			<text name="pick_location">
 				載入中...
 			</text>
-			<button label="Set to Current Location" name="set_to_curr_location_btn"/>
+			<button label="設定為目前位置" name="set_to_curr_location_btn"/>
 		</panel>
 	</scroll_container>
 	<panel label="bottom_panel" name="bottom_panel">
 		<layout_stack name="layout_stack1">
 			<layout_panel name="layout_panel1">
-				<button label="Save Pick" name="save_changes_btn"/>
+				<button label="儲存精選地點" name="save_changes_btn"/>
 			</layout_panel>
 			<layout_panel name="layout_panel1">
 				<button label="取消" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shape.xml b/indra/newview/skins/default/xui/zh/panel_edit_shape.xml
index da6049ea75..f249100786 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shape.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shape_panel">
 	<string name="meters">
-		Meters
+		公尺
 	</string>
 	<string name="feet">
-		Feet
+		英呎
 	</string>
 	<string name="height">
-		Height:
+		身高：
 	</string>
 	<panel label="襯衫" name="accordion_panel">
 		<accordion name="wearable_accordion">
-			<accordion_tab name="shape_body_tab" title="Body"/>
-			<accordion_tab name="shape_head_tab" title="Head"/>
+			<accordion_tab name="shape_body_tab" title="身體"/>
+			<accordion_tab name="shape_head_tab" title="頭部"/>
 			<accordion_tab name="shape_eyes_tab" title="眼睛"/>
-			<accordion_tab name="shape_ears_tab" title="Ears"/>
-			<accordion_tab name="shape_nose_tab" title="Nose"/>
-			<accordion_tab name="shape_mouth_tab" title="Mouth"/>
-			<accordion_tab name="shape_chin_tab" title="Chin"/>
-			<accordion_tab name="shape_torso_tab" title="Torso"/>
-			<accordion_tab name="shape_legs_tab" title="Legs"/>
+			<accordion_tab name="shape_ears_tab" title="耳朵"/>
+			<accordion_tab name="shape_nose_tab" title="鼻子"/>
+			<accordion_tab name="shape_mouth_tab" title="嘴巴"/>
+			<accordion_tab name="shape_chin_tab" title="下巴"/>
+			<accordion_tab name="shape_torso_tab" title="軀幹"/>
+			<accordion_tab name="shape_legs_tab" title="腿部"/>
 		</accordion>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
index 321fb68756..ecfc1e2fad 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
@@ -2,7 +2,7 @@
 <panel name="edit_shirt_panel">
 	<panel name="avatar_shirt_color_panel">
 		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
+		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
index 096a83c871..5c46f94fe9 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
@@ -2,7 +2,7 @@
 <panel name="edit_skirt_panel">
 	<panel name="avatar_skirt_color_panel">
 		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
+		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
index dab132bad2..09c888f226 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
@@ -2,7 +2,7 @@
 <panel name="edit_socks_panel">
 	<panel name="avatar_socks_color_panel">
 		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
+		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
index d183e6897d..946f8b22dc 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_tattoo_panel">
 	<panel name="avatar_tattoo_color_panel">
-		<texture_picker label="Head Tattoo" name="Head Tattoo" tool_tip="點擊以挑選圖片"/>
-		<texture_picker label="Upper Tattoo" name="Upper Tattoo" tool_tip="Click to choose a picture"/>
-		<texture_picker label="Lower Tattoo" name="Lower Tattoo" tool_tip="點擊以挑選圖片"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
+		<texture_picker label="頭部刺青" name="Head Tattoo" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="上半身刺青" name="Upper Tattoo" tool_tip="點擊以挑選照片"/>
+		<texture_picker label="下半身刺青" name="Lower Tattoo" tool_tip="點擊以挑選圖片"/>
+		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
 	</panel>
 </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 d741ed70df..936a2651ab 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
@@ -49,16 +49,16 @@
 		Editing Physics
 	</string>
 	<string name="shape_desc_text">
-		Shape:
+		體形：
 	</string>
 	<string name="skin_desc_text">
-		Skin:
+		皮膚：
 	</string>
 	<string name="hair_desc_text">
-		Hair:
+		頭髮：
 	</string>
 	<string name="eyes_desc_text">
-		Eyes:
+		眼睛：
 	</string>
 	<string name="shirt_desc_text">
 		襯衫：
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 1706541f2b..a97a35056b 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_general.xml
@@ -6,7 +6,7 @@
 Hover your mouse over the options for more help.
 	</panel.string>
 	<panel.string name="group_info_unchanged">
-		General group information has changed
+		一般社團資訊已經被變更
 	</panel.string>
 	<panel.string name="incomplete_member_data_str">
 		Retrieving member data
@@ -17,7 +17,7 @@ Hover your mouse over the options for more help.
 			創辦人：
 		</text>
 		<text name="join_cost_text">
-			Free
+			免費
 		</text>
 		<button label="現在就加入!!" name="btn_join"/>
 	</panel>
@@ -50,7 +50,7 @@ Hover your mouse over the options for more help.
 				- 選擇內容分級 -
 			</combo_item>
 			<combo_box.item label="Moderate Content" name="mature"/>
-			<combo_box.item label="General Content" name="pg"/>
+			<combo_box.item label="一般內容" name="pg"/>
 		</combo_box>
 		<check_box initial_value="true" label="顯示在搜尋中" name="show_in_group_list" tool_tip="Let people see this group in search results"/>
 	</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 0a0a1f1941..a1395f454b 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
@@ -19,7 +19,7 @@
 		Choose what Role to assign them to:
 	</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="ok_button"/>
 	<button label="取消" name="cancel_button"/>
 	<string name="GroupInvitation">
 		社團邀請
diff --git a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
index 71f139a3e6..58022c2279 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
@@ -22,9 +22,9 @@
 		<scroll_list name="group_parcel_list">
 			<scroll_list.columns label="地段" name="name"/>
 			<scroll_list.columns label="地區" name="location"/>
-			<scroll_list.columns label="Type" name="type"/>
-			<scroll_list.columns label="Area" name="area"/>
-			<scroll_list.columns label="Hidden" name="hidden"/>
+			<scroll_list.columns label="類型" name="type"/>
+			<scroll_list.columns label="區域" name="area"/>
+			<scroll_list.columns label="隱藏" name="hidden"/>
 		</scroll_list>
 		<text name="total_contributed_land_label">
 			Total contribution:
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 5fed96dbd9..65c07e7137 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
@@ -6,11 +6,11 @@ Notices only go to group members in Roles with the ability to receive Notices.
 You can turn off Notices on the General tab.
 	</panel.string>
 	<panel.string name="no_notices_text">
-		There are no past notices
+		沒有過去的通知
 	</panel.string>
 	<text name="lbl2">
-		Notices are kept for 14 days.
-Maximum 200 per group daily
+		通知保留 14 天。
+每個社團一天最多 200 則
 	</text>
 	<scroll_list name="notice_list">
 		<scroll_list.columns label="主旨" name="subject"/>
@@ -18,7 +18,7 @@ Maximum 200 per group daily
 		<scroll_list.columns label="日期" name="date"/>
 	</scroll_list>
 	<text name="notice_list_none_found">
-		None found
+		沒發現。
 	</text>
 	<button label="新通知" name="create_new_notice" tool_tip="建立一個新通知"/>
 	<button name="refresh_notices" tool_tip="Refresh list of notices"/>
@@ -39,16 +39,16 @@ Maximum 200 per group daily
 			將物品拖曳並丟於此處以添加為附件：
 		</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"/>
+		<button name="remove_attachment" tool_tip="由你的通知移除附件"/>
+		<button label="送出" label_selected="送出" 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="察看過去的通知" name="panel_view_past_notice">
 		<text name="lbl">
-			Archived Notice
+			存檔的通知
 		</text>
 		<text name="lbl2">
-			To send a new notice, click the + button
+			要送出一個新通知，點擊 + 按鈕
 		</text>
 		<text name="lbl3">
 			主旨：
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 8947ab6e45..fff4383893 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
@@ -19,7 +19,7 @@ clicking on their names.
 			<filter_editor label="成員過濾器" name="filter_input"/>
 			<name_list name="member_list">
 				<name_list.columns label="成員" name="name"/>
-				<name_list.columns label="Donation" name="donated"/>
+				<name_list.columns label="捐款" name="donated"/>
 				<name_list.columns label="狀態" name="online"/>
 			</name_list>
 			<button label="邀請" name="member_invite"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
index 881f8eac0b..703182e04d 100644
--- a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
@@ -14,7 +14,7 @@
 			<button label="分享" name="share_btn"/>
 		</layout_panel>
 		<layout_panel name="pay_btn_panel">
-			<button label="Pay" name="pay_btn"/>
+			<button label="支付" name="pay_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
 			<button label="通話" name="call_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_me.xml b/indra/newview/skins/default/xui/zh/panel_me.xml
index abdbfd7429..a236dfc17a 100644
--- a/indra/newview/skins/default/xui/zh/panel_me.xml
+++ b/indra/newview/skins/default/xui/zh/panel_me.xml
@@ -2,6 +2,6 @@
 <panel label="我的檔案" name="panel_me">
 	<tab_container name="tabs">
 		<panel label="我的檔案" name="panel_profile"/>
-		<panel label="MY PICKS" name="panel_picks"/>
+		<panel label="我的精選地點" name="panel_picks"/>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
index f3163e3c19..059a78cf7d 100644
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
@@ -11,7 +11,7 @@
 		預覽
 	</text>
 	<text name="current_url_label">
-		Current Page:
+		目前頁面：
 	</text>
 	<text name="current_url" tool_tip="The current page for this media source" value=""/>
 	<button label="Reset" name="current_url_reset_btn"/>
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 6e2d47c09e..3645f471ce 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
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="自訂" name="Media settings for controls">
 	<text name="controls_label">
-		Controls:
+		控制：
 	</text>
 	<combo_box name="controls">
 		<combo_item name="Standard">
-			Standard
+			標準
 		</combo_item>
 		<combo_item name="Mini">
-			Mini
+			迷你
 		</combo_item>
 	</combo_box>
 	<text name="owner_label">
-		Owner
+		擁有者
 	</text>
 	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_owner_interact"/>
 	<check_box initial_value="false" label="顯示控制列" name="perms_owner_control"/>
@@ -22,7 +22,7 @@
 	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_group_interact"/>
 	<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="顯示控制列" name="perms_anyone_control"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
index 724cd54bf1..3cabfcfaba 100644
--- a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="chat_bar">
-	<line_editor label="點擊此處開始聊天。" name="chat_box" tool_tip="Press Enter to say, Ctrl+Enter to shout"/>
-	<button name="show_nearby_chat" tool_tip="顯示 / 隱藏 附近聊天紀錄"/>
+	<line_editor label="點擊此處開始聊天。" name="chat_box" tool_tip="按下 Enter 鍵來說或按下 Ctrl+Enter 來喊叫"/>
+	<button name="show_nearby_chat" tool_tip="顯示 / 隱藏 附近的聊天紀錄"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
index 0b8a7a5f42..5ab6837569 100644
--- a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
@@ -44,13 +44,13 @@
 		<panel name="media_controls_panel">
 			<layout_stack name="media_controls">
 				<layout_panel name="stop">
-					<button name="stop_btn" tool_tip="Stop selected media"/>
+					<button name="stop_btn" tool_tip="停止所選擇媒體"/>
 				</layout_panel>
 				<layout_panel name="play">
-					<button name="play_btn" tool_tip="Play selected media"/>
+					<button name="play_btn" tool_tip="播放所選擇的媒體"/>
 				</layout_panel>
 				<layout_panel name="pause">
-					<button name="pause_btn" tool_tip="Pause selected media"/>
+					<button name="pause_btn" tool_tip="暫停所選擇的媒體"/>
 				</layout_panel>
 				<layout_panel name="volume_slider_ctrl">
 					<slider_bar initial_value="0.5" name="volume_slider" tool_tip="Audio volume for selected media"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml b/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml
index bdbc89f71c..01a8210338 100644
--- a/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="instant_message" name="panel_notify_textbox">
+<panel label="即時訊息" name="panel_notify_textbox">
 	<string name="message_max_lines_count" value="7"/>
 	<panel label="info_panel" name="info_panel">
-		<text_editor name="message" value="message"/>
+		<text_editor name="message" value="訊息"/>
 	</panel>
 	<panel label="control_panel" name="control_panel">
-		<button label="Submit" name="btn_submit"/>
+		<button label="提交" name="btn_submit"/>
 		<button label="忽視" name="ignore_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
index 6ceaf447a7..263106d13a 100644
--- a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
@@ -15,7 +15,7 @@
 	<string name="Filter.Objects" value="物件"/>
 	<string name="Filter.Clothing" value="服裝"/>
 	<string name="Filter.Bodyparts" value="身體部位"/>
-	<string name="replace_body_part" value="Click to replace your existing shape"/>
+	<string name="replace_body_part" value="點擊以取代你現存的體形"/>
 	<text name="title" value="編輯裝扮"/>
 	<panel name="header_panel">
 		<panel name="outfit_name_and_status">
@@ -27,7 +27,7 @@
 		<layout_panel name="outfit_wearables_panel">
 			<layout_stack name="filter_panels">
 				<layout_panel name="add_button_and_combobox">
-					<button label="Add More..." name="show_add_wearables_btn" tool_tip="開啟 / 關閉"/>
+					<button label="添加更多..." name="show_add_wearables_btn" tool_tip="開啟 / 關閉"/>
 				</layout_panel>
 				<layout_panel name="filter_panel">
 					<filter_editor label="收納區可穿著過濾器" name="look_item_filter"/>
@@ -35,7 +35,7 @@
 			</layout_stack>
 		</layout_panel>
 		<layout_panel name="add_wearables_panel">
-			<button label="Wear Item" name="plus_btn"/>
+			<button label="穿上物品" name="plus_btn"/>
 		</layout_panel>
 	</layout_stack>
 	<panel name="no_add_wearables_button_bar">
diff --git a/indra/newview/skins/default/xui/zh/panel_pick_info.xml b/indra/newview/skins/default/xui/zh/panel_pick_info.xml
index 44ae5703c6..cd4cdbf999 100644
--- a/indra/newview/skins/default/xui/zh/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_pick_info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_pick_info">
-	<text name="title" value="Pick Info"/>
+	<text name="title" value="精選地點資訊"/>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<text_editor name="pick_name" value="[name]"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_picks.xml b/indra/newview/skins/default/xui/zh/panel_picks.xml
index 3b356967f9..a233092dc2 100644
--- a/indra/newview/skins/default/xui/zh/panel_picks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_picks.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Picks" name="panel_picks">
-	<string name="no_picks" value="No Picks"/>
+<panel label="精選地點" name="panel_picks">
+	<string name="no_picks" value="無精選地點"/>
 	<string name="no_classifieds" value="No Classifieds"/>
 	<accordion name="accordion">
-		<accordion_tab name="tab_picks" title="Picks"/>
+		<accordion_tab name="tab_picks" title="精選地點"/>
 		<accordion_tab name="tab_classifieds" title="Classifieds"/>
 	</accordion>
 	<panel label="bottom_panel" name="edit_panel">
 		<layout_stack name="edit_panel_ls">
 			<layout_panel name="gear_menu_btn">
-				<button name="new_btn" tool_tip="Create a new pick or classified at the current location"/>
+				<button name="new_btn" tool_tip="以目前位置建立新的精選地點或個人廣告"/>
 			</layout_panel>
 		</layout_stack>
 	</panel>
 	<panel name="buttons_cucks">
 		<layout_stack name="buttons_cucks_ls">
 			<layout_panel name="info_btn_lp">
-				<button label="資訊" name="info_btn" tool_tip="Show pick information"/>
+				<button label="資訊" name="info_btn" tool_tip="顯示精選地點資訊"/>
 			</layout_panel>
 			<layout_panel name="teleport_btn_lp">
-				<button label="瞬間傳送" name="teleport_btn" tool_tip="Teleport to the corresponding area"/>
+				<button label="瞬間傳送" name="teleport_btn" tool_tip="瞬間傳送到相對應的區域"/>
 			</layout_panel>
 			<layout_panel name="show_on_map_btn_lp">
-				<button label="地圖" name="show_on_map_btn" tool_tip="Show the corresponding area on the World Map"/>
+				<button label="地圖" name="show_on_map_btn" tool_tip="在世界地圖上顯示相對應的區域"/>
 			</layout_panel>
 		</layout_stack>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_place_profile.xml b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
index b0919c9151..aa7b036398 100644
--- a/indra/newview/skins/default/xui/zh/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
@@ -11,7 +11,7 @@
 	<string name="unknown" value="（未知）"/>
 	<string name="public" value="（公開）"/>
 	<string name="none_text" value="（無）"/>
-	<string name="sale_pending_text" value="(Sale Pending)"/>
+	<string name="sale_pending_text" value="（擱置銷售）"/>
 	<string name="group_owned_text" value="（社團所擁有）"/>
 	<string name="price_text" value="L$"/>
 	<string name="area_text" value="m²"/>
@@ -60,11 +60,11 @@
 						<text name="voice_value" value="On"/>
 						<text name="fly_label" value="飛行："/>
 						<text name="fly_value" value="On"/>
-						<text name="push_label" value="Push:"/>
+						<text name="push_label" value="推撞："/>
 						<text name="push_value" value="Off"/>
-						<text name="build_label" value="Build:"/>
+						<text name="build_label" value="建造："/>
 						<text name="build_value" value="On"/>
-						<text name="scripts_label" value="Scripts:"/>
+						<text name="scripts_label" value="腳本："/>
 						<text name="scripts_value" value="On"/>
 						<text name="damage_label" value="Damage:"/>
 						<text name="damage_value" value="Off"/>
@@ -78,7 +78,7 @@
 						<text name="region_type_label" value="類型："/>
 						<text name="region_type" value="Moose"/>
 						<text name="region_rating_label" value="分級："/>
-						<text name="region_rating" value="Adult"/>
+						<text name="region_rating" value="成人"/>
 						<text name="region_owner_label" value="擁有者："/>
 						<text name="region_owner" value="moose Van Moose extra long name moose"/>
 						<text name="region_group_label" value="社團："/>
@@ -103,7 +103,7 @@
 						<text name="area_label" value="面積："/>
 						<text name="traffic_label" value="流量："/>
 						<text name="primitives_label" value="Primitives:"/>
-						<text name="parcel_scripts_label" value="Scripts:"/>
+						<text name="parcel_scripts_label" value="腳本："/>
 						<text name="terraform_limits_label" value="Terraform limits:"/>
 						<text name="subdivide_label" value="Subdivide/Join ability:"/>
 						<text name="resale_label" value="ReSale ability:"/>
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 a39402c858..c691edb11c 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -33,7 +33,7 @@
 		Use machine translation while chatting (powered by Google)
 	</text>
 	<text name="translate_language_text">
-		Translate chat into:
+		聊天翻譯為：
 	</text>
 	<combo_box name="translate_language_combobox">
 		<combo_box.item label="系統預設" name="System Default Language"/>
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 c7299ad8a9..b7449dad10 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -17,10 +17,10 @@
 		<combo_box.item label="日本語 (Japanese) - Beta" name="(Japanese)"/>
 	</combo_box>
 	<text name="language_textbox2">
-		(Requires restart)
+		（須重新啟動）
 	</text>
 	<text name="maturity_desired_prompt">
-		I want to access content rated:
+		我想要能進出內容分級的地區為：
 	</text>
 	<combo_box name="maturity_desired_combobox">
 		<combo_box.item label="General, Moderate, Adult" name="Desired_Adult"/>
@@ -36,34 +36,34 @@
 	</combo_box>
 	<check_box initial_value="true" label="登入時顯示" name="show_location_checkbox"/>
 	<text name="name_tags_textbox">
-		Name tags:
+		名稱標籤：
 	</text>
 	<radio_group name="Name_Tag_Preference">
 		<radio_item label="Off" name="radio" value="0"/>
 		<radio_item label="On" name="radio2" value="1"/>
-		<radio_item label="Show briefly" name="radio3" value="2"/>
+		<radio_item label="簡短顯示" name="radio3" value="2"/>
 	</radio_group>
-	<check_box label="My name" name="show_my_name_checkbox1"/>
-	<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_my_name_checkbox1"/>
+	<check_box label="使用者名稱" name="show_slids" tool_tip="顯示使用者名稱，就像 bobsmith123 這類的"/>
+	<check_box label="社團頭銜" name="show_all_title_checkbox1" tool_tip="顯示社團頭銜，像是 Officer 或成員"/>
 	<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">
-		Pressing letter keys:
+		按下字母鍵：
 	</text>
 	<radio_group name="inworld_typing_preference">
-		<radio_item label="Starts local chat" name="radio_start_chat" value="1"/>
-		<radio_item label="Affects movement (i.e. WASD)" name="radio_move" value="0"/>
+		<radio_item label="開始本地聊天" name="radio_start_chat" value="1"/>
+		<radio_item label="影響移動（例如 WASD鍵）" name="radio_move" value="0"/>
 	</radio_group>
 	<text name="title_afk_text">
-		Away timeout:
+		離開逾時設定：
 	</text>
-	<combo_box label="Away timeout:" name="afk">
-		<combo_box.item label="2 minutes" name="item0"/>
-		<combo_box.item label="5 minutes" name="item1"/>
-		<combo_box.item label="10 minutes" name="item2"/>
-		<combo_box.item label="30 minutes" name="item3"/>
-		<combo_box.item label="never" name="item4"/>
+	<combo_box label="離開逾時設定：" name="afk">
+		<combo_box.item label="2 分鐘" name="item0"/>
+		<combo_box.item label="5 分鐘" name="item1"/>
+		<combo_box.item label="10 分鐘" name="item2"/>
+		<combo_box.item label="30 分鐘" name="item3"/>
+		<combo_box.item label="絕不" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
 		忙碌模式回應：
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
index ff582d774b..de296f72f3 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
@@ -13,9 +13,9 @@
 		Mouselook mouse sensitivity:
 	</text>
 	<check_box label="反轉" name="invert_mouse"/>
-	<check_box label="Arrow keys always move me" name="arrow_keys_move_avatar_check"/>
+	<check_box label="總是使用方向鍵移動" name="arrow_keys_move_avatar_check"/>
 	<check_box label="Tap-tap-hold to run" name="tap_tap_hold_to_run"/>
-	<check_box label="Double-Click to:" name="double_click_chkbox"/>
+	<check_box label="雙擊以D：" name="double_click_chkbox"/>
 	<radio_group name="double_click_action">
 		<radio_item label="瞬間傳送" name="radio_teleport"/>
 		<radio_item label="Auto-pilot" name="radio_autopilot"/>
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 2cab05e2ad..305d1e2ac9 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
@@ -10,29 +10,29 @@
 	</text>
 	<slider label="按鍵音" name="UI Volume"/>
 	<slider label="Ambient" name="Wind Volume"/>
-	<slider label="Sound Effects" name="SFX Volume"/>
-	<slider label="Streaming music" name="Music Volume"/>
-	<check_box label="Enabled" name="enable_music"/>
-	<slider label="Media" name="Media Volume"/>
-	<check_box label="Enabled" name="enable_media"/>
-	<slider label="Voice Chat" name="Voice Volume"/>
-	<check_box label="Enabled" name="enable_voice_check"/>
-	<check_box label="Allow Media to auto-play" name="media_auto_play_btn" tool_tip="Check this to let media auto-play if it wants" value="true"/>
-	<check_box label="Play media attached to other avatars" name="media_show_on_others_btn" tool_tip="Uncheck this to hide media attached to other avatars nearby" value="true"/>
+	<slider label="音效" name="SFX Volume"/>
+	<slider label="串流音樂" name="Music Volume"/>
+	<check_box label="已啟用" name="enable_music"/>
+	<slider label="媒體" name="Media Volume"/>
+	<check_box label="已啟用" name="enable_media"/>
+	<slider label="語音聊天" name="Voice Volume"/>
+	<check_box label="已啟用" name="enable_voice_check"/>
+	<check_box label="允許媒體自動播放" name="media_auto_play_btn" tool_tip="若你想要，可以勾選這個允許媒體自動播放" value="true"/>
+	<check_box label="播放附加到其他化身身上的媒體" name="media_show_on_others_btn" tool_tip="Uncheck this to hide media attached to other avatars nearby" value="true"/>
 	<text name="voice_chat_settings">
-		Voice Chat Settings
+		語音聊天設定
 	</text>
 	<text name="Listen from">
-		Listen from:
+		傾聽位置：
 	</text>
 	<radio_group name="ear_location">
-		<radio_item label="Camera position" name="0"/>
-		<radio_item label="Avatar position" name="1"/>
+		<radio_item label="攝影機位置" name="0"/>
+		<radio_item label="化身位置" name="1"/>
 	</radio_group>
-	<check_box label="Move avatar lips when speaking" name="enable_lip_sync"/>
+	<check_box label="說話時同步移動化身嘴唇" name="enable_lip_sync"/>
 	<check_box label="Toggle speak on/off when I press:" name="push_to_talk_toggle_check" tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."/>
 	<line_editor label="Push-to-Speak trigger" name="modifier_combo"/>
-	<button label="Set Key" name="set_voice_hotkey_button"/>
+	<button label="設定按鍵" name="set_voice_hotkey_button"/>
 	<button name="set_voice_middlemouse_button" tool_tip="Reset to Middle Mouse Button"/>
 	<button label="輸入 / 輸出設備" name="device_settings_btn"/>
 	<panel label="設備設定" name="device_settings_panel">
@@ -49,7 +49,7 @@
 			輸入
 		</text>
 		<text name="My volume label">
-			My volume:
+			我的音量：
 		</text>
 		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Change the volume using this slider"/>
 		<text name="wait_text">
diff --git a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
index 71de9f861a..8d0e2a6355 100644
--- a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
@@ -40,7 +40,7 @@
 			<button name="home_btn" tool_tip="Home page"/>
 		</layout_panel>
 		<layout_panel name="media_stop">
-			<button name="media_stop_btn" tool_tip="Stop media"/>
+			<button name="media_stop_btn" tool_tip="停止媒體"/>
 		</layout_panel>
 		<layout_panel name="reload">
 			<button name="reload_btn" tool_tip="Reload"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile.xml b/indra/newview/skins/default/xui/zh/panel_profile.xml
index 7536311daf..fcf7bb64db 100644
--- a/indra/newview/skins/default/xui/zh/panel_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_profile.xml
@@ -32,7 +32,7 @@
 					<panel name="first_life_image_panel">
 						<text name="title_rw_descr_text" value="真實世界："/>
 					</panel>
-					<text name="title_member_text" value="Resident Since:"/>
+					<text name="title_member_text" value="成為居民自："/>
 					<text name="title_acc_status_text" value="帳戶狀態："/>
 					<text name="title_partner_text" value="配偶："/>
 					<panel name="partner_data_panel">
@@ -59,7 +59,7 @@
 					<button label="瞬間傳送" name="teleport" tool_tip="Offer teleport"/>
 				</layout_panel>
 				<layout_panel name="overflow_btn_lp">
-					<menu_button label="▼" name="overflow_btn" tool_tip="Pay money to or share inventory with the Resident"/>
+					<menu_button label="▼" name="overflow_btn" tool_tip="支付金錢，或分享收納區給居民"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
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 ac8c7cad3d..12fe776e45 100644
--- a/indra/newview/skins/default/xui/zh/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/zh/panel_profile_view.xml
@@ -14,7 +14,7 @@
 	<text name="user_label" value="使用者名稱："/>
 	<tab_container name="tabs">
 		<panel label="檔案" name="panel_profile"/>
-		<panel label="PICKS" name="panel_picks"/>
+		<panel label="精選地點" name="panel_picks"/>
 		<panel label="NOTES &amp; PRIVACY" name="panel_notes"/>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
index 2e52efb804..315bc0ac8e 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
@@ -62,18 +62,18 @@
 		分級：
 	</text>
 	<text name="region_maturity_text">
-		Adult
+		成人
 	</text>
 	<text name="resellable_lbl">
-		Resale:
+		轉售：
 	</text>
 	<text name="resellable_clause">
-		Land in this region may not be resold.
+		這地區的土地不能轉售。
 	</text>
 	<text name="changeable_lbl">
-		Subdivide:
+		分割：
 	</text>
 	<text name="changeable_clause">
-		Land in this region may not be joined/subdivided.
+		這地區的土地不能合併或分割。
 	</text>
 </panel>
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 798831bc84..1ffbcbf8fd 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
@@ -11,24 +11,24 @@
 	<check_box label="Disable Physics" name="disable_physics_check" tool_tip="Disable all physics in this region"/>
 	<button label="套用" name="apply_btn"/>
 	<text name="objret_text_lbl">
-		Object Return
+		物件退回
 	</text>
 	<text name="resident_text_lbl">
-		Resident:
+		居民：
 	</text>
 	<line_editor name="target_avatar_name">
 		（無）
 	</line_editor>
-	<button label="Choose" name="choose_avatar_btn"/>
+	<button label="選擇" name="choose_avatar_btn"/>
 	<text name="options_text_lbl">
 		選項：
 	</text>
-	<check_box label="With scripts" name="return_scripts" tool_tip="Return only objects which have scripts"/>
+	<check_box label="With scripts" name="return_scripts" tool_tip="只退回R包含腳本的物件"/>
 	<check_box label="On someone else&apos;s land" name="return_other_land" tool_tip="Return only objects which are on land belonging to someone else"/>
 	<check_box label="In every region of this estate" name="return_estate_wide" tool_tip="Return objects in all of the regions that make up this estate"/>
-	<button label="Return" name="return_btn"/>
+	<button label="退回" name="return_btn"/>
 	<button label="Get Top Colliders..." name="top_colliders_btn" tool_tip="List of objects experiencing the most potential collisions"/>
 	<button label="Get Top Scripts..." name="top_scripts_btn" tool_tip="List of objects spending the most time running scripts"/>
-	<button label="Restart Region" name="restart_btn" tool_tip="Give 2 minute countdown and restart region"/>
-	<button label="Delay Restart" name="cancel_restart_btn" tool_tip="Delay region restart by one hour"/>
+	<button label="地區重新啟動" name="restart_btn" tool_tip="給予兩分鐘倒數計時並重新啟動"/>
+	<button label="延遲重新啟動" name="cancel_restart_btn" tool_tip="延遲地區重新啟動一小時"/>
 </panel>
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 899191c3f0..1f1676167b 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
@@ -27,7 +27,7 @@
 	<check_box label="允許語音聊天" name="voice_chat_check"/>
 	<check_box label="允許直接瞬間傳送" name="allow_direct_teleport"/>
 	<button label="套用" name="apply_btn"/>
-	<button label="瞬間傳送訊息到領地..." name="message_estate_btn"/>
+	<button label="送出訊息到領地..." name="message_estate_btn"/>
 	<button label="由領地將居民踢出..." name="kick_user_from_estate_btn"/>
 	<text name="estate_manager_label">
 		領地管理員：
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 71caaf1144..dce75c997d 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml
@@ -7,7 +7,7 @@
 		未知
 	</text>
 	<text name="version_channel_text_lbl">
-		Version:
+		版本：
 	</text>
 	<text name="version_channel_text">
 		未知
@@ -22,22 +22,22 @@
 	<check_box label="Block Fly" name="block_fly_check"/>
 	<check_box label="Allow Damage" name="allow_damage_check"/>
 	<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="允許土地轉售" name="allow_land_resell_check"/>
+	<check_box label="允許土地 合併/分割" name="allow_parcel_changes_check"/>
 	<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="人數上限" name="agent_limit_spin"/>
 	<spinner label="Object Bonus" name="object_bonus_spin"/>
 	<text label="Maturity" name="access_text">
 		分級：
 	</text>
 	<icons_combo_box label="Moderate" name="access_combo">
-		<icons_combo_box.item label="Adult" name="Adult" value="42"/>
+		<icons_combo_box.item label="成人" name="Adult" value="42"/>
 		<icons_combo_box.item label="Moderate" name="Mature" value="21"/>
 		<icons_combo_box.item label="一般" name="PG" value="13"/>
 	</icons_combo_box>
 	<button label="套用" name="apply_btn"/>
 	<button label="強制瞬間傳送一位居民回家..." name="kick_btn"/>
 	<button label="強制瞬間傳送所有居民回家..." name="kick_all_btn"/>
-	<button label="傳送訊息到地區..." name="im_btn"/>
+	<button label="送出訊息到地區..." name="im_btn"/>
 	<button label="管理瞬間傳送中心..." name="manage_telehub_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 85ac4613dd..625213e376 100644
--- a/indra/newview/skins/default/xui/zh/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_side_tray.xml
@@ -6,7 +6,7 @@
 	<sidetray_tab description="首頁。" name="sidebar_home" tab_title="首頁">
 		<panel label="首頁" name="panel_home"/>
 	</sidetray_tab>
-	<sidetray_tab description="編輯你的公開檔案及精選。" 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>
diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml
index 6c81ede76c..a2a63db000 100644
--- a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml
@@ -2,7 +2,7 @@
 <panel name="Teleport History">
 	<accordion name="history_accordion">
 		<no_matched_tabs_text name="no_matched_teleports_msg" value="沒有發現你要找的嗎？試試 [secondlife:///app/search/places/[SEARCH_TERM] 搜尋]。"/>
-		<no_visible_tabs_text name="no_teleports_msg" value="瞬間傳送紀錄是空白的。試試 [secondlife:///app/search/places/ 搜尋]。"/>
+		<no_visible_tabs_text name="no_teleports_msg" value="瞬間傳送紀錄是空白的。試試 [secondlife:///app/search/places/ Search]。"/>
 		<accordion_tab name="today" title="今天"/>
 		<accordion_tab name="yesterday" title="昨天"/>
 		<accordion_tab name="2_days_ago" title="前天"/>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
index 6f8f19b26d..7d8a502594 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
@@ -8,7 +8,7 @@
 		<button label="E" name="editappearance_btn"/>
 		<button label="O" name="openoutfit_btn"/>
 		<text name="currentlook_status">
-			(Status)
+			（狀態）
 		</text>
 		<text name="currentlook_name">
 			MyOutfit With a really Long Name like MOOSE
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 de5a10ba51..f308f2d4d0 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -58,18 +58,18 @@
 		<name_box initial_value="載入中..." name="Group Name Proxy"/>
 		<button label="Deed" label_selected="Deed" name="button deed" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."/>
 		<text name="label click action">
-			Click to:
+			點擊以：
 		</text>
 		<combo_box name="clickaction">
-			<combo_box.item label="Touch  (default)" name="Touch/grab(default)"/>
-			<combo_box.item label="Sit on object" name="Sitonobject"/>
-			<combo_box.item label="Buy object" name="Buyobject"/>
-			<combo_box.item label="Pay object" name="Payobject"/>
-			<combo_box.item label="Open" name="Open"/>
+			<combo_box.item label="觸碰（預設）" name="Touch/grab(default)"/>
+			<combo_box.item label="坐在物件上" name="Sitonobject"/>
+			<combo_box.item label="購買物件" name="Buyobject"/>
+			<combo_box.item label="支付物件" name="Payobject"/>
+			<combo_box.item label="開啟" name="Open"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
-				You can modify this object
+				你能修改這個物件
 			</text>
 			<text name="Anyone can:">
 				任何人：
@@ -115,9 +115,9 @@
 		</text>
 	</panel>
 	<panel name="button_panel">
-		<button label="Open" name="open_btn"/>
-		<button label="Pay" name="pay_btn"/>
+		<button label="開啟" name="open_btn"/>
+		<button label="支付" name="pay_btn"/>
 		<button label="購買" name="buy_btn"/>
-		<button label="Details" name="details_btn"/>
+		<button label="細節" name="details_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 211d91a707..986ab82523 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -5,19 +5,19 @@
      that are returned from one component and may appear in many places-->
 <strings>
 	<string name="SECOND_LIFE">
-		Second Life
+		第二人生
 	</string>
 	<string name="APP_NAME">
-		Second Life
+		第二人生
 	</string>
 	<string name="CAPITALIZED_APP_NAME">
-		SECOND LIFE
+		第二人生
 	</string>
 	<string name="SECOND_LIFE_GRID">
-		Second Life Grid
+		第二人生網格
 	</string>
 	<string name="SUPPORT_SITE">
-		Second Life Support Portal
+		第二人生支援入口
 	</string>
 	<string name="StartupDetectingHardware">
 		硬體偵測中...
@@ -131,10 +131,10 @@
 		http://join.secondlife.com/
 	</string>
 	<string name="AgentLostConnection">
-		This region may be experiencing trouble.  Please check your connection to the Internet.
+		這個地區可能遭遇問題，請檢查你的網路連線。
 	</string>
 	<string name="SavingSettings">
-		Saving your settings...
+		你的設定儲存中...
 	</string>
 	<string name="LoggingOut">
 		登出中...
@@ -149,10 +149,10 @@
 		You were sent to an invalid region.
 	</string>
 	<string name="TestingDisconnect">
-		Testing viewer disconnect
+		測試瀏覽器斷線
 	</string>
 	<string name="TooltipPerson">
-		Person
+		人
 	</string>
 	<string name="TooltipNoName">
 		(no name)
@@ -173,41 +173,41 @@
 		Group Build
 	</string>
 	<string name="TooltipFlagNoBuild">
-		No Build
+		禁止建造
 	</string>
 	<string name="TooltipFlagNoEdit">
-		Group Build
+		社團建造
 	</string>
 	<string name="TooltipFlagNotSafe">
-		Not Safe
+		非安全
 	</string>
 	<string name="TooltipFlagNoFly">
 		禁止飛行
 	</string>
 	<string name="TooltipFlagGroupScripts">
-		Group Scripts
+		社團腳本
 	</string>
 	<string name="TooltipFlagNoScripts">
-		No Scripts
+		禁止腳本
 	</string>
 	<string name="TooltipLand">
 		土地：
 	</string>
 	<string name="TooltipMustSingleDrop">
-		Only a single item can be dragged here
+		只有一個物品可以被拖曳到此處
 	</string>
 	<string name="TooltipPrice" value="L$[AMOUNT]:"/>
 	<string name="TooltipHttpUrl">
 		點擊以察看這個網頁
 	</string>
 	<string name="TooltipSLURL">
-		Click to view this location&apos;s information
+		點擊以察看這個位置資訊
 	</string>
 	<string name="TooltipAgentUrl">
-		Click to view this Resident&apos;s profile
+		點擊以察看這個居民檔案
 	</string>
 	<string name="TooltipAgentInspect">
-		Learn more about this Resident
+		瞭解更多有關這個居民
 	</string>
 	<string name="TooltipAgentMute">
 		Click to mute this Resident
@@ -219,7 +219,7 @@
 		點擊開始 IM 這位居民
 	</string>
 	<string name="TooltipAgentPay">
-		Click to Pay this Resident
+		點擊以支付這位居民
 	</string>
 	<string name="TooltipAgentOfferTeleport">
 		Click to offer a teleport request to this Resident
@@ -268,7 +268,7 @@
 		IM
 	</string>
 	<string name="SLappAgentPay">
-		Pay
+		支付
 	</string>
 	<string name="SLappAgentOfferTeleport">
 		Offer Teleport to
@@ -286,7 +286,7 @@
 		關閉
 	</string>
 	<string name="BUTTON_RESTORE">
-		Restore
+		還原
 	</string>
 	<string name="BUTTON_MINIMIZE">
 		最小化
@@ -331,7 +331,7 @@
 		Avaline Caller [ORDER]
 	</string>
 	<string name="AssetErrorNone">
-		No error
+		無錯誤
 	</string>
 	<string name="AssetErrorRequestFailed">
 		Asset request: failed
@@ -361,13 +361,13 @@
 		Viewer and server do not agree on price
 	</string>
 	<string name="AssetErrorUnknownStatus">
-		Unknown status
+		未知狀態
 	</string>
 	<string name="texture">
 		材質
 	</string>
 	<string name="sound">
-		sound
+		聲音
 	</string>
 	<string name="calling card">
 		calling card
@@ -661,13 +661,13 @@
 		載入中...
 	</string>
 	<string name="worldmap_offline">
-		Offline
+		離線
 	</string>
 	<string name="worldmap_item_tooltip_format">
 		[AREA] m² L$[PRICE]
 	</string>
 	<string name="worldmap_results_none_found">
-		None found.
+		沒有發現。
 	</string>
 	<string name="Ok">
 		確定
@@ -748,10 +748,10 @@
 		Moderate
 	</string>
 	<string name="SIM_ACCESS_ADULT">
-		Adult
+		成人
 	</string>
 	<string name="SIM_ACCESS_DOWN">
-		Offline
+		離線
 	</string>
 	<string name="SIM_ACCESS_MIN">
 		未知
@@ -760,34 +760,34 @@
 		（未知）
 	</string>
 	<string name="Estate / Full Region">
-		Estate / Full Region
+		領地 / 完整地區
 	</string>
 	<string name="Estate / Homestead">
-		Estate / Homestead
+		領地 / 家園
 	</string>
 	<string name="Mainland / Homestead">
-		Mainland / Homestead
+		大陸 / 家園
 	</string>
 	<string name="Mainland / Full Region">
-		Mainland / Full Region
+		大陸 / 完整地區
 	</string>
 	<string name="all_files">
 		全部檔案
 	</string>
 	<string name="sound_files">
-		Sounds
+		聲音
 	</string>
 	<string name="animation_files">
-		Animations
+		動作
 	</string>
 	<string name="image_files">
 		圖像
 	</string>
 	<string name="save_file_verb">
-		Save
+		儲存
 	</string>
 	<string name="load_file_verb">
-		Load
+		載入
 	</string>
 	<string name="targa_image_files">
 		Targa 圖像
@@ -808,34 +808,34 @@
 		RAW File
 	</string>
 	<string name="compressed_image_files">
-		Compressed Images
+		壓縮的圖像
 	</string>
 	<string name="load_files">
-		Load Files
+		載入檔案
 	</string>
 	<string name="choose_the_directory">
-		Choose Directory
+		選擇目錄
 	</string>
 	<string name="AvatarSetNotAway">
-		Not Away
+		非離開
 	</string>
 	<string name="AvatarSetAway">
-		Away
+		離開
 	</string>
 	<string name="AvatarSetNotBusy">
-		Not Busy
+		非忙碌
 	</string>
 	<string name="AvatarSetBusy">
-		Busy
+		忙碌
 	</string>
 	<string name="shape">
-		Shape
+		體形
 	</string>
 	<string name="skin">
-		Skin
+		皮膚
 	</string>
 	<string name="hair">
-		Hair
+		頭髮
 	</string>
 	<string name="eyes">
 		眼睛
@@ -877,49 +877,49 @@
 		Physics
 	</string>
 	<string name="invalid">
-		invalid
+		無效
 	</string>
 	<string name="none">
 		無
 	</string>
 	<string name="shirt_not_worn">
-		Shirt not worn
+		襯衫未穿
 	</string>
 	<string name="pants_not_worn">
-		Pants not worn
+		褲子未穿
 	</string>
 	<string name="shoes_not_worn">
-		Shoes not worn
+		鞋子未穿
 	</string>
 	<string name="socks_not_worn">
-		Socks not worn
+		襪子未穿
 	</string>
 	<string name="jacket_not_worn">
-		Jacket not worn
+		夾克未穿
 	</string>
 	<string name="gloves_not_worn">
-		Gloves not worn
+		手套未穿
 	</string>
 	<string name="undershirt_not_worn">
-		Undershirt not worn
+		內衣未穿
 	</string>
 	<string name="underpants_not_worn">
-		Underpants not worn
+		內褲未穿
 	</string>
 	<string name="skirt_not_worn">
-		Skirt not worn
+		裙子未穿
 	</string>
 	<string name="alpha_not_worn">
 		Alpha not worn
 	</string>
 	<string name="tattoo_not_worn">
-		Tattoo not worn
+		刺青未穿
 	</string>
 	<string name="physics_not_worn">
 		Physics not worn
 	</string>
 	<string name="invalid_not_worn">
-		invalid
+		無效
 	</string>
 	<string name="create_new_shape">
 		創造新體形
@@ -931,34 +931,34 @@
 		創造新頭髮
 	</string>
 	<string name="create_new_eyes">
-		創耖新眼睛
+		創造新眼睛
 	</string>
 	<string name="create_new_shirt">
-		Create new shirt
+		創造新襯衫
 	</string>
 	<string name="create_new_pants">
-		Create new pants
+		創造新褲子
 	</string>
 	<string name="create_new_shoes">
-		Create new shoes
+		創造新鞋子
 	</string>
 	<string name="create_new_socks">
-		Create new socks
+		創造新襪子
 	</string>
 	<string name="create_new_jacket">
-		Create new jacket
+		創造新夾克
 	</string>
 	<string name="create_new_gloves">
-		Create new gloves
+		創造新手套
 	</string>
 	<string name="create_new_undershirt">
-		Create new undershirt
+		創造新內衣
 	</string>
 	<string name="create_new_underpants">
-		Create new underpants
+		創造新內褲
 	</string>
 	<string name="create_new_skirt">
-		Create new skirt
+		創造新裙子
 	</string>
 	<string name="create_new_alpha">
 		Create new alpha
@@ -970,13 +970,13 @@
 		Create new physics
 	</string>
 	<string name="create_new_invalid">
-		invalid
+		無效
 	</string>
 	<string name="NewWearable">
-		New [WEARABLE_ITEM]
+		新 [WEARABLE_ITEM]
 	</string>
 	<string name="next">
-		Next
+		下一個
 	</string>
 	<string name="ok">
 		確定
@@ -988,7 +988,7 @@
 		社團通知
 	</string>
 	<string name="GroupNotifySentBy">
-		Sent by
+		送出由
 	</string>
 	<string name="GroupNotifyAttached">
 		Attached:
@@ -1006,16 +1006,16 @@
 		Teleport offering
 	</string>
 	<string name="StartUpNotifications">
-		New notifications arrived while you were away.
+		當你離開時有新的通知送達。
 	</string>
 	<string name="OverflowInfoChannelString">
-		You have %d more notification
+		你有約 %d 通知
 	</string>
 	<string name="BodyPartsRightArm">
 		Right Arm
 	</string>
 	<string name="BodyPartsHead">
-		Head
+		頭部
 	</string>
 	<string name="BodyPartsLeftArm">
 		Left Arm
@@ -1024,7 +1024,7 @@
 		Left Leg
 	</string>
 	<string name="BodyPartsTorso">
-		Torso
+		軀幹
 	</string>
 	<string name="BodyPartsRightLeg">
 		Right Leg
@@ -1175,7 +1175,7 @@
 		我的裝扮
 	</string>
 	<string name="InvFolder Accessories">
-		Accessories
+		配件
 	</string>
 	<string name="InvFolder Friends">
 		朋友
@@ -1253,7 +1253,7 @@
 		嘴
 	</string>
 	<string name="Chin">
-		Chin
+		下巴
 	</string>
 	<string name="Left Ear">
 		左耳
@@ -1328,7 +1328,7 @@
 		[AGEDAYS] old
 	</string>
 	<string name="TodayOld">
-		今日剛加入
+		高日剛加入
 	</string>
 	<string name="AgeYearsA">
 		[COUNT] 年
@@ -1469,7 +1469,7 @@
 		設為非執行中
 	</string>
 	<string name="CompileSuccessful">
-		編譯成功!
+		編譯成功!!
 	</string>
 	<string name="CompileSuccessfulSaving">
 		編譯成功，儲存中...
@@ -1579,7 +1579,7 @@
 		Chest
 	</string>
 	<string name="ATTACH_HEAD">
-		Head
+		頭部
 	</string>
 	<string name="ATTACH_LSHOULDER">
 		Left Shoulder
@@ -1609,7 +1609,7 @@
 		Mouth
 	</string>
 	<string name="ATTACH_CHIN">
-		Chin
+		下巴
 	</string>
 	<string name="ATTACH_LEAR">
 		Left Ear
@@ -1750,7 +1750,7 @@
 		You haven&apos;t created any Picks or Classifieds. Click the Plus button below to create a Pick or Classified.
 	</string>
 	<string name="NoAvatarPicksClassifiedsText">
-		User has no picks or classifieds
+		使用者無精選地點或個人廣告
 	</string>
 	<string name="PicksClassifiedsLoadingText">
 		載入中...
@@ -1955,7 +1955,7 @@
 		Linden Location
 	</string>
 	<string name="Adult">
-		Adult
+		成人
 	</string>
 	<string name="Arts&amp;Culture">
 		Arts &amp; Culture
@@ -2392,7 +2392,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Chest Size
 	</string>
 	<string name="Chin Angle">
-		Chin Angle
+		下巴角度
 	</string>
 	<string name="Chin Cleft">
 		Chin Cleft
@@ -2629,7 +2629,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Glove Length
 	</string>
 	<string name="Hair">
-		Hair
+		頭髮
 	</string>
 	<string name="Hair Back">
 		Hair: Back
@@ -3577,13 +3577,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Health
 	</string>
 	<string name="LocationCtrlAdultIconTooltip">
-		Adult Region
+		成人地區
 	</string>
 	<string name="LocationCtrlModerateIconTooltip">
 		Moderate Region
 	</string>
 	<string name="LocationCtrlGeneralIconTooltip">
-		General Region
+		一般地區
 	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] 更新
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
index 9702832f44..b18eb4a390 100644
--- a/indra/newview/skins/default/xui/zh/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml
@@ -53,7 +53,7 @@ Try again in a moment.
 			Relaying to destination.
 		</message>
 		<message name="sending_home">
-			傳送家位置的要求。
+			送出家位置的要求。
 		</message>
 		<message name="sending_landmark">
 			地標位置要求瞬間傳送中。
-- 
cgit v1.2.3


From 6575258ff961bb534ee26813f5f2601e792dedc9 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Fri, 17 Jun 2011 11:39:56 -0700
Subject: FIX VWR-25068 en_xui_change

---
 .../newview/skins/default/xui/de/floater_preview_gesture.xml |  2 +-
 .../newview/skins/default/xui/en/floater_preview_gesture.xml | 12 ++++++------
 .../newview/skins/default/xui/nl/floater_preview_gesture.xml |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
index 6d3635fa8d..76dc623ca4 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
@@ -33,7 +33,7 @@
 	<text name="replace_text" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt.">
 		Ersetzen mit:
 	</text>
-	<line_editor left_delta="94" name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt." width="160"/>
+	<line_editor name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt."/>
 	<text name="key_label">
 		Tastenkürzel:
 	</text>
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index 9f6199fada..478ae5f53f 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -50,17 +50,17 @@
      name="desc_label"
      top_pad="25"
      font.style="BOLD"
-     width="100">
+     width="105">
         Description:
     </text>
     <line_editor
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="89"
+     left_delta="94"
      name="desc"
      top_delta="-4"
-     width="175" />
+     width="170" />
     <text
      type="string"
      length="1"
@@ -96,19 +96,19 @@
      name="replace_text"
      tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture!"
      top_pad="10"
-     width="210">
+     width="215">
         Replace with:
     </text>
     <line_editor
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="99"
+     left_delta="104"
      max_length_bytes="31"
      name="replace_editor"
      tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"
      top_delta="-4"
-     width="165" />
+     width="160" />
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/nl/floater_preview_gesture.xml b/indra/newview/skins/default/xui/nl/floater_preview_gesture.xml
index 7dd85460a2..c6b301841a 100644
--- a/indra/newview/skins/default/xui/nl/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/nl/floater_preview_gesture.xml
@@ -15,7 +15,7 @@
 	<text name="trigger_label">
 		Trigger:
 	</text>
-	<text name="replace_text" tool_tip="Vervang de startseinwoorden door deze woorden. Bijvoorbeeld, startsein &apos;hallo&apos; vervang door &apos;hoi&apos; zal de chat &apos;Ik wilde hallo zeggen&apos; veranderen in &apos;Ik wilde hoi zeggen&apos;, waarbij tevens het gebaar afgespeeld zal worden!" left="208">
+	<text name="replace_text" tool_tip="Vervang de startseinwoorden door deze woorden. Bijvoorbeeld, startsein &apos;hallo&apos; vervang door &apos;hoi&apos; zal de chat &apos;Ik wilde hallo zeggen&apos; veranderen in &apos;Ik wilde hoi zeggen&apos;, waarbij tevens het gebaar afgespeeld zal worden!">
 		Vervangen door:
 	</text>
 	<line_editor name="replace_editor" tool_tip="Vervang de startseinwoorden door deze woorden. Bijvoorbeeld, startsein &apos;hallo&apos; vervang door &apos;hoi&apos; zal de chat &apos;Ik wilde hallo zeggen&apos; veranderen in &apos;Ik wilde hoi zeggen&apos;, waarbij tevens het gebaar afgespeeld zal worden."/>
-- 
cgit v1.2.3


From 34674d935bb287a0202f0348d6ec9d3afb780d50 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Fri, 17 Jun 2011 11:40:48 -0700
Subject: FIX VWR-25070

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 0b14f92ae7..b29f744a68 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -69,7 +69,7 @@
 	<text name="RenderingCost" tool_tip="このオブジェクトにかかるレンダリングコストを表示">
 		þ: [COUNT]
 	</text>
-	<check_box label="" left="116" name="checkbox uniform"/>
+	<check_box label="" name="checkbox uniform"/>
 	<text label="両側を延ばす" name="checkbox uniform label">
 		両側を延ばす
 	</text>
-- 
cgit v1.2.3


From 47c49b5bc564675b4e4b5c21f3c5ea0005980ae6 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Mon, 20 Jun 2011 11:22:02 -0700
Subject: sync with viewer-development

---
 .../skins/default/xui/en/floater_model_preview.xml       | 16 ++++++++++++++++
 .../skins/default/xui/en/floater_model_wizard.xml        |  4 +++-
 indra/newview/skins/default/xui/en/floater_tools.xml     | 11 ++++-------
 indra/newview/skins/default/xui/en/notifications.xml     |  4 +++-
 4 files changed, 26 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index dce55dae12..f58595b3c5 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -4,9 +4,11 @@
      name="Model Preview" title="Upload Model" width="620">
 
   <string name="status_idle">Idle</string>
+  <string name="status_parse_error">Dae parsing issue - see log for details.</string>
   <string name="status_reading_file">Loading...</string>
   <string name="status_generating_meshes">Generating Meshes...</string>
   <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
+  <string name="bad_element">Error: element is invalid</string>
   <string name="high">High</string>
   <string name="medium">Medium</string>
   <string name="low">Low</string>
@@ -83,6 +85,20 @@
     </text>
   </panel>
 
+  <check_box
+	height="16"
+	left_delta="0"
+	name="confirm_checkbox"
+	top_pad="15"
+	follows="bottom|left"
+	width="16" />
+
+  <text
+	height="30"
+	width="570"
+	word_wrap="true" 
+	left_delta="25"
+	top_delta="0">I confirm that I have the appropriate rights to the material contained in this model. [secondlife:///app/floater/learn_more Learn more]</text>
   <text left="10" bottom="540" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text>
 
   
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 47b2e5fd79..8603682e3a 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -1019,9 +1019,11 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 	<spinner visible="false" left="10" height="20" follows="top|left" width="80" top_pad="-50" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>
 
 	<string name="status_idle">Idle</string>
+  <string name="status_parse_error">Dae parsing issue - see log for details.</string>
 	<string name="status_reading_file">Loading...</string>
 	<string name="status_generating_meshes">Generating Meshes...</string>
-  <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
+	<string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
+	<string name="bad_element">Error: element is invalid</string>
 	<string name="high">High</string>
 	<string name="medium">Medium</string>
 	<string name="low">Low</string>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 40bf7bfed7..7441b2cd9c 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2098,11 +2098,7 @@ even though the user gets a free copy.
                  label="Cylinder"
                  name="Cylinder"
                  value="Cylinder" />
-              <combo_box.item
-                 label="Mesh"
-                 name="Mesh"
-                 value="Mesh" />
-            </combo_box>
+              </combo_box>
         </panel>
         <panel
          border="false"
@@ -2461,8 +2457,9 @@ even though the user gets a free copy.
              height="19"
              increment="0.1"
              initial_value="0"
-             label="Density"
+             label="Density in 100 kg/m^3"
              label_width="70"
+             label_wrap="true"
              layout="topleft"
              left_delta="0"
              max_val="22587"
@@ -2483,7 +2480,7 @@ even though the user gets a free copy.
              max_val="1"
              min_val="0"
              name="Physics Restitution"
-             top_pad="4"
+             top_pad="8"
              width="132" />
         </panel>
          <panel
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ce96c488b4..09105c1d28 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6823,7 +6823,9 @@ Select residents to share with.
     name="MeshUploadError"
     icon="alert.tga"
     type="alert">
-    [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+    [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] 
+
+See the log file for details.
   </notification>
    
   <notification
-- 
cgit v1.2.3


From 6977c09a88f5591c135df2f8f37eaa544402e69a Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Tue, 21 Jun 2011 11:58:54 -0700
Subject: FIX VWR-25071

---
 .../newview/skins/default/xui/ja/floater_tools.xml | 38 +++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index b29f744a68..f7d77d351e 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -74,8 +74,8 @@
 		両側を延ばす
 	</text>
 	<check_box initial_value="true" label="テクスチャを引き延ばす" name="checkbox stretch textures"/>
-	<check_box initial_value="true" label="グリッドにスナップ" left_delta="27" name="checkbox snap to grid"/>
-	<combo_box left_delta="60" name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択します" width="76">
+	<check_box initial_value="true" label="グリッドにスナップ" name="checkbox snap to grid"/>
+	<combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択します" >
 		<combo_box.item label="インワールドグリッド" name="World"/>
 		<combo_box.item label="ローカルグリッド" name="Local"/>
 		<combo_box.item label="リファレンスグリッド" name="Reference"/>
@@ -137,7 +137,7 @@
 	<text name="object_cost" tool_tip="[prims] / [physics complexity] として現在選択されているオブジェクトのコスト">
 		料金： [COST] / [PHYSICS]
 	</text>
-	<tab_container name="Object Info Tabs" tab_max_width="150" tab_min_width="30">
+	<tab_container name="Object Info Tabs" >
 		<panel label="一般" name="General">
 			<panel.string name="text deed continued">
 				譲渡
@@ -379,22 +379,22 @@
 				オブジェクトの特徴を編集：
 			</text>
 			<check_box label="フレキシブルパス" name="Flexible1D Checkbox Ctrl" tool_tip="Z 軸を中心にオブジェクトの屈曲を有効にします（クライアント側のみ）"/>
-			<spinner label="柔軟性" label_width="72" name="FlexNumSections" width="135"/>
-			<spinner label="重力" label_width="72" name="FlexGravity" width="135"/>
-			<spinner label="ドラッグ" label_width="72" name="FlexFriction" width="135"/>
-			<spinner label="風" label_width="72" name="FlexWind" width="135"/>
-			<spinner label="緊張" label_width="72" name="FlexTension" width="135"/>
-			<spinner label="X 軸方向の力" label_width="72" name="FlexForceX" width="135"/>
-			<spinner label="Y 軸方向の力" label_width="72" name="FlexForceY" width="135"/>
-			<spinner label="Z 軸方向の力" label_width="72" name="FlexForceZ" width="135"/>
+			<spinner label="柔軟性" name="FlexNumSections" />
+			<spinner label="重力" name="FlexGravity" />
+			<spinner label="ドラッグ" name="FlexFriction" />
+			<spinner label="風" name="FlexWind" />
+			<spinner label="緊張" name="FlexTension" />
+			<spinner label="X 軸方向の力" name="FlexForceX" />
+			<spinner label="Y 軸方向の力" name="FlexForceY" />
+			<spinner label="Z 軸方向の力" name="FlexForceZ" />
 			<check_box label="光" name="Light Checkbox Ctrl" tool_tip="オブジェクトが発光します"/>
-			<color_swatch label="" left_delta="74" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
+			<color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
 			<texture_picker label="" name="light texture control" tool_tip="クリックで投影画を選択します（遅延レンダリング有効時のみ）"/>
-			<spinner label="輝度" label_width="72" name="Light Intensity" width="135"/>
+			<spinner label="輝度" name="Light Intensity" />
 			<spinner label="FOV" name="Light FOV"/>
-			<spinner label="半径" label_width="72" name="Light Radius" width="135"/>
+			<spinner label="半径" name="Light Radius" />
 			<spinner label="焦点" name="Light Focus"/>
-			<spinner label="弱まる" label_width="72" name="Light Falloff" width="135"/>
+			<spinner label="弱まる" name="Light Falloff" />
 			<spinner label="環境" name="Light Ambiance"/>
 			<text name="label physicsshapetype">
 				実像の種類：
@@ -496,18 +496,18 @@
 			</panel>
 		</panel>
 		<panel label="中身" name="Contents">
-			<button label="新しいスクリプト" label_selected="新規スクリプト" name="button new script" width="120"/>
-			<button label="権限" left_delta="130" name="button permissions" width="80"/>
+			<button label="新しいスクリプト" label_selected="新規スクリプト" name="button new script" />
+			<button label="権限" name="button permissions" />
 		</panel>
 	</tab_container>
 	<panel name="land info panel">
 		<text name="label_parcel_info">
 			区画情報
 		</text>
-		<text name="label_area_price" width="200">
+		<text name="label_area_price" >
 			価格： [AREA] 平方メートル L$ [PRICE]
 		</text>
-		<text name="label_area" width="200">
+		<text name="label_area" >
 			面積： [AREA] 平方メートル
 		</text>
 		<button label="土地情報" label_selected="土地情報" name="button about land"/>
-- 
cgit v1.2.3


From ed684fb2ed4315df38d7bc5bad8b4481ffc44549 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Tue, 21 Jun 2011 12:00:08 -0700
Subject: FIX VWR-25072

---
 .../skins/default/xui/de/floater_about_land.xml    | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index f1e42232c8..f0fa4386d2 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -219,38 +219,38 @@ werden.
 			<text name="objects_available">
 				[COUNT] von [MAX] ([AVAILABLE] verfügbar)
 			</text>
-			<text name="Primitives parcel supports:" width="200">
+			<text name="Primitives parcel supports:">
 				Von Parzelle unterstützte Prims:
 			</text>
-			<text left="204" name="object_contrib_text" width="152">
+			<text name="object_contrib_text">
 				[COUNT]
 			</text>
 			<text name="Primitives on parcel:">
 				Prims auf Parzelle:
 			</text>
-			<text left="204" name="total_objects_text" width="48">
+			<text name="total_objects_text">
 				[COUNT]
 			</text>
-			<text left="14" name="Owned by parcel owner:" width="200">
+			<text name="Owned by parcel owner:" width="200">
 				Im Eigentum des Parzellenbesitzers:
 			</text>
-			<text left="204" left_delta="200" name="owner_objects_text" width="48">
+			<text left_delta="204" name="owner_objects_text">
 				[COUNT]
 			</text>
-			<button label="Anzeigen" label_selected="Anzeigen" name="ShowOwner" right="-135" width="60"/>
-			<button label="Zurückgeben" label_selected="Zurückgeben..." name="ReturnOwner..." right="-10" tool_tip="Objekte an ihre Eigentümer zurückgeben." width="119"/>
-			<text left="14" name="Set to group:">
+			<button label="Anzeigen" label_selected="Anzeigen" name="ShowOwner"/>
+			<button label="Zurückgeben" label_selected="Zurückgeben..." name="ReturnOwner..." tool_tip="Objekte an ihre Eigentümer zurückgeben."/>
+			<text name="Set to group:">
 				Der Gruppe zugeordnet:
 			</text>
-			<text left="204" name="group_objects_text" width="48">
+			<text name="group_objects_text">
 				[COUNT]
 			</text>
-			<button label="Anzeigen" label_selected="Anzeigen" name="ShowGroup" right="-135" width="60"/>
-			<button label="Zurückgeben" label_selected="Zurückgeben..." name="ReturnGroup..." right="-10" tool_tip="Objekte an ihre Eigentümer zurückgeben." width="119"/>
-			<text left="14" name="Owned by others:" width="128">
+			<button label="Anzeigen" label_selected="Anzeigen" name="ShowGroup"/>
+			<button label="Zurückgeben" label_selected="Zurückgeben..." name="ReturnGroup..." tool_tip="Objekte an ihre Eigentümer zurückgeben."/>
+			<text name="Owned by others:">
 				Im Eigentum anderer:
 			</text>
-			<text left="204" name="other_objects_text" width="48">
+			<text name="other_objects_text">
 				[COUNT]
 			</text>
 			<button label="Anzeigen" label_selected="Anzeigen" name="ShowOther"/>
-- 
cgit v1.2.3


From 2a3a01dcc9cef08b28715015ffc61e6c72776af6 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Tue, 21 Jun 2011 15:40:13 -0700
Subject: FIX VWR-25118

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml b/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
index fd65987aa9..9be22f3ccb 100644
--- a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
@@ -9,7 +9,7 @@
 		</text>
 		<check_box label="Bearbeiten" name="next_owner_modify"/>
 		<check_box label="Kopieren" name="next_owner_copy"/>
-		<check_box label="Verkaufen/Weggeben" left_delta="80" name="next_owner_transfer"/>
+		<check_box label="Verkaufen/Weggeben" name="next_owner_transfer"/>
 	</panel>
 	<button label="OK" label_selected="OK" name="ok"/>
 	<button label="Abbrechen" label_selected="Abbrechen" name="cancel"/>
-- 
cgit v1.2.3


From 54195e81259d76fd7bc0d1fee5ef28a145626e2b Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Tue, 21 Jun 2011 16:07:28 -0700
Subject: FIX VWR-25159

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
index 2f92cb55eb..43bbf0b70f 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
@@ -18,7 +18,7 @@
 	<text name="balance_amount">
 		[AMT] L$
 	</text>
-	<text name="currency_action" width="50">
+	<text name="currency_action">
 		Quiero comprar
 	</text>
 	<text name="currency_label">
-- 
cgit v1.2.3


From c0fa40141b576ee40f016d27a8f02a08e6d49446 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Tue, 21 Jun 2011 16:15:58 -0700
Subject: FIX VWR-25160 en_xui_change

---
 indra/newview/skins/default/xui/en/panel_nearby_media.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index 9bd60b935f..bfc503f05b 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -104,12 +104,12 @@
 		top_pad="15"
 		left="10"
 		name="show_text"
-		width="40">
+		width="62">
 	  Show:
 	</text>
 	<combo_box
 		height="23"
-		left="50"
+		left="72"
 		width="140"
 		top_delta="-5"
 		follows="left|top"
-- 
cgit v1.2.3


From 3ef49a967be6e4731c7c905299ac3e990a6c28d1 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 22 Jun 2011 06:27:51 -0400
Subject: STORM-899 [ILL-FORMED XML] 'No attachments worn' text on blank
 'Attachments' accordion remains in English for all locales Added / to xml
 file

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

(limited to 'indra/newview/skins')

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 bbeb592e96..9e70706603 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -52,7 +52,7 @@
              multi_select="true"
              name="list_attachments"
              top="0"
-             width="311">
+             width="311"/>
         </accordion_tab>
         <accordion_tab
          layout="topleft"
-- 
cgit v1.2.3


From 5f3c4f7e19f73f540ff29e93cd8d8eb3890fa063 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Thu, 23 Jun 2011 14:47:07 -0700
Subject: FIX VWR-25125

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 3731b6b57c..b759eed738 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -3628,6 +3628,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="LocationCtrlComboBtnTooltip">
 		Historial de mis localizaciones
 	</string>
+	<string name="LocationCtrlForSaleTooltip">
+		Comprar este terreno
+	</string>
 	<string name="LocationCtrlAdultIconTooltip">
 		Región Adulta
 	</string>
-- 
cgit v1.2.3


From 47f1f3f3968a5f8ed6038752b0be360132964876 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Thu, 23 Jun 2011 15:23:30 -0700
Subject: FIX VWR-25381

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml
index e8e95c3bac..293c9ef1d9 100644
--- a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="navigation_bar">
 	<panel name="navigation_panel">
-		<pull_button name="back_btn" tool_tip="Volver a lo localización anterior"/>
+		<pull_button name="back_btn" tool_tip="Volver a la localización anterior"/>
 		<pull_button name="forward_btn" tool_tip="Ir una localización adelante"/>
 		<button name="home_btn" tool_tip="Teleportar a mi Base"/>
 		<location_input label="Localización" name="location_combo"/>
-- 
cgit v1.2.3


From cf5e9841a72716eb0dc15ec8c3b202a7731950da Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Thu, 23 Jun 2011 15:39:55 -0700
Subject: FIX VWR-25400

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index b874074c79..9175ea0bae 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -60,7 +60,7 @@
 			m
 		</text>
 		<slider label="Max. Partikelzahl:" name="MaxParticleCount"/>
-		<slider label="Max. Anzahl an voll dargestellten Avataren:" name="MaxNumberAvatarDrawn"/>
+		<slider label="Max. Anzahl an voll dargestellten Avataren:" label_width="230" name="MaxNumberAvatarDrawn" width="315"/>
 		<slider label="Post-Processing-Qualität:" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
 			Darstellungsgrad:
-- 
cgit v1.2.3


From 6c18a086f3354a7ab0b6a9388dfe36b0639e2a10 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Thu, 23 Jun 2011 15:44:36 -0700
Subject: FIX VWR-25408

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml
index c014b8e040..ae68c71a80 100644
--- a/indra/newview/skins/default/xui/de/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml
@@ -4,7 +4,7 @@
 		unbekannt
 	</floater.string>
 	<radio_group label="Fototyp" name="snapshot_type_radio">
-		<radio_item label="Email" name="postcard"/>
+		<radio_item label="E-Mail" name="postcard"/>
 		<radio_item label="Mein Inventar ([AMOUNT] L$)" name="texture"/>
 		<radio_item label="Auf meinem Computer speichern" name="local"/>
 	</radio_group>
-- 
cgit v1.2.3


From 11eb995e69dfc3b91512da0de2db22d764323eda Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Thu, 23 Jun 2011 16:28:59 -0700
Subject: FIX VWR-25660 en_xui_change

---
 indra/newview/skins/default/xui/de/floater_tools.xml | 6 +++---
 indra/newview/skins/default/xui/en/floater_tools.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index 258e67a138..338b609343 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -64,9 +64,9 @@
 		<radio_item label="Fläche auswählen" name="radio select face"/>
 	</radio_group>
 	<check_box label="Verknüpfte Teile bearbeiten" name="checkbox edit linked parts"/>
-	<button label="Link" name="link_btn"/>
-	<button label="Verknüpfung auflösen" name="unlink_btn"/>
-	<text name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für dieses Objekt">
+	<button label="Link" name="link_btn" width="30"/>
+	<button label="Verknüpfung auflösen" name="unlink_btn" width="126"/>
+	<text name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für dieses Objekt" left_pad="0">
 		þ: [COUNT]
 	</text>
 	<check_box label="" name="checkbox uniform"/>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 7441b2cd9c..8b8f70b940 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -279,7 +279,7 @@
      layout="topleft"
      left_pad="2"
      name="unlink_btn"
-     width="50">
+     width="105">
 	  <button.commit_callback
 	     function="BuildTool.UnlinkObjects"/>
     </button>
-- 
cgit v1.2.3


From 44308a50c2389b3d021d5f6bfa125b06f1b643d1 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Fri, 24 Jun 2011 11:09:26 -0700
Subject: sync with viewer-development

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

(limited to 'indra/newview/skins')

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 bbeb592e96..9e70706603 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -52,7 +52,7 @@
              multi_select="true"
              name="list_attachments"
              top="0"
-             width="311">
+             width="311"/>
         </accordion_tab>
         <accordion_tab
          layout="topleft"
-- 
cgit v1.2.3


From d66545d17ff1aa30a3840928fa38a919ddec0a53 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sat, 25 Jun 2011 11:08:36 -0400
Subject: STORM-1326 [ALL LANGS] (Spanish) [HARDCODED] Selling land, advice
 with "Anyone" in English.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 71f48c833d..143a989d32 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2250,6 +2250,9 @@ Returns a string with the requested data about the region
 	<string name="IMMainland">mainland</string>
 	<string name="IMTeen">teen</string>
 
+    <!-- floater about land -->
+    <string name="Anyone">anyone</string>
+
 	<!-- floater region info -->
 	<!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* -->
 	<string name="RegionInfoError">error</string>
-- 
cgit v1.2.3


From 9a40b84beded2bb0d0d2adb062b1611bdeb756ed Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sat, 25 Jun 2011 16:37:10 -0400
Subject: STORM-1302 (all langs) [TRANSLATED BUT IN ENG] (Spanish) Side Menu >
 Gente tab > MIS AMIGOS tab > buttons "Call", "Share" and "Teleport" and their
 tooltips

---
 indra/newview/skins/default/xui/da/panel_people.xml | 8 ++++----
 indra/newview/skins/default/xui/de/panel_people.xml | 8 ++++----
 indra/newview/skins/default/xui/en/panel_people.xml | 8 ++++----
 indra/newview/skins/default/xui/es/panel_people.xml | 8 ++++----
 indra/newview/skins/default/xui/fr/panel_people.xml | 8 ++++----
 indra/newview/skins/default/xui/it/panel_people.xml | 8 ++++----
 indra/newview/skins/default/xui/ja/panel_people.xml | 8 ++++----
 indra/newview/skins/default/xui/pl/panel_people.xml | 8 ++++----
 indra/newview/skins/default/xui/pt/panel_people.xml | 8 ++++----
 indra/newview/skins/default/xui/zh/panel_people.xml | 8 ++++----
 10 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml
index 925492b2d7..66a128cd13 100644
--- a/indra/newview/skins/default/xui/da/panel_people.xml
+++ b/indra/newview/skins/default/xui/da/panel_people.xml
@@ -66,16 +66,16 @@ Leder du efter nogen at være sammen med? Prøv [secondlife:///app/worldmap Verd
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profil" name="view_profile_btn" tool_tip="Vis billeder, grupper og anden beboer information"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="Åben session med privat besked (IM)"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Kald" name="call_btn" tool_tip="Opkald til denne beboer"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Del" name="share_btn" tool_tip="Del en genstand fra beholdning"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teleportér" name="teleport_btn" tool_tip="Tilbyd teleport"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index 004792bbf5..63a832a165 100644
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -66,16 +66,16 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="Instant Messenger öffnen"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Teilen" name="share_btn" tool_tip="Inventarobjekt teilen"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 775805ad2e..f5a87194dd 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -621,7 +621,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 			height="23"
 			layout="bottomleft"
 			left_pad="3"
-			name="chat_btn_lp"
+			name="im_btn_lp"
 		    user_resize="false" 
 		    auto_resize="true"
 			width="41">
@@ -642,7 +642,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 			height="23"
 			layout="bottomleft"
 			left_pad="3"
-			name="chat_btn_lp"
+			name="call_btn_lp"
 		    user_resize="false" 
 		    auto_resize="true"
 			width="52">
@@ -663,7 +663,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 			height="23"
 			layout="bottomleft"
 			left_pad="3"
-			name="chat_btn_lp"
+			name="share_btn_lp"
 		    user_resize="false" 
 		    auto_resize="true"
 			width="66">
@@ -684,7 +684,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 			height="23"
 			layout="bottomleft"
 			left_pad="3"
-			name="chat_btn_lp"
+			name="teleport_btn_lp"
 		    user_resize="false" 
 		    auto_resize="true"
 			width="77">
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 01149e412d..a9d38dca25 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -66,16 +66,16 @@
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="MI" name="im_btn" tool_tip="Abrir una sesión de mensajes instantáneos"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Llamar" name="call_btn" tool_tip="Llamar a este Residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Compartir" name="share_btn" tool_tip="Compartir un objeto del inventario"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index 166f04b3e4..b24c340708 100644
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -66,16 +66,16 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife://
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profil" name="view_profile_btn" tool_tip="Afficher la photo, les groupes et autres infos des résidents"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Appel" name="call_btn" tool_tip="Appeler ce résident"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Partager" name="share_btn" tool_tip="Partager un article de l&apos;inventaire"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index b24a4055f7..f903ae6e2c 100644
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -66,16 +66,16 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profilo" name="view_profile_btn" tool_tip="Mostra immagine, gruppi e altre informazioni del residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="Apri una sessione messaggio istantaneo"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Chiama" name="call_btn" tool_tip="Chiama questo residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Condividi" name="share_btn" tool_tip="Condividi un oggetto dell&apos;inventario"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teleport" name="teleport_btn" tool_tip="Offri teleport"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index c7f71c6de0..1c90f7327e 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -66,16 +66,16 @@
 			<layout_panel name="view_profile_btn_lp">
 				<button label="プロフィール" name="view_profile_btn" tool_tip="写真、グループ、その他住人情報を表示"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="インスタントメッセージを開きます"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="コール" name="call_btn" tool_tip="この住人にコールする"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="共有" name="share_btn" tool_tip="「持ち物」のアイテムを共有する"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="テレポート" name="teleport_btn" tool_tip="テレポートを送ります"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml
index da9f84cb2e..ef52e2148b 100644
--- a/indra/newview/skins/default/xui/pl/panel_people.xml
+++ b/indra/newview/skins/default/xui/pl/panel_people.xml
@@ -66,16 +66,16 @@ Chcesz spotkać ludzi? Spróbuj [secondlife:///app/worldmap Mapa Świata].
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profil" name="view_profile_btn" tool_tip="Pokaż zdjęcie, grupy i inne informacje o Rezydencie"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="Otwórz wiadomości IM"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Dzwoń" name="call_btn" tool_tip="Zadzwoń do tego Rezydenta"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Udostępnij" name="share_btn" tool_tip="Udostępnij obiekt z Szafy"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teleportuj" name="teleport_btn" tool_tip="Zaproponuj teleport"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index aece30738b..f3af15b991 100644
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -66,16 +66,16 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Ligar" name="call_btn" tool_tip="Ligar para este residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Compartilhar" name="share_btn" tool_tip="Compartilhar item de inventário"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 8da75e334e..4c6d6c76be 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -66,16 +66,16 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 			<layout_panel name="view_profile_btn_lp">
 				<button label="檔案" name="view_profile_btn" tool_tip="Show picture, groups, and other Residents information"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="通話" name="call_btn" tool_tip="Call this Resident"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="瞬間傳送" name="teleport_btn" tool_tip="Offer teleport"/>
 			</layout_panel>
 		</layout_stack>
-- 
cgit v1.2.3


From 0ec675b7d1f6f7de231b2c9907ae5fe18a94d9ae Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sat, 25 Jun 2011 18:39:12 -0400
Subject: STORM-1292 [UNTRANSLATABLE XUI ATTRIBUTE] "Mi apariencia" tab in side
 menu bar > "MIS VESTUARIOS". You don't have any outfits yet. Try Search. (ALL
 LANGS)

---
 indra/newview/skins/default/xui/en/panel_outfits_list.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
index 9f98019c94..a0096adc01 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
@@ -14,9 +14,7 @@
      background_visible="true"
      bg_alpha_color="DkGray2"
      bg_opaque_color="DkGray2"
-     no_matched_tabs_text.value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]."
-     no_matched_tabs_text.v_pad="10"
-     no_visible_tabs_text.value="You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]"
+
      follows="all"
      height="400"
      layout="topleft"
@@ -24,6 +22,13 @@
      name="outfits_accordion"
      top="0"
      width="309">
+       <no_matched_tabs_text
+         name="no_matched_outfits_msg"
+         value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]."
+         v_pad="10"/>
+       <no_visible_tabs_text
+         name="no_outfits_msg"
+         value="You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]"/>
     </accordion>
     <panel
      background_visible="true"
-- 
cgit v1.2.3


From bd6e1b7fd8b5dd45ccf246bd7fbc7f2071aa0d1c Mon Sep 17 00:00:00 2001
From: Twisted_Laws <none@none>
Date: Sun, 26 Jun 2011 11:22:42 -0400
Subject: STORM-1103 sets a minimum size for map in nearby people and makes the
 map resizable

---
 indra/newview/skins/default/xui/en/panel_people.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 775805ad2e..e478d7c9e2 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -110,8 +110,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
            <layout_panel
              height="142"
              layout="topleft"
+             min_dim="100"
              mouse_opaque="false"
-             user_resize="false"
+             user_resize="true"
              visibility_control="NearbyListShowMap"
              width="313">
              <net_map
@@ -128,9 +129,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
            <layout_panel
              height="213"
              layout="topleft"
-             min_height="100"
+             min_dim="100"
              mouse_opaque="false"
-             user_resize="false"
+             user_resize="true"
              width="313">
              <avatar_list
                allow_select="true"
-- 
cgit v1.2.3


From 1b9c42fb0b0f6807c684d886263efd541e0340c0 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Mon, 27 Jun 2011 16:06:37 -0700
Subject: FIX VWR-25660

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 9d29bc40bf..78f18b745c 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -65,7 +65,7 @@
 	</radio_group>
 	<check_box label="Editar las partes enlazadas" name="checkbox edit linked parts"/>
 	<button label="Enlazar" name="link_btn"/>
-	<button label="Desenlazar" name="unlink_btn"/>
+	<button label="Desenlazar" name="unlink_btn" width="95"/>
 	<text name="RenderingCost" tool_tip="Muestra cuánto se calcula que cuesta renderizar este objeto">
 		þ: [COUNT]
 	</text>
-- 
cgit v1.2.3


From 5e65933d298d08fb4b1a21540620266d5c6161f0 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Mon, 27 Jun 2011 17:49:22 -0700
Subject: FIX VWR-25879

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
index e6e4c13203..36777a720e 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
@@ -39,6 +39,6 @@
 	<text name="floater_opacity">
 		Opacidad de la ventana:
 	</text>
-	<slider label="Activo:" name="active"/>
+	<slider label="Activa:" name="active"/>
 	<slider label="Inactivo:" name="inactive"/>
 </panel>
-- 
cgit v1.2.3


From d22f199d4e852e18725c9deee081ce53641124e3 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Mon, 27 Jun 2011 17:52:41 -0700
Subject: FIX VWR-25880

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
index 36777a720e..d47a6d718a 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
@@ -40,5 +40,5 @@
 		Opacidad de la ventana:
 	</text>
 	<slider label="Activa:" name="active"/>
-	<slider label="Inactivo:" name="inactive"/>
+	<slider label="Inactiva:" name="inactive"/>
 </panel>
-- 
cgit v1.2.3


From 1e54158bd54153163a6ae16c67e0ee27e82302d8 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Mon, 27 Jun 2011 17:55:48 -0700
Subject: FIX VWR-25881

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
index fa7806a75a..75d175b262 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
@@ -12,7 +12,7 @@
 	<slider label="Ambiental" name="Wind Volume"/>
 	<slider label="Efectos de sonido" name="SFX Volume"/>
 	<slider label="Música en streaming" name="Music Volume"/>
-	<check_box label="Activados" name="enable_music"/>
+	<check_box label="Activada" name="enable_music"/>
 	<slider label="Multimedia" name="Media Volume"/>
 	<check_box label="Activados" name="enable_media"/>
 	<slider label="Chat de voz" name="Voice Volume"/>
-- 
cgit v1.2.3


From 02602aaad35ec549aa945e72b98997bf0fd1a1d5 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Mon, 27 Jun 2011 18:04:04 -0700
Subject: FIX VWR-25943 en_xui_change

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index ec190ab656..89a0c4c287 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -330,13 +330,13 @@
      increment="1"
      initial_value="75"
      label="Image quality"
-     label_width="100"
+     label_width="124"
      layout="topleft"
      left_delta="0"
      max_val="100"
      name="image_quality_slider"
      top_pad="5"
-     width="205" />
+     width="228" />
     <text
      type="string"
      length="1"
-- 
cgit v1.2.3


From 45e171328480c713551a98493cf31e16211a0cce Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Mon, 27 Jun 2011 18:07:51 -0700
Subject: FIX VWR-25681

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml
index 990193574e..fa659040ea 100644
--- a/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="LLScrollingPanelParamBase">
-	<slider label="[BESCHR]" name="param slider"/>
+	<slider label="[DESC]" name="param slider"/>
 </panel>
-- 
cgit v1.2.3