From 9f84a348ca08dd0487b2a7dff13da905fd8e11bd Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Wed, 25 Nov 2009 14:30:16 -0800
Subject: EXT-2779 World map - clean up layout and simplify

---
 .../skins/default/textures/icon_event_adult.tga    | Bin 648 -> 1006 bytes
 .../skins/default/textures/icon_top_pick.tga       | Bin 858 -> 1068 bytes
 .../skins/default/textures/map_avatar_16.tga       | Bin 1068 -> 1068 bytes
 .../skins/default/textures/map_avatar_8.tga        | Bin 300 -> 300 bytes
 indra/newview/skins/default/textures/map_event.tga | Bin 1068 -> 1068 bytes
 .../skins/default/textures/map_event_adult.tga     | Bin 648 -> 1006 bytes
 .../skins/default/textures/map_event_mature.tga    | Bin 1068 -> 1068 bytes
 indra/newview/skins/default/textures/map_home.tga  | Bin 1068 -> 1068 bytes
 .../newview/skins/default/textures/map_infohub.tga | Bin 1068 -> 1068 bytes
 .../newview/skins/default/textures/map_telehub.tga | Bin 1068 -> 1068 bytes
 indra/newview/skins/default/textures/textures.xml  |  15 +-
 .../skins/default/xui/en/floater_world_map.xml     | 714 ++++++++++++---------
 .../default/xui/en/panel_region_general_layout.xml | 242 -------
 13 files changed, 426 insertions(+), 545 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/panel_region_general_layout.xml

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

diff --git a/indra/newview/skins/default/textures/icon_event_adult.tga b/indra/newview/skins/default/textures/icon_event_adult.tga
index c344fb1e78..f548126e5a 100644
Binary files a/indra/newview/skins/default/textures/icon_event_adult.tga and b/indra/newview/skins/default/textures/icon_event_adult.tga differ
diff --git a/indra/newview/skins/default/textures/icon_top_pick.tga b/indra/newview/skins/default/textures/icon_top_pick.tga
index 7fe119a818..0b34882d2f 100644
Binary files a/indra/newview/skins/default/textures/icon_top_pick.tga and b/indra/newview/skins/default/textures/icon_top_pick.tga differ
diff --git a/indra/newview/skins/default/textures/map_avatar_16.tga b/indra/newview/skins/default/textures/map_avatar_16.tga
index ce129e3590..f59e9e9193 100644
Binary files a/indra/newview/skins/default/textures/map_avatar_16.tga and b/indra/newview/skins/default/textures/map_avatar_16.tga differ
diff --git a/indra/newview/skins/default/textures/map_avatar_8.tga b/indra/newview/skins/default/textures/map_avatar_8.tga
index 28552f2237..8500eadeba 100644
Binary files a/indra/newview/skins/default/textures/map_avatar_8.tga and b/indra/newview/skins/default/textures/map_avatar_8.tga differ
diff --git a/indra/newview/skins/default/textures/map_event.tga b/indra/newview/skins/default/textures/map_event.tga
index c229b379a2..2c06d08fd2 100644
Binary files a/indra/newview/skins/default/textures/map_event.tga and b/indra/newview/skins/default/textures/map_event.tga differ
diff --git a/indra/newview/skins/default/textures/map_event_adult.tga b/indra/newview/skins/default/textures/map_event_adult.tga
index c344fb1e78..f548126e5a 100644
Binary files a/indra/newview/skins/default/textures/map_event_adult.tga and b/indra/newview/skins/default/textures/map_event_adult.tga differ
diff --git a/indra/newview/skins/default/textures/map_event_mature.tga b/indra/newview/skins/default/textures/map_event_mature.tga
index 61c879bc92..71067c0dfd 100644
Binary files a/indra/newview/skins/default/textures/map_event_mature.tga and b/indra/newview/skins/default/textures/map_event_mature.tga differ
diff --git a/indra/newview/skins/default/textures/map_home.tga b/indra/newview/skins/default/textures/map_home.tga
index 7478de371a..acaaa3db44 100644
Binary files a/indra/newview/skins/default/textures/map_home.tga and b/indra/newview/skins/default/textures/map_home.tga differ
diff --git a/indra/newview/skins/default/textures/map_infohub.tga b/indra/newview/skins/default/textures/map_infohub.tga
index d0134fa5fe..545b8e532c 100644
Binary files a/indra/newview/skins/default/textures/map_infohub.tga and b/indra/newview/skins/default/textures/map_infohub.tga differ
diff --git a/indra/newview/skins/default/textures/map_telehub.tga b/indra/newview/skins/default/textures/map_telehub.tga
index ef63a3eb72..545b8e532c 100644
Binary files a/indra/newview/skins/default/textures/map_telehub.tga and b/indra/newview/skins/default/textures/map_telehub.tga differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index f4a239be62..5e2105206d 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -1,19 +1,19 @@
 <!--
 This file contains metadata about how to load, display, and scale textures for rendering in the UI.
-Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer 
+Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer
 to them by filename (relative to textures directory).
-NOTE: if you want to reuse an image file with different metadata, simply create a new texture entry 
+NOTE: if you want to reuse an image file with different metadata, simply create a new texture entry
 with the same filename but different name
 
 <texture
   name="MyTexture" (mandatory)
     - this is the name you reference the texture by in XUI.  For example, <button image_unselected="MyTexture"/>
   file_name="images/my_texture.png" (optional)
-    - this is the path to the actual file asset, relative to the current skins "textures" directory.  
-      If not supplied, the filename will be taken from the texture name itself, "MyTexture" in this case.  
+    - this is the path to the actual file asset, relative to the current skins "textures" directory.
+      If not supplied, the filename will be taken from the texture name itself, "MyTexture" in this case.
       NOTE: you need to provide an extension on the filename (".png", ".tga", ".jpg") for us to decode the image properly
   preload="true" (optional, false by default)
-    - If true, we will attempt to load the image before displaying any UI.  
+    - If true, we will attempt to load the image before displaying any UI.
       If false, we will load in the background after initializing the UI.
   use_mips="true" (currently unused)
   scale.left="1"
@@ -23,8 +23,8 @@ with the same filename but different name
     - Specifies the segmentation for 9-slice image scaling.  Specifically, the pixel offsets from the LOWER LEFT corner
       that define the region of the image that is stretched to make the whole image fit in the required space.
       In this example, if the source image is 32x16 pixels, we have defined a center region that starts one pixel up
-      and to the right from the bottom left corner and extends to 31 pixels right and 15 pixels up from the bottom left 
-      corner.  The end result is that the image will keep a 1 pixel border all around while stretching to fit the required 
+      and to the right from the bottom left corner and extends to 31 pixels right and 15 pixels up from the bottom left
+      corner.  The end result is that the image will keep a 1 pixel border all around while stretching to fit the required
       region.
 -->
 
@@ -707,7 +707,6 @@ with the same filename but different name
   <texture name="icon_groupnotice.tga" />
   <texture name="icon_groupnoticeinventory.tga" />
   <texture name="icon_place.tga" />
-  <texture name="icon_place_for_sale.tga" />
   <texture name="icon_popular.tga" />
   <texture name="icon_top_pick.tga" />
 
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index c60cc163c8..c0eca91a46 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -4,7 +4,7 @@
  can_resize="true"
  center_horiz="true"
  center_vert="true"
- height="600"
+ height="535"
  layout="topleft"
  min_height="520"
  min_width="520"
@@ -17,389 +17,493 @@
  width="800">
     <panel
      filename="panel_world_map.xml"
-     follows="left|top|right|bottom"
-     height="565"
+     follows="all"
+     height="500"
      layout="topleft"
-     left="15"
+     left="10"
      name="objects_mapview"
      top="25"
      width="542" />
-    <icon
-     follows="top|right"
-     height="16"
-     image_name="map_avatar_16.tga"
-     layout="topleft"
-     left="-230"
-     mouse_opaque="true"
-     name="self"
-     top="34"
-     width="16" />
+     <panel
+     name="layout_panel_1"
+     height="22"
+     width="238"
+     follows="right|top"
+     top="25"
+     left_pad="5"
+  background_visible="true"
+  bg_alpha_color="DkGray2">
     <text
+     text_color="White"
+     font="SansSerifLarge"
      type="string"
      length="1"
      follows="top|right"
+     halign="left"
      height="16"
      layout="topleft"
-     left_pad="4"
-     name="you_label"
-     top_delta="0"
-     width="145">
-        You
+     left="15"
+     name="events_label"
+     top="3"
+     width="215">
+        Legend
     </text>
-    <icon
-     follows="top|right"
-     height="16"
-     image_name="map_home.tga"
+    </panel>
+<panel
+ follows="right|top"
+  height="126"
+  top_pad="0"
+  width="238">
+<button
+     follows="right|top"
+     height="22"
+     image_overlay="map_avatar_16.tga"
+     scale_image="true"
+     left="4"
      layout="topleft"
-     left_delta="50"
-     mouse_opaque="true"
-     name="home"
-     top_delta="0"
-     width="16" />
-    <text
+     name="Show My Location"
+     tool_tip="Center map on your avatar&apos;s location"
+     top="6"
+     width="24" >
+		<button.commit_callback
+		function="WMap.ShowAgent" />
+    </button>
+          <text
      type="string"
      length="1"
      follows="top|right"
-     height="16"
+     halign="left"
+     height="13"
+     top_delta="6"
+     left_pad="5"
      layout="topleft"
-     left_pad="4"
-     name="home_label"
-     top_delta="0"
-     width="145">
-        Home
+     name="person_label"
+     width="90">
+        Me
     </text>
-    <icon
-     color="0.5 0.25 1 1"
+    <check_box
+     control_name="MapShowPeople"
      follows="top|right"
      height="16"
-     image_name="legend.tga"
      layout="topleft"
-     left="-230"
+     left="3"
+     name="people_chk"
+     top_pad="9"
+     width="22" />
+    <icon
+     color="0 1 0 1"
+     follows="top|right"
+     height="8"
+     image_name="map_avatar_8.tga"
+     layout="topleft"
+     left_pad="3"
      mouse_opaque="true"
-     name="square2"
-     top="54"
-     width="16" />
-    <text
+     name="person"
+     top_delta="3"
+     width="8" />
+      <text
      type="string"
      length="1"
      follows="top|right"
+     halign="left"
      height="16"
+     top_delta="-2"
+     left_pad="7"
      layout="topleft"
-     left_pad="4"
-     name="auction_label"
-     top_delta="0"
-     width="145">
-        Auction
+     name="person_label"
+     width="90">
+        Person
     </text>
-    <icon
-     color="1 1 0.25 1"
+    <check_box
+     control_name="MapShowInfohubs"
      follows="top|right"
      height="16"
-     image_name="legend.tga"
      layout="topleft"
-     left_delta="50"
+     left="3"
+     name="infohub_chk"
+     top_pad="3"
+     width="22" />
+         <icon
+     follows="top|right"
+     height="16"
+     image_name="map_infohub.tga"
+     layout="topleft"
+     left_pad="0"
      mouse_opaque="true"
-     name="square"
+     name="infohub"
      top_delta="0"
      width="16" />
-    <text
+ <text
      type="string"
      length="1"
      follows="top|right"
+     halign="left"
      height="16"
+     top_delta="2"
+     left_pad="3"
      layout="topleft"
-     left_pad="4"
-     name="land_for_sale_label"
-     top_delta="0"
-     width="145">
-        Land For Sale
+     name="infohub_label"
+     width="90">
+        Infohub
     </text>
-    <button
+    <check_box
+     control_name="MapShowLandForSale"
      follows="top|right"
-     font="SansSerifSmall"
      height="16"
-     label="Go Home"
-     label_selected="Go Home"
      layout="topleft"
-     left="-90"
-     name="Go Home"
-     tool_tip="Teleport to your home"
-     top="34"
-     width="88" >
-		<button.commit_callback
-		function="WMap.GoHome" />
-	</button>
+     left="3"
+     name="land_for_sale_chk"
+     top_pad="2"
+     width="22" />
     <icon
-     color="0 1 0 1"
      follows="top|right"
-     height="8"
-     image_name="map_avatar_8.tga"
+     height="16"
+     image_name="icon_for_sale.tga"
      layout="topleft"
-     left="-226"
      mouse_opaque="true"
-     name="person"
-     top="84"
-     width="8" />
-    <check_box
-     control_name="MapShowPeople"
+     name="landforsale"
+     top_delta="0"
+     left_pad="0"
+     width="16" />
+         <text
+     type="string"
+     length="1"
      follows="top|right"
+     halign="left"
      height="16"
-     label="Resident"
+     top_delta="2"
+     left_pad="3"
      layout="topleft"
-     left_pad="8"
-     name="people_chk"
-     top_delta="-4"
-     width="110" />
+     name="land_sale_label"
+     width="90">
+        Land Sale
+    </text>
     <icon
+     color="1 1 0.25 1"
      follows="top|right"
      height="16"
-     image_name="map_infohub.tga"
+     image_name="legend.tga"
      layout="topleft"
-     left="-230"
      mouse_opaque="true"
-     name="infohub"
-     top="100"
+     name="square2"
+     left="41"
+     top_pad="-2"
      width="16" />
-    <check_box
-     control_name="MapShowInfohubs"
+    <text
+     type="string"
+     length="1"
      follows="top|right"
      height="16"
-     label="Infohub"
      layout="topleft"
-     left_pad="4"
-     name="infohub_chk"
-     top_delta="0"
-     width="110" />
-    <icon
+     left_pad="0"
+     name="auction_label"
+     top_delta="3"
+     width="100">
+       by owner
+    </text>
+        <icon
+     color="0.5 0.25 1 1"
      follows="top|right"
      height="16"
-     image_name="map_telehub.tga"
+     image_name="legend.tga"
      layout="topleft"
-     left="-230"
      mouse_opaque="true"
-     name="telehub"
-     top="120"
+     name="square2"
+     left="41"
+     top_pad="-3"
      width="16" />
-    <check_box
-     control_name="MapShowTelehubs"
+    <text
+     type="string"
+     length="1"
      follows="top|right"
      height="16"
-     label="Telehub"
      layout="topleft"
-     left_pad="4"
-     name="telehub_chk"
-     top_delta="0"
-     width="110" />
-    <icon
+     left_pad="0"
+     name="auction_label"
+     top_delta="3"
+     width="170">
+        land auction
+    </text>
+
+    <button
      follows="top|right"
-     height="16"
-     image_name="icon_for_sale.tga"
+     height="22"
+     image_overlay="map_home.tga"
+     scale_image="true"
+     label_color="White"
      layout="topleft"
-     left="-230"
-     mouse_opaque="true"
-     name="landforsale"
-     top="140"
-     width="16" />
-    <check_box
-     control_name="MapShowLandForSale"
+     left="136"
+     top="6"
+     name="Go Home"
+     tool_tip="Teleport home"
+     width="24" >
+		<button.commit_callback
+		function="WMap.GoHome" />
+        </button>
+             <text
+     type="string"
+     length="1"
      follows="top|right"
-     height="16"
-     label="Land for Sale"
+     halign="left"
+     height="13"
+     top_delta="6"
+     left_pad="5"
      layout="topleft"
-     left_pad="4"
-     name="land_for_sale_chk"
-     top_delta="0"
-     width="110" />
+     name="Home_label"
+     width="70">
+        Home
+    </text>
     <text
      type="string"
      length="1"
      follows="top|right"
+     halign="left"
      height="16"
      layout="topleft"
-     left="-104"
+     left="137"
      name="events_label"
-     top="80"
-     width="145">
+     top_pad="9"
+     width="66">
         Events:
     </text>
-    <icon
+
+    <check_box
+     control_name="MapShowEvents"
+     follows="top|right"
+     height="16"
+     layout="topleft"
+     left="135"
+     top_pad="1"
+     name="event_chk"
+     width="22" />
+         <icon
      follows="top|right"
      height="16"
      image_name="map_event.tga"
      layout="topleft"
-     left="-92"
      mouse_opaque="true"
      name="event"
-     top="100"
+     left_pad="0"
      width="16" />
+      <text
+     type="string"
+     length="1"
+     follows="top|right"
+     halign="left"
+     height="16"
+     top_delta="2"
+     left_pad="3"
+     layout="topleft"
+     name="pg_label"
+     width="60">
+        PG
+    </text>
+
     <check_box
-     control_name="MapShowEvents"
+     control_name="ShowMatureEvents"
      follows="top|right"
      height="16"
-     label="PG"
+     initial_value="true"
      layout="topleft"
-     left_pad="4"
-     name="event_chk"
-     top_delta="0"
-     width="55" />
+     left="135"
+     name="event_mature_chk"
+     top_pad="3"
+     width="22" />
     <icon
      follows="top|right"
      height="16"
      image_name="map_event_mature.tga"
      layout="topleft"
-     left="-92"
      mouse_opaque="true"
      name="events_mature_icon"
-     top="120"
+     top_delta="0"
+     left_pad="0"
      width="16" />
+           <text
+     type="string"
+     length="1"
+     follows="top|right"
+     halign="left"
+     height="16"
+     top_delta="2"
+     left_pad="3"
+     layout="topleft"
+     name="mature_label"
+     width="66">
+        Mature
+    </text>
+
     <check_box
-     control_name="ShowMatureEvents"
+     control_name="ShowAdultEvents"
      follows="top|right"
      height="16"
-     initial_value="true"
-     label="Mature"
      layout="topleft"
-     left_pad="4"
-     name="event_mature_chk"
-     top_delta="0"
-     width="55" />
+     left="135"
+     name="event_adult_chk"
+     top_pad="3"
+     width="22" />
     <icon
      follows="top|right"
      height="16"
      image_name="map_event_adult.tga"
      layout="topleft"
-     left="-92"
+     left_pad="0"
      mouse_opaque="true"
      name="events_adult_icon"
-     top="140"
+     top_delta="0"
      width="16" />
-    <check_box
-     control_name="ShowAdultEvents"
+                <text
+     type="string"
+     length="1"
      follows="top|right"
+     halign="left"
      height="16"
-     label="Adult"
+     top_delta="2"
+     left_pad="3"
      layout="topleft"
-     left_pad="4"
-     name="event_adult_chk"
-     top_delta="0"
-     width="55" />
-    <icon
+     name="pg_label"
+     width="66">
+        Adult
+    </text>
+</panel>
+
+
+  <panel
+   follows="right|top"
+  height="22"
+  top_pad="0"
+  width="238"
+  background_visible="true"
+  bg_alpha_color="DkGray2">
+    <text
+     text_color="White"
+     font="SansSerifLarge"
+     type="string"
+     length="1"
+     follows="top|right"
+     halign="left"
+     height="16"
+     layout="topleft"
+     left="15"
+     name="find_on_map_label"
+     top="3"
+     width="215">
+        Find on Map
+    </text>
+  </panel>
+
+    <panel
+ follows="right|top|bottom"
+  height="270"
+  top_pad="0"
+  width="238">
+      <icon
      color="0.5 0 0 1"
      follows="top|right"
      height="16"
      image_name="map_track_16.tga"
      layout="topleft"
-     left="-230"
+     left="5"
+     top="11"
      mouse_opaque="true"
-     name="avatar_icon"
-     top="164"
+     name="friends_icon"
      width="16" />
     <combo_box
      allow_text_entry="true"
      follows="top|right"
-     height="20"
+     height="23"
      label="Online Friends"
      layout="topleft"
-     left_pad="4"
+     top_delta="-4"
+     left_pad="5"
      max_chars="60"
      name="friend combo"
-     tool_tip="Friend to show on map"
-     top_delta="-4"
-     width="202">
+     tool_tip="Show friends on map"
+     width="182">
         <combo_box.item
-         label="Online Friends"
+         label="My Friends Online"
          name="item1"
          value="None" />
 		<combo_box.commit_callback
 		function="WMap.AvatarCombo"/>
     </combo_box>
-    <icon
+   <icon
      color="0.5 0 0 1"
      follows="top|right"
      height="16"
      image_name="map_track_16.tga"
      layout="topleft"
-     left="-230"
+     left="5"
+     top_pad="8"
      mouse_opaque="true"
      name="landmark_icon"
-     top="189"
      width="16" />
     <combo_box
      allow_text_entry="true"
      follows="top|right"
-     height="20"
-     label="Landmarks"
+     height="23"
+     label="My Landmarks"
      layout="topleft"
-     left_pad="4"
+     top_delta="-3"
+     left_pad="5"
      max_chars="64"
      name="landmark combo"
      tool_tip="Landmark to show on map"
-     top_delta="-4"
-     width="202">
+     width="182">
         <combo_box.item
-         label="Landmarks"
+         label="My Landmarks"
          name="item1"
          value="None" />
 		<combo_box.commit_callback
 		function="WMap.Landmark"/>
     </combo_box>
-    <icon
+       <icon
      color="0.5 0 0 1"
      follows="top|right"
      height="16"
      image_name="map_track_16.tga"
      layout="topleft"
-     left="-230"
+     left="5"
+     top_pad="7"
      mouse_opaque="true"
-     name="location_icon"
-     top="214"
+     name="region_icon"
      width="16" />
-    <line_editor
+    <search_editor
      follows="top|right"
-     height="20"
-     label="Search by Region Name"
+  search_button_visible="false"
+     height="22"
+  text_readonly_color="DkGray"
+     label="Regions by Name"
      layout="topleft"
-     left_pad="4"
+     top_delta="-2"
+     left_pad="5"
      name="location"
      select_on_focus="true"
      tool_tip="Type the name of a region"
-     top_delta="-4"
-     width="140" />
-    <button
+     width="152" />
+   <button
      follows="top|right"
-     height="20"
-     label="Search"
+     height="23"
+     label="Find"
      layout="topleft"
-     left_pad="5"
+     left_pad="2"
+     top_delta="-1"
      name="DoSearch"
      tool_tip="Search for region"
-     top_delta="0"
-     width="60">
+     width="58">
 		<button.commit_callback
 		function="WMap.Location" />
-	</button>
-    <text
-     type="string"
-     length="1"
-     follows="top|right"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="-230"
-     name="search_label"
-     top="234"
-     width="222">
-        Search Results:
-    </text>
+    </button>
     <scroll_list
      draw_stripes="false"
-     follows="top|right|bottom"
-     height="200"
+     bg_writeable_color="MouseGray"
+     follows="all"
+     height="115"
      layout="topleft"
-     left_delta="0"
+     left="28"
      name="search_results"
-     top_pad="10"
-     width="222"
+     top_pad="5"
+     width="209"
      sort_column="1">
         <scroll_list.columns
          label=""
@@ -408,35 +512,87 @@
         <scroll_list.columns
          label=""
          name="sim_name"
-         width="206" />
+         width="193" />
 		<scroll_list.commit_callback
 		function="WMap.SearchResult" />
     </scroll_list>
-    <text
+    <button
+     follows="right|bottom"
+     height="23"
+     label="Teleport"
+     layout="topleft"
+     left="25"
+     name="Teleport"
+     tool_tip="Teleport to selected location"
+     top_pad="7"
+     width="104">
+		<button.commit_callback
+		function="WMap.Teleport" />
+    </button>
+    <button
+     follows="right|bottom"
+     height="23"
+     label="Copy SLurl"
+     layout="topleft"
+     left_pad="5"
+     name="copy_slurl"
+     tool_tip="Copies current location as SLurl to be used on the web."
+     top_delta="0"
+     width="104">
+		<button.commit_callback
+		function="WMap.CopySLURL" />
+    </button>
+   <!-- <button
+     follows="right|bottom"
+     height="23"
+     label="Clear"
+     layout="topleft"
+     left="10"
+     name="Clear"
+     tool_tip="Stop tracking"
+     top_pad="5"
+     width="105">
+		<button.commit_callback
+		function="WMap.Clear" />
+    </button>-->
+    <button
+     enabled="false"
+     follows="right|bottom"
+     height="23"
+     label="Show Selection"
+     left="25"
+     top_pad="5"
+     name="Show Destination"
+     tool_tip="Center map on selected location"
+     width="213">
+		<button.commit_callback
+		function="WMap.ShowTarget" />
+    </button>
+
+<!-- <text
      type="string"
      length="1"
      follows="bottom|right"
-     font="SansSerif"
+     halign="left"
      height="16"
-     layout="topleft"
-     left_delta="0"
-     name="location_label"
      top_pad="4"
-     width="98">
+     left="25"
+     layout="topleft"
+     name="land_sale_label"
+     width="250">
         Location:
     </text>
-    <spinner
+      <spinner
      decimal_digits="0"
      follows="bottom|right"
-     height="16"
      increment="1"
      initial_value="128"
      layout="topleft"
-     left_delta="70"
+     top_pad="0"
+     left="25"
      max_val="255"
      name="spin x"
      tool_tip="X coordinate of location to show on map"
-     top_delta="0"
      width="48">
 		<spinner.commit_callback
 		function="WMap.CommitLocation" />
@@ -460,7 +616,6 @@
     <spinner
      decimal_digits="0"
      follows="bottom|right"
-     height="16"
      increment="1"
      initial_value="0"
      layout="topleft"
@@ -472,89 +627,58 @@
      width="48">
 		<spinner.commit_callback
 		function="WMap.CommitLocation" />
-    </spinner>
-    <button
-     follows="right|bottom"
-     height="20"
-     label="Teleport"
-     label_selected="Teleport"
-     layout="topleft"
-     left="-230"
-     name="Teleport"
-     tool_tip="Teleport to selected location"
-     top="494"
-     width="90">
-		<button.commit_callback
-		function="WMap.Teleport" />
-    </button>
-    <button
-     follows="right|bottom"
-     height="20"
-     label="Show Destination"
-     label_selected="Show Destination"
-     layout="topleft"
-     left_pad="10"
-     name="Show Destination"
-     tool_tip="Center map on selected location"
-     top_delta="0"
-     width="125">
-		<button.commit_callback
-		function="WMap.ShowTarget" />
-    </button>
-    <button
-     follows="right|bottom"
-     height="20"
-     label="Clear"
-     label_selected="Clear"
-     layout="topleft"
-     left="-230"
-     name="Clear"
-     tool_tip="Stop tracking"
-     top="518"
-     width="90">
-		<button.commit_callback
-		function="WMap.Clear" />
-    </button>
-    <button
-     follows="right|bottom"
-     height="20"
-     label="Show My Location"
-     label_selected="Show My Location"
+    </spinner>-->
+    </panel>
+      <panel
+    follows="right|bottom"
+  height="22"
+  top_pad="0"
+  width="238"
+  background_visible="true"
+  bg_alpha_color="DkGray2">
+    <text
+     text_color="White"
+     font="SansSerifLarge"
+     type="string"
+     length="1"
+     follows="top|right"
+     halign="left"
+     height="16"
      layout="topleft"
-     left_pad="10"
-     name="Show My Location"
-     tool_tip="Center map on your avatar&apos;s location"
-     top_delta="0"
-     width="125" >
-		<button.commit_callback
-		function="WMap.ShowAgent" />
-    </button>
-    <button
-     enabled="false"
-     follows="bottom|right"
-     height="20"
-     label="Copy SLurl to clipboard"
+     left="15"
+     name="zoom_label"
+     top="3"
+     width="210">
+        Zoom
+    </text>
+  </panel>
+    <panel
+ follows="right|bottom"
+  height="30"
+  min_height="30"
+  top_pad="0"
+  width="238">
+  <icon
+     follows="left|bottom"
+     height="16"
+     image_name="Zoom_Off"
      layout="topleft"
-     left="-230"
-     name="copy_slurl"
-     tool_tip="Copies current location as SLurl to be used on the web."
-     top="542"
-     width="222">
-		<button.commit_callback
-		function="WMap.CopySLURL" />
-    </button>
+     left="20"
+     mouse_opaque="true"
+     name="zoom_icon"
+     top_pad="7"
+     width="16" />
     <slider
-     follows="right|bottom"
+     follows="left|bottom"
      height="16"
      increment="0.2"
-     initial_value="48.5029"
-     label="Zoom"
+     initial_value="-2"
+     left_pad="0"
      layout="topleft"
-     left_delta="0"
      max_val="0"
      min_val="-8"
      name="zoom slider"
      show_text="false"
-     top_pad="8"
-     width="222" />
+     width="200" />
+     </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
deleted file mode 100644
index bffd84877f..0000000000
--- a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="true"
- follows="top|left"
- height="360"
- label="Region"
- layout="topleft"
- left="0"
- name="General"
- top="360"
- width="280">
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="region_text_lbl"
-     top="10"
-     width="100">
-        Region:
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="50"
-     name="region_text"
-     top_delta="0"
-     width="200">
-        unknown
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="version_channel_text_lbl"
-     top="30"
-     width="100">
-        Version:
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="50"
-     name="version_channel_text"
-     top_delta="0"
-     width="200">
-        unknown
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="region_type_lbl"
-     top="50"
-     width="100">
-        Type:
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="50"
-     name="region_type"
-     top_delta="0"
-     width="200">
-        unknown
-    </text>
-    <check_box
-     height="20"
-     label="Block Terraform"
-     layout="topleft"
-     left="10"
-     name="block_terraform_check"
-     top="70"
-     width="80" />
-    <check_box
-     height="20"
-     label="Block Fly"
-     layout="topleft"
-     left="10"
-     name="block_fly_check"
-     top="90"
-     width="80" />
-    <check_box
-     height="20"
-     label="Allow Damage"
-     layout="topleft"
-     left="10"
-     name="allow_damage_check"
-     top="110"
-     width="80" />
-    <check_box
-     height="20"
-     label="Restrict Pushing"
-     layout="topleft"
-     left="10"
-     name="restrict_pushobject"
-     top="130"
-     width="80" />
-    <check_box
-     height="20"
-     label="Allow Land Resell"
-     layout="topleft"
-     left="10"
-     name="allow_land_resell_check"
-     top="160"
-     width="80" />
-    <check_box
-     height="20"
-     label="Allow Land Join/Divide"
-     layout="topleft"
-     left="10"
-     name="allow_parcel_changes_check"
-     top="180"
-     width="80" />
-    <check_box
-     height="20"
-     label="Block Land Show in Search"
-     layout="topleft"
-     left="10"
-     name="block_parcel_search_check"
-     tool_tip="Let people see this region and its parcels in search results"
-     top="200"
-     width="80" />
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="1"
-     label="Agent Limit"
-     label_width="97"
-     layout="topleft"
-     left="10"
-     max_val="100"
-     min_val="1"
-     name="agent_limit_spin"
-     top="240"
-     width="170" />
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="Object Bonus"
-     label_width="97"
-     layout="topleft"
-     left="10"
-     max_val="10"
-     min_val="1"
-     name="object_bonus_spin"
-     top="260"
-     width="170" />
-    <text
-     follows="left|top"
-     height="20"
-     label="Maturity"
-     layout="topleft"
-     left="10"
-     name="access_text"
-     top="290"
-     width="100">
-        Rating:
-    </text>
-    <combo_box
-     height="20"
-     label="Mature"
-     layout="topleft"
-     left_delta="100"
-     name="access_combo"
-     top_delta="0"
-     width="85">
-        <combo_box.item
-         label="Adult"
-         name="Adult"
-         value="42" />
-        <combo_box.item
-         label="Mature"
-         name="Mature"
-         value="21" />
-        <combo_box.item
-         label="PG"
-         name="PG"
-         value="13" />
-    </combo_box> 
-    <button
-     enabled="false"
-     follows="left|top"
-     height="20"
-     label="Apply"
-     layout="topleft"
-     left="108"
-     name="apply_btn"
-     top="320"
-     width="100"/>
-   <button
-     follows="left|top"
-     height="20"
-     label="Teleport Home One User..."
-     layout="topleft"
-     left="10"
-     name="kick_btn"
-     top_pad="10"
-     width="250" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Teleport Home All Users..."
-     layout="topleft"
-     left_delta="0"
-     name="kick_all_btn"
-     top_pad="3"
-     width="250" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Send Message To Region..."
-     layout="topleft"
-     left_delta="0"
-     name="im_btn"
-     top_pad="20"
-     width="200" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Manage Telehub..."
-     layout="topleft"
-     left_delta="0"
-     name="manage_telehub_btn"
-     top_pad="20"
-     width="150" >
-		<button.commit_callback
-         function="RegionInfo.ManageTelehub" />
-    </button> 
-</panel>
-- 
cgit v1.2.3


From 855a02554f0181227ac20633b2fcc6af3958e444 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Mon, 30 Nov 2009 16:37:02 +0800
Subject: trivial xml formating changes

---
 .../skins/default/xui/en/floater_nearby_chat.xml   |  4 +-
 .../skins/default/xui/en/panel_chat_item.xml       | 85 +++++++++++++---------
 indra/newview/skins/default/xui/en/panel_toast.xml | 44 +++++------
 3 files changed, 74 insertions(+), 59 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index d8534bfe0b..e2230d82ea 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -22,10 +22,10 @@
              bg_readonly_color="ChatHistoryBgColor"
              bg_writeable_color="ChatHistoryBgColor"
              follows="all"
-	    left="1"
+			 left="1"
              top="20"
              layout="topleft"
-	    height="280"
+			 height="280"
              name="chat_history"
              parse_highlights="true"
              text_color="ChatHistoryTextColor"
diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
index 2b29796f0a..ce4e4701b6 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml
@@ -6,14 +6,14 @@
   height="180"
   follows="all">
 	<panel
-	width="290"
-	height="24"
-	background_visible="true"
-	background_opaque="false"
-	bg_alpha_color="Black"
-	left="5"
-	name="msg_caption">
-             <avatar_icon
+	 width="290"
+	 height="24"
+	 background_visible="true"
+	 background_opaque="false"
+	 bg_alpha_color="Black"
+	 left="5"
+	 name="msg_caption">
+		<avatar_icon
          follows="left"
          height="18"
          image_name="Generic_Person"
@@ -24,37 +24,52 @@
          top="3"
          width="18" />
     	<text
-                font.style="BOLD"
-                height="12"
-	    layout="topleft"
-	    left_pad="5"
-	    top="7"
-		text_color="white"
-		word_wrap="false"
-		use_ellipses="true"
-        	mouse_opaque="true"
-		name="sender_name"
-        	width="150">
+		 font.style="BOLD"
+		 height="12"
+	     layout="topleft"
+	     left_pad="5"
+	     top="7"
+		 text_color="white"
+		 word_wrap="false"
+		 use_ellipses="true"
+		 mouse_opaque="true"
+		 name="sender_name"
+		 width="150">
 	      Jerry Knight
     	</text>
-   <!-- 	<icon top="22" left="215" width="15" height="15" follows="top|right"
-      		image_name="icn_voice-pvtfocus.tga" visible="false" name="msg_inspector" />-->
-    	<!--<icon top="22" left="215" width="10" height="10" follows="top|right"
-      		image_name="speaking_indicator.tga"	name="msg_icon"/>-->
+<!-- 	<icon 
+		 top="22" 
+		 left="215" 
+		 width="15" 
+		 height="15" 
+		 follows="top|right"
+		 image_name="icn_voice-pvtfocus.tga" 
+		 visible="false" 
+		 name="msg_inspector" />
+-->
+<!--    <icon 
+         top="22" 
+		 left="215" 
+		 width="10" 
+		 height="10" 
+		 follows="top|right"
+		 image_name="speaking_indicator.tga"	
+		 name="msg_icon"/>
+-->
 	 <text
-            font="SansSerifSmall"
-         follows="right|top"
-	 halign="right"
-         height="13"
-         layout="topleft"
-         right="-10"
-	 left="205"
-	 mouse_opaque="true"
+	  font="SansSerifSmall"
+	  follows="right|top"
+	  halign="right"
+	  height="13"
+	  layout="topleft"
+	  right="-10"
+	  left="205"
+	  mouse_opaque="true"
       name="msg_time"
-        top="8"
-         value="23:30"
-         width="50"
-	 word_wrap="true" />
+	  top="8"
+	  value="23:30"
+	  width="50"
+	  word_wrap="true" />
 	</panel>
 	<text_chat
       top="-35"
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 4293051dbd..6479fc91ca 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -5,28 +5,28 @@
 
 <floater
  legacy_header_height="18"
-	name="toast"
-	title=""
-  visible="false"
-  layout="topleft"
-  height="40" 
-	width="305"
-  left="0"
-  top="0"
-  follows="right|bottom"
-  bg_opaque_image="Toast_Background"
-  bg_alpha_image="Toast_Background"
-  can_minimize="false"
-  can_tear_off="false"
-  can_resize="false"
-  can_drag_on_left="false"
-  can_close="false"
-  can_dock="false"
-  border_visible = "false"
-  border_drop_shadow_visible = "false"
-  drop_shadow_visible = "false"
-  border = "false"
-  >
+ name="toast"
+ title=""
+ visible="false"
+ layout="topleft"
+ height="40"  
+ width="305"
+ left="0"
+ top="0"
+ follows="right|bottom"
+ bg_opaque_image="Toast_Background"
+ bg_alpha_image="Toast_Background"
+ can_minimize="false"
+ can_tear_off="false"
+ can_resize="false"
+ can_drag_on_left="false"
+ can_close="false"
+ can_dock="false"
+ border_visible = "false"
+ border_drop_shadow_visible = "false"
+ drop_shadow_visible = "false"
+ border = "false"
+>
   <!-- Don't remove this wiget! It is needed for Overflow and Start-Up toasts!-->
   <text
     clip_partial="true" 
-- 
cgit v1.2.3


From 12cb41912110a423d9005df7377c4d9e34a84e51 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Mon, 30 Nov 2009 18:36:33 +0800
Subject: EXT-1881 [BSI] Log (Nearby Chat) floater should turn semi-transparent
 when it loses focus.

---
 .../skins/default/xui/en/floater_nearby_chat.xml   |  7 ++++
 .../skins/default/xui/en/widgets/floater.xml       | 45 +++++++++++-----------
 2 files changed, 30 insertions(+), 22 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index e2230d82ea..d0632940b6 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
+ border_visible = "false"
+ border_drop_shadow_visible = "false"
+ drop_shadow_visible = "false"
+ border = "false"
+ bg_opaque_image="Inspector_Background"
+ bg_alpha_image="Toast_Background"	 
+ bg_alpha_color="0 0 0 0"
  legacy_header_height="18"
  can_minimize="false"
  can_tear_off="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 2263866471..1425258b2a 100644
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- See also settings.xml UIFloater* settings for configuration -->
-<floater name="floater"
-         bg_opaque_color="FloaterFocusBackgroundColor"
-         bg_alpha_color="FloaterDefaultBackgroundColor"
-         bg_opaque_image="Window_Foreground" 
-         bg_alpha_image="Window_Background" 
-         background_visible="true"
-         background_opaque="false"
-         header_height="25"
-  close_image="Icon_Close_Foreground"
-  restore_image="Icon_Restore_Foreground"
-  minimize_image="Icon_Minimize_Foreground"
-  tear_off_image="tearoffbox.tga"
-  dock_image="Icon_Dock_Foreground"
-  undock_image="Icon_Undock_Foreground"
-  help_image="Icon_Help_Foreground"
-  close_pressed_image="Icon_Close_Press"
-  restore_pressed_image="Icon_Restore_Press"
-  minimize_pressed_image="Icon_Minimize_Press"
-  tear_off_pressed_image="tearoff_pressed.tga"
-  dock_pressed_image="Icon_Dock_Press"
-  undock_pressed_image="Icon_Undock_Press"
-  help_pressed_image="Icon_Help_Press"
+<floater 
+ name="floater"
+ bg_opaque_color="FloaterFocusBackgroundColor"
+ bg_alpha_color="FloaterDefaultBackgroundColor"
+ bg_opaque_image="Window_Foreground" 
+ bg_alpha_image="Window_Background" 
+ background_visible="true"
+ background_opaque="false"
+ header_height="25"
+ close_image="Icon_Close_Foreground"
+ restore_image="Icon_Restore_Foreground"
+ minimize_image="Icon_Minimize_Foreground"
+ tear_off_image="tearoffbox.tga"
+ dock_image="Icon_Dock_Foreground"
+ undock_image="Icon_Undock_Foreground"
+ help_image="Icon_Help_Foreground"
+ close_pressed_image="Icon_Close_Press"
+ restore_pressed_image="Icon_Restore_Press"
+ minimize_pressed_image="Icon_Minimize_Press"
+ tear_off_pressed_image="tearoff_pressed.tga"
+ dock_pressed_image="Icon_Dock_Press"
+ undock_pressed_image="Icon_Undock_Press"
+ help_pressed_image="Icon_Help_Press"
   />
-- 
cgit v1.2.3


From a8796e17bbbd41b6b7b930e42d684ca9acbffe35 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Tue, 1 Dec 2009 16:21:08 +0800
Subject: EXT-2854 Replace instances in the viewer with the final search
 maturity names

---
 indra/newview/skins/default/xui/en/floater_about_land.xml        | 8 ++++----
 indra/newview/skins/default/xui/en/floater_world_map.xml         | 2 +-
 indra/newview/skins/default/xui/en/notifications.xml             | 6 +++---
 indra/newview/skins/default/xui/en/panel_edit_classified.xml     | 4 ++--
 indra/newview/skins/default/xui/en/panel_group_general.xml       | 6 +++---
 indra/newview/skins/default/xui/en/panel_preferences_general.xml | 6 +++---
 indra/newview/skins/default/xui/en/panel_region_general.xml      | 4 ++--
 indra/newview/skins/default/xui/en/strings.xml                   | 4 ++--
 8 files changed, 20 insertions(+), 20 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 8bfd64b3df..6706ef0c8b 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1177,19 +1177,19 @@ Only large parcels can be listed in search.
             </panel.string>
             <panel.string
              name="mature_check_mature">
-                Mature Content
+                Moderate Content
             </panel.string>
             <panel.string
              name="mature_check_adult">
-                Adult Content
+                Explicit Content
             </panel.string>
             <panel.string
              name="mature_check_mature_tooltip">
-                Your parcel information or content is considered mature.
+                Your parcel information or content is considered moderate.
             </panel.string>
             <panel.string
              name="mature_check_adult_tooltip">
-                Your parcel information or content is considered adult.
+                Your parcel information or content is considered explicit.
             </panel.string>
             <panel.string
              name="landing_point_none">
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index e3db0972ec..cb87c9a94d 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -256,7 +256,7 @@
      follows="top|right"
      height="16"
      initial_value="true"
-     label="Mature"
+     label="Moderate"
      layout="topleft"
      left_pad="4"
      name="event_mature_chk"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6e178ad570..cf4b486561 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3486,7 +3486,7 @@ Publish this classified now for L$[AMOUNT]?
    icon="alertmodal.tga"
    name="SetClassifiedMature"
    type="alertmodal">
-Does this classified contain Mature content?
+Does this classified contain Moderate content?
     <usetemplate
      canceltext="Cancel"
      name="yesnocancelbuttons"
@@ -3498,7 +3498,7 @@ Does this classified contain Mature content?
    icon="alertmodal.tga"
    name="SetGroupMature"
    type="alertmodal">
-Does this group contain Mature content?
+Does this group contain Moderate content?
     <usetemplate
      canceltext="Cancel"
      name="yesnocancelbuttons"
@@ -4574,7 +4574,7 @@ Some terms in your search query were excluded due to content restrictions as cla
    icon="notifytip.tga"
    name="NoContentToSearch"
    type="notifytip">
-Please select at least one type of content to search (PG, Mature, or Adult).
+Please select at least one type of content to search (General, Moderate, or Adult).
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index 2f3277804f..b5760e977f 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -189,12 +189,12 @@
          <combo_item 
           name="mature_ci" 
           value="Mature">
-           Mature Content
+           Moderate Content
          </combo_item>
          <combo_item 
           name="pg_ci" 
           value="PG">
-           PG Content
+           General Content
          </combo_item>
         </combo_box>
         <spinner
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 4c30db4034..06c187991f 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -156,15 +156,15 @@ Hover your mouse over the options for more help.
          layout="topleft"
          left_delta="0"
          name="group_mature_check"
-         tool_tip="Sets whether your group information is considered mature"
+         tool_tip="Sets whether your group information is considered moderate"
          top_pad="2"
          width="190">
             <combo_box.item
-             label="PG Content"
+             label="General Content"
              name="pg"
              value="Not Mature" />
              <combo_box.item
-             label="Mature Content"
+             label="Moderate Content"
              name="mature"
              value="Mature" />
         </combo_box>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 6bb937e3c6..ee9bfbae93 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -143,15 +143,15 @@
      top_pad="-10"
      width="170">
         <combo_box.item
-         label="PG, Mature and Adult"
+         label="General, Moderate, Adult"
          name="Desired_Adult"
          value="42" />
         <combo_box.item
-         label="PG and Mature"
+         label="General and Moderate"
          name="Desired_Mature"
          value="21" />
         <combo_box.item
-         label="PG"
+         label="General"
          name="Desired_PG"
          value="13" />
     </combo_box>
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 42c6319699..1f22689313 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -182,11 +182,11 @@
          name="Adult"
          value="42" />
         <combo_box.item
-         label="Mature"
+         label="Moderate"
          name="Mature"
          value="21" />
         <combo_box.item
-         label="PG"
+         label="General"
          name="PG"
          value="13" />
     </combo_box>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3c03f0a8cf..d44bdee947 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -269,8 +269,8 @@
 	<string name="ControlYourCamera">Control your camera</string>
 
 	<!-- Sim Access labels -->
-	<string name="SIM_ACCESS_PG">PG</string>
-	<string name="SIM_ACCESS_MATURE">Mature</string>
+	<string name="SIM_ACCESS_PG">General</string>
+	<string name="SIM_ACCESS_MATURE">Moderate</string>
 	<string name="SIM_ACCESS_ADULT">Adult</string>
 	<string name="SIM_ACCESS_DOWN">Offline</string>
 	<string name="SIM_ACCESS_MIN">Unknown</string>
-- 
cgit v1.2.3


From c4d6442ef4b6d547521d1d70ecf37bf99ad86373 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Tue, 1 Dec 2009 18:02:24 +0800
Subject:   EXT-2927 [BSI] profile text and partner text overwrite after
 selecting I button on a user

---
 .../skins/default/xui/en/inspect_avatar.xml        | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index dd3cf079db..e6f384dccd 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -19,7 +19,7 @@
   <!-- Allowed fields include:
 	[BORN_ON] ("12/3/2008")
 	[SL_PROFILE] (Second Life profile),
-  [RW_PROFILE] (real world profile),
+    [RW_PROFILE] (real world profile),
 	[ACCTTYPE] ("Resident"),
 	[PAYMENTINFO] ("Payment Info on File"),
 	[AGE] ("1 year 2 months")
@@ -32,10 +32,11 @@
      name="Details">
 [SL_PROFILE]
     </string>
-  <string
+<!--  <string
      name="Partner">
     Partner: [PARTNER]
-  </string>
+  </string>   
+-->
   <text
      follows="all"
      font="SansSerifLarge"
@@ -52,21 +53,21 @@
      height="16"
      left="8"
      name="user_subtitle"
-   font="SansSerifSmall"
-   text_color="White"
+     font="SansSerifSmall"
+     text_color="White"
      value="11 Months, 3 days old"
      width="175"
      use_ellipses="true" />
      <text
      follows="all"
-   height="25"
-   left="8"
+     height="35"
+     left="8"
      name="user_details"
      word_wrap="true"
      top_pad="6"
      width="220">This is my second life description and I really think it is great.
     </text>
-    <text
+<!--<text
      follows="all"
      height="13"
      left="8"
@@ -76,7 +77,8 @@
      use_ellipses="true"
      word_wrap="false">
     Erica Linden
-  </text>
+    </text> 
+-->
     <slider
      follows="top|left"
      height="23"
@@ -113,8 +115,9 @@
      name="avatar_icon"
      top="10"
      width="38" />
-  <!-- Overlapping buttons for default actions
-    llinspectavatar.cpp makes visible the most likely default action -->
+<!-- Overlapping buttons for default actions
+    llinspectavatar.cpp makes visible the most likely default action 
+-->
     <button
      follows="bottom|left"
      height="20"
@@ -131,9 +134,8 @@
      top_delta="0"
      name="im_btn"
      width="80"
-     commit_callback.function="InspectAvatar.IM"
-     />
-          <button
+     commit_callback.function="InspectAvatar.IM"/>
+	<button
      follows="top|left"
      height="20"
      label="More"
@@ -153,7 +155,7 @@
      right="-5"
      top_delta="0"
      width="35" />
-         <menu_button
+	<menu_button
      follows="top|left"
      height="20"
      image_overlay="OptionsMenu_Off"
-- 
cgit v1.2.3


From dee48496166e44f0e9b13a6c0b348d3409ddf0e5 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 1 Dec 2009 11:26:43 -0800
Subject: EXT-2635 	 No message reminding user that a restart is required
 to reset cache (was Clear Cache) EXT-2652 	 Favorites bar drop-down
 button (for when favorites exceed width of viewer) is not configurable via
 XUI EXT-2227 	 [BSI] Preferences -> Setup -> Cache Location blank EXT-1036 
  Clicking menu separators selects wrong menu option (allows selection of
 greyed-out option) reviewed by James

---
 .../skins/default/xui/en/panel_navigation_bar.xml  | 29 ++++++++++++++--------
 1 file changed, 18 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index bf33b752d9..e8f1ad85f9 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -146,15 +146,22 @@
           name="search_combo_editor"/>
         </search_combo_box>
 	</panel>
-
-    <favorites_bar
-     follows="left|right|top"
-     height="15"
-     layout="topleft"
-     left="0"
-     name="favorite"
-     image_drag_indication="Arrow_Down"
-     chevron_button_tool_tip="Show more of My Favorites"
-     bottom="62"
-     width="590" />
+  <favorites_bar
+   follows="left|right|top"
+   height="15"
+   layout="topleft"
+   left="0"
+   name="favorite"
+   image_drag_indication="Arrow_Down"
+   bottom="62"
+   width="590">
+    <chevron_button name=">>"
+                     image_unselected="TabIcon_Close_Off"
+                     image_selected="TabIcon_Close_Off"
+                     tab_stop="false"
+                     follows="left|bottom" 
+                     tool_tip="Show more of My Favorites" 
+                     width="15"
+                     height="15"/>
+  </favorites_bar>
 </panel>
-- 
cgit v1.2.3


From b3a424a7e341f875747abd47b9d0a5eda2c3d3c9 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 1 Dec 2009 13:58:01 -0800
Subject: EXT-2888 'Parcel Variable Icons' don't follow right edge of nav bar
 Needed follows flags set

---
 .../skins/default/xui/en/widgets/location_input.xml   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index ea78f6d0dd..d32952b04f 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -53,35 +53,40 @@
     name="voice_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_VoiceNo"
     />
   <fly_icon
     name="fly_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_FlyNo"
     />
   <push_icon
     name="push_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_PushNo"
     />
   <build_icon
     name="build_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_BuildNo"
     />
   <scripts_icon
     name="scripts_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_ScriptsNo"
     />
   <!-- NOTE: Placeholder icon, there is no dark grayscale version -->
@@ -89,7 +94,8 @@
     name="damage_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_Damage"
     />
   <!-- Default text color is invisible on top of nav bar background -->
@@ -98,6 +104,7 @@
 	width="35"
 	height="18"
 	top="16"
+    follows="right|top"
 	halign="right"
 	font="SansSerifSmall"
 	text_color="TextFgColor"
-- 
cgit v1.2.3


From 69ad211a003a31dbb997be53250112fea610c9fb Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Tue, 1 Dec 2009 17:20:13 -0500
Subject: Made context menus opaque to improve readability, especially in areas
 like Inventory where the menu appears in front of text.
 http://jira.secondlife.com/browse/EXT-2622

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

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

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index d53d2d896c..85cb145dbc 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -459,7 +459,7 @@
      value="0 0.5 0 1" />
     <color
      name="MenuPopupBgColor"
-	  reference="DkGray_66" />
+	  reference="DkGray2" />
     <color
      name="MultiSliderDisabledThumbColor"
      reference="Unused?" />
-- 
cgit v1.2.3


From 52a6fd6b33b500f707cccaae06427d23396429d5 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 1 Dec 2009 14:59:40 -0800
Subject: Test floater for nearby chat text clipping problem

---
 indra/newview/skins/default/xui/en/floater_aaa.xml | 81 +++++++++++++---------
 1 file changed, 49 insertions(+), 32 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index 3f86080160..6598c95c0e 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -1,36 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- height="400"
+ legacy_header_height="18"
+ can_minimize="false"
+ can_tear_off="false"
+ can_resize="true"
+ can_drag_on_left="false"
+ can_close="true"
+ can_dock="true"
+ bevel_style="in"
+ height="300"
  layout="topleft"
- name="floater_aaa"
- can_resize="true" 
- width="500">
-  <string name="bump_parabuild">1</string>
-  <text
- bottom="390"
- left="10"
- name="right_aligned_text"
- width="300"
- halign="right"
- top_pad="10">
-    Right aligned text
-  </text>
-  <text
- bottom="390"
- left="10"
- name="centered_text"
- width="300"
- halign="center"
- top_pad="10">
-    Centered text
-  </text>
-  <text
- left="10"
- name="left_aligned_text"
- width="300"
- halign="left"
- top_pad="10">
-    Left aligned text
-  </text>
-
+ name="Test Floater"
+ save_rect="true"
+ title="TEST FLOATER"
+ save_dock_state="true"
+ save_visibility="true"
+ single_instance="true"
+ width="320">
+  <chat_history
+   allow_html="true"
+   bg_readonly_color="ChatHistoryBgColor"
+   bg_writeable_color="ChatHistoryBgColor"
+   border_visible="true" 
+   follows="all"
+   font="SansSerif" 
+	    left="1"
+   top="20"
+   layout="topleft"
+	    height="260"
+   name="chat_history"
+   parse_highlights="true"
+   text_color="ChatHistoryTextColor"
+   text_readonly_color="ChatHistoryTextColor"
+   width="320">
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+Really long line that is long enough to wrap once with jyg descenders.
+  </chat_history>
 </floater>
-- 
cgit v1.2.3


From 126c6feed5d335690c50da4d2ffff8b6cc5cdc0c Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Tue, 1 Dec 2009 16:47:52 -0800
Subject: preserve a prior helpful tool_tip in 2.0 for the Build > Texture >
 'Align' button

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index a9b4c1b938..e3851de8e7 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2746,6 +2746,7 @@ even though the user gets a free copy.
 			 left="10"
 			 name="button align"
 			 top_pad="5"
+			 tool_tip="Align media texture (must load first)"
 			 width="100" />
 		</panel>
 	   </panel>
-- 
cgit v1.2.3


From 3d3f2fa4be8b28041b46983010547fb804ff8144 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Wed, 2 Dec 2009 14:25:18 +0000
Subject: DEV-43439: Initial web-based Home side tray panel

Moved LLSideTrayInfoPanel from llsidetray.cpp into its own
llpanelhome.{cpp|h} module.

Updated the XUI for the Home tab to simply embed a web view.
Thanks to Erica for the initial cut at this XUI.
---
 .../default/xui/en/panel_sidetray_home_tab.xml     | 279 ++-------------------
 1 file changed, 24 insertions(+), 255 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 9839075862..e04a07b177 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -1,265 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- Part of side tray, see that XML file for panel config -->
+<!-- the web-based Home panel of the side tray -->
 <panel
  follows="all"
- height="560"
+ height="570"
+ min_height="350"
  label="home_tab"
  layout="topleft"
+ top="0"
+ left="0"
  name="home_tab"
  width="333">
-  <scroll_container
-   color="DkGray"
-   follows="all"
-   layout="topleft"
-   left="0"
-   name="profile_scroll"
-   opaque="true"
-   height="560"
-   width="333"
-   top="0">
   <panel
-   background_visible="true"
-   height="560"
+   class="panel_sidetray_home"
+   follows="all"
+   height="550"
    layout="topleft"
-   name="profile_scroll_panel"
-   top="0"
-   left="0"
-   width="311">
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     class="panel_sidetray_home_info"
-     follows="left|top|right"
-     height="90"
-     layout="topleft"
-     left="15"
-     top="17"
-     name="sidebar_people"
-     width="303">
-        <text
-         follows="left|right|top"
-         font="SansSerifBigBold"
-         height="30"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_name"
-         text_color="EmphasisColor"
-         top="10"
-         value="People"
-         width="200"
-         word_wrap="true" />
-        <icon
-         follows="top|right"
-         height="20"
-         layout="topleft"
-         name="tab_icon"
-         right="-10"
-         top="10"
-         image_name="TabIcon_People_Selected"
-         width="20" />
-        <text
-         follows="left|right|bottom"
-         height="90"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_description"
-         right="-10"
-         text_color="white"
-         top="40"
-         word_wrap="true">
-            Find your friends, your groups, contacts and people nearby.
-        </text>
-    </panel>
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     class="panel_sidetray_home_info"
-     follows="left|top|right"
-     height="90"
-     layout="topleft"
-     left="15"
-     top_pad="15"
-     name="sidebar_places"
-     width="303">
-        <text
-         follows="left|right|top"
-         font="SansSerifBigBold"
-         height="30"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_name"
-         text_color="EmphasisColor"
-         top="10"
-         value="Places"
-         width="200"
-         word_wrap="true" />
-        <icon
-         follows="top|right"
-         height="20"
-         layout="topleft"
-         name="tab_icon"
-         right="-10"
-         top="10"
-         width="20"
-         image_name="TabIcon_Places_Selected"/>
-        <text
-         follows="all"
-         height="90"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_description"
-         right="-10"
-         text_color="white"
-         top="40"
-         word_wrap="true">
-            Find places to go and places you&apos;ve visited before.
-        </text>
-    </panel>
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     class="panel_sidetray_home_info"
-     follows="left|top|right"
-     height="90"
-     layout="topleft"
-     left="15"
-     top_pad="15"
-     name="sidebar_me"
-     width="303">
-        <text
-         follows="left|right|top"
-         font="SansSerifBigBold"
-         height="30"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_name"
-         text_color="EmphasisColor"
-         top="10"
-         value="My Profile"
-         width="200"
-         word_wrap="true" />
-        <icon
-         follows="top|right"
-         height="20"
-         layout="topleft"
-         name="tab_icon"
-         right="-10"
-         top="10"
-         width="20"
-         image_name="TabIcon_Me_Selected"/>
-        <text
-         follows="all"
-         height="90"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_description"
-         right="-10"
-         text_color="white"
-         top="40"
-         word_wrap="true">
-            Edit your public profile.
-        </text>
-    </panel>
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     class="panel_sidetray_home_info"
-     follows="left|top|right"
-     height="90"
-     layout="topleft"
-     left="15"
-     top_pad="15"
-     name="sidebar_appearance"
-     width="303">
-        <text
-         follows="left|right|top"
-         font="SansSerifBigBold"
-         height="30"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_name"
-         text_color="EmphasisColor"
-         top="10"
-         value="My Appearance"
-         width="200"
-         word_wrap="true" />
-        <icon
-         follows="top|right"
-         height="20"
-         layout="topleft"
-         name="tab_icon"
-         right="-10"
-         top="10"
-         width="20"
-         image_name="TabIcon_Appearance_Selected"/>
-        <text
-         follows="all"
-         height="90"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_description"
-         right="-10"
-         text_color="white"
-         top="40"
-         word_wrap="true">
-            Change your appearance and current look.
-        </text>
-    </panel>
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     class="panel_sidetray_home_info"
-     follows="left|top|right"
-     height="90"
-     layout="topleft"
-     left="15"
-     top_pad="15"
-     name="sidebar_inventory"
-     width="303">
-        <text
-         follows="left|right|top"
-         font="SansSerifBigBold"
-         height="30"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_name"
-         text_color="EmphasisColor"
-         top="10"
-         value="My Inventory"
-         width="200"
-         word_wrap="true" />
-        <icon
-         follows="top|right"
-         height="20"
-         layout="topleft"
-         name="tab_icon"
-         right="-10"
-         top="10"
-         width="20"
-         image_name="TabIcon_Things_Selected"/>
-        <text
-         follows="all"
-         height="90"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="tab_description"
-         right="-10"
-         text_color="white"
-         top="40"
-         word_wrap="true">
-            Browse your inventory.
-        </text>
-    </panel>
-  </panel>
-  </scroll_container>
+   left="10"
+   help_topic="sidetray_home"
+   name="sidetray_home"
+   top_pad="10"
+   width="313">
+     <web_browser
+      border_visible="false"
+      follows="all"
+      height="550"
+      layout="topleft"
+      left="0"
+      name="sidetray_home_browser"
+      start_url="about:blank"
+      top="0"
+      width="313" />
+   </panel>
 </panel>
-- 
cgit v1.2.3


From a6b9765d6237f6a251eb875d38164b53c0eb2bd2 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Wed, 2 Dec 2009 16:52:19 +0000
Subject: DEV-43439: Initial implementation of web-based Home panel.

The home panel now displays a web page - hardcoded to secondlife.com
until we have something more relevant to display.
---
 indra/newview/skins/default/xui/en/floater_help_browser.xml    | 1 +
 indra/newview/skins/default/xui/en/floater_search.xml          | 1 +
 indra/newview/skins/default/xui/en/panel_side_tray.xml         | 1 +
 indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml | 5 ++---
 4 files changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
index f50ff01230..55a6179afb 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -43,6 +43,7 @@
              left="0"
              name="browser"
              top="0"
+             start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22%3E%3C/body%3E%3C/html%3E"
              width="570" />
             <button
              follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index d9498586af..d363452204 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -47,6 +47,7 @@
              left="0"
              name="browser"
              top="0"
+             start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22%3E%3C/body%3E%3C/html%3E"
              width="570" />
             <text
              follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 95242a9639..63b7112c17 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -23,6 +23,7 @@
     background_visible="true"
   >
       <panel
+        class="panel_sidetray_home"
         name="panel_home"
         filename="panel_sidetray_home_tab.xml"
         label="home"
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index e04a07b177..4fe1e08bf0 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -11,7 +11,6 @@
  name="home_tab"
  width="333">
   <panel
-   class="panel_sidetray_home"
    follows="all"
    height="550"
    layout="topleft"
@@ -26,8 +25,8 @@
       height="550"
       layout="topleft"
       left="0"
-      name="sidetray_home_browser"
-      start_url="about:blank"
+      name="browser"
+      start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22 text=%22eeeeee%22%3E %3Ch3%3E %0D%0A%0D%0ALoading... %3C/h3%3E %3C/body%3E%3C/html%3E"
       top="0"
       width="313" />
    </panel>
-- 
cgit v1.2.3


From 1f1261b8cadb15664ad0ceec9fe5088402a8ee1c Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Wed, 2 Dec 2009 11:45:33 -0800
Subject: EXT-3064 New layout for Login page, wider default window size

---
 indra/newview/skins/default/textures/textures.xml  |  10 +-
 indra/newview/skins/default/xui/en/panel_login.xml | 187 ++++++++++-----------
 2 files changed, 98 insertions(+), 99 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 14ce08e260..607b33fbb1 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -53,9 +53,6 @@ with the same filename but different name
   <texture name="Arrow_Left" file_name="widgets/Arrow_Left.png" preload="true" />
   <texture name="Arrow_Right" file_name="widgets/Arrow_Right.png" preload="true" />
 
-  <texture name="Arrow_Up" file_name="widgets/Arrow_Up.png" preload="true" />
-  <texture name="Arrow_Down" file_name="widgets/Arrow_Down.png" preload="true" />
-
   <texture name="Arrow_Small_Up" file_name="widgets/Arrow_Small_Up.png" preload="true" />
   <texture name="Arrow_Small_Left" file_name="widgets/Arrow_Small_Left.png" preload="true" />
   <texture name="Arrow_Small_Right" file_name="widgets/Arrow_Small_Right.png" preload="true" />
@@ -143,7 +140,6 @@ with the same filename but different name
   <texture name="DropDown_Over" file_name="widgets/DropDown_Over.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="DropDown_Press" file_name="widgets/DropDown_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="DropDown_Selected" file_name="widgets/DropDown_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
-  <texture name="DropDown_On" file_name="widgets/DropDown_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="DropDown_Off" file_name="widgets/DropDown_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
 
   <texture name="DropTarget" file_name="widgets/DropTarget.png" preload="false" />
@@ -404,9 +400,12 @@ with the same filename but different name
   <texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="10" scale.right="48" scale.bottom="2" />
   <texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" />
 
+  <texture name="PushButton_Disabled" file_name="widgets/PushButton_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Off" file_name="widgets/PushButton_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_On" file_name="widgets/PushButton_On.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_On_Selected" file_name="widgets/PushButton_On_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_On_Disabled" file_name="widgets/PushButton_On_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Press" file_name="widgets/PushButton_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
-  <texture name="PushButton_Disabled" file_name="widgets/PushButton_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Selected" file_name="widgets/PushButton_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Selected_Press" file_name="widgets/PushButton_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Selected_Disabled" file_name="widgets/PushButton_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
@@ -730,6 +729,7 @@ with the same filename but different name
   <texture name="icon_groupnotice.tga" />
   <texture name="icon_groupnoticeinventory.tga" />
   <texture name="icon_place.tga" />
+  <texture name="icon_place_for_sale.tga" />
   <texture name="icon_popular.tga" />
   <texture name="icon_top_pick.tga" />
 
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index a9a02e8fc7..d07d4ea25f 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -6,7 +6,7 @@
  left="0"
  name="panel_login"
  top="600"
- width="800">
+ width="996">
     <panel.string
      name="create_account_url">
         http://join.secondlife.com/
@@ -27,128 +27,79 @@
      border_visible="false"
      bottom="600"
      follows="all"
-	 hide_loading="true"
+     hide_loading="true"
      left="0"
      name="login_html"
      start_url=""
      top="0"
      height="600"
-     width="800"/>
+     width="996" />
     <panel
      follows="left|bottom|right"
      name="login_widgets"
      layout="topleft"
-     left="0"
-     top="0">
+     top="519"
+     width="996"
+     height="80">
     <text
      follows="left|bottom"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="16"
-     left="32"
+     left="20"
      name="first_name_text"
-     top="530"
-     width="120">
-        First Name:
+     top="20"
+     width="135">
+        Name:
     </text>
     <line_editor
      follows="left|bottom"
-     font="SansSerif"
      handle_edit_keys_directly="true"
-     height="20"
+     height="23"
+     label="First"
      left_delta="0"
      max_length="31"
      name="first_name_edit"
      select_on_focus="true"
      tool_tip="[SECOND_LIFE] First Name"
-     top_pad="2"
-     width="120" />
-    <text
-     follows="left|bottom"
-     font="SansSerif"
-     height="16"
-     left="164"
-     name="last_name_text"
-     top="530"
-     width="120">
-        Last Name:
-    </text>
+     top_pad="0"
+     width="135" />
     <line_editor
      follows="left|bottom"
-     font="SansSerif"
      handle_edit_keys_directly="true"
-     height="20"
-     left_delta="0"
+     height="23"
+     label="Last"
+     left_pad="8"
      max_length="31"
      name="last_name_edit"
      select_on_focus="true"
      tool_tip="[SECOND_LIFE] Last Name"
-     top_pad="2"
-     width="120" />
-    <text
-     follows="left|bottom"
-     font="SansSerif"
-     height="16"
-     left="296"
-     name="password_text"
-     top="530"
-     width="120">
-        Password:
-    </text>
-    <line_editor
-     follows="left|bottom"
-     font="SansSerif"
-     handle_edit_keys_directly="true"
-     height="20"
-     left_delta="0"
-     max_length="16"
-     name="password_edit"
-     select_on_focus="true"
-     top_pad="2"
-     width="120" />
-     <button
-     follows="left|bottom"
-     height="23"
-     label="Log In"
-     label_selected="Log In"
-     layout="topleft"
-     left="425"
-     name="connect_btn"
-     top="546"
-     width="100" />
-    <combo_box
-     allow_text_entry="true"
-     follows="left|bottom"
-     height="23"
-     layout="topleft"
-     left_pad="5"
-     name="server_combo"
-     width="100" />
+     top_delta="0"
+     width="135" />
     <text
      follows="left|bottom"
-     font="SansSerif"
-     height="16"
-     left="32"
+     font="SansSerifSmall"
+     height="15"
+     left_pad="8"
      name="start_location_text"
-     top="576"
-     width="95">
-        Start location:
+     top="20"
+     width="135">
+        Starting location:
     </text>
     <combo_box
      allow_text_entry="true"
      control_name="LoginLocation"
      follows="left|bottom"
      height="23"
-     left_pad="0"
      max_chars="128"
+     top_pad="0"
      name="start_location_combo"
-     top_delta="-2"
-     width="155">
+     width="135">
         <combo_box.item
-         label="My Last Location"
+         label="My last location"
          name="MyLastLocation"
          value="last" />
         <combo_box.item
-         label="My Home"
+         label="My home"
          name="MyHome"
          value="home" />
         <combo_box.item
@@ -156,43 +107,91 @@
          name="Typeregionname"
          value="" />
     </combo_box>
+      <combo_box
+     allow_text_entry="true"
+     font="SansSerifSmall"
+     follows="left|bottom"
+     height="23"
+     layout="topleft"
+     top="60"
+     name="server_combo"
+     width="135"
+     visible="false" />
+     <text
+     follows="left|bottom"
+     font="SansSerifSmall"
+     height="15"
+     left_pad="3"
+     name="password_text"
+     top="20"
+     width="135">
+        Password:
+    </text>
+    <line_editor
+     follows="left|bottom"
+     handle_edit_keys_directly="true"
+     height="23"
+     left_delta="0"
+     max_length="16"
+     name="password_edit"
+     select_on_focus="true"
+     top_pad="0"
+     width="135" />
     <check_box
      control_name="RememberPassword"
      follows="left|bottom"
+     font="SansSerifSmall"
      height="16"
-     label="Remember password"
-     left_pad="10"
+     label="Remember"
+     left_pad="5"
      name="remember_check"
-     top_delta="3"
-     width="138" />
+     top_delta="5"
+     width="90" />
+     <button
+     follows="left|bottom"
+     height="23"
+     image_unselected="PushButton_On"
+     image_selected="PushButton_On_Selected"
+     label="Log In"
+     label_color="White"
+     layout="topleft"
+     left_pad="20"
+     name="connect_btn"
+     top="35"
+     width="90" />
     <text
      follows="right|bottom"
+     font="SansSerifSmall"
+     text_color="EmphasisColor"
      halign="right"
      height="16"
-     left="-210"
+     top="17"
+     left_pad="10"
+     right="-10"
      name="create_new_account_text"
-     top="539"
-     width="200">
-        Create a new account
+     width="180">
+        Sign up for account
     </text>
     <text
      follows="right|bottom"
+     font="SansSerifSmall"
+     text_color="EmphasisColor"
      halign="right"
      height="16"
-     left_delta="0"
      name="forgot_password_text"
-     top_pad="4"
-     width="200">
+     top_pad="2"
+     width="180">
         Forgot your name or password?
     </text>
     <text
      follows="right|bottom"
+     font="SansSerifSmall"
      halign="right"
-     height="16"
-     left="-310"
+     height="28"
+     top_pad="2"
      name="channel_text"
-     top="579"
-     width="300">
+     width="180"
+     word_wrap="true">
         [VERSION]
     </text>
   </panel>
-- 
cgit v1.2.3


From d491050c553ad2fa20f1ecadc37077fba3962b10 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Wed, 2 Dec 2009 21:18:59 +0000
Subject: DEV-43439: Added navigation buttons to the Home side panel.

Added Back, Forward, and Home buttons to the web view for the Home
side panel. Still more work to do here, but the basic functionality
is there; albeit hardcoded to secondlife.com.

I notice that you can click Back on the first page. Seems to be an
issue for the general media browser too. I'll file a JIRA for that.
---
 .../default/xui/en/panel_sidetray_home_tab.xml     | 87 ++++++++++++++++++----
 1 file changed, 73 insertions(+), 14 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 4fe1e08bf0..4b841b0a09 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -5,29 +5,88 @@
  height="570"
  min_height="350"
  label="home_tab"
+ help_topic="sidetray_home"
  layout="topleft"
  top="0"
  left="0"
  name="home_tab"
  width="333">
-  <panel
+  <layout_stack
    follows="all"
    height="550"
    layout="topleft"
    left="10"
-   help_topic="sidetray_home"
-   name="sidetray_home"
+   name="stack"
    top_pad="10"
    width="313">
-     <web_browser
-      border_visible="false"
-      follows="all"
-      height="550"
-      layout="topleft"
-      left="0"
-      name="browser"
-      start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22 text=%22eeeeee%22%3E %3Ch3%3E %0D%0A%0D%0ALoading... %3C/h3%3E %3C/body%3E%3C/html%3E"
-      top="0"
-      width="313" />
-   </panel>
+    <layout_panel
+     auto_resize="false"
+     height="20"
+     layout="topleft"
+     left="0"
+     name="nav_controls"
+     top="0"
+     user_resize="false"
+     width="313">
+      <button
+       follows="left|top"
+       enabled="false"
+       height="20"
+       label="Back"
+       layout="topleft"
+       tab_stop="false"
+       left="0"
+       name="back"
+       top="0"
+       width="70">
+        <button.commit_callback
+         function="MediaBrowser.Back" />
+      </button>
+      <button
+       follows="left|top"
+       height="20"
+       enabled="false"
+       label="Forward"
+       layout="topleft"
+       tab_stop="false"
+       left_pad="3"
+       name="forward"
+       top_delta="0"
+       width="70">
+        <button.commit_callback
+         function="MediaBrowser.Forward" />
+      </button>
+      <button
+       follows="left|top"
+       height="20"
+       label="Home"
+       layout="topleft"
+       tab_stop="false"
+       left_pad="2"
+       name="home"
+       top_delta="0"
+       width="70">
+        <button.commit_callback
+         function="MediaBrowser.Home" />
+      </button>
+    </layout_panel>
+    <layout_panel
+     height="530"
+     layout="topleft"
+     left_delta="0"
+     name="browser_layout"
+     top_delta="0"
+     width="313">
+      <web_browser
+       border_visible="false"
+       follows="all"
+       height="530"
+       layout="topleft"
+       left="0"
+       name="browser"
+       start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22 text=%22eeeeee%22%3E %3Ch3%3E %0D%0A%0D%0ALoading... %3C/h3%3E %3C/body%3E%3C/html%3E"
+       top="0"
+       width="313" />
+    </layout_panel>
+  </layout_stack>
 </panel>
-- 
cgit v1.2.3


From c8fd78466155760d34bec75f415d4879f565663c Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Wed, 2 Dec 2009 14:57:32 -0800
Subject: DEV-43687 commit translations - Dutch(NL) set3 This adds new, raw
 translations to the viewer; they will not yet be formatted to fit cleanly to
 the user.

---
 .../newview/skins/default/xui/nl/role_actions.xml  | 76 ++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/nl/role_actions.xml

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

diff --git a/indra/newview/skins/default/xui/nl/role_actions.xml b/indra/newview/skins/default/xui/nl/role_actions.xml
new file mode 100644
index 0000000000..1f0a6e4235
--- /dev/null
+++ b/indra/newview/skins/default/xui/nl/role_actions.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<role_actions>
+	<action_set description="Deze Mogelijkheden regelen het toevoegen en verwijderen van Groepsleden, en om aan te geven dat nieuwe Leden lid kunnen worden zonder uitnodiging." name="Membership">
+		<action description="Personen uitnodigen voor deze Groep" longdescription="Personen uitnodigen voor deze Groep door de 'Uitnodigen Nieuwe Leden...' knop in de leden &amp; Rollen tab &gt; Leden sub-tab." name="member invite"/>
+		<action description="Leden uit deze Groep zetten" longdescription="Leden uit deze Groep zetten door de 'Uit Groep Zetten' knop in de leden tab &amp; Rollen tab &gt; Leden sub-tab. Een Eigenaar kan iedereen uit de groep zetten behalve een andere Eigenaar. Als je geen Eigenaar bent, kan een Lid worden uitgezet als, en alleen als, het Lid deel uitmaakt van de Iedereen Rol, en NIET van andere Rollen. Om Leden uit Rollen te verwijderen, moet je de 'Leden uit Rollen Verwijderen' mogelijkheid hebben." name="member eject"/>
+		<action description="Selecteer 'Vrije Toegang' en wijzig 'Contibutie Bijdrage'" longdescription="Selecteer 'Vrije Toegang' zodat nieuwe Leden lid kunnen worden zonder uitnodiging, en wijzig 'Contributie Bijdrage' in de Groep Voorkeuren sectie van de Algemene tab." name="member options"/>
+	</action_set>
+	<action_set description="Deze Mogelijkheden regelen het toevoegen, verwijderen, en wijzigen van Groepsrollen, toevoegen en verwijderen van Leden in Rollen, en toewijzen van Mogelijkheden aan Rollen." name="Roles">
+		<action description="Creëren nieuwe Rollen" longdescription="Creëren nieuwe Rollen in de Leden &amp; Rollen tab &gt; Rollen sub-tab." name="role create"/>
+		<action description="Verwijderen Rollen" longdescription="Verwijderen Rollen in de Leden &amp; Rollen tab &gt; Rollen sub-tab." name="role delete"/>
+		<action description="Wijzigen Rol-naam, titel, beschrijving, en of de Rol leden publiekelijk zichtbaar zijn" longdescription="Wijzigen Rol-naam, titel, beschrijving, en of de Rol leden publiekelijk zichtbaar zijn. Dit kan worden gedaan onderaan de de Leden &amp; Rollen tab &gt; Rollen sub-tab na de selectie van een rol." name="role properties"/>
+		<action description="Toewijzen Leden aan Toewijzers Rollen" longdescription="Toewijzen Leden aan Rollen in de Toegewezen Rollen sectie van de Leden &amp; Rol tab &gt; Leden sub-tab. Een Lid met deze Mogelijkheid kan alleen Leden toevoegen aan een Rol waartoe men zelf al behoort." name="role assign member limited"/>
+		<action description="Toewijzen Leden aan Alle Rollen" longdescription="Toewijzen van Leden aan Alle Rollen in the Toegewezen Rollen sectie van de Leden &amp; Rollen tab &gt; Leden sub-tab. *WAARSCHUWING* Ieder Lid in een Rol met deze Mogelijkheid kan zichzelf--en ieder ander niet-Eigenaar Lid--toewijzen aan rollen met meer rechten dan zijzelf op dat moment hebben, hierdoor ontstaat de mogelijkheid om zichzelf bijna-Eigenaar rechten toewijzen. Wees er zeker van en controleer voordat deze Mogelijkheid wordt toegekend." name="role assign member"/>
+		<action description="Verwijderen Leden uit Rollen" longdescription="Verwijderen Leden uit Rollen in the Toegewezen Rollen sectie van de Leden &amp; Rollen tab &gt; Leden sub-tab. Eigenaars kunnen niet worcen verwijderd." name="role remove member"/>
+		<action description="Toewijzen en Verwijderen Mogelijkheden in Rollen" longdescription="Toewijzen en Verwijderen Mogelijkheden in Rollen in de Toegestane Mogelijkheden van de Leden &amp; Rollen tab &gt; Leden sub-tab. *WAARSCHUWING* Ieder Lid in een Rol met deze Mogelijkheid kan kan zichzelf--en ieder ander niet-Eigenaar Lid--toewijzen aan rollen met meer rechten dan zijzelf op dat moment hebben, hierdoor ontstaat de mogelijkheid om zichzelf bijna-Eigenaar rechten toewijzen. Wees er zeker van en controleer voordat deze Mogelijkheid wordt toegekend." name="role change actions"/>
+	</action_set>
+	<action_set description="Deze Mogelijkheden regelen het wijzigen van de Groepsidentiteit, zoals het veranderen van publieke zichtbaarheid, charter en insigne." name="Group Identity">
+		<action description="Wijzigen Charter, Insigne, en 'Toon in zoeken'" longdescription="Wijzigen Charter, Insigne, en 'Toon in zoeken'. Dit kan worden gedaan in de Algemeen tab." name="group change identity"/>
+	</action_set>
+	<action_set description="Deze Mogelijkheden regelen het overdragen, wijzigen, en verkopen van land dat in bezit is van deze groep. Om naar het Over Land venster te gaan, rechts-klik de grond selecteer 'Over Land...', of klik op de perceel info in de menubalk." name="Parcel Management">
+		<action description="Land overdragen en land kopen voor groep" longdescription="Land overdragen en land kopen voor groep. Dit kan worden gedaan in Over Land &gt; Algemeen tab." name="land deed"/>
+		<action description="Land overdragen aan Govenor Linden" longdescription="Land overdragen aan Govenor Linden. *WAARSCHUWING* Ieder Lid in een Rol met deze Mogelijkheid kan land in eigendom van de groep laten vervallen in Over Land &gt; Algemeen tab, teruggeven in Linden eigendom zonder verkoop! Wees er zeker van en controleer voordat deze Mogelijkheid wordt toegekend." name="land release"/>
+		<action description="Activeer land te koop info" longdescription="Activeer land te koop info. *WAARSCHUWING* Ieder Lid in een Rol met deze Mogelijkheid kan land in eigendom van de groep verkopen in Over Land &gt; Algemeen tab als ze dat willen! Wees er zeker van en controleer voordat deze Mogelijkheid wordt toegekend." name="land set sale info"/>
+		<action description="Opdelen en samenvoegen van percelen" longdescription="Opdelen en samenvoegen van percelen. Dit kan worden gedaan door rechts klikken op de grond, 'Terrein Bewerken, en de muis te slepen naar het land om een selectie te maken. Om te verdelen, selecteer wat je wil splitsen en klik 'Opdelen...'. Om samen te voegen, selecteer twee of meer aaneengesloten percelen en klik 'Samenvoegen...'." name="land divide join"/>
+	</action_set>
+	<action_set description="Deze Mogelijkheden regelen het veranderen van de perceelnaam en publicatie instelling, zichtbaarheid in 'Tonen in zoeken', en landingspunt &amp; TP routering." name="Parcel Identity">
+		<action description="Selecteer 'Tonen in zoeken' en instellen categorie" longdescription="Selecteer 'Tonen in zoeken' en instellen van de categorie voor een perceel in Over Land &gt; Opties tab." name="land find places"/>
+		<action description="Veranderen perceel naam, omschrijving, en 'Tonen in zoeken' instellingen" longdescription="Veranderen perceel naam, omschrijving en 'Tonen in zoeken' instellingen. Dit kan worden gedaan in Overland &gt; Opties tab." name="land change identity"/>
+		<action description="Instellen landingsplaats en instellen teleport routering" longdescription="Op een perceel in groepseigendom, Leden in een Rol met die mogelijkheid kunnen een landingsplaats instellen om te bepalen waar inkomende teleports aankomen, en ook een teleport routering instelling voor meer controle. Dit kan worden gedaan in About Land &gt; Opties tab." name="land set landing point"/>
+	</action_set>
+	<action_set description="Deze Mogelijkheden regelen het aanpassen van perceel opties, zoals 'Maak Objecten', 'Bewerken Terrein', en muziek &amp; media instellingen." name="Parcel Settings">
+		<action description="Veranderen muziek &amp; media instellingen" longdescription="Veranderen streaming muziek en film instellingen in Over Land&gt; Media tab." name="land change media"/>
+		<action description="Instellen 'Bewerken Terrein'" longdescription="Instellen 'Bewerken Terrein'. *WAARSCHUWING* Over Land &gt; Opties tab &gt; Bewerken Terrein staat toe dat iedereen de vorm van het terrein kan aanpassen, en Linden planten kan plaatsen en verplaatsen. Wees er zeker van en controleer voordat deze Mogelijkheid wordt toegekend. Bewerken terrein kan worden aangezet in Over Land&gt; Opties tab." name="land edit"/>
+		<action description="Instellen diversen Over Land &gt; Optie instellingen" longdescription="Instellen 'Veilig (geen letsel)', 'Vliegen' and andere Inwoners toestaan om: 'Objecten te maken', 'Terrein te bewerken', en 'Scripts uit te voeren' op land in groepseigendom in Over Land &gt; Opties tab." name="land options"/>
+	</action_set>
+	<action_set description="Deze Mogelijkheden regelend de toestemming voor leden om beperkingen te omzeilen op percelen in groepseigendom." name="Parcel Powers">
+		<action description="'Bewerken Terrein' altijd toestaan" longdescription="Leden in een Rol met deze Mogelijkheid kunnen terrein bewerken op een perceel in groepseigendom, zelfs als de optie uitstaat in Over Land &gt; Opties tab." name="land allow edit land"/>
+		<action description="'Vliegen' altijd toestaan" longdescription="Leden in een Rol met deze Mogelijkheid kunnen vliegen op een perceel in groepseigendom, zelfs als de optie uitstaat in Over Land &gt; Opties tab." name="land allow fly"/>
+		<action description="'Maak Objecten' altijd toestaan" longdescription="Leden in een Rol met deze Mogelijkheid kunnen objecten maken op een perceel in groepseigendom, zelfs als de optie uitstaat in Over Land &gt; Opties tab." name="land allow create"/>
+		<action description="'Maak Landmarkering' altijd toestaan" longdescription="Leden in een Rol met deze Mogelijkheid kunnen een landmarkering maken op een perceel in groepseigendom, zelfs als de optie uitstaat in Over Land &gt; Opties tab." name="land allow landmark"/>
+		<action description="Toestaan 'Thuis hier Instellen' op land in groepseigendom" longdescription="Leden in een Rol met deze Mogelijkheid kunnen gebruik maken van Wereld menu &gt; Thuis hier Instellen op een perceel afgestaan aan deze groep." name="land allow set home"/>
+	</action_set>
+	<action_set description="Deze Mogelijkheden regelen het toestaan of beperken van toegang van percelen in groepseigendom, inclusief het bevriezen en verbannen van Inwoners." name="Parcel Access">
+		<action description="Beheren perceel Toegang lijsten" longdescription="Beheren perceel Toegang lijsten in Over Land &gt; Toegang tab." name="land manage allowed"/>
+		<action description="Beheren perceel Verbannen lijst" longdescription="Beheren perceel Verbannen lijst in Over Land &gt; Verbannen tab." name="land manage banned"/>
+		<action description="Veranderen perceel 'Verkoop toegangspassen...' instellingen" longdescription="Verandere perceel 'Verkoop toegangspassen...'instellingen" name="land manage passes"/>
+		<action description="Uitwerpen en bevriezen Inwoners op percelen" longdescription="Leden in een Rol met deze mogelijkheid kunnen een onwelkome Inwoners aanpakken op een perceel in groepseigendom door een rechter-klik op deze inwoner &gt; en 'Uitwerpen...'of 'Bevriezen...'te selecteren." name="land admin"/>
+	</action_set>
+	<action_set description="Deze Mogelijkheden regelen de toestemming voor leden om objecten te retourneren en Linden planten te plaatsen en te verplaatsen. Dit is nuttig voor Leden om rommel op te ruimen en landschappen te maken, echter het moet ook met omzichtigheid worden gebruikt, omdat er geen herstelfunktie is voor retourneren objecten." name="Parcel Content">
+		<action description="Retourneren objecten in groepseigendom" longdescription="Retourneren van objecten die in eigendom zijn van de groep op percelen in groepseigendom in Over Land &gt; Objecten tab." name="land return group owned"/>
+		<action description="Retourneren objecten toegewezen aan de groep" longdescriotion="Retourneren van objecten die aan de groep zijn toegewezen op percelen in groepseigendom in Over Land &gt; Objecten tab." name="land return group set"/>
+		<action description="Retourneren objecten die niet van de groep zijn" longdescription="Retourneren objecten die niet van de groep zijn op percelen in groepeigendom in Over Land &gt; Objecten tab." name="land return non group"/>
+		<action description="Landschappen maken met Linden planten" longdescription="Landschappen maken om Linden bomen, planten en grassen te plaatsen en te verplaatsen. Deze opties zijn te vinden in de inventaris Library &gt; Objects folder of ze kunnen worden gemaakt via de Bouwen knop." name="land gardening"/>
+	</action_set>
+	<action_set description="Deze Mogelijkheden regelen het afstaan, wijzigen, en verkopen van objecten in groepseigendom. Deze veranderingen worden gedaan in Bewerken Gereedschap &gt; Algemeen tab. Rechts-klik een object en selecteer Bewerken om de instellingen ervan  te bekijken." name="Object Management">
+		<action description="Overdragen objecten aan groep" longdescription="Overdragen objecten aan groep in de Bewerkings Hulpmiddelen &gt; Algemeen tab." name="object deed"/>
+		<action description="Manipuleren (verplaatsen, copieren, wijzigen) van objecten in groepseigendom" longdescription="Manipuleren (verplaatsen, copieren, wijzigen) van objecten in groepseigendom in de Bewerkings Hulpmiddelen &gt; Algemeen tab." name="object manipulate"/>
+		<action description="Te koop zetten van objecten in groepseigendom" longdescription="Te koop zetten van objecten in groepseigendom in de Bewerkings Hulpmiddelen &gt; Algemeen tab." name="object set sale"/>
+	</action_set>
+	<action_set description="Deze Mogelijkheden regelen dat Leden groepsverplichtingen betalen en groepsdividenden ontvangen, en toegang beperken tot de financiele historie van de groep." name="Accounting">
+		<action description="Betalen groepsverplichtingen en ontvangen van groepsdividenden" longdescription="Leden in een Rol met deze mogelijkheid betalen groepsverplichtingen en ontvangen groepsdividenden automatisch. Dit betekent dat ze een deel ontvangen van de verkoop van land in groepseigendom die dagelijks worden verdeeld, maar ook dat ze bijdragen aan zaken zoals lijstbijdrage voor het perceel." name="accounting accountable"/>
+	</action_set>
+	<action_set description="Deze Mogelijkheden regelen de toestemming dat Leden Groepsberichten kunnen versturen, ontvangen en inzien." name="Notices">
+		<action description="Versturen Berichten" longdescription="Leden in een Rol met deze Mogelijkheid kunnen Berichten versturen in Groep Informatie &gt; Berichten tab." name="notices send"/>
+		<action description="Ontvangen Berichten en inzien van oude Berichten" longdescription="Leden in een Rol met deze Mogelijkheid kunnen Berichten ontvangen en oude Berichten inzien in Groep Informatie &gt; Berichten tab." name="notices receive"/>
+	</action_set>
+	<action_set description="Deze Mogelijkheden regelen de toestemming dat Leden Voorstellen kunnen maken, Voorstellen kunnen inzien, en het stemverloop kunnen bekijken." name="Proposals">
+		<action description="Maken Voorstellen" longdescription="Leden in een Rol met deze Mogelijkheid kunnen Voorstellen maken waarop kan worden gestemd in Groep Informatie &gt; Voorstellen tab." name="proposal start"/>
+		<action description="Stemmen op Voorstellen" longdescription="Leden in een Rol met deze Mogelijkheid kunnen stemmen op Voorstellen in Groep Informatie &gt; Voorstellen tab." name="proposal vote"/>	
+	</action_set>
+	<action_set description="Deze Mogelijkheden regelen de toegang (en de beperking ervan) tot groep chat sessies en groep voice chat." name="Chat">
+		<action description="Deelname aan Groep Chat" longdescription="Leden in een Rol met deze Mogelijkheid kunnen deelnemen aan groep chat sessies, zowel voor tekst als voice." name="join group chat"/>
+		<action description="Deelname aan Groep Voice Chat" longdescription="Leden in een Rol met deze Mogelijkheid kunnen deelnemen aan groep voice chat sessies. OPMERKING: De Deelname Group Chat is vereist om toegang te krijgen to de voice chat sessie." name="join voice chat"/>	
+		<action description="Modereren Groep Chat" longdescription="Leden in een Rol met deze Mogelijkheid kunnen toegang en deelname controleren in groep voice en tekst chat sessies." name="moderate group chat"/>
+	</action_set>
+</role_actions>
\ No newline at end of file
-- 
cgit v1.2.3


From 9779e6f55a5cfd2846f7fba685e4143666e05d62 Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Wed, 2 Dec 2009 14:58:25 -0800
Subject: DEV-43687 commit translations - Danish(DA) set1, set2 This adds new,
 raw translations to the viewer; they will not yet be formatted to fit cleanly
 to the user.

---
 .../newview/skins/default/xui/da/floater_about.xml |  125 +-
 .../skins/default/xui/da/floater_mute_object.xml   |   26 +-
 .../skins/default/xui/da/floater_report_abuse.xml  |  206 +-
 .../newview/skins/default/xui/da/floater_stats.xml |   71 +
 .../skins/default/xui/da/menu_inventory.xml        |  148 +-
 .../skins/default/xui/da/menu_inventory_add.xml    |   32 +
 indra/newview/skins/default/xui/da/menu_picks.xml  |    8 +
 .../default/xui/da/menu_places_gear_landmark.xml   |   18 +
 .../default/xui/da/panel_block_list_sidetray.xml   |   10 +
 .../skins/default/xui/da/panel_edit_profile.xml    |    3 +-
 .../skins/default/xui/da/panel_group_roles.xml     |  282 +-
 indra/newview/skins/default/xui/da/panel_login.xml |   75 +-
 .../skins/default/xui/da/panel_main_inventory.xml  |   64 +
 .../default/xui/da/panel_preferences_advanced.xml  |   60 +-
 .../default/xui/da/panel_preferences_alerts.xml    |   34 +-
 .../default/xui/da/panel_preferences_chat.xml      |  103 +-
 .../default/xui/da/panel_preferences_sound.xml     |   78 +-
 .../skins/default/xui/da/panel_world_map.xml       |  108 +-
 indra/newview/skins/default/xui/da/strings.xml     | 3896 ++++++++++++++++----
 .../skins/default/xui/da/teleport_strings.xml      |  160 +-
 20 files changed, 4164 insertions(+), 1343 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/da/floater_stats.xml
 create mode 100644 indra/newview/skins/default/xui/da/menu_inventory_add.xml
 create mode 100644 indra/newview/skins/default/xui/da/menu_picks.xml
 create mode 100644 indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_main_inventory.xml

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

diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index f0c9c45d04..cdf1915d5e 100644
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -1,44 +1,81 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_about" title="OM [APP_NAME]">
-<tab_container name="about_tab">
-	<panel name="credits_panel">
-	<text_editor name="credits_editor">
-		Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
-
-Tak til følgende beboerne for at bidrage til at sikre, at dette er den bedste version til dato: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
-
-
-
-I get by with a little help from my friends. --Richard Starkey
-	</text_editor>
-	</panel>
-	<panel 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.
-
-Alle rettigheder forbeholdes.  Se licenses.txt for detaljer.
-
-Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-	</text_editor>
-	</panel>
-</tab_container>
-	<string name="you_are_at">
-		Du er ved [POSITION]
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_about" title="OM [APP_NAME]">
+	<floater.string name="AboutHeader">
+		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</floater.string>
+	<floater.string name="AboutCompiler">
+		Bygget med [COMPILER] version [COMPILER_VERSION]
+	</floater.string>
+	<floater.string name="AboutPosition">
+		Du er ved [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] i [REGION] lokaliseret på [HOSTNAME] ([HOSTIP])
+[SERVER_VERSION]
+[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</floater.string>
+	<floater.string name="AboutSystem">
+		CPU: [CPU]
+Memory: [MEMORY_MB] MB
+OS Version: [OS_VERSION]
+Grafik kort mærke: [GRAPHICS_CARD_VENDOR]
+Grafik kort: [GRAPHICS_CARD]
+	</floater.string>
+	<floater.string name="AboutDriver">
+		Windows Graphics Driver Version: [GRAPHICS_DRIVER_VERSION]
+	</floater.string>
+	<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]
+Vivox Version: [VIVOX_VERSION]
+	</floater.string>
+	<floater.string name="none">
+		(ingen)
+	</floater.string>
+	<floater.string name="AboutTraffic">
+		Pakker tabt: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
+	</floater.string>
+	<tab_container name="about_tab">
+		<panel label="Info" name="support_panel">
+			<button label="Kopiér til udklipsholder" name="copy_btn"/>
+		</panel>
+		<panel label="Tak til" name="credits_panel">
+			<text_editor name="credits_editor">
+				Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
+
+Tak til følgende beboerne for at bidrage til at sikre, at dette er den bedste version til dato: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
+
+
+
+I get by with a little help from my friends. --Richard Starkey
+			</text_editor>
+		</panel>
+		<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.
+
+Alle rettigheder forbeholdes.  Se licenses.txt for detaljer.
+
+Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+			</text_editor>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_mute_object.xml b/indra/newview/skins/default/xui/da/floater_mute_object.xml
index 4145918b49..edda8b44e9 100644
--- a/indra/newview/skins/default/xui/da/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/da/floater_mute_object.xml
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute by name" title="BLOKER OBJEKT VIA NAVN">
-	<text name="message">
-		Blokering via navn har ikke betydning for lyde.
-Du skal skrive det præcise navn på objektet.
-	</text>
-	<line_editor name="object_name">
-		Objekt navn
-	</line_editor>
-	<button label="OK" name="OK" />
-	<button label="Annullér" name="Cancel" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="mute by name" title="BLOKÉR OBJEKT VIA NAVN">
+	<text name="message">
+		Blokér et objekt:
+	</text>
+	<line_editor name="object_name">
+		Objekt navn
+	</line_editor>
+	<text name="note">
+		* Blokérer kun tekst fra objekt, ikke lyde
+	</text>
+	<button label="OK" name="OK"/>
+	<button label="Annullér" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_report_abuse.xml b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
index 6f1e2884eb..b249fc5654 100644
--- a/indra/newview/skins/default/xui/da/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
@@ -1,103 +1,103 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_report_abuse" title="RAPPORTÉR MISBRUG">
-	<texture_picker label="" name="screenshot"/>
-	<check_box label="Inkludér billede" name="screen_check"/>
-	<text name="reporter_title">
-		Anmelder:
-	</text>
-	<text name="reporter_field">
-		Loremipsum Dolorsitamut
-	</text>
-	<text name="sim_title">
-		Region:
-	</text>
-	<text name="sim_field">
-		Region navn
-	</text>
-	<text name="pos_title">
-		Position:
-	</text>
-	<text name="pos_field">
-		{128.1, 128.1, 15.4}
-	</text>
-	<text name="select_object_label">
-		Klik på knappen derefter objektet:
-	</text>
-	<button label="" label_selected="" name="pick_btn" tool_tip="Objekt vælger - Identificér et objekt denne rapport omhandler"/>
-	<text name="object_name_label">
-		Navn:
-	</text>
-	<text name="object_name" left_delta="64" width="140">
-		Consetetur Sadipscing
-	</text>
-	<text name="owner_name_label">
-		Ejer:
-	</text>
-	<text name="owner_name" left_delta="64">
-		Hendrerit Vulputate
-	</text>
-	<combo_box name="category_combo" tool_tip="Kategori -- Vælg en kategori der passer bedst på denne rapport">
-		<combo_box.item name="Select_category" label="Vælg kategori"/>
-		<combo_box.item name="Age__Age_play" label="Alder &gt; Falsk alder"/>
-		<combo_box.item name="Age__Adult_resident_on_Teen_Second_Life" label="Alder &gt; Voksen beboer på Teen Second Life"/>
-		<combo_box.item name="Age__Underage_resident_outside_of_Teen_Second_Life" label="Alder &gt; Mindreårig beboer udenfor Teen Second Life"/>
-		<combo_box.item name="Assault__Combat_sandbox___unsafe_area" label="Overfald &gt; Kamp sandkasse / Usikkert område"/>
-		<combo_box.item name="Assault__Safe_area" label="Overfald &gt; Sikkert område"/>
-		<combo_box.item name="Assault__Weapons_testing_sandbox" label="Overfald &gt; Sandkasse til våbentest"/>
-		<combo_box.item name="Commerce__Failure_to_deliver_product_or_service" label="Handel &gt; Vare eller ydelse ikke leveret"/>
-		<combo_box.item name="Disclosure__Real_world_information" label="Offentliggørelse &gt; Om oplysninger i den virkelige verden"/>
-		<combo_box.item name="Disclosure__Remotely_monitoring chat" label="Offentliggørelse &gt; Fjernaflytning af chat"/>
-		<combo_box.item name="Disclosure__Second_Life_information_chat_IMs" label="Offentliggørelse &gt; Information/chat/IM fra Second Life"/>
-		<combo_box.item name="Disturbing_the_peace__Unfair_use_of_region_resources" label="Forstyrrelse af fred &gt; Unfair brug af region ressourcer"/>
-		<combo_box.item name="Disturbing_the_peace__Excessive_scripted_objects" label="Forstyrrelse af fred &gt; Overdreven brug af objekter med script"/>
-		<combo_box.item name="Disturbing_the_peace__Object_littering" label="Forstyrrelse af fred &gt; Object affald"/>
-		<combo_box.item name="Disturbing_the_peace__Repetitive_spam" label="Forstyrring af fred &gt; Gentagen spam"/>
-		<combo_box.item name="Disturbing_the_peace__Unwanted_advert_spam" label="Forstyrrelse af fred &gt; Uønsket reklame spam"/>
-		<combo_box.item name="Fraud__L$" label="Bedrageri &gt; L$"/>
-		<combo_box.item name="Fraud__Land" label="Bedrageri &gt; Land"/>
-		<combo_box.item name="Fraud__Pyramid_scheme_or_chain_letter" label="Bedrageri &gt; Pyramide spil eller kædebreve"/>
-		<combo_box.item name="Fraud__US$" label="Bedrageri &gt; US$"/>
-		<combo_box.item name="Harassment__Advert_farms___visual_spam" label="Chikane &gt; reklame farm / billedeligt spam"/>
-		<combo_box.item name="Harassment__Defaming_individuals_or_groups" label="Chikane &gt; Injurier/bagvask enkeltpersoner eller grupper"/>
-		<combo_box.item name="Harassment__Impeding_movement" label="Chikane &gt; Hindre bevægelse"/>
-		<combo_box.item name="Harassment__Sexual_harassment" label="Chikane &gt; Sex chikane"/>
-		<combo_box.item name="Harassment__Solicting_inciting_others_to_violate_ToS" label="Chikane &gt; Opfordrer/kræver at andre overtræder licensbetingelser"/>
-		<combo_box.item name="Harassment__Verbal_abuse" label="Chikane &gt; Verbalt chikane"/>
-		<combo_box.item name="Indecency__Broadly_offensive_content_or_conduct" label="Uanstændighed &gt; Meget stødende indhold eller adfærd"/>
-		<combo_box.item name="Indecency__Inappropriate_avatar_name" label="Uanstændighed &gt; Upassende avatar navn"/>
-		<combo_box.item name="Indecency__Mature_content_in_PG_region" label="Usømmelighed &gt; Upassende inhold eller opførsel i en &apos;PG&apos; region"/>
-		<combo_box.item name="Indecency__Inappropriate_content_in_Mature_region" label="Usømmelighed &gt; Upassende inhold eller opførsel i en &apos;Mature&apos; region"/>
-		<combo_box.item name="Intellectual_property_infringement_Content_Removal" label="Krænkelse af intellektuelle ejendomsrettigheder &gt; Indholds fjernelse"/>
-		<combo_box.item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" label="Krænkelse af intellektuelle ejendomsrettigheder &gt; CopyBot eller omgåelse af rettighedsbeskyttelse"/>
-		<combo_box.item name="Intolerance" label="Intolerance"/>
-		<combo_box.item name="Land__Abuse_of_sandbox_resources" label="Land &gt; Misbrug af sandkasse resourcer"/>
-		<combo_box.item name="Land__Encroachment__Objects_textures" label="Land &gt; Overgreb &gt; Objekter/teksturer"/>
-		<combo_box.item name="Land__Encroachment__Particles" label="Land &gt; Overgreb &gt; Partikler"/>
-		<combo_box.item name="Land__Encroachment__Trees_plants" label="Land &gt; Overgreb &gt; Træer/planter"/>
-		<combo_box.item name="Wagering_gambling" label="Væddemål/gambling"/>
-		<combo_box.item name="Other" label="Andet"/>
-	</combo_box>
-	<text name="abuser_name_title">
-		Udøvers navn:
-	</text>
-	<button label="Vælg beboer" label_selected="" name="select_abuser" tool_tip="Vælg navnet på udøveren fra denne liste"/>
-	<check_box label="Kender ikke udøvers navn" name="omit_abuser_name" tool_tip="Afkryds her, hvis du ikke kender navn på udøvers"/>
-	<text name="abuser_name_title2">
-		Sted for misbrug/overgreb:
-	</text>
-	<text name="sum_title">
-		Opsummering:
-	</text>
-	<text name="dscr_title">
-		Detaljer:
-	</text>
-	<text name="bug_aviso">
-		Vær venligst præcis omkring dato, sted, overgrebets 
-natur, relevant chat/IM og vælg objekt hvis muligt.
-	</text>
-	<text name="incomplete_title">
-		Note: Ufuldstændige rapporter vil ikke blive undersøgt.
-	</text>
-	<button label="Annullér" label_selected="Annullér" name="cancel_btn"/>
-	<button label="Rapporter misbrug" label_selected="Rapporter misbrug" name="send_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_report_abuse" title="RAPPORTÉR MISBRUG">
+	<floater.string name="Screenshot">
+		Screenshot
+	</floater.string>
+	<check_box label="Inkludér billede" name="screen_check"/>
+	<text name="reporter_title">
+		Anmelder:
+	</text>
+	<text name="reporter_field">
+		Loremipsum Dolorsitamut Longnamez
+	</text>
+	<text name="sim_title">
+		Region:
+	</text>
+	<text name="sim_field">
+		Region navn
+	</text>
+	<text name="pos_title">
+		Position:
+	</text>
+	<text name="pos_field">
+		{128.1, 128.1, 15.4}
+	</text>
+	<text name="select_object_label">
+		Klik på knappen derefter objektet:
+	</text>
+	<button label="" label_selected="" name="pick_btn" tool_tip="Objekt vælger - Identificér et objekt denne rapport omhandler"/>
+	<text name="object_name_label">
+		Navn:
+	</text>
+	<text left_delta="64" name="object_name" width="140">
+		Consetetur Sadipscing
+	</text>
+	<text name="owner_name_label">
+		Ejer:
+	</text>
+	<text left_delta="64" name="owner_name">
+		Hendrerit Vulputate Kamawashi Longname
+	</text>
+	<combo_box name="category_combo" tool_tip="Kategori -- Vælg en kategori der passer bedst på denne rapport">
+		<combo_box.item label="Vælg kategori" name="Select_category"/>
+		<combo_box.item label="Alder &gt; Falsk alder" name="Age__Age_play"/>
+		<combo_box.item label="Alder &gt; Voksen beboer på Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life"/>
+		<combo_box.item label="Alder &gt; Mindreårig beboer udenfor Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
+		<combo_box.item label="Overfald &gt; Kamp sandkasse / Usikkert område" name="Assault__Combat_sandbox___unsafe_area"/>
+		<combo_box.item label="Overfald &gt; Sikkert område" name="Assault__Safe_area"/>
+		<combo_box.item label="Overfald &gt; Sandkasse til våbentest" name="Assault__Weapons_testing_sandbox"/>
+		<combo_box.item label="Handel &gt; Vare eller ydelse ikke leveret" name="Commerce__Failure_to_deliver_product_or_service"/>
+		<combo_box.item label="Offentliggørelse &gt; Om oplysninger i den virkelige verden" name="Disclosure__Real_world_information"/>
+		<combo_box.item label="Offentliggørelse &gt; Fjernaflytning af chat" name="Disclosure__Remotely_monitoring chat"/>
+		<combo_box.item label="Offentliggørelse &gt; Information/chat/IM fra Second Life" name="Disclosure__Second_Life_information_chat_IMs"/>
+		<combo_box.item label="Forstyrrelse af fred &gt; Unfair brug af region ressourcer" name="Disturbing_the_peace__Unfair_use_of_region_resources"/>
+		<combo_box.item label="Forstyrrelse af fred &gt; Overdreven brug af objekter med script" name="Disturbing_the_peace__Excessive_scripted_objects"/>
+		<combo_box.item label="Forstyrrelse af fred &gt; Object affald" name="Disturbing_the_peace__Object_littering"/>
+		<combo_box.item label="Forstyrring af fred &gt; Gentagen spam" name="Disturbing_the_peace__Repetitive_spam"/>
+		<combo_box.item label="Forstyrrelse af fred &gt; Uønsket reklame spam" name="Disturbing_the_peace__Unwanted_advert_spam"/>
+		<combo_box.item label="Bedrageri &gt; L$" name="Fraud__L$"/>
+		<combo_box.item label="Bedrageri &gt; Land" name="Fraud__Land"/>
+		<combo_box.item label="Bedrageri &gt; Pyramide spil eller kædebreve" name="Fraud__Pyramid_scheme_or_chain_letter"/>
+		<combo_box.item label="Bedrageri &gt; US$" name="Fraud__US$"/>
+		<combo_box.item label="Chikane &gt; reklame farm / billedeligt spam" name="Harassment__Advert_farms___visual_spam"/>
+		<combo_box.item label="Chikane &gt; Injurier/bagvask enkeltpersoner eller grupper" name="Harassment__Defaming_individuals_or_groups"/>
+		<combo_box.item label="Chikane &gt; Hindre bevægelse" name="Harassment__Impeding_movement"/>
+		<combo_box.item label="Chikane &gt; Sex chikane" name="Harassment__Sexual_harassment"/>
+		<combo_box.item label="Chikane &gt; Opfordrer/kræver at andre overtræder licensbetingelser" name="Harassment__Solicting_inciting_others_to_violate_ToS"/>
+		<combo_box.item label="Chikane &gt; Verbalt chikane" name="Harassment__Verbal_abuse"/>
+		<combo_box.item label="Uanstændighed &gt; Meget stødende indhold eller adfærd" name="Indecency__Broadly_offensive_content_or_conduct"/>
+		<combo_box.item label="Uanstændighed &gt; Upassende avatar navn" name="Indecency__Inappropriate_avatar_name"/>
+		<combo_box.item label="Usømmelighed &gt; Upassende inhold eller opførsel i en &apos;PG&apos; region" name="Indecency__Mature_content_in_PG_region"/>
+		<combo_box.item label="Usømmelighed &gt; Upassende inhold eller opførsel i en &apos;Mature&apos; region" name="Indecency__Inappropriate_content_in_Mature_region"/>
+		<combo_box.item label="Krænkelse af intellektuelle ejendomsrettigheder &gt; Indholds fjernelse" name="Intellectual_property_infringement_Content_Removal"/>
+		<combo_box.item label="Krænkelse af intellektuelle ejendomsrettigheder &gt; CopyBot eller omgåelse af rettighedsbeskyttelse" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/>
+		<combo_box.item label="Intolerance" name="Intolerance"/>
+		<combo_box.item label="Land &gt; Misbrug af sandkasse resourcer" name="Land__Abuse_of_sandbox_resources"/>
+		<combo_box.item label="Land &gt; Overgreb &gt; Objekter/teksturer" name="Land__Encroachment__Objects_textures"/>
+		<combo_box.item label="Land &gt; Overgreb &gt; Partikler" name="Land__Encroachment__Particles"/>
+		<combo_box.item label="Land &gt; Overgreb &gt; Træer/planter" name="Land__Encroachment__Trees_plants"/>
+		<combo_box.item label="Væddemål/gambling" name="Wagering_gambling"/>
+		<combo_box.item label="Andet" name="Other"/>
+	</combo_box>
+	<text name="abuser_name_title">
+		Udøvers navn:
+	</text>
+	<button label="Vælg beboer" label_selected="" name="select_abuser" tool_tip="Vælg navnet på udøveren fra denne liste"/>
+	<text name="abuser_name_title2">
+		Sted for misbrug/overgreb:
+	</text>
+	<text name="sum_title">
+		Opsummering:
+	</text>
+	<text name="dscr_title">
+		Detaljer:
+	</text>
+	<text name="bug_aviso">
+		Vær venligst så præcis som muligt
+	</text>
+	<text name="incomplete_title">
+		* Note: Ufuldstændige rapporter vil ikke blive undersøgt.
+	</text>
+	<button label="Rapporter misbrug" label_selected="Rapporter misbrug" name="send_btn"/>
+	<button label="Annullér" label_selected="Annullér" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_stats.xml b/indra/newview/skins/default/xui/da/floater_stats.xml
new file mode 100644
index 0000000000..06b795c3b9
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_stats.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Statistics" title="STATISTIK">
+	<scroll_container name="statistics_scroll">
+		<container_view name="statistics_view">
+			<stat_view label="Grundlæggende" name="basic">
+				<stat_bar label="FPS" name="fps"/>
+				<stat_bar label="Båndbredde" name="bandwidth"/>
+				<stat_bar label="Pakketab" name="packet_loss"/>
+				<stat_bar label="Ping Sim" name="ping"/>
+			</stat_view>
+			<stat_view label="Avanceret" name="advanced">
+				<stat_view label="Render" name="render">
+					<stat_bar label="KTris tegnet" name="ktrisframe"/>
+					<stat_bar label="KTris tegnet" name="ktrissec"/>
+					<stat_bar label="Total antal objekter" name="objs"/>
+					<stat_bar label="Nye objekter" name="newobjs"/>
+				</stat_view>
+				<stat_view label="Texture" name="texture">
+					<stat_bar label="Count" 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="Netværk" name="network">
+					<stat_bar label="Packets In" name="packetsinstat"/>
+					<stat_bar label="Packets Out" name="packetsoutstat"/>
+					<stat_bar label="Objekter" name="objectkbitstat"/>
+					<stat_bar label="Texture" name="texturekbitstat"/>
+					<stat_bar label="Asset" 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_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="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="Active Objects" name="simactiveobjects"/>
+					<stat_bar label="Active Scripts" name="simactivescripts"/>
+					<stat_bar label="Script Events" name="simscripteps"/>
+					<stat_bar label="Packets In" name="siminpps"/>
+					<stat_bar label="Packets Out" name="simoutpps"/>
+					<stat_bar label="Pending Downloads" name="simpendingdownloads"/>
+					<stat_bar label="Pending Uploads" name="simpendinguploads"/>
+					<stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/>
+				</stat_view>
+				<stat_view label="Time (ms)" name="simperf">
+					<stat_bar label="Total Frame Time" name="simframemsec"/>
+					<stat_bar label="Net Time" name="simnetmsec"/>
+					<stat_bar label="Physics Time" name="simsimphysicsmsec"/>
+					<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_view>
+			</stat_view>
+		</container_view>
+	</scroll_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml
index fd5ebe5c82..b24fd80607 100644
--- a/indra/newview/skins/default/xui/da/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory.xml
@@ -1,66 +1,82 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="Popup">
-	<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 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>
-	<menu 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="Teleport" name="Landmark Open" />
-	<menu_item_call label="åben" name="Animation Open" />
-	<menu_item_call label="åben" name="Sound Open" />
-	<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="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="Slet" name="Delete" />
-	<menu_item_call label="Tag ting af" name="Take Off Items" />
-	<menu_item_call label="Tilføj til påklædning" name="Add To Outfit" />
-	<menu_item_call label="Erstat påklædning" name="Replace Outfit" />
-	<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="Teleport To Landmark" />
-	<menu_item_call label="Afspil offentligt" 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="Tag af dig selv" name="Detach From Yourself" />
-	<menu_item_call label="Tilbage til sidste position" name="Restore to Last Position"/>
-	<menu_item_call label="Tag på" name="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="Tag på" name="Wearable Wear" />
-	<menu_item_call label="Tag af" name="Take Off" />
-	<menu_item_call label="--ingen valg--" name="--no options--" />
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Popup">
+	<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="Slet ting" name="Purge Item"/>
+	<menu_item_call label="Genskab ting" name="Restore Item"/>
+	<menu_item_call label="Gå til link" name="Goto Link"/>
+	<menu_item_call label="åben" name="Open"/>
+	<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="Delete"/>
+	<menu_item_call label="Tag ting af" name="Take Off Items"/>
+	<menu_item_call label="Tilføj til påklædning" name="Add To Outfit"/>
+	<menu_item_call label="Erstat påklædning" name="Replace Outfit"/>
+	<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 offentligt" 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="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="Tag på" name="Wearable Wear"/>
+	<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/default/xui/da/menu_inventory_add.xml b/indra/newview/skins/default/xui/da/menu_inventory_add.xml
new file mode 100644
index 0000000000..b2a144c9f0
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_inventory_add.xml
@@ -0,0 +1,32 @@
+<?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>
+	<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/default/xui/da/menu_picks.xml b/indra/newview/skins/default/xui/da/menu_picks.xml
new file mode 100644
index 0000000000..a47ef49ca0
--- /dev/null
+++ b/indra/newview/skins/default/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/default/xui/da/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
new file mode 100644
index 0000000000..ed00c91508
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<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="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"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
new file mode 100644
index 0000000000..d16f7535fc
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="block_list_panel">
+	<text name="title_text">
+		Blokérede avatarer
+	</text>
+	<scroll_list name="blocked" tool_tip="Vis liste over blokerede avatarer"/>
+	<button label="Blokér beboer..." label_selected="Blokér beboer..." name="Block resident..." tool_tip="Vælg en beboer der skal blokeres"/>
+	<button label="Blokér objekt via navn..." label_selected="Blokér objekt via navn..." name="Block object by name..."/>
+	<button label="Fjern blokering" label_selected="Fjern blokering" name="Unblock" tool_tip="Fjern beboer fra liste med blokeringer"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
index b4d0fa20ef..a8a02a34b7 100644
--- a/indra/newview/skins/default/xui/da/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="edit_profile_panel">
    <string name="CaptionTextAcctInfo">
-       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+       [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
    </string>
    <string name="AcctTypeResident"
     value="Beboer" />
diff --git a/indra/newview/skins/default/xui/da/panel_group_roles.xml b/indra/newview/skins/default/xui/da/panel_group_roles.xml
index 5c2fd356d8..99f5bac89d 100644
--- a/indra/newview/skins/default/xui/da/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_roles.xml
@@ -1,161 +1,121 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Medlemmer &amp; roller" name="roles_tab">
-	<string name="default_needs_apply_text">
-		Der er ændringer her, der ikke er gemt.
-	</string>
-	<string name="want_apply_text">
-		Vil du gemme disse ændringer?
-	</string>
-	<button label="?" name="help_button" />
-	<panel name="members_header">
-		<text name="static">
-			Medlemmer &amp; roller
-		</text>
-		<text name="static2" width="400">
-			Gruppemedlemmer får tildelt roller med rettigheder. Disse indstillinger kan 
-let tilpasses efter ønske, så gruppen kan vokse og blive mere fleksibel.
-		</text>
-	</panel>
-	<panel name="roles_header">
-		<text name="static">
-			Roller
-		</text>
-		<text name="role_properties_modifiable" width="400">
-			Vælg en rolle nedenfor. Du kan ændre dens navn, beskrivelse og medlemstitel.
-		</text>
-		<text name="role_properties_not_modifiable" width="400">
-			Vælg rolle forneden for at se dens egenskaber, medlemmer og rettigheder.
-		</text>
-		<text name="role_actions_modifiable">
-			Du kan også tildele rettigheder til rollen.
-		</text>
-		<text name="role_actions_not_modifiable">
-			Du kan se, men ikke ændre, tildelte rettigheder.
-		</text>
-	</panel>
-	<panel name="actions_header">
-		<text name="static">
-			Rettigheder
-		</text>
-		<text name="static2">
-			Du kan se en rettigheds beskrivelse og hvilke roller og medlemmer, 
-der har denne rettighed.
-		</text>
-	</panel>
-	<tab_container name="roles_tab_container">
-		<panel label="Medlemmer" name="members_sub_tab" tool_tip="Medlemmer">
-			<button label="Søg" name="search_button" />
-			<button label="Vis alle" name="show_all_button" />
-			<name_list name="member_list">
-				<column label="Medlemsnavn" name="name" />
-				<column label="Doneret leje" name="donated" />
-				<column label="Sidst på den" name="online" />
-			</name_list>
-			<button label="Invitér nyt medlem..." name="member_invite"/>
-			<button label="Udmeld" name="member_eject" />
-			<string name="help_text">
-				Du kan tilføje eller fjerne roller, der er tildelt medlemmerne.
-Vælg flere medlemmer ved at holde Ctrl-tasten nede og
-klik på deres navne.
-			</string>
-		</panel>
-		<panel label="Roller" name="roles_sub_tab">
-			<button label="Søg" name="search_button" />
-			<button label="Vis alle" name="show_all_button" />
-			<scroll_list name="role_list">
-				<column label="Rollenavn" name="name" />
-				<column label="Titel" name="title" />
-				<column label="Medlemmer" name="members" />
-			</scroll_list>
-			<button label="Opret ny rolle..." name="role_create" />
-			<button label="Slet rolle" name="role_delete" />
-			<string name="help_text">
-				Roller har en titel og en tilladelsesliste med rettigheder,
-som medlemmerne kan bruge. Medlemmer kan høre til 
-en eller flere roller. En gruppe kan have op til 10 roller,
-inkluderet alle- og ejerroller.
-			</string>
-			<string name="cant_delete_role">
-				&apos;Alle-&apos; og &apos;Ejerroller&apos; er specielle og kan ikke slettes.
-			</string>
-		</panel>
-		<panel label="Rettigheder" name="actions_sub_tab">
-			<button label="Søg" name="search_button" />
-			<button label="Vis alle" name="show_all_button" />
-			<scroll_list name="action_list" tool_tip="Vælg en rettighed for at se flere detaljer">
-				<column label="" name="icon" />
-				<column label="" name="action" />
-			</scroll_list>
-			<string name="help_text">
-				Rettigheder giver medlemmer i roller mulighed for at gøre specifikke
-ting i denne gruppe. Der er en bred vifte af rettigheder.
-			</string>
-		</panel>
-	</tab_container>
-	<panel name="members_footer">
-		<text name="static">
-			Tildelte roller
-		</text>
-		<text name="static2">
-			Tilladte rettigheder
-		</text>
-		<scroll_list name="member_assigned_roles">
-			<column label="" name="checkbox" />
-			<column label="" name="role" />
-		</scroll_list>
-		<scroll_list name="member_allowed_actions"
-		     tool_tip="For detaljer om hver tilladte rettighed, se rettighedsfanebladet.">
-			<column label="" name="icon" />
-			<column label="" name="action" />
-		</scroll_list>
-	</panel>
-	<panel name="roles_footer">
-		<text name="static">
-			Navn
-		</text>
-		<text name="static2">
-			Beskrivelse
-		</text>
-		<line_editor name="role_name">
-			Ansatte
-		</line_editor>
-		<text name="static3">
-			Titel
-		</text>
-		<line_editor name="role_title">
-			(venter)
-		</line_editor>
-		<text_editor name="role_description">
-			(venter)
-		</text_editor>
-		<text name="static4">
-			Tildelte medlemmer
-		</text>
-		<text name="static5"
-		     tool_tip="A list of Abilities the currently selected role can perform.">
-			Tilladte rettigheder
-		</text>
-		<check_box label="Medlemmer er synlige" name="role_visible_in_list"
-		     tool_tip=" Angiver om medlemmer med denne rolle er synlige i fanen &apos;Generelt&apos; for avatarer uden for gruppen." />
-		<scroll_list name="role_allowed_actions"
-		     tool_tip="For detaljer om hver rettighed se under rettigheder fanebladet.">
-			<column label="" name="icon" />
-			<column label="" name="checkbox" />
-			<column label="" name="action" />
-		</scroll_list>
-	</panel>
-	<panel name="actions_footer">
-		<text name="static">
-			Beskrivelse
-		</text>
-		<text_editor name="action_description">
-			Denne rettigheder &apos;Udmeld medlemmer fra denne gruppe&apos;. Kun en ejer kan udmelde en anden ejer.
-		</text_editor>
-		<text name="static2">
-			Roller med rettighed
-		</text>
-		<text name="static3">
-			Medlemmer med rettighed
-		</text>
-	</panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Medlemmer &amp; roller" name="roles_tab">
+	<panel.string name="default_needs_apply_text">
+		Der er ændringer her, der ikke er gemt.
+	</panel.string>
+	<panel.string name="want_apply_text">
+		Vil du gemme disse ændringer?
+	</panel.string>
+	<tab_container name="roles_tab_container">
+		<panel label="MEDLEMMER" name="members_sub_tab" tool_tip="Medlemmer">
+			<panel.string name="help_text">
+				Du kan tilføje eller fjerne roller, der er tildelt medlemmerne.
+Vælg flere medlemmer ved at holde Ctrl-tasten nede og
+klik på deres navne.
+			</panel.string>
+			<filter_editor label="Filtrér medlemmer" name="filter_input"/>
+			<name_list name="member_list">
+				<name_list.columns label="Medlemsnavn" name="name"/>
+				<name_list.columns label="Doneret leje" name="donated"/>
+				<name_list.columns label="Sidst på den" name="online"/>
+			</name_list>
+			<button label="Invitér nyt medlem" name="member_invite"/>
+			<button label="Udmeld" name="member_eject"/>
+		</panel>
+		<panel label="ROLLER" name="roles_sub_tab">
+			<panel.string name="help_text">
+				Roller har en titel og en tilladelsesliste med rettigheder,
+som medlemmerne kan bruge. Medlemmer kan høre til 
+en eller flere roller. En gruppe kan have op til 10 roller,
+inkluderet alle- og ejerroller.
+			</panel.string>
+			<panel.string name="cant_delete_role">
+				&apos;Alle-&apos; og &apos;Ejerroller&apos; er specielle og kan ikke slettes.
+			</panel.string>
+			<panel.string name="power_folder_icon">
+				Inv_FolderClosed
+			</panel.string>
+			<filter_editor label="Filtrér roller" name="filter_input"/>
+			<scroll_list name="role_list">
+				<scroll_list.columns label="Rollenavn" name="name"/>
+				<scroll_list.columns label="Titel" name="title"/>
+				<scroll_list.columns label="Medlemmer" name="members"/>
+			</scroll_list>
+			<button label="Opret ny rolle" name="role_create"/>
+			<button label="Slet rolle" name="role_delete"/>
+		</panel>
+		<panel label="RETTIGHEDER" name="actions_sub_tab" tool_tip="Du kan se beskrivelse af rettighed og hvilke roller og medlemmer der har denne rettighed.">
+			<panel.string name="help_text">
+				Rettigheder giver medlemmer i roller mulighed for at gøre specifikke
+ting i denne gruppe. Der er en bred vifte af rettigheder.
+			</panel.string>
+			<filter_editor label="Filtrér rettigheder" name="filter_input"/>
+			<scroll_list name="action_list" tool_tip="Vælg en rettighed for at se flere detaljer">
+				<scroll_list.columns label="" name="icon"/>
+				<scroll_list.columns label="" name="action"/>
+			</scroll_list>
+		</panel>
+	</tab_container>
+	<panel name="members_footer">
+		<text name="static">
+			Tildelte roller
+		</text>
+		<scroll_list name="member_assigned_roles">
+			<scroll_list.columns label="" name="checkbox"/>
+			<scroll_list.columns label="" name="role"/>
+		</scroll_list>
+		<text name="static2">
+			Tilladte rettigheder
+		</text>
+		<scroll_list name="member_allowed_actions" tool_tip="For detaljer om hver tilladte rettighed, se rettighedsfanebladet.">
+			<scroll_list.columns label="" name="icon"/>
+			<scroll_list.columns label="" name="action"/>
+		</scroll_list>
+	</panel>
+	<panel name="roles_footer">
+		<text name="static">
+			Navn
+		</text>
+		<line_editor name="role_name">
+			Ansatte
+		</line_editor>
+		<text name="static3">
+			Titel
+		</text>
+		<line_editor name="role_title">
+			(venter)
+		</line_editor>
+		<text name="static2">
+			Beskrivelse
+		</text>
+		<text_editor name="role_description">
+			(venter)
+		</text_editor>
+		<text name="static4">
+			Tildelte roller
+		</text>
+		<check_box label="Medlemmer er synlige" name="role_visible_in_list" tool_tip="Angiver om medlemmer med denne rolle er synlige i fanen &apos;Generelt&apos; for avatarer uden for gruppen."/>
+		<text name="static5" tool_tip="A list of Abilities the currently selected role can perform.">
+			Tilladte rettigheder
+		</text>
+		<scroll_list name="role_allowed_actions" tool_tip="For detaljer om hver rettighed se under rettigheder fanebladet.">
+			<scroll_list.columns label="" name="icon"/>
+			<scroll_list.columns label="" name="checkbox"/>
+			<scroll_list.columns label="" name="action"/>
+		</scroll_list>
+	</panel>
+	<panel name="actions_footer">
+		<text name="static">
+			Beskrivelse
+		</text>
+		<text_editor name="action_description">
+			Denne rettigheder &apos;Udmeld medlemmer fra denne gruppe&apos;. Kun en ejer kan udmelde en anden ejer.
+		</text_editor>
+		<text name="static2">
+			Roller med rettighed
+		</text>
+		<text name="static3">
+			Medlemmer med rettighed
+		</text>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index 1c5b013104..fbef93de69 100644
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -1,37 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="panel_login">
-	<string name="real_url">
-		http://secondlife.com/app/login/
-	</string>
-	<string name="forgot_password_url">
-		http://secondlife.com/account/request.php
-	</string>
-	<text name="first_name_text">
-		Fornavn:
-	</text>
-	<text name="last_name_text">
-		Efternavn:
-	</text>
-	<text name="password_text">
-		Password:
-	</text>
-	<text name="start_location_text">
-		Start lokation:
-	</text>
-	<combo_box name="start_location_combo">
-		<combo_box.item name="MyHome" label="Hjem" />
-		<combo_box.item name="MyLastLocation" label="Min sidste lokation" />
-		<combo_box.item name="Typeregionname" label="&lt;Skriv navn på region&gt;" />
-	</combo_box>
-	<check_box label="Husk password" name="remember_check" />
-	<button label="Log ind" label_selected="Log ind" name="connect_btn" />
-	<text name="create_new_account_text">
-		Opret bruger
-	</text>
-	<text name="forgot_password_text">
-		Glemt navn eller password?
-	</text>
-	<text name="channel_text">
-		[VERSION]
-	</text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_login">
+	<panel.string name="real_url">
+		http://secondlife.com/app/login/
+	</panel.string>
+	<panel.string name="forgot_password_url">
+		http://secondlife.com/account/request.php
+	</panel.string>
+	<panel name="login_widgets">
+		<text name="first_name_text">
+			Fornavn:
+		</text>
+		<line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] Fornavn"/>
+		<text name="last_name_text">
+			Efternavn:
+		</text>
+		<line_editor name="last_name_edit" tool_tip="[SECOND_LIFE] Efternavn"/>
+		<text name="password_text">
+			Password:
+		</text>
+		<button label="Log Ind" label_selected="Log Ind" name="connect_btn"/>
+		<text name="start_location_text">
+			Start lokation:
+		</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;Skriv navn på region&gt;" name="Typeregionname"/>
+		</combo_box>
+		<check_box label="Husk password" name="remember_check"/>
+		<text name="create_new_account_text">
+			Opret bruger
+		</text>
+		<text name="forgot_password_text">
+			Glemt navn eller password?
+		</text>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_main_inventory.xml b/indra/newview/skins/default/xui/da/panel_main_inventory.xml
new file mode 100644
index 0000000000..e0f99bee93
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_main_inventory.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Ting" name="main inventory panel">
+	<panel.string name="Title">
+		Ting
+	</panel.string>
+	<filter_editor label="Filter" name="inventory search editor"/>
+	<tab_container name="inventory filter tabs">
+		<inventory_panel label="Alle ting" name="All Items"/>
+		<inventory_panel label="Nye ting" name="Recent Items"/>
+	</tab_container>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="Vis flere valgmuligheder"/>
+		<button name="add_btn" tool_tip="Opret ny genstand"/>
+		<dnd_button name="trash_btn" tool_tip="Fjern valgt genstand"/>
+	</panel>
+	<menu_bar name="Inventory Menu">
+		<menu label="Filer" name="File">
+			<menu_item_call label="Åben" name="Open"/>
+			<menu label="Send fil" 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="Flere filer (L$[COST] pr. fil)..." name="Bulk Upload"/>
+			</menu>
+			<menu_item_call label="Nyt vindue" name="New Window"/>
+			<menu_item_call label="Vis filtre" name="Show Filters"/>
+			<menu_item_call label="Nulstil filtre" name="Reset Current"/>
+			<menu_item_call label="Luk alle mapper" name="Close All Folders"/>
+			<menu_item_call label="Tøm papirkurv" name="Empty Trash"/>
+			<menu_item_call label="Tøm fundne genstande" name="Empty Lost And Found"/>
+		</menu>
+		<menu label="Opret" name="Create">
+			<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>
+		<menu label="Sortér" name="Sort">
+			<menu_item_check label="Efter navn" name="By Name"/>
+			<menu_item_check label="Efter dato" name="By Date"/>
+			<menu_item_check label="Altid mapper efter navn" name="Folders Always By Name"/>
+			<menu_item_check label="System-mapper i toppen" name="System Folders To Top"/>
+		</menu>
+	</menu_bar>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
index d3d017914d..e8f30c185d 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
@@ -1,12 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="advanced">
-	<text name="AspectRatioLabel1" tool_tip="bredde / højde">
-		Format:
-	</text>
-	<combo_box name="aspect_ratio" tool_tip="bredde/ højde">
-		<combo_box.item label="4:3 (Standard CRT)" name="item1"/>
-		<combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/>
-		<combo_box.item label="8:5 (Widescreen)" name="item3"/>
-		<combo_box.item label="16:9 (Widescreen)" name="item4"/>
-	</combo_box>
-</panel>
+<?xml version="1.0" encoding="utf-8"?>
+<panel name="advanced">
+	<panel.string name="resolution_format">
+		[RES_X] x [RES_Y]
+	</panel.string>
+	<panel.string name="aspect_ratio_text">
+		[NUM]:[DEN]
+	</panel.string>
+	<check_box label="Talebobler" name="bubble_text_chat"/>
+	<color_swatch name="background" tool_tip="Vælg farve for talebobler"/>
+	<slider label="Gennemsigtighed" name="bubble_chat_opacity"/>
+	<text name="AspectRatioLabel1" tool_tip="bredde / højde">
+		Format
+	</text>
+	<combo_box name="aspect_ratio" tool_tip="bredde/ højde">
+		<combo_box.item label="4:3 (Standard CRT)" name="item1"/>
+		<combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/>
+		<combo_box.item label="8:5 (Widescreen)" name="item3"/>
+		<combo_box.item label="16:9 (Widescreen)" name="item4"/>
+	</combo_box>
+	<check_box label="Registrér automatisk" name="aspect_auto_detect"/>
+	<text name="heading1">
+		Kamera:
+	</text>
+	<slider label="Synsvinkel" name="camera_fov"/>
+	<slider label="Distance" name="camera_offset_scale"/>
+	<text name="heading2">
+		Automatisk positionering for:
+	</text>
+	<check_box label="Byg/Redigér" name="edit_camera_movement" tool_tip="Benyt automatisk kamera positionering ved start og slut af editerings modus"/>
+	<check_box label="Udseende" name="appearance_camera_movement" tool_tip="Benyt automatisk kamera positionering ved redigering"/>
+	<text name="heading3">
+		Avatarer:
+	</text>
+	<check_box label="Vis avatar i førsteperson" name="first_person_avatar_visible"/>
+	<check_box label="Piletaster bruges altid til bevægelse" name="arrow_keys_move_avatar_check"/>
+	<check_box label="Tast-tast-hold for at løbe" name="tap_tap_hold_to_run"/>
+	<check_box label="Bevæg avatarlæber når der tales" name="enable_lip_sync"/>
+	<check_box label="Vis scriptfejl" name="show_script_errors"/>
+	<radio_group name="show_location">
+		<radio_item label="I chat" name="0"/>
+		<radio_item label="I et vindue" name="1"/>
+	</radio_group>
+	<check_box label="Knap til aktivering af mikrofon:" name="push_to_talk_toggle_check" tool_tip="I walkie-talkie-modus sendes stemme kun når knappen er trykket ned, ellers vil tryk på knap tænde og slukke mikrofon."/>
+	<line_editor label="Brug walkie-talkie modus" name="modifier_combo"/>
+	<button label="Angiv taste" name="set_voice_hotkey_button"/>
+	<button label="Midterste museknap" name="set_voice_middlemouse_button"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
index c7a49ef307..cc3972238e 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
@@ -1,20 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Popups" name="popups" title="Popups">
-	<text name="dont_show_label">
-		Vis ikke disse popups:
-	</text>
-	<button label="Aktivér denne popup" name="enable_popup" />
-	<button label="Aktivér alle popups..." name="reset_dialogs_btn"
-	     tool_tip="Viser alle de valgfrie popups og &apos;første gangs&apos; beskeder." />
-	<text name="show_label">
-		Vis disse popups:
-	</text>
-	<button label="Deaktivér alle disse popups..." name="skip_dialogs_btn"
-	     tool_tip="Viser ingen af de valgfrie popups og &apos;første gangs&apos; beskeder." />
-	<text name="text_box2" width="310">
-		Ved tilbud om tekstdokumenter, teksturer og landemærker:
-	</text>
-	<check_box label="Accepter automatisk" name="accept_new_inventory" />
-	<check_box label="Vis automatisk efter accept" name="show_new_inventory" />
-	<check_box label="Vis nye objekter i beholdning automatisk" name="show_in_inventory" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Popups" name="popups" title="Popups">
+	<text name="tell_me_label">
+		Vis mig når:
+	</text>
+	<check_box label="Når jeg bruger eller får L$" name="notify_money_change_checkbox"/>
+	<check_box label="Når mine venner logger af eller på" name="friends_online_notify_checkbox"/>
+	<text name="show_label">
+		Vis altid disse beskeder:
+	</text>
+	<text name="dont_show_label">
+		Vis aldrig disse beskeder:
+	</text>
+</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 dee42b4de5..b141998451 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
@@ -1,61 +1,42 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Tekst chat" name="chat">
-	<text name="text_box">
-		Chat skriftstørrelse:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item name="radio" label="Lille" />
-		<radio_item name="radio2" label="Mellem" />
-		<radio_item name="radio3" label="Stor" />
-	</radio_group>
-	<color_swatch label="Dig" name="user"/>
-	<text name="text_box1">
-		Dig
-	</text>
-	<color_swatch label="Andre" name="agent"/>
-	<text name="text_box2">
-		Andre
-	</text>
-	<color_swatch label="IM" name="im"/>
-	<text name="text_box3">
-		IM
-	</text>
-	<color_swatch label="System" name="system"/>
-	<text name="text_box4">
-		System
-	</text>
-	<color_swatch label="Fejl" name="script_error"/>
-	<text name="text_box5">
-		Fejl
-	</text>
-	<color_swatch label="Objekter" name="objects"/>
-	<text name="text_box6">
-		Objekter
-	</text>
-	<color_swatch label="Ejer" name="owner"/>
-	<text name="text_box7">
-		Ejer
-	</text>
-	<color_swatch label="Bobler" name="background"/>
-	<text name="text_box8">
-		Bobler
-	</text>
-	<color_swatch label="URL&apos;er" name="links"/>
-	<text name="text_box9">
-		URL&apos;er
-	</text>
-	<check_box label="Vis script fejl og advarsler i almindelig chat"
-	     name="script_errors_as_chat" />
-	<spinner label="Udfas chat efter" name="fade_chat_time" label_width="90" width="140" />
-	<spinner left="350" name="max_chat_count"/>
-	<slider label="Gennemsigtighed" name="console_opacity" />
-	<check_box label="Brug fuldskærms bredde  (Kræver genstart)"
-	     name="chat_full_width_check" />
-	<check_box label="Luk chat efter tryk på enter" name="close_chat_on_return_check" />
-	<check_box label="Piletaster flytter altid figur under chat"
-	     name="arrow_keys_move_avatar_check" />
-	<check_box label="Vis klokkeslæt i lokal chat" name="show_timestamps_check" />
-	<check_box label="Afspil skrive animation ved chat" name="play_typing_animation" />
-	<check_box label="Vis chat bobler" name="bubble_text_chat" />
-	<slider label="Gennemsigtighed" name="bubble_chat_opacity" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Tekst chat" name="chat">
+	<radio_group name="chat_font_size">
+		<radio_item label="Lille" name="radio"/>
+		<radio_item label="Mellem" name="radio2"/>
+		<radio_item label="Stor" name="radio3"/>
+	</radio_group>
+	<color_swatch label="Dig" name="user"/>
+	<text name="text_box1">
+		Dig
+	</text>
+	<color_swatch label="Andre" name="agent"/>
+	<text name="text_box2">
+		Andre
+	</text>
+	<color_swatch label="IM" name="im"/>
+	<text name="text_box3">
+		IM
+	</text>
+	<color_swatch label="System" name="system"/>
+	<text name="text_box4">
+		System
+	</text>
+	<color_swatch label="Fejl" name="script_error"/>
+	<text name="text_box5">
+		Fejl
+	</text>
+	<color_swatch label="Objekter" name="objects"/>
+	<text name="text_box6">
+		Objekter
+	</text>
+	<color_swatch label="Ejer" name="owner"/>
+	<text name="text_box7">
+		Ejer
+	</text>
+	<color_swatch label="URL&apos;er" name="links"/>
+	<text name="text_box9">
+		URL&apos;er
+	</text>
+	<check_box initial_value="true" label="Afspil skrive animation ved chat" name="play_typing_animation"/>
+	<check_box label="Send e-mail til mig når jeg modtager IM og er offline" name="send_im_to_email"/>
+</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 d50c05a192..c032e414c1 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
@@ -1,40 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Lyd &amp; video" name="Preference Media panel">
-	<slider label="Generel" name="System Volume"/>
-	<slider label="Omgivelser" name="Wind Volume"/>
-	<slider label="Effekter" name="SFX Volume"/>
-	<slider label="Media" name="Media Volume"/>
-	<slider label="Brugerflade" name="UI Volume"/>
-	<slider label="Musik" name="Music Volume"/>
-	<slider label="Tale" name="Voice Volume"/>
-	<text_editor name="voice_unavailable">
-		Stemme chat er ikke tilgængelig
-	</text_editor>
-	<check_box label="Aktivér stemme chat" name="enable_voice_check"/>
-	<radio_group name="ear_location">
-		<radio_item name="0" label="Hør stemmer fra kamera position" />
-		<radio_item name="1" label="Hør stemmer fra avatar position" />
-	</radio_group>
-	<button label="Enheds Indstillinger" name="device_settings_btn"/>
-	<text name="muting_text">
-		Lydstyrke:
-	</text>
-	<text name="streaming_prefs_text">
-		Streaming indstillinger:
-	</text>
-	<text name="audio_prefs_text">
-		Lyd indstillinger:
-	</text>
-	<panel label="Lydstyrke" name="Volume Panel" />
-	<check_box label="Afspil musik når det er muligt"
-	     name="streaming_music" />
-	<check_box label="Afspil video når det er muligt"
-	     name="streaming_video" />
-	<check_box label="Afspil automatisk medie" name="auto_streaming_video" />
-	<check_box label="Sluk lyd når vinduet er minimeret" name="mute_when_minimized" />
-	<slider label="Doppler effekt" name="Doppler Effect" />
-	<slider label="Rækkevidde" name="Distance Factor" />
-	<slider label="Styrkefald/afstand" name="Rolloff Factor" />
-	<spinner label="Penge lydstyrke" name="L$ Change Threshold" />
-	<spinner label="Livspoint lydstyrke" name="Health Change Threshold" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Lyde" name="Preference Media panel">
+	<slider label="Generel" name="System Volume"/>
+	<check_box initial_value="true" label="Sluk lyd når vinduet er minimeret" name="mute_when_minimized"/>
+	<slider label="Omgivelser" name="Wind Volume"/>
+	<slider label="Knapper" name="UI Volume"/>
+	<slider label="Media" name="Media Volume"/>
+	<slider label="Effekter" name="SFX Volume"/>
+	<slider label="Musik" name="Music Volume"/>
+	<check_box label="Tale" name="enable_voice_check"/>
+	<slider label="Tale" name="Voice Volume"/>
+	<text name="Listen from">
+		Hør stemmer fra:
+	</text>
+	<radio_group name="ear_location">
+		<radio_item label="Kamera position" name="0"/>
+		<radio_item label="Avatar position" name="1"/>
+	</radio_group>
+	<button label="Input/Output enheder" name="device_settings_btn"/>
+	<panel label="Enhedsopsætning" 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>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_world_map.xml b/indra/newview/skins/default/xui/da/panel_world_map.xml
index d2ae3ab116..f8bdaa9953 100644
--- a/indra/newview/skins/default/xui/da/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/da/panel_world_map.xml
@@ -1,51 +1,57 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="world_map">
-	<panel.string name="world_map_north">
-		N
-	</panel.string>
-	<panel.string name="world_map_east">
-		Ø
-	</panel.string>
-	<panel.string name="world_map_west">
-		V
-	</panel.string>
-	<panel.string name="world_map_south">
-		S
-	</panel.string>
-	<panel.string name="world_map_southeast">
-		SØ
-	</panel.string>
-	<panel.string name="world_map_northeast">
-		NØ
-	</panel.string>
-	<panel.string name="world_map_southwest">
-		SV
-	</panel.string>
-	<panel.string name="world_map_northwest">
-		NV
-	</panel.string>
-	<text label="N" name="floater_map_north" text="N">
-		N
-	</text>
-	<text label="Ø" name="floater_map_east" text="Ø">
-		Ø
-	</text>
-	<text label="V" name="floater_map_west" text="V">
-		V
-	</text>
-	<text label="S" name="floater_map_south" text="S">
-		S
-	</text>
-	<text label="SØ" name="floater_map_southeast" text="SØ">
-		SØ
-	</text>
-	<text label="NØ" name="floater_map_northeast" text="NØ">
-		NØ
-	</text>
-	<text label="SV" name="floater_map_southwest" text="SV">
-		SV
-	</text>
-	<text label="NV" name="floater_map_northwest" text="NV">
-		NV
-	</text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="world_map">
+	<panel.string name="Loading">
+		Henter...
+	</panel.string>
+	<panel.string name="InvalidLocation">
+		Ugyldig lokation
+	</panel.string>
+	<panel.string name="world_map_north">
+		N
+	</panel.string>
+	<panel.string name="world_map_east">
+		Ø
+	</panel.string>
+	<panel.string name="world_map_west">
+		V
+	</panel.string>
+	<panel.string name="world_map_south">
+		S
+	</panel.string>
+	<panel.string name="world_map_southeast">
+		SØ
+	</panel.string>
+	<panel.string name="world_map_northeast">
+		NØ
+	</panel.string>
+	<panel.string name="world_map_southwest">
+		SV
+	</panel.string>
+	<panel.string name="world_map_northwest">
+		NV
+	</panel.string>
+	<text label="N" name="floater_map_north" text="N">
+		N
+	</text>
+	<text label="Ø" name="floater_map_east" text="Ø">
+		Ø
+	</text>
+	<text label="V" name="floater_map_west" text="V">
+		V
+	</text>
+	<text label="S" name="floater_map_south" text="S">
+		S
+	</text>
+	<text label="SØ" name="floater_map_southeast" text="SØ">
+		SØ
+	</text>
+	<text label="NØ" name="floater_map_northeast" text="NØ">
+		NØ
+	</text>
+	<text label="SV" name="floater_map_southwest" text="SV">
+		SV
+	</text>
+	<text label="NV" name="floater_map_northwest" text="NV">
+		NV
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index 945833d57a..155714363e 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -1,654 +1,3242 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- This file contains strings that used to be hardcoded in the source.
-     It is only for those strings which do not belong in a floater.
-     For example, the strings used in avatar chat bubbles, and strings 
-     that are returned from one component and may appear in many places-->
-<strings>
-	<string name="LoginInProgress">
-		Logger p. [APP_NAME] kan virke laast.  Vent venligst.
-	</string>
-	<string name="LoginAuthenticating">
-		Validerer adgang
-	</string>
-	<string name="LoginMaintenance">
-		Udfører konto vedligeholdelse...
-	</string>
-	<string name="LoginAttempt">
-		Tidligere forsø på login fejlede. Logger på, forsøg [NUMBER]
-	</string>
-	<string name="LoginPrecaching">
-		verden...
-	</string>
-	<string name="LoginInitializingBrowser">
-		Klargør indbyggede web browser...
-	</string>
-	<string name="LoginInitializingMultimedia">
-		Klargør multimedia...
-	</string>
-	<string name="LoginVerifyingCache">
-		Verificérer cache filer (kan tage 60-90 sekunder)...
-	</string>
-	<string name="LoginProcessingResponse">
-		Behandler svar...
-	</string>
-	<string name="LoginInitializingWorld">
-		Initialiserer verden...
-	</string>
-	<string name="LoginDecodingImages">
-		Behandler billeder...
-	</string>
-	<string name="LoginInitializingQuicktime">
-		Initialiserer QuickTime...
-	</string>
-	<string name="LoginQuicktimeNotFound">
-		QuickTime ikke fundet- kunne derfor ikke initialisere.
-	</string>
-	<string name="LoginQuicktimeOK">
-		QuickTime initialiseret.
-	</string>
-	<string name="LoginWaitingForRegionHandshake">
-		Venter på svar fra region...
-	</string>
-	<string name="LoginConnectingToRegion">
-		Tilslutter til region...
-	</string>
-	<string name="LoginDownloadingClothing">
-		Henter tøj...
-	</string>
-	<string name="AgentLostConnection">
-		Denne region kan have problemer. Tjek venligst din forbindelse til internettet.
-	</string>
-	<string name="TooltipPerson">
-		Person
-	</string>
-	<string name="TooltipNoName">
-		(intet navn)
-	</string>
-	<string name="TooltipOwner">
-		Ejer:
-	</string>
-	<string name="TooltipPublic">
-		Offentlig
-	</string>
-	<string name="TooltipIsGroup">
-		(Gruppe)
-	</string>
-	<string name="TooltipFlagScript">
-		Script
-	</string>
-	<string name="TooltipFlagPhysics">
-		Fysik
-	</string>
-	<string name="TooltipFlagTouch">
-		Rør
-	</string>
-	<string name="TooltipFlagL$">
-		L$
-	</string>
-	<string name="TooltipFlagDropInventory">
-		Drop beholdning
-	</string>
-	<string name="TooltipFlagPhantom">
-		Fantom
-	</string>
-	<string name="TooltipFlagTemporary">
-		Temporær
-	</string>
-	<string name="TooltipFlagRightClickMenu">
-		(Højre-klik for menu)
-	</string>
-	<string name="TooltipFreeToCopy">
-		Kan kopieres
-	</string>
-	<string name="TooltipForSaleL$">
-		Til salg: L$[AMOUNT]
-	</string>
-	<string name="TooltipForSaleMsg">
-		Til salg: [MESSAGE]
-	</string>
-	<string name="TooltipFlagGroupBuild">
-		Gruppe byg
-	</string>
-	<string name="TooltipFlagNoBuild">
-		Må ikke bygge
-	</string>
-	<string name="TooltipFlagNoEdit">
-		Gruppe byg
-	</string>
-	<string name="TooltipFlagNotSafe">
-		Ikke sikker område
-	</string>
-	<string name="TooltipFlagNoFly">
-		Ingen flyvning
-	</string>
-	<string name="TooltipFlagGroupScripts">
-		Gruppe scripts
-	</string>
-	<string name="TooltipFlagNoScripts">
-		Ingen Scripts
-	</string>
-	<string name="TooltipLand">
-		Land:
-	</string>
-	<string name="TooltipMustSingleDrop">
-		Kun et enkelt element kan trækkes ind her
-	</string>
-	<string name="RetrievingData">
-		Henter...
-	</string>
-	<string name="ReleaseNotes">
-		Noter om version
-	</string>
-	<string name="LoadingData">
-		Henter...
-	</string>
-	<string name="AvatarNameNobody">
-		(ingen)
-	</string>
-	<string name="AvatarNameWaiting">
-		(venter)
-	</string>
-	<string name="AvatarNameHippos">
-		(hippos)
-	</string>
-	<string name="GroupNameNone">
-		(ingen)
-	</string>
-	<string name="AssetErrorNone">
-		Ingen fejl
-	</string>
-	<string name="AssetErrorRequestFailed">
-		Element forespørgsel: fejlede
-	</string>
-	<string name="AssetErrorNonexistentFile">
-		Element forespørgsel: fil findes ikke
-	</string>
-	<string name="AssetErrorNotInDatabase">
-		Element forespørgsel: element ikke fundet i database
-	</string>
-	<string name="AssetErrorEOF">
-		Slutning af fil
-	</string>
-	<string name="AssetErrorCannotOpenFile">
-		Kan ikke åbne fil
-	</string>
-	<string name="AssetErrorFileNotFound">
-		Fil ikke fundet
-	</string>
-	<string name="AssetErrorTCPTimeout">
-		Tidsgrænse overskredet ved filhentning
-	</string>
-	<string name="AssetErrorCircuitGone">
-		Forbindelsen mistet
-	</string>
-	<string name="AssetErrorPriceMismatch">
-		[APP_NAME] klient og server er uenige om prisen
-	</string>
-	<string name="AssetErrorUnknownStatus">
-		Ukendt status
-	</string>
-	<string name="AvatarEditingApparance">
-		(Ændrer udseende)
-	</string>
-	<string name="AvatarAway">
-		Væk
-	</string>
-	<string name="AvatarBusy">
-		Optaget
-	</string>
-	<string name="AvatarMuted">
-		Blokeret
-	</string>
-	<string name="anim_express_afraid">
-		Bange
-	</string>
-	<string name="anim_express_anger">
-		Vred
-	</string>
-	<string name="anim_away">
-		Væk
-	</string>
-	<string name="anim_backflip">
-		Baglæns salto
-	</string>
-	<string name="anim_express_laugh">
-		Hjertelig latter
-	</string>
-	<string name="anim_express_toothsmile">
-		Stort smil
-	</string>
-	<string name="anim_blowkiss">
-		Sende kys
-	</string>
-	<string name="anim_express_bored">
-		Keder sig
-	</string>
-	<string name="anim_bow">
-		Buk
-	</string>
-	<string name="anim_clap">
-		Klap
-	</string>
-	<string name="anim_courtbow">
-		Højtideligt buk
-	</string>
-	<string name="anim_express_cry">
-		Græd
-	</string>
-	<string name="anim_dance1">
-		Dans 1
-	</string>
-	<string name="anim_dance2">
-		Dans 2
-	</string>
-	<string name="anim_dance3">
-		Dans 3
-	</string>
-	<string name="anim_dance4">
-		Dans 4
-	</string>
-	<string name="anim_dance5">
-		Dans 5
-	</string>
-	<string name="anim_dance6">
-		Dans 6
-	</string>
-	<string name="anim_dance7">
-		Dans 7
-	</string>
-	<string name="anim_dance8">
-		Dans 8
-	</string>
-	<string name="anim_express_disdain">
-		Foragt
-	</string>
-	<string name="anim_drink">
-		Drik
-	</string>
-	<string name="anim_express_embarrased">
-		Flov
-	</string>
-	<string name="anim_angry_fingerwag">
-		Løftet finger
-	</string>
-	<string name="anim_fist_pump">
-		Knytnæve
-	</string>
-	<string name="anim_yoga_float">
-		Svævende yoga
-	</string>
-	<string name="anim_express_frown">
-		Mistroisk
-	</string>
-	<string name="anim_impatient">
-		Utålmodig
-	</string>
-	<string name="anim_jumpforjoy">
-		Glædeshop
-	</string>
-	<string name="anim_kissmybutt">
-		Kys min r..
-	</string>
-	<string name="anim_express_kiss">
-		Kys
-	</string>
-	<string name="anim_laugh_short">
-		Grin
-	</string>
-	<string name="anim_musclebeach">
-		Bodybuilder
-	</string>
-	<string name="anim_no_unhappy">
-		Nej (sur)
-	</string>
-	<string name="anim_no_head">
-		Nej
-	</string>
-	<string name="anim_nyanya">
-		Æv-bæv
-	</string>
-	<string name="anim_punch_onetwo">
-		Et-to slag
-	</string>
-	<string name="anim_express_open_mouth">
-		Åben mund
-	</string>
-	<string name="anim_peace">
-		Peace
-	</string>
-	<string name="anim_point_you">
-		Peg på andre
-	</string>
-	<string name="anim_point_me">
-		Peg på dig selv
-	</string>
-	<string name="anim_punch_l">
-		Slå venstre
-	</string>
-	<string name="anim_punch_r">
-		Slå højre
-	</string>
-	<string name="anim_rps_countdown">
-		SSP - Tæl
-	</string>
-	<string name="anim_rps_paper">
-		SSP - Papir
-	</string>
-	<string name="anim_rps_rock">
-		SSP - Sten
-	</string>
-	<string name="anim_rps_scissors">
-		SSP - Saks
-	</string>
-	<string name="anim_express_repulsed">
-		Misfornøjet
-	</string>
-	<string name="anim_kick_roundhouse_r">
-		Karatepark
-	</string>
-	<string name="anim_express_sad">
-		Ked af det
-	</string>
-	<string name="anim_salute">
-		Honnør
-	</string>
-	<string name="anim_shout">
-		Råb
-	</string>
-	<string name="anim_express_shrug">
-		Skuldertræk
-	</string>
-	<string name="anim_express_smile">
-		Smil
-	</string>
-	<string name="anim_smoke_idle">
-		Ryg
-	</string>
-	<string name="anim_smoke_inhale">
-		Indhalér
-	</string>
-	<string name="anim_smoke_throw_down">
-		Smid cigaret
-	</string>
-	<string name="anim_express_surprise">
-		Overrasket
-	</string>
-	<string name="anim_sword_strike_r">
-		Sværdslag
-	</string>
-	<string name="anim_angry_tantrum">
-		Ekstatisk
-	</string>
-	<string name="anim_express_tongue_out">
-		Tunge ud
-	</string>
-	<string name="anim_hello">
-		Vink
-	</string>
-	<string name="anim_whisper">
-		Knib øje i
-	</string>
-	<string name="anim_whistle">
-		Pift
-	</string>
-	<string name="anim_express_wink">
-		Blink
-	</string>
-	<string name="anim_wink_hollywood">
-		Blink (Hollywood)
-	</string>
-	<string name="anim_express_worry">
-		Bekymret
-	</string>
-	<string name="anim_yes_happy">
-		Ja (glad)
-	</string>
-	<string name="anim_yes_head">
-		Ja
-	</string>
-	<string name="texture_loading">
-		Henter...
-	</string>
-	<string name="worldmap_offline">
-		Offline
-	</string>
-	<string name="whisper">
-		hvisker:
-	</string>
-	<string name="shout">
-		råber:
-	</string>
-	<string name="SIM_ACCESS_PG">
-		PG
-	</string>
-	<string name="SIM_ACCESS_MATURE">
-		Mature
-	</string>
-	<string name="SIM_ACCESS_ADULT">
-		Adult
-	</string>
-	<string name="SIM_ACCESS_DOWN">
-		logget af
-	</string>
-	<string name="SIM_ACCESS_MIN">
-		Ukendt
-	</string>
-	<string name="land_type_unknown">
-		(ukendt)
-	</string>
-	<string name="covenant_never_modified">Sidst ændret: (aldrig)</string>
-	<string name="covenant_modified">Sidst ændret: </string>
-	<string name="all_files">
-		Alle filer
-	</string>
-	<string name="sound_files">
-		Lyde
-	</string>
-	<string name="animation_files">
-		Animationer
-	</string>
-	<string name="image_files">
-		Billeder
-	</string>
-	<string name="save_file_verb">
-		Gem
-	</string>
-	<string name="load_file_verb">
-		Hent
-	</string>
-	<string name="targa_image_files">
-		Targa billeder
-	</string>
-	<string name="bitmap_image_files">
-		Bitmap billeder
-	</string>
-	<string name="avi_movie_file">
-		AVI film fil
-	</string>
-	<string name="xaf_animation_file">
-		XAF Anim Fil
-	</string>
-	<string name="xml_file">
-		XML Fil
-	</string>
-	<string name="dot_raw_file">
-		RAW Fil
-	</string>
-	<string name="compressed_image_files">
-		Komprimerede billeder
-	</string>
-	<string name="load_files">
-		Hent filer
-	</string>
-	<string name="choose_the_directory">
-		Vælg bibliotek
-	</string>
-	<string name="accel-mac-control">
-		&#8963;
-	</string>
-	<string name="accel-mac-command">
-		&#8984;
-	</string>
-	<string name="accel-mac-option">
-		&#8997;
-	</string>
-	<string name="accel-mac-shift">
-		&#8679;
-	</string>
-	<string name="accel-win-control">
-		Ctrl+
-	</string>
-	<string name="accel-win-alt">
-		Alt+
-	</string>
-	<string name="accel-win-shift">
-		Shift+
-	</string>
-	<string name="GraphicsQualityLow">
-		Lav
-	</string>
-	<string name="GraphicsQualityMid">
-		Middel
-	</string>
-	<string name="GraphicsQualityHigh">
-		Høj
-	</string>
-	
-	<!-- PARCEL_CATEGORY_UI_STRING -->
-	<string name="Linden Location">Linden sted</string>
-	<string name="Adult">Adult</string>
-	<string name="Arts&amp;Culture">Kunst &amp; kultur</string>
-	<string name="Business">Business</string>
-	<string name="Educational">Uddannelse</string>
-	<string name="Gaming">Spil</string>
-	<string name="Hangout">Afslapning</string>
-	<string name="Newcomer Friendly">Nybegynder venligt</string>
-	<string name="Parks&amp;Nature">Parker &amp; natur</string>
-	<string name="Residential">Beboelse</string>
-	<string name="Shopping">Indkøb</string>
-	<string name="Other">Andet</string>
-	
-	<string name="ringing">
-		Forbinder til stemmechat...
-	</string>
-	<string name="connected">
-		Forbundet
-	</string>
-	<string name="unavailable">
-		Stemmechat er ikke tilladt hvor du befinder dig
-	</string>
-	<string name="hang_up">
-		Stemme chat er afbrudt
-	</string>
-  <string name="ScriptQuestionCautionChatGranted">
-	&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[OWNERNAME]&apos;, lokaliseret i [REGIONNAME] på [REGIONPOS], har fået tilladelse til: [PERMISSIONS].
-  </string>
-  <string name="ScriptQuestionCautionChatDenied">
-	&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[OWNERNAME]&apos;, lokaliseret i [REGIONNAME] på [REGIONPOS], er afvist tilladelse til: [PERMISSIONS].
-  </string>
-  <string name="ScriptTakeMoney">
-	Tag Linden dollars (L$) fra dig
-  </string>
-  <string name="ActOnControlInputs">
-	Reagér på dine kontrol-taster
-  </string>
-  <string name="RemapControlInputs">
-	Ændre dine kontrol-taster
-  </string>
-  <string name="AnimateYourAvatar">
-	Animér din avatar
-  </string>
-  <string name="AttachToYourAvatar">
-	Sæt på din avatar
-  </string>
-  <string name="ReleaseOwnership">
-	Fjern ejerskabet og sæt til offentlig
-  </string>
-  <string name="LinkAndDelink">
-	Sammenkæd og adskil andre genstande
-  </string>
-  <string name="AddAndRemoveJoints">
-	Tilføj og fjern sammenkødninger med andre genstande
-  </string>
-  <string name="ChangePermissions">
-	Ændre dens tilladelser
-  </string>
-  <string name="TrackYourCamera">
-	Spor dit kamera
-  </string>
-  <string name="ControlYourCamera">
-	Kontrollér dit kamera
-  </string>
-	<string name="only_user_message">
-		Du er den eneste deltager i denne samtale
-	</string>
-	<string name="offline_message">
-		[FIRST] [LAST] er ikke logget på.
-	</string>
-	<string name="invite_message">
-		Tryk på [BUTTON NAME] knappen for at acceptére/tilslutte til denne stemme chat.
-	</string>
-	<string name="muted_message">
-		Du har blokeret denne beboer. Hvis du starter en samtale vil denne blokering automatisk blive fjernet.
-	</string>
-	<string name="generic_request_error">
-		Kunne ikke etablere forbindelse, prøv igen senere
-	</string>
-	<string name="insufficient_perms_error">
-		Du har ikke de fornødne rettigheder.
-	</string>
-	<string name="session_does_not_exist_error">
-		Denne samtale er lukket ned
-	</string>
-	<string name="no_ability_error">
-		Du har ikke den mulighed.
-	</string>
-	<string name="no_ability">
-		Du har ikke den mulighed.
-	</string>
-	<string name="not_a_mod_error">
-		Du er ikke moderator for denne samtale.
-	</string>
-	<string name="muted_error">
-		Du er blevet &quot;blokeret&quot;.
-	</string>
-	<string name="add_session_event">
-		Ikke muligt at tilføge brugere til samtale med [RECIPIENT].
-	</string>
-	<string name="message_session_event">
-		Ikke muligt at sende din besked til samtalen med [RECIPIENT].
-	</string>
-	<string name="removed_from_group">
-		Du er blevet fjernet fra gruppen.
-	</string>
-	<string name="close_on_no_ability">
-		Du har ikke længere mulighed for at deltage i samtalen
-	</string>
-			<string name="AcctTypeResident">
-				Beboer
-			</string>
-			<string name="AcctTypeTrial">
-				På prøve
-			</string>
-			<string name="AcctTypeCharterMember">
-				æresmedlem
-			</string>
-			<string name="AcctTypeEmployee">
-				Linden Lab medarbejder
-			</string>
-			<string name="PaymentInfoUsed">
-				Betalende medlem
-			</string>
-			<string name="PaymentInfoOnFile">
-				Registreret betalende
-			</string>
-			<string name="NoPaymentInfoOnFile">
-				Ingen betalingsinfo
-			</string>
-			<string name="AgeVerified">
-				Alders-checket
-			</string>
-			<string name="NotAgeVerified">
-				Ikke alders-checket
-			</string>
-</strings>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- This file contains strings that used to be hardcoded in the source.
+     It is only for those strings which do not belong in a floater.
+     For example, the strings used in avatar chat bubbles, and strings 
+     that are returned from one component and may appear in many places-->
+<strings>
+	<string name="SUPPORT_SITE">
+		Second Life Support Portal
+	</string>
+	<string name="StartupDetectingHardware">
+		Detekterer hardware...
+	</string>
+	<string name="StartupLoading">
+		Indlæser
+	</string>
+	<string name="LoginInProgress">
+		Logger p. [APP_NAME] kan virke laast.  Vent venligst.
+	</string>
+	<string name="LoginInProgressNoFrozen">
+		Logger på...
+	</string>
+	<string name="LoginAuthenticating">
+		Validerer adgang
+	</string>
+	<string name="LoginMaintenance">
+		Udfører konto vedligeholdelse...
+	</string>
+	<string name="LoginAttempt">
+		Tidligere forsø på login fejlede. Logger på, forsøg [NUMBER]
+	</string>
+	<string name="LoginPrecaching">
+		verden...
+	</string>
+	<string name="LoginInitializingBrowser">
+		Klargør indbyggede web browser...
+	</string>
+	<string name="LoginInitializingMultimedia">
+		Klargør multimedia...
+	</string>
+	<string name="LoginInitializingFonts">
+		Indlæser fonts...
+	</string>
+	<string name="LoginVerifyingCache">
+		Checker cache filer (kan tage 60-90 sekunder)...
+	</string>
+	<string name="LoginProcessingResponse">
+		Behandler svar ...
+	</string>
+	<string name="LoginInitializingWorld">
+		Initialiserer verden...
+	</string>
+	<string name="LoginDecodingImages">
+		Behandler billeder...
+	</string>
+	<string name="LoginInitializingQuicktime">
+		Initialiserer QuickTime...
+	</string>
+	<string name="LoginQuicktimeNotFound">
+		QuickTime ikke fundet- kunne derfor ikke initialisere.
+	</string>
+	<string name="LoginQuicktimeOK">
+		QuickTime initialiseret.
+	</string>
+	<string name="LoginWaitingForRegionHandshake">
+		Venter på svar fra region...
+	</string>
+	<string name="LoginConnectingToRegion">
+		Tilslutter til region...
+	</string>
+	<string name="LoginDownloadingClothing">
+		Henter tøj...
+	</string>
+	<string name="LoginFailedNoNetwork">
+		Netværksfejl: Kunne ikke etablere forbindelse, check venligst din netværksforbindelse.
+	</string>
+	<string name="Quit">
+		Afslut
+	</string>
+	<string name="AgentLostConnection">
+		Denne region kan have problemer. Tjek venligst din forbindelse til internettet.
+	</string>
+	<string name="TooltipPerson">
+		Person
+	</string>
+	<string name="TooltipNoName">
+		(intet navn)
+	</string>
+	<string name="TooltipOwner">
+		Ejer:
+	</string>
+	<string name="TooltipPublic">
+		Offentlig
+	</string>
+	<string name="TooltipIsGroup">
+		(Gruppe)
+	</string>
+	<string name="TooltipForSaleL$">
+		Til salg: L$[AMOUNT]
+	</string>
+	<string name="TooltipFlagGroupBuild">
+		Gruppe byg
+	</string>
+	<string name="TooltipFlagNoBuild">
+		Må ikke bygge
+	</string>
+	<string name="TooltipFlagNoEdit">
+		Gruppe byg
+	</string>
+	<string name="TooltipFlagNotSafe">
+		Ikke sikker område
+	</string>
+	<string name="TooltipFlagNoFly">
+		Ingen flyvning
+	</string>
+	<string name="TooltipFlagGroupScripts">
+		Gruppe scripts
+	</string>
+	<string name="TooltipFlagNoScripts">
+		Ingen Scripts
+	</string>
+	<string name="TooltipLand">
+		Land:
+	</string>
+	<string name="TooltipMustSingleDrop">
+		Kun et enkelt element kan trækkes ind her
+	</string>
+	<string name="TooltipHttpUrl">
+		Klik for at se denne hjemmeside
+	</string>
+	<string name="TooltipSLURL">
+		Klik for at se information om denne lokation
+	</string>
+	<string name="TooltipAgentUrl">
+		Klik for at denne beboers profil
+	</string>
+	<string name="TooltipGroupUrl">
+		Klik for at se denne gruppes beskrivelse
+	</string>
+	<string name="TooltipEventUrl">
+		Klik for at se beskrivelse af denne event
+	</string>
+	<string name="TooltipClassifiedUrl">
+		Klik for at se denne annonce
+	</string>
+	<string name="TooltipParcelUrl">
+		Klik for at se beskrivelse for denne parcel
+	</string>
+	<string name="TooltipTeleportUrl">
+		Klik for at teleportere til denne lokation
+	</string>
+	<string name="TooltipObjectIMUrl">
+		Klik for at se beskrivelse for dette objekt
+	</string>
+	<string name="TooltipMapUrl">
+		Klik for at se denne lokation på kortet
+	</string>
+	<string name="TooltipSLAPP">
+		Klik for at starte secondlife:// kommando
+	</string>
+	<string name="CurrentURL" value=" Nuværende URL: [CurrentURL]"/>
+	<string name="SLurlLabelTeleport">
+		Teleportér til
+	</string>
+	<string name="SLurlLabelShowOnMap">
+		Vis kort for
+	</string>
+	<string name="BUTTON_CLOSE_DARWIN">
+		Luk (&#8984;W)
+	</string>
+	<string name="BUTTON_CLOSE_WIN">
+		Luk (Ctrl+W)
+	</string>
+	<string name="BUTTON_RESTORE">
+		Gendan
+	</string>
+	<string name="BUTTON_MINIMIZE">
+		Minimér
+	</string>
+	<string name="BUTTON_TEAR_OFF">
+		Løsriv
+	</string>
+	<string name="BUTTON_DOCK">
+		Fastgør
+	</string>
+	<string name="BUTTON_UNDOCK">
+		Frigør
+	</string>
+	<string name="BUTTON_HELP">
+		Vis hjælp
+	</string>
+	<string name="Searching">
+		Søger...
+	</string>
+	<string name="NoneFound">
+		Intet fundet.
+	</string>
+	<string name="RetrievingData">
+		Henter...
+	</string>
+	<string name="ReleaseNotes">
+		Noter om version
+	</string>
+	<string name="LoadingData">
+		Henter...
+	</string>
+	<string name="AvatarNameNobody">
+		(ingen)
+	</string>
+	<string name="AvatarNameWaiting">
+		(venter)
+	</string>
+	<string name="AvatarNameHippos">
+		(hippos)
+	</string>
+	<string name="GroupNameNone">
+		(ingen)
+	</string>
+	<string name="AssetErrorNone">
+		Ingen fejl
+	</string>
+	<string name="AssetErrorRequestFailed">
+		Element forespørgsel: fejlede
+	</string>
+	<string name="AssetErrorNonexistentFile">
+		Element forespørgsel: fil findes ikke
+	</string>
+	<string name="AssetErrorNotInDatabase">
+		Element forespørgsel: element ikke fundet i database
+	</string>
+	<string name="AssetErrorEOF">
+		Slutning af fil
+	</string>
+	<string name="AssetErrorCannotOpenFile">
+		Kan ikke åbne fil
+	</string>
+	<string name="AssetErrorFileNotFound">
+		Fil ikke fundet
+	</string>
+	<string name="AssetErrorTCPTimeout">
+		Tidsgrænse overskredet ved filhentning
+	</string>
+	<string name="AssetErrorCircuitGone">
+		Forbindelsen mistet
+	</string>
+	<string name="AssetErrorPriceMismatch">
+		[APP_NAME] klient og server er uenige om prisen
+	</string>
+	<string name="AssetErrorUnknownStatus">
+		Ukendt status
+	</string>
+	<string name="texture">
+		tekstur
+	</string>
+	<string name="sound">
+		lyd
+	</string>
+	<string name="calling card">
+		visitkort
+	</string>
+	<string name="landmark">
+		landemærke
+	</string>
+	<string name="legacy script">
+		ældre script
+	</string>
+	<string name="clothing">
+		tøj
+	</string>
+	<string name="object">
+		objekt
+	</string>
+	<string name="note card">
+		note
+	</string>
+	<string name="folder">
+		mappe
+	</string>
+	<string name="root">
+		rod
+	</string>
+	<string name="lsl2 script">
+		LSL2 script
+	</string>
+	<string name="lsl bytecode">
+		LSL bytecode
+	</string>
+	<string name="tga texture">
+		tga texture
+	</string>
+	<string name="body part">
+		kropsdel
+	</string>
+	<string name="snapshot">
+		foto
+	</string>
+	<string name="lost and found">
+		Fundne genstande
+	</string>
+	<string name="targa image">
+		targa billede
+	</string>
+	<string name="trash">
+		Papirkurv
+	</string>
+	<string name="jpeg image">
+		jpeg billede
+	</string>
+	<string name="animation">
+		animation
+	</string>
+	<string name="gesture">
+		bevægelse
+	</string>
+	<string name="simstate">
+		simstate
+	</string>
+	<string name="favorite">
+		favorit
+	</string>
+	<string name="symbolic link">
+		link
+	</string>
+	<string name="AvatarAway">
+		Væk
+	</string>
+	<string name="AvatarBusy">
+		Optaget
+	</string>
+	<string name="AvatarMuted">
+		Blokeret
+	</string>
+	<string name="anim_express_afraid">
+		Bange
+	</string>
+	<string name="anim_express_anger">
+		Vred
+	</string>
+	<string name="anim_away">
+		Væk
+	</string>
+	<string name="anim_backflip">
+		Baglæns salto
+	</string>
+	<string name="anim_express_laugh">
+		Hjertelig latter
+	</string>
+	<string name="anim_express_toothsmile">
+		Stort smil
+	</string>
+	<string name="anim_blowkiss">
+		Sende kys
+	</string>
+	<string name="anim_express_bored">
+		Keder sig
+	</string>
+	<string name="anim_bow">
+		Buk
+	</string>
+	<string name="anim_clap">
+		Klap
+	</string>
+	<string name="anim_courtbow">
+		Højtideligt buk
+	</string>
+	<string name="anim_express_cry">
+		Græd
+	</string>
+	<string name="anim_dance1">
+		Dans 1
+	</string>
+	<string name="anim_dance2">
+		Dans 2
+	</string>
+	<string name="anim_dance3">
+		Dans 3
+	</string>
+	<string name="anim_dance4">
+		Dans 4
+	</string>
+	<string name="anim_dance5">
+		Dans 5
+	</string>
+	<string name="anim_dance6">
+		Dans 6
+	</string>
+	<string name="anim_dance7">
+		Dans 7
+	</string>
+	<string name="anim_dance8">
+		Dans 8
+	</string>
+	<string name="anim_express_disdain">
+		Foragt
+	</string>
+	<string name="anim_drink">
+		Drik
+	</string>
+	<string name="anim_express_embarrased">
+		Flov
+	</string>
+	<string name="anim_angry_fingerwag">
+		Løftet finger
+	</string>
+	<string name="anim_fist_pump">
+		Knytnæve
+	</string>
+	<string name="anim_yoga_float">
+		Svævende yoga
+	</string>
+	<string name="anim_express_frown">
+		Mistroisk
+	</string>
+	<string name="anim_impatient">
+		Utålmodig
+	</string>
+	<string name="anim_jumpforjoy">
+		Glædeshop
+	</string>
+	<string name="anim_kissmybutt">
+		Kys min r..
+	</string>
+	<string name="anim_express_kiss">
+		Kys
+	</string>
+	<string name="anim_laugh_short">
+		Grin
+	</string>
+	<string name="anim_musclebeach">
+		Bodybuilder
+	</string>
+	<string name="anim_no_unhappy">
+		Nej (sur)
+	</string>
+	<string name="anim_no_head">
+		Nej
+	</string>
+	<string name="anim_nyanya">
+		Æv-bæv
+	</string>
+	<string name="anim_punch_onetwo">
+		Et-to slag
+	</string>
+	<string name="anim_express_open_mouth">
+		Åben mund
+	</string>
+	<string name="anim_peace">
+		Peace
+	</string>
+	<string name="anim_point_you">
+		Peg på andre
+	</string>
+	<string name="anim_point_me">
+		Peg på dig selv
+	</string>
+	<string name="anim_punch_l">
+		Slå venstre
+	</string>
+	<string name="anim_punch_r">
+		Slå højre
+	</string>
+	<string name="anim_rps_countdown">
+		SSP - Tæl
+	</string>
+	<string name="anim_rps_paper">
+		SSP - Papir
+	</string>
+	<string name="anim_rps_rock">
+		SSP - Sten
+	</string>
+	<string name="anim_rps_scissors">
+		SSP - Saks
+	</string>
+	<string name="anim_express_repulsed">
+		Misfornøjet
+	</string>
+	<string name="anim_kick_roundhouse_r">
+		Karatepark
+	</string>
+	<string name="anim_express_sad">
+		Ked af det
+	</string>
+	<string name="anim_salute">
+		Honnør
+	</string>
+	<string name="anim_shout">
+		Råb
+	</string>
+	<string name="anim_express_shrug">
+		Skuldertræk
+	</string>
+	<string name="anim_express_smile">
+		Smil
+	</string>
+	<string name="anim_smoke_idle">
+		Ryg
+	</string>
+	<string name="anim_smoke_inhale">
+		Indhalér
+	</string>
+	<string name="anim_smoke_throw_down">
+		Smid cigaret
+	</string>
+	<string name="anim_express_surprise">
+		Overrasket
+	</string>
+	<string name="anim_sword_strike_r">
+		Sværdslag
+	</string>
+	<string name="anim_angry_tantrum">
+		Ekstatisk
+	</string>
+	<string name="anim_express_tongue_out">
+		Tunge ud
+	</string>
+	<string name="anim_hello">
+		Vink
+	</string>
+	<string name="anim_whisper">
+		Knib øje i
+	</string>
+	<string name="anim_whistle">
+		Pift
+	</string>
+	<string name="anim_express_wink">
+		Blink
+	</string>
+	<string name="anim_wink_hollywood">
+		Blink (Hollywood)
+	</string>
+	<string name="anim_express_worry">
+		Bekymret
+	</string>
+	<string name="anim_yes_happy">
+		Ja (glad)
+	</string>
+	<string name="anim_yes_head">
+		Ja
+	</string>
+	<string name="texture_loading">
+		Indlæser...
+	</string>
+	<string name="worldmap_offline">
+		Offline
+	</string>
+	<string name="worldmap_results_none_found">
+		Ingen fundet.
+	</string>
+	<string name="Ok">
+		OK
+	</string>
+	<string name="Premature end of file">
+		Fil slutter for tidligt
+	</string>
+	<string name="ST_NO_JOINT">
+		Kan ikke funde ROOT eller JOINT.
+	</string>
+	<string name="whisper">
+		hvisker:
+	</string>
+	<string name="shout">
+		råber:
+	</string>
+	<string name="ringing">
+		Forbinder til stemmechat...
+	</string>
+	<string name="connected">
+		Forbundet
+	</string>
+	<string name="unavailable">
+		Stemmechat er ikke tilladt hvor du befinder dig
+	</string>
+	<string name="hang_up">
+		Stemme chat er afbrudt
+	</string>
+	<string name="ScriptQuestionCautionChatGranted">
+		&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[OWNERNAME]&apos;, lokaliseret i [REGIONNAME] på [REGIONPOS], har fået tilladelse til: [PERMISSIONS].
+	</string>
+	<string name="ScriptQuestionCautionChatDenied">
+		&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[OWNERNAME]&apos;, lokaliseret i [REGIONNAME] på [REGIONPOS], er afvist tilladelse til: [PERMISSIONS].
+	</string>
+	<string name="ScriptTakeMoney">
+		Tag Linden dollars (L$) fra dig
+	</string>
+	<string name="ActOnControlInputs">
+		Reagér på dine kontrol-taster
+	</string>
+	<string name="RemapControlInputs">
+		Ændre dine kontrol-taster
+	</string>
+	<string name="AnimateYourAvatar">
+		Animér din avatar
+	</string>
+	<string name="AttachToYourAvatar">
+		Sæt på din avatar
+	</string>
+	<string name="ReleaseOwnership">
+		Fjern ejerskabet og sæt til offentlig
+	</string>
+	<string name="LinkAndDelink">
+		Sammenkæd og adskil andre genstande
+	</string>
+	<string name="AddAndRemoveJoints">
+		Tilføj og fjern sammenkødninger med andre genstande
+	</string>
+	<string name="ChangePermissions">
+		Ændre dens tilladelser
+	</string>
+	<string name="TrackYourCamera">
+		Spor dit kamera
+	</string>
+	<string name="ControlYourCamera">
+		Kontrollér dit kamera
+	</string>
+	<string name="SIM_ACCESS_PG">
+		PG
+	</string>
+	<string name="SIM_ACCESS_MATURE">
+		Mature
+	</string>
+	<string name="SIM_ACCESS_ADULT">
+		Adult
+	</string>
+	<string name="SIM_ACCESS_DOWN">
+		logget af
+	</string>
+	<string name="SIM_ACCESS_MIN">
+		Ukendt
+	</string>
+	<string name="land_type_unknown">
+		(ukendt)
+	</string>
+	<string name="all_files">
+		Alle filer
+	</string>
+	<string name="sound_files">
+		Lyde
+	</string>
+	<string name="animation_files">
+		Animationer
+	</string>
+	<string name="image_files">
+		Billeder
+	</string>
+	<string name="save_file_verb">
+		Gem
+	</string>
+	<string name="load_file_verb">
+		Hent
+	</string>
+	<string name="targa_image_files">
+		Targa billeder
+	</string>
+	<string name="bitmap_image_files">
+		Bitmap billeder
+	</string>
+	<string name="avi_movie_file">
+		AVI film fil
+	</string>
+	<string name="xaf_animation_file">
+		XAF Anim Fil
+	</string>
+	<string name="xml_file">
+		XML Fil
+	</string>
+	<string name="dot_raw_file">
+		RAW Fil
+	</string>
+	<string name="compressed_image_files">
+		Komprimerede billeder
+	</string>
+	<string name="load_files">
+		Hent filer
+	</string>
+	<string name="choose_the_directory">
+		Vælg bibliotek
+	</string>
+	<string name="AvatarSetNotAway">
+		Sæt &quot;til stede&quot;
+	</string>
+	<string name="AvatarSetAway">
+		Sæt &quot;væk&quot;
+	</string>
+	<string name="AvatarSetNotBusy">
+		Sæt &quot;ledig&quot;
+	</string>
+	<string name="AvatarSetBusy">
+		Sæt &quot;optaget&quot;
+	</string>
+	<string name="shape">
+		Form
+	</string>
+	<string name="skin">
+		Hud
+	</string>
+	<string name="hair">
+		Hår
+	</string>
+	<string name="eyes">
+		Øjne
+	</string>
+	<string name="shirt">
+		Trøje
+	</string>
+	<string name="pants">
+		Bukser
+	</string>
+	<string name="shoes">
+		Sko
+	</string>
+	<string name="socks">
+		Strømper
+	</string>
+	<string name="jacket">
+		Jakke
+	</string>
+	<string name="gloves">
+		Handsker
+	</string>
+	<string name="undershirt">
+		Undertrøje
+	</string>
+	<string name="underpants">
+		Underbukser
+	</string>
+	<string name="skirt">
+		Nederdel
+	</string>
+	<string name="alpha">
+		Alpha
+	</string>
+	<string name="tattoo">
+		Tatovering
+	</string>
+	<string name="invalid">
+		ugyldig
+	</string>
+	<string name="next">
+		Næste
+	</string>
+	<string name="ok">
+		OK
+	</string>
+	<string name="GroupNotifyGroupNotice">
+		Gruppe besked
+	</string>
+	<string name="GroupNotifyGroupNotices">
+		Gruppe besked
+	</string>
+	<string name="GroupNotifySentBy">
+		Sendt af
+	</string>
+	<string name="GroupNotifyAttached">
+		Vedhæftet:
+	</string>
+	<string name="GroupNotifyViewPastNotices">
+		Se tidligere beskeder eller slå modtagelse af beskeder fra her.
+	</string>
+	<string name="GroupNotifyOpenAttachment">
+		Åben vedhæng
+	</string>
+	<string name="GroupNotifySaveAttachment">
+		Gem vedhæng
+	</string>
+	<string name="TeleportOffer">
+		Teleport tilbud
+	</string>
+	<string name="StartUpNotification">
+		%d nye besked modtaget mens du var væk...
+	</string>
+	<string name="StartUpNotifications">
+		%d nye beskeder modtaget mens du var væk......
+	</string>
+	<string name="OverflowInfoChannelString">
+		Du har %d mere besked(er)
+	</string>
+	<string name="BodyPartsRightArm">
+		Højre arm
+	</string>
+	<string name="BodyPartsHead">
+		Hoved
+	</string>
+	<string name="BodyPartsLeftArm">
+		Venstre arm
+	</string>
+	<string name="BodyPartsLeftLeg">
+		Venstre ben
+	</string>
+	<string name="BodyPartsTorso">
+		Overkrop
+	</string>
+	<string name="BodyPartsRightLeg">
+		Højre ben
+	</string>
+	<string name="GraphicsQualityLow">
+		Lav
+	</string>
+	<string name="GraphicsQualityMid">
+		Middel
+	</string>
+	<string name="GraphicsQualityHigh">
+		Høj
+	</string>
+	<string name="LeaveMouselook">
+		Tryk ESC for at skift til normalt udsyn
+	</string>
+	<string name="InventoryNoMatchingItems">
+		No matching items found in inventory.
+	</string>
+	<string name="InventoryNoTexture">
+		Du har ikke en kopi af denne
+tekstur i din beholdning.
+	</string>
+	<string name="no_transfer" value=" (ikke overdragbar)"/>
+	<string name="no_modify" value=" (ikke redigere)"/>
+	<string name="no_copy" value=" (ikke kopiere)"/>
+	<string name="worn" value=" (båret)"/>
+	<string name="link" value=" (sammenkæde)"/>
+	<string name="broken_link" value=" (brudt_kæde)&quot;"/>
+	<string name="LoadingContents">
+		Henter indhold...
+	</string>
+	<string name="NoContents">
+		Intet indhold
+	</string>
+	<string name="WornOnAttachmentPoint" value=" (båret på [ATTACHMENT_POINT])"/>
+	<string name="Chat" value=" Chat : "/>
+	<string name="Sound" value=" Lyd : "/>
+	<string name="Wait" value=" --- Vent : "/>
+	<string name="AnimFlagStop" value=" Stop Animation :   "/>
+	<string name="AnimFlagStart" value=" Start Animation :   "/>
+	<string name="Wave" value=" Vink "/>
+	<string name="HelloAvatar" value=" Hej, avatar! "/>
+	<string name="ViewAllGestures" value=" Se alle &gt;&gt;"/>
+	<string name="Animations" value=" Animationer,"/>
+	<string name="Calling Cards" value=" Visitkort,"/>
+	<string name="Clothing" value=" Tøj,"/>
+	<string name="Gestures" value=" Bevægelser,"/>
+	<string name="Landmarks" value=" Landemærker,"/>
+	<string name="Notecards" value=" Note,"/>
+	<string name="Objects" value=" Objekter,"/>
+	<string name="Scripts" value=" Scripts,"/>
+	<string name="Sounds" value=" Lyde,"/>
+	<string name="Textures" value=" Teksturer,"/>
+	<string name="Snapshots" value=" Fotos,"/>
+	<string name="No Filters" value="Nej "/>
+	<string name="Since Logoff" value=" - Siden log ud"/>
+	<string name="InvFolder My Inventory">
+		Min beholdning
+	</string>
+	<string name="InvFolder My Favorites">
+		Mine favoritter
+	</string>
+	<string name="InvFolder Library">
+		Bibliotek
+	</string>
+	<string name="InvFolder Textures">
+		Teksturer
+	</string>
+	<string name="InvFolder Sounds">
+		Lyde
+	</string>
+	<string name="InvFolder Calling Cards">
+		Visitkort
+	</string>
+	<string name="InvFolder Landmarks">
+		Landemærker
+	</string>
+	<string name="InvFolder Scripts">
+		Scripts
+	</string>
+	<string name="InvFolder Clothing">
+		Tøj
+	</string>
+	<string name="InvFolder Objects">
+		Objekter
+	</string>
+	<string name="InvFolder Notecards">
+		Noter
+	</string>
+	<string name="InvFolder New Folder">
+		Ny mappe
+	</string>
+	<string name="InvFolder Inventory">
+		Beholdning
+	</string>
+	<string name="InvFolder Uncompressed Images">
+		Ukomprimerede billeder
+	</string>
+	<string name="InvFolder Body Parts">
+		Kropsdele
+	</string>
+	<string name="InvFolder Trash">
+		Papirkurv
+	</string>
+	<string name="InvFolder Photo Album">
+		Fotoalbum
+	</string>
+	<string name="InvFolder Lost And Found">
+		Fundne genstande
+	</string>
+	<string name="InvFolder Uncompressed Sounds">
+		Ukomprimerede lyde
+	</string>
+	<string name="InvFolder Animations">
+		Animationer
+	</string>
+	<string name="InvFolder Gestures">
+		Bevægelser
+	</string>
+	<string name="InvFolder favorite">
+		Favoritter
+	</string>
+	<string name="InvFolder Current Outfit">
+		Nuværende sæt
+	</string>
+	<string name="InvFolder My Outfits">
+		Mine sæt
+	</string>
+	<string name="InvFolder Friends">
+		Venner
+	</string>
+	<string name="InvFolder All">
+		Alle
+	</string>
+	<string name="Buy">
+		Køb
+	</string>
+	<string name="BuyforL$">
+		Køb for L$
+	</string>
+	<string name="Stone">
+		Sten
+	</string>
+	<string name="Metal">
+		Metal
+	</string>
+	<string name="Glass">
+		Glas
+	</string>
+	<string name="Wood">
+		Træ
+	</string>
+	<string name="Flesh">
+		Kød
+	</string>
+	<string name="Plastic">
+		Plastik
+	</string>
+	<string name="Rubber">
+		Gummi
+	</string>
+	<string name="Light">
+		Lys
+	</string>
+	<string name="KBShift">
+		Shift
+	</string>
+	<string name="KBCtrl">
+		Ctrl
+	</string>
+	<string name="Chest">
+		Bryst
+	</string>
+	<string name="Skull">
+		Hovedskal
+	</string>
+	<string name="Left Shoulder">
+		Venstre skulder
+	</string>
+	<string name="Right Shoulder">
+		Højre skulder
+	</string>
+	<string name="Left Hand">
+		Venstre hånd
+	</string>
+	<string name="Right Hand">
+		Højre hånd
+	</string>
+	<string name="Left Foot">
+		Venstre fod
+	</string>
+	<string name="Right Foot">
+		Højre fod
+	</string>
+	<string name="Spine">
+		Rygsøjle
+	</string>
+	<string name="Pelvis">
+		Bækken
+	</string>
+	<string name="Mouth">
+		Mund
+	</string>
+	<string name="Chin">
+		Hage
+	</string>
+	<string name="Left Ear">
+		Venstre øre
+	</string>
+	<string name="Right Ear">
+		Højre øre
+	</string>
+	<string name="Left Eyeball">
+		Venstre øje
+	</string>
+	<string name="Right Eyeball">
+		Højre øje
+	</string>
+	<string name="Nose">
+		Næse
+	</string>
+	<string name="R Upper Arm">
+		H overarm
+	</string>
+	<string name="R Forearm">
+		H underarm
+	</string>
+	<string name="L Upper Arm">
+		V overarm
+	</string>
+	<string name="L Forearm">
+		V underarm
+	</string>
+	<string name="Right Hip">
+		Højre hofte
+	</string>
+	<string name="R Upper Leg">
+		Højre lår
+	</string>
+	<string name="R Lower Leg">
+		H underben
+	</string>
+	<string name="Left Hip">
+		Venstre hofte
+	</string>
+	<string name="L Upper Leg">
+		Venstre lår
+	</string>
+	<string name="L Lower Leg">
+		V underben
+	</string>
+	<string name="Stomach">
+		Mave
+	</string>
+	<string name="Left Pec">
+		Venstre bryst
+	</string>
+	<string name="Right Pec">
+		Højre bryst
+	</string>
+	<string name="YearsMonthsOld">
+		[AGEYEARS] [AGEMONTHS] gammel
+	</string>
+	<string name="YearsOld">
+		[AGEYEARS] gammel
+	</string>
+	<string name="MonthsOld">
+		[AGEMONTHS] gammel
+	</string>
+	<string name="WeeksOld">
+		[AGEWEEKS] gammel
+	</string>
+	<string name="DaysOld">
+		[AGEDAYS] gammel
+	</string>
+	<string name="TodayOld">
+		Med fra i dag
+	</string>
+	<string name="AgeYearsA">
+		[COUNT] år
+	</string>
+	<string name="AgeYearsB">
+		[COUNT] år
+	</string>
+	<string name="AgeYearsC">
+		[COUNT] år
+	</string>
+	<string name="AgeMonthsA">
+		[COUNT] måned
+	</string>
+	<string name="AgeMonthsB">
+		[COUNT] måneder
+	</string>
+	<string name="AgeMonthsC">
+		[COUNT] måneder
+	</string>
+	<string name="AgeWeeksA">
+		[COUNT] uge
+	</string>
+	<string name="AgeWeeksB">
+		[COUNT] uger
+	</string>
+	<string name="AgeWeeksC">
+		[COUNT] uger
+	</string>
+	<string name="AgeDaysA">
+		[COUNT] dag
+	</string>
+	<string name="AgeDaysB">
+		[COUNT] dage
+	</string>
+	<string name="AgeDaysC">
+		[COUNT] dage
+	</string>
+	<string name="GroupMembersA">
+		[COUNT] medlem
+	</string>
+	<string name="GroupMembersB">
+		[COUNT] medlemmer
+	</string>
+	<string name="GroupMembersC">
+		[COUNT] medlemmer
+	</string>
+	<string name="AcctTypeResident">
+		Beboer
+	</string>
+	<string name="AcctTypeTrial">
+		På prøve
+	</string>
+	<string name="AcctTypeCharterMember">
+		Æresmedlemmer
+	</string>
+	<string name="AcctTypeEmployee">
+		Linden Lab medarbejder
+	</string>
+	<string name="PaymentInfoUsed">
+		Betalende medlem
+	</string>
+	<string name="PaymentInfoOnFile">
+		Betalingsinfo registreret
+	</string>
+	<string name="NoPaymentInfoOnFile">
+		Ingen betalingsinfo
+	</string>
+	<string name="AgeVerified">
+		Alders-checket
+	</string>
+	<string name="NotAgeVerified">
+		Ikke alders-checket
+	</string>
+	<string name="Center 2">
+		Center 2
+	</string>
+	<string name="Top Right">
+		Øverst højre
+	</string>
+	<string name="Top">
+		Top
+	</string>
+	<string name="Top Left">
+		Øverst venstre
+	</string>
+	<string name="Center">
+		Centrum
+	</string>
+	<string name="Bottom Left">
+		Nederst venstre
+	</string>
+	<string name="Bottom">
+		Nederst midt
+	</string>
+	<string name="Bottom Right">
+		nederst højre
+	</string>
+	<string name="CompileQueueDownloadedCompiling">
+		Hentet, kompilerer nu
+	</string>
+	<string name="CompileQueueScriptNotFound">
+		Script ikke fundet på server.
+	</string>
+	<string name="CompileQueueProblemDownloading">
+		Problem ved download
+	</string>
+	<string name="CompileQueueInsufficientPermDownload">
+		Ikke rettigheder til at downloade script.
+	</string>
+	<string name="CompileQueueInsufficientPermFor">
+		Ikke nok rettigheder til at
+	</string>
+	<string name="CompileQueueUnknownFailure">
+		Ukendt fejl ved download
+	</string>
+	<string name="CompileQueueTitle">
+		Rekompilering fremskridt
+	</string>
+	<string name="CompileQueueStart">
+		Rekompilér
+	</string>
+	<string name="ResetQueueTitle">
+		Nulstil fremskridt
+	</string>
+	<string name="ResetQueueStart">
+		nulstil
+	</string>
+	<string name="RunQueueTitle">
+		Sæt &quot;running&quot; fremskridt
+	</string>
+	<string name="RunQueueStart">
+		sæt til &quot;running&quot;
+	</string>
+	<string name="NotRunQueueTitle">
+		Sæt &quot;Not Running&quot; fremskridt
+	</string>
+	<string name="NotRunQueueStart">
+		sæt til &quot;not running&quot;
+	</string>
+	<string name="CompileSuccessful">
+		Kompleret uden fejl!
+	</string>
+	<string name="CompileSuccessfulSaving">
+		Kompileret uden fejl, gemmer...
+	</string>
+	<string name="SaveComplete">
+		Gemt.
+	</string>
+	<string name="ObjectOutOfRange">
+		Script (&quot;object out of range&quot;)
+	</string>
+	<string name="GodToolsObjectOwnedBy">
+		Objekt [OBJECT] ejet af [OWNER]
+	</string>
+	<string name="GroupsNone">
+		ingen
+	</string>
+	<string name="Group" value=" (gruppe)"/>
+	<string name="Unknown">
+		(ukendt)
+	</string>
+	<string name="SummaryForTheWeek" value="Opsummering for denne uge, begyndende med "/>
+	<string name="NextStipendDay" value="Næste stipendie dag er "/>
+	<string name="GroupIndividualShare" value="                      Gruppe     Individuel Delt"/>
+	<string name="Balance">
+		Balance
+	</string>
+	<string name="Credits">
+		Kredit
+	</string>
+	<string name="Debits">
+		Debet
+	</string>
+	<string name="Total">
+		Total
+	</string>
+	<string name="NoGroupDataFound">
+		Ingen gruppedata fundet for gruppe
+	</string>
+	<string name="IMParentEstate">
+		overordnet estate
+	</string>
+	<string name="IMMainland">
+		mainland
+	</string>
+	<string name="IMTeen">
+		teen
+	</string>
+	<string name="RegionInfoError">
+		fejl
+	</string>
+	<string name="RegionInfoAllEstatesOwnedBy">
+		alle estates ejet af [OWNER]
+	</string>
+	<string name="RegionInfoAllEstatesYouOwn">
+		alle estates du ejer
+	</string>
+	<string name="RegionInfoAllEstatesYouManage">
+		alle estates du administrerer for [OWNER]
+	</string>
+	<string name="RegionInfoAllowedResidents">
+		Godkendte beboere: ([ALLOWEDAGENTS], max. [MAXACCESS])
+	</string>
+	<string name="RegionInfoAllowedGroups">
+		Godkendte grupper: ([ALLOWEDGROUPS], max. [MAXACCESS])
+	</string>
+	<string name="CursorPos">
+		Linie [LINE], Kolonne [COLUMN]
+	</string>
+	<string name="PanelDirCountFound">
+		[COUNT] fundet
+	</string>
+	<string name="PanelContentsNewScript">
+		Nyt script
+	</string>
+	<string name="MuteByName">
+		(efter navn)
+	</string>
+	<string name="MuteAgent">
+		(beboer)
+	</string>
+	<string name="MuteObject">
+		(objekt)
+	</string>
+	<string name="MuteGroup">
+		(gruppe)
+	</string>
+	<string name="RegionNoCovenant">
+		Der er ingen regler for dette estate.
+	</string>
+	<string name="RegionNoCovenantOtherOwner">
+		Der er ingen regler for dette estate. Land på dette estate sælges af estate ejeren, ikke af Linden Lab.  Kontakt venligst estate ejeren for detaljer om salg.
+	</string>
+	<string name="covenant_last_modified">
+		Sidst ændret:
+	</string>
+	<string name="none_text" value=" (ingen) "/>
+	<string name="never_text" value=" (aldrig) "/>
+	<string name="GroupOwned">
+		Gruppe ejet
+	</string>
+	<string name="Public">
+		Offentlig
+	</string>
+	<string name="ClassifiedClicksTxt">
+		Klik: [TELEPORT] teleport, [MAP] kort, [PROFILE] profil
+	</string>
+	<string name="ClassifiedUpdateAfterPublish">
+		(vil blive opdateret efter offentliggørelse)
+	</string>
+	<string name="MultiPreviewTitle">
+		Vis først
+	</string>
+	<string name="MultiPropertiesTitle">
+		Egenskaber
+	</string>
+	<string name="InvOfferAnObjectNamed">
+		Et objekt med navnet
+	</string>
+	<string name="InvOfferOwnedByGroup">
+		ejet af gruppen
+	</string>
+	<string name="InvOfferOwnedByUnknownGroup">
+		ejet af en ukendt gruppe
+	</string>
+	<string name="InvOfferOwnedBy">
+		ejet af
+	</string>
+	<string name="InvOfferOwnedByUnknownUser">
+		ejet af en ukendt bruger
+	</string>
+	<string name="InvOfferGaveYou">
+		gav dig
+	</string>
+	<string name="InvOfferYouDecline">
+		Du afslår
+	</string>
+	<string name="InvOfferFrom">
+		fra
+	</string>
+	<string name="GroupMoneyTotal">
+		Total
+	</string>
+	<string name="GroupMoneyBought">
+		købt
+	</string>
+	<string name="GroupMoneyPaidYou">
+		betalte dig
+	</string>
+	<string name="GroupMoneyPaidInto">
+		betalt til
+	</string>
+	<string name="GroupMoneyBoughtPassTo">
+		købte adgang til
+	</string>
+	<string name="GroupMoneyPaidFeeForEvent">
+		betalte gebyr for event
+	</string>
+	<string name="GroupMoneyPaidPrizeForEvent">
+		betalte prisen for event
+	</string>
+	<string name="GroupMoneyBalance">
+		Balance
+	</string>
+	<string name="GroupMoneyCredits">
+		Kredit
+	</string>
+	<string name="GroupMoneyDebits">
+		Debet
+	</string>
+	<string name="ViewerObjectContents">
+		Indhold
+	</string>
+	<string name="AcquiredItems">
+		Anskaffede genstande
+	</string>
+	<string name="Cancel">
+		Annullér
+	</string>
+	<string name="UploadingCosts">
+		Uploader [%s] omkostninger
+	</string>
+	<string name="UnknownFileExtension">
+		Ukendt fil efternavn [.%s]
+Forventet .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
+	</string>
+	<string name="AddLandmarkNavBarMenu">
+		Tilføj landemærke...
+	</string>
+	<string name="EditLandmarkNavBarMenu">
+		Redigér landemærke...
+	</string>
+	<string name="accel-mac-control">&#8963;</string>
+	<string name="accel-mac-command">&#8984;</string>
+	<string name="accel-mac-option">&#8997;</string>
+	<string name="accel-mac-shift">&#8679;</string>
+	<string name="accel-win-control">
+		Ctrl+
+	</string>
+	<string name="accel-win-alt">
+		Alt+
+	</string>
+	<string name="accel-win-shift">
+		Shift+
+	</string>
+	<string name="FileSaved">
+		Fil gemt
+	</string>
+	<string name="Receiving">
+		Modtager
+	</string>
+	<string name="AM">
+		AM
+	</string>
+	<string name="PM">
+		PM
+	</string>
+	<string name="PST">
+		PST
+	</string>
+	<string name="PDT">
+		PDT
+	</string>
+	<string name="Forward">
+		Fremad
+	</string>
+	<string name="Left">
+		Venstre
+	</string>
+	<string name="Right">
+		Højre
+	</string>
+	<string name="Back">
+		Bagud
+	</string>
+	<string name="North">
+		Nord
+	</string>
+	<string name="South">
+		Syd
+	</string>
+	<string name="West">
+		Vest
+	</string>
+	<string name="East">
+		Øst
+	</string>
+	<string name="Up">
+		Op
+	</string>
+	<string name="Down">
+		Ned
+	</string>
+	<string name="Any Category">
+		Enhver kategori
+	</string>
+	<string name="Shopping">
+		Shopping
+	</string>
+	<string name="Land Rental">
+		Land til leje
+	</string>
+	<string name="Property Rental">
+		Grunde til leje
+	</string>
+	<string name="Special Attraction">
+		Speciel attraktion
+	</string>
+	<string name="New Products">
+		Nye produkter
+	</string>
+	<string name="Employment">
+		Jobs
+	</string>
+	<string name="Wanted">
+		Søges
+	</string>
+	<string name="Service">
+		Service
+	</string>
+	<string name="Personal">
+		Personlig
+	</string>
+	<string name="None">
+		Ingen
+	</string>
+	<string name="Linden Location">
+		Linden sted
+	</string>
+	<string name="Adult">
+		Adult
+	</string>
+	<string name="Arts&amp;Culture">
+		Kunst &amp; kultur
+	</string>
+	<string name="Business">
+		Business
+	</string>
+	<string name="Educational">
+		Uddannelse
+	</string>
+	<string name="Gaming">
+		Spil
+	</string>
+	<string name="Hangout">
+		Afslapning
+	</string>
+	<string name="Newcomer Friendly">
+		Nybegynder venligt
+	</string>
+	<string name="Parks&amp;Nature">
+		Parker &amp; natur
+	</string>
+	<string name="Residential">
+		Beboelse
+	</string>
+	<string name="Stage">
+		Fase
+	</string>
+	<string name="Other">
+		Andet
+	</string>
+	<string name="Any">
+		Enhver
+	</string>
+	<string name="You">
+		Dig
+	</string>
+	<string name="Multiple Media">
+		Flere medietyper
+	</string>
+	<string name="Play Media">
+		Afspil/Pause medie
+	</string>
+	<string name="MBCmdLineError">
+		Der opstod en fejl ved afvikling af kommandolinie.
+Se venligst: http://wiki.secondlife.com/wiki/Client_parameters
+Fejl:
+	</string>
+	<string name="MBCmdLineUsg">
+		[APP_NAME] Kommando linie brug:
+	</string>
+	<string name="MBUnableToAccessFile">
+		[APP_NAME] kan ikke få adgang til fil den/det skal bruge.
+
+Dette kan skyldes at du har flere kopier kørende eller operativsystemet tror at filen allerede er åben.
+Hvis fejlen bliver ved, genstart computer og prøv igen.
+Hvis fejlen stadig bliver ved, kan det være nødvendigt at afinstallere [APP_NAME] og installere igen.
+	</string>
+	<string name="MBFatalError">
+		Fatal fejl
+	</string>
+	<string name="MBRequiresAltiVec">
+		[APP_NAME] kræver en processor med AltiVec (G4 eller nyere).
+	</string>
+	<string name="MBAlreadyRunning">
+		[APP_NAME] kører allerede.
+Undersøg din &quot;task bar&quot; for at se efter minimeret version af programmet.
+Hvis fejlen fortsætter, prøv at genstarte din computer.
+	</string>
+	<string name="MBFrozenCrashed">
+		[APP_NAME] ser ud til at være &quot;frosset&quot; eller gået ned tidligere.
+Ønsker du at sende en fejlrapport?
+	</string>
+	<string name="MBAlert">
+		Besked
+	</string>
+	<string name="MBNoDirectX">
+		[APP_NAME] kan ikke detektere DirectX 9.0b eller nyere.
+[APP_NAME] benytte DirectX til at detektere hardware og/eller forældede drivere der kan give problemer med stabilitet, dårlig hastighed eller nedbrud.  Selvom du kan køre [APP_NAME] uden det, anbefaler vi meget at køre med DirectX 9.0b.
+
+Ønsker du at fortsætte?
+	</string>
+	<string name="MBWarning">
+		Advarsel
+	</string>
+	<string name="MBNoAutoUpdate">
+		Automatisk opdatering er endnu ikke implementeret på Linux.
+Hent venligst den nyeste version på www.secondlife.com.
+	</string>
+	<string name="MBRegClassFailed">
+		RegisterClass fejlede
+	</string>
+	<string name="MBError">
+		Fejl
+	</string>
+	<string name="MBFullScreenErr">
+		Ikke muligt at køre i fuldskærm med [WIDTH] x [HEIGHT].
+Afvikler i vindue.
+	</string>
+	<string name="MBDestroyWinFailed">
+		Nedlukningsfejl ved lukning af vindue (DestroyWindow() fejlede)
+	</string>
+	<string name="MBShutdownErr">
+		Fejl ved nedlukning
+	</string>
+	<string name="MBDevContextErr">
+		Kan ikke oprette &quot;GL device context&quot;
+	</string>
+	<string name="MBPixelFmtErr">
+		Kan ikke finde passende &quot;pixel format&quot;
+	</string>
+	<string name="MBPixelFmtDescErr">
+		Kan ikke finde &quot;pixel format&quot; beskrivelse
+	</string>
+	<string name="MBTrueColorWindow">
+		[APP_NAME] kræver &quot;True Color (32-bit)&quot; for at kunne køre.
+Gå venligst til din computers skærmopsætning og sæt &quot;color mode&quot; til 32-bit.
+	</string>
+	<string name="MBAlpha">
+		[APP_NAME] kan ikke køre, da den ikke kan finde en &quot;8 bit alpha channel&quot;.  Normalt skyldes dette et problem med en video driver.
+Venligst undersøg om du har de nyeste drivere til dit videokort installeret.
+Din skærm skal også være sat op til at køre &quot;True Color (32-bit)&quot;  i din displayopsætning.
+Hvis du bliver ved med at modtage denne besked, kontakt [SUPPORT_SITE].
+	</string>
+	<string name="MBPixelFmtSetErr">
+		Kan ikke sætte &quot;pixel format&quot;
+	</string>
+	<string name="MBGLContextErr">
+		Kan ikke oprette &quot;GL rendering context&quot;
+	</string>
+	<string name="MBGLContextActErr">
+		Kan ikke aktivere &quot;GL rendering context&quot;
+	</string>
+	<string name="MBVideoDrvErr">
+		[APP_NAME] kan ikke afvikles da driverne til dit videokort ikke blev installeret korrekt, er forældede, eller du benytter hardware der ikke er supporteret. Undersøg venligst om du har installeret de nyeste drivere til dit grafikkort, og selv om du har de nyeste, prøv at geninstallere dem.
+
+Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
+	</string>
+	<string name="5 O&apos;Clock Shadow">
+		Skægstubbe
+	</string>
+	<string name="All White">
+		Helt hvidt
+	</string>
+	<string name="Anime Eyes">
+		Store øjne
+	</string>
+	<string name="Arced">
+		Spidst
+	</string>
+	<string name="Arm Length">
+		Armængde
+	</string>
+	<string name="Attached">
+		Vedhæftet
+	</string>
+	<string name="Attached Earlobes">
+		Vedhæftede øreflipper
+	</string>
+	<string name="Back Bangs">
+		Nakkehår
+	</string>
+	<string name="Back Bangs Down">
+		Nakkehår langt
+	</string>
+	<string name="Back Bangs Up">
+		Nakkehår kort
+	</string>
+	<string name="Back Fringe">
+		Nakkehår
+	</string>
+	<string name="Back Hair">
+		Volumen
+	</string>
+	<string name="Back Hair Down">
+		Volumen nedad
+	</string>
+	<string name="Back Hair Up">
+		Volumen op
+	</string>
+	<string name="Baggy">
+		Posede
+	</string>
+	<string name="Bangs">
+		Pandehår
+	</string>
+	<string name="Bangs Down">
+		Pandehår ned
+	</string>
+	<string name="Bangs Up">
+		Pandehår op
+	</string>
+	<string name="Beady Eyes">
+		Stikkende øjne
+	</string>
+	<string name="Belly Size">
+		Mave størrelse
+	</string>
+	<string name="Big">
+		Stor
+	</string>
+	<string name="Big Butt">
+		Stor bagdel
+	</string>
+	<string name="Big Eyeball">
+		Store øjenæbler
+	</string>
+	<string name="Big Hair Back">
+		Stort hår: Bag
+	</string>
+	<string name="Big Hair Front">
+		Stort hår: Foran
+	</string>
+	<string name="Big Hair Top">
+		Stort hår: Top
+	</string>
+	<string name="Big Head">
+		Stort hovede
+	</string>
+	<string name="Big Pectorals">
+		Store brystmuskler
+	</string>
+	<string name="Big Spikes">
+		Store spikes
+	</string>
+	<string name="Black">
+		Sort
+	</string>
+	<string name="Blonde">
+		Blond
+	</string>
+	<string name="Blonde Hair">
+		Blondt hår
+	</string>
+	<string name="Blush">
+		Rødmen
+	</string>
+	<string name="Blush Color">
+		Rødme farve
+	</string>
+	<string name="Blush Opacity">
+		Rødme gennemsigtighed
+	</string>
+	<string name="Body Definition">
+		Kropskontur
+	</string>
+	<string name="Body Fat">
+		Kropsfedt
+	</string>
+	<string name="Body Freckles">
+		Fregner på kroppen
+	</string>
+	<string name="Body Thick">
+		Tyk krop
+	</string>
+	<string name="Body Thickness">
+		Kropstykkelse
+	</string>
+	<string name="Body Thin">
+		Tynd krop
+	</string>
+	<string name="Bow Legged">
+		Hjulbenet
+	</string>
+	<string name="Breast Buoyancy">
+		Bryst tyngdepåvirkning
+	</string>
+	<string name="Breast Cleavage">
+		Kavalergang
+	</string>
+	<string name="Breast Size">
+		Bryststørrelse
+	</string>
+	<string name="Bridge Width">
+		Bredde næseryg
+	</string>
+	<string name="Broad">
+		Bred
+	</string>
+	<string name="Brow Size">
+		Størrelse øjenbryn
+	</string>
+	<string name="Bug Eyes">
+		Udstående øjne
+	</string>
+	<string name="Bugged Eyes">
+		Udstående øjne
+	</string>
+	<string name="Bulbous">
+		Kartoffelnæse
+	</string>
+	<string name="Bulbous Nose">
+		Kartoffelnæse
+	</string>
+	<string name="Bushy Eyebrows">
+		Buskede øjenbryn
+	</string>
+	<string name="Bushy Hair">
+		Busket hår
+	</string>
+	<string name="Butt Size">
+		Størrelse bagdel
+	</string>
+	<string name="bustle skirt">
+		Tournure
+	</string>
+	<string name="no bustle">
+		Ingen tournure
+	</string>
+	<string name="more bustle">
+		Mere tournure
+	</string>
+	<string name="Chaplin">
+		Chaplin
+	</string>
+	<string name="Cheek Bones">
+		Kindben
+	</string>
+	<string name="Chest Size">
+		Bryst størrelse
+	</string>
+	<string name="Chin Angle">
+		Hage form
+	</string>
+	<string name="Chin Cleft">
+		Hagekløft
+	</string>
+	<string name="Chin Curtains">
+		Hageskæg
+	</string>
+	<string name="Chin Depth">
+		Hage dybde
+	</string>
+	<string name="Chin Heavy">
+		Stort forneden
+	</string>
+	<string name="Chin In">
+		Vigende hage
+	</string>
+	<string name="Chin Out">
+		Hage frem
+	</string>
+	<string name="Chin-Neck">
+		Hals under hage
+	</string>
+	<string name="Clear">
+		Slet
+	</string>
+	<string name="Cleft">
+		Kløft
+	</string>
+	<string name="Close Set Eyes">
+		Tætsiddende øjne
+	</string>
+	<string name="Closed">
+		Lukket
+	</string>
+	<string name="Closed Back">
+		Lukket bagtil
+	</string>
+	<string name="Closed Front">
+		Lukket foran
+	</string>
+	<string name="Closed Left">
+		Lukket til venstre
+	</string>
+	<string name="Closed Right">
+		Lukket til højre
+	</string>
+	<string name="Coin Purse">
+		Lille
+	</string>
+	<string name="Collar Back">
+		Krave bagtil
+	</string>
+	<string name="Collar Front">
+		Krave foran
+	</string>
+	<string name="Corner Down">
+		Nedadvendt
+	</string>
+	<string name="Corner Normal">
+		Normalt
+	</string>
+	<string name="Corner Up">
+		Opadvendt
+	</string>
+	<string name="Creased">
+		Rynket
+	</string>
+	<string name="Crooked Nose">
+		Skæv næse
+	</string>
+	<string name="Cropped Hair">
+		Kort hår
+	</string>
+	<string name="Cuff Flare">
+		Svaj
+	</string>
+	<string name="Dark">
+		Mørk
+	</string>
+	<string name="Dark Green">
+		Mørkegrøn
+	</string>
+	<string name="Darker">
+		Mørkere
+	</string>
+	<string name="Deep">
+		Dyb
+	</string>
+	<string name="Default Heels">
+		Standard hæle
+	</string>
+	<string name="Default Toe">
+		Standard snude
+	</string>
+	<string name="Dense">
+		Tæt
+	</string>
+	<string name="Dense hair">
+		Tæt hår
+	</string>
+	<string name="Double Chin">
+		Dobbelthage
+	</string>
+	<string name="Downturned">
+		Peger nedad
+	</string>
+	<string name="Duffle Bag">
+		Stort
+	</string>
+	<string name="Ear Angle">
+		Øre vinkel
+	</string>
+	<string name="Ear Size">
+		Øre størrelse
+	</string>
+	<string name="Ear Tips">
+		Ørespidser
+	</string>
+	<string name="Egg Head">
+		Ovalt hovede
+	</string>
+	<string name="Eye Bags">
+		Poser under øjne
+	</string>
+	<string name="Eye Color">
+		Øjenfarve
+	</string>
+	<string name="Eye Depth">
+		Øjendybde
+	</string>
+	<string name="Eye Lightness">
+		Øjennuance
+	</string>
+	<string name="Eye Opening">
+		Øjenåbning
+	</string>
+	<string name="Eye Pop">
+		Øjensymmetri
+	</string>
+	<string name="Eye Size">
+		Øjenstørrelse
+	</string>
+	<string name="Eye Spacing">
+		Øjenafstand
+	</string>
+	<string name="Eyeball Size">
+		Størrelse øjenæble
+	</string>
+	<string name="Eyebrow Arc">
+		Bue på øjenbryn
+	</string>
+	<string name="Eyebrow Density">
+		Tæthed øjenbryn
+	</string>
+	<string name="Eyebrow Height">
+		Højde på øjenbryn
+	</string>
+	<string name="Eyebrow Points">
+		Løftede øjenbryn
+	</string>
+	<string name="Eyebrow Size">
+		Størrelse øjenbryn
+	</string>
+	<string name="Eyelash Length">
+		Længde øjenvipper
+	</string>
+	<string name="Eyeliner">
+		Eyeliner
+	</string>
+	<string name="Eyeliner Color">
+		Eyeliner farve
+	</string>
+	<string name="Eyes Back">
+		Dybtliggende øjne
+	</string>
+	<string name="Eyes Bugged">
+		Udstående øjne
+	</string>
+	<string name="Eyes Forward">
+		Øjne fremme
+	</string>
+	<string name="Eyes Long Head">
+		Eyes Long Head
+	</string>
+	<string name="Eyes Shear Left Up">
+		Eyes Shear Left Up
+	</string>
+	<string name="Eyes Shear Right Up">
+		Eyes Shear Right Up
+	</string>
+	<string name="Eyes Short Head">
+		Eyes Short Head
+	</string>
+	<string name="Eyes Spread">
+		Stor afstand
+	</string>
+	<string name="Eyes Sunken">
+		Indsunkne øjne
+	</string>
+	<string name="Eyes Together">
+		Tætsiddende
+	</string>
+	<string name="Face Shear">
+		Ansigts symmetri
+	</string>
+	<string name="Facial Definition">
+		Ansigtskonturer
+	</string>
+	<string name="Far Set Eyes">
+		Stor afstand mellem øjne
+	</string>
+	<string name="Fat">
+		Tyk
+	</string>
+	<string name="Fat Head">
+		Tykt hovede
+	</string>
+	<string name="Fat Lips">
+		Tykke læber
+	</string>
+	<string name="Fat Lower">
+		Tyk nedre
+	</string>
+	<string name="Fat Lower Lip">
+		Tyk underlæbe
+	</string>
+	<string name="Fat Torso">
+		Tyk overkrop
+	</string>
+	<string name="Fat Upper">
+		Tyk øvre
+	</string>
+	<string name="Fat Upper Lip">
+		Tyk overlæbe
+	</string>
+	<string name="Female">
+		Kvinde
+	</string>
+	<string name="Fingerless">
+		Fingerløse
+	</string>
+	<string name="Fingers">
+		Fingre
+	</string>
+	<string name="Flared Cuffs">
+		Stor vidde
+	</string>
+	<string name="Flat">
+		Flad
+	</string>
+	<string name="Flat Butt">
+		Flad bagdel
+	</string>
+	<string name="Flat Head">
+		Fladt hovede
+	</string>
+	<string name="Flat Toe">
+		Flad snude
+	</string>
+	<string name="Foot Size">
+		Størrelse fod
+	</string>
+	<string name="Forehead Angle">
+		Pande vinkel
+	</string>
+	<string name="Forehead Heavy">
+		Stort foroven
+	</string>
+	<string name="Freckles">
+		Fregner
+	</string>
+	<string name="Front Bangs Down">
+		Pandehår - ned
+	</string>
+	<string name="Front Bangs Up">
+		Pandehår - op
+	</string>
+	<string name="Front Fringe">
+		Frynser foran
+	</string>
+	<string name="Front Hair">
+		Hår foran
+	</string>
+	<string name="Front Hair Down">
+		Hår foran - ned
+	</string>
+	<string name="Front Hair Up">
+		Hår foran - op
+	</string>
+	<string name="Full Back">
+		Langt ud bagtil
+	</string>
+	<string name="Full Eyeliner">
+		Meget eyeliner
+	</string>
+	<string name="Full Front">
+		Langt frem fortil
+	</string>
+	<string name="Full Hair Sides">
+		Hår i siderne
+	</string>
+	<string name="Full Sides">
+		Meget hår
+	</string>
+	<string name="Glossy">
+		Skinnende
+	</string>
+	<string name="Glove Fingers">
+		Fingre i handsker
+	</string>
+	<string name="Glove Length">
+		Handskelængde
+	</string>
+	<string name="Hair">
+		Hår
+	</string>
+	<string name="Hair Back">
+		Hår: Bagtil
+	</string>
+	<string name="Hair Front">
+		Hår: Foran
+	</string>
+	<string name="Hair Sides">
+		Hår: Siderne
+	</string>
+	<string name="Hair Sweep">
+		Strøget hår
+	</string>
+	<string name="Hair Thickess">
+		Hår tykkelse
+	</string>
+	<string name="Hair Thickness">
+		Hår tykkelse
+	</string>
+	<string name="Hair Tilt">
+		Hældning
+	</string>
+	<string name="Hair Tilted Left">
+		mest hår venstre
+	</string>
+	<string name="Hair Tilted Right">
+		Mest hår højre
+	</string>
+	<string name="Hair Volume">
+		Hår: Volumen
+	</string>
+	<string name="Hand Size">
+		Størrelse hånd
+	</string>
+	<string name="Handlebars">
+		Cykelstyr
+	</string>
+	<string name="Head Length">
+		Længde på hovede
+	</string>
+	<string name="Head Shape">
+		Hovedform
+	</string>
+	<string name="Head Size">
+		Hovedstørrelse
+	</string>
+	<string name="Head Stretch">
+		Hovedhøjde
+	</string>
+	<string name="Heel Height">
+		Hælhøjde
+	</string>
+	<string name="Heel Shape">
+		Hælform
+	</string>
+	<string name="Height">
+		Højde
+	</string>
+	<string name="High">
+		Høj
+	</string>
+	<string name="High Heels">
+		Hæje hæle
+	</string>
+	<string name="High Jaw">
+		Høj kæbe
+	</string>
+	<string name="High Platforms">
+		Høje såle
+	</string>
+	<string name="High and Tight">
+		Høj og tæt
+	</string>
+	<string name="Higher">
+		Højere
+	</string>
+	<string name="Hip Length">
+		Hoftelængde
+	</string>
+	<string name="Hip Width">
+		Hoftebredde
+	</string>
+	<string name="In">
+		Inde
+	</string>
+	<string name="In Shdw Color">
+		Indre skygge farve
+	</string>
+	<string name="In Shdw Opacity">
+		Indre skygge gennemsigtighed
+	</string>
+	<string name="Inner Eye Corner">
+		Inderste del af øje
+	</string>
+	<string name="Inner Eye Shadow">
+		Inderste øjenskygge
+	</string>
+	<string name="Inner Shadow">
+		Indre skygge
+	</string>
+	<string name="Jacket Length">
+		Jakkelængde
+	</string>
+	<string name="Jacket Wrinkles">
+		Jakkerynker
+	</string>
+	<string name="Jaw Angle">
+		Kæbevinkel
+	</string>
+	<string name="Jaw Jut">
+		Kæbefremspring
+	</string>
+	<string name="Jaw Shape">
+		Kæbeform
+	</string>
+	<string name="Join">
+		Saml
+	</string>
+	<string name="Jowls">
+		Kindehud
+	</string>
+	<string name="Knee Angle">
+		Knævinkel
+	</string>
+	<string name="Knock Kneed">
+		Kalveknæet
+	</string>
+	<string name="Large">
+		Stor
+	</string>
+	<string name="Large Hands">
+		Store hænder
+	</string>
+	<string name="Left Part">
+		Venstre side
+	</string>
+	<string name="Leg Length">
+		Benlængde
+	</string>
+	<string name="Leg Muscles">
+		Benmuskler
+	</string>
+	<string name="Less">
+		Mindre
+	</string>
+	<string name="Less Body Fat">
+		Mindre kropsfedt
+	</string>
+	<string name="Less Curtains">
+		Mindre
+	</string>
+	<string name="Less Freckles">
+		Færre fregner
+	</string>
+	<string name="Less Full">
+		Mindre
+	</string>
+	<string name="Less Gravity">
+		Mindre
+	</string>
+	<string name="Less Love">
+		Mindre bildæk
+	</string>
+	<string name="Less Muscles">
+		Færre muskler
+	</string>
+	<string name="Less Muscular">
+		Mindre muskuløs
+	</string>
+	<string name="Less Rosy">
+		Mindre rosa
+	</string>
+	<string name="Less Round">
+		Mindre rund
+	</string>
+	<string name="Less Saddle">
+		Mindre
+	</string>
+	<string name="Less Square">
+		Mindre
+	</string>
+	<string name="Less Volume">
+		Mindre
+	</string>
+	<string name="Less soul">
+		Mindre
+	</string>
+	<string name="Lighter">
+		Lettere
+	</string>
+	<string name="Lip Cleft">
+		Læbekløft
+	</string>
+	<string name="Lip Cleft Depth">
+		Dybde læbekløft
+	</string>
+	<string name="Lip Fullness">
+		Fyldige læber
+	</string>
+	<string name="Lip Pinkness">
+		Lyserøde læber
+	</string>
+	<string name="Lip Ratio">
+		Læbeproportioner
+	</string>
+	<string name="Lip Thickness">
+		Læbetykkelse
+	</string>
+	<string name="Lip Width">
+		Læbebredde
+	</string>
+	<string name="Lipgloss">
+		Lipgloss
+	</string>
+	<string name="Lipstick">
+		Læbestift
+	</string>
+	<string name="Lipstick Color">
+		Læbestift farve
+	</string>
+	<string name="Long">
+		Lang
+	</string>
+	<string name="Long Head">
+		Langt hovede
+	</string>
+	<string name="Long Hips">
+		Lange hofter
+	</string>
+	<string name="Long Legs">
+		Bange ben
+	</string>
+	<string name="Long Neck">
+		Lang hals
+	</string>
+	<string name="Long Pigtails">
+		Lange rottehaler
+	</string>
+	<string name="Long Ponytail">
+		Lang hestehale
+	</string>
+	<string name="Long Torso">
+		Lang overkrop
+	</string>
+	<string name="Long arms">
+		Lange arme
+	</string>
+	<string name="Longcuffs">
+		Longcuffs
+	</string>
+	<string name="Loose Pants">
+		Løse bukser
+	</string>
+	<string name="Loose Shirt">
+		Løs trøje
+	</string>
+	<string name="Loose Sleeves">
+		Løse ærmer
+	</string>
+	<string name="Love Handles">
+		Bildæk
+	</string>
+	<string name="Low">
+		Lav
+	</string>
+	<string name="Low Heels">
+		Flade hæle
+	</string>
+	<string name="Low Jaw">
+		Lav kæbe
+	</string>
+	<string name="Low Platforms">
+		Flade såler
+	</string>
+	<string name="Low and Loose">
+		Lav og løs
+	</string>
+	<string name="Lower">
+		Nedre
+	</string>
+	<string name="Lower Bridge">
+		Nedre næseryg
+	</string>
+	<string name="Lower Cheeks">
+		Nedre kinder
+	</string>
+	<string name="Male">
+		Mand
+	</string>
+	<string name="Middle Part">
+		Midterste del
+	</string>
+	<string name="More">
+		Mere
+	</string>
+	<string name="More Blush">
+		Mere rødmen
+	</string>
+	<string name="More Body Fat">
+		Mere kropsfedt
+	</string>
+	<string name="More Curtains">
+		Mere
+	</string>
+	<string name="More Eyeshadow">
+		Mere øjenskygge
+	</string>
+	<string name="More Freckles">
+		Flere fregner
+	</string>
+	<string name="More Full">
+		Mere
+	</string>
+	<string name="More Gravity">
+		More
+	</string>
+	<string name="More Lipstick">
+		Mere læbestift
+	</string>
+	<string name="More Love">
+		Mere bildæk
+	</string>
+	<string name="More Lower Lip">
+		Mere underlæbe
+	</string>
+	<string name="More Muscles">
+		Flere muskler
+	</string>
+	<string name="More Muscular">
+		Mere muskuløs
+	</string>
+	<string name="More Rosy">
+		Mere rosa
+	</string>
+	<string name="More Round">
+		Mere rund
+	</string>
+	<string name="More Saddle">
+		Mere
+	</string>
+	<string name="More Sloped">
+		Mere skrå
+	</string>
+	<string name="More Square">
+		Mere firkantet
+	</string>
+	<string name="More Upper Lip">
+		Mere overlæbe
+	</string>
+	<string name="More Vertical">
+		Mere lodret
+	</string>
+	<string name="More Volume">
+		Mere
+	</string>
+	<string name="More soul">
+		Mere
+	</string>
+	<string name="Moustache">
+		Overskæg
+	</string>
+	<string name="Mouth Corner">
+		Mundvige
+	</string>
+	<string name="Mouth Position">
+		Position mund
+	</string>
+	<string name="Mowhawk">
+		Intet hår
+	</string>
+	<string name="Muscular">
+		Muskuløs
+	</string>
+	<string name="Mutton Chops">
+		Lange
+	</string>
+	<string name="Nail Polish">
+		Neglelak
+	</string>
+	<string name="Nail Polish Color">
+		Neglelak farve
+	</string>
+	<string name="Narrow">
+		Smal
+	</string>
+	<string name="Narrow Back">
+		Smal bagtil
+	</string>
+	<string name="Narrow Front">
+		Smal fortil
+	</string>
+	<string name="Narrow Lips">
+		Smalle læber
+	</string>
+	<string name="Natural">
+		Naturlig
+	</string>
+	<string name="Neck Length">
+		Halslængde
+	</string>
+	<string name="Neck Thickness">
+		Halstykkelse
+	</string>
+	<string name="No Blush">
+		Ingen rødmen
+	</string>
+	<string name="No Eyeliner">
+		Ingen eyeliner
+	</string>
+	<string name="No Eyeshadow">
+		Ingen øjenskygge
+	</string>
+	<string name="No Heels">
+		Ingen hæle
+	</string>
+	<string name="No Lipgloss">
+		Ingen lipgloss
+	</string>
+	<string name="No Lipstick">
+		Ingen læbestift
+	</string>
+	<string name="No Part">
+		Ingen dele
+	</string>
+	<string name="No Polish">
+		Ingen lak
+	</string>
+	<string name="No Red">
+		Ingen rød
+	</string>
+	<string name="No Spikes">
+		Ingen spikes
+	</string>
+	<string name="No White">
+		Ingen hvid
+	</string>
+	<string name="No Wrinkles">
+		Ingen rynker
+	</string>
+	<string name="Normal Lower">
+		Normal nedre
+	</string>
+	<string name="Normal Upper">
+		Normal øvre
+	</string>
+	<string name="Nose Left">
+		Højre
+	</string>
+	<string name="Nose Right">
+		Venstre
+	</string>
+	<string name="Nose Size">
+		Næse størrelse
+	</string>
+	<string name="Nose Thickness">
+		Næse tykkelse
+	</string>
+	<string name="Nose Tip Angle">
+		Næsetip vinkel
+	</string>
+	<string name="Nose Tip Shape">
+		Næsetip form
+	</string>
+	<string name="Nose Width">
+		Næse bredde
+	</string>
+	<string name="Nostril Division">
+		Næsebor adskillelse
+	</string>
+	<string name="Nostril Width">
+		Næsebor bredde
+	</string>
+	<string name="Old">
+		Gammel
+	</string>
+	<string name="Opaque">
+		Uigennemsigtig
+	</string>
+	<string name="Open">
+		Åben
+	</string>
+	<string name="Open Back">
+		Åben bagtil
+	</string>
+	<string name="Open Front">
+		Åben foran
+	</string>
+	<string name="Open Left">
+		Åben til venstre
+	</string>
+	<string name="Open Right">
+		Åben til højre
+	</string>
+	<string name="Orange">
+		Orange
+	</string>
+	<string name="Out">
+		Ud
+	</string>
+	<string name="Out Shdw Color">
+		Ydre skygge farve
+	</string>
+	<string name="Out Shdw Opacity">
+		Ydre skygge uigennemsigtighed
+	</string>
+	<string name="Outer Eye Corner">
+		Yderste del af øje
+	</string>
+	<string name="Outer Eye Shadow">
+		Ydre øjenskygge
+	</string>
+	<string name="Outer Shadow">
+		Ydre skygge
+	</string>
+	<string name="Overbite">
+		Overbid
+	</string>
+	<string name="Package">
+		Skridt
+	</string>
+	<string name="Painted Nails">
+		Malede negle
+	</string>
+	<string name="Pale">
+		Bleg
+	</string>
+	<string name="Pants Crotch">
+		Bukser skridt
+	</string>
+	<string name="Pants Fit">
+		Pasform bukser
+	</string>
+	<string name="Pants Length">
+		Bukser - længde
+	</string>
+	<string name="Pants Waist">
+		Bukser - vidde
+	</string>
+	<string name="Pants Wrinkles">
+		Bukser - rynker
+	</string>
+	<string name="Part">
+		Skilning
+	</string>
+	<string name="Part Bangs">
+		Skilning
+	</string>
+	<string name="Pectorals">
+		Brystmuskler
+	</string>
+	<string name="Pigment">
+		Pigmentering
+	</string>
+	<string name="Pigtails">
+		Rottehaler
+	</string>
+	<string name="Pink">
+		Pink
+	</string>
+	<string name="Pinker">
+		Mere pink
+	</string>
+	<string name="Platform Height">
+		Højde sål
+	</string>
+	<string name="Platform Width">
+		Bredde sål
+	</string>
+	<string name="Pointy">
+		Spids
+	</string>
+	<string name="Pointy Heels">
+		Spidse hæle
+	</string>
+	<string name="Pointy Toe">
+		Spids snude
+	</string>
+	<string name="Ponytail">
+		Hestehale
+	</string>
+	<string name="Poofy Skirt">
+		Strutskørt
+	</string>
+	<string name="Pop Left Eye">
+		Forstør venstre øje
+	</string>
+	<string name="Pop Right Eye">
+		Forstør højre øje
+	</string>
+	<string name="Puffy">
+		Posede
+	</string>
+	<string name="Puffy Eyelids">
+		Posede øjenlåg
+	</string>
+	<string name="Rainbow Color">
+		Regnbue farver
+	</string>
+	<string name="Red Hair">
+		Rødt hår
+	</string>
+	<string name="Red Skin">
+		Rød hud
+	</string>
+	<string name="Regular">
+		Almindelig
+	</string>
+	<string name="Regular Muscles">
+		Almindelige muskler
+	</string>
+	<string name="Right Part">
+		Højre skildning
+	</string>
+	<string name="Rosy Complexion">
+		Rosa teint
+	</string>
+	<string name="Round">
+		Rund
+	</string>
+	<string name="Round Forehead">
+		Rund pande
+	</string>
+	<string name="Ruddiness">
+		Rødmossethed
+	</string>
+	<string name="Ruddy">
+		Rødmosset
+	</string>
+	<string name="Rumpled Hair">
+		Krøllet hår
+	</string>
+	<string name="Saddle Bags">
+		Ridebukselår
+	</string>
+	<string name="Saddlebags">
+		Ridebukselår
+	</string>
+	<string name="Scrawny">
+		Radmager
+	</string>
+	<string name="Scrawny Leg">
+		Magert ben
+	</string>
+	<string name="Separate">
+		Separat
+	</string>
+	<string name="Shading">
+		Skygger
+	</string>
+	<string name="Shadow hair">
+		Skygge hår
+	</string>
+	<string name="Shallow">
+		Lille
+	</string>
+	<string name="Shear Back">
+		Afklippet bagi
+	</string>
+	<string name="Shear Face">
+		Skævt ansigt
+	</string>
+	<string name="Shear Front">
+		&quot;Måne&quot;
+	</string>
+	<string name="Shear Left">
+		Venstre
+	</string>
+	<string name="Shear Left Up">
+		Venstre op
+	</string>
+	<string name="Shear Right">
+		Højre
+	</string>
+	<string name="Shear Right Up">
+		Højre op
+	</string>
+	<string name="Sheared Back">
+		Afklippet bagtil
+	</string>
+	<string name="Sheared Front">
+		Måne
+	</string>
+	<string name="Shift Left">
+		Mod venstre
+	</string>
+	<string name="Shift Mouth">
+		Flyt mund
+	</string>
+	<string name="Shift Right">
+		Mod højre
+	</string>
+	<string name="Shirt Bottom">
+		Trøje - bund
+	</string>
+	<string name="Shirt Fit">
+		Trøje - pasform
+	</string>
+	<string name="Shirt Wrinkles">
+		Trøje - rynker
+	</string>
+	<string name="Shoe Height">
+		Sko højde
+	</string>
+	<string name="Short">
+		Kort
+	</string>
+	<string name="Short Arms">
+		Korte arme
+	</string>
+	<string name="Short Legs">
+		Korte ben
+	</string>
+	<string name="Short Neck">
+		Kort hals
+	</string>
+	<string name="Short Pigtails">
+		Korte rottehaler
+	</string>
+	<string name="Short Ponytail">
+		Kort hestehale
+	</string>
+	<string name="Short Sideburns">
+		Korte
+	</string>
+	<string name="Short Torso">
+		Kort overkrop
+	</string>
+	<string name="Short hips">
+		Korte hofter
+	</string>
+	<string name="Shoulders">
+		Skuldre
+	</string>
+	<string name="Side Bangs">
+		Sidehår
+	</string>
+	<string name="Side Bangs Down">
+		Ned
+	</string>
+	<string name="Side Bangs Up">
+		Op
+	</string>
+	<string name="Side Fringe">
+		Side frynser
+	</string>
+	<string name="Sideburns">
+		Bakkenbarter
+	</string>
+	<string name="Sides Hair">
+		Sidehår
+	</string>
+	<string name="Sides Hair Down">
+		Ned
+	</string>
+	<string name="Sides Hair Up">
+		Op
+	</string>
+	<string name="Skinny">
+		Tynd
+	</string>
+	<string name="Skinny Neck">
+		Tynd hals
+	</string>
+	<string name="Skirt Fit">
+		Omfang
+	</string>
+	<string name="Skirt Length">
+		Længde nederdel
+	</string>
+	<string name="Slanted Forehead">
+		Skrånende pande
+	</string>
+	<string name="Sleeve Length">
+		Ærmelængde
+	</string>
+	<string name="Sleeve Looseness">
+		Ærmer - stramhed
+	</string>
+	<string name="Slit Back">
+		Slids: Bag
+	</string>
+	<string name="Slit Front">
+		Slids: Foran
+	</string>
+	<string name="Slit Left">
+		Slids: Venstre
+	</string>
+	<string name="Slit Right">
+		Slids: Højre
+	</string>
+	<string name="Small">
+		Lille
+	</string>
+	<string name="Small Hands">
+		Små hænder
+	</string>
+	<string name="Small Head">
+		Lille hovede
+	</string>
+	<string name="Smooth">
+		Glat
+	</string>
+	<string name="Smooth Hair">
+		Glat hår
+	</string>
+	<string name="Socks Length">
+		Strømper - længde
+	</string>
+	<string name="Some">
+		Nogen
+	</string>
+	<string name="Soulpatch">
+		Soulpatch
+	</string>
+	<string name="Sparse">
+		Sparsomt
+	</string>
+	<string name="Spiked Hair">
+		Hår med &quot;spikes&quot;
+	</string>
+	<string name="Square">
+		Firkantet
+	</string>
+	<string name="Square Toe">
+		Firkantet snude
+	</string>
+	<string name="Squash Head">
+		Bredt hovede
+	</string>
+	<string name="Squash/Stretch Head">
+		Sammentryk/stræk hovede
+	</string>
+	<string name="Stretch Head">
+		Stræk hovede
+	</string>
+	<string name="Sunken">
+		Indsunket
+	</string>
+	<string name="Sunken Chest">
+		Indsunket bryst
+	</string>
+	<string name="Sunken Eyes">
+		Dybtliggende øjne
+	</string>
+	<string name="Sweep Back">
+		Stryge tilbage
+	</string>
+	<string name="Sweep Forward">
+		Stryge fremad
+	</string>
+	<string name="Swept Back">
+		Tilbagestrøget
+	</string>
+	<string name="Swept Back Hair">
+		Tilbagestrøget hår
+	</string>
+	<string name="Swept Forward">
+		Fremadstrøget
+	</string>
+	<string name="Swept Forward Hair">
+		Fremadstrøget hår
+	</string>
+	<string name="Tall">
+		Høj
+	</string>
+	<string name="Taper Back">
+		Indsnævring bag
+	</string>
+	<string name="Taper Front">
+		Indsnævring foran
+	</string>
+	<string name="Thick Heels">
+		Brede hæle
+	</string>
+	<string name="Thick Neck">
+		Bred nakke
+	</string>
+	<string name="Thick Toe">
+		Bred snude
+	</string>
+	<string name="Thickness">
+		Tykkelse
+	</string>
+	<string name="Thin">
+		Tynd
+	</string>
+	<string name="Thin Eyebrows">
+		Tynde øjenbryn
+	</string>
+	<string name="Thin Lips">
+		Tynde læber
+	</string>
+	<string name="Thin Nose">
+		Tynd næse
+	</string>
+	<string name="Tight Chin">
+		Stram hage
+	</string>
+	<string name="Tight Cuffs">
+		Smalle bukseben
+	</string>
+	<string name="Tight Pants">
+		Stramme bukser
+	</string>
+	<string name="Tight Shirt">
+		Stram trøje
+	</string>
+	<string name="Tight Skirt">
+		Stram nederdel
+	</string>
+	<string name="Tight Sleeves">
+		Stramme ærmer
+	</string>
+	<string name="Tilt Left">
+		Hæld til venstre
+	</string>
+	<string name="Tilt Right">
+		Hæld til højre
+	</string>
+	<string name="Toe Shape">
+		Sko form
+	</string>
+	<string name="Toe Thickness">
+		Tykkelse af snud
+	</string>
+	<string name="Torso Length">
+		Overkrop - længde
+	</string>
+	<string name="Torso Muscles">
+		Overkrop - muskler
+	</string>
+	<string name="Torso Scrawny">
+		Overkrop - mager
+	</string>
+	<string name="Unattached">
+		Ikke vedhæftet
+	</string>
+	<string name="Uncreased">
+		Glat
+	</string>
+	<string name="Underbite">
+		Underbid
+	</string>
+	<string name="Unnatural">
+		Unaturlig
+	</string>
+	<string name="Upper Bridge">
+		Øverste næseryg
+	</string>
+	<string name="Upper Cheeks">
+		Øvre kinder
+	</string>
+	<string name="Upper Chin Cleft">
+		Øvre hagekløft
+	</string>
+	<string name="Upper Eyelid Fold">
+		Øvre øjenlåg
+	</string>
+	<string name="Upturned">
+		Opadvendt
+	</string>
+	<string name="Very Red">
+		Meget rød
+	</string>
+	<string name="Waist Height">
+		Talje højde
+	</string>
+	<string name="Well-Fed">
+		Velnæret
+	</string>
+	<string name="White Hair">
+		Hvidt hår
+	</string>
+	<string name="Wide">
+		Bred
+	</string>
+	<string name="Wide Back">
+		Bredt
+	</string>
+	<string name="Wide Front">
+		Bredt
+	</string>
+	<string name="Wide Lips">
+		Brede læber
+	</string>
+	<string name="Wild">
+		Vildt
+	</string>
+	<string name="Wrinkles">
+		Rynker
+	</string>
+	<string name="LocationCtrlAddLandmarkTooltip">
+		Tilføj til mine landemærker
+	</string>
+	<string name="LocationCtrlEditLandmarkTooltip">
+		Rediger mit landemærke
+	</string>
+	<string name="LocationCtrlInfoBtnTooltip">
+		Se yderligere information om nuværende lokation
+	</string>
+	<string name="LocationCtrlComboBtnTooltip">
+		Min lokationshistorik
+	</string>
+	<string name="UpdaterWindowTitle">
+		[APP_NAME] Opdatér
+	</string>
+	<string name="UpdaterNowUpdating">
+		Opdaterer nu [APP_NAME]...
+	</string>
+	<string name="UpdaterNowInstalling">
+		Installerer [APP_NAME]...
+	</string>
+	<string name="UpdaterUpdatingDescriptive">
+		Din [APP_NAME] klient bliver opdateret til nyeste version.  Dette kan tage noget tid, så venligst vær tålmodig.
+	</string>
+	<string name="UpdaterProgressBarTextWithEllipses">
+		Download færdig...
+	</string>
+	<string name="UpdaterProgressBarText">
+		Downloader opdatering
+	</string>
+	<string name="UpdaterFailDownloadTitle">
+		Download af opdatering fejlede
+	</string>
+	<string name="UpdaterFailUpdateDescriptive">
+		Der opstod en fejl ved opdatering af  [APP_NAME]. Hent venligst den nyeste version fra www.secondlife.com.
+	</string>
+	<string name="UpdaterFailInstallTitle">
+		Installation af opdatering fejlede
+	</string>
+	<string name="UpdaterFailStartTitle">
+		Opstart af klient fejlede
+	</string>
+	<string name="IM_logging_string">
+		-- Logning af IM aktiveret --
+	</string>
+	<string name="IM_typing_start_string">
+		[NAME] skriver...
+	</string>
+	<string name="Unnamed">
+		(Uden navn)
+	</string>
+	<string name="IM_moderated_chat_label">
+		(Modereret: Stemmer deaktiveret)
+	</string>
+	<string name="IM_unavailable_text_label">
+		Tekst chat er ikke tilgængelig i denne samtale.
+	</string>
+	<string name="IM_muted_text_label">
+		Din tekst chat er blevet deaktiveret af en gruppe moderator.
+	</string>
+	<string name="IM_default_text_label">
+		Klik her for privat besked (IM).
+	</string>
+	<string name="IM_to_label">
+		Til
+	</string>
+	<string name="IM_moderator_label">
+		(Moderator)
+	</string>
+	<string name="only_user_message">
+		Du er den eneste deltager i denne samtale
+	</string>
+	<string name="offline_message">
+		[FIRST] [LAST] er ikke logget på.
+	</string>
+	<string name="invite_message">
+		Tryk på [BUTTON NAME] knappen for at acceptére/tilslutte til denne stemme chat.
+	</string>
+	<string name="muted_message">
+		Du har blokeret denne beboer. Hvis du starter en samtale vil denne blokering automatisk blive fjernet.
+	</string>
+	<string name="generic_request_error">
+		Kunne ikke etablere forbindelse, prøv igen senere
+	</string>
+	<string name="insufficient_perms_error">
+		Du har ikke de fornødne rettigheder.
+	</string>
+	<string name="session_does_not_exist_error">
+		Denne samtale er lukket ned
+	</string>
+	<string name="no_ability_error">
+		Du har ikke den mulighed.
+	</string>
+	<string name="no_ability">
+		Du har ikke den mulighed.
+	</string>
+	<string name="not_a_mod_error">
+		Du er ikke moderator for denne samtale.
+	</string>
+	<string name="muted_error">
+		Du er blevet &quot;blokeret&quot;.
+	</string>
+	<string name="add_session_event">
+		Ikke muligt at tilføge brugere til samtale med [RECIPIENT].
+	</string>
+	<string name="message_session_event">
+		Ikke muligt at sende din besked til samtalen med [RECIPIENT].
+	</string>
+	<string name="removed_from_group">
+		Du er blevet fjernet fra gruppen.
+	</string>
+	<string name="close_on_no_ability">
+		Du har ikke længere mulighed for at deltage i samtalen
+	</string>
+</strings>
diff --git a/indra/newview/skins/default/xui/da/teleport_strings.xml b/indra/newview/skins/default/xui/da/teleport_strings.xml
index cc75abbb26..680806c8ac 100644
--- a/indra/newview/skins/default/xui/da/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/da/teleport_strings.xml
@@ -1,81 +1,79 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<teleport_messages>
-	<message_set name="errors">
-		<message name="invalid_tport">
-			Der er problemer med at håndtere din teleport. Det kan være nødvendigt at logge ud og ind for at kunne skifte teleportere.
-Hvis du bliver ved med at have problemet kan du checke teknisk support på:
-www.secondlife.com/support
-		</message>
-		<message name="invalid_region_handoff">
-			Problem registreret i forbindelse med skift til ny region. Det kan være nødvendigt at logge ud og ind for at kunne skifte regioner.
-Hvis du bliver ved med at have problemet kan du checke teknisk support på:
-www.secondlife.com/support
-		</message>
-		<message 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.
-		</message>
-		<message name="nolandmark_tport">
-			Beklager, systemet kunne ikke finde landmærke destinationen.
-		</message>
-		<message name="timeout_tport">
-			Beklager, systemet kunne ikke fuldføre teleport forbindelse.
-Prøv igen om lidt.
-		</message>
-		<message name="noaccess_tport">
-			Beklager, du har ikke adgang til denne teleport destination.
-		</message>
-		<message 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.
-		</message>
-		<message 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.
-		</message>
-		<message name="expired_tport">
-			Beklager, men systemet kunne ikke fuldføre din teleport i rimelig tid. Prøv venligst igen om lidt.
-		</message>
-		<message name="expired_region_handoff">
-			Beklager, men systemet kunne ikke fuldføre skift til anden region i rimelig tid. Prøv venligst igen om lidt.
-		</message>
-		<message 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.
-		</message>
-		<message name="no_inventory_host">
-			Beholdningssystemet er ikke tilgængelig lige nu.
-		</message>
-	</message_set>
-	<message_set name="progress">
-		<message name="sending_dest">
-			Sender til destination.
-		</message>
-		<message name="redirecting">
-			Omdirigerer til en anden lokation.
-		</message>
-		<message name="relaying">
-			Overfører til destination.
-		</message>
-		<message name="sending_home">
-			Sender forespørgsel på hjem-position.
-		</message>
-		<message name="sending_landmark">
-			Semder anmodning om landmærke.
-		</message>
-		<message name="completing">
-			Fuldfører teleport.
-		</message>
-		<message name="resolving">
-			Finder destination.
-		</message>
-		<message name="contacting">
-			Kontakter ny region.
-		</message>
-		<message name="arriving">
-			Ankommer...
-		</message>
-		<message name="requesting">
-			Anmoder om teleport...
-		</message>
-	</message_set>
-</teleport_messages>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<teleport_messages>
+	<message_set name="errors">
+		<message name="invalid_tport">
+			Der er problemer med at håndtere din teleport. Det kan være nødvendigt at logge ud og ind for at kunne skifte teleportere.
+Hvis du bliver ved med at have problemet kan du checke teknisk support på: [SUPPORT_SITE].
+		</message>
+		<message name="invalid_region_handoff">
+			Problem registreret i forbindelse med skift til ny region. Det kan være nødvendigt at logge ud og ind for at kunne skifte regioner.
+Hvis du bliver ved med at have problemet kan du checke teknisk support på: [SUPPORT_SITE].
+		</message>
+		<message 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.
+		</message>
+		<message name="nolandmark_tport">
+			Beklager, systemet kunne ikke finde landmærke destinationen.
+		</message>
+		<message name="timeout_tport">
+			Beklager, systemet kunne ikke fuldføre teleport forbindelse.
+Prøv igen om lidt.
+		</message>
+		<message name="noaccess_tport">
+			Beklager, du har ikke adgang til denne teleport destination.
+		</message>
+		<message 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.
+		</message>
+		<message 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.
+		</message>
+		<message name="expired_tport">
+			Beklager, men systemet kunne ikke fuldføre din teleport i rimelig tid. Prøv venligst igen om lidt.
+		</message>
+		<message name="expired_region_handoff">
+			Beklager, men systemet kunne ikke fuldføre skift til anden region i rimelig tid. Prøv venligst igen om lidt.
+		</message>
+		<message 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.
+		</message>
+		<message name="no_inventory_host">
+			Beholdningssystemet er ikke tilgængelig lige nu.
+		</message>
+	</message_set>
+	<message_set name="progress">
+		<message name="sending_dest">
+			Sender til destination.
+		</message>
+		<message name="redirecting">
+			Omdirigerer til en anden lokation.
+		</message>
+		<message name="relaying">
+			Overfører til destination.
+		</message>
+		<message name="sending_home">
+			Sender forespørgsel på hjem-position.
+		</message>
+		<message name="sending_landmark">
+			Semder anmodning om landmærke.
+		</message>
+		<message name="completing">
+			Fuldfører teleport.
+		</message>
+		<message name="resolving">
+			Finder destination.
+		</message>
+		<message name="contacting">
+			Kontakter ny region.
+		</message>
+		<message name="arriving">
+			Ankommer...
+		</message>
+		<message name="requesting">
+			Anmoder om teleport...
+		</message>
+	</message_set>
+</teleport_messages>
-- 
cgit v1.2.3


From eb7bba01d45d889ced072498cce2d4e73a719398 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 2 Dec 2009 16:02:43 -0800
Subject: EXT-2572 partial fix for nearby chat text clipping at the bottom
 Fixes 1 pixel of clipping caused by LLScrollContainer. Text is still clipped
 by 1 pixel, down from 2. Added more test text boxes to
 floater_test_textbox.xml Reviewed with Leyla.

---
 indra/newview/skins/default/xui/en/floater_aaa.xml |  2 +-
 .../skins/default/xui/en/floater_test_textbox.xml  | 47 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index 6598c95c0e..6ecdd76573 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -21,7 +21,7 @@
    allow_html="true"
    bg_readonly_color="ChatHistoryBgColor"
    bg_writeable_color="ChatHistoryBgColor"
-   border_visible="true" 
+   border_visible="false" 
    follows="all"
    font="SansSerif" 
 	    left="1"
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
index 310ad13dac..033070607b 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -174,6 +174,53 @@ scroll bar
  word_wrap="true">
 Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others.
   </text_editor>
+    <text_editor
+ height="50"
+ follows="top|left|bottom"
+ font="Monospace"
+ left_delta="0"
+ name="monospace_text_editor"
+ tool_tip="text editor"
+ top_pad="10"
+ width="200">
+Text Editor
+with multiple
+lines of text
+and hence a
+scroll bar gjyrrr
+  </text_editor>
+    <text_editor
+      border_visible="true"
+      height="50"
+      follows="top|left|bottom"
+      font="Monospace"
+ left_delta="0"
+ name="monospace_text_editor"
+ tool_tip="text editor"
+ top_pad="10"
+ width="200">
+Text Editor
+with multiple
+lines of text
+and hence a
+scroll bar gjyrrr
+  </text_editor>
+    <text_editor
+ height="50"
+ follows="top|left|bottom"
+ font="SansSerif"
+ left_delta="0"
+ name="sansserif_text_editor"
+ tool_tip="text editor"
+ top_pad="10"
+ width="200">
+Text Editor
+with multiple
+lines of text
+and hence a
+scroll bar gjyrrr
+  </text_editor>
+
   <text
    height="40"
    follows="top|left|bottom"
-- 
cgit v1.2.3


From b615962908eabd20f80dffba02af61712652822c Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 2 Dec 2009 16:17:07 -0800
Subject: EXT-2934 Sidetray is resizeable and its resize causes crash One panel
 had user_resize="true", which it should not have.

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

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

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index d99205b2fe..eee1134d15 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -104,7 +104,7 @@
                       min_width="333"
                       mouse_opaque="false"
                       name="side_tray_container"
-                      user_resize="true"
+                      user_resize="false"
                       visible="false"
                       width="333"/>
       </layout_stack>
-- 
cgit v1.2.3


From fc0aca76dc77c543ef7ce06b136bc2a60c400b42 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Wed, 2 Dec 2009 16:41:17 -0800
Subject: added new png startup logo and texture reference - not yet changed in
 code

---
 indra/newview/skins/default/textures/textures.xml        |  11 ++++++-----
 .../skins/default/textures/windows/startup_logo.png      | Bin 0 -> 2457 bytes
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/windows/startup_logo.png

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 607b33fbb1..7b8a9d561d 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -341,8 +341,8 @@ with the same filename but different name
  <texture name="parcel_drk_BuildNo" file_name="icons/parcel_drk_BuildNo.png" preload="false" />
  <texture name="parcel_drk_Damage" file_name="icons/parcel_drk_Damage.png" preload="false" />
  <texture name="parcel_drk_DamageNo" file_name="icons/parcel_drk_DamageNo.png" preload="false" />
-  <texture name="parcel_drk_EVRY" file_name="icons/parcel_drk_EVRY.png" preload="false" />
-  <texture name="parcel_drk_EXP" file_name="icons/parcel_drk_EXP.png" preload="false" />
+ <texture name="parcel_drk_EVRY" file_name="icons/parcel_drk_EVRY.png" preload="false" />
+ <texture name="parcel_drk_EXP" file_name="icons/parcel_drk_EXP.png" preload="false" />
  <texture name="parcel_drk_Fly" file_name="icons/parcel_drk_Fly.png" preload="false" />
  <texture name="parcel_drk_FlyNo" file_name="icons/parcel_drk_FlyNo.png" preload="false" />
  <texture name="parcel_drk_ForSale" file_name="icons/parcel_drk_ForSale.png" preload="false" />
@@ -361,8 +361,8 @@ with the same filename but different name
  <texture name="parcel_lght_BuildNo" file_name="icons/parcel_lght_BuildNo.png" preload="false" />
  <texture name="parcel_lght_Damage" file_name="icons/parcel_lght_Damage.png" preload="false" />
  <texture name="parcel_lght_DamageNo" file_name="icons/parcel_lght_DamageNo.png" preload="false" />
-  <texture name="parcel_lght_EVRY" file_name="icons/parcel_lght_EVRY.png" preload="false" />
-  <texture name="parcel_lght_EXP" file_name="icons/parcel_lght_EXP.png" preload="false" />
+ <texture name="parcel_lght_EVRY" file_name="icons/parcel_lght_EVRY.png" preload="false" />
+ <texture name="parcel_lght_EXP" file_name="icons/parcel_lght_EXP.png" preload="false" />
  <texture name="parcel_lght_Fly" file_name="icons/parcel_lght_Fly.png" preload="false" />
  <texture name="parcel_lght_FlyNo" file_name="icons/parcel_lght_FlyNo.png" preload="false" />
  <texture name="parcel_lght_ForSale" file_name="icons/parcel_lght_ForSale.png" preload="false" />
@@ -486,6 +486,8 @@ with the same filename but different name
   <texture name="Snapshot_Over" file_name="bottomtray/Snapshot_Over.png" preload="false" />
   <texture name="Snapshot_Press" file_name="bottomtray/Snapshot_Press.png" preload="false" />
 
+  <texture name="startup_logo"  file_name="windows/startup_logo.png" preload="true" />
+
   <texture name="Stepper_Down_Disabled" file_name="widgets/Stepper_Down_Disabled.png" preload="true" />
   <texture name="Stepper_Down_Off" file_name="widgets/Stepper_Down_Off.png" preload="true" />
   <texture name="Stepper_Down_Press" file_name="widgets/Stepper_Down_Press.png" preload="true" />
@@ -704,7 +706,6 @@ with the same filename but different name
   <texture name="tab_top_blue.tga"	preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
   <texture name="tab_top_selected_blue.tga" preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
 
-  <texture name="startup_logo.j2c" preload="true" />
   <texture name="color_swatch_alpha.tga" preload="true" />
 
   <texture name="button_anim_pause.tga" />
diff --git a/indra/newview/skins/default/textures/windows/startup_logo.png b/indra/newview/skins/default/textures/windows/startup_logo.png
new file mode 100644
index 0000000000..b89449692b
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/startup_logo.png differ
-- 
cgit v1.2.3


From de9273d80b15ba3cd3bdd2c4f9d6801f4f359238 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 3 Dec 2009 09:16:29 +0800
Subject: EXT-2854 Replace instances in the viewer with the final search
 maturity names

---
 indra/newview/skins/default/xui/en/floater_about_land.xml          | 6 +++---
 indra/newview/skins/default/xui/en/floater_report_abuse.xml        | 2 +-
 indra/newview/skins/default/xui/en/floater_world_map.xml           | 2 +-
 indra/newview/skins/default/xui/en/panel_classified.xml            | 4 ++--
 indra/newview/skins/default/xui/en/panel_classified_info.xml       | 4 ++--
 indra/newview/skins/default/xui/en/panel_place_profile.xml         | 2 +-
 indra/newview/skins/default/xui/en/panel_region_general.xml        | 2 +-
 indra/newview/skins/default/xui/en/panel_region_general_layout.xml | 6 +++---
 8 files changed, 14 insertions(+), 14 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 6706ef0c8b..05fc48f3a8 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1181,7 +1181,7 @@ Only large parcels can be listed in search.
             </panel.string>
             <panel.string
              name="mature_check_adult">
-                Explicit Content
+                Adult Content
             </panel.string>
             <panel.string
              name="mature_check_mature_tooltip">
@@ -1189,7 +1189,7 @@ Only large parcels can be listed in search.
             </panel.string>
             <panel.string
              name="mature_check_adult_tooltip">
-                Your parcel information or content is considered explicit.
+                Your parcel information or content is considered adult.
             </panel.string>
             <panel.string
              name="landing_point_none">
@@ -1478,7 +1478,7 @@ Only large parcels can be listed in search.
             </combo_box>
             <check_box
              height="16"
-             label="Mature Content"
+             label="Moderate Content"
              layout="topleft"
              left="14"
              name="MatureCheck"
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index 91ca3ef27a..f1a75bfcb4 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -309,7 +309,7 @@
          name="Indecency__Mature_content_in_PG_region"
          value="60" />
         <combo_box.item
-         label="Indecency &gt; Inappropriate content or conduct in a Mature region"
+         label="Indecency &gt; Inappropriate content or conduct in a Moderate region"
          name="Indecency__Inappropriate_content_in_Mature_region"
          value="69" />
         <combo_box.item
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index cb87c9a94d..ea417b4990 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -235,7 +235,7 @@
      control_name="MapShowEvents"
      follows="top|right"
      height="16"
-     label="PG"
+     label="General"
      layout="topleft"
      left_pad="4"
      name="event_chk"
diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml
index 18d12aef70..9622313786 100644
--- a/indra/newview/skins/default/xui/en/panel_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified.xml
@@ -111,11 +111,11 @@
          name="select_mature"
          value="Select" />
         <combo_box.item
-         label="Mature Content"
+         label="Moderate Content"
          name="mature"
          value="Mature" />
         <combo_box.item
-         label="PG Content"
+         label="General Content"
          name="pg"
          value="PG" />
     </combo_box>
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index df889e87c3..5c594d3f14 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -11,11 +11,11 @@
  width="333">
  <panel.string
   name="type_mature">
-    Mature
+    Moderate
  </panel.string>
  <panel.string
   name="type_pg">
-    PG Content
+    General Content
  </panel.string>
     <button
      follows="top|right"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 9ab5c6b4f7..3f5da66dce 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -602,7 +602,7 @@
                          layout="topleft"
                          left_pad="10"
                          name="region_rating"
-                         value="Explicit"
+                         value="Adult"
                          width="159" />
                         <text
                          follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 1f22689313..79d8f3a0ee 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -171,7 +171,7 @@
     </text>
     <combo_box
      height="20"
-     label="Mature"
+     label="Moderate"
      layout="topleft"
      left_delta="100"
      name="access_combo"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
index bffd84877f..525c5aa8e7 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
@@ -171,7 +171,7 @@
     </text>
     <combo_box
      height="20"
-     label="Mature"
+     label="Moderate"
      layout="topleft"
      left_delta="100"
      name="access_combo"
@@ -182,11 +182,11 @@
          name="Adult"
          value="42" />
         <combo_box.item
-         label="Mature"
+         label="Moderate"
          name="Mature"
          value="21" />
         <combo_box.item
-         label="PG"
+         label="General"
          name="PG"
          value="13" />
     </combo_box> 
-- 
cgit v1.2.3


From 1a75c4c49046b496829b41a49359002adc94b1a3 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 3 Dec 2009 09:53:24 +0800
Subject: delete unused code EXT-2927 [BSI] profile text and partner text
 overwrite after selecting I button on a user

---
 indra/newview/skins/default/xui/en/inspect_avatar.xml | 17 -----------------
 1 file changed, 17 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index e6f384dccd..8349f594d9 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -32,11 +32,6 @@
      name="Details">
 [SL_PROFILE]
     </string>
-<!--  <string
-     name="Partner">
-    Partner: [PARTNER]
-  </string>   
--->
   <text
      follows="all"
      font="SansSerifLarge"
@@ -67,18 +62,6 @@
      top_pad="6"
      width="220">This is my second life description and I really think it is great.
     </text>
-<!--<text
-     follows="all"
-     height="13"
-     left="8"
-     name="user_partner"
-     top_pad="3"
-     width="220"
-     use_ellipses="true"
-     word_wrap="false">
-    Erica Linden
-    </text> 
--->
     <slider
      follows="top|left"
      height="23"
-- 
cgit v1.2.3


From bce5052fb578b0e381bf59e73eb1bac392c143b3 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Wed, 2 Dec 2009 19:34:03 -0800
Subject: About Land layout cleanup

---
 .../skins/default/xui/en/floater_about_land.xml    | 732 +++++++++------------
 1 file changed, 328 insertions(+), 404 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 8bfd64b3df..9125e33344 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -7,7 +7,7 @@
  help_topic="floaterland"
  save_rect="true"
  title="ABOUT LAND"
- width="460">
+ width="490">
     <floater.string
      name="Minutes">
         [MINUTES] minutes
@@ -25,25 +25,25 @@
         remaining
     </floater.string>
     <tab_container
-     follows="left|top|right|bottom"
-     height="400"
+     follows="all"
+     height="410"
      layout="topleft"
-     left="1"
+     left="0"
      name="landtab"
      tab_position="top"
-     top="20"
-     width="459">
+     tab_height="25"
+     tab_min_width="67"
+     top="10"
+     width="489">
         <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="380"
-         label="General"
+         border="false"
+         follows="all"
+         label="GENERAL"
          layout="topleft"
-         left="1"
+         left="0"
          help_topic="land_general_tab"
          name="land_general_panel"
-         top="-31"
-         width="458">
+         top="0">
             <panel.string
              name="new users only">
                 New users only
@@ -74,11 +74,11 @@
             </panel.string>
             <panel.string
              name="profile_text">
-                Profile...
+                Profile
             </panel.string>
             <panel.string
              name="info_text">
-                Info...
+                Info
             </panel.string>
             <panel.string
              name="public_text">
@@ -95,7 +95,6 @@
             <panel.string
              name="no_selection_text">
                 No parcel selected.
-Go to World menu &gt; About Land or select another parcel to show its details.
             </panel.string>
             <text
              type="string"
@@ -103,32 +102,29 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="Name:"
-             top="4"
-             width="92">
+             top="10"
+             width="100">
                 Name:
             </text>
             <line_editor
-             border_style="line"
-             border_thickness="1"
-             follows="left|top|right"
+             follows="left|top"
              height="16"
              layout="topleft"
              left_pad="2"
              max_length="63"
              name="Name"
              top_delta="0"
-             width="350" />
+             width="365" />
             <text
              type="string"
              length="1"
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="Description:"
-             top="24"
              width="100">
                 Description:
             </text>
@@ -136,10 +132,10 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top|right"
              height="52"
              layout="topleft"
-             left_delta="92"
+             left_pad="2"
              name="Description"
              top_delta="0"
-             width="350"
+             width="365"
              word_wrap="true" />
             <text
              type="string"
@@ -147,10 +143,10 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="LandType"
              top="84"
-             width="92">
+             width="100">
                 Type:
             </text>
             <text
@@ -159,7 +155,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left_delta="92"
+             left_pad="2"
              name="LandTypeText"
              top_delta="0"
              width="250">
@@ -171,10 +167,9 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="ContentRating"
-             top="104"
-             width="92">
+             width="100">
                 Rating:
             </text>
             <text
@@ -183,7 +178,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left_delta="92"
+             left_pad="2"
              name="ContentRatingText"
              top_delta="0"
              width="250">
@@ -195,65 +190,92 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="Owner:"
              top="124"
-             width="92">
+             width="100">
                 Owner:
             </text>
+                <avatar_icon
+     follows="left|top"
+     height="16"
+     default_icon_name="Generic_Person"
+     layout="topleft"
+     left_pad="0"
+     mouse_opaque="true"
+     width="20" />
             <text
              type="string"
              length="1"
              follows="left|top"
              height="16"
              layout="topleft"
-             left_delta="92"
+             left_pad="5"
              name="OwnerText"
-             top_delta="0"
-             width="250">
+             width="240">
                 Leyla Linden
             </text>
-            <button
+             <button
+     follows="right"
+     height="16"
+     image_pressed="Info_Press"
+     image_unselected="Info_Over"
+     left_pad="3"
+     name="info_btn"
+     top_delta="-2"
+     width="16" />
+          <!--  <button
              follows="left|top"
              height="16"
-             label="Profile..."
-             label_selected="Profile..."
+             label="Profile"
              layout="topleft"
              left_pad="4"
              name="Profile..."
-             top_delta="0"
-             width="90" />
+             width="90" />-->
             <text
              type="string"
              length="1"
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="Group:"
-             top="144"
-             width="92">
+             width="100">
                 Group:
             </text>
+            <icon
+     height="16"
+     image_name="Generic_Group"
+     name="group_icon"
+     mouse_opaque="true"
+             left_pad="0"
+     width="20" />
             <text
              enabled="false"
              follows="left|top"
              height="16"
+             left_pad="5"
              layout="topleft"
-             left_delta="92"
              name="GroupText"
-             top_delta="2"
-             width="250" />
+             width="240" />
+                 <button
+     follows="right"
+     height="16"
+     image_pressed="Info_Press"
+     image_unselected="Info_Over"
+     left_pad="3"
+     name="info_btn"
+     top_delta="-2"
+     width="16" />
             <button
              follows="left|top"
              height="16"
-             label="Set..."
-             label_selected="Set..."
+             label="Set"
              layout="topleft"
              left_pad="4"
+             right="-10"
              name="Set..."
-             top_delta="-2"
-             width="90" />
+             width="50" />
             <check_box
              enabled="false"
              height="16"
@@ -263,15 +285,15 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              name="check deed"
              tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation."
              top="164"
-             width="116" />
+             width="146" />
             <button
              enabled="false"
              follows="left|top"
              height="16"
-             label="Deed..."
-             label_selected="Deed..."
+             label="Deed"
              layout="topleft"
-             left_pad="138"
+             left_pad="2"
+             right="-10"
              name="Deed..."
              tool_tip="You may only deed land if you are an officer in the selected group."
              top_delta="0"
@@ -284,7 +306,6 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              left="96"
              name="check contrib"
              tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it."
-             top="184"
              width="199" />
             <text
              type="string"
@@ -292,10 +313,9 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="For Sale:"
-             top="204"
-             width="92">
+             width="100">
                 For Sale:
             </text>
             <text
@@ -304,9 +324,8 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left_delta="92"
+             left_pad="2"
              name="Not for sale."
-             top_delta="0"
              width="186">
                 Not for sale.
             </text>
@@ -318,7 +337,6 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              layout="topleft"
              left_delta="0"
              name="For Sale: Price L$[PRICE]."
-             top_delta="0"
              width="226">
                 Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²).
             </text>
@@ -330,14 +348,14 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              left_delta="0"
              name="SalePending"
              top_pad="4"
-             width="344" />
+             width="324" />
             <button
              follows="left|top"
-             height="20"
-             label="Sell Land..."
-             label_selected="Sell Land..."
+             height="16"
+             label="Sell Land"
              layout="topleft"
-             left_delta="199"
+             left_pad="5"
+             right="-10"
              name="Sell Land..."
              top_delta="0"
              width="145" />
@@ -383,9 +401,9 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              label="Cancel Land Sale"
              label_selected="Cancel Land Sale"
              layout="topleft"
-             left="295"
+             right="-10"
              name="Cancel Land Sale"
-             top="228"
+             left_pad="5"
              width="145" />
             <text
              type="string"
@@ -393,10 +411,10 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="Claimed:"
              top="268"
-             width="92">
+             width="100">
                 Claimed:
             </text>
             <text
@@ -405,7 +423,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left_delta="92"
+             left_pad="2"
              name="DateClaimText"
              top_delta="0"
              width="186">
@@ -417,10 +435,10 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="PriceLabel"
              top="288"
-             width="92">
+             width="100">
                 Area:
             </text>
             <text
@@ -429,7 +447,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left_delta="92"
+             left_pad="2"
              name="PriceText"
              top_delta="0"
              width="186">
@@ -441,10 +459,10 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="Traffic:"
              top="308"
-             width="92">
+             width="100">
                 Traffic:
             </text>
             <text
@@ -453,7 +471,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left_delta="92"
+             left_pad="2"
              name="DwellText"
              top_delta="0"
              width="186">
@@ -463,8 +481,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              enabled="false"
              follows="left|top"
              height="20"
-             label="Buy Land..."
-             label_selected="Buy Land..."
+             label="Buy Land"
              layout="topleft"
              left="155"
              name="Buy Land..."
@@ -474,8 +491,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              enabled="false"
              follows="left|top"
              height="20"
-             label="Buy For Group..."
-             label_selected="Buy For Group..."
+             label="Buy For Group"
              layout="topleft"
              left="260"
              name="Buy For Group..."
@@ -485,8 +501,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              enabled="false"
              follows="left|top"
              height="20"
-             label="Buy Pass..."
-             label_selected="Buy Pass..."
+             label="Buy Pass"
              layout="topleft"
              left_delta="-105"
              name="Buy Pass..."
@@ -496,8 +511,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
             <button
              follows="left|top"
              height="20"
-             label="Abandon Land..."
-             label_selected="Abandon Land..."
+             label="Abandon Land"
              layout="topleft"
              left="260"
              name="Abandon Land..."
@@ -506,8 +520,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
             <button
              follows="left|top"
              height="20"
-             label="Reclaim Land..."
-             label_selected="Reclaim Land..."
+             label="Reclaim Land"
              layout="topleft"
              left_delta="0"
              name="Reclaim Land..."
@@ -517,8 +530,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              enabled="false"
              follows="left|top"
              height="20"
-             label="Linden Sale..."
-             label_selected="Linden Sale..."
+             label="Linden Sale"
              layout="topleft"
              left_delta="0"
              name="Linden Sale..."
@@ -528,15 +540,13 @@ Go to World menu &gt; About Land or select another parcel to show its details.
         </panel>
         <panel
          border="true"
-         follows="left|top|right|bottom"
-         height="380"
-         label="Covenant"
+         follows="all"
+         label="COVENANT"
          layout="topleft"
-         left_delta="-1"
+         left="0"
+         top="0"
          help_topic="land_covenant_tab"
-         name="land_covenant_panel"
-         top_delta="-47"
-         width="458">
+         name="land_covenant_panel">
             <panel.string
              name="can_resell">
                 Purchased land in this region may be resold.
@@ -557,13 +567,12 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              type="string"
              length="1"
              follows="left|top"
-             font="SansSerif"
-             height="20"
+             height="16"
              layout="topleft"
-             left="5"
+             left="10"
              mouse_opaque="false"
              name="estate_section_lbl"
-             top="0"
+             top="10"
              width="100">
                 Estate:
             </text>
@@ -571,38 +580,24 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="16"
              layout="topleft"
-             left="10"
-             mouse_opaque="false"
-             name="estate_name_lbl"
-             top="20"
-             width="100">
-                Name:
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="20"
-             layout="topleft"
-             left_pad="10"
+             left_pad="0"
              mouse_opaque="false"
              name="estate_name_text"
              top_delta="0"
-             width="150">
+             width="260">
                 mainland
             </text>
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="16"
              layout="topleft"
              left="10"
              mouse_opaque="false"
              name="estate_owner_lbl"
-             top="40"
              width="100">
                 Owner:
             </text>
@@ -610,55 +605,52 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="16"
              layout="topleft"
-             left_pad="10"
+             left_pad="0"
              mouse_opaque="false"
              name="estate_owner_text"
-             top_delta="0"
-             width="150">
+             width="300">
                 (none)
             </text>
             <text_editor
              type="string"
              length="1"
              enabled="false"
-             follows="left|top|right|bottom"
-             handle_edit_keys_directly="true" 
-             height="115"
+             follows="all"
+             handle_edit_keys_directly="true"
+             height="200"
              layout="topleft"
-             left_delta="0"
+             left="10"
              max_length="65535"
              name="covenant_editor"
-             top_delta="20"
-             width="330"
+             width="470"
              word_wrap="true">
                 There is no Covenant provided for this Estate.
             </text_editor>
             <text
              type="string"
              length="1"
-             follows="left|top"
-             height="20"
+             follows="right|top"
+             height="16"
+             halign="right"
              layout="topleft"
-             left_delta="0"
+             right="-10"
+             top_pad="0"
              mouse_opaque="false"
              name="covenant_timestamp_text"
-             top_pad="55"
-             width="250">
+             width="460">
                 Last Modified Wed Dec 31 16:00:00 1969
             </text>
             <text
              type="string"
              length="1"
              follows="left|top"
-             font="SansSerif"
-             height="20"
+             height="16"
              layout="topleft"
-             left="5"
+             left="10"
              mouse_opaque="false"
              name="region_section_lbl"
-             top="250"
              width="100">
                 Region:
             </text>
@@ -666,38 +658,23 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              type="string"
              length="1"
              follows="left|top"
-             height="20"
-             layout="topleft"
-             left="10"
-             mouse_opaque="false"
-             name="region_name_lbl"
-             top="270"
-             width="100">
-                Name:
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="20"
+             height="16"
              layout="topleft"
              left_pad="10"
              mouse_opaque="false"
              name="region_name_text"
-             top_delta="0"
              width="150">
-                leyla
+                EricaVille
             </text>
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="16"
              layout="topleft"
              left="10"
              mouse_opaque="false"
              name="region_landtype_lbl"
-             top="290"
              width="100">
                 Type:
             </text>
@@ -705,12 +682,11 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="16"
              layout="topleft"
              left_pad="10"
              mouse_opaque="false"
              name="region_landtype_text"
-             top_delta="0"
              width="150">
                 Mainland / Homestead
             </text>
@@ -718,12 +694,11 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="16"
              layout="topleft"
              left="10"
              mouse_opaque="false"
              name="region_maturity_lbl"
-             top="310"
              width="100">
                 Rating:
             </text>
@@ -731,12 +706,11 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="16"
              layout="topleft"
              left_pad="10"
              mouse_opaque="false"
              name="region_maturity_text"
-             top_delta="0"
              width="150">
                 Adult
             </text>
@@ -744,12 +718,11 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="16"
              layout="topleft"
              left="10"
              mouse_opaque="false"
              name="resellable_lbl"
-             top="330"
              width="100">
                 Resale:
             </text>
@@ -757,12 +730,11 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="16"
              layout="topleft"
              left_pad="10"
              mouse_opaque="false"
              name="resellable_clause"
-             top_delta="0"
              width="330">
                 Land in this region may not be resold.
             </text>
@@ -770,12 +742,11 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="30"
              layout="topleft"
              left="10"
              mouse_opaque="false"
              name="changeable_lbl"
-             top="350"
              width="100">
                 Subdivide:
             </text>
@@ -788,22 +759,20 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              left_pad="10"
              mouse_opaque="false"
              name="changeable_clause"
-             top_delta="0"
+             word_wrap="true"
              width="330">
                 Land in this region may not be joined/subdivided.
             </text>
         </panel>
         <panel
          border="true"
-         follows="left|top|right|bottom"
-         height="380"
-         label="Objects"
+         follows="all"
+         label="OBJECTS"
          layout="topleft"
-         left_delta="0"
+         left="0"
+         top="0"
          help_topic="land_objects_tab"
-         name="land_objects_panel"
-         top_delta="-47"
-         width="458">
+         name="land_objects_panel">
             <panel.string
              name="objects_available_text">
                 [COUNT] out of [MAX] ([AVAILABLE] available)
@@ -818,7 +787,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="parcel_object_bonus"
              top="4"
              visible="false"
@@ -835,7 +804,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              name="Simulator primitive usage:"
              top_pad="4"
              width="364">
-                Simulator primitive usage:
+               Primative usage:
             </text>
             <text
              type="string"
@@ -855,11 +824,11 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="Primitives parcel supports:"
              top="44"
              width="152">
-                Primitives parcel supports:
+                Prims parcel supports:
             </text>
             <text
              type="string"
@@ -879,11 +848,11 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="Primitives on parcel:"
              top="64"
              width="152">
-                Primitives on parcel:
+                Prims on parcel:
             </text>
             <text
              type="string"
@@ -925,7 +894,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              bottom="100"
              enabled="false"
              follows="left|top"
-             height="16"
+             height="20"
              label="Show"
              label_selected="Show"
              layout="topleft"
@@ -936,9 +905,8 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              bottom="100"
              enabled="false"
              follows="left|top"
-             height="16"
-             label="Return..."
-             label_selected="Return..."
+             height="20"
+             label="Return"
              layout="topleft"
              name="ReturnOwner..."
              right="-10"
@@ -972,8 +940,8 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              bottom="120"
              enabled="false"
              follows="left|top"
-             height="16"
              label="Show"
+             height="20"
              label_selected="Show"
              layout="topleft"
              name="ShowGroup"
@@ -983,9 +951,8 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              bottom="120"
              enabled="false"
              follows="left|top"
-             height="16"
-             label="Return..."
-             label_selected="Return..."
+             height="20"
+             label="Return"
              layout="topleft"
              name="ReturnGroup..."
              right="-10"
@@ -1019,7 +986,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              bottom="140"
              enabled="false"
              follows="left|top"
-             height="16"
+             height="20"
              label="Show"
              label_selected="Show"
              layout="topleft"
@@ -1030,9 +997,8 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              bottom="140"
              enabled="false"
              follows="left|top"
-             height="16"
-             label="Return..."
-             label_selected="Return..."
+             height="20"
+             label="Return"
              layout="topleft"
              name="ReturnOther..."
              right="-10"
@@ -1068,7 +1034,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="Autoreturn"
              top="164"
              width="294">
@@ -1091,7 +1057,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="Object Owners:"
              top="184"
              width="104">
@@ -1099,7 +1065,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
             </text>
             <button
              follows="left|top"
-             height="16"
+             height="20"
              label="Refresh List"
              label_selected="Refresh List"
              layout="topleft"
@@ -1110,25 +1076,24 @@ Go to World menu &gt; About Land or select another parcel to show its details.
             <button
              enabled="false"
              follows="left|top"
-             height="16"
-             label="Return objects..."
-             label_selected="Return objects..."
+             height="20"
+             label="Return Objects"
              layout="topleft"
              left_pad="6"
              name="Return objects..."
              top_delta="0"
+             right="-10"
              width="164" />
             <name_list
              column_padding="0"
              draw_heading="true"
-             follows="left|top|right|bottom"
-             height="165"
+             follows="all"
+             height="190"
              layout="topleft"
-             left="4"
+             left="10"
              name="owner list"
              name_column="name"
-             top="210"
-             width="450">
+             width="470">
                 <name_list.columns
                  label="Type"
                  name="type"
@@ -1153,15 +1118,13 @@ Go to World menu &gt; About Land or select another parcel to show its details.
         </panel>
         <panel
          border="true"
-         follows="left|top|right|bottom"
-         height="333"
-         label="Options"
+         follows="all"
+         label="OPTIONS"
          layout="topleft"
-         left_delta="0"
          help_topic="land_options_tab"
          name="land_options_panel"
-         top_delta="31"
-         width="458">
+         left="0"
+         top="0">
             <panel.string
              name="search_enabled_tooltip">
                 Let people see this parcel in search results
@@ -1207,11 +1170,12 @@ Only large parcels can be listed in search.
              type="string"
              length="1"
              follows="left|top"
+             text_color="white"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="allow_label"
-             top="4"
+             top="10"
              width="278">
                 Allow other residents to:
             </text>
@@ -1222,44 +1186,40 @@ Only large parcels can be listed in search.
              left="14"
              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."
-             top="24"
-             width="268" />
+             top_pad="4"
+             width="147i" />
             <check_box
              height="16"
              label="Fly"
              layout="topleft"
-             left_delta="0"
              name="check fly"
              tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land."
-             top_pad="4"
-             width="268" />
+             left_pad="4"
+             width="150" />
             <text
              type="string"
              length="1"
              follows="left|top"
              height="16"
              layout="topleft"
-             left="178"
+             left="14"
              name="allow_label2"
-             top="24"
-             width="104">
-                Create Objects:
+             width="150">
+                Build:
             </text>
             <check_box
              height="16"
-             label="All Residents"
+             label="Everyone"
              layout="topleft"
-             left_delta="92"
+             left_pad="2"
              name="edit objects check"
-             top_delta="0"
-             width="104" />
+             width="120" />
             <check_box
              height="16"
              label="Group"
              layout="topleft"
-             left_delta="100"
+             left_pad="2"
              name="edit group objects check"
-             top_delta="0"
              width="70" />
             <text
              type="string"
@@ -1267,17 +1227,16 @@ Only large parcels can be listed in search.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="178"
+             left="14"
              name="allow_label3"
-             top="44"
-             width="124">
+             width="150">
                 Object Entry:
             </text>
             <check_box
              height="16"
-             label="All Residents"
+             label="Everyone"
              layout="topleft"
-             left_delta="92"
+             left_pad="2"
              name="all object entry check"
              top_delta="0"
              width="120" />
@@ -1285,7 +1244,7 @@ Only large parcels can be listed in search.
              height="16"
              label="Group"
              layout="topleft"
-             left_delta="100"
+             left_pad="2"
              name="group object entry check"
              top_delta="0"
              width="70" />
@@ -1295,17 +1254,16 @@ Only large parcels can be listed in search.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="178"
+             left="14"
              name="allow_label4"
-             top="64"
-             width="124">
+             width="150">
                 Run Scripts:
             </text>
             <check_box
              height="16"
-             label="All Residents"
+             label="Everyone"
              layout="topleft"
-             left_delta="92"
+             left_pad="2"
              name="check other scripts"
              top_delta="0"
              width="120" />
@@ -1313,19 +1271,19 @@ Only large parcels can be listed in search.
              height="16"
              label="Group"
              layout="topleft"
-             left_delta="100"
+             left_pad="2"
              name="check group scripts"
              top_delta="0"
              width="70" />
             <text
              type="string"
+             text_color="white"
              length="1"
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="land_options_label"
-             top="84"
              width="278">
                 Land Options:
             </text>
@@ -1336,33 +1294,31 @@ Only large parcels can be listed in search.
              left="14"
              name="check safe"
              tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."
-             top="104"
-             width="268" />
+             top_pad="5"
+             width="200" />
             <check_box
              height="16"
              label="No Pushing"
              layout="topleft"
-             left_delta="164"
+             left_pad="5"
              name="PushRestrictCheck"
              tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land."
              top_delta="0"
              width="119" />
             <check_box
              height="16"
-             label="Show Place in Search (L$30/week) under"
+             label="Show Place in Search (L$30/week)"
              layout="topleft"
              left="14"
              name="ShowDirectoryCheck"
              tool_tip="Let people see this parcel in search results"
-             top="124"
-             width="268" />
+             width="430" />
             <combo_box
              enabled="false"
              height="18"
              layout="topleft"
-             left_delta="241"
+             left="30"
              name="land category with adult"
-             top_delta="-2"
              visible="false"
              width="130">
                 <combo_box.item
@@ -1422,9 +1378,8 @@ Only large parcels can be listed in search.
              enabled="false"
              height="18"
              layout="topleft"
-             left_delta="0"
+             left="30"
              name="land category"
-             top_delta="0"
              visible="false"
              width="130">
                 <combo_box.item
@@ -1482,8 +1437,8 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="14"
              name="MatureCheck"
+             top="180"
              tool_tip=" "
-             top="144"
              width="107" />
             <text
              type="string"
@@ -1491,74 +1446,73 @@ Only large parcels can be listed in search.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="10"
              name="Snapshot:"
-             top="164"
-             width="278">
+             text_color="white"
+             width="200">
                 Snapshot:
             </text>
             <texture_picker
              follows="left|top"
-             height="135"
+             height="150"
              layout="topleft"
-             left_delta="72"
+             left="14"
              name="snapshot_ctrl"
              tool_tip="Click to choose a picture"
-             top_delta="0"
-             width="180" />
+             width="195" />
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="30"
              layout="topleft"
-             left="4"
+             left="220"
+             top="180"
+             text_color="white"
              name="landing_point"
-             top="287"
-             width="278">
+             word_wrap="true"
+             width="200">
                 Landing Point: [LANDING]
             </text>
             <button
-             follows="left|top"
-             height="16"
+             follows="right|top"
+             height="23"
              label="Set"
              label_selected="Set"
              layout="topleft"
-             left_delta="232"
              name="Set"
              tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."
-             top_delta="0"
              width="50" />
             <button
-             follows="left|top"
-             height="16"
+             follows="right|top"
+             height="23"
              label="Clear"
              label_selected="Clear"
              layout="topleft"
              left_pad="5"
              name="Clear"
              tool_tip="Clear the landing point"
-             top_delta="0"
+             right="-10"
              width="50" />
             <text
              type="string"
              length="1"
+             text_color="white"
              follows="left|top"
              height="16"
              layout="topleft"
-             left="4"
+             left="220"
+             top_pad="10"
              name="Teleport Routing: "
-             top="307"
-             width="278">
+             width="200">
                 Teleport Routing:
             </text>
             <combo_box
-             height="18"
+             height="23"
              layout="topleft"
-             left_delta="116"
              name="landing type"
+             top_pad="3"
              tool_tip="Teleport Routing -- select how to handle teleports onto your land"
-             top_delta="0"
              width="120">
                 <combo_box.item
                  enabled="true"
@@ -1579,34 +1533,31 @@ Only large parcels can be listed in search.
         </panel>
         <panel
          border="true"
-         follows="left|top|right|bottom"
-         height="363"
-         label="Media"
+         follows="all"
+         label="MEDIA"
          layout="topleft"
-         left_delta="0"
+         left="0"
+         top="0"
          help_topic="land_media_tab"
-         name="land_media_panel"
-         top_delta="1"
-         width="458">
+         name="land_media_panel">
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="20"
              layout="topleft"
              left="10"
              name="with media:"
-             top="9"
-             width="65">
+             top="10"
+             width="100">
                 Type:
             </text>
             <combo_box
-             height="18"
+             height="20"
              layout="topleft"
-             left_pad="5"
+             left_pad="0"
              name="media type"
              tool_tip="Specify if the URL is a movie, web page, or other media"
-             top_delta="-2"
              width="120" />
             <text
              follows="left|top"
@@ -1614,79 +1565,70 @@ Only large parcels can be listed in search.
              layout="topleft"
              left_pad="10"
              name="mime_type"
-             top_delta="2"
              width="200" />
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="20"
              layout="topleft"
              left="10"
              name="at URL:"
-             top="29"
-             width="65">
+             width="100">
                 Home URL:
             </text>
             <line_editor
-             bottom_delta="0"
              follows="left|top"
-             height="16"
+             height="20"
              layout="topleft"
-             left="80"
+             left_pad="0"
              max_length="255"
              name="media_url"
-             right="-80"
              select_on_focus="true"
-             text_readonly_color="0.576471 0.662745 0.835294 1" />
+             width="300" />
             <button
-             follows="left|top"
-             height="16"
-             label="Set..."
-             label_selected="Set..."
+             follows="right|top"
+             height="20"
+             label="Set"
              layout="topleft"
-             left_pad="8"
+             left_pad="5"
+             right="-10"
              name="set_media_url"
-             top_delta="0"
-             width="60" />
+             width="50" />
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="20"
              layout="topleft"
              left="10"
              name="CurrentURL:"
-             top="49"
-             width="65">
+             width="100">
                 Current URL:
             </text>
+             <button
+     follows="top|right"
+     height="20"
+     image_overlay="Refresh_Off"
+     layout="topleft"
+             name="reset_media_url"
+     left_pad="0"
+     tool_tip="Refresh URL"
+     width="20" />
             <text
              follows="left|top"
              height="16"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              name="current_url"
-             top_delta="0"
              width="300" />
-            <button
-             follows="left|top"
-             height="16"
-             label="Reset..."
-             label_selected="Reset..."
-             layout="topleft"
-             left_pad="6"
-             name="reset_media_url"
-             top_delta="0"
-             width="60" />
             <check_box
              height="16"
              label="Hide URL"
              layout="topleft"
-             left="100"
+             left="110"
              name="hide_media_url"
              tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types."
-             top="89"
              width="200" />
             <text
              type="string"
@@ -1696,23 +1638,20 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="10"
              name="Description:"
-             top="49"
              width="364">
                 Description:
             </text>
             <line_editor
-             border_style="line"
-             border_thickness="1"
-             bottom_delta="0"
              follows="left|top"
-             height="16"
+             height="20"
              layout="topleft"
-             left="80"
+             left="110"
              max_length="255"
              name="url_description"
-             right="-80"
              select_on_focus="true"
-             tool_tip="Text displayed next to play/load button" />
+             tool_tip="Text displayed next to play/load button"
+             top_delta="10"
+             width="300" />
             <text
              type="string"
              length="1"
@@ -1721,10 +1660,9 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="10"
              name="Media texture:"
-             top="69"
-             width="364">
-                Replace
-Texture:
+             width="364"
+             word_wrap="true">
+                Replace Texture:
             </text>
             <texture_picker
              allow_no_texture="true"
@@ -1732,46 +1670,44 @@ Texture:
              follows="left|top"
              height="80"
              layout="topleft"
-             left_delta="70"
+             left="110"
              name="media texture"
              tool_tip="Click to choose a picture"
-             top_delta="0"
+             top_delta="10"
              width="64" />
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="80"
              layout="topleft"
-             left_delta="75"
+             left_pad="8"
              name="replace_texture_help"
-             top="85"
-             width="270">
-                Objects using this texture will show the movie or
-        web page after you click the play arrow.
+             width="300"
+             word_wrap="true">
+             Objects using this texture will show the movie or web page after you click the play arrow.
 
-        Select the thumbnail to choose a different texture.
+Select the thumbnail to choose a different texture.
             </text>
             <check_box
              height="16"
              label="Auto scale"
              layout="topleft"
-             left_delta="70"
+             left="110"
              name="media_auto_scale"
+             top_pad="0"
              tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required."
-             top_delta="0"
              width="200" />
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="20"
              layout="topleft"
-             left="85"
+             left="10"
              name="media_size"
              tool_tip="Size to render Web media, leave 0 for default."
-             top="185"
-             width="85">
+             width="100">
                 Size:
             </text>
             <spinner
@@ -1779,11 +1715,11 @@ Texture:
              enabled="false"
              follows="left|top"
              halign="right"
-             height="16"
+             height="20"
              increment="1"
              initial_value="0"
              layout="topleft"
-             left_delta="65"
+             left_pad="0"
              max_val="1024"
              name="media_size_width"
              tool_tip="Size to render Web media, leave 0 for default."
@@ -1794,7 +1730,7 @@ Texture:
              enabled="false"
              follows="left|top"
              halign="right"
-             height="16"
+             height="20"
              increment="1"
              initial_value="0"
              layout="topleft"
@@ -1811,7 +1747,7 @@ Texture:
              follows="left|top"
              height="16"
              layout="topleft"
-             left_delta="70"
+             left_pad="5"
              name="pixels"
              right="-10">
                 pixels
@@ -1824,15 +1760,15 @@ Texture:
              layout="topleft"
              left="10"
              name="Options:"
-             top="237"
-             width="292">
+             top_pad="8"
+             width="100">
                 Options:
             </text>
             <check_box
              height="16"
              label="Loop"
              layout="topleft"
-             left_delta="70"
+             left_pad="0"
              name="media_loop"
              tool_tip="Play media in a loop.  When the media has finished playing, it will restart from the beginning."
              top_delta="0"
@@ -1840,15 +1776,13 @@ Texture:
         </panel>
         <panel
          border="true"
-         follows="left|top|right|bottom"
-         height="363"
-         label="Audio"
+         follows="all"
+         label="SOUND"
          layout="topleft"
-         left_delta="0"
+         left="0"
+         top="0"
          help_topic="land_audio_tab"
-         name="land_audio_panel"
-         top_delta="1"
-         width="458">
+         name="land_audio_panel">
             <text
              type="string"
              length="1"
@@ -1856,21 +1790,19 @@ Texture:
              height="16"
              layout="topleft"
              left="10"
+             top="10"
              name="MusicURL:"
-             top="225"
              width="364">
                 Music URL:
             </text>
             <line_editor
-             border_style="line"
-             border_thickness="1"
-             bottom_delta="0"
              follows="left|top"
-             height="16"
+             height="20"
              layout="topleft"
-             left="80"
+             left="100"
              max_length="255"
              name="music_url"
+             top_pad="0"
              right="-15"
              select_on_focus="true" />
             <text
@@ -1881,17 +1813,16 @@ Texture:
              layout="topleft"
              left="10"
              name="Sound:"
-             top="265"
-             width="364">
+             top_pad="10"
+             width="100">
                 Sound:
             </text>
             <check_box
              height="16"
              label="Restrict gesture and object sounds to this parcel"
              layout="topleft"
-             left_delta="70"
              name="check sound local"
-             top_delta="0"
+             left_pad="0"
              width="292" />
             <text
              type="string"
@@ -1902,47 +1833,42 @@ Texture:
              left="10"
              mouse_opaque="false"
              name="Voice settings:"
-             top="305"
-             width="364">
+             top_pad="10"
+             width="100">
                 Voice:
             </text>
             <check_box
-             height="54"
+             height="16"
              label="Enable Voice"
              layout="topleft"
-             left="80"
+             left_pad="0"
              name="parcel_enable_voice_channel"
-             top="267"
-             width="463" />
+             width="300" />
             <check_box
              enabled="false"
-             height="54"
+             height="16"
              label="Enable Voice (established by the Estate)"
              layout="topleft"
-             left_delta="0"
+             left="110"
              name="parcel_enable_voice_channel_is_estate_disabled"
-             top_delta="0"
-             width="463" />
+             width="300" />
             <check_box
-             height="54"
+             height="16"
              label="Restrict Voice to this parcel"
              layout="topleft"
-             left="100"
+             left="110"
              name="parcel_enable_voice_channel_parcel"
-             top="287"
-             width="443" />
+             width="300" />
         </panel>
         <panel
          border="true"
-         follows="left|top|right|bottom"
-         height="333"
-         label="Access"
+         follows="all"
+         label="ACCESS"
          layout="topleft"
-         left_delta="0"
+         left="0"
+         top="0"
          help_topic="land_access_tab"
-         name="land_access_panel"
-         top_delta="31"
-         width="458">
+         name="land_access_panel">
             <panel.string
              name="estate_override">
                 One or more of these options is set at the estate level
@@ -1951,8 +1877,8 @@ Texture:
              type="string"
              length="1"
              follows="left|top"
-             font="SansSerif"
-             height="20"
+
+             height="16"
              layout="topleft"
              left="8"
              name="Limit access to this parcel to:"
@@ -2094,8 +2020,7 @@ Texture:
             <button
              follows="bottom"
              height="16"
-             label="Add..."
-             label_selected="Add..."
+             label="Add"
              layout="topleft"
              left_delta="5"
              name="add_allowed"
@@ -2139,8 +2064,7 @@ Texture:
             <button
              follows="bottom"
              height="16"
-             label="Add..."
-             label_selected="Add..."
+             label="Add"
              layout="topleft"
              left_delta="5"
              name="add_banned"
-- 
cgit v1.2.3


From a28de873cea85bdedcac20a164d7bd2012a4d5bc Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 3 Dec 2009 22:28:53 +0800
Subject:  EXT-2575 [BSI] Deleting content inside a prim from build floater
 deletes prim, rather than content

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_text_editor.xml b/indra/newview/skins/default/xui/en/menu_text_editor.xml
index 7c9e6f0796..ecd96088e7 100644
--- a/indra/newview/skins/default/xui/en/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/menu_text_editor.xml
@@ -32,10 +32,10 @@
      function="Edit.EnablePaste" />
   </menu_item_call>
   <menu_item_call
- label="Delete"
- layout="topleft"
- name="Delete"
- shortcut="Del">
+   label="Delete"
+   layout="topleft"
+   name="Delete"
+   shortcut="Del">
     <menu_item_call.on_click
      function="Edit.Delete" />
     <menu_item_call.on_enable
-- 
cgit v1.2.3


From bbdfd84e2a7e3482143260acf75adb8968fa71bb Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Thu, 3 Dec 2009 09:52:05 -0800
Subject: moved start location dropdown

---
 indra/newview/skins/default/xui/en/panel_login.xml | 90 +++++++++++-----------
 1 file changed, 46 insertions(+), 44 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index d07d4ea25f..aab7f23ecc 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -48,13 +48,13 @@
      left="20"
      name="first_name_text"
      top="20"
-     width="135">
+     width="150">
         Name:
     </text>
     <line_editor
      follows="left|bottom"
      handle_edit_keys_directly="true"
-     height="23"
+     height="22"
      label="First"
      left_delta="0"
      max_length="31"
@@ -66,7 +66,7 @@
     <line_editor
      follows="left|bottom"
      handle_edit_keys_directly="true"
-     height="23"
+     height="22"
      label="Last"
      left_pad="8"
      max_length="31"
@@ -75,38 +75,6 @@
      tool_tip="[SECOND_LIFE] Last Name"
      top_delta="0"
      width="135" />
-    <text
-     follows="left|bottom"
-     font="SansSerifSmall"
-     height="15"
-     left_pad="8"
-     name="start_location_text"
-     top="20"
-     width="135">
-        Starting location:
-    </text>
-    <combo_box
-     allow_text_entry="true"
-     control_name="LoginLocation"
-     follows="left|bottom"
-     height="23"
-     max_chars="128"
-     top_pad="0"
-     name="start_location_combo"
-     width="135">
-        <combo_box.item
-         label="My last location"
-         name="MyLastLocation"
-         value="last" />
-        <combo_box.item
-         label="My home"
-         name="MyHome"
-         value="home" />
-        <combo_box.item
-         label="&lt;Type region name&gt;"
-         name="Typeregionname"
-         value="" />
-    </combo_box>
       <combo_box
      allow_text_entry="true"
      font="SansSerifSmall"
@@ -121,21 +89,21 @@
      follows="left|bottom"
      font="SansSerifSmall"
      height="15"
-     left_pad="3"
+     left_pad="8"
      name="password_text"
      top="20"
-     width="135">
+     width="150">
         Password:
     </text>
     <line_editor
      follows="left|bottom"
      handle_edit_keys_directly="true"
-     height="23"
-     left_delta="0"
+     height="22"
+     left="304"
      max_length="16"
      name="password_edit"
      select_on_focus="true"
-     top_pad="0"
+     top_pad="1"
      width="135" />
     <check_box
      control_name="RememberPassword"
@@ -143,10 +111,10 @@
      font="SansSerifSmall"
      height="16"
      label="Remember"
-     left_pad="5"
+     left_pad="20"
+     top="20"
      name="remember_check"
-     top_delta="5"
-     width="90" />
+     width="150" />
      <button
      follows="left|bottom"
      height="23"
@@ -155,10 +123,44 @@
      label="Log In"
      label_color="White"
      layout="topleft"
-     left_pad="20"
+     left="462"
      name="connect_btn"
      top="35"
      width="90" />
+     <text
+     follows="right|bottom"
+     font="SansSerifSmall"
+     height="15"
+     halign="right"
+     left_pad="10"
+     right="-210"
+     name="start_location_text"
+     top="20"
+     width="130">
+        Starting location:
+    </text>
+    <combo_box
+     allow_text_entry="true"
+     control_name="LoginLocation"
+     follows="left|bottom"
+     height="23"
+     max_chars="128"
+     top_pad="0"
+     name="start_location_combo"
+     width="135">
+        <combo_box.item
+         label="My last location"
+         name="MyLastLocation"
+         value="last" />
+        <combo_box.item
+         label="My home"
+         name="MyHome"
+         value="home" />
+        <combo_box.item
+         label="&lt;Type region name&gt;"
+         name="Typeregionname"
+         value="" />
+    </combo_box>
     <text
      follows="right|bottom"
      font="SansSerifSmall"
-- 
cgit v1.2.3


From 4feca85dfa8347184a76d727582cc86cf3d40245 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 3 Dec 2009 10:54:43 -0800
Subject: EXT-2966 Parcel property icons on nav bar have no tool-tips Added
 tooltips in strings.xml so they can be localized.

---
 indra/newview/skins/default/xui/en/strings.xml                | 10 +++++++++-
 indra/newview/skins/default/xui/en/widgets/location_input.xml |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e795c8e241..b014b8d1c0 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2777,11 +2777,19 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Wild">Wild</string>
 <string name="Wrinkles">Wrinkles</string>
 
-  <!-- Favorites Bar -->
+  <!-- Navigation bar location input control.
+       Strings are here because widget xml is not localizable -->
   <string name="LocationCtrlAddLandmarkTooltip">Add to My Landmarks</string>
   <string name="LocationCtrlEditLandmarkTooltip">Edit My Landmark</string>
   <string name="LocationCtrlInfoBtnTooltip">See more info about the current location</string>
   <string name="LocationCtrlComboBtnTooltip">My location history</string>
+  <string name="LocationCtrlForSaleTooltip">Buy this land</string>
+  <string name="LocationCtrlVoiceTooltip">Voice not available here</string>
+  <string name="LocationCtrlFlyTooltip">Flying not allowed</string>
+  <string name="LocationCtrlPushTooltip">No pushing</string>
+  <string name="LocationCtrlBuildTooltip">Building/dropping objects not allowed</string>
+  <string name="LocationCtrlScriptsTooltip">Scripts not allowed</string>
+  <string name="LocationCtrlDamageTooltip">Health</string>
 
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index d32952b04f..0e2700cb80 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -20,6 +20,8 @@
                 follows="left|top"
                 allow_new_values="true"
                 >
+  <!-- *NOTE: Tooltips are in strings.xml so they can be localized.
+  See LocationCtrlAddLandmarkTooltip etc. -->
   <info_button name="Place Information"
                           width="16"
                           height="16"
@@ -50,6 +52,7 @@
     top="21"
     />
   <voice_icon
+    enabled="true" 
     name="voice_icon"
     width="22"
     height="18"
-- 
cgit v1.2.3


From 60bbeeb0c0b03b8ad37dd47542bb8a96ab691b5e Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Thu, 3 Dec 2009 14:32:05 -0500
Subject: Changed ChatToastAgentNameColor to EmphasisColor.
 http://jira.secondlife.com/browse/EXT-3072

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

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

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 85cb145dbc..acb3262093 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -686,6 +686,6 @@
      value="0.3 0.3 0.3 1.0" />
 	<color
      name="ChatToastAgentNameColor"
-     value="1.0 0.3 1.0 1.0" />
+     reference="EmphasisColor" />
 
 </colors>
-- 
cgit v1.2.3


From 301f6b45ca30ccddb6ff6241ed745040ca1f7461 Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Thu, 3 Dec 2009 15:19:03 -0500
Subject: Updated to add ellipses on long descriptions, and added a margin
 beneath the description to keep it from running into the text below.
 http://jira.secondlife.com/browse/EXT-2995

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

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

diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml
index 3929e3277a..37ae5a64d7 100644
--- a/indra/newview/skins/default/xui/en/inspect_group.xml
+++ b/indra/newview/skins/default/xui/en/inspect_group.xml
@@ -9,7 +9,7 @@
  bg_opaque_image="Inspector_Background" 
  can_close="false"
  can_minimize="false"
- height="148"
+ height="158"
  layout="topleft"
  name="inspect_group"
  single_instance="true"
@@ -49,6 +49,7 @@
    height="45"
    left="8"
    name="group_details"
+   use_ellipses="true"
    top_pad="6"
    width="220"
    word_wrap="true">
@@ -60,7 +61,7 @@ Fear the moose!  Fear it!  And the mongoose too!
    height="13"
    left="8"
    name="group_cost"
-   top_pad="3"
+   top_pad="13"
    width="220">
 L$123 to join
   </text>
@@ -78,7 +79,7 @@ L$123 to join
    height="23"
    label="Join"
    left="8"
-   top="266"
+   top="286"
    name="join_btn"
    width="103"
    commit_callback.function="InspectGroup.Join"/>
@@ -87,7 +88,7 @@ L$123 to join
    height="23"
    label="Leave"
    left="8"
-   top="266"
+   top="286"
    name="leave_btn"
    width="103"
    commit_callback.function="InspectGroup.Leave"/>
@@ -96,7 +97,7 @@ L$123 to join
      height="23"
      label="View Profile"
      name="view_profile_btn"
-     top="266"
+     top="286"
      left="117"
      width="103"
      commit_callback.function="InspectGroup.ViewProfile" />
-- 
cgit v1.2.3


From 329cdc33da27d492f461505a1c4aecf8f127a717 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Thu, 3 Dec 2009 12:28:40 -0800
Subject: Final layout changes to about land, new widget sizes, EXT-3027 About
 Land dialog:Media panel layout issues

---
 .../skins/default/xui/en/floater_about_land.xml    | 187 ++++++++++-----------
 1 file changed, 93 insertions(+), 94 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 1f077bfdae..d1fd42bdd9 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -196,14 +196,6 @@
              width="100">
                 Owner:
             </text>
-                <avatar_icon
-     follows="left|top"
-     height="16"
-     default_icon_name="Generic_Person"
-     layout="topleft"
-     left_pad="0"
-     mouse_opaque="true"
-     width="20" />
             <text
              type="string"
              length="1"
@@ -243,13 +235,7 @@
              width="100">
                 Group:
             </text>
-            <icon
-     height="16"
-     image_name="Generic_Group"
-     name="group_icon"
-     mouse_opaque="true"
-             left_pad="0"
-     width="20" />
+   <!--TODO: HOOK UP GROUP ICON-->
             <text
              enabled="false"
              follows="left|top"
@@ -269,7 +255,7 @@
      width="16" />
             <button
              follows="left|top"
-             height="16"
+             height="23"
              label="Set"
              layout="topleft"
              left_pad="4"
@@ -278,7 +264,7 @@
              width="50" />
             <check_box
              enabled="false"
-             height="16"
+             height="23"
              label="Allow Deed to Group"
              layout="topleft"
              left="96"
@@ -289,7 +275,7 @@
             <button
              enabled="false"
              follows="left|top"
-             height="16"
+             height="23S"
              label="Deed"
              layout="topleft"
              left_pad="2"
@@ -327,7 +313,7 @@
              left_pad="2"
              name="Not for sale."
              width="186">
-                Not for sale.
+                Not for sale
             </text>
             <text
              type="string"
@@ -338,7 +324,7 @@
              left_delta="0"
              name="For Sale: Price L$[PRICE]."
              width="226">
-                Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²).
+                Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²)
             </text>
             <text
              enabled="false"
@@ -347,17 +333,16 @@
              layout="topleft"
              left_delta="0"
              name="SalePending"
-             top_pad="4"
+             top_pad="6"
              width="324" />
             <button
              follows="left|top"
-             height="16"
+             height="23"
              label="Sell Land"
              layout="topleft"
              left_pad="5"
              right="-10"
              name="Sell Land..."
-             top_delta="0"
              width="145" />
             <text
              type="string"
@@ -367,7 +352,7 @@
              layout="topleft"
              left_delta="-199"
              name="For sale to"
-             top_delta="0"
+             top_delta="6"
              width="186">
                 For sale to: [BUYER]
             </text>
@@ -379,9 +364,9 @@
              layout="topleft"
              left_delta="0"
              name="Sell with landowners objects in parcel."
-             top_pad="4"
+             top_pad="8"
              width="186">
-                Objects included in sale.
+                Objects included in sale
             </text>
             <text
              type="string"
@@ -393,11 +378,11 @@
              name="Selling with no objects in parcel."
              top_delta="0"
              width="186">
-                Objects not included in sale.
+                Objects not included in sale
             </text>
             <button
              follows="left|top"
-             height="20"
+             height="23"
              label="Cancel Land Sale"
              label_selected="Cancel Land Sale"
              layout="topleft"
@@ -480,27 +465,27 @@
             <button
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Buy Land"
              layout="topleft"
-             left="155"
+             left_delta="82"
              name="Buy Land..."
              top="328"
              width="100" />
             <button
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Buy For Group"
              layout="topleft"
-             left="260"
+             right="-10"
              name="Buy For Group..."
              top="352"
              width="180" />
             <button
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Buy Pass"
              layout="topleft"
              left_delta="-105"
@@ -510,26 +495,26 @@
              width="100" />
             <button
              follows="left|top"
-             height="20"
+             height="23"
              label="Abandon Land"
              layout="topleft"
-             left="260"
+             right="-10"
              name="Abandon Land..."
              top="328"
              width="180" />
             <button
              follows="left|top"
-             height="20"
+             height="23"
              label="Reclaim Land"
              layout="topleft"
              left_delta="0"
              name="Reclaim Land..."
-             top_delta="-48"
+             top_delta="-50"
              width="180" />
             <button
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Linden Sale"
              layout="topleft"
              left_delta="0"
@@ -1063,16 +1048,16 @@
              width="104">
                 Object Owners:
             </text>
-            <button
-             follows="left|top"
-             height="20"
-             label="Refresh List"
-             label_selected="Refresh List"
-             layout="topleft"
-             left_delta="104"
-             name="Refresh List"
-             top_delta="0"
-             width="106" />
+             <button
+     follows="top|right"
+     height="20"
+     image_overlay="Refresh_Off"
+     layout="topleft"
+     name="Refresh List"
+     left_pad="5"
+     right="-183"
+     tool_tip="Refresh Object List"
+     width="20" />
             <button
              enabled="false"
              follows="left|top"
@@ -1315,7 +1300,7 @@ Only large parcels can be listed in search.
              width="430" />
             <combo_box
              enabled="false"
-             height="18"
+             height="20"
              layout="topleft"
              left="30"
              name="land category with adult"
@@ -1376,7 +1361,7 @@ Only large parcels can be listed in search.
             </combo_box>
             <combo_box
              enabled="false"
-             height="18"
+             height="20"
              layout="topleft"
              left="30"
              name="land category"
@@ -1437,7 +1422,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="14"
              name="MatureCheck"
-             top="180"
+             top="177"
              tool_tip=" "
              width="107" />
             <text
@@ -1449,6 +1434,7 @@ Only large parcels can be listed in search.
              left="10"
              name="Snapshot:"
              text_color="white"
+             top="220"
              width="200">
                 Snapshot:
             </text>
@@ -1481,6 +1467,7 @@ Only large parcels can be listed in search.
              label_selected="Set"
              layout="topleft"
              name="Set"
+             right="-68"
              tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."
              width="50" />
             <button
@@ -1588,7 +1575,7 @@ Only large parcels can be listed in search.
              width="300" />
             <button
              follows="right|top"
-             height="20"
+             height="22"
              label="Set"
              layout="topleft"
              left_pad="5"
@@ -1660,6 +1647,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="10"
              name="Media texture:"
+             top_pad="10"
              width="364"
              word_wrap="true">
                 Replace Texture:
@@ -1877,13 +1865,13 @@ Select the thumbnail to choose a different texture.
              type="string"
              length="1"
              follows="left|top"
-
              height="16"
              layout="topleft"
-             left="8"
+             left="10"
              name="Limit access to this parcel to:"
-             top="4"
-             width="278">
+             text_color="White"
+             top="10"
+             width="400">
                 Access To This Parcel
             </text>
             <check_box
@@ -1938,7 +1926,7 @@ Select the thumbnail to choose a different texture.
              width="278" />
             <check_box
              enabled="false"
-             height="16"
+             height="22"
              label="Sell passes to:"
              layout="topleft"
              left_delta="0"
@@ -1947,7 +1935,7 @@ Select the thumbnail to choose a different texture.
              top_pad="4"
              width="120" />
             <combo_box
-             height="16"
+             height="20"
              layout="topleft"
              left_pad="22"
              name="pass_combo"
@@ -1965,7 +1953,7 @@ Select the thumbnail to choose a different texture.
             <spinner
              enabled="false"
              follows="left|top"
-             height="16"
+             height="22"
              increment="1"
              initial_value="10"
              label="Price in L$:"
@@ -1975,12 +1963,12 @@ Select the thumbnail to choose a different texture.
              max_val="500"
              min_val="1"
              name="PriceSpin"
-             top="149"
-             width="180" />
+             top_pad="5"
+             width="200" />
             <spinner
              enabled="false"
              follows="left|top"
-             height="16"
+             height="22"
              increment="0.25"
              initial_value="1"
              label="Hours of access:"
@@ -1990,8 +1978,15 @@ Select the thumbnail to choose a different texture.
              max_val="24"
              min_val="0.01"
              name="HoursSpin"
-             top_pad="4"
-             width="180" />
+             top_pad="5"
+             width="200" />
+            <panel
+            name="Allowed_layout_panel"
+            follows="top|left"
+            left="10"
+            height="170"
+             top_pad="8"
+            width="240">
             <text
              type="string"
              length="1"
@@ -1999,43 +1994,48 @@ Select the thumbnail to choose a different texture.
              height="16"
              label="Always Allow"
              layout="topleft"
-             left="20"
+             left="0"
              name="AllowedText"
-             top="204"
-             width="195">
+             top="0"
+             width="230">
                 Allowed Residents
             </text>
             <name_list
              column_padding="0"
              follows="top|bottom"
              heading_height="14"
-             height="80"
+             height="120"
              layout="topleft"
-             left_delta="0"
+             left="0"
              multi_select="true"
              name="AccessList"
              tool_tip="([LISTED] listed, [MAX] max)"
-             top_pad="4"
-             width="195" />
+             width="240" />
             <button
              follows="bottom"
-             height="16"
+             height="23"
              label="Add"
              layout="topleft"
-             left_delta="5"
+             left="0"
              name="add_allowed"
-             top="308"
-             width="80" />
+             width="100" />
             <button
              follows="bottom"
-             height="16"
+             height="23"
              label="Remove"
              label_selected="Remove"
              layout="topleft"
-             left_pad="20"
+             left_pad="10"
              name="remove_allowed"
-             top_delta="0"
-             width="80" />
+             right="-1"
+             width="100" />
+             </panel>
+            <panel
+            name="Banned_layout_panel"
+            follows="top|right"
+            height="170"
+            width="240"
+            left_pad="8">
             <text
              type="string"
              length="1"
@@ -2043,44 +2043,43 @@ Select the thumbnail to choose a different texture.
              height="16"
              label="Ban"
              layout="topleft"
-             left="240"
+             left="0"
              name="BanCheck"
-             top="204"
-             width="195">
+             top="0"
+             width="200">
                 Banned Residents
             </text>
             <name_list
              column_padding="0"
              follows="top|bottom"
              heading_height="14"
-             height="80"
+             height="120"
              layout="topleft"
-             left_delta="0"
+             left="0"
              multi_select="true"
              name="BannedList"
              tool_tip="([LISTED] listed, [MAX] max)"
-             top_pad="4"
-             width="195" />
+             width="240" />
             <button
              follows="bottom"
-             height="16"
+             height="23"
              label="Add"
              layout="topleft"
-             left_delta="5"
+             left="0"
              name="add_banned"
-             top="308"
-             width="80" />
+             width="100" />
             <button
              enabled="false"
              follows="bottom"
-             height="16"
+             height="23"
              label="Remove"
              label_selected="Remove"
              layout="topleft"
-             left_pad="20"
+             left_pad="10"
              name="remove_banned"
-             top_delta="0"
-             width="80" />
+             right="-1"
+             width="100" />
+             </panel>
         </panel>
     </tab_container>
 </floater>
-- 
cgit v1.2.3


From 9388a1a9386d4f333323bf2e49bd04766598b2e8 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Thu, 3 Dec 2009 14:42:41 -0800
Subject: fixed window resize alignment problem in login form

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index aab7f23ecc..0bc2b44ad5 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -133,7 +133,7 @@
      height="15"
      halign="right"
      left_pad="10"
-     right="-210"
+     right="-240"
      name="start_location_text"
      top="20"
      width="130">
@@ -142,7 +142,7 @@
     <combo_box
      allow_text_entry="true"
      control_name="LoginLocation"
-     follows="left|bottom"
+     follows="right|bottom"
      height="23"
      max_chars="128"
      top_pad="0"
-- 
cgit v1.2.3


From 2add7f70458a4a439d2fb25039c24d6bbbf245e9 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 3 Dec 2009 15:21:04 -0800
Subject: Added floater_test_text_editor, hooked up UI tests to login Debug
 menu Reviewed with Leyla

---
 .../default/xui/en/floater_test_text_editor.xml    | 20 +++++++++++
 .../skins/default/xui/en/floater_test_textbox.xml  | 17 ++++++++-
 indra/newview/skins/default/xui/en/menu_login.xml  | 41 ++++++++++++++++------
 3 files changed, 67 insertions(+), 11 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_test_text_editor.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
new file mode 100644
index 0000000000..b0aa5c7c4f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="600"
+ layout="topleft"
+ name="floater_test_text_editor"
+ width="800">
+  <text_editor
+   height="50"
+   follows="top|left|bottom"
+   layout="topleft"
+   left="10"
+   name="test_text_editor"
+   tool_tip="text editor"
+   top="25"
+   width="200">
+    Text Editor
+  </text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
index 033070607b..8fc2677cbe 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -21,6 +21,21 @@ Third line of multiple lines
 Fourth line of multiple lines
 Fifth line of multiple lines
     </text>
+  <text
+    clip_partial="true"
+    top_pad="10"
+    left="10"
+    width="267"
+    height="28"
+    layout="topleft"
+    follows="right|left"
+    text_color="white"
+    use_ellipses="true"
+    word_wrap="true"
+    mouse_opaque="false"
+    name="title" >
+    This text has word_wrap set true, use_ellipses set true, and clip_partial set true, so it should wrap around, spilling over to the last line, then clip the last partial line and show ellipses to indicate there is more text
+  </text>
 
   <text
    font="SansSerif"
@@ -28,7 +43,7 @@ Fifth line of multiple lines
    height="10"
    layout="topleft"
    left_delta="0"
-   top_pad="40"
+   top_pad="10"
    width="300">
     SansSerif BOLD
   </text>
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 07940e18b6..a22dc80f4e 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -185,21 +185,42 @@
         <menu_item_call.on_click
          function="Advanced.ShowSideTray" />
       </menu_item_call>
+      <menu
+       label="UI Tests"
+       name="UI Tests"
+       tear_off="true">
+        <menu_item_call
+         label="Textbox"
+         name="Textbox"
+         shortcut="control|1">
+          <menu_item_call.on_click
+           function="ShowFloater"
+           parameter="test_textbox" />
+        </menu_item_call>
+        <menu_item_call
+         label="Text Editor"
+         name="Text Editor"
+         shortcut="control|2">
+          <menu_item_call.on_click
+           function="ShowFloater"
+           parameter="test_text_editor" />
+        </menu_item_call>
         <menu_item_call
-         label="Widget Test"
-         name="Widget Test"
+         label="Widgets"
+         name="Widgets"
          shortcut="control|shift|T">
-            <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="test_widgets" />
+          <menu_item_call.on_click
+           function="ShowFloater"
+           parameter="test_widgets" />
         </menu_item_call>
         <menu_item_call
-         label="Inspectors Test"
-         name="Inspectors Test">
-            <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="test_inspectors" />
+         label="Inspectors"
+         name="Inspectors">
+          <menu_item_call.on_click
+           function="ShowFloater"
+           parameter="test_inspectors" />
         </menu_item_call>
+      </menu>
       <menu_item_check
          label="Reg In Client Test (restart)"
          name="Reg In Client Test (restart)">
-- 
cgit v1.2.3


From 4e3f00fcad09d62b7be67c54513c818c2370f9c5 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Thu, 3 Dec 2009 16:06:33 -0800
Subject: EXT-2450 Extra column in Group panel memberlist

---
 .../skins/default/xui/en/panel_group_general.xml   | 62 +++++++++++-----------
 1 file changed, 31 insertions(+), 31 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 06c187991f..043edd10e1 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="all"
-     height="378"
+     height="395"
  label="General"
  class="panel_group_general"
  layout="topleft"
- left="0"
- top="0"
  name="general_tab"
- width="310">
+ width="323">
     <panel.string
      name="help_text">
         The General tab contains general information about this group, a list of members, general Group Preferences and member options.
@@ -32,7 +30,7 @@ Hover your mouse over the options for more help.
      max_length="511"
      name="charter"
      top="5"
-     width="305"
+     right="-1"
      word_wrap="true">
      Group Charter
     </text_editor>
@@ -41,12 +39,12 @@ Hover your mouse over the options for more help.
      draw_heading="true"
      follows="left|top"
      heading_height="20"
-     height="130"
+     height="156"
      layout="topleft"
      left="0"
+     right="-1"
      name="visible_members"
-     top_pad="2"
-     width="310">
+     top_pad="2">
         <name_list.columns
          label="Member"
          name="name"
@@ -71,15 +69,15 @@ Hover your mouse over the options for more help.
          follows="left|top"
          height="20"
          layout="topleft"
-         left_delta="0"
+         left="5"
+     right="-5"
          name="active_title"
          tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active."
-         top_pad="2"
-         width="300" />
+         top_pad="2" />
         <check_box
          height="16"
          font="SansSerifSmall"
-         label="Receive notices"
+         label="Receive group notices"
          layout="topleft"
          left="5"
          name="receive_notices"
@@ -101,12 +99,12 @@ Hover your mouse over the options for more help.
          border="true"
          bg_alpha_color="FloaterUnfocusBorderColor"
          follows="left|top"
-         height="90"
+         height="88"
          layout="topleft"
-         left="5"
+         left="2"
+         right="-1"
          name="preferences_container"
-         top_pad="5"
-         width="300">
+         top_pad="2">
         <check_box
          follows="right|top"
          height="16"
@@ -132,32 +130,23 @@ Hover your mouse over the options for more help.
          halign="left"
          height="16"
          increment="1"
-         label_width="20"
+         label_width="15"
          label="L$"
          layout="topleft"
          right="-10"
          max_val="99999"
-         left_pad="2"
+         left_pad="0"
          name="spin_enrollment_fee"
          tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked."
          width="100" />
-        <check_box
-         height="16"
-         initial_value="true"
-         label="Show in search"
-         layout="topleft"
-         left="10"
-         name="show_in_group_list"
-         tool_tip="Let people see this group in search results"
-         top_pad="4"
-         width="300" />
-        <combo_box
+         <combo_box
+         follows="left|top"
          height="20"
          layout="topleft"
-         left_delta="0"
+         left="10"
          name="group_mature_check"
          tool_tip="Sets whether your group information is considered moderate"
-         top_pad="2"
+         top_pad="0"
          width="190">
             <combo_box.item
              label="General Content"
@@ -168,5 +157,16 @@ Hover your mouse over the options for more help.
              name="mature"
              value="Mature" />
         </combo_box>
+        <check_box
+         follows="left|top"
+         height="16"
+         initial_value="true"
+         label="Show in search"
+         layout="topleft"
+         left="10"
+         name="show_in_group_list"
+         tool_tip="Let people see this group in search results"
+         top_pad="4"
+         width="300" />
     </panel>
 </panel>
-- 
cgit v1.2.3


From b119ee524a8c809c01baa91d653dfe0b8217c44e Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 30 Dec 2009 15:14:59 -0800
Subject: EXT-2967   	 Spinner label font sizes are not rendering
 consistently between platforms OSX isn't loading the ui_ctrl.xml file, moving
 font to individual widgets reviewed by James

---
 indra/newview/skins/default/xui/en/widgets/accordion_tab.xml  | 3 ++-
 indra/newview/skins/default/xui/en/widgets/chat_history.xml   | 3 ++-
 indra/newview/skins/default/xui/en/widgets/chiclet_script.xml | 3 ++-
 indra/newview/skins/default/xui/en/widgets/menu_item.xml      | 3 +--
 indra/newview/skins/default/xui/en/widgets/radio_item.xml     | 2 +-
 indra/newview/skins/default/xui/en/widgets/slider_bar.xml     | 3 ++-
 indra/newview/skins/default/xui/en/widgets/spinner.xml        | 1 +
 indra/newview/skins/default/xui/en/widgets/textbase.xml       | 3 ++-
 indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml        | 2 +-
 9 files changed, 14 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
index c0e1944f56..9990324d03 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -9,5 +9,6 @@
     header_image_over="Accordion_Over"
     header_image_pressed="Accordion_Press"
     header_image_expanded="Accordion_Selected"
-    header_text_color="LtGray" 
+    header_text_color="LtGray"
+    font="SansSerif"
     />
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
index 32916c0816..2be37d222a 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -15,4 +15,5 @@
 	track_bottom="true"
 	name="chat_history"
 	type="string"
-	word_wrap="true" />
\ No newline at end of file
+	word_wrap="true"
+  font="SansSerif"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
index 5011bf6a61..e5af961a56 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_script
- name="script_chiclet">
+ name="script_chiclet"
+ font="SansSerif">
  <icon
   name="chiclet_icon"
   follows="all"
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml
index 2bbaa6233f..c65244ae22 100644
--- a/indra/newview/skins/default/xui/en/widgets/menu_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_item.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- Use this for the top-level menu styling -->
-<menu_item>
-</menu_item>
+<menu_item font="SansSerif" />
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
index dd848f3acd..3ddf18b2cb 100644
--- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<radio_item follows="left|top">
+<radio_item follows="left|top" font="SansSerif">
   <radio_item.label_text name="Radio Item label"/>
   <radio_item.check_button name="Radio control button"
                           image_unselected="RadioButton_Off"
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
index 706c89f5ed..89d5950e98 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
@@ -8,4 +8,5 @@
             track_image_horizontal="SliderTrack_Horiz"
             track_image_vertical="SliderTrack_Vert"
             track_highlight_horizontal_image="SliderTrack_Horiz"
-            track_highlight_vertical_image="SliderTrack_Vert" />
+            track_highlight_vertical_image="SliderTrack_Vert"
+         font="SansSerif"  />
diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml
index 7d1a5118cb..ab3f8df5f8 100644
--- a/indra/newview/skins/default/xui/en/widgets/spinner.xml
+++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <spinner text_enabled_color="LabelTextColor"
          text_disabled_color="LabelDisabledColor"
+         font="SansSerif" 
          decimal_digits="3"
          label_width="40" >
   <spinner.up_button name="SpinCtrl Up"
diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml
index 166e8555fe..f4dc192bc3 100644
--- a/indra/newview/skins/default/xui/en/widgets/textbase.xml
+++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml
@@ -1,2 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<textbase clip_partial="false"/>
+<textbase clip_partial="false"
+          font="SansSerif"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
index 2f72ad65a1..f4dbb8f404 100644
--- a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- Global settings for all widgets ("UI Controls") -->
+<!-- The params in this file aren't currently getting loaded in OSX -->
 <ui_ctrl
-  font="SansSerif"
   /> 
-- 
cgit v1.2.3


From d2901ab4ce56c837df45c06672053844e8290e61 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 30 Dec 2009 15:33:34 -0800
Subject: EXT-2898   	 Hiding navbar and favbar is broken reviewed by James

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

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

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index d99205b2fe..3d8999b134 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -10,22 +10,16 @@
   <layout_stack border_size="0"
                 follows="all"
                 mouse_opaque="false"
-                height="768"
+                height="749"
                 name="menu_stack"
                 orientation="vertical"
-                top="0">
+                top="19">
     <layout_panel auto_resize="false"
-                  height="84"
+                  height="65"
                   mouse_opaque="false"
-                  name="nav_and_status_bar_region"
+                  name="nav_bar_container"
                   width="1024"
                   visible="false">
-      <panel follows="left|right|bottom"
-             left="0"
-             name="nav_bar_container"
-             right="1024"
-             top="19"
-             height="65"/>
     </layout_panel>
     <layout_panel auto_resize="true"
                   follows="all"
-- 
cgit v1.2.3


From 58d65d58a90ab61f4fa317c829e96f9d24bbc65b Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 30 Dec 2009 15:34:30 -0800
Subject: EXT-2823   	 Find window: change default open location to the
 top-left of screen EXT-2921   	 [BSI] Default location for Screenshot Floater
 hides expanded options off screen reviewed by James

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

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

diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 2263866471..9b4a04cbca 100644
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -8,6 +8,8 @@
          background_visible="true"
          background_opaque="false"
          header_height="25"
+         top="0"
+         left="0" 
   close_image="Icon_Close_Foreground"
   restore_image="Icon_Restore_Foreground"
   minimize_image="Icon_Minimize_Foreground"
-- 
cgit v1.2.3