From 46b2826d653a7e59e89bcffb591567d3ee4c67dd Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 3 Feb 2010 16:52:23 -0500
Subject: EXT-4923 : Texture Preview "Copy to Inventory" button too small

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
index 0d155fb01e..fc6f06ffd4 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
@@ -114,7 +114,7 @@
      left="6"
      name="Keep"
      top_pad="5"
-     width="100" />
+     width="110" />
     <button
      follows="right|bottom"
      height="22"
@@ -123,7 +123,7 @@
      left_pad="5"
      name="Discard"
      top_delta="0"
-     width="100" />
+     width="110" />
     <button
      follows="right|bottom"
      height="22"
@@ -132,5 +132,5 @@
      left_pad="5"
      name="save_tex_btn"
      top_delta="0"
-     width="100" />
+     width="110" />
 </floater>
-- 
cgit v1.2.3


From 554c163baf5bee0d62082338e854468ecb2fc5f1 Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Wed, 3 Feb 2010 17:51:33 -0500
Subject: EXT-1268 'Remember me' is misleading

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index c04414abbb..627e616af5 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -118,7 +118,7 @@ control_name="RememberPassword"
 follows="left|bottom"
 font="SansSerifSmall"
 height="16"
-label="Remember"
+label="Remember password"
   top_pad="3"
   name="remember_check"
  width="135" />
-- 
cgit v1.2.3


From da19bed9a816a396fbc359803bd6a7f88bf8b6ae Mon Sep 17 00:00:00 2001
From: Soft Linden <soft@lindenlab.com>
Date: Wed, 3 Feb 2010 17:04:44 -0600
Subject: EXT-1560 VWR-11118 DEV-27362 Ctrl+Alt+Shift+H doesn't say hippos!
 anymore

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 7a4f63bfe4..22f4d277a4 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1998,6 +1998,18 @@
                  function="Advanced.ToggleHUDInfo"
                  parameter="fov" />
             </menu_item_check>
+            <menu_item_check
+             label="Badge"
+             layout="topleft"
+             name="Badge"
+			 shortcut="alt|control|shift|h">
+                <menu_item_check.on_check
+                 function="Advanced.CheckHUDInfo"
+                 parameter="badge" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleHUDInfo"
+                 parameter="badge" />
+            </menu_item_check>
         </menu>
         <menu
          create_jump_keys="true"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b4a12cfb32..d6db451286 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -115,9 +115,6 @@
   <!-- Avatar name: More than one avatar is selected/used here -->
   <string name="AvatarNameMultiple">(multiple)</string>
 
-  <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
-	<string name="AvatarNameHippos">(hippos)</string>
-
 	<!-- Group name: text shown for LLUUID::null -->
 	<string name="GroupNameNone">(none)</string>
 
-- 
cgit v1.2.3


From 46bcfc4bb4efb99ed58d700b3c462d776bb52559 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Wed, 3 Feb 2010 19:46:24 -0500
Subject: Fixed paths to artwork. https://jira.secondlife.com/browse/EXT-4935

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

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

diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 2163660206..626135642b 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -99,7 +99,7 @@
     top="19"
     left="2"
     follows="right|top"
-    image_name="Parcel_Damage_Dark"
+    image_name="Parcel_Health_Dark"
     />
   <!-- Default text color is invisible on top of nav bar background -->
   <damage_text
-- 
cgit v1.2.3


From 13aa8f8faaaefea59531a970bd0b6fe1d947b756 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 3 Feb 2010 21:27:02 -0500
Subject: EXT-4344 : Object Inspector has "Sorry, not implemented yet"

Added sidetray object inspector code.
---
 indra/newview/skins/default/xui/en/notifications.xml | 8 --------
 1 file changed, 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 636db2b59b..5c37ef75b5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -391,14 +391,6 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
      notext="No"
      yestext="Yes"/>
   </notification>
-
-  <notification
-    icon="alertmodal.tga"
-    name="ClickUnimplemented"
-    type="alertmodal">
-Sorry, not implemented yet.
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="JoinGroupCanAfford"
-- 
cgit v1.2.3


From 482eefcba94dac0e6a0e6f9985f582e724b02523 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Thu, 4 Feb 2010 12:39:13 +0200
Subject: fix for task EXT-4750 Disable "Join" dialog for free groups also add
 group name to notification - more informative...

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 636db2b59b..7cc4af53f8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -411,6 +411,19 @@ Do you wish to proceed?
      yestext="Join"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="JoinGroupNoCost"
+   type="alertmodal">
+You are Joining group [NAME].
+Do you wish to proceed?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Join"/>
+  </notification>
+
+
   <notification
    icon="alertmodal.tga"
    name="JoinGroupCannotAfford"
-- 
cgit v1.2.3


From 667ae0b9a31318d43d36cb6c8cb73a83e1470009 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 4 Feb 2010 15:54:56 +0200
Subject: Fixed critical bug EXT-4845 (Create padding around text messages in
 the side tray panels) - moved "No Items" textbox params to widget
 (flat_list_view.xml) - set default vertical/horizontal padding to 10 px -
 they can be overridden in panel's xml if necessary.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.xml           |  2 ++
 indra/newview/skins/default/xui/en/widgets/flat_list_view.xml | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 3b5add33a8..447ac1b123 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -137,6 +137,7 @@ background_visible="true"
                         <avatar_list
                          allow_select="true"
                          follows="all"
+                         height="235"
                          layout="topleft"
                          left="0"
                          multi_select="true"
@@ -152,6 +153,7 @@ background_visible="true"
                         <avatar_list
                          allow_select="true"
                          follows="all"
+                         height="235"
                          layout="topleft"
                          left="0"
                          multi_select="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
index 888b4eaf7c..a71b293f31 100644
--- a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
@@ -5,4 +5,12 @@
  item_pad="0"
  keep_one_selected="true"
  multi_select="false"
- opaque="true" />
\ No newline at end of file
+ opaque="true">
+    <flat_list_view.no_items_text
+     follows="all"
+     name="no_items_msg"
+     v_pad="10"
+     h_pad="10"
+     value="There are no any items in the list"
+     wrap="true" />
+</flat_list_view>
\ No newline at end of file
-- 
cgit v1.2.3


From 36a44ba0e9133e78cc66f7d0b65d0890cfeb3db5 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Thu, 4 Feb 2010 15:37:25 +0200
Subject: fix for normal EXT-1888 Apply button remains active after Applying
 changes

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_preferences.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 15655a920e..05deca705a 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -56,7 +56,7 @@
          help_topic="preferences_general_tab"
          name="general" />
         <panel
-	 class="panel_preference"
+	 class="panel_preference_graphics"
          filename="panel_preferences_graphics1.xml"
          label="Graphics"
          layout="topleft"
-- 
cgit v1.2.3


From 79bcb8dc723d093e92bb5897e42c48e26b0bbf4e Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 4 Feb 2010 15:44:45 +0200
Subject: Fixed low bug EXT-4951 - Redundant edit box context menu in list
 items in Panel Picks/Classifieds

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_pick_list_item.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 023b1fc81d..e62c1278f9 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -64,6 +64,7 @@
      layout="topleft"
      left="103"
      name="picture_descr"
+     textbox.mouse_opaque="false" 
      top_pad="0"
      width="178"
      word_wrap="true" />
-- 
cgit v1.2.3


From a7141017afb8b13fe9d4758dfe502cc28966310f Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 4 Feb 2010 16:27:22 +0200
Subject: =?UTF-8?q?fixed=20EXT-4905=20=E2=80=9CDuplicated=20text=20in=20te?=
 =?UTF-8?q?leport=20notification=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5d78cfc9ef..d16474873f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1532,7 +1532,7 @@ Your search terms were too short so no search was performed.
    icon="alertmodal.tga"
    name="CouldNotTeleportReason"
    type="alertmodal">
-Could not teleport.
+Teleport failed.
 [REASON]
   </notification>
 
-- 
cgit v1.2.3


From 9a15ee8a91a12020b22625873c280837739f946c Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Thu, 4 Feb 2010 10:00:33 -0500
Subject: Removed aspect ratio controls.
 http://jira.secondlife.com/browse/EXT-3908

---
 .../default/xui/en/panel_preferences_advanced.xml  | 57 ----------------------
 1 file changed, 57 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 4d14d46743..05a3771edf 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -266,61 +266,4 @@ Automatic position for:
           <button.commit_callback
           function="Pref.VoiceSetMiddleMouse" />
     </button>
-       <text
-     follows="left|top"
-     type="string"
-     length="1"
-     height="13"
-     layout="topleft"
-     left="30"
-     top_pad="8"
-     name="AspectRatioLabel1"
-     tool_tip="width / height"
-     label_width="50"
-     width="120">
-        Aspect ratio
-    </text>
-    <combo_box
-     allow_text_entry="true"
-     height="23"
-     follows="left|top"
-     layout="topleft"
-     left="80"
-     max_chars="100"
-     name="aspect_ratio"
-     tool_tip="width / height"
-     width="150">
-        <combo_box.item
-         enabled="true"
-         label=" 4:3 (Standard CRT)"
-         name="item1"
-         value="1.333333" />
-        <combo_box.item
-         enabled="true"
-         label=" 5:4 (1280x1024 LCD)"
-         name="item2"
-         value="1.25" />
-        <combo_box.item
-         enabled="true"
-         label=" 8:5 (Widescreen)"
-         name="item3"
-         value="1.6" />
-        <combo_box.item
-         enabled="true"
-         label=" 16:9 (Widescreen)"
-         name="item4"
-         value="1.7777777" />
-    </combo_box>
-    <check_box
-     control_name="FullScreenAutoDetectAspectRatio"
-     follows="left|top"
-     height="25"
-     label="Automatic"
-     layout="topleft"
-     left_pad="10"
-     name="aspect_auto_detect"
-     width="256">
-        <check_box.commit_callback
-         function="Pref.AutoDetectAspect" />
-    </check_box>
 </panel>
-- 
cgit v1.2.3


From c99fb12b3d300705dbf6eb68b1a3f22927d4d221 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 4 Feb 2010 17:25:30 +0200
Subject: Update for low bug EXT-4951 - Redundant edit box context menu in list
 items in Panel Picks/Classifieds Disabled edit box context menu in classified
 list items.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index b881719e3a..0c1418fc2d 100644
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -64,6 +64,7 @@
      layout="topleft"
      left="103"
      name="description"
+     textbox.mouse_opaque="false" 
      top_pad="0"
      width="178"
      word_wrap="true" />
-- 
cgit v1.2.3


From 643b014fb858ec547663536dc649d845d2722ed2 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Thu, 4 Feb 2010 16:43:46 -0500
Subject: EXT-4990 : "Find Original" should be enabled for links in the trash
 EXT-4988 : Centralize right-click menu options when items are in trash

This change is a lot less scary than it looks.  There is a bit of minor cosmetic cleanup (e.g. typedefing a commonly-used vector), and I've eliminated code duplication since, previously, every item/listener type had its own purge/restore item dialog; these are now handled in one central function.
I also moved "Find Original" above Purge/RestoreItem so that it appears first in the trash menu; this does not affect other menu options.
The functionality change from this checkin is to enable "Find Original" for link items in the trash.
---
 indra/newview/skins/default/xui/en/menu_inventory.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 1993af6730..2874151df5 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -369,6 +369,14 @@
     <menu_item_separator
      layout="topleft"
      name="Outfit Separator" />
+    <menu_item_call
+     label="Find Original"
+     layout="topleft"
+     name="Find Original">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="goto" />
+    </menu_item_call>
     <menu_item_call
      label="Purge Item"
      layout="topleft"
@@ -385,14 +393,6 @@
          function="Inventory.DoToSelected"
          parameter="restore" />
     </menu_item_call>
-    <menu_item_call
-     label="Find Original"
-     layout="topleft"
-     name="Find Original">
-        <menu_item_call.on_click
-         function="Inventory.DoToSelected"
-         parameter="goto" />
-    </menu_item_call>
     <menu_item_call
      label="Open"
      layout="topleft"
-- 
cgit v1.2.3


From ee4a27ab7995db8677a23053614cfcafbccde524 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Thu, 4 Feb 2010 16:44:06 -0500
Subject: Change "Teleport History Location" subheader to "Teleport History".
 Adjusted color and style on this and other side-panel subheaders to be
 consistent.

---
 indra/newview/skins/default/xui/en/panel_landmark_info.xml  | 2 +-
 indra/newview/skins/default/xui/en/panel_place_profile.xml  | 4 ++--
 indra/newview/skins/default/xui/en/panel_profile_view.xml   | 2 +-
 indra/newview/skins/default/xui/en/sidepanel_appearance.xml | 4 ++--
 indra/newview/skins/default/xui/en/sidepanel_item_info.xml  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index 396699ad6c..d1b22a34bb 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -71,7 +71,7 @@
      layout="topleft"
      left_pad="10"
      name="title"
-     text_color="white"
+     text_color="LtGray"
      top="0"
      use_ellipses="true"
      value="Place Profile"
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 7ac771de27..94c9b2de01 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -29,7 +29,7 @@
      value="Place Profile" />
     <string
      name="title_teleport_history"
-     value="Teleport History Location" />
+     value="Teleport History" />
     <string
      name="not_available"
      value="(N\A)" />
@@ -156,7 +156,7 @@
      layout="topleft"
      left_pad="10"
      name="title"
-     text_color="white"
+     text_color="LtGray"
      top="0"
      use_ellipses="true"
      value="Place Profile"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index f5396951ca..607de65c5c 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -35,7 +35,7 @@
       layout="topleft"
       left_pad="10"
       name="user_name"
-      text_color="white"
+      text_color="LtGray"
       top="0"
       value="(Loading...)"
       use_ellipses="true"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index fab1f11273..bde45a9487 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -46,10 +46,10 @@ width="333">
       top="0"
       width="30" />
       <text
-      font="SansSerifHuge"
+      font="SansSerifHugeBold"
       height="20"
       left_pad="5"
-      text_color="white"
+      text_color="LtGray"
       top="3"
       use_ellipses="true"
       width="305"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index e18f59ab64..18b59741bf 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -50,7 +50,7 @@
      width="23" />
     <text
      follows="top|left|right"
-     font="SansSerifHuge"
+     font="SansSerifHugeBold"
      height="26"
      layout="topleft"
      left_pad="10"
-- 
cgit v1.2.3


From 195b13beff0ea476ed47a08f6a44b85dc151eec8 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Thu, 4 Feb 2010 16:00:56 -0800
Subject: EXT-2181 DA Danish translation for set6

---
 .../skins/default/xui/da/floater_about_land.xml    | 368 ++++++++++-----------
 .../default/xui/da/floater_animation_preview.xml   | 231 +++++++++----
 .../default/xui/da/floater_avatar_textures.xml     |  52 +--
 .../skins/default/xui/da/floater_beacons.xml       |  26 +-
 .../skins/default/xui/da/floater_build_options.xml |  17 +-
 .../skins/default/xui/da/floater_buy_contents.xml  |   8 +-
 .../skins/default/xui/da/floater_buy_currency.xml  |  82 +++--
 .../skins/default/xui/da/floater_buy_land.xml      |  24 +-
 .../skins/default/xui/da/floater_choose_group.xml  |   6 +-
 .../skins/default/xui/da/floater_customize.xml     |  88 ++++-
 .../default/xui/da/floater_device_settings.xml     |   4 +-
 .../skins/default/xui/da/floater_env_settings.xml  |  20 +-
 .../default/xui/da/floater_hardware_settings.xml   |  26 +-
 .../skins/default/xui/da/floater_help_browser.xml  |   8 +
 indra/newview/skins/default/xui/da/floater_im.xml  |   4 +-
 .../skins/default/xui/da/floater_im_container.xml  |   2 +
 .../skins/default/xui/da/floater_image_preview.xml |  28 +-
 .../skins/default/xui/da/floater_incoming_call.xml |  21 ++
 .../skins/default/xui/da/floater_inspect.xml       |  13 +-
 .../skins/default/xui/da/floater_inventory.xml     |  59 +---
 .../xui/da/floater_inventory_item_properties.xml   |  92 +++---
 .../skins/default/xui/da/floater_joystick.xml      |   8 +-
 .../skins/default/xui/da/floater_lagmeter.xml      | 215 ++++++------
 .../skins/default/xui/da/floater_lsl_guide.xml     |  10 +-
 .../default/xui/da/floater_media_settings.xml      |   6 +
 .../skins/default/xui/da/floater_nearby_chat.xml   |   2 +
 .../skins/default/xui/da/floater_openobject.xml    |   8 +-
 .../skins/default/xui/da/floater_outgoing_call.xml |  28 ++
 indra/newview/skins/default/xui/da/floater_pay.xml |  32 +-
 .../skins/default/xui/da/floater_pay_object.xml    |  33 +-
 .../skins/default/xui/da/floater_preview_event.xml |   8 +-
 .../default/xui/da/floater_preview_gesture.xml     |  53 +--
 .../xui/da/floater_preview_gesture_info.xml        |   2 +
 .../xui/da/floater_preview_gesture_shortcut.xml    |  15 +
 .../xui/da/floater_preview_gesture_steps.xml       |   2 +
 .../default/xui/da/floater_preview_notecard.xml    |  20 +-
 .../default/xui/da/floater_preview_texture.xml     |  39 ++-
 .../default/xui/da/floater_script_debug_panel.xml  |   2 +
 .../default/xui/da/floater_script_preview.xml      |   7 +-
 .../skins/default/xui/da/floater_script_search.xml |  10 +-
 .../skins/default/xui/da/floater_sell_land.xml     | 123 +++----
 .../default/xui/da/floater_settings_debug.xml      |  20 +-
 .../skins/default/xui/da/floater_snapshot.xml      |  68 ++--
 .../skins/default/xui/da/floater_sys_well.xml      |   9 +
 .../skins/default/xui/da/floater_telehub.xml       |  15 +-
 .../skins/default/xui/da/floater_top_objects.xml   |  34 +-
 indra/newview/skins/default/xui/da/floater_tos.xml |  11 +-
 .../newview/skins/default/xui/da/floater_water.xml |  64 ++--
 .../default/xui/da/floater_whitelist_entry.xml     |   9 +
 .../skins/default/xui/da/inspect_object.xml        |  34 ++
 .../skins/default/xui/da/mime_types_linux.xml      | 217 ++++++++++++
 .../default/xui/da/panel_active_object_row.xml     |   9 +
 .../default/xui/da/panel_adhoc_control_panel.xml   |   8 +
 .../skins/default/xui/da/panel_bottomtray.xml      |  23 ++
 .../skins/default/xui/da/panel_edit_alpha.xml      |  10 +
 .../skins/default/xui/da/panel_edit_eyes.xml       |   9 +
 .../skins/default/xui/da/panel_edit_gloves.xml     |  10 +
 .../skins/default/xui/da/panel_edit_jacket.xml     |  11 +
 .../skins/default/xui/da/panel_edit_pants.xml      |  10 +
 .../skins/default/xui/da/panel_edit_pick.xml       |  28 ++
 .../skins/default/xui/da/panel_edit_shoes.xml      |  10 +
 .../skins/default/xui/da/panel_edit_skin.xml       |  14 +
 .../skins/default/xui/da/panel_edit_socks.xml      |  10 +
 .../skins/default/xui/da/panel_edit_underpants.xml |  10 +
 .../skins/default/xui/da/panel_edit_undershirt.xml |  10 +
 .../skins/default/xui/da/panel_edit_wearable.xml   | 101 ++++++
 .../newview/skins/default/xui/da/panel_friends.xml |  36 +-
 .../default/xui/da/panel_group_control_panel.xml   |   9 +
 .../skins/default/xui/da/panel_group_general.xml   |  77 ++---
 .../default/xui/da/panel_group_info_sidetray.xml   |  36 ++
 .../skins/default/xui/da/panel_group_invite.xml    |  37 +--
 .../default/xui/da/panel_group_land_money.xml      |  39 ++-
 .../skins/default/xui/da/panel_group_notices.xml   |  51 ++-
 indra/newview/skins/default/xui/da/panel_me.xml    |   7 +
 .../xui/da/panel_media_settings_general.xml        |  32 ++
 .../xui/da/panel_media_settings_security.xml       |  12 +
 .../skins/default/xui/da/panel_my_profile.xml      |  37 +++
 .../skins/default/xui/da/panel_nearby_chat.xml     |   9 +
 .../skins/default/xui/da/panel_nearby_chat_bar.xml |  11 +
 .../skins/default/xui/da/panel_pick_info.xml       |  16 +
 .../skins/default/xui/da/panel_place_profile.xml   | 103 ++++++
 .../default/xui/da/panel_preferences_chat.xml      |   4 +
 .../default/xui/da/panel_preferences_general.xml   | 107 +++---
 .../default/xui/da/panel_preferences_graphics1.xml | 213 +++++-------
 .../default/xui/da/panel_prim_media_controls.xml   |  28 ++
 .../skins/default/xui/da/panel_profile_view.xml    |  16 +
 .../skins/default/xui/da/panel_region_estate.xml   |  64 ++--
 .../default/xui/da/panel_side_tray_tab_caption.xml |   5 +
 .../skins/default/xui/da/panel_status_bar.xml      |  61 ++--
 .../newview/skins/default/xui/da/role_actions.xml  | 245 ++++----------
 .../skins/default/xui/da/sidepanel_appearance.xml  |  11 +
 .../skins/default/xui/da/sidepanel_inventory.xml   |  11 +
 92 files changed, 2358 insertions(+), 1475 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/da/floater_help_browser.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_im_container.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_incoming_call.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_media_settings.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_nearby_chat.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_outgoing_call.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_preview_gesture_info.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_preview_gesture_shortcut.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_preview_gesture_steps.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_script_debug_panel.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_sys_well.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
 create mode 100644 indra/newview/skins/default/xui/da/inspect_object.xml
 create mode 100644 indra/newview/skins/default/xui/da/mime_types_linux.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_active_object_row.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_bottomtray.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_edit_alpha.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_edit_eyes.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_edit_gloves.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_edit_jacket.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_edit_pants.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_edit_pick.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_edit_shoes.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_edit_skin.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_edit_socks.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_edit_underpants.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_edit_undershirt.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_edit_wearable.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_group_control_panel.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_me.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_media_settings_general.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_media_settings_security.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_my_profile.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_nearby_chat.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_pick_info.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_place_profile.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_profile_view.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml
 create mode 100644 indra/newview/skins/default/xui/da/sidepanel_appearance.xml
 create mode 100644 indra/newview/skins/default/xui/da/sidepanel_inventory.xml

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

diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
index cb5d618dde..b4af427538 100644
--- a/indra/newview/skins/default/xui/da/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
@@ -1,7 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterland" title="OM LAND">
+	<floater.string name="Minutes">
+		[MINUTES] minutter
+	</floater.string>
+	<floater.string name="Minute">
+		minut
+	</floater.string>
+	<floater.string name="Seconds">
+		[SECONDS] sekunder
+	</floater.string>
+	<floater.string name="Remaining">
+		mangler
+	</floater.string>
 	<tab_container name="landtab">
-		<panel label="Generelt" name="land_general_panel">
+		<panel label="GENERELT" name="land_general_panel">
+			<panel.string name="new users only">
+				Kun nye brugere
+			</panel.string>
+			<panel.string name="anyone">
+				Alle
+			</panel.string>
+			<panel.string name="area_text">
+				Størrelse
+			</panel.string>
+			<panel.string name="area_size_text">
+				[AREA] m²
+			</panel.string>
+			<panel.string name="auction_id_text">
+				Auktion nr: [ID]
+			</panel.string>
+			<panel.string name="need_tier_to_modify">
+				Du skal godkende dit køb for at kunne æmdre på dette land.
+			</panel.string>
+			<panel.string name="group_owned_text">
+				(Gruppe ejet)
+			</panel.string>
+			<panel.string name="profile_text">
+				Profil...
+			</panel.string>
+			<panel.string name="info_text">
+				Info...
+			</panel.string>
+			<panel.string name="public_text">
+				(offentlig)
+			</panel.string>
+			<panel.string name="none_text">
+				(ingen)
+			</panel.string>
+			<panel.string name="sale_pending_text">
+				(Salg i gang)
+			</panel.string>
+			<panel.string name="no_selection_text">
+				Pacel ikke valgt.
+Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel for at se detaljer.
+			</panel.string>
 			<text name="Name:">
 				Navn:
 			</text>
@@ -26,7 +78,6 @@
 			<text name="OwnerText">
 				Leyla Linden
 			</text>
-			<button label="Profil..." label_selected="Profil..." name="Profile..."/>
 			<text name="Group:">
 				Gruppe:
 			</text>
@@ -78,54 +129,23 @@
 			<button label="Efterlad land..." label_selected="Efterlad land..." name="Abandon Land..."/>
 			<button label="Kræv tilbage..." label_selected="Kræv tilbage..." name="Reclaim Land..."/>
 			<button label="Linden salg..." label_selected="Linden salg..." name="Linden Sale..." tool_tip="Land skal være ejet, indholdsrating sat og ikke allerede på auktion."/>
-			<panel.string name="new users only">
-				Kun nye brugere
-			</panel.string>
-			<panel.string name="anyone">
-				Alle
-			</panel.string>
-			<panel.string name="area_text">
-				Størrelse
-			</panel.string>
-			<panel.string name="area_size_text">
-				[AREA] m²
-			</panel.string>
-			<panel.string name="auction_id_text">
-				Auktion nr: [ID]
-			</panel.string>
-			<panel.string name="need_tier_to_modify">
-				Du skal godkende dit køb for at kunne æmdre på dette land.
-			</panel.string>
-			<panel.string name="group_owned_text">
-				(Gruppe ejet)
-			</panel.string>
-			<panel.string name="profile_text">
-				Profil...
-			</panel.string>
-			<panel.string name="info_text">
-				Info...
-			</panel.string>
-			<panel.string name="public_text">
-				(offentlig)
+		</panel>
+		<panel label="REGLER" name="land_covenant_panel">
+			<panel.string name="can_resell">
+				Købt land i denne region må sælges videre
 			</panel.string>
-			<panel.string name="none_text">
-				(ingen)
+			<panel.string name="can_not_resell">
+				Købt land i denne region må ikke sælges videre
 			</panel.string>
-			<panel.string name="sale_pending_text">
-				(Salg i gang)
+			<panel.string name="can_change">
+				Købt jord i denne region må gerne samles eller opdeles.
 			</panel.string>
-			<panel.string name="no_selection_text">
-				Pacel ikke valgt.
-Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel for at se detaljer.
+			<panel.string name="can_not_change">
+				Købt jord i denne region må íkke samles eller opdeles.
 			</panel.string>
-		</panel>
-		<panel label="Regler" name="land_covenant_panel">
 			<text name="estate_section_lbl">
 				Estate:
 			</text>
-			<text name="estate_name_lbl">
-				Navn:
-			</text>
 			<text name="estate_name_text">
 				Hovedland
 			</text>
@@ -144,9 +164,6 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 			<text name="region_section_lbl">
 				Region:
 			</text>
-			<text name="region_name_lbl">
-				Navn:
-			</text>
 			<text name="region_name_text">
 				leyla
 			</text>
@@ -174,35 +191,23 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 			<text name="changeable_clause">
 				Land i denne region må ikke samles/opdeles.
 			</text>
-			<panel.string name="can_resell">
-				Købt land i denne region må sælges videre
-			</panel.string>
-			<panel.string name="can_not_resell">
-				Købt land i denne region må ikke sælges videre
-			</panel.string>
-			<panel.string name="can_change">
-				Købt jord i denne region må gerne samles eller opdeles.
+		</panel>
+		<panel label="OBJEKTER" name="land_objects_panel">
+			<panel.string name="objects_available_text">
+				[COUNT] ud af [MAX] ([AVAILABLE] ledige)
 			</panel.string>
-			<panel.string name="can_not_change">
-				Købt jord i denne region må íkke samles eller opdeles.
+			<panel.string name="objects_deleted_text">
+				[COUNT] ud af [MAX] ([DELETED] bliver slettet)
 			</panel.string>
-		</panel>
-		<panel label="Objekter" name="land_objects_panel">
 			<text name="parcel_object_bonus">
 				Region objekt bonus faktor: [BONUS]
 			</text>
 			<text name="Simulator primitive usage:">
-				Prims brugt i denne Sim:
+				Prim forbrug:
 			</text>
 			<text name="objects_available">
 				[COUNT] ud af [MAX] ([AVAILABLE] ledige)
 			</text>
-			<panel.string name="objects_available_text">
-				[COUNT] ud af [MAX] ([AVAILABLE] ledige)
-			</panel.string>
-			<panel.string name="objects_deleted_text">
-				[COUNT] ud af [MAX] ([DELETED] bliver slettet)
-			</panel.string>
 			<text name="Primitives parcel supports:">
 				Prims til rådighed:
 			</text>
@@ -251,33 +256,63 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 			<text name="Object Owners:">
 				Objekt ejere:
 			</text>
-			<button label="Gentegn liste" label_selected="Gentegn liste" name="Refresh List"/>
+			<button label="Gentegn liste" label_selected="Gentegn liste" name="Refresh List" tool_tip="Refresh Object List"/>
 			<button label="Returnér objekter..." label_selected="Returnér objekter..." name="Return objects..."/>
 			<name_list name="owner list">
-				<column label="Type" name="type"/>
-				<column label="Navn" name="name"/>
-				<column label="Antal" name="count"/>
-				<column label="Nyeste" name="mostrecent"/>
+				<name_list.columns label="Type" name="type"/>
+				<name_list.columns label="Navn" name="name"/>
+				<name_list.columns label="Antal" name="count"/>
+				<name_list.columns label="Nyeste" name="mostrecent"/>
 			</name_list>
 		</panel>
-		<panel label="Indstillinger" name="land_options_panel">
+		<panel label="INDSTILLINGER" name="land_options_panel">
+			<panel.string name="search_enabled_tooltip">
+				Lad beboere se denne parcel i søgeresultater
+			</panel.string>
+			<panel.string name="search_disabled_small_tooltip">
+				Denne mulighed er ikke til stede da parcellens område er 128 m² eller mindre.
+Kun større parceller kan vises i søgning.
+			</panel.string>
+			<panel.string name="search_disabled_permissions_tooltip">
+				Dette valg er lukket da du ikke kan ændre på denne parcels opsætning.
+			</panel.string>
+			<panel.string name="mature_check_mature">
+				Mature indhold
+			</panel.string>
+			<panel.string name="mature_check_adult">
+				Adult indhold
+			</panel.string>
+			<panel.string name="mature_check_mature_tooltip">
+				Din parcel information eller indhold anses for at være &apos;adult&apos;.
+			</panel.string>
+			<panel.string name="mature_check_adult_tooltip">
+				Din parcel information eller indhold anses for at være &apos;adult&apos;.
+			</panel.string>
+			<panel.string name="landing_point_none">
+				(ingen)
+			</panel.string>
+			<panel.string name="push_restrict_text">
+				Skub forbudt
+			</panel.string>
+			<panel.string name="push_restrict_region_text">
+				Skub forbudt (Uanset region indstilling)
+			</panel.string>
 			<text name="allow_label">
 				Tillad andre beboere at:
 			</text>
 			<check_box label="Redigere terræn" name="edit land check" tool_tip="Hvis dette er valg, kan enhver redigere dit land. Det er bedst ikke at vælge her, da det altid er muligt for dig som ejer at ændre terræn på dit eget land."/>
-			<check_box label="Lave landemærker" name="check landmark"/>
 			<check_box label="Flyve" name="check fly" tool_tip="Hvis valgt, kan beboere flyve på dit land. Hvis ikke valgt kan beboere kun flyve ind på dit land og over dit land."/>
-			<text name="allow_label2" left="194">
+			<text left="194" name="allow_label2">
 				Lave objekter:
 			</text>
 			<check_box label="Alle beboere" name="edit objects check"/>
 			<check_box label="Gruppe" name="edit group objects check"/>
-			<text name="allow_label3" left="170">
+			<text left="170" name="allow_label3">
 				Anbringe objekter:
 			</text>
 			<check_box label="Alle beboere" name="all object entry check"/>
 			<check_box label="Gruppe" name="group object entry check"/>
-			<text name="allow_label4" left="200">
+			<text left="200" name="allow_label4">
 				Køre scripts:
 			</text>
 			<check_box label="Alle beboere" name="check other scripts"/>
@@ -287,73 +322,37 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 			</text>
 			<check_box label="Sikker (ingen skade)" name="check safe" tool_tip="Hvis valgt, er det ikke muligt at forårsage skade på andre beboere. Hvis fravalgt er det muligt at få skader (f.eks. ved kamp)."/>
 			<check_box label="Skub forbudt" name="PushRestrictCheck" tool_tip="Forhindrer scripts i at skubbe. Valg af denne mulighed, kan være nyttigt for at forhindre forstyrrende adfærd på dit land."/>
-			<check_box label="Vis sted i søgning (L$30/uge) i kategorien:" name="ShowDirectoryCheck" tool_tip="Lad dit parcel blive vist i søge resultaterne"/>
-			<panel.string name="search_enabled_tooltip">
-				Lad beboere se denne parcel i søgeresultater
-			</panel.string>
-			<panel.string name="search_disabled_small_tooltip">
-				Denne mulighed er ikke til stede da parcellens område er 128 m² eller mindre.
-Kun større parceller kan vises i søgning.
-			</panel.string>
-			<panel.string name="search_disabled_permissions_tooltip">
-				Dette valg er lukket da du ikke kan ændre på denne parcels opsætning.
-			</panel.string>
+			<check_box label="Vis sted i søgning (L$30/uge)" name="ShowDirectoryCheck" tool_tip="Lad dit parcel blive vist i søge resultaterne"/>
 			<combo_box name="land category with adult">
-				<combo_box.item name="item0" label="Enhver kategori"
-				/>
-				<combo_box.item name="item1" label="Linden sted"
-				/>
-				<combo_box.item name="item2" label="Adult"
-				/>
-				<combo_box.item name="item3" label="Kunst &amp; kultur"
-				/>
-				<combo_box.item name="item4" label="Business"
-				/>
-				<combo_box.item name="item5" label="Uddannelse"
-				/>
-				<combo_box.item name="item6" label="Spil"
-				/>
-				<combo_box.item name="item7" label="Afslapning"
-				/>
-				<combo_box.item name="item8" label="Nybegynder venligt"
-				/>
-				<combo_box.item name="item9" label="Parker &amp; natur"
-				/>
-				<combo_box.item name="item10" label="Beboelse"
-				/>
-				<combo_box.item name="item11" label="Indkøb"
-				/>
-				<combo_box.item name="item12" label="Andet"
-				/>
+				<combo_box.item label="Enhver kategori" name="item0"/>
+				<combo_box.item label="Linden sted" name="item1"/>
+				<combo_box.item label="Adult" name="item2"/>
+				<combo_box.item label="Kunst &amp; kultur" name="item3"/>
+				<combo_box.item label="Business" name="item4"/>
+				<combo_box.item label="Uddannelse" name="item5"/>
+				<combo_box.item label="Spil" name="item6"/>
+				<combo_box.item label="Afslapning" name="item7"/>
+				<combo_box.item label="Nybegynder venligt" name="item8"/>
+				<combo_box.item label="Parker &amp; natur" name="item9"/>
+				<combo_box.item label="Beboelse" name="item10"/>
+				<combo_box.item label="Indkøb" name="item11"/>
+				<combo_box.item label="Andet" name="item12"/>
 			</combo_box>
 			<combo_box name="land category">
-				<combo_box.item name="item0" label="Enhver kategori" />
-				<combo_box.item name="item1" label="Linden sted" />
-				<combo_box.item name="item3" label="Kunst &amp; kultur" />
-				<combo_box.item name="item4" label="Business" />
-				<combo_box.item name="item5" label="Uddannelse" />
-				<combo_box.item name="item6" label="Spil" />
-				<combo_box.item name="item7" label="Afslapning" />
-				<combo_box.item name="item8" label="Nybegynder venligt" />
-				<combo_box.item name="item9" label="Parker &amp; natur" />
-				<combo_box.item name="item10" label="Beboelse" />
-				<combo_box.item name="item11" label="Indkøb" />
-				<combo_box.item name="item12" label="Andet" />
+				<combo_box.item label="Enhver kategori" name="item0"/>
+				<combo_box.item label="Linden sted" name="item1"/>
+				<combo_box.item label="Kunst &amp; kultur" name="item3"/>
+				<combo_box.item label="Business" name="item4"/>
+				<combo_box.item label="Uddannelse" name="item5"/>
+				<combo_box.item label="Spil" name="item6"/>
+				<combo_box.item label="Afslapning" name="item7"/>
+				<combo_box.item label="Nybegynder venligt" name="item8"/>
+				<combo_box.item label="Parker &amp; natur" name="item9"/>
+				<combo_box.item label="Beboelse" name="item10"/>
+				<combo_box.item label="Indkøb" name="item11"/>
+				<combo_box.item label="Andet" name="item12"/>
 			</combo_box>
-			<button label="?" label_selected="?" name="?"/>
 			<check_box label="Mature indhold" name="MatureCheck" tool_tip=""/>
-			<panel.string name="mature_check_mature">
-				Mature indhold
-			</panel.string>
-			<panel.string name="mature_check_adult">
-				Adult indhold
-			</panel.string>
-			<panel.string name="mature_check_mature_tooltip">
-				Din parcel information eller indhold anses for at være &apos;adult&apos;.
-			</panel.string>
-			<panel.string name="mature_check_adult_tooltip">
-				Din parcel information eller indhold anses for at være &apos;adult&apos;.
-			</panel.string>
 			<text name="Snapshot:">
 				Foto:
 			</text>
@@ -361,40 +360,35 @@ Kun større parceller kan vises i søgning.
 			<text name="landing_point">
 				Landingspunkt: [LANDING]
 			</text>
-			<panel.string name="landing_point_none">
-				(ingen)
-			</panel.string>
 			<button label="Vælg" label_selected="Vælg" name="Set" tool_tip="Indstiller landingspunkt, hvor de besøgende ankommer. Sættes til din avatars aktuelle placering i denne parcel."/>
 			<button label="Fjern" label_selected="Fjern" name="Clear" tool_tip="Fjerner oplysning om landingspunkt."/>
 			<text name="Teleport Routing: ">
 				Teleport valg:
 			</text>
 			<combo_box name="landing type" tool_tip="Vælg hvordan du vil håndtere teleporteringer til dit land.">
-				<combo_box.item name="Blocked" label="Blokeret" />
-				<combo_box.item name="LandingPoint" label="Landingspunkt" />
-				<combo_box.item name="Anywhere" label="Hvor som helst" />
+				<combo_box.item label="Blokeret" name="Blocked"/>
+				<combo_box.item label="Landingspunkt" name="LandingPoint"/>
+				<combo_box.item label="Hvor som helst" name="Anywhere"/>
 			</combo_box>
-			<panel.string name="push_restrict_text">
-				Skub forbudt
-			</panel.string>
-			<panel.string name="push_restrict_region_text">
-				Skub forbudt (Uanset region indstilling)
-			</panel.string>
 		</panel>
-		<panel label="Medier" name="land_media_panel">
-			<text name="with media:" left="4">
+		<panel label="MEDIA" name="land_media_panel">
+			<text left="4" name="with media:">
 				Medie type:
 			</text>
 			<combo_box name="media type" tool_tip="Specificer om URL-adressen er til en film, hjemmeside eller et andet medie."/>
-			<text name="at URL:" left="4">
+			<text left="4" name="at URL:">
 				Medie URL:
 			</text>
 			<button label="Vælg..." label_selected="Vælg..." name="set_media_url"/>
-			<text name="Description:" left="4">
+			<text name="CurrentURL:">
+				Nuværende side:
+			</text>
+			<check_box label="Skjul medie URL" name="hide_media_url" tool_tip="Klik her for at skjule medie adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den."/>
+			<text left="4" name="Description:">
 				Beskrivelse:
 			</text>
 			<line_editor name="url_description" tool_tip="Tekst vist ved siden af Afspil/Hent knappen"/>
-			<text name="Media texture:" left="4">
+			<text left="4" name="Media texture:">
 				Erstat tekstur:
 			</text>
 			<texture_picker label="" name="media texture" tool_tip="Klik for at vælge billede"/>
@@ -402,13 +396,7 @@ Kun større parceller kan vises i søgning.
 				(Objekter der har denne tekstur vil vise filmen eller 
 web-siden, efter du klikker på play knappen.)
 			</text>
-			<text name="Options:">
-				Medie valg:
-			</text>
 			<check_box label="Auto skalér" name="media_auto_scale" tool_tip="Vælg denne mulighed for at skalere indholdet for dette parcel automatisk. Det kan være lidt langsommere og have lavere kvalitet, men ingen anden tekstur skalering eller tilpasning vil være nødvendigt."/>
-			<check_box label="Gentag afspil" name="media_loop" tool_tip="Gentager automatisk medie, når det er færdigt med at spille starter det automatisk forfra."/>
-			<check_box label="Skjul medie URL" name="hide_media_url" tool_tip="Klik her for at skjule medie adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den."/>
-			<check_box label="Skjul musik URL" name="hide_music_url" tool_tip="Klik her for at skjule musik adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den."/>
 			<text name="media_size" tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." width="105">
 				Medie Størrelse:
 			</text>
@@ -417,56 +405,42 @@ web-siden, efter du klikker på play knappen.)
 			<text name="pixels">
 				pixels
 			</text>
-			<text name="MusicURL:">
-				Musik URL:
-			</text>
-			<text name="Sound:">
-				Lyd:
-			</text>
-			<check_box label="Begræns lyde fra bevægelser og objekter til denne parcel" name="check sound local"/>
-			<button label="?" label_selected="?" name="?" left="400"/>
-			<text name="Voice settings:">
-				Stemme:
+			<text name="Options:">
+				Medie valg:
 			</text>
-			<radio_group name="parcel_voice_channel">
-				<radio_item name="Estate" label="Brug Estate kanalen" />
-				<radio_item name="Private" label="Brug en privat kanal" />
-				<radio_item name="Disabled" label="Slå stemme chat fra på denne parcel" />
-			</radio_group>
+			<check_box label="Gentag afspil" name="media_loop" tool_tip="Gentager automatisk medie, når det er færdigt med at spille starter det automatisk forfra."/>
+		</panel>
+		<panel label="LYD" name="land_audio_panel">
+			<check_box label="Tillad stemmer" name="parcel_enable_voice_channel"/>
+			<check_box label="Tillad stemmer (håndteret af estate)" name="parcel_enable_voice_channel_is_estate_disabled"/>
 		</panel>
-		<panel label="Adgang" name="land_access_panel">
+		<panel label="ADGANG" name="land_access_panel">
+			<panel.string name="access_estate_defined">
+				(Defineret via estate)
+			</panel.string>
+			<panel.string name="estate_override">
+				En eller flere af disse valg er indstillet på estate niveau
+			</panel.string>
 			<text name="Limit access to this parcel to:">
 				Adgang til denne parcel
 			</text>
-			<check_box label="Tillad offentlig adgang" name="public_access"/>
+			<check_box label="Tillad offentlig adgang [MATURITY]" name="public_access"/>
 			<text name="Only Allow">
-				Blokér adgang for:
+				Blokér adgang for::
 			</text>
-			<check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab" name="limit_payment" tool_tip="Blokér beboere der ikke har afgivet identifikationsoplysninger."/>
-			<check_box label="Beboere der ikke er godkendt som voksne" name="limit_age_verified" tool_tip="Blokér beboere der ikke har verificeret deres alder. Se support.secondlife.com for mere information."/>
-			<panel.string name="estate_override">
-				En eller flere af disse valg er indstillet på estate niveau
-			</panel.string>
+			<check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Blokér beboere der ikke har afgivet identifikationsoplysninger."/>
+			<check_box label="Alders verifikation [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Blokér beboere der ikke har verificeret deres alder. Se support.secondlife.com for mere information."/>
 			<check_box label="Tillad adgang til gruppen: [GROUP]" name="GroupCheck" tool_tip="Vælg gruppe under fanen &apos;generelt&apos;."/>
 			<check_box label="Sælg adgang til:" name="PassCheck" tool_tip="Tillader midlertidig adgang til denne parcel"/>
 			<combo_box name="pass_combo">
-				<combo_box.item name="Anyone" label="Alle" />
-				<combo_box.item name="Group" label="Gruppe" />
+				<combo_box.item label="Alle" name="Anyone"/>
+				<combo_box.item label="Gruppe" name="Group"/>
 			</combo_box>
 			<spinner label="Pris i L$:" name="PriceSpin"/>
 			<spinner label="Timers adgang:" name="HoursSpin"/>
-			<text label="Tillad altid" name="AllowedText">
-				Altid godkendte beboere
-			</text>
-			<name_list name="AccessList" tool_tip="([LISTED] vist, [MAX] max)"/>
-			<button label="Tilføj..." label_selected="Tilføj..." name="add_allowed"/>
-			<button label="Fjern" label_selected="Fjern" name="remove_allowed"/>
-			<text label="Blokér" name="BanCheck">
-				Blokerede beboere
-			</text>
-			<name_list name="BannedList" tool_tip="([LISTED] vist, [MAX] max)"/>
-			<button label="Tilføj..." label_selected="Tilføj..." name="add_banned"/>
-			<button label="Fjern" label_selected="Fjern" name="remove_banned"/>
+			<panel name="Allowed_layout_panel">
+				<name_list name="AccessList" tool_tip="([LISTED] vist, [MAX] maks.)"/>
+			</panel>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
index 8cb0eee601..47e02f0704 100644
--- a/indra/newview/skins/default/xui/da/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
@@ -1,97 +1,184 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Animation Preview" title="">
+	<floater.string name="failed_to_initialize">
+		Fejlede at starte bevægelse
+	</floater.string>
+	<floater.string name="anim_too_long">
+		Animations filen er [LENGTH] sekunder lang.
+
+Maksimal animations længde er [MAX_LENGTH] sekunder.
+	</floater.string>
+	<floater.string name="failed_file_read">
+		Kan ikke læse animations fil.
+
+[STATUS]
+	</floater.string>
+	<floater.string name="E_ST_OK">
+		OK
+	</floater.string>
+	<floater.string name="E_ST_EOF">
+		Fil afsluttet for tidligt.
+	</floater.string>
+	<floater.string name="E_ST_NO_CONSTRAINT">
+		Kan ikke læse &quot;constraint definition&quot;.
+	</floater.string>
+	<floater.string name="E_ST_NO_FILE">
+		Kan ikke åbne BVH fil.
+	</floater.string>
+	<floater.string name="E_ST_NO_HIER">
+		Ugyldig header i HIERARCHY.
+	</floater.string>
+	<floater.string name="E_ST_NO_JOINT">
+		Kan ikke finde &quot;ROOT&quot; eller &quot;JOINT&quot;.
+	</floater.string>
+	<floater.string name="E_ST_NO_NAME">
+		Kan ikke finde JOINT navn.
+	</floater.string>
+	<floater.string name="E_ST_NO_OFFSET">
+		Kan ikke finde OFFSET.
+	</floater.string>
+	<floater.string name="E_ST_NO_CHANNELS">
+		Kan ikke finde CHANNELS.
+	</floater.string>
+	<floater.string name="E_ST_NO_ROTATION">
+		Kan ikke læse &quot;rotation order&quot;.
+	</floater.string>
+	<floater.string name="E_ST_NO_AXIS">
+		Kan ikke finde rotationsakser.
+	</floater.string>
+	<floater.string name="E_ST_NO_MOTION">
+		Kan ikke finde MOTION.
+	</floater.string>
+	<floater.string name="E_ST_NO_FRAMES">
+		Kan ikke læse antal &quot;frames&quot;.
+	</floater.string>
+	<floater.string name="E_ST_NO_FRAME_TIME">
+		Kan ikke læse &quot;frame time&quot;.
+	</floater.string>
+	<floater.string name="E_ST_NO_POS">
+		Kan ikke læse positionsværdier.
+	</floater.string>
+	<floater.string name="E_ST_NO_ROT">
+		Kan ikke læse rotationsværdier.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_FILE">
+		kan ikke åbne &quot;translation file&quot;.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_HEADER">
+		Kan ikke læse &quot;translation header.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_NAME">
+		Kan ikke aflæse &quot;translation&quot; navne.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_IGNORE">
+		Kan ikke læse &quot;translation ignore&quot; værdi.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_RELATIVE">
+		Kan ikke læse &quot;translation relative&quot; værdi.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_OUTNAME">
+		Kan ikke læse &quot;translation outname&quot; værdi.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_MATRIX">
+		Kan ikke læse &quot;translation matrix&quot;.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_MERGECHILD">
+		Kan ikke læse &quot;mergechild&quot; navn.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
+		Kan ikke læse &quot;mergeparent&quot; navn.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_PRIORITY">
+		Kan ikke finde prioritetsværdi.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_LOOP">
+		Kan ikke læse &quot;loop&quot; værdi.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_EASEIN">
+		kan ikke læse &quot;easeIn&quot; værdier.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_EASEOUT">
+		Kan ikke læse &quot;easeOut&quot; værdier.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_HAND">
+		Kan ikke læse &quot;hand morph&quot; værdi.
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_EMOTE">
+		kan ikke læse &quot;emote&quot; navn.
+	</floater.string>
 	<text name="name_label">
 		Navn:
 	</text>
 	<text name="description_label">
 		Beskrivelse:
 	</text>
-	<spinner label="Prioritet" name="priority"
-	     tool_tip="Vælg hvilke andre animationer der har lavere prioritet end denne." />
-	<check_box label="Gentag" name="loop_check" tool_tip="Gentager animationen konstant." />
-	<spinner left="76" label_width="40" width="105" label="Ind(%)" name="loop_in_point" tool_tip="Sætter punktet hvor gentagelsen genstarter fra."/>
-	<spinner label="Ud (%)" name="loop_out_point"
-	     tool_tip="Sætter punktet i animationen der afslutter gentagelsen." />
+	<spinner label="Prioritet" name="priority" tool_tip="Vælg hvilke andre animationer der &quot;overstyres&quot; af denne"/>
+	<check_box label="Gentag" name="loop_check" tool_tip="Gentager animationen konstant"/>
+	<spinner label="Ind(%)" label_width="40" left="76" name="loop_in_point" tool_tip="Sætter punktet hvor gentagelsen genstarter fra" width="105"/>
+	<spinner label="Ud (%)" name="loop_out_point" tool_tip="Sætter punktet i animationen der afslutter gentagelsen"/>
 	<text name="hand_label">
 		Hånd posering
 	</text>
-	<combo_box label="" name="hand_pose_combo"
-	     tool_tip="Kontrollerer hvad hænderne går i løbet af animationen." width="140">
-		<combo_box.item name="Spread" label="Spredt" />
-		<combo_box.item name="Relaxed" label="Afslappet" />
-		<combo_box.item name="PointBoth" label="Peg begge" />
-		<combo_box.item name="Fist" label="Knytnæver" />
-		<combo_box.item name="RelaxedLeft" label="Afslappet venstre" />
-		<combo_box.item name="PointLeft" label="Peg venstre" />
-		<combo_box.item name="FistLeft" label="Knytnæve venstre" />
-		<combo_box.item name="RelaxedRight" label="Afslappet højre" />
-		<combo_box.item name="PointRight" label="Peg højre" />
-		<combo_box.item name="FistRight" label="Knytnæve højre" />
-		<combo_box.item name="SaluteRight" label="Honnør højre" />
-		<combo_box.item name="Typing" label="Skriver" />
-		<combo_box.item name="PeaceRight" label="Fredstegn højre" />
+	<combo_box label="" name="hand_pose_combo" tool_tip="Kontrollerer hvad hænderne går i løbet af animationen" width="140">
+		<combo_box.item label="Spredt" name="Spread"/>
+		<combo_box.item label="Afslappet" name="Relaxed"/>
+		<combo_box.item label="Peg begge" name="PointBoth"/>
+		<combo_box.item label="Knytnæver" name="Fist"/>
+		<combo_box.item label="Afslappet venstre" name="RelaxedLeft"/>
+		<combo_box.item label="Peg venstre" name="PointLeft"/>
+		<combo_box.item label="Knytnæve venstre" name="FistLeft"/>
+		<combo_box.item label="Afslappet højre" name="RelaxedRight"/>
+		<combo_box.item label="peg højre" name="PointRight"/>
+		<combo_box.item label="knytnæve højre" name="FistRight"/>
+		<combo_box.item label="Honnør højre" name="SaluteRight"/>
+		<combo_box.item label="Skrivende" name="Typing"/>
+		<combo_box.item label="Fredstegn højre" name="PeaceRight"/>
 	</combo_box>
 	<text name="emote_label">
 		Ansigtsudtryk
 	</text>
-	<combo_box label="" name="emote_combo"
-	     tool_tip="Angiver hvad ansigtet gør under animationen" width="140">
-		<combo_box.item name="[None]" label="Intet]" />
-		<combo_box.item name="Aaaaah" label="Aaaaah" />
-		<combo_box.item name="Afraid" label="Bange" />
-		<combo_box.item name="Angry" label="Vred" />
-		<combo_box.item name="BigSmile" label="Stort smil" />
-		<combo_box.item name="Bored" label="Keder sig" />
-		<combo_box.item name="Cry" label="Græder" />
-		<combo_box.item name="Disdain" label="Forarget" />
-		<combo_box.item name="Embarrassed" label="Flov" />
-		<combo_box.item name="Frown" label="Skuler" />
-		<combo_box.item name="Kiss" label="Kysser" />
-		<combo_box.item name="Laugh" label="Griner" />
-		<combo_box.item name="Plllppt" label="Plllppt" />
-		<combo_box.item name="Repulsed" label="Frastødt" />
-		<combo_box.item name="Sad" label="Ked af det" />
-		<combo_box.item name="Shrug" label="Skuldertræk" />
-		<combo_box.item name="Smile" label="Smiler" />
-		<combo_box.item name="Surprise" label="Overrasket" />
-		<combo_box.item name="Wink" label="Blinker" />
-		<combo_box.item name="Worry" label="Bekymret" />
+	<combo_box label="" name="emote_combo" tool_tip="Angiver hvad ansigtet gør under animationen" width="140">
+		<combo_box.item label="(Intet)" name="[None]"/>
+		<combo_box.item label="Aaaaah" name="Aaaaah"/>
+		<combo_box.item label="Bange" name="Afraid"/>
+		<combo_box.item label="Vred" name="Angry"/>
+		<combo_box.item label="Stort smil" name="BigSmile"/>
+		<combo_box.item label="Keder sig" name="Bored"/>
+		<combo_box.item label="Græder" name="Cry"/>
+		<combo_box.item label="Forarget" name="Disdain"/>
+		<combo_box.item label="Flov" name="Embarrassed"/>
+		<combo_box.item label="Skuler" name="Frown"/>
+		<combo_box.item label="Kysser" name="Kiss"/>
+		<combo_box.item label="Griner" name="Laugh"/>
+		<combo_box.item label="Plllppt" name="Plllppt"/>
+		<combo_box.item label="Frastødt" name="Repulsed"/>
+		<combo_box.item label="Ked af det" name="Sad"/>
+		<combo_box.item label="Skuldertræk" name="Shrug"/>
+		<combo_box.item label="Smil" name="Smile"/>
+		<combo_box.item label="Overrasket" name="Surprise"/>
+		<combo_box.item label="Blinker" name="Wink"/>
+		<combo_box.item label="Bekymret" name="Worry"/>
 	</combo_box>
 	<text name="preview_label">
 		Vis mens
 	</text>
-	<combo_box label="" name="preview_base_anim"
-	     tool_tip="Se hvordan animation ser ud i forskellige typiske avatar-situationer." width="140">
-		<combo_box.item name="Standing" label="Står" />
-		<combo_box.item name="Walking" label="Går" />
-		<combo_box.item name="Sitting" label="Sidder" />
-		<combo_box.item name="Flying" label="Flyver" />
+	<combo_box label="" name="preview_base_anim" tool_tip="Se hvordan animation ser ud i forskellige typiske avatar-situationer." width="140">
+		<combo_box.item label="Stående" name="Standing"/>
+		<combo_box.item label="Gående" name="Walking"/>
+		<combo_box.item label="Sidder" name="Sitting"/>
+		<combo_box.item label="Flyver" name="Flying"/>
 	</combo_box>
-	<spinner label="start (sec)" name="ease_in_time"
-	     tool_tip="Tid i sekunder animationen bruger på at komme i gang." />
-	<spinner label="Afslut (sec)" name="ease_out_time"
-	     tool_tip="Tid i sekunder animationen bruger på at afslutte." />
-	<button label="" name="play_btn" tool_tip="Start/pause din animation." />
-	<button label="" name="stop_btn" tool_tip="Stop afspilning af animation" />
-	<slider label="" name="playback_slider" />
+	<spinner label="start (sec)" name="ease_in_time" tool_tip="Tid (i sekunder) animationen bruger på at komme i gang."/>
+	<spinner label="Afslut (sec)" name="ease_out_time" tool_tip="Tid (i sekunder) animationen bruger på at afslutte"/>
+	<button label="" name="play_btn" tool_tip="Start din animation"/>
+	<button name="pause_btn" tool_tip="Pause din animation"/>
+	<button label="" name="stop_btn" tool_tip="Stop afspilning af animation"/>
+	<slider label="" name="playback_slider"/>
 	<text name="bad_animation_text">
 		Kan ikke læse animations fil.
 
 Vi anbefaler BVH filer der er exporteret fra Poser 4.
 	</text>
-	<button label="Annullér" name="cancel_btn" />
-	<button label="Hent (L$[AMOUNT])" name="ok_btn" />
-	<string name="failed_to_initialize">
-		Fejlede at starte bevægelse
-	</string>
-	<string name="anim_too_long">
-		Animations filen er [LENGTH] sekunder lang.
-
-Maksimal animations længde er [MAX_LENGTH] sekunder.
-	</string>
-	<string name="failed_file_read">
-		Kan ikke læse animations fil.
-
-[STATUS]
-	</string>
+	<button label="Hent (L$[AMOUNT])" name="ok_btn"/>
+	<button label="Annullér" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
index 27bfa367f6..1111c5e18b 100644
--- a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
@@ -1,30 +1,32 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatar_texture_debug" title="AVATAR TEKSTURER">
-	<text name="baked_label">
-		Faste teksturer
-	</text>
+	<floater.string name="InvalidAvatar">
+		UGYLDING AVATAR
+	</floater.string>
 	<text name="composite_label">
 		Blandede teksturer
 	</text>
-	<texture_picker label="Hoved" name="baked_head" />
-	<texture_picker label="Makeup" name="head_bodypaint" />
-	<texture_picker label="Hår" name="hair" />
-	<button label="Drop" label_selected="Dump" name="Dump" />
-	<texture_picker label="øjne" name="baked_eyes" />
-	<texture_picker label="øje" name="eye_texture" />
-	<texture_picker label="Overkrop" name="baked_upper_body" />
-	<texture_picker label="Tatovering overkrop" name="upper_bodypaint" />
-	<texture_picker label="Undertrøje" name="undershirt" />
-	<texture_picker label="Handsker" name="gloves" />
-	<texture_picker label="Trøje" name="shirt" />
-	<texture_picker label="øvre jakke" name="upper_jacket" />
-	<texture_picker label="Underkrop" name="baked_lower_body" />
-	<texture_picker label="Tatovering underkrop" name="lower_bodypaint" />
-	<texture_picker label="Underbukser" name="underpants" />
-	<texture_picker label="Strømper" name="socks" />
-	<texture_picker label="Sko" name="shoes" />
-	<texture_picker label="Bukser" name="pants" />
-	<texture_picker label="Jakke" name="jacket" />
-	<texture_picker label="Nederdel" name="baked_skirt" />
-	<texture_picker label="Nederdel" name="skirt_texture" />
+	<button label="Drop" label_selected="Dump" name="Dump"/>
+	<texture_picker label="Hår" name="hair_grain"/>
+	<texture_picker label="Alpha - hår" name="hair_alpha"/>
+	<texture_picker label="Makeup" name="head_bodypaint"/>
+	<texture_picker label="Alpha - hoved" name="head_alpha"/>
+	<texture_picker label="Tatovering hovede" name="head_tattoo"/>
+	<texture_picker label="Øje" name="eyes_iris"/>
+	<texture_picker label="Alpha - øjne" name="eyes_alpha"/>
+	<texture_picker label="Bodypaint - overkrop" name="upper_bodypaint"/>
+	<texture_picker label="Undertrøje" name="upper_undershirt"/>
+	<texture_picker label="Handsker" name="upper_gloves"/>
+	<texture_picker label="Trøje" name="upper_shirt"/>
+	<texture_picker label="Øvre jakke" name="upper_jacket"/>
+	<texture_picker label="Alpha - øvre" name="upper_alpha"/>
+	<texture_picker label="Øvre tatovering" name="upper_tattoo"/>
+	<texture_picker label="Bodypaint - underkrop" name="lower_bodypaint"/>
+	<texture_picker label="Undertøj" name="lower_underpants"/>
+	<texture_picker label="Strømper" name="lower_socks"/>
+	<texture_picker label="Sko" name="lower_shoes"/>
+	<texture_picker label="Bukser" name="lower_pants"/>
+	<texture_picker label="Jakke" name="lower_jacket"/>
+	<texture_picker label="Alpha - nedre" name="lower_alpha"/>
+	<texture_picker label="Nedre tatovering" name="lower_tattoo"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_beacons.xml b/indra/newview/skins/default/xui/da/floater_beacons.xml
index 18bc7aeb31..d67d859e7b 100644
--- a/indra/newview/skins/default/xui/da/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/da/floater_beacons.xml
@@ -1,15 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="beacons" title="PEJLELYS">
 	<panel name="beacons_panel">
-		<check_box label="Kun scriptede objekter med &quot;rør&quot;" name="touch_only" />
-		<check_box label="Scriptede objekter" name="scripted" />
-		<check_box label="Fysiske objekter" name="physical" />
-		<check_box label="Lyd kilder" name="sounds" />
-		<check_box label="Partikel kilder" name="particles" />
-		<check_box label="Rendér highlights" name="highlights" />
-		<check_box label="Rendér pejlelys" name="beacons" />
-		<text name="beacon_width_label">
-			Pejlelys bredde:
+		<text name="label_show">
+			Vis:
 		</text>
+		<check_box label="Pejlelys" name="beacons"/>
+		<check_box label="Fremhævninger" name="highlights"/>
+		<text name="beacon_width_label" tool_tip="Pejlelys bredde">
+			Bredde:
+		</text>
+		<text name="label_objects">
+			For disse objekter:
+		</text>
+		<check_box label="Fysisk" name="physical"/>
+		<check_box label="Scriptet" name="scripted"/>
+		<check_box label="Kun berøring" name="touch_only"/>
+		<check_box label="Lydkilder" name="sounds"/>
+		<check_box label="Partikel kilder" name="particles"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_build_options.xml b/indra/newview/skins/default/xui/da/floater_build_options.xml
index 7eb0d4c035..9196f19b78 100644
--- a/indra/newview/skins/default/xui/da/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/da/floater_build_options.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="build options floater" title="GITTER INDSTILLINGER">
-	<spinner label="Gitter enhed (meter)" name="GridResolution" width="200" label_width="136"/>
-	<spinner label="Gitter rækkevidde (meter)" name="GridDrawSize" width="200" label_width="136"/>
-	<check_box label="Aktiver låsning til under-enheder" name="GridSubUnit" />
-	<check_box label="Vis &apos;cross sections&apos;" name="GridCrossSection" />
-	<slider label="Gitter synlighed" name="GridOpacity" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="build options floater" title="GITTER VALG">
+	<spinner label="Gitter enheder (meter)" label_width="136" name="GridResolution" width="200"/>
+	<spinner label="Gitter rækkevidde (meter)" label_width="136" name="GridDrawSize" width="200"/>
+	<check_box label="Aktivér låsning til underenheder" name="GridSubUnit"/>
+	<check_box label="Vis &apos;cross-sections&apos;" name="GridCrossSection"/>
+	<text name="grid_opacity_label" tool_tip="Gitter synlighed">
+		Uigennemsigtighed:
+	</text>
+	<slider label="Gitter synlighed" name="GridOpacity"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_contents.xml b/indra/newview/skins/default/xui/da/floater_buy_contents.xml
index 8dccf32304..c2b2ccc244 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_contents.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_buy_contents" title="KØB INDHOLD">
 	<text name="contains_text">
 		[NAME] indeholder:
@@ -6,9 +6,9 @@
 	<text name="buy_text">
 		Køb for L$[AMOUNT] fra [NAME]?
 	</text>
-	<button label="Annullér" label_selected="Annullér" name="cancel_btn" />
-	<button label="Køb" label_selected="Køb" name="buy_btn" />
-	<check_box label="Tag tøj på nu" name="wear_check" />
+	<button label="Annullér" label_selected="Annullér" name="cancel_btn"/>
+	<button label="Køb" label_selected="Køb" name="buy_btn"/>
+	<check_box label="Tag tøj på nu" name="wear_check"/>
 	<string name="no_copy_text">
 		(kopiér ej)
 	</string>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
index d1fca8984d..18ee0e0597 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
@@ -1,68 +1,66 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="buy currency" title="KØB VALUTA">
-	<text name="info_buying">
-		Køber valuta:
-	</text>
-	<text name="info_cannot_buy">
-		Kan ikke købe nu:
-	</text>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="buy currency" title="KØB L$">
+	<floater.string name="buy_currency">
+		Køb L$ [LINDENS] for ca. [LOCALAMOUNT]
+	</floater.string>
 	<text name="info_need_more">
-		Du har ikke penge nok:
+		Du skal bruge flere L$
 	</text>
-	<text name="error_message">
-		Noget er gået galt.
-	</text>
-	<button label="Gå til hjemmeside" name="error_web" />
 	<text name="contacting">
 		Kontakter LindeX...
 	</text>
-	<text name="buy_action_unknown">
-		Køb L$ på LindeX valuta marked
+	<text name="info_buying">
+		Køb L$
 	</text>
-	<text name="buy_action">
-		[NAME] L$ [PRICE]
+	<text name="balance_label">
+		Jeg har
+	</text>
+	<text name="balance_amount">
+		L$ [AMT]
 	</text>
 	<text name="currency_action">
-		Køb L$
+		Jeg ønsker at købe
 	</text>
-	<line_editor name="currency_amt">
+	<text name="currency_label">
+		L$
+	</text>
+	<line_editor label="L$" name="currency_amt">
 		1234
 	</line_editor>
+	<text name="buying_label">
+		Til prisen
+	</text>
 	<text name="currency_est">
-		for ca. [LOCALAMOUNT]
+		ca. [LOCALAMOUNT]
 	</text>
 	<text name="getting_data">
-		Henter data...
-	</text>
-	<text name="balance_label">
-		Du har i øjeblikket
-	</text>
-	<text name="balance_amount">
-		L$ [AMT]
-	</text>
-	<text name="buying_label">
-		Du køber
+		Estimerer...
 	</text>
-	<text name="buying_amount">
-		L$ [AMT]
+	<text name="buy_action">
+		[NAME] L$ [PRICE]
 	</text>
 	<text name="total_label">
-		Din balance bliver
+		Min nye beholdning vil være
 	</text>
 	<text name="total_amount">
 		L$ [AMT]
 	</text>
+	<text name="currency_links">
+		[http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate]
+	</text>
+	<text name="exchange_rate_note">
+		Indtast beløbet for at se nyeste valutakurs.
+	</text>
 	<text name="purchase_warning_repurchase">
-		Bekræfter at denne handel kun omfatter valuta.
-Gentag operationen venligst igen.
+		Bekræftelse af dette køb medfører kun køb af L$, ikke objektet.
 	</text>
 	<text name="purchase_warning_notenough">
-		Du køber ikke nok valuta, tast et større beløb
-og prøv igen.
+		Du køber ikke nok L$. Forøg venligst beløbet.
 	</text>
-	<button label="Annullér" name="cancel_btn" />
-	<button label="Køb" name="buy_btn" />
-	<string name="buy_currency">
-		Køb L$ [LINDENS] for ca. [LOCALAMOUNT]
-	</string>
+	<button label="Køb nu" name="buy_btn"/>
+	<button label="Annullér" name="cancel_btn"/>
+	<text name="info_cannot_buy">
+		Kan ikke købe
+	</text>
+	<button label="Fortsæt til web" name="error_web"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml
index 71e6eaa7f7..987ad6585f 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml
@@ -59,7 +59,7 @@
 	<text left_delta="62" name="info_price">
 		L$ 1500
 (L$ 1.1/m²)
-sælges med objekter
+solgt med objekter
 	</text>
 	<text name="info_action">
 		Køb af dette land vil:
@@ -75,16 +75,16 @@ sælges med objekter
 		Kun premium medlemmer kan eje land.
 	</text>
 	<combo_box name="account_level">
-		<combo_box.item name="US$9.95/month,billedmonthly" label="US$9.95/md, månedlig afregning" />
-		<combo_box.item name="US$7.50/month,billedquarterly" label="US$7.50/md, kvartalsvis afregning" />
-		<combo_box.item name="US$6.00/month,billedannually" label="US$6.00/md, årlig afregning" />
+		<combo_box.item label="US$9.95 pr. måned, faktureret månedligt" name="US$9.95/month,billedmonthly"/>
+		<combo_box.item label="US$7.50 pr. måned, faktureret kvartalsvist" name="US$7.50/month,billedquarterly"/>
+		<combo_box.item label="US$6.00 pr. måned, faktureret årligt" name="US$6.00/month,billedannually"/>
 	</combo_box>
 	<text name="land_use_action">
 		Forøg dine månedlige arealanvendelse gebyrer til US $ 40/måned.
 	</text>
 	<text name="land_use_reason">
-		You hold 1309 m² of land. 
-This parcel is 512 m² of land.
+		Du ejer 1309 m² land.
+Denne parcel er på 512 m².
 	</text>
 	<text name="purchase_action">
 		Betal Joe Resident L$ 4000 dette areal
@@ -99,12 +99,12 @@ This parcel is 512 m² of land.
 		1000
 	</line_editor>
 	<text name="currency_est">
-		for ca. US$ [AMOUNT2]
+		for ca. [LOCAL_AMOUNT]
 	</text>
 	<text name="currency_balance">
 		Du har L$2,100.
 	</text>
-	<check_box label="Fjern [AMOUNT] kvadratmeter af bidrag fra gruppe." name="remove_contribution"/>
+	<check_box label="Fjern [AMOUNT] m² af bidrag fra gruppe." name="remove_contribution"/>
 	<button label="Køb" name="buy_btn"/>
 	<button label="Annullér" name="cancel_btn"/>
 	<string name="can_resell">
@@ -181,16 +181,16 @@ Prøv at vælge et mindre område.
 		Din konto kan eje jord.
 	</string>
 	<string name="land_holdings">
-		Du har [BUYER] m² jord.
+		Du ejer [BUYER] m² land.
 	</string>
 	<string name="pay_to_for_land">
 		Betal L$ [AMOUNT] til [SELLER] for dette stykke jord
 	</string>
 	<string name="buy_for_US">
-		Køb L$ [AMOUNT] for ca. US$ [AMOUNT2],
+		Køb L$ [AMOUNT] for ca. [LOCAL_AMOUNT],
 	</string>
 	<string name="parcel_meters">
-		Denne parcel er [AMOUNT] m².
+		Denne parcel er på [AMOUNT] m²
 	</string>
 	<string name="premium_land">
 		Dette stykke jord er premium, og vil tælle som [AMOUNT] m².
@@ -200,7 +200,7 @@ Prøv at vælge et mindre område.
 	</string>
 	<string name="meters_supports_object">
 		[AMOUNT] m²
-kan indeholder [AMOUNT2] objekter
+kan indeholde [AMOUNT2] objekter
 	</string>
 	<string name="sold_with_objects">
 		solgt med objekter
diff --git a/indra/newview/skins/default/xui/da/floater_choose_group.xml b/indra/newview/skins/default/xui/da/floater_choose_group.xml
index 9f02f281db..1ccda4f1d7 100644
--- a/indra/newview/skins/default/xui/da/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/da/floater_choose_group.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="groups" title="GRUPPER">
 	<text name="groupdesc">
 		Vælg en gruppe:
 	</text>
-	<button label="OK" label_selected="OK" name="OK" />
-	<button label="Annullér" label_selected="Annullér" name="Cancel" />
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Annullér" label_selected="Annullér" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_customize.xml b/indra/newview/skins/default/xui/da/floater_customize.xml
index b2409f1682..379302ef6a 100644
--- a/indra/newview/skins/default/xui/da/floater_customize.xml
+++ b/indra/newview/skins/default/xui/da/floater_customize.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater customize" title="APPEARANCE" width="509">
+<floater name="floater customize" title="UDSEENDE" width="509">
 	<tab_container name="customize tab container" width="507">
 		<placeholder label="Krops Dele" name="body_parts_placeholder"/>
 		<panel label="Kropsbygning" name="Shape">
@@ -14,8 +14,8 @@
 			<button label="Overkrop" label_selected="Overkrop" name="Torso"/>
 			<button label="Ben" label_selected="Ben" name="Legs"/>
 			<radio_group name="sex radio">
-				<radio_item name="radio" label="Kvinde" />
-				<radio_item name="radio2" label="Mand" />
+				<radio_item label="Kvinde" name="radio"/>
+				<radio_item label="Mand" name="radio2"/>
 			</radio_group>
 			<text name="title">
 				[DESC]
@@ -78,9 +78,9 @@ og bagefter &apos;tage den på&apos;.
 			<text name="Item Action Label">
 				Hud:
 			</text>
-			<texture_picker width="98" label="Tatoveringer hoved" name="Head Tattoos" tool_tip="Klik for at vælge et billede"/>
-			<texture_picker width="98" label="Tatover. overkrop" name="Upper Tattoos" tool_tip="Klik for at vælge et billede"/>
-			<texture_picker width="98" label="Tatover. underkrop" name="Lower Tattoos" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker label="Tatoveringer hoved" name="Head Tattoos" tool_tip="Klik for at vælge et billede" width="98"/>
+			<texture_picker label="Tatover. overkrop" name="Upper Tattoos" tool_tip="Klik for at vælge et billede" width="98"/>
+			<texture_picker label="Tatover. underkrop" name="Lower Tattoos" tool_tip="Klik for at vælge et billede" width="98"/>
 			<button label="Lav ny hud" label_selected="Lav nyt hud" name="Create New"/>
 			<button label="Gem" label_selected="Gem" name="Save"/>
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -156,7 +156,7 @@ og bagefter &apos;tage dem på&apos;.
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
 			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 		</panel>
-		<panel label="Tøje" name="clothes_placeholder"/>
+		<placeholder label="Tøje" name="clothes_placeholder"/>
 		<panel label="Trøje" name="Shirt">
 			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
 			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
@@ -471,9 +471,81 @@ og bagefter &apos;tage den på&apos;.
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
 			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 		</panel>
+		<panel label="Alpha" name="Alpha">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: kan ikke ændre
+			</text>
+			<text name="title_loading">
+				[DESC]: indlæser...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: ikke båret
+			</text>
+			<text name="path">
+				Placeret i [PATH]
+			</text>
+			<text name="not worn instructions">
+				Brug en ny &quot;alpha mask&quot; ved at trække en fra din beholding til din avatar.
+Alternativt kan du lave en fra bunden og bære denne.
+			</text>
+			<text name="no modify instructions">
+				Du har ikke rettigheder til at ændre denne.
+			</text>
+			<text name="Item Action Label">
+				Alpha:
+			</text>
+			<texture_picker label="Alpha - nedre" name="Lower Alpha" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker label="Øvre alpha" name="Upper Alpha" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker label="Alpha - hoved" name="Head Alpha" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker label="Alpha - øjne" name="Eye Alpha" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker label="Alpha - hår" name="Hair Alpha" tool_tip="Klik for at vælge et billede"/>
+			<button label="Lav ny &quot;Alpha&quot;" label_selected="Lav ny &quot;Alpha&quot;" name="Create New"/>
+			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
+			<button label="Vend tilbage" label_selected="Vend tilbage" name="Revert"/>
+		</panel>
+		<panel label="Tatovering" name="Tattoo">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: kan ikke ændre
+			</text>
+			<text name="title_loading">
+				[DESC]: indlæser...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: ikke båret
+			</text>
+			<text name="path">
+				Placeret i [PATH]
+			</text>
+			<text name="not worn instructions">
+				Brug en ny tatovering ved at trække en fra din beholding til din avatar.
+Alternativt kan du lave en fra bunden og bære denne.
+			</text>
+			<text name="no modify instructions">
+				Du har ikke rettigheder til at ændre denne.
+			</text>
+			<text name="Item Action Label">
+				Tatovering:
+			</text>
+			<texture_picker label="Tatovering - hovede" name="Head Tattoo" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker label="Øvre tatovering" name="Upper Tattoo" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker label="Nedre tatovering" name="Lower Tattoo" tool_tip="Klik for at vælge et billede"/>
+			<button label="lav ny tatovering" label_selected="Lav ny tatovering" name="Create New"/>
+			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
+			<button label="Vend tilbage" label_selected="Vend tilbage" name="Revert"/>
+		</panel>
 	</tab_container>
 	<scroll_container left="212" name="panel_container"/>
+	<button label="Lav sæt" label_selected="Lav sæt" name="make_outfit_btn"/>
 	<button label="Annullér" label_selected="Annullér" name="Cancel"/>
 	<button label="OK" label_selected="OK" name="Ok"/>
-	<button label="Opret sæt..." label_selected="Opret sæt..." name="Make Outfit"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_device_settings.xml b/indra/newview/skins/default/xui/da/floater_device_settings.xml
index 5e53a697f2..06d431a8f9 100644
--- a/indra/newview/skins/default/xui/da/floater_device_settings.xml
+++ b/indra/newview/skins/default/xui/da/floater_device_settings.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_device_settings" title="STEMME CHAT INDSTILLINGER" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_device_settings" title="STEMME CHAT ENHEDSOPSÆTNING"/>
diff --git a/indra/newview/skins/default/xui/da/floater_env_settings.xml b/indra/newview/skins/default/xui/da/floater_env_settings.xml
index 6c5b6d3b6b..8d9c05500b 100644
--- a/indra/newview/skins/default/xui/da/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/da/floater_env_settings.xml
@@ -1,26 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Environment Editor Floater" title="REDIGERING AF OMGIVELSER">
+	<floater.string name="timeStr">
+		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
+	</floater.string>
 	<text name="EnvTimeText">
 		Tid på dagen
 	</text>
 	<text name="EnvTimeText2">
 		00:00
 	</text>
-	<slider label="" name="EnvTimeSlider" />
+	<slider label="" name="EnvTimeSlider"/>
 	<text name="EnvCloudText">
 		Skydække
 	</text>
-	<slider label="" name="EnvCloudSlider" />
+	<slider label="" name="EnvCloudSlider"/>
 	<text name="EnvWaterColorText">
 		Farve på vand
 	</text>
-	<color_swatch label="" name="EnvWaterColor" tool_tip="Klik for at åbne farvevælger" />
+	<color_swatch label="" name="EnvWaterColor" tool_tip="Klik for at åbne farvevælger"/>
 	<text name="EnvWaterFogText">
 		Tåge på vand
 	</text>
-	<slider label="" name="EnvWaterFogSlider" />
-	<button label="Benyt tid fra estate" name="EnvUseEstateTimeButton" />
-	<button label="Avanceret himmel" name="EnvAdvancedSkyButton" />
-	<button label="Avanceret vand" name="EnvAdvancedWaterButton" />
-	<button label="?" name="EnvSettingsHelpButton" />
+	<slider label="" name="EnvWaterFogSlider"/>
+	<button label="Benyt tid fra estate" name="EnvUseEstateTimeButton"/>
+	<button label="Avanceret himmel" name="EnvAdvancedSkyButton"/>
+	<button label="Avanceret vand" name="EnvAdvancedWaterButton"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
index fc1231ceef..2b10afe7e3 100644
--- a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
@@ -1,30 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Hardware Settings Floater" title="HARDWARE OPSÆTNING">
 	<text name="Filtering:">
 		Filtrering:
 	</text>
-	<check_box label="Anisotropic filtrering (langsommere når aktiveret)" name="ani" />
+	<check_box label="Anisotropic filtrering (langsommere når aktiveret)" name="ani"/>
 	<text name="Antialiasing:">
 		Antialiasing:
 	</text>
 	<combo_box label="Antialiasing" name="fsaa" width="100">
-		<combo_box.item name="FSAADisabled" label="Slået fra"/>
-		<combo_box.item name="2x" label="2x"/>
-		<combo_box.item name="4x" label="4x"/>
-		<combo_box.item name="8x" label="8x"/>
-		<combo_box.item name="16x" label="16x"/>
+		<combo_box.item label="Slået fra" name="FSAADisabled"/>
+		<combo_box.item label="2x" name="2x"/>
+		<combo_box.item label="4x" name="4x"/>
+		<combo_box.item label="8x" name="8x"/>
+		<combo_box.item label="16x" name="16x"/>
 	</combo_box>
-	<spinner label="Gamma:" name="gamma" />
+	<spinner label="Gamma:" name="gamma"/>
 	<text name="(brightness, lower is brighter)">
 		(Lysstyrke, lavere er lysere, 0=benyt standard)
 	</text>
 	<text name="Enable VBO:">
 		Aktivér VBO:
 	</text>
-	<check_box label="Aktivér OpenGL Vertex Buffer objekter" name="vbo"
-	     tool_tip="Aktivér af dette på nyere hardware giver performance forbedring.  På ældre hardware kan aktivering medfø nedbrud." />
-	<slider label="Tekstur hukommelse (MB):" name="GrapicsCardTextureMemory"
-	     tool_tip="Mængde hukommelse der skal allokeres til teksturer (textures). Standardindstilling er hukommelse på grafikkortet. Reduktion kan medfø bedre ydeevne, men kan samtidig gøre teksturer mere udflydende." />
-	<spinner label="Tåge: afstandsforhold:" name="fog" />
-	<button label="OK" label_selected="OK" name="OK" />
+	<check_box initial_value="true" label="Aktivér OpenGL Vertex Buffer objekter" name="vbo" tool_tip="Aktivér af dette på nyere hardware giver performance forbedring.  På ældre hardware kan aktivering medfø nedbrud."/>
+	<slider label="Tekstur hukommelse (MB):" name="GraphicsCardTextureMemory" tool_tip="Mængde hukommelse der skal allokeres til teksturer (textures). Standardindstilling er hukommelse på grafikkortet. Reduktion kan medfø bedre ydeevne, men kan samtidig gøre teksturer mere udflydende."/>
+	<spinner label="Tåge: afstandsforhold:" name="fog"/>
+	<button label="OK" label_selected="OK" name="OK"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_help_browser.xml b/indra/newview/skins/default/xui/da/floater_help_browser.xml
new file mode 100644
index 0000000000..fc52796344
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_help_browser.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_help_browser" title="HJÆLP">
+	<layout_stack name="stack1">
+		<layout_panel name="external_controls">
+			<button label="Åben i min web browser" name="open_browser"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_im.xml b/indra/newview/skins/default/xui/da/floater_im.xml
index 0b42b78706..519a70d1d9 100644
--- a/indra/newview/skins/default/xui/da/floater_im.xml
+++ b/indra/newview/skins/default/xui/da/floater_im.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater name="im_floater" title="Personlig samtale (IM)">
 	<string name="only_user_message">
 		Du er den eneste deltager i denne samtale
@@ -10,7 +10,7 @@
 		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.
+		Du har blokeret denne beboer. Hvis du sender besked vil denne blokering fjernes.
 	</string>
 	<string name="generic_request_error">
 		Kunne ikke etablere forbindelse, prøv igen senere
diff --git a/indra/newview/skins/default/xui/da/floater_im_container.xml b/indra/newview/skins/default/xui/da/floater_im_container.xml
new file mode 100644
index 0000000000..da6f877f56
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_im_container.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<multi_floater name="floater_im_box" title="Personlige beskeder"/>
diff --git a/indra/newview/skins/default/xui/da/floater_image_preview.xml b/indra/newview/skins/default/xui/da/floater_image_preview.xml
index 345c9aa6d1..52fd9f80c0 100644
--- a/indra/newview/skins/default/xui/da/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_image_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Image Preview" title="">
 	<text name="name_label">
 		Navn:
@@ -10,23 +10,23 @@
 		Se billede som:
 	</text>
 	<combo_box label="Tøj type" name="clothing_type_combo">
-		<combo_box.item name="Image" label="Billede"/>
-		<combo_box.item name="Hair" label="Hår"/>
-		<combo_box.item name="FemaleHead" label="Kvinde - hoved"/>
-		<combo_box.item name="FemaleUpperBody" label="Kvinde - overkrop"/>
-		<combo_box.item name="FemaleLowerBody" label="Kvinde - underkrop"/>
-		<combo_box.item name="MaleHead" label="Mand - hoved"/>
-		<combo_box.item name="MaleUpperBody" label="Mand - overkrop"/>
-		<combo_box.item name="MaleLowerBody" label="Mand - underkrop"/>
-		<combo_box.item name="Skirt" label="Nederdel"/>
-		<combo_box.item name="SculptedPrim" label="Sculpted prim"/>
+		<combo_box.item label="Billede" name="Image"/>
+		<combo_box.item label="Hår" name="Hair"/>
+		<combo_box.item label="Kvinde - hoved" name="FemaleHead"/>
+		<combo_box.item label="Kvinde - overkrop" name="FemaleUpperBody"/>
+		<combo_box.item label="Kvinde - underkrop" name="FemaleLowerBody"/>
+		<combo_box.item label="Mand - hoved" name="MaleHead"/>
+		<combo_box.item label="Mand - overkrop" name="MaleUpperBody"/>
+		<combo_box.item label="Mand - underkrop" name="MaleLowerBody"/>
+		<combo_box.item label="Nederdel" name="Skirt"/>
+		<combo_box.item label="Sculpted Prim" name="SculptedPrim"/>
 	</combo_box>
 	<text name="bad_image_text">
 		Kunne ikke læse billede.
 
 Prøv at gemme billede som en 24 bit Targa fil (.tga).
 	</text>
-	<check_box label="Benyt komprimering uden tab" name="lossless_check" />
-	<button label="Annullér" name="cancel_btn" />
-	<button label="Hent (L$[AMOUNT])" name="ok_btn" />
+	<check_box label="Benyt komprimering uden tab" name="lossless_check"/>
+	<button label="Annullér" name="cancel_btn"/>
+	<button label="Hent (L$[AMOUNT])" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_incoming_call.xml b/indra/newview/skins/default/xui/da/floater_incoming_call.xml
new file mode 100644
index 0000000000..3a1ef2e47d
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_incoming_call.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="incoming call" title="UKENDT PERSON KALDER OP">
+	<floater.string name="localchat">
+		Stemme chat nærved
+	</floater.string>
+	<floater.string name="anonymous">
+		anonym
+	</floater.string>
+	<floater.string name="VoiceInviteP2P">
+		kalder op.
+	</floater.string>
+	<floater.string name="VoiceInviteAdHoc">
+		har sluttet sig til stemme chat opkald med en konference chat.
+	</floater.string>
+	<text name="question">
+		Ønsker du at forlade [CURRENT_CHAT] og slutte dig til denne stemme chat?
+	</text>
+	<button label="Acceptér" label_selected="Acceptér" name="Accept"/>
+	<button label="Afvis" label_selected="Afvis" name="Reject"/>
+	<button label="Start IM" name="Start IM"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_inspect.xml b/indra/newview/skins/default/xui/da/floater_inspect.xml
index 0610e9408f..d0dca8863a 100644
--- a/indra/newview/skins/default/xui/da/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/da/floater_inspect.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="inspect" title="INSPECÉR OBJEKTER">
+<floater name="inspect" title="UNDERSØG OBJEKT">
+	<floater.string name="timeStamp">
+		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+	</floater.string>
 	<scroll_list name="object_list" tool_tip="Vælg et objekt fra listen for at markere det">
-		<column label="Objekt navn" name="object_name"/>
-		<column label="Objekt ejer" name="owner_name"/>
-		<column label="Bygget af" name="creator_name"/>
-		<column label="Lavet den " name="creation_date"/>
+		<scroll_list.columns label="Objekt navn" name="object_name"/>
+		<scroll_list.columns label="Objekt ejer" name="owner_name"/>
+		<scroll_list.columns label="Bygget af" name="creator_name"/>
+		<scroll_list.columns label="Lavet den " name="creation_date"/>
 	</scroll_list>
 	<button label="Se profil for ejer..." label_selected="" name="button owner" tool_tip="Se profilen for ejeren af det markerede objekt på listen"/>
 	<button label="Se profil for bygger..." label_selected="" name="button creator" tool_tip="Se profilen for den beboer der har bygget det markerede objekt på listen"/>
diff --git a/indra/newview/skins/default/xui/da/floater_inventory.xml b/indra/newview/skins/default/xui/da/floater_inventory.xml
index 8bfe7164d0..d80051fb84 100644
--- a/indra/newview/skins/default/xui/da/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/da/floater_inventory.xml
@@ -1,47 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory" title="BEHOLDNING">
-	<search_editor label="Skriv her for at søge" 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>
-	<menu_bar name="Inventory Menu">
-		<menu label="Filer" name="File">
-			<menu_item_call label="Åben" name="Open" />
-			<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>
-		<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 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="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>
+	<floater.string name="Title">
+		Beholdning
+	</floater.string>
+	<floater.string name="TitleFetching">
+		Beholdning (henter [ITEM_COUNT] genstande...) [FILTER]
+	</floater.string>
+	<floater.string name="TitleCompleted">
+		Beholdning ([ITEM_COUNT] genstande) [FILTER]
+	</floater.string>
+	<floater.string name="Fetched">
+		Hentet
+	</floater.string>
+	<panel label="Beholdningspanel" name="Inventory Panel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
index fbcf202c54..fa36fab762 100644
--- a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="item properties" title="EGENSKABER FOR OBJEKT I BEHOLDNING">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="item properties" title="OPLYSNINGER OM BEHOLDNINGSGENSTAND">
+	<floater.string name="unknown">
+		(ukendt)
+	</floater.string>
+	<floater.string name="public">
+		(offentlig)
+	</floater.string>
+	<floater.string name="you_can">
+		Du kan:
+	</floater.string>
+	<floater.string name="owner_can">
+		Ejer kan:
+	</floater.string>
+	<floater.string name="acquiredDate">
+		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+	</floater.string>
 	<text name="LabelItemNameTitle">
 		Navn:
 	</text>
@@ -12,14 +27,14 @@
 	<text name="LabelCreatorName">
 		Nicole Linden
 	</text>
-	<button label="Profil..." label_selected="" name="BtnCreator" />
+	<button label="Profil..." label_selected="" name="BtnCreator"/>
 	<text name="LabelOwnerTitle">
 		Ejer:
 	</text>
 	<text name="LabelOwnerName">
 		Thrax Linden
 	</text>
-	<button label="Profil..." label_selected="" name="BtnOwner" />
+	<button label="Profil..." label_selected="" name="BtnOwner"/>
 	<text name="LabelAcquiredTitle">
 		Erhvervet:
 	</text>
@@ -27,55 +42,32 @@
 		Wed May 24 12:50:46 2006
 	</text>
 	<text name="OwnerLabel">
-		Du kan:
-	</text>
-	<check_box label="Redigere" name="CheckOwnerModify" />
-	<check_box label="Kopiere" name="CheckOwnerCopy" />
-	<check_box label="Sælge/give væk" name="CheckOwnerTransfer" />
-	<text name="BaseMaskDebug">
-		S:
-	</text>
-	<text name="OwnerMaskDebug">
-		E:
+		Dig:
 	</text>
-	<text name="GroupMaskDebug">
-		G:
+	<check_box label="Redigér" name="CheckOwnerModify"/>
+	<check_box label="Kopiere" name="CheckOwnerCopy"/>
+	<check_box label="Sælg" name="CheckOwnerTransfer"/>
+	<text name="AnyoneLabel">
+		Enhver:
 	</text>
-	<text name="EveryoneMaskDebug">
-		A:
+	<check_box label="Kopiér" name="CheckEveryoneCopy"/>
+	<text name="GroupLabel">
+		Gruppe:
 	</text>
-	<text name="NextMaskDebug">
-		N:
-	</text>
-	<check_box label="Del med gruppe" name="CheckShareWithGroup" />
-	<check_box label="Tillad alle at kopiere" name="CheckEveryoneCopy" />
+	<check_box label="Del" name="CheckShareWithGroup"/>
 	<text name="NextOwnerLabel">
-		Næste ejer kan:
-	</text>
-	<check_box label="Redigere" name="CheckNextOwnerModify" />
-	<check_box label="Kopiere" name="CheckNextOwnerCopy" />
-	<check_box label="Sælge/Give væk" name="CheckNextOwnerTransfer" />
-	<text name="SaleLabel">
-		Markér ting:
+		Næste ejer:
+	</text>
+	<check_box label="Redigér" name="CheckNextOwnerModify"/>
+	<check_box label="Kopiere" name="CheckNextOwnerCopy"/>
+	<check_box label="Sælg" name="CheckNextOwnerTransfer"/>
+	<check_box label="Til salg" name="CheckPurchase"/>
+	<combo_box name="combobox sale copy">
+		<combo_box.item label="Kopiér" name="Copy"/>
+		<combo_box.item label="Original" name="Original"/>
+	</combo_box>
+	<spinner label="Pris:" name="Edit Cost"/>
+	<text name="CurrencySymbol">
+		L$
 	</text>
-	<check_box label="Til salg" name="CheckPurchase" />
-	<radio_group name="RadioSaleType">
-		<radio_item name="radio" label="Original" />
-		<radio_item name="radio2" label="Kopi" />
-	</radio_group>
-	<text name="TextPrice">
-		Pris:  L$
-	</text>
-	<string name="unknown">
-		(ukendt)
-	</string>
-	<string name="public">
-		(offentlig)
-	</string>
-	<string name="you_can">
-		Du kan:
-	</string>
-	<string name="owner_can">
-		Ejer kan:
-	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_joystick.xml b/indra/newview/skins/default/xui/da/floater_joystick.xml
index 4954b7b619..49e1397e9f 100644
--- a/indra/newview/skins/default/xui/da/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/da/floater_joystick.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Joystick" title="JOYSTICK OPSÆTNING">
-	<check_box name="enable_joystick" label="Aktiver Joystick:"/>
+	<check_box label="Aktiver Joystick:" name="enable_joystick"/>
 	<spinner label="X akse mapping" name="JoystickAxis1"/>
 	<spinner label="Y akse mapping" name="JoystickAxis2"/>
 	<spinner label="Z akse mapping" name="JoystickAxis0"/>
@@ -14,9 +14,9 @@
 	<text name="Control Modes:">
 		Kontrollér:
 	</text>
-	<check_box name="JoystickAvatarEnabled" label="Avatar"/>
-	<check_box name="JoystickBuildEnabled" label="Build"/>
-	<check_box name="JoystickFlycamEnabled" label="Flycam"/>
+	<check_box label="Avatar" name="JoystickAvatarEnabled"/>
+	<check_box label="Build" name="JoystickBuildEnabled"/>
+	<check_box label="Flycam" name="JoystickFlycamEnabled"/>
 	<text name="XScale">
 		X følsomhed
 	</text>
diff --git a/indra/newview/skins/default/xui/da/floater_lagmeter.xml b/indra/newview/skins/default/xui/da/floater_lagmeter.xml
index bcf15ea926..149d174c34 100644
--- a/indra/newview/skins/default/xui/da/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/da/floater_lagmeter.xml
@@ -1,152 +1,151 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="LAG MÅLER">
-	<button label="" label_selected="" name="client_lagmeter" tool_tip="Status for klient lag"/>
-	<text name="client">
-		Klient:
-	</text>
-	<text name="client_text">
-		Normal
-	</text>
-	<button label="" label_selected="" name="network_lagmeter" tool_tip="Network lag status"/>
-	<text name="network">
-		Netværk:
-	</text>
-	<text name="network_text">
-		Normal
-	</text>
-	<button label="" label_selected="" name="server_lagmeter" tool_tip="Status for server lag"/>
-	<text name="server">
-		Server:
-	</text>
-	<text name="server_text">
-		Normal
-	</text>
-	<button label="?" name="server_help"/>
-	<button label="&gt;&gt;" name="minimize"/>
-	<string name="max_title_msg">
+<floater name="floater_lagmeter" title="LAG METER">
+	<floater.string name="max_title_msg">
 		Lag måler
-	</string>
-	<string name="max_width_px">
+	</floater.string>
+	<floater.string name="max_width_px">
 		360
-	</string>
-	<string name="min_title_msg">
+	</floater.string>
+	<floater.string name="min_title_msg">
 		Lag
-	</string>
-	<string name="min_width_px">
+	</floater.string>
+	<floater.string name="min_width_px">
 		90
-	</string>
-	<string name="client_text_msg">
+	</floater.string>
+	<floater.string name="client_text_msg">
 		Klient
-	</string>
-	<string name="client_frame_rate_critical_fps">
+	</floater.string>
+	<floater.string name="client_frame_rate_critical_fps">
 		10
-	</string>
-	<string name="client_frame_rate_warning_fps">
+	</floater.string>
+	<floater.string name="client_frame_rate_warning_fps">
 		15
-	</string>
-	<string name="client_frame_time_window_bg_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_window_bg_msg">
 		Normal, vindue i baggrund
-	</string>
-	<string name="client_frame_time_critical_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_critical_msg">
 		Klients billeder/sek under [CLIENT_FRAME_RATE_CRITICAL]
-	</string>
-	<string name="client_frame_time_warning_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_warning_msg">
 		Klients billeder/sek mellem [CLIENT_FRAME_RATE_CRITICAL] og [CLIENT_FRAME_RATE_WARNING]
-	</string>
-	<string name="client_frame_time_normal_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_normal_msg">
 		Normal
-	</string>
-	<string name="client_draw_distance_cause_msg">
+	</floater.string>
+	<floater.string name="client_draw_distance_cause_msg">
 		Mulig årsag: &apos;Vis afstand&apos; sat for højt i grafik indstillinger
-	</string>
-	<string name="client_texture_loading_cause_msg">
+	</floater.string>
+	<floater.string name="client_texture_loading_cause_msg">
 		Mulig årsag: Billeder hentes
-	</string>
-	<string name="client_texture_memory_cause_msg">
+	</floater.string>
+	<floater.string name="client_texture_memory_cause_msg">
 		Mulig årsag: For mange billeder i hukommelse
-	</string>
-	<string name="client_complex_objects_cause_msg">
+	</floater.string>
+	<floater.string name="client_complex_objects_cause_msg">
 		Mulig årsag: For mange komplekse objekter i scenariet
-	</string>
-	<string name="network_text_msg">
+	</floater.string>
+	<floater.string name="network_text_msg">
 		Netværk
-	</string>
-	<string name="network_packet_loss_critical_pct">
+	</floater.string>
+	<floater.string name="network_packet_loss_critical_pct">
 		10
-	</string>
-	<string name="network_packet_loss_warning_pct">
+	</floater.string>
+	<floater.string name="network_packet_loss_warning_pct">
 		5
-	</string>
-	<string name="network_packet_loss_critical_msg">
+	</floater.string>
+	<floater.string name="network_packet_loss_critical_msg">
 		Forbindelsen mister over [NETWORK_PACKET_LOSS_CRITICAL]% pakker
-	</string>
-	<string name="network_packet_loss_warning_msg">
+	</floater.string>
+	<floater.string name="network_packet_loss_warning_msg">
 		Forbindelsen mister [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% pakker
-	</string>
-	<string name="network_performance_normal_msg">
+	</floater.string>
+	<floater.string name="network_performance_normal_msg">
 		Normal
-	</string>
-	<string name="network_ping_critical_ms">
+	</floater.string>
+	<floater.string name="network_ping_critical_ms">
 		600
-	</string>
-	<string name="network_ping_warning_ms">
+	</floater.string>
+	<floater.string name="network_ping_warning_ms">
 		300
-	</string>
-	<string name="network_ping_critical_msg">
+	</floater.string>
+	<floater.string name="network_ping_critical_msg">
 		Forbindelsens ping tider er over [NETWORK_PING_CRITICAL] ms
-	</string>
-	<string name="network_ping_warning_msg">
+	</floater.string>
+	<floater.string name="network_ping_warning_msg">
 		Forbindelsens ping tider er [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
-	</string>
-	<string name="network_packet_loss_cause_msg">
+	</floater.string>
+	<floater.string name="network_packet_loss_cause_msg">
 		Muligvis dårlig forbindelse eller &apos;båndbredde&apos; sat for højt i netværksopsætning.
-	</string>
-	<string name="network_ping_cause_msg">
+	</floater.string>
+	<floater.string name="network_ping_cause_msg">
 		Muligvis dårlig forbindelse eller fil delings program.
-	</string>
-	<string name="server_text_msg">
+	</floater.string>
+	<floater.string name="server_text_msg">
 		Server
-	</string>
-	<string name="server_frame_rate_critical_fps">
+	</floater.string>
+	<floater.string name="server_frame_rate_critical_fps">
 		20
-	</string>
-	<string name="server_frame_rate_warning_fps">
+	</floater.string>
+	<floater.string name="server_frame_rate_warning_fps">
 		30
-	</string>
-	<string name="server_single_process_max_time_ms">
+	</floater.string>
+	<floater.string name="server_single_process_max_time_ms">
 		20
-	</string>
-	<string name="server_frame_time_critical_msg">
+	</floater.string>
+	<floater.string name="server_frame_time_critical_msg">
 		Simulator framerate er under [SERVER_FRAME_RATE_CRITICAL]
-	</string>
-	<string name="server_frame_time_warning_msg">
+	</floater.string>
+	<floater.string name="server_frame_time_warning_msg">
 		Simulator framerate er mellem [SERVER_FRAME_RATE_CRITICAL] og [SERVER_FRAME_RATE_WARNING]
-	</string>
-	<string name="server_frame_time_normal_msg">
+	</floater.string>
+	<floater.string name="server_frame_time_normal_msg">
 		Normal
-	</string>
-	<string name="server_physics_cause_msg">
+	</floater.string>
+	<floater.string name="server_physics_cause_msg">
 		Mulig årsag: For mange fysiske objekter
-	</string>
-	<string name="server_scripts_cause_msg">
+	</floater.string>
+	<floater.string name="server_scripts_cause_msg">
 		Mulig årsag: For mange objekter med script
-	</string>
-	<string name="server_net_cause_msg">
+	</floater.string>
+	<floater.string name="server_net_cause_msg">
 		Mulig årsag: For meget netværks trafik
-	</string>
-	<string name="server_agent_cause_msg">
+	</floater.string>
+	<floater.string name="server_agent_cause_msg">
 		Mulig årsag: For mange avatarer i bevægelse i regionen
-	</string>
-	<string name="server_images_cause_msg">
+	</floater.string>
+	<floater.string name="server_images_cause_msg">
 		Mulig årsag: For mange billed udregninger
-	</string>
-	<string name="server_generic_cause_msg">
+	</floater.string>
+	<floater.string name="server_generic_cause_msg">
 		Mulig årsag: Simulator belastning for stor
-	</string>
-	<string name="smaller_label">
+	</floater.string>
+	<floater.string name="smaller_label">
 		&gt;&gt;
-	</string>
-	<string name="bigger_label">
+	</floater.string>
+	<floater.string name="bigger_label">
 		&lt;&lt;
-	</string>
+	</floater.string>
+	<button label="" label_selected="" name="client_lagmeter" tool_tip="Status for klient lag"/>
+	<text name="client">
+		Klient
+	</text>
+	<text name="client_text">
+		Normal
+	</text>
+	<button label="" label_selected="" name="network_lagmeter" tool_tip="Network lag status"/>
+	<text name="network">
+		Netværk
+	</text>
+	<text name="network_text">
+		Normal
+	</text>
+	<button label="" label_selected="" name="server_lagmeter" tool_tip="Status for server lag"/>
+	<text name="server">
+		Server
+	</text>
+	<text name="server_text">
+		Normal
+	</text>
+	<button label="&gt;&gt;" name="minimize" tool_tip="Ændre størrelse"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
index ebc86c5c73..2b008f133c 100644
--- a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="LSL WIKI">
-	<check_box label="Følg markøreren" name="lock_check" />
-	<combo_box label="Lås" name="history_combo" left_delta="114" width="70"/>
-	<button label="Tilbage" name="back_btn" />
-	<button label="Frem" name="fwd_btn" />
+	<check_box label="Følg markøreren" name="lock_check"/>
+	<combo_box label="Lås" left_delta="114" name="history_combo" width="70"/>
+	<button label="Tilbage" name="back_btn"/>
+	<button label="Frem" name="fwd_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_media_settings.xml b/indra/newview/skins/default/xui/da/floater_media_settings.xml
new file mode 100644
index 0000000000..67c122b9d5
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_media_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="media_settings" title="MEDIA INDSTILLINGER">
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Annullér" label_selected="Annullér" name="Cancel"/>
+	<button label="Anvend" label_selected="Anvend" name="Apply"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
new file mode 100644
index 0000000000..ef4e4cbe7e
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="nearby_chat" title="CHAT NÆRVED"/>
diff --git a/indra/newview/skins/default/xui/da/floater_openobject.xml b/indra/newview/skins/default/xui/da/floater_openobject.xml
index 5875b7a967..92fdd1e0a6 100644
--- a/indra/newview/skins/default/xui/da/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/da/floater_openobject.xml
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="objectcontents" title="OBJEKT INDHOLD">
 	<text name="object_name">
 		[DESC]:
 	</text>
-	<button label="Kopiér til beholdning" label_selected="Kopiér til beholdning"
-	     name="copy_to_inventory_button" />
-	<button label="Kopiér og tag på" label_selected="Kopiér og tag på"
-	     name="copy_and_wear_button" />
+	<button label="Kopiér til beholdning" label_selected="Kopiér til beholdning" name="copy_to_inventory_button"/>
+	<button label="Kopiér og tag på" label_selected="Kopiér og tag på" name="copy_and_wear_button"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml
new file mode 100644
index 0000000000..5c98d9855f
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="outgoing call" title="KALDER">
+	<floater.string name="localchat">
+		Stemme chat nærved
+	</floater.string>
+	<floater.string name="anonymous">
+		anonym
+	</floater.string>
+	<floater.string name="VoiceInviteP2P">
+		kalder op.
+	</floater.string>
+	<floater.string name="VoiceInviteAdHoc">
+		har sluttet sig til stemmechat med en konference chat.
+	</floater.string>
+	<text name="connecting">
+		Tilslutter til [CALLEE_NAME]
+	</text>
+	<text name="calling">
+		Kalder [CALLEE_NAME]
+	</text>
+	<text name="noanswer">
+		Intet svar.  Prøv igen senere.
+	</text>
+	<text name="leaving">
+		Forlader [CURRENT_CHAT].
+	</text>
+	<button label="Annullér" label_selected="Annullér" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_pay.xml b/indra/newview/skins/default/xui/da/floater_pay.xml
index f39cfa4871..b2cdc0bfe7 100644
--- a/indra/newview/skins/default/xui/da/floater_pay.xml
+++ b/indra/newview/skins/default/xui/da/floater_pay.xml
@@ -1,21 +1,25 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
-	<button label="L$1" label_selected="L$1" name="fastpay 1" />
-	<button label="L$5" label_selected="L$5" name="fastpay 5" />
-	<button label="L$10" label_selected="L$10" name="fastpay 10" />
-	<button label="L$20" label_selected="L$20" name="fastpay 20" />
-	<button label="Betal" label_selected="Betal" name="pay btn" />
-	<button label="Annullér" label_selected="Annullér" name="cancel btn" />
-	<text name="payee_label" left="5" width="81">
-		Betal beboer:
+	<string name="payee_group">
+		Betal gruppe
+	</string>
+	<string name="payee_resident">
+		Betal beboer
+	</string>
+	<text left="5" name="payee_label" width="81">
+		Betal:
 	</text>
+	<icon name="icon_person" tool_tip="Person"/>
 	<text name="payee_name">
 		[FIRST] [LAST]
 	</text>
-	<text name="fastpay text">
-		Hurtig betal:
-	</text>
-	<text name="amount text" left="4" >
-		Beløb:
+	<button label="L$1" label_selected="L$1" name="fastpay 1"/>
+	<button label="L$5" label_selected="L$5" name="fastpay 5"/>
+	<button label="L$10" label_selected="L$10" name="fastpay 10"/>
+	<button label="L$20" label_selected="L$20" name="fastpay 20"/>
+	<text left="4" name="amount text">
+		eler vælg beløb:
 	</text>
+	<button label="Betal" label_selected="Betal" name="pay btn"/>
+	<button label="Annullér" label_selected="Annullér" name="cancel btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_pay_object.xml b/indra/newview/skins/default/xui/da/floater_pay_object.xml
index 09e2e3f5d0..f74e097da2 100644
--- a/indra/newview/skins/default/xui/da/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/da/floater_pay_object.xml
@@ -1,30 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
-	<text name="payee_group">
-		Betal gruppe:
-	</text>
-	<text name="payee_resident">
-		Betal beboer:
-	</text>
+	<string name="payee_group">
+		Betal gruppe
+	</string>
+	<string name="payee_resident">
+		Betal beboer
+	</string>
+	<icon name="icon_person" tool_tip="Person"/>
 	<text name="payee_name">
 		[FIRST] [LAST]
 	</text>
 	<text name="object_name_label">
 		Via objekt:
 	</text>
+	<icon name="icon_object" tool_tip="Objekter"/>
 	<text name="object_name_text">
 		...
 	</text>
-	<text name="fastpay text">
-		Hurtig betal:
-	</text>
+	<button label="L$1" label_selected="L$1" name="fastpay 1"/>
+	<button label="L$5" label_selected="L$5" name="fastpay 5"/>
+	<button label="L$10" label_selected="L$10" name="fastpay 10"/>
+	<button label="L$20" label_selected="L$20" name="fastpay 20"/>
 	<text name="amount text">
-		Beløb:
+		Eller vælg beløb:
 	</text>
-	<button label="L$1" label_selected="L$1" name="fastpay 1" />
-	<button label="L$5" label_selected="L$5" name="fastpay 5" />
-	<button label="L$10" label_selected="L$10" name="fastpay 10" />
-	<button label="L$20" label_selected="L$20" name="fastpay 20" />
-	<button label="Betal" label_selected="Betal" name="pay btn" />
-	<button label="Annullér" label_selected="Annullér" name="cancel btn" />
+	<button label="Betal" label_selected="Betal" name="pay btn"/>
+	<button label="Annullér" label_selected="Annullér" name="cancel btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_event.xml b/indra/newview/skins/default/xui/da/floater_preview_event.xml
index 584085fea0..3e870b58ae 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_event.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_event.xml
@@ -1,2 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="event_preview" title="EVENT INFORMATION" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="event_preview" title="EVENT INFORMATION">
+	<floater.string name="Title">
+		Event: [NAME]
+	</floater.string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
index 0053cb852f..bfa3c150a9 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
@@ -1,14 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gesture_preview">
-	<string name="stop_txt">
+	<floater.string name="step_anim">
+		Animation til afspilning:
+	</floater.string>
+	<floater.string name="step_sound">
+		Lyd til afspilning:
+	</floater.string>
+	<floater.string name="step_chat">
+		Sig:
+	</floater.string>
+	<floater.string name="step_wait">
+		Vent:
+	</floater.string>
+	<floater.string name="stop_txt">
 		Stop
-	</string>
-	<string name="preview_txt">
+	</floater.string>
+	<floater.string name="preview_txt">
 		Vis
-	</string>
-	<string name="none_text">
+	</floater.string>
+	<floater.string name="none_text">
 		-- Intet --
-	</string>
+	</floater.string>
+	<floater.string name="Title">
+		Bevægelse: [NAME]
+	</floater.string>
 	<text name="desc_label">
 		Beskrivelse:
 	</text>
@@ -23,33 +38,27 @@
 		Genvejstast:
 	</text>
 	<combo_box label="Ingen" name="modifier_combo" width="60"/>
-	<combo_box label="Ingen" name="key_combo" left_delta="70" width="60"/>
+	<combo_box label="Ingen" left_delta="70" name="key_combo" width="60"/>
 	<text name="library_label">
 		Type:
 	</text>
+	<scroll_list name="library_list"/>
+	<button label="Tilføj &gt;&gt;" name="add_btn"/>
 	<text name="steps_label">
 		Trin:
 	</text>
-	<scroll_list name="library_list">
-		Animation
-Lyd
-Chat
-Vent
-	</scroll_list>
-	<button label="Tilføj &gt;&gt;" name="add_btn"/>
-	<button label="Flyt op" name="up_btn"/>
-	<button label="Flyt ned" name="down_btn"/>
+	<button label="Op" name="up_btn"/>
+	<button label="Ned" name="down_btn"/>
 	<button label="Fjern" name="delete_btn"/>
-	<text name="help_label">
-		Alle trin vil ske samtidigt,
-medmindre du tilføjer vente trin.
-	</text>
 	<radio_group name="animation_trigger_type">
-		<radio_item name="start" label="Start" />
-		<radio_item name="stop" label="Stop" />
+		<radio_item label="Start" name="start"/>
+		<radio_item label="Stop" name="stop"/>
 	</radio_group>
 	<check_box label="Indtil animation er færdig" name="wait_anim_check"/>
 	<check_box label="tid i sekunder" name="wait_time_check"/>
+	<text name="help_label">
+		Alle trin vil ske samtidigt, medmindre du tilføjer vente trin.
+	</text>
 	<check_box label="Aktiv" name="active_check" tool_tip="Aktive bevægelser kan blive aktiveret ved at skrive deress udløser tekst eller ved at trykke på genvejstaste. Bevægelser vil normalt være inaktive hvis der allerede findes en tilsvarende genvejstaste."/>
 	<button label="Vis" name="preview_btn"/>
 	<button label="Gem" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture_info.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture_info.xml
new file mode 100644
index 0000000000..9892a92e4c
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_preview_gesture_info.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Gesture" title="BEVÆGELSE GENVEJ"/>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture_shortcut.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture_shortcut.xml
new file mode 100644
index 0000000000..4d4cca1d90
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_preview_gesture_shortcut.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Gesture" title="GENVEJ BEVÆGELSER">
+	<text name="trigger_label">
+		Chat:
+	</text>
+	<text name="key_label">
+		Tastatur:
+	</text>
+	<combo_box label="Intet" name="modifier_combo"/>
+	<combo_box label="Intet" name="key_combo"/>
+	<text name="replace_text" tool_tip="Erstat udløser ord med disse ord. For eksempel uløser &quot;hello&quot; erstat med &quot;hej&quot; vil ændre chat &apos;Jeg ville bare sige hello&apos; til &apos;Jeg ville bare sige hej&apos; samtidig med bevægelsen afspilles!">
+		Erstat:
+	</text>
+	<line_editor name="replace_editor" tool_tip="Erstat udløser ord med disse ord. For eksempel uløser &quot;hello&quot; erstat med &quot;hej&quot; vil ændre chat &apos;Jeg ville bare sige hello&apos; til &apos;Jeg ville bare sige hej&apos; samtidig med bevægelsen afspilles!"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture_steps.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture_steps.xml
new file mode 100644
index 0000000000..9892a92e4c
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_preview_gesture_steps.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Gesture" title="BEVÆGELSE GENVEJ"/>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
index 7258824878..2ebec4462f 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview notecard" title="NOTE:">
-	<button label="Gem" label_selected="Gem" name="Save"/>
+	<floater.string name="no_object">
+		Kunne ikke finde objekt der indeholder denne note.
+	</floater.string>
+	<floater.string name="not_allowed">
+		Du har ikke rettigheder til at se denne note.
+	</floater.string>
+	<floater.string name="Title">
+		Note: [NAME]
+	</floater.string>
+	<floater.string label="Gem" label_selected="Gem" name="Save">
+		Gem
+	</floater.string>
 	<text name="desc txt">
 		Beskrivelse:
 	</text>
 	<text_editor name="Notecard Editor">
 		Indlæser...
 	</text_editor>
-	<string name="no_object">
-		Kunne ikke finde objekt der indeholder denne note.
-	</string>
-	<string name="not_allowed">
-		Du har ikke tilladelse til at læse denne note.
-	</string>
+	<button label="Gem" label_selected="Gem" name="Save"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_texture.xml b/indra/newview/skins/default/xui/da/floater_preview_texture.xml
index 250659f249..ab7ddbcc72 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_texture.xml
@@ -1,9 +1,44 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_texture">
+	<floater.string name="Title">
+		Tekstur: [NAME]
+	</floater.string>
+	<floater.string name="Copy">
+		Kopiér til beholdning
+	</floater.string>
 	<text name="desc txt">
 		Beskrivelse:
 	</text>
 	<text name="dimensions">
-		Størrelse: [WIDTH] x [HEIGHT]
+		[WIDTH]px x [HEIGHT]px
 	</text>
+	<combo_box name="combo_aspect_ratio" tool_tip="Forhåndsvisning med et bestemt billedformat">
+		<combo_item name="Unconstrained">
+			Ikke låst
+		</combo_item>
+		<combo_item name="1:1" tool_tip="Typisk valg til gruppe logo eller &quot;Real world&quot; profil billede">
+			1:1
+		</combo_item>
+		<combo_item name="4:3" tool_tip="Typisk valg til din &quot;Second Life Profil&quot; billede">
+			4:3
+		</combo_item>
+		<combo_item name="10:7" tool_tip="Typisk valg til billeder i annoncer, landemærker og søgninger">
+			10:7
+		</combo_item>
+		<combo_item name="3:2" tool_tip="Typisk valg til &quot;Om land&quot; billede">
+			3:2
+		</combo_item>
+		<combo_item name="16:10">
+			16:10
+		</combo_item>
+		<combo_item name="16:9" tool_tip="Typisk valg til favorit billeder i profil">
+			16:9
+		</combo_item>
+		<combo_item name="2:1">
+			2:1
+		</combo_item>
+	</combo_box>
+	<button label="OK" name="keep"/>
+	<button label="Annullér" name="discard"/>
+	<button label="Gem som" name="save_tex_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml
new file mode 100644
index 0000000000..e70a30fa24
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script" short_title="[ALL SCRIPTS]" title="[ALL SCRIPTS]"/>
diff --git a/indra/newview/skins/default/xui/da/floater_script_preview.xml b/indra/newview/skins/default/xui/da/floater_script_preview.xml
index ede277bbd2..1e8d869716 100644
--- a/indra/newview/skins/default/xui/da/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_script_preview.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview lsl text" title="SCRIPT: ROTATION SCRIPT">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview lsl text" title="SCRIPT: ROTATIONS SCRIPT">
+	<floater.string name="Title">
+		Script: [NAME]
+	</floater.string>
 	<text name="desc txt">
 		Beskrivelse:
 	</text>
diff --git a/indra/newview/skins/default/xui/da/floater_script_search.xml b/indra/newview/skins/default/xui/da/floater_script_search.xml
index 62f311be6e..f1605cac34 100644
--- a/indra/newview/skins/default/xui/da/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/da/floater_script_search.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script search" title="SCRIPT SØGNING">
-	<check_box label="Store/små bogstaver har ingen betydning" name="case_text" />
-	<button label="Søg" label_selected="Søg" name="search_btn" />
-	<button label="Erstat" label_selected="Erstat" name="replace_btn" />
-	<button label="Erstat alle" label_selected="Erstat alle" name="replace_all_btn" />
+	<check_box label="Store/små bogstaver har ingen betydning" name="case_text"/>
+	<button label="Søg" label_selected="Søg" name="search_btn"/>
+	<button label="Erstat" label_selected="Erstat" name="replace_btn"/>
+	<button label="Erstat alle" label_selected="Erstat alle" name="replace_all_btn"/>
 	<text name="txt">
 		Søg
 	</text>
diff --git a/indra/newview/skins/default/xui/da/floater_sell_land.xml b/indra/newview/skins/default/xui/da/floater_sell_land.xml
index fcbe0abe08..873e6d7995 100644
--- a/indra/newview/skins/default/xui/da/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_sell_land.xml
@@ -1,62 +1,65 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="sell land" title="SÆLG LAND">
-    <scroll_container name="profile_scroll">
-    <panel name="scroll_content_panel">
-	<text name="info_parcel_label">
-		Parcel:
-	</text>
-	<text name="info_parcel">
-		PARCEL NAME
-	</text>
-	<text name="info_size_label">
-		Størrelse:
-	</text>
-	<text name="info_size">
-		[AREA] m²
-	</text>
-	<text name="info_action">
-		Sælg denne parcel:
-	</text>
-	<text name="price_label">
-		Sæt en pris:
-	</text>
-	<text name="price_text">
-		Vælg en passende pris for jorden.
-	</text>
-	<text name="price_ld">
-		L$
-	</text>
-	<text name="price_per_m">
-		(L$[PER_METER] pr. kvadratmeter)
-	</text>
-	<text name="sell_to_label">
-		Sælg denne jord til:
-	</text>
-	<text name="sell_to_text">
-		Vælg om du vil sælge til hvem som helst eller en specifik køber.
-	</text>
-	<combo_box name="sell_to">
-		<combo_box.item name="--selectone--" label="Vælg --" />
-		<combo_box.item name="Anyone" label="Alle" />
-		<combo_box.item name="Specificuser:" label="Specifik bruger:" />
-	</combo_box>
-	<button label="Vælg..." name="sell_to_select_agent" />
-	<text name="sell_objects_label">
-		Sælg objekter sammen med jorden?
-	</text>
-	<text name="sell_objects_text">
-		Dine objekter der kan videregives sælges med jorden.
-	</text>
-	<radio_group name="sell_objects">
-		<radio_item name="no" label="Nej, behold ejerskab til objekterne" />
-		<radio_item name="yes" label="Ja, sælg objekter med jorden" />
-	</radio_group>
-	<button label="Vis objekter" name="show_objects" />
-	<text name="nag_message_label">
-		HUSK: Alle salg er endegyldige.
-	</text>
-	<button label="Sæt land til salg" name="sell_btn" />
-	<button label="Annullér" name="cancel_btn" />
-    </panel>
-    </scroll_container>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<text name="info_parcel_label">
+				Parcel:
+			</text>
+			<text name="info_parcel">
+				PARCEL
+			</text>
+			<text name="info_size_label">
+				Størrelse:
+			</text>
+			<text name="info_size">
+				[AREA] m²
+			</text>
+			<text name="info_action">
+				For at sælge:
+			</text>
+			<text name="price_label">
+				1. Sæt en pris:
+			</text>
+			<text name="price_text">
+				Vælg en passende pris for jorden.
+			</text>
+			<text name="price_ld">
+				L$
+			</text>
+			<line_editor name="price">
+				0
+			</line_editor>
+			<text name="price_per_m">
+				(L$[PER_METER] pr. m²)
+			</text>
+			<text name="sell_to_label">
+				2. Sælg denne parcel til:
+			</text>
+			<text name="sell_to_text">
+				Vælg om du vil sælge til hvem som helst eller en specifik køber.
+			</text>
+			<combo_box name="sell_to">
+				<combo_box.item label="- Vælg -" name="--selectone--"/>
+				<combo_box.item label="Enhver" name="Anyone"/>
+				<combo_box.item label="Specifik person:" name="Specificuser:"/>
+			</combo_box>
+			<button label="Vælg" name="sell_to_select_agent"/>
+			<text name="sell_objects_label">
+				3. Sælg objekter sammen med jorden?
+			</text>
+			<text name="sell_objects_text">
+				Objekter der kan vidergives og som tilhører ejer af land på parcel vil skifte ejerskab
+			</text>
+			<radio_group name="sell_objects">
+				<radio_item label="Nej, behold ejerskab til objekter" name="no"/>
+				<radio_item label="Ja, sælg objekter med jorden" name="yes"/>
+			</radio_group>
+			<button label="Vis objekter" name="show_objects"/>
+			<text name="nag_message_label">
+				HUSK: Alle salg er endegyldige.
+			</text>
+			<button label="Sæt land til salg" name="sell_btn"/>
+			<button label="Annullér" name="cancel_btn"/>
+		</panel>
+	</scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_settings_debug.xml b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
index c1429ed3a3..41cf100d94 100644
--- a/indra/newview/skins/default/xui/da/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="settings_debug" title="TEKNISKE INDSTILLINGER">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="settings_debug" title="DEBUG INDSTILLINGER">
 	<combo_box name="boolean_combo">
-		<combo_box.item name="TRUE" label="TRUE (Valgt)" />
-		<combo_box.item name="FALSE" label="FALSE (Fravalgt)" />
+		<combo_box.item label="SANDT" name="TRUE"/>
+		<combo_box.item label="FALSK" name="FALSE"/>
 	</combo_box>
-	<color_swatch label="Farve" name="color_swatch" />
-	<spinner label="x" name="val_spinner_1" />
-	<spinner label="x" name="val_spinner_2" />
-	<spinner label="x" name="val_spinner_3" />
-	<spinner label="x" name="val_spinner_4" />
-	<button label="Sæt til standard" name="default_btn" />
+	<color_swatch label="Farve" name="val_color_swatch"/>
+	<spinner label="x" name="val_spinner_1"/>
+	<spinner label="x" name="val_spinner_2"/>
+	<spinner label="x" name="val_spinner_3"/>
+	<spinner label="x" name="val_spinner_4"/>
+	<button label="Sæt til standard" name="default_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml
index 3eed869db4..5e8c64e21f 100644
--- a/indra/newview/skins/default/xui/da/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Snapshot" title="SE FOTO">
+<floater name="Snapshot" title="FOTO FORHÅNDSVINSNING">
 	<text name="type_label">
 		Hvor skal foto hen?
 	</text>
 	<radio_group label="Snapshot type" name="snapshot_type_radio">
-		<radio_item name="postcard" label="Send via e-mail" />
-		<radio_item name="texture" label="Gem i din beholdning (L$[AMOUNT])" />
-		<radio_item name="local" label="Gem på din computer" />
+		<radio_item label="Send via e-mail" name="postcard"/>
+		<radio_item label="Gem i din beholdning (L$[AMOUNT])" name="texture"/>
+		<radio_item label="Gem på din computer" name="local"/>
 	</radio_group>
 	<text name="file_size_label">
 		Fil størrelse: [SIZE] KB
@@ -15,12 +15,12 @@
 	<button label="Send" name="send_btn"/>
 	<button label="Gem (L$[AMOUNT])" name="upload_btn"/>
 	<flyout_button label="Gem" name="save_btn" tool_tip="Gem billede i på din computer">
-		<flyout_button_item name="save_item" label="Gem"/>
-		<flyout_button_item name="saveas_item" label="Gem som..."/>
+		<flyout_button_item label="Gem" name="save_item"/>
+		<flyout_button_item label="Gem som..." name="saveas_item"/>
 	</flyout_button>
 	<button label="Annullér" name="discard_btn"/>
-	<button label="Mere &gt;&gt;" name="more_btn" tool_tip="Avancerede valg"/>
-	<button label="&lt;&lt; Mindre" name="less_btn" tool_tip="Avancerede valg"/>
+	<button label="Mere &gt;&gt;" name="more_btn" tool_tip="Avancerede muligheder"/>
+	<button label="&lt;&lt; Mindre" name="less_btn" tool_tip="Avancerede muligheder"/>
 	<text name="type_label2">
 		Størrelse
 	</text>
@@ -28,45 +28,45 @@
 		Format
 	</text>
 	<combo_box label="Opløsning" name="postcard_size_combo">
-		<combo_box.item name="CurrentWindow" label="Aktuelle vindue"/>
-		<combo_box.item name="640x480" label="640x480"/>
-		<combo_box.item name="800x600" label="800x600"/>
-		<combo_box.item name="1024x768" label="1024x768"/>
-		<combo_box.item name="Custom" label="Manuel"/>
+		<combo_box.item label="Aktuelle vindue" name="CurrentWindow"/>
+		<combo_box.item label="640x480" name="640x480"/>
+		<combo_box.item label="800x600" name="800x600"/>
+		<combo_box.item label="1024x768" name="1024x768"/>
+		<combo_box.item label="Manuel" name="Custom"/>
 	</combo_box>
 	<combo_box label="Opløsning" name="texture_size_combo">
-		<combo_box.item name="CurrentWindow" label="Aktuelle vindue"/>
-		<combo_box.item name="Small(128x128)" label="Lille (128x128)"/>
-		<combo_box.item name="Medium(256x256)" label="Medium (256x256)"/>
-		<combo_box.item name="Large(512x512)" label="Stor (512x512)"/>
-		<combo_box.item name="Custom" label="Manuel"/>
+		<combo_box.item label="Aktuelle vindue" name="CurrentWindow"/>
+		<combo_box.item label="Lille (128x128)" name="Small(128x128)"/>
+		<combo_box.item label="Medium (256x256)" name="Medium(256x256)"/>
+		<combo_box.item label="Stor (512x512)" name="Large(512x512)"/>
+		<combo_box.item label="Manuel" name="Custom"/>
 	</combo_box>
 	<combo_box label="Opløsning" name="local_size_combo">
-		<combo_box.item name="CurrentWindow" label="Aktuelle vindue"/>
-		<combo_box.item name="320x240" label="320x240"/>
-		<combo_box.item name="640x480" label="640x480"/>
-		<combo_box.item name="800x600" label="800x600"/>
-		<combo_box.item name="1024x768" label="1024x768"/>
-		<combo_box.item name="1280x1024" label="1280x1024"/>
-		<combo_box.item name="1600x1200" label="1600x1200"/>
-		<combo_box.item name="Custom" label="Manuelt"/>
+		<combo_box.item label="Aktuelle vindue" name="CurrentWindow"/>
+		<combo_box.item label="320x240" name="320x240"/>
+		<combo_box.item label="640x480" name="640x480"/>
+		<combo_box.item label="800x600" name="800x600"/>
+		<combo_box.item label="1024x768" name="1024x768"/>
+		<combo_box.item label="1280x1024" name="1280x1024"/>
+		<combo_box.item label="1600x1200" name="1600x1200"/>
+		<combo_box.item label="Manuelt" name="Custom"/>
 	</combo_box>
 	<combo_box label="Fil-format" name="local_format_combo" width="76">
-		<combo_box.item name="PNG" label="PNG"/>
-		<combo_box.item name="JPEG" label="JPEG"/>
-		<combo_box.item name="BMP" label="BMP"/>
+		<combo_box.item label="PNG" name="PNG"/>
+		<combo_box.item label="JPEG" name="JPEG"/>
+		<combo_box.item label="BMP" name="BMP"/>
 	</combo_box>
-	<spinner label="Bredde" name="snapshot_width" label_width="41" width="101"/>
-	<spinner label="Højde" name="snapshot_height" label_width="32" width="92" left="117"/>
+	<spinner label="Bredde" label_width="41" name="snapshot_width" width="101"/>
+	<spinner label="Højde" label_width="32" left="117" name="snapshot_height" width="92"/>
 	<check_box label="Fasthold proportioner" name="keep_aspect_check"/>
 	<slider label="Billed-kvalitet" name="image_quality_slider"/>
 	<text name="layer_type_label">
 		Benyt:
 	</text>
 	<combo_box label="Billedlag" name="layer_types">
-		<combo_box.item name="Colors" label="Farver"/>
-		<combo_box.item name="Depth" label="Dybde"/>
-		<combo_box.item name="ObjectMattes" label="Materinger"/>
+		<combo_box.item label="Farver" name="Colors"/>
+		<combo_box.item label="Dybde" name="Depth"/>
+		<combo_box.item label="Materinger" name="ObjectMattes"/>
 	</combo_box>
 	<check_box label="Vis brugerflade på foto" name="ui_check"/>
 	<check_box label="Vis HUD objekter på foto" name="hud_check"/>
diff --git a/indra/newview/skins/default/xui/da/floater_sys_well.xml b/indra/newview/skins/default/xui/da/floater_sys_well.xml
new file mode 100644
index 0000000000..b5cecf93e9
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_sys_well.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="sys_well_window" title="BESKEDER">
+	<string name="title_im_well_window">
+		IM SESSIONER
+	</string>
+	<string name="title_notification_well_window">
+		BESKEDER
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_telehub.xml b/indra/newview/skins/default/xui/da/floater_telehub.xml
index bf31da9515..5a0e89aa98 100644
--- a/indra/newview/skins/default/xui/da/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/da/floater_telehub.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="telehub" title="TELEHUB">
 	<text name="status_text_connected">
 		Telehub forbundet til objekt [OBJECT]
@@ -12,17 +12,14 @@
 	<text name="help_text_not_connected">
 		230;lg objekt og klik &apos;Forbind telehub&apos;.
 	</text>
-	<button label="Forbind telehub" name="connect_btn" />
-	<button label="Afslut" name="disconnect_btn" />
+	<button label="Forbind telehub" name="connect_btn"/>
+	<button label="Afslut" name="disconnect_btn"/>
 	<text name="spawn_points_text" width="300">
 		Ankomst punkter (positioner, ikke objekter):
 	</text>
-	<button label="Tilføj punkt" name="add_spawn_point_btn" />
-	<button label="Fjern punkt" name="remove_spawn_point_btn" />
+	<button label="Tilføj punkt" name="add_spawn_point_btn"/>
+	<button label="Fjern punkt" name="remove_spawn_point_btn"/>
 	<text name="spawn_point_help">
-		Vælg objekt og klik på &apos;Tilføj punkt&apos;for at angive 
-position. Du kan derefter flytte eller slette 
-objektet. Positioner er i forhold til telehub center.
-Vælg emne i listen for at vise position i verden.
+		Vælg objekt og klik på &apos;Tilføj punkt&apos; for at angive position. Du kan derefter flytte eller slette objektet. Positioner er i forhold til telehub center. Vælg emne i listen for at vise position i verden.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_top_objects.xml b/indra/newview/skins/default/xui/da/floater_top_objects.xml
index 0cfbe77def..3f19350e30 100644
--- a/indra/newview/skins/default/xui/da/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/da/floater_top_objects.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="top_objects" title="INDLÆSER...">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="top_objects" title="Top objekter">
 	<text name="title_text">
 		Henter...
 	</text>
 	<scroll_list name="objects_list">
-		<column label="Point" name="score" />
-		<column label="Navn" name="name" />
-		<column label="Ejer" name="owner" />
-		<column label="Lokation" name="location" />
-		<column label="Tid" name="time" />
-		<column label="Mono tid" name="mono_time" />
+		<column label="Point" name="score"/>
+		<column label="Navn" name="name"/>
+		<column label="Ejer" name="owner"/>
+		<column label="Lokation" name="location"/>
+		<column label="Tid" name="time"/>
+		<column label="Mono tid" name="mono_time"/>
 	</scroll_list>
 	<text name="id_text">
 		Objekt ID:
 	</text>
-	<button label="Vis pejlelys" name="show_beacon_btn" />
+	<button label="Vis pejlelys" name="show_beacon_btn"/>
 	<text name="obj_name_text">
 		Objekt navn:
 	</text>
-	<button label="Filter" name="filter_object_btn" />
+	<button label="Filter" name="filter_object_btn"/>
 	<text name="owner_name_text">
-		Ejers navn:
+		Ejer:
 	</text>
-	<button label="Filter" name="filter_owner_btn" />
-	<button label="Returnér valgte" name="return_selected_btn" />
-	<button label="Returnér alle" name="return_all_btn" />
-	<button label="Afbryd valgte" name="disable_selected_btn" />
-	<button label="Afbryd alle" name="disable_all_btn" />
-	<button label="Genopfrisk" name="refresh_btn" />
+	<button label="Filter" name="filter_owner_btn"/>
+	<button label="Returnér valgte" name="return_selected_btn"/>
+	<button label="Returnér alle" name="return_all_btn"/>
+	<button label="Afbryd valgte" name="disable_selected_btn"/>
+	<button label="Afbryd alle" name="disable_all_btn"/>
+	<button label="Genopfrisk" name="refresh_btn"/>
 	<string name="top_scripts_title">
 		Mest krævende scripts
 	</string>
diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml
index 9a348ca7bf..77906f0f46 100644
--- a/indra/newview/skins/default/xui/da/floater_tos.xml
+++ b/indra/newview/skins/default/xui/da/floater_tos.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" title="">
-	<button label="Fortsæt" label_selected="Fortsæt" name="Continue" />
-	<button label="Annullér" label_selected="Annullér" name="Cancel" />
-	<check_box label="Jeg accepterer vilkårene for brug af tjenesten" name="agree_chk" />
+	<button label="Fortsæt" label_selected="Fortsæt" name="Continue"/>
+	<button label="Annullér" label_selected="Annullér" name="Cancel"/>
+	<check_box label="Jeg accepterer vilkårene for brug af tjenesten" name="agree_chk"/>
 	<text name="tos_heading">
-		Læs venligst de almindelige bestemmelser og vilkår igennem, for at fortsætte til [SECOND_LIFE] 
-skal du acceptere vilkårene.
+		Læs venligst de almindelige bestemmelser og vilkår igennem, for at fortsætte til [SECOND LIFE] skal du acceptere vilkårene.
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/da/floater_water.xml b/indra/newview/skins/default/xui/da/floater_water.xml
index 63880b4a69..103feaa879 100644
--- a/indra/newview/skins/default/xui/da/floater_water.xml
+++ b/indra/newview/skins/default/xui/da/floater_water.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Water Floater" title="AVANCERET OPSÆTNING AF VAND">
 	<text name="KeyFramePresetsText">
 		Vand opsætninger:
 	</text>
-	<button label="Ny" label_selected="Ny" name="WaterNewPreset" />
-	<button label="Gem" label_selected="Gem" name="WaterSavePreset" />
-	<button label="Slet" label_selected="Slet" name="WaterDeletePreset" />
+	<button label="Ny" label_selected="Ny" name="WaterNewPreset"/>
+	<button label="Gem" label_selected="Gem" name="WaterSavePreset"/>
+	<button label="Slet" label_selected="Slet" name="WaterDeletePreset"/>
 	<tab_container name="Water Tabs">
 		<panel label="Opsætning" name="Settings">
 			<text name="BHText">
 				Vandtåge farve
 			</text>
-			<button label="?" name="WaterFogColorHelp" />
-			<color_swatch label="" name="WaterFogColor" tool_tip="Click to open Color Picker" />
+			<button label="?" name="WaterFogColorHelp"/>
+			<color_swatch label="" name="WaterFogColor" tool_tip="Klik for at åbne farvevælger"/>
 			<text name="WaterFogDensText">
 				Tåge tæthedskarakteristik
 			</text>
-			<button label="?" name="WaterFogDensityHelp" />
-			<slider label="" name="WaterFogDensity" />
+			<button label="?" name="WaterFogDensityHelp"/>
+			<slider label="" name="WaterFogDensity"/>
 			<text name="WaterUnderWaterFogModText">
 				Tilretning undervandståge
 			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp" />
-			<slider label="" name="WaterUnderWaterFogMod" />
+			<button label="?" name="WaterUnderWaterFogModHelp"/>
+			<slider label="" name="WaterUnderWaterFogMod"/>
 			<text name="BDensText">
 				Lille bølge reflektionsskala
 			</text>
-			<button label="?" name="WaterNormalScaleHelp" />
+			<button label="?" name="WaterNormalScaleHelp"/>
 			<text name="BHText2">
 				1
 			</text>
@@ -36,65 +36,65 @@
 			<text name="BHText4">
 				3
 			</text>
-			<slider label="" name="WaterNormalScaleX" />
-			<slider label="" name="WaterNormalScaleY" />
-			<slider label="" name="WaterNormalScaleZ" />
+			<slider label="" name="WaterNormalScaleX"/>
+			<slider label="" name="WaterNormalScaleY"/>
+			<slider label="" name="WaterNormalScaleZ"/>
 			<text name="HDText">
 				Spredningsskala
 			</text>
-			<button label="?" name="WaterFresnelScaleHelp" />
-			<slider label="" name="WaterFresnelScale" />
+			<button label="?" name="WaterFresnelScaleHelp"/>
+			<slider label="" name="WaterFresnelScale"/>
 			<text name="FresnelOffsetText">
 				Spredning offset
 			</text>
-			<button label="?" name="WaterFresnelOffsetHelp" />
-			<slider label="" name="WaterFresnelOffset" />
+			<button label="?" name="WaterFresnelOffsetHelp"/>
+			<slider label="" name="WaterFresnelOffset"/>
 			<text name="DensMultText">
 				Lysbrydning fra oven
 			</text>
-			<button label="?" name="WaterScaleAboveHelp" />
-			<slider label="" name="WaterScaleAbove" />
+			<button label="?" name="WaterScaleAboveHelp"/>
+			<slider label="" name="WaterScaleAbove"/>
 			<text name="WaterScaleBelowText">
 				Lysbrydning fra neden
 			</text>
-			<button label="?" name="WaterScaleBelowHelp" />
-			<slider label="" name="WaterScaleBelow" />
+			<button label="?" name="WaterScaleBelowHelp"/>
+			<slider label="" name="WaterScaleBelow"/>
 			<text name="MaxAltText">
 				Udviskning
 			</text>
-			<button label="?" name="WaterBlurMultiplierHelp" />
-			<slider label="" name="WaterBlurMult" />
+			<button label="?" name="WaterBlurMultiplierHelp"/>
+			<slider label="" name="WaterBlurMult"/>
 		</panel>
 		<panel label="Billede" name="Waves">
 			<text name="BHText">
 				Retning for store bølger
 			</text>
-			<button label="?" name="WaterWave1Help" />
+			<button label="?" name="WaterWave1Help"/>
 			<text name="WaterWave1DirXText">
 				X
 			</text>
 			<text name="WaterWave1DirYText">
 				Y
 			</text>
-			<slider label="" name="WaterWave1DirX" />
-			<slider label="" name="WaterWave1DirY" />
+			<slider label="" name="WaterWave1DirX"/>
+			<slider label="" name="WaterWave1DirY"/>
 			<text name="BHText2">
 				Retning for små bølger
 			</text>
-			<button label="?" name="WaterWave2Help" />
+			<button label="?" name="WaterWave2Help"/>
 			<text name="WaterWave2DirXText">
 				X
 			</text>
 			<text name="WaterWave2DirYText">
 				Y
 			</text>
-			<slider label="" name="WaterWave2DirX" />
-			<slider label="" name="WaterWave2DirY" />
+			<slider label="" name="WaterWave2DirX"/>
+			<slider label="" name="WaterWave2DirY"/>
 			<text name="BHText3">
 				Tekstur map
 			</text>
-			<button label="?" name="WaterNormalMapHelp" />
-			<texture_picker label="" name="WaterNormalMap" />
+			<button label="?" name="WaterNormalMapHelp"/>
+			<texture_picker label="" name="WaterNormalMap"/>
 		</panel>
 	</tab_container>
 	<string name="WLDefaultWaterNames">
diff --git a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
new file mode 100644
index 0000000000..d2f618579d
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="whitelist_entry">
+	<text name="media_label">
+		Indtast en URL eller et URL mønster for at tilføje til listen med godkendte domæner
+	</text>
+	<line_editor name="whitelist_entry" tool_tip="Indtast en URL eller et URL mønster for at godkende side(r)"/>
+	<button label="OK" name="ok_btn"/>
+	<button label="Annullér" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/inspect_object.xml b/indra/newview/skins/default/xui/da/inspect_object.xml
new file mode 100644
index 0000000000..8cbcf6cac8
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/inspect_object.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_object">
+	<string name="Creator">
+		Af [CREATOR]
+	</string>
+	<string name="CreatorAndOwner">
+		af [CREATOR]
+ejer [OWNER]
+	</string>
+	<string name="Price">
+		L$[AMOUNT]
+	</string>
+	<string name="PriceFree">
+		Gratis!
+	</string>
+	<string name="Touch">
+		Berør
+	</string>
+	<string name="Sit">
+		Sid
+	</string>
+	<button label="Køb" name="buy_btn"/>
+	<button label="Betal" name="pay_btn"/>
+	<button label="Tag kopi" name="take_free_copy_btn"/>
+	<button label="Berør" name="touch_btn"/>
+	<button label="Sid" name="sit_btn"/>
+	<button label="Åben" name="open_btn"/>
+	<icon name="secure_browsing" tool_tip="Sikker Browsing"/>
+	<button label="Mere" name="more_info_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/mime_types_linux.xml b/indra/newview/skins/default/xui/da/mime_types_linux.xml
new file mode 100644
index 0000000000..69a0fb23f6
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/mime_types_linux.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<mimetypes name="default">
+	<widgetset name="web">
+		<label name="web_label">
+			Web indhold
+		</label>
+		<tooltip name="web_tooltip">
+			Dette sted har ikke noget web indhold
+		</tooltip>
+		<playtip name="web_playtip">
+			Vis web indhold
+		</playtip>
+	</widgetset>
+	<widgetset name="movie">
+		<label name="movie_label">
+			Film
+		</label>
+		<tooltip name="movie_tooltip">
+			Der er en film der kan afspilles her
+		</tooltip>
+		<playtip name="movie_playtip">
+			Afspil film
+		</playtip>
+	</widgetset>
+	<widgetset name="image">
+		<label name="image_label">
+			Billede
+		</label>
+		<tooltip name="image_tooltip">
+			Der er et billede på dette sted
+		</tooltip>
+		<playtip name="image_playtip">
+			Vis stedets billede
+		</playtip>
+	</widgetset>
+	<widgetset name="audio">
+		<label name="audio_label">
+			Lyd
+		</label>
+		<tooltip name="audio_tooltip">
+			Der er lyd på dette sted
+		</tooltip>
+		<playtip name="audio_playtip">
+			Afspil lyden for dette sted
+		</playtip>
+	</widgetset>
+	<scheme name="rtsp">
+		<label name="rtsp_label">
+			Realtids streaming
+		</label>
+	</scheme>
+	<mimetype name="blank">
+		<label name="blank_label">
+			- Ingen -
+		</label>
+	</mimetype>
+	<mimetype name="none/none">
+		<label name="none/none_label">
+			- Ingen -
+		</label>
+	</mimetype>
+	<mimetype name="audio/*">
+		<label name="audio2_label">
+			Lyd
+		</label>
+	</mimetype>
+	<mimetype name="video/*">
+		<label name="video2_label">
+			Video
+		</label>
+	</mimetype>
+	<mimetype name="image/*">
+		<label name="image2_label">
+			Billede
+		</label>
+	</mimetype>
+	<mimetype name="video/vnd.secondlife.qt.legacy">
+		<label name="vnd.secondlife.qt.legacy_label">
+			Film (QuickTime)
+		</label>
+	</mimetype>
+	<mimetype name="application/javascript">
+		<label name="application/javascript_label">
+			Javascript
+		</label>
+	</mimetype>
+	<mimetype name="application/ogg">
+		<label name="application/ogg_label">
+			Ogg Lyd/Video
+		</label>
+	</mimetype>
+	<mimetype name="application/pdf">
+		<label name="application/pdf_label">
+			PDF Dokument
+		</label>
+	</mimetype>
+	<mimetype name="application/postscript">
+		<label name="application/postscript_label">
+			Postscript Dokument
+		</label>
+	</mimetype>
+	<mimetype name="application/rtf">
+		<label name="application/rtf_label">
+			Rich Text (RTF)
+		</label>
+	</mimetype>
+	<mimetype name="application/smil">
+		<label name="application/smil_label">
+			Synchronized Multimedia Integration Language (SMIL)
+		</label>
+	</mimetype>
+	<mimetype name="application/xhtml+xml">
+		<label name="application/xhtml+xml_label">
+			Hjemmeside (XHTML)
+		</label>
+	</mimetype>
+	<mimetype name="application/x-director">
+		<label name="application/x-director_label">
+			Macromedia Director
+		</label>
+	</mimetype>
+	<mimetype name="audio/mid">
+		<label name="audio/mid_label">
+			Lyd (MIDI)
+		</label>
+	</mimetype>
+	<mimetype name="audio/mpeg">
+		<label name="audio/mpeg_label">
+			Lyd (MP3)
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-aiff">
+		<label name="audio/x-aiff_label">
+			Lyd (AIFF)
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-wav">
+		<label name="audio/x-wav_label">
+			Lyd (WAV)
+		</label>
+	</mimetype>
+	<mimetype name="image/bmp">
+		<label name="image/bmp_label">
+			Billede (BMP)
+		</label>
+	</mimetype>
+	<mimetype name="image/gif">
+		<label name="image/gif_label">
+			Billede (GIF)
+		</label>
+	</mimetype>
+	<mimetype name="image/jpeg">
+		<label name="image/jpeg_label">
+			Billede (JPEG)
+		</label>
+	</mimetype>
+	<mimetype name="image/png">
+		<label name="image/png_label">
+			Billede (PNG)
+		</label>
+	</mimetype>
+	<mimetype name="image/svg+xml">
+		<label name="image/svg+xml_label">
+			Billede (SVG)
+		</label>
+	</mimetype>
+	<mimetype name="image/tiff">
+		<label name="image/tiff_label">
+			Billede (TIFF)
+		</label>
+	</mimetype>
+	<mimetype name="text/html">
+		<label name="text/html_label">
+			Hjemmeside
+		</label>
+	</mimetype>
+	<mimetype name="text/plain">
+		<label name="text/plain_label">
+			Tekst
+		</label>
+	</mimetype>
+	<mimetype name="text/xml">
+		<label name="text/xml_label">
+			XML
+		</label>
+	</mimetype>
+	<mimetype name="video/mpeg">
+		<label name="video/mpeg_label">
+			Film (MPEG)
+		</label>
+	</mimetype>
+	<mimetype name="video/mp4">
+		<label name="video/mp4_label">
+			Film (MP4)
+		</label>
+	</mimetype>
+	<mimetype name="video/quicktime">
+		<label name="video/quicktime_label">
+			Film (QuickTime)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-asf">
+		<label name="video/x-ms-asf_label">
+			Film (Windows Media ASF)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-wmv">
+		<label name="video/x-ms-wmv_label">
+			Film (Windows Media WMV)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-msvideo">
+		<label name="video/x-msvideo_label">
+			Film (AVI)
+		</label>
+	</mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/da/panel_active_object_row.xml b/indra/newview/skins/default/xui/da/panel_active_object_row.xml
new file mode 100644
index 0000000000..9c27ea7fe2
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_active_object_row.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_activeim_row">
+	<string name="unknown_obj">
+		Ukendt objekt
+	</string>
+	<text name="object_name">
+		Unavngivet objekt
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
new file mode 100644
index 0000000000..ab2e7a6e31
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<panel name="panel_call_buttons">
+		<button label="Opkald" name="call_btn"/>
+		<button label="Forlad samtale" name="end_call_btn"/>
+		<button label="Stemmekontroller" name="voice_ctrls_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray.xml b/indra/newview/skins/default/xui/da/panel_bottomtray.xml
new file mode 100644
index 0000000000..2085840bb5
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_bottomtray.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="bottom_tray">
+	<string name="SpeakBtnToolTip">
+		Slukker/tænder mikrofon
+	</string>
+	<string name="VoiceControlBtnToolTip">
+		Skjuler/viser stemme kontrol panel
+	</string>
+	<layout_stack name="toolbar_stack">
+		<layout_panel name="gesture_panel">
+			<gesture_combo_box label="Bevægelse" name="Gesture" tool_tip="Skjuler/viser bevægelser"/>
+		</layout_panel>
+		<layout_panel name="movement_panel">
+			<button label="Flyt" name="movement_btn" tool_tip="Vis/skjul bevægelseskontroller"/>
+		</layout_panel>
+		<layout_panel name="cam_panel">
+			<button label="Vis" name="camera_btn" tool_tip="Vis/Skjul kamerakontroller"/>
+		</layout_panel>
+		<layout_panel name="snapshot_panel">
+			<button label="" name="snapshots" tool_tip="Tag foto"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_alpha.xml b/indra/newview/skins/default/xui/da/panel_edit_alpha.xml
new file mode 100644
index 0000000000..3826e8a228
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_edit_alpha.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_alpha_panel">
+	<panel name="avatar_alpha_color_panel">
+		<texture_picker label="Alpha - nedre" name="Lower Alpha" tool_tip="Klik for at vælge et billede"/>
+		<texture_picker label="Alpha - øvre" name="Upper Alpha" tool_tip="Klik for at vælge et billede"/>
+		<texture_picker label="Alpha - hoved" name="Head Alpha" tool_tip="Klik for at vælge et billede"/>
+		<texture_picker label="Alpha - øje" name="Eye Alpha" tool_tip="Klik for at vælge et billede"/>
+		<texture_picker label="Alpha - hår" name="Hair Alpha" tool_tip="Klik for at vælge et billede"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_eyes.xml b/indra/newview/skins/default/xui/da/panel_edit_eyes.xml
new file mode 100644
index 0000000000..9c0d77c370
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_edit_eyes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_eyes_panel">
+	<panel name="avatar_eye_color_panel">
+		<texture_picker label="Iris" name="Iris" tool_tip="Klik for at vælge billede"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="eyes_main_tab" title="Øjne"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_gloves.xml b/indra/newview/skins/default/xui/da/panel_edit_gloves.xml
new file mode 100644
index 0000000000..1d3ba061bc
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_edit_gloves.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_gloves_panel">
+	<panel name="avatar_gloves_color_panel">
+		<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge bilede"/>
+		<color_swatch label="Farve/nuance" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="gloves_main_tab" title="Handsker"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_jacket.xml b/indra/newview/skins/default/xui/da/panel_edit_jacket.xml
new file mode 100644
index 0000000000..4c9973c0bd
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_edit_jacket.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_jacket_panel">
+	<panel name="avatar_jacket_color_panel">
+		<texture_picker label="Stof foroven" name="Upper Fabric" tool_tip="Klik for at vælge et billede"/>
+		<texture_picker label="Stof forneden" name="Lower Fabric" tool_tip="Klik for at vælge et billede"/>
+		<color_swatch label="Farve/nuance" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="jacket_main_tab" title="Jakke"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_pants.xml b/indra/newview/skins/default/xui/da/panel_edit_pants.xml
new file mode 100644
index 0000000000..bcb1450258
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_edit_pants.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_pants_panel">
+	<panel name="avatar_pants_color_panel">
+		<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et bilede"/>
+		<color_swatch label="Farve/Nuance" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="pants_main_tab" title="Bukser"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_pick.xml b/indra/newview/skins/default/xui/da/panel_edit_pick.xml
new file mode 100644
index 0000000000..41db2be5e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_edit_pick.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Redigér Pick" name="panel_edit_pick">
+	<text name="title">
+		Redigér favorit
+	</text>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="Klik for at vælge billede"/>
+			<text name="Name:">
+				Titel:
+			</text>
+			<text name="description_label">
+				Beskrivelse:
+			</text>
+			<text name="location_label">
+				Lokation:
+			</text>
+			<text name="pick_location">
+				henter...
+			</text>
+			<button label="Sæt til nuværende lokation" name="set_to_curr_location_btn"/>
+		</panel>
+	</scroll_container>
+	<panel label="bottom_panel" name="bottom_panel">
+		<button label="Gem [WHAT]" name="save_changes_btn"/>
+		<button label="Annullér" name="cancel_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_shoes.xml b/indra/newview/skins/default/xui/da/panel_edit_shoes.xml
new file mode 100644
index 0000000000..54a0cc01a4
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_edit_shoes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_shoes_panel">
+	<panel name="avatar_shoes_color_panel">
+		<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
+		<color_swatch label="Farve/nuance" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="shoes_main_tab" title="Sko"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_skin.xml b/indra/newview/skins/default/xui/da/panel_edit_skin.xml
new file mode 100644
index 0000000000..46dce354a9
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_edit_skin.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_skin_panel">
+	<panel name="avatar_skin_color_panel">
+		<texture_picker label="Hoved tatoveringer" name="Head Tattoos" tool_tip="Klik for at vælge et bilede"/>
+		<texture_picker label="Øvre tatoveringer" name="Upper Tattoos" tool_tip="Klik for at vælge et bilede"/>
+		<texture_picker label="Nedre tatoveringer" name="Lower Tattoos" tool_tip="Klik for at vælge et bilede"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="skin_color_tab" title="Hudfarve"/>
+		<accordion_tab name="skin_face_tab" title="Ansigtsdetaljer"/>
+		<accordion_tab name="skin_makeup_tab" title="Makeup"/>
+		<accordion_tab name="skin_body_tab" title="Kropsdetaljer"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_socks.xml b/indra/newview/skins/default/xui/da/panel_edit_socks.xml
new file mode 100644
index 0000000000..6ef6dad86c
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_edit_socks.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_socks_panel">
+	<panel name="avatar_socks_color_panel">
+		<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
+		<color_swatch label="Farve/Nuance" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="socks_main_tab" title="Strømper"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_underpants.xml b/indra/newview/skins/default/xui/da/panel_edit_underpants.xml
new file mode 100644
index 0000000000..de52146e29
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_edit_underpants.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_underpants_panel">
+	<panel name="avatar_underpants_color_panel">
+		<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge bilede"/>
+		<color_swatch label="Farve/nuance" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="underpants_main_tab" title="Underbukser"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml
new file mode 100644
index 0000000000..6c2e1f5833
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_undershirt_panel">
+	<panel name="avatar_undershirt_color_panel">
+		<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge bilede"/>
+		<color_swatch label="Farve/nuance" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="undershirt_main_tab" title="Undertrøje"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
new file mode 100644
index 0000000000..12bc120c45
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Kan bæres" name="panel_edit_wearable">
+	<string name="edit_shape_title">
+		Redigerer kropsbygning
+	</string>
+	<string name="edit_skin_title">
+		Redigerer hud
+	</string>
+	<string name="edit_hair_title">
+		Redigerer hår
+	</string>
+	<string name="edit_eyes_title">
+		Redigerer øjne
+	</string>
+	<string name="edit_shirt_title">
+		Redigerer trøje
+	</string>
+	<string name="edit_pants_title">
+		Redigerer bukser
+	</string>
+	<string name="edit_shoes_title">
+		Redigerer sko
+	</string>
+	<string name="edit_socks_title">
+		Redigerer strømper
+	</string>
+	<string name="edit_jacket_title">
+		Redigerer jakke
+	</string>
+	<string name="edit_skirt_title">
+		Redigerer nederdel
+	</string>
+	<string name="edit_gloves_title">
+		Redigerer handsker
+	</string>
+	<string name="edit_undershirt_title">
+		Redigerer undertrøje
+	</string>
+	<string name="edit_underpants_title">
+		Redigerer underbukser
+	</string>
+	<string name="edit_alpha_title">
+		Redigerer Alpha maske
+	</string>
+	<string name="edit_tattoo_title">
+		Redigerer tatovering
+	</string>
+	<string name="shape_desc_text">
+		Kropsbygning:
+	</string>
+	<string name="skin_desc_text">
+		Hud:
+	</string>
+	<string name="hair_desc_text">
+		Hår:
+	</string>
+	<string name="eyes_desc_text">
+		Øjne:
+	</string>
+	<string name="shirt_desc_text">
+		Trøje:
+	</string>
+	<string name="pants_desc_text">
+		Bukser:
+	</string>
+	<string name="shoes_desc_text">
+		Sko:
+	</string>
+	<string name="socks_desc_text">
+		Strømper:
+	</string>
+	<string name="jacket_desc_text">
+		Jakke:
+	</string>
+	<string name="skirt_skirt_desc_text">
+		Nederdel:
+	</string>
+	<string name="gloves_desc_text">
+		Handsker:
+	</string>
+	<string name="undershirt_desc_text">
+		Undertrøje:
+	</string>
+	<string name="underpants_desc_text">
+		Underbukser:
+	</string>
+	<string name="alpha_desc_text">
+		Alpha maske:
+	</string>
+	<string name="tattoo_desc_text">
+		Tatovering:
+	</string>
+	<text name="edit_wearable_title" value="Redigerer kropsbygning"/>
+	<panel label="Trøje" name="wearable_type_panel">
+		<text name="description_text" value="Kropsbygning:"/>
+	</panel>
+	<panel name="button_panel">
+		<button label="Gem som" name="save_as_button"/>
+		<button label="Vend tilbage" name="revert_button"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_friends.xml b/indra/newview/skins/default/xui/da/panel_friends.xml
index 2644b80968..a41eaf20c1 100644
--- a/indra/newview/skins/default/xui/da/panel_friends.xml
+++ b/indra/newview/skins/default/xui/da/panel_friends.xml
@@ -1,26 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="friends">
 	<string name="Multiple">
-		Flere venner...
+		Flere venner
 	</string>
-	<scroll_list name="friend_list"
-	     tool_tip="Hold Shift eller Ctrl nede imens du klikker for at vælge flere venner">
-		<column name="icon_online_status" tool_tip="Online status" />
-		<column label="Name" name="friend_name" tool_tip="Navn" />
-		<column name="icon_visible_online" tool_tip="Venner kan se at du er online" />
-		<column name="icon_visible_map" tool_tip="Venner kan finde dig på kortet" />
-		<column name="icon_edit_mine"
-		     tool_tip="Venner kan rette i, slette eller tage dine objekter" />
-		<column name="icon_edit_theirs" tool_tip="Du kan rette i denne vens objekter" />
+	<scroll_list name="friend_list" tool_tip="Hold Shift eller Ctrl nede imens du klikker for at vælge flere venner">
+		<column name="icon_online_status" tool_tip="Online status"/>
+		<column label="Name" name="friend_name" tool_tip="Navn"/>
+		<column name="icon_visible_online" tool_tip="Venner kan se at du er online"/>
+		<column name="icon_visible_map" tool_tip="Venner kan finde dig på kortet"/>
+		<column name="icon_edit_mine" tool_tip="Venner kan rette i, slette eller tage dine objekter"/>
+		<column name="icon_edit_theirs" tool_tip="Du kan rette i denne vens objekter"/>
 	</scroll_list>
-	<button label="IM" name="im_btn" tool_tip="Skriv en personlig besked (IM)" />
-	<button label="Profil" name="profile_btn"
-	     tool_tip="Vis billede, grupper og anden information" />
-	<button label="Teleport..." name="offer_teleport_btn"
-	     tool_tip="Tilbyd denne ven at blive teleporteret til din nuværende position" />
-	<button label="Betal..." name="pay_btn"
-	     tool_tip="Giv Linden dollars (L$) til denne ven" />
-	<button label="Fjern..." name="remove_btn"
-	     tool_tip="Fjern denne beboer fra din venneliste" />
-	<button label="Tilføj..." name="add_btn" tool_tip="Tilbyd venskab til denne beboer" />
+	<button label="IM" name="im_btn" tool_tip="Skriv en personlig besked (IM)"/>
+	<button label="Profil" name="profile_btn" tool_tip="Vis billede, grupper og anden information"/>
+	<button label="Teleport" name="offer_teleport_btn" tool_tip="Tilbyd denne ven at blive teleporteret til din nuværende position"/>
+	<button label="Betal" name="pay_btn" tool_tip="Giv Linden dollars (L$) til denne ven"/>
+	<button label="Fjern" name="remove_btn" tool_tip="Fjern denne beboer fra din venneliste"/>
+	<button label="Tilføj" name="add_btn" tool_tip="Tilbyd venskab til denne beboer"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
new file mode 100644
index 0000000000..1db2db45af
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<button label="Group Profile" name="group_info_btn"/>
+	<panel name="panel_call_buttons">
+		<button label="Opkaldsgruppe" name="call_btn"/>
+		<button label="Forlad samtale" name="end_call_btn"/>
+		<button label="Kontroller for åben stemmechat" name="voice_ctrls_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_general.xml b/indra/newview/skins/default/xui/da/panel_group_general.xml
index 4e98ca2bc2..ec957e6094 100644
--- a/indra/newview/skins/default/xui/da/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_general.xml
@@ -1,72 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Generelt" name="general_tab">
-	<string name="help_text">
-		Generel-fanen indeholder generel information om denne gruppe, en liste med ejere og synlige medlemmer, generel-gruppeindstillinger og medlemsmuligheder.
-
-Bevæg din mus over mulighederne for mere hjælp.
-	</string>
-	<string name="group_info_unchanged">
-		Generel gruppeinformation er ændret.
-	</string>
-	<button label="?" label_selected="?" name="help_button"/>
-	<line_editor label="Indtast nyt gruppenavn her" name="group_name_editor"/>
-	<text name="group_name">
-		Skriv det nye gruppenavn her
-	</text>
-	<text name="prepend_founded_by">
-		Grundlagt af
-	</text>
-	<text name="founder_name" left_delta="70" >
-		(venter)
-	</text>
-	<text name="group_charter_label">
-		Gruppens formål
-	</text>
-	<texture_picker label="Gruppe distinktioner" name="insignia" tool_tip="Klik for at vælge et billede"/>
+	<panel.string name="help_text">
+		Generelt-fanen indeholder generel information om denne gruppe, en liste med ejere og synlige medlemmer, generel-gruppeindstillinger og medlemsmuligheder. Bevæg din mus over mulighederne for mere hjælp.
+	</panel.string>
+	<panel.string name="group_info_unchanged">
+		Generel gruppeinformation er ændret
+	</panel.string>
+	<panel.string name="incomplete_member_data_str">
+		Henter medlemsinformationer
+	</panel.string>
 	<text_editor name="charter">
 		Gruppens formål
 	</text_editor>
-	<button label="Tilmeld (L$0)" label_selected="Tilmeld (L$0)" name="join_button"/>
-	<button label="Detaljeret visning" label_selected="Detaljeret visning" name="info_button"/>
-	<text name="text_owners_and_visible_members">
-		Ejere &amp; synlige medlemmer
-	</text>
-	<text name="text_owners_are_shown_in_bold">
-		(Ejere er vist med fed skrift)
-	</text>
 	<name_list name="visible_members">
-		<name_list.columns label="Medlemsnavn" name="name"/>
+		<name_list.columns label="Medlem" name="name"/>
 		<name_list.columns label="Titel" name="title"/>
-		<name_list.columns label="Senest på d." name="online"/>
 	</name_list>
-	<text name="text_group_preferences">
-		Gruppeindstillinger
+	<text name="active_title_label">
+		Min titel
 	</text>
+	<combo_box name="active_title" tool_tip="Angiver den titel der vises i din avatars navnefelt, når denne gruppe er aktiv"/>
+	<check_box label="Modtag gruppeinformationer" name="receive_notices" tool_tip="Angiver om du vil modtage informationer fra denne gruppe. Fjern markeringen i boksen hvis gruppen spammer dig."/>
+	<check_box label="Vis gruppen i min profil" name="list_groups_in_profile" tool_tip="Angiver om du vil vise denne gruppe i dine profilinformationer"/>
 	<panel name="preferences_container">
-		<check_box label="Vis i søgning" name="show_in_group_list" tool_tip="Lad folk se denne gruppe i søgeresultater."/>
 		<check_box label="Åben tilmelding" name="open_enrollement" tool_tip="Angiver om denne gruppe tillader nye medlemmer at tilmelde sig, uden de er inviteret."/>
-		<check_box label="Tilmeldingsgebyr:" name="check_enrollment_fee" tool_tip="Angiver om der kræves et gebyr, for at tilmelde sig gruppen."/>
-		<spinner name="spin_enrollment_fee" tool_tip="Nye medlemmer skal betale dette gebyr for at tilmelde sig gruppen, når Tilmeldingsgebyr er valgt." width="60" left_delta="130"/>
+		<check_box label="Tilmeldingsgebyr" name="check_enrollment_fee" tool_tip="Angiver om der kræves et gebyr, for at tilmelde sig gruppen"/>
+		<spinner label="L$" left_delta="130" name="spin_enrollment_fee" tool_tip="Nye medlemmer skal betale dette gebyr for at tilmelde sig gruppen, når &quot;Tilmeldingsgebyr&quot; er valgt." width="60"/>
 		<combo_box name="group_mature_check" tool_tip="Angiver om din gruppes information anses som &apos;mature&apos;." width="150">
-			<combo_box.item name="select_mature" label="- Vælg indholdsrating -"/>
-			<combo_box.item name="mature" label="Mature indhold"/>
-			<combo_box.item name="pg" label="PG indhold"/>
+			<combo_box.item label="PG indhold" name="pg"/>
+			<combo_box.item label="Mature indhold" name="mature"/>
 		</combo_box>
-		<panel name="title_container">
-			<text name="active_title_label">
-				Min aktive titel
-			</text>
-			<combo_box name="active_title" tool_tip="Angiver den titel der vises i din avatars navnefelt, når denne gruppe er aktiv."/>
-		</panel>
-		<check_box label="Modtag gruppeinformationer" name="receive_notices" tool_tip="Angiver om du vil modtage informationer fra denne gruppe.   Fjern markeringen i boksen hvis gruppen spammer dig."/>
-		<check_box label="Vis gruppen i min profil" name="list_groups_in_profile" tool_tip="Angiver om du vil vise denne gruppe i dine profilinformationer"/>
+		<check_box initial_value="true" label="Vis i søgning" name="show_in_group_list" tool_tip="Lad folk se denne gruppe i søgeresultater."/>
 	</panel>
-	<string name="incomplete_member_data_str">
-		Henter medlemsinformationer
-	</string>
-	<string name="confirm_group_create_str">
-		Creating this group will cost L$100. 
-Er du virkelig, virkelig, VIRKELIG sikker på, at du vil bruge L$100 på at lave denne gruppe?
-Du skal være opmærksom på, at hvis ingen andre indmelder sig i denne gruppe indenfor 48 timer, så vil gruppen blive opløst, og gruppens navn vil ikke være tilgængelig i fremtiden.
-	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
new file mode 100644
index 0000000000..9940ebbd4d
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Gruppe info" name="GroupInfo">
+	<panel.string name="default_needs_apply_text">
+		Der er ændringer på denne fane der ikke er gemt
+	</panel.string>
+	<panel.string name="want_apply_text">
+		Ønsker du at gemme disse ændringer?
+	</panel.string>
+	<panel.string name="group_join_btn">
+		Tilmeld (L$[AMOUNT])
+	</panel.string>
+	<panel.string name="group_join_free">
+		Gratis
+	</panel.string>
+	<text name="group_name" value="(Henter...)"/>
+	<line_editor label="Indtast dit nye gruppenavn her" name="group_name_editor"/>
+	<texture_picker label="" name="insignia" tool_tip="Klik for at vælge bilede"/>
+	<text name="prepend_founded_by">
+		Grundlægger:
+	</text>
+	<name_box initial_value="(finder)" name="founder_name"/>
+	<text name="join_cost_text">
+		Gratis
+	</text>
+	<button label="MELD IND NU!" name="btn_join"/>
+	<accordion name="groups_accordion">
+		<accordion_tab name="group_general_tab" title="Generelt"/>
+		<accordion_tab name="group_roles_tab" title="Roller"/>
+		<accordion_tab name="group_notices_tab" title="Beskeder"/>
+		<accordion_tab name="group_land_tab" title="Land/Aktiver"/>
+	</accordion>
+	<panel name="button_row">
+		<button label="Lav" label_selected="Ny gruppe" name="btn_create"/>
+		<button label="Gem" label_selected="Gem" name="btn_apply"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_invite.xml b/indra/newview/skins/default/xui/da/panel_group_invite.xml
index 813007aee0..1e00642c29 100644
--- a/indra/newview/skins/default/xui/da/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_invite.xml
@@ -1,31 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Invitér et medlem" name="invite_panel">
+	<panel.string name="confirm_invite_owner_str">
+		Er du sikker på, at du vil invitere ny(e) ejer(e)? Denne handling er permanent!
+	</panel.string>
+	<panel.string name="loading">
+		(indlæser...)
+	</panel.string>
+	<panel.string name="already_in_group">
+		Nogen af avatarerne var allerede i gruppen og blev ikke inviteret
+	</panel.string>
 	<text name="help_text">
 		Du kan invitere flere beboere ad 
 gangen til at blive medlem af din 
 gruppe. Klik &apos;Åben personvælger&apos; for 
 at begynde.
 	</text>
-	<button label="Åben personvælger" name="add_button" bottom_delta="-30"/>
-	<name_list name="invitee_list"
-	     tool_tip="Hold Ctrl-tasten nede og klik på beboere for at vælge flere." />
-	<button label="Fjern valgte fra listen" name="remove_button"
-	     tool_tip="Fjerner beboere, der er valgt på ovenstående invitationsliste." />
+	<button bottom_delta="-30" label="Åben personvælger" name="add_button"/>
+	<name_list name="invitee_list" tool_tip="Hold Ctrl knappen nede og klik på beboer navne for at vælge flere"/>
+	<button label="Fjern valgte fra listen" name="remove_button" tool_tip="Fjern beboere valgt ovenfor fra invitationslisten"/>
 	<text name="role_text">
 		Vælg hvilken rolle, du vil tildele dem:
 	</text>
-	<combo_box name="role_name"
-	     tool_tip="Vælg fra listen med roller, du har tilladelse til at tildele medlemmerne." />
-	<button label="Send invitationer" name="ok_button" />
-	<button label="Annullér" name="cancel_button" />
-	<string name="confirm_invite_owner_str">
-		Er du sikker på, at du vil invitere ny(e) ejer(e)? Denne handling er permanent!
-	</string>
-	<!--button bottom="25" font="SansSerifSmall" halign="center" height="20"
-	     label="Send invitationer" left="65" name="ok_button" width="140" />
-	<button bottom_delta="-22" font="SansSerifSmall" halign="center" height="20"
-	     label="Annull&#233;r" left_delta="0" name="cancel_button" width="140" /-->
-	<string name="loading">
-		(indlæser...)
+	<combo_box name="role_name" tool_tip="Vælg fra en liste med roller du har ret til at tildele medlemmer"/>
+	<button label="Send invitationer" name="ok_button"/>
+	<button label="Annullér" name="cancel_button"/>
+	<string name="GroupInvitation">
+		Gruppe invitation
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_land_money.xml b/indra/newview/skins/default/xui/da/panel_group_land_money.xml
index 636a16f97b..c73d7c807d 100644
--- a/indra/newview/skins/default/xui/da/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_land_money.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Land &amp; L$" name="land_money_tab">
 	<string name="help_text">
-		Grunde ejet af gruppen er vist sammen med bidragsdetaljer. En advarsel vises indtil Total land i brug er mindre end eller lig med det totale bidrag. Planlægning, detaljer og salgsfaneblade viser information om gruppens økonomi.
+		En advarsel vises indtil Total land i brug er mindre end eller lig med det totale bidrag.
 	</string>
 	<button label="?" name="help_button"/>
 	<string name="cant_view_group_land_text">
@@ -17,27 +17,27 @@
 		Gruppeejet land
 	</text>
 	<scroll_list name="group_parcel_list">
-		<column label="Grundens navn" name="name"/>
+		<column label="Parcel" name="name"/>
 		<column label="Region" name="location"/>
 		<column label="Type" name="type"/>
 		<column label="Område" name="area"/>
 		<column label="" name="hidden"/>
 	</scroll_list>
-	<button label="Vis på kort" label_selected="Vis på kort" name="map_button"/>
+	<button label="Kort" label_selected="Kort" name="map_button"/>
 	<text name="total_contributed_land_label">
-		Total bidrag:
+		Totalt bidrag:
 	</text>
 	<text name="total_contributed_land_value">
 		[AREA] m²
 	</text>
 	<text name="total_land_in_use_label">
-		Total land i brug:
+		Totalt land i brug:
 	</text>
 	<text name="total_land_in_use_value">
 		[AREA] m²
 	</text>
 	<text name="land_available_label">
-		Tilgængeligt land:
+		Ledigt land:
 	</text>
 	<text name="land_available_value">
 		[AREA] m²
@@ -46,40 +46,39 @@
 		Dit bidrag:
 	</text>
 	<string name="land_contrib_error">
-		Ikke muligt at lave dit bidrag til landet.
+		Ikke muligt at lave dit bidrag til landet
 	</string>
 	<text name="your_contribution_units">
-		( m² )
+		m²
 	</text>
 	<text name="your_contribution_max_value">
 		([AMOUNT] maks.)
 	</text>
 	<text name="group_over_limit_text">
-		Gruppemedlemmer må bidrag med mere, for at understøtte 
-med det land der bliver brugt.
+		Gruppemedlemmer må bidrag med mere, for at understøtte med det land der bliver brugt
 	</text>
 	<text name="group_money_heading">
 		Gruppe L$
 	</text>
 	<tab_container name="group_money_tab_container">
-		<panel label="Planlægning" name="group_money_planning_tab">
+		<panel label="PLANLÆGNING" name="group_money_planning_tab">
 			<text_editor name="group_money_planning_text">
-				Beregner...
+				Henter...
 			</text_editor>
 		</panel>
-		<panel label="Detaljer" name="group_money_details_tab">
+		<panel label="DETALJER" name="group_money_details_tab">
 			<text_editor name="group_money_details_text">
-				Beregner...
+				Henter...
 			</text_editor>
-			<button label="&lt; Før" label_selected="&lt; Før" name="earlier_details_button" tool_tip="Gå tilbage i tid"/>
-			<button label="Efter &gt;" label_selected="Efter &gt;" name="later_details_button" tool_tip="Gå frem i tid"/>
+			<button label="&lt; Før" label_selected="&lt; Før" name="earlier_details_button" tool_tip="Tilbage"/>
+			<button label="Efter &gt;" label_selected="Efter &gt;" name="later_details_button" tool_tip="Næste"/>
 		</panel>
-		<panel label="Salg" name="group_money_sales_tab">
+		<panel label="SALG" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
-				Beregner...
+				Henter...
 			</text_editor>
-			<button label="&lt; Før" label_selected="&lt; Før" name="earlier_sales_button" tool_tip="Gå tilbage i tid"/>
-			<button label="Efter &gt;" label_selected="Efter &gt;" name="later_sales_button" tool_tip="Gå frem i tid"/>
+			<button label="&lt; Før" label_selected="&lt; Før" name="earlier_sales_button" tool_tip="Tilbage"/>
+			<button label="Efter &gt;" label_selected="Efter &gt;" name="later_sales_button" tool_tip="Næste"/>
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_notices.xml b/indra/newview/skins/default/xui/da/panel_group_notices.xml
index 9e6aa9eb7c..ec503c37dc 100644
--- a/indra/newview/skins/default/xui/da/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_notices.xml
@@ -1,42 +1,35 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Beskeder" name="notices_tab">
-	<string name="help_text">
+	<panel.string name="help_text">
 		Beskeder er en hurtig måde at kommunikere på 
 på tværs i gruppen ved at sende en meddelelse eller en 
 eventuel vedlagt genstand. beskeder sendes kun til
 gruppemedlemmer i roller som giver evnen til at 
 modtage dem. Du kan slå beskeder fra i 
 Generel-fanebladet.
-	</string>
-	<string name="no_notices_text">
-		Der er ingen tidligere beskeder.
-	</string>
-	<button label="?" label_selected="?" name="help_button" />
-	<text name="lbl">
-		Arkiv med gruppebeskeder
-	</text>
+	</panel.string>
+	<panel.string name="no_notices_text">
+		Der er ikke nogen tidligere beskeder
+	</panel.string>
 	<text name="lbl2">
-		Beskeder er gemt i 14 dage. 
-Listen er begrænset til 200 beskeder pr. gruppe hver dag.
+		Beskeder gemmes i 14 dage.
+Maksimum er 200 pr. gruppe pr. dag
 	</text>
 	<scroll_list name="notice_list">
-		<column label="" name="icon" />
-		<column label="Emne" name="subject" />
-		<column label="Fra" name="from" />
-		<column label="Dato" name="date" />
+		<scroll_list.columns label="" name="icon"/>
+		<scroll_list.columns label="Emne" name="subject"/>
+		<scroll_list.columns label="Fra" name="from"/>
+		<scroll_list.columns label="Dato" name="date"/>
 	</scroll_list>
 	<text name="notice_list_none_found">
-		Ingen fundet.
+		Ingen fundet
 	</text>
-	<button label="Lav ny besked" label_selected="Lav ny besked" name="create_new_notice" />
-	<button label="Genopfrisk" label_selected="Genopfrisk liste" name="refresh_notices" />
+	<button label="Lav en ny besked" label_selected="Lav ny besked" name="create_new_notice" tool_tip="Lav en ny besked"/>
+	<button label="Genopfrisk" label_selected="Genopfrisk liste" name="refresh_notices" tool_tip="Genopfrisk beskedliste"/>
 	<panel label="Lav ny besked" name="panel_create_new_notice">
 		<text name="lbl">
 			Lav en besked
 		</text>
-		<text name="lbl2">
-			Du kan tilføje et bilag til beskeden ved at trække den fra beholdningen til dette felt. Vedhæftede objekter skal være sat til at kunne kopieres og overføres, og du kan ikke sende en mappe.
-		</text>
 		<text name="lbl3">
 			Emne:
 		</text>
@@ -46,17 +39,19 @@ Listen er begrænset til 200 beskeder pr. gruppe hver dag.
 		<text name="lbl5">
 			Vedhæft:
 		</text>
-		<button label="Fjern bilag" label_selected="Fjern bilag" name="remove_attachment" />
-		<button label="Afsend" label_selected="Afsend" name="send_notice" />
-		<panel name="drop_target"
-		     tool_tip="Træk en genstand fra beholdningen over på denne boks for at sende den sammen med beskeden. Du skal have tilladelse til at kopiere og overføre genstanden, for at kunne sende den med beskeden." />
+		<text name="string">
+			Træk og slip en gensand for at vedhæfte den:
+		</text>
+		<button label="Fjern" label_selected="Fjern bilag" name="remove_attachment"/>
+		<button label="Send" label_selected="Send" name="send_notice"/>
+		<group_drop_target name="drop_target" tool_tip="Træk en genstand fra din beholdning til dette felt for at sende den med denne besked. Du skal have rettigheder til at kopiere og overdrage denne genstand for at kunne vedhæfte den."/>
 	</panel>
 	<panel label="Se tidligere beskeder" name="panel_view_past_notice">
 		<text name="lbl">
 			Arkiverede beskeder
 		</text>
 		<text name="lbl2">
-			For at sende en ny besked, klik på &apos;Lav ny besked&apos;-knappen foroven.
+			For at sende en ny besked, tryk på + knappen
 		</text>
 		<text name="lbl3">
 			Emne:
@@ -64,6 +59,6 @@ Listen er begrænset til 200 beskeder pr. gruppe hver dag.
 		<text name="lbl4">
 			Besked:
 		</text>
-		<button label="åben bilag" label_selected="åben bilag" name="open_attachment" />
+		<button label="Åben bilag" label_selected="åben bilag" name="open_attachment"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_me.xml b/indra/newview/skins/default/xui/da/panel_me.xml
new file mode 100644
index 0000000000..2cfd358d13
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_me.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Min profil" name="panel_me">
+	<tab_container name="tabs">
+		<panel label="PROFIL" name="panel_profile"/>
+		<panel label="FAVORITTER" name="panel_picks"/>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml
new file mode 100644
index 0000000000..7f1581888d
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Generelt" name="Media Settings General">
+	<text name="home_label">
+		Hjemmeside:
+	</text>
+	<text name="home_fails_whitelist_label">
+		(Denne side optræder ikke i godkendte sider)
+	</text>
+	<line_editor name="home_url" tool_tip="Hjemmesiden for kilden til dette media"/>
+	<text name="preview_label">
+		Vis
+	</text>
+	<text name="current_url_label">
+		Nuværende side:
+	</text>
+	<text name="current_url" tool_tip="Den nuværende hjemmeside for kilden til dette media" value=""/>
+	<button label="Nulstil" name="current_url_reset_btn"/>
+	<check_box initial_value="false" label="Gentag afspil" name="auto_loop"/>
+	<check_box initial_value="false" label="Første klik medfører interaktion" name="first_click_interact"/>
+	<check_box initial_value="false" label="Auto zoom" name="auto_zoom"/>
+	<check_box initial_value="false" label="Afspil automatisk media" name="auto_play"/>
+	<text name="media_setting_note">
+		Note: Beboere kan selv ændre denne indstilling
+	</text>
+	<check_box initial_value="false" label="Auto skalér media på objektets overflade" name="auto_scale"/>
+	<text name="size_label">
+		Størrelse:
+	</text>
+	<text name="X_label">
+		X
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml
new file mode 100644
index 0000000000..ee341f9142
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Sikkerhed" name="Media Settings Security">
+	<check_box initial_value="false" label="Tillad kun adgang til specifikke URL&apos;er (via &quot;prefix&quot;)" name="whitelist_enable"/>
+	<text name="home_url_fails_some_items_in_whitelist">
+		Opslag som hjemmesiden fejler ved er markeret:
+	</text>
+	<button label="Tilføj" name="whitelist_add"/>
+	<button label="Slet" name="whitelist_del"/>
+	<text name="home_url_fails_whitelist">
+		Advarsel: Hjemmesiden angive i &quot;Generelt&quot; fanen er ikke indeholdt i godkendte sider. Den er slået fra, indtil en gyldig værdi er tilføjet.
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_my_profile.xml b/indra/newview/skins/default/xui/da/panel_my_profile.xml
new file mode 100644
index 0000000000..1dffc73239
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_my_profile.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Profil" name="panel_profile">
+	<string name="no_partner_text" value="Ingen"/>
+	<string name="RegisterDateFormat">
+		[REG_DATE] ([AGE])
+	</string>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<panel name="second_life_image_panel">
+				<icon label="" name="2nd_life_edit_icon" tool_tip="Klik på Rediger Profil knappen nedenfor for at ændre billede"/>
+			</panel>
+			<panel name="first_life_image_panel">
+				<icon label="" name="real_world_edit_icon" tool_tip="Klik på Rediger Profil knappen nedenfor for at ændre billede"/>
+				<text name="title_rw_descr_text" value="RL:"/>
+			</panel>
+			<text name="me_homepage_text">
+				Web:
+			</text>
+			<text name="title_member_text" value="Medlem siden:"/>
+			<text name="title_acc_status_text" value="Konto:"/>
+			<text name="acc_status_text" value="Beboer. Ingen betalingsinfo"/>
+			<text name="title_partner_text" value="Partner:"/>
+			<text name="title_groups_text" value="Grupper:"/>
+		</panel>
+	</scroll_container>
+	<panel name="profile_buttons_panel">
+		<button label="Tilføj ven" name="add_friend"/>
+		<button label="IM" name="im"/>
+		<button label="Opkald" name="call"/>
+		<button label="Kort" name="show_on_map_btn"/>
+		<button label="Teleportér" name="teleport"/>
+	</panel>
+	<panel name="profile_me_buttons_panel">
+		<button label="Rediger profil" name="edit_profile_btn" tool_tip="Redigér personlig information"/>
+		<button label="Ændre udseende" name="edit_appearance_btn" tool_tip="Ændre dit udseende: fysiske data, tøj m.v."/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_nearby_chat.xml b/indra/newview/skins/default/xui/da/panel_nearby_chat.xml
new file mode 100644
index 0000000000..7f94345976
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_nearby_chat.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+<panel name="nearby_chat">
+	<panel name="chat_caption">
+		<text name="sender_name">
+			CHAT NÆRVED
+		</text>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
new file mode 100644
index 0000000000..2aa7ed7c6c
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="chat_bar">
+	<string name="min_width">
+		192
+	</string>
+	<string name="max_width">
+		320
+	</string>
+	<line_editor label="Klik her for at chatte." name="chat_box" tool_tip="Tryk på enter for at tale, Ctrl-Enter for at råbe."/>
+	<button name="show_nearby_chat" tool_tip="Viser/skjuler log for chat nærved"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_pick_info.xml b/indra/newview/skins/default/xui/da/panel_pick_info.xml
new file mode 100644
index 0000000000..ce05018b5b
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_pick_info.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_pick_info">
+	<text name="title" value="Favorit info"/>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<text name="pick_name" value="[name]"/>
+			<text name="pick_location" value="[loading...]"/>
+			<text name="pick_desc" value="[description]"/>
+		</panel>
+	</scroll_container>
+	<panel name="buttons">
+		<button label="Teleportér" name="teleport_btn"/>
+		<button label="Kort" name="show_on_map_btn"/>
+		<button label="Redigér" name="edit_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_place_profile.xml b/indra/newview/skins/default/xui/da/panel_place_profile.xml
new file mode 100644
index 0000000000..24316fea14
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_place_profile.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="place_profile">
+	<string name="on" value="Til"/>
+	<string name="off" value="Fra"/>
+	<string name="anyone" value="Enhver"/>
+	<string name="available" value="ledig"/>
+	<string name="allocated" value="fordelt"/>
+	<string name="title_place" value="Sted profil"/>
+	<string name="title_teleport_history" value="Teleport historik sted"/>
+	<string name="not_available" value="(N\A)"/>
+	<string name="unknown" value="(ukendt)"/>
+	<string name="public" value="(offentlig)"/>
+	<string name="none_text" value="(ingen)"/>
+	<string name="sale_pending_text" value="(Salg igang)"/>
+	<string name="group_owned_text" value="(Gruppe ejet)"/>
+	<string name="price_text" value="L$"/>
+	<string name="area_text" value="m²"/>
+	<string name="all_residents_text" value="Alle beboere"/>
+	<string name="group_text" value="Gruppe"/>
+	<string name="can_resell">
+		Købt land i denne region må sælges videre
+	</string>
+	<string name="can_not_resell">
+		Købt land i denne region må ikke sælges videre
+	</string>
+	<string name="can_change">
+		Købt jord i denne region må gerne samles eller opdeles.
+	</string>
+	<string name="can_not_change">
+		Købt jord i denne region må ikke samles eller opdeles.
+	</string>
+	<string name="server_update_text">
+		Information om dette sted er ikke tilgængelig før en server opdatering.
+	</string>
+	<string name="server_error_text">
+		Information om dette sted er ikke tilgængelig lige nu, prøv venligst igen senere.
+	</string>
+	<string name="server_forbidden_text">
+		Information om dette sted er ikke tilgængelig på grund af adgangsbegrænsninger.  Check venligst dine rettigheder med stedets ejer.
+	</string>
+	<string name="acquired_date">
+		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+	</string>
+	<text name="title" value="Sted profil"/>
+	<scroll_container name="place_scroll">
+		<panel name="scrolling_panel">
+			<text name="owner_label" value="Ejer:"/>
+			<text name="maturity_value" value="ukendt"/>
+			<accordion name="advanced_info_accordion">
+				<accordion_tab name="parcel_characteristics_tab" title="Parcel">
+					<panel>
+						<text name="rating_label" value="Rating:"/>
+						<text name="rating_value" value="ukendt"/>
+						<text name="voice_label" value="Stem:"/>
+						<text name="voice_value" value="Til"/>
+						<text name="fly_label" value="Flyve:"/>
+						<text name="fly_value" value="Til"/>
+						<text name="push_label" value="Skub:"/>
+						<text name="push_value" value="Fra"/>
+						<text name="build_label" value="Byg:"/>
+						<text name="build_value" value="Til"/>
+						<text name="scripts_label" value="Scripts:"/>
+						<text name="scripts_value" value="Til"/>
+						<text name="damage_label" value="Skade:"/>
+						<text name="damage_value" value="Fra"/>
+						<button label="Om land" name="about_land_btn"/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="region_information_tab" title="Region">
+					<panel>
+						<text name="region_name_label" value="Region:"/>
+						<text name="region_type_label" value="Type:"/>
+						<text name="region_rating_label" value="Rating:"/>
+						<text name="region_owner_label" value="Ejer:"/>
+						<text name="region_group_label" value="Gruppe:"/>
+						<button label="Region/Estate" name="region_info_btn"/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="estate_information_tab" title="Estate">
+					<panel>
+						<text name="estate_name_label" value="Estate:"/>
+						<text name="estate_rating_label" value="Rating:"/>
+						<text name="estate_owner_label" value="Ejer:"/>
+						<text name="covenant_label" value="Regler:"/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="sales_tab" title="Til salg">
+					<panel>
+						<text name="sales_price_label" value="Pris:"/>
+						<text name="area_label" value="Areal:"/>
+						<text name="traffic_label" value="Trafik:"/>
+						<text name="primitives_label" value="Prims:"/>
+						<text name="parcel_scripts_label" value="Scripts:"/>
+						<text name="terraform_limits_label" value="Terraform begrænsninger:"/>
+						<text name="subdivide_label" value="Mulighed for at Opdele/samle:"/>
+						<text name="resale_label" value="Mulighed for videresalg:"/>
+						<text name="sale_to_label" value="Til salg til:"/>
+					</panel>
+				</accordion_tab>
+			</accordion>
+		</panel>
+	</scroll_container>
+</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 c8602d3119..609512bc1b 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
@@ -39,4 +39,8 @@
 	</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"/>
+	<radio_group name="chat_window" tool_tip="Vis dine personlige beskeder i separate vinduer eller i ét vindue med mange faner (ændring kræver genstart)">
+		<radio_item label="Flere vinduer" name="radio"/>
+		<radio_item label="Et vindue" name="radio2"/>
+	</radio_group>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
index ed23a9a706..e17ccca4a1 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
@@ -1,85 +1,62 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Generelt" name="general_panel">
-	<combo_box name="start_location_combo">
-		<combo_box.item name="MyHome" tool_tip="Log ind til min hjemme lokation som standard." label="Mit hjem" />
-		<combo_box.item name="MyLastLocation" tool_tip="Log ind til min sidste lokation som standard." label="Min sidste lokation" />
-	</combo_box>
-	<check_box label="Vis start lokation på login billedet" name="show_location_checkbox"/>
-	<combo_box name="fade_out_combobox">
-		<combo_box.item name="Never" label="Aldrig"/>
-		<combo_box.item name="Show Temporarily" label="Vis midlertidigt"/>
-		<combo_box.item name="Always" label="Altid"/>
-	</combo_box>
-	<check_box label="Små avatar navne" name="small_avatar_names_checkbox"/>
-	<check_box label="Skjul mit navn på min skærm" name="show_my_name_checkbox"/>
-	<text name="group_titles_textbox">
-		Gruppe titler:
-	</text>
-	<check_box label="Skjul alle gruppe titler" name="show_all_title_checkbox"/>
-	<check_box label="Gem min gruppe titel" name="show_my_title_checkbox"/>
-	<color_swatch label="" name="effect_color_swatch" tool_tip="Klik for at åbne farvevælger"/>
-	<text name="UI Size:">
-		UI Størrelse:
+	<text name="language_textbox">
+		Sprog:
 	</text>
-	<check_box label="Brug opløsnings uafhængig skalering" name="ui_auto_scale"/>
-	<spinner label="Tid før inaktiv:" name="afk_timeout_spinner"/>
-	<check_box label="Giv besked når Linden dollars (L$) bliver brugt eller modtaget" name="notify_money_change_checkbox"/>
-	<text name="maturity_desired_label">
-		Rating:
+	<combo_box name="language_combobox">
+		<combo_box.item label="System standard" name="System Default Language"/>
+		<combo_box.item label="English (Engelsk)" name="English"/>
+		<combo_box.item label="Dansk - Beta" name="Danish"/>
+		<combo_box.item label="Deutsch (Tysk) - Beta" name="Deutsch(German)"/>
+		<combo_box.item label="Español (Spansk) - Beta" name="Spanish"/>
+		<combo_box.item label="Français (Fransk) - Beta" name="French"/>
+		<combo_box.item label="Polski (Polsk) - Beta" name="Polish"/>
+		<combo_box.item label="Portugués (Portugisisk) - Beta" name="Portugese"/>
+		<combo_box.item label="日本語 (Japansk) - Beta" name="(Japanese)"/>
+	</combo_box>
+	<text name="language_textbox2">
+		(Kræver genstart)
 	</text>
 	<text name="maturity_desired_prompt">
 		Jeg ønsker adgang til inhold med rating:
 	</text>
+	<text name="maturity_desired_textbox"/>
 	<combo_box name="maturity_desired_combobox">
-		<combo_box.item name="Desired_Adult" label="PG, Mature og Adult"/>
-		<combo_box.item name="Desired_Mature" label="PG and Mature"/>
-		<combo_box.item name="Desired_PG" label="PG"/>
+		<combo_box.item label="PG, Mature og Adult" name="Desired_Adult"/>
+		<combo_box.item label="PG and Mature" name="Desired_Mature"/>
+		<combo_box.item label="PG" name="Desired_PG"/>
 	</combo_box>
-	<text name="maturity_desired_textbox">
-		PG
-	</text>
 	<text name="start_location_textbox">
 		Start lokation:
 	</text>
-	<text name="show_names_textbox">
-		Vis navne:
-	</text>
+	<combo_box name="start_location_combo">
+		<combo_box.item label="Min sidste lokation" name="MyLastLocation" tool_tip="Log ind til min sidste lokation som standard."/>
+		<combo_box.item label="Mit hjem" name="MyHome" tool_tip="Log ind til min hjemme lokation som standard."/>
+	</combo_box>
+	<check_box initial_value="true" label="Vis start lokation på login billedet" name="show_location_checkbox"/>
+	<text name="name_tags_textbox">
+		Navneskilte:
+	</text>
+	<radio_group name="Name_Tag_Preference">
+		<radio_item label="Skjul" name="radio"/>
+		<radio_item label="Vis" name="radio2"/>
+		<radio_item label="Vis et øjeblik" name="radio3"/>
+	</radio_group>
+	<check_box label="Vis mit navn" name="show_my_name_checkbox1"/>
+	<check_box initial_value="true" label="Små avatar navne" name="small_avatar_names_checkbox"/>
+	<check_box label="Gruppetitler" name="show_all_title_checkbox1"/>
 	<text name="effects_color_textbox">
 		Farve til mine effekter:
 	</text>
+	<color_swatch label="" name="effect_color_swatch" tool_tip="Klik for at åbne farvevælger"/>
+	<text name="title_afk_text">
+		Tid inden &quot;væk&quot;:
+	</text>
+	<spinner label="Tid før inaktiv:" name="afk_timeout_spinner"/>
 	<text name="seconds_textbox">
 		sekunder
 	</text>
-	<text name="crash_report_textbox">
-		Nedbrudsrapporter:
+	<text name="text_box3">
+		Optaget autosvar:
 	</text>
-	<text name="language_textbox">
-		Sprog:
-	</text>
-	<text name="language_textbox2">
-		(Kræver genstart for at virke optimalt)
-	</text>
-	<string name="region_name_prompt">
-		&lt;Skriv regions navn&gt;
-	</string>
-	<combo_box name="crash_behavior_combobox">
-		<combo_box.item name="Askbeforesending" label="Bed om bekræftigelse"/>
-		<combo_box.item name="Alwayssend" label="Send altid"/>
-		<combo_box.item name="Neversend" label="Send aldrig"/>
-	</combo_box>
-	<combo_box name="language_combobox">
-		<combo_box.item name="System Default Language" label="System standard"/>
-		<combo_box.item name="English" label="English (Engelsk)"/>
-		<combo_box.item name="Danish" label="Dansk - Beta"/>
-		<combo_box.item name="Deutsch(German)" label="Deutsch (Tysk) - Beta"/>
-		<combo_box.item name="Spanish" label="Español (Spansk) - Beta"/>
-		<combo_box.item name="French" label="Français (Fransk) - Beta"/>
-		<combo_box.item name="Hungarian" label="Magyar (Ungarsk) - Beta"/>
-		<combo_box.item name="Polish" label="Polski (Polsk) - Beta"/>
-		<combo_box.item name="Portugese" label="Portugués (Portugisisk) - Beta"/>
-		<combo_box.item name="Chinese" label="中文 (简体) (Kinesisk) - Beta"/>
-		<combo_box.item name="(Japanese)" label="日本語 (Japansk) - Beta"/>
-		<combo_box.item name="(Korean)" label="한국어 (Koreansk) - Beta"/>
-	</combo_box>
-	<check_box label="Del sprog med objekter" name="language_is_public" tool_tip="Dette lader objekter i verden vide hvad dit foretrukne sprog er."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
index 4dac7be413..bb1cacc773 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
@@ -1,42 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Grafik" name="Display panel">
-	<button label="?" name="GraphicsPreferencesHelpButton" />
-	<check_box label="Kør Second Life i et vindue" name="windowed mode" />
-	<text_editor name="FullScreenInfo">
-		Hvis dette ikke er valgt kører Second Life i Fuld skærm.
-	</text_editor>
-	<text name="WindowSizeLabel">
-		Opløsning:
+	<text name="UI Size:">
+		UI størrelse:
 	</text>
-	<combo_box name="windowsize combo">
-		<combo_box.item name="640x480" label="640x480" />
-		<combo_box.item name="800x600" label="800x600" />
-		<combo_box.item name="720x480" label="720x480 (NTSC)" />
-		<combo_box.item name="768x576" label="768x576 (PAL)" />
-		<combo_box.item name="1024x768" label="1024x768" />
-	</combo_box>
-	<text name="DisplayResLabel">
-		Skærm opløsning:
-	</text>
-	<text name="AspectRatioLabel1" tool_tip="bredde / højde">
-		Format:
-	</text>
-	<combo_box name="aspect_ratio" tool_tip="bredde/ højde">
-		<combo_box.item name="4:3(StandardCRT)" label="4:3 (Standard CRT)" />
-		<combo_box.item name="5:4(1280x1024LCD)" label="5:4 (1280x1024 LCD)" />
-		<combo_box.item name="8:5(Widescreen)" label="8:5 (Widescreen)" />
-		<combo_box.item name="16:9(Widescreen)" label="16:9 (Widescreen)" />
-	</combo_box>
-	<check_box label="Auto-detect format" name="aspect_auto_detect" />
-	<text name="HigherText">
-		Kvalitet og
-	</text>
-	<text name="QualityText">
-		Ydelse:
+	<text name="QualitySpeed">
+		Kvalitet og hastighed:
 	</text>
 	<text name="FasterText">
 		Hurtigere
 	</text>
+	<text name="BetterText">
+		Bedre
+	</text>
+	<slider label="" name="QualityPerformanceSelection"/>
 	<text name="ShadersPrefText">
 		Lav
 	</text>
@@ -49,99 +25,82 @@
 	<text name="ShadersPrefText4">
 		Ultra
 	</text>
-	<text name="HigherText2">
-		Højere
-	</text>
-	<text name="QualityText2">
-		Kvalitet
-	</text>
-	<slider label="" name="QualityPerformanceSelection" />
-	<check_box label="Manuelt" name="CustomSettings" />
-	<panel name="CustomGraphics Panel">
-	<text name="ShadersText">
-		Overflader:
-	</text>
-	<check_box label="Glatte flader og skin" name="BumpShiny" />
-	<check_box label="Basale flader" name="BasicShaders"
-	     tool_tip="Ved at slå dette valg fra, kan det forhindres at visse grafikkort drivere crasher." />
-	<check_box label="Atmosfæriske flader" name="WindLightUseAtmosShaders" />
-	<check_box label="Reflektioner i vand" name="Reflections" />
-	<text name="ReflectionDetailText">
-		Spejlnings detaljer:
-	</text>
-	<radio_group name="ReflectionDetailRadio">
-		<radio_item name="0" label="Terræn og træer" />
-		<radio_item name="1" label="Alle statiske objekter" />
-		<radio_item name="2" label="Alle avatarer og objekter" />
-		<radio_item name="3" label="Alt" />
-	</radio_group>
-	<text name="AvatarRenderingText">
-		Avatar gengivelse
-	</text>
-	<check_box label="Mini-figurer på lang afstand" name="AvatarImpostors" />
-	<check_box label="Hardware Skinning" name="AvatarVertexProgram" />
-	<check_box label="Avatar tøj" name="AvatarCloth" />
-	<text name="DrawDistanceMeterText1">
-		m
-	</text>
-	<text name="DrawDistanceMeterText2">
-		m
-	</text>
-	<slider label="Maks. visnings-afstand:" name="DrawDistance" />
-	<slider label="Maks. antal partikler:" name="MaxParticleCount" />
-	<slider label="Efterbehandlingskvalitet:" name="RenderPostProcess" />
-	<text name="MeshDetailText">
-		Netmaske detaljer:
-	</text>
-	<slider label="  Objekter:" name="ObjectMeshDetail" />
-	<slider label="  Flexiprims:" name="FlexibleMeshDetail" />
-	<slider label="  Træer:" name="TreeMeshDetail" />
-	<slider label="  Avatarer:" name="AvatarMeshDetail" />
-	<slider label="  Terræn:" name="TerrainMeshDetail" />
-	<slider label="  Himmel:" name="SkyMeshDetail" />
-	<text name="PostProcessText">
-		Lav
-	</text>
-	<text name="ObjectMeshDetailText">
-		Lav
-	</text>
-	<text name="FlexibleMeshDetailText">
-		Lav
-	</text>
-	<text name="TreeMeshDetailText">
-		Lav
-	</text>
-	<text name="AvatarMeshDetailText">
-		Lav
-	</text>
-	<text name="TerrainMeshDetailText">
-		Lav
-	</text>
-	<text name="SkyMeshDetailText">
-		Lav
-	</text>
-	<text name="LightingDetailText">
-		Lys detaljer:
-	</text>
-	<radio_group name="LightingDetailRadio">
-		<radio_item name="SunMoon" label="Kun sol og måne" />
-		<radio_item name="LocalLights" label="Lys i nærheden" />
-	</radio_group>
-	<text name="TerrainDetailText">
-		Terræn detaljer:
-	</text>
-	<radio_group name="TerrainDetailRadio">
-		<radio_item name="0" label="Lav" />
-		<radio_item name="2" label="Høj" />
-	</radio_group>
+	<panel label="CustomGraphics" name="CustomGraphics Panel">
+		<text name="ShadersText">
+			Overflader:
+		</text>
+		<check_box initial_value="true" label="Glatte flader og skin" name="BumpShiny"/>
+		<check_box initial_value="true" label="Basale flader" name="BasicShaders" tool_tip="Ved at slå dette valg fra, kan det forhindres at visse grafikkort drivere crasher."/>
+		<check_box initial_value="true" label="Atmosfæriske flader" name="WindLightUseAtmosShaders"/>
+		<check_box initial_value="true" label="Reflektioner i vand" name="Reflections"/>
+		<text name="ReflectionDetailText">
+			Spejlnings detaljer:
+		</text>
+		<radio_group name="ReflectionDetailRadio">
+			<radio_item label="Terræn og træer" name="0"/>
+			<radio_item label="Alle statiske objekter" name="1"/>
+			<radio_item label="Alle avatarer og objekter" name="2"/>
+			<radio_item label="Alt" name="3"/>
+		</radio_group>
+		<text name="AvatarRenderingText">
+			Avatar gengivelse
+		</text>
+		<check_box initial_value="true" label="Mini-figurer på lang afstand" name="AvatarImpostors"/>
+		<check_box initial_value="true" label="Hardware Skinning" name="AvatarVertexProgram"/>
+		<check_box initial_value="true" label="Avatar tøj" name="AvatarCloth"/>
+		<slider label="Maks. visnings-afstand:" name="DrawDistance"/>
+		<text name="DrawDistanceMeterText2">
+			m
+		</text>
+		<slider label="Maks. antal partikler:" name="MaxParticleCount"/>
+		<slider label="Efterbehandlingskvalitet:" name="RenderPostProcess"/>
+		<text name="MeshDetailText">
+			Netmaske detaljer:
+		</text>
+		<slider label="  Objekter:" name="ObjectMeshDetail"/>
+		<slider label="  Flexiprims:" name="FlexibleMeshDetail"/>
+		<slider label="  Træer:" name="TreeMeshDetail"/>
+		<slider label="  Avatarer:" name="AvatarMeshDetail"/>
+		<slider label="  Terræn:" name="TerrainMeshDetail"/>
+		<slider label="  Himmel:" name="SkyMeshDetail"/>
+		<text name="PostProcessText">
+			Lav
+		</text>
+		<text name="ObjectMeshDetailText">
+			Lav
+		</text>
+		<text name="FlexibleMeshDetailText">
+			Lav
+		</text>
+		<text name="TreeMeshDetailText">
+			Lav
+		</text>
+		<text name="AvatarMeshDetailText">
+			Lav
+		</text>
+		<text name="TerrainMeshDetailText">
+			Lav
+		</text>
+		<text name="SkyMeshDetailText">
+			Lav
+		</text>
+		<text name="LightingDetailText">
+			Lys detaljer:
+		</text>
+		<radio_group name="LightingDetailRadio">
+			<radio_item label="Kun sol og måne" name="SunMoon"/>
+			<radio_item label="Lys i nærheden" name="LocalLights"/>
+		</radio_group>
+		<text name="TerrainDetailText">
+			Terræn detaljer:
+		</text>
+		<radio_group name="TerrainDetailRadio">
+			<radio_item label="Lav" name="0"/>
+			<radio_item label="Høj" name="2"/>
+		</radio_group>
 	</panel>
-	<button label="Anbefalede indstillinger" name="Defaults" />
-	<button label="Hardware valg" label_selected="Hardware Options"
-	     name="GraphicsHardwareButton" />
-	<panel.string name="resolution_format">
-		[RES_X] x [RES_Y]
-	</panel.string>
-	<panel.string name="aspect_ratio_text">
-		[NUM]:[DEN]
-	</panel.string>
+	<button label="Benyt" label_selected="Benyt" name="Apply"/>
+	<button label="Nulstil" name="Defaults"/>
+	<button label="Avanceret" name="Advanced"/>
+	<button label="Hardware" label_selected="Hardware" name="GraphicsHardwareButton"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
new file mode 100644
index 0000000000..987ba2a3f8
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="MediaControls">
+	<layout_stack name="media_controls">
+		<layout_panel name="media_address">
+			<line_editor name="media_address_url" tool_tip="Media URL"/>
+			<layout_stack name="media_address_url_icons">
+				<layout_panel>
+					<icon name="media_whitelist_flag" tool_tip="Godkendt side"/>
+				</layout_panel>
+				<layout_panel>
+					<icon name="media_secure_lock_flag" tool_tip="Sikker browsing"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="media_play_position">
+			<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Filmafspilning fremskridt"/>
+		</layout_panel>
+		<layout_panel name="media_volume">
+			<button name="media_mute_button" tool_tip="Sluk for dette media"/>
+			<slider name="volume_slider" tool_tip="Media lydstyrke"/>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack>
+		<panel name="media_progress_indicator">
+			<progress_bar name="media_progress_bar" tool_tip="Media hentes"/>
+		</panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_profile_view.xml b/indra/newview/skins/default/xui/da/panel_profile_view.xml
new file mode 100644
index 0000000000..23b9d3ba83
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_profile_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_target_profile">
+	<string name="status_online">
+		Online
+	</string>
+	<string name="status_offline">
+		Offline
+	</string>
+	<text_editor name="user_name" value="(Henter...)"/>
+	<text name="status" value="Online"/>
+	<tab_container name="tabs">
+		<panel label="PROFIL" name="panel_profile"/>
+		<panel label="FAVORITTER" name="panel_picks"/>
+		<panel label="NOTER &amp; PRIVATLIV" name="panel_notes"/>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_region_estate.xml b/indra/newview/skins/default/xui/da/panel_region_estate.xml
index 5d0799cab9..d726fedfe9 100644
--- a/indra/newview/skins/default/xui/da/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_estate.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Estate" name="Estate">
 	<text name="estate_help_text">
 		Ændringer i dette afsnit vil påvirke alle
@@ -11,61 +11,59 @@ regioner i dette estate.
 		(ukendt)
 	</text>
 	<text name="owner_text">
-		Ejer:
+		Estate ejer:
 	</text>
 	<text name="estate_owner">
 		(ukendt)
 	</text>
-	<check_box label="Brug global tid" name="use_global_time_check" />
-	<button label="?" name="use_global_time_help" />
-	<check_box label="Sol i fast position" name="fixed_sun_check" />
-	<button label="?" name="fixed_sun_help" />
-	<slider label="Fase" name="sun_hour_slider" />
-	<check_box label="Tillad offentlig adgang" name="externally_visible_check" />
-	<button label="?" name="externally_visible_help" />
+	<check_box label="Brug global tid" name="use_global_time_check"/>
+	<button label="?" name="use_global_time_help"/>
+	<check_box label="Sol i fast position" name="fixed_sun_check"/>
+	<button label="?" name="fixed_sun_help"/>
+	<slider label="Fase" name="sun_hour_slider"/>
+	<check_box label="Tillad offentlig adgang" name="externally_visible_check"/>
+	<button label="?" name="externally_visible_help"/>
 	<text name="Only Allow">
 		Begræns adgang til:
 	</text>
-	<check_box label="Beboere med betalingsoplysninger" name="limit_payment"
-	     tool_tip="Blokér for brugere uden identifikation" />
-	<check_box label="Beboere der er godkendt som voksne" name="limit_age_verified"
-	     tool_tip="Blokér for brugere der ikke har verificéret deres alder. Se support.secondlife.com for mere information." />
-	<check_box label="Tillad stemme chat" name="voice_chat_check" />
-	<button label="?" name="voice_chat_help" />
-	<check_box label="Tillad direkte teleport" name="allow_direct_teleport" />
-	<button label="?" name="allow_direct_teleport_help" />
+	<check_box label="Beboere med betalingsoplysninger" name="limit_payment" tool_tip="Blokér for brugere uden identifikation"/>
+	<check_box label="Beboere der er godkendt som voksne" name="limit_age_verified" tool_tip="Blokér for brugere der ikke har verificéret deres alder. Se [SUPPORT_SITE] for mere information."/>
+	<check_box label="Tillad stemme chat" name="voice_chat_check"/>
+	<button label="?" name="voice_chat_help"/>
+	<check_box label="Tillad direkte teleport" name="allow_direct_teleport"/>
+	<button label="?" name="allow_direct_teleport_help"/>
 	<text name="abuse_email_text" width="260">
 		Send beskeder misbrug til email adresse:
 	</text>
 	<string name="email_unsupported">
 		Ikke supporteret
 	</string>
-	<button label="?" name="abuse_email_address_help" />
-	<button label="Gem" name="apply_btn" />
-	<button label="Smid bruger ud fra estate..." name="kick_user_from_estate_btn" />
-	<button label="Send besked til estate..." name="message_estate_btn" />
+	<button label="?" name="abuse_email_address_help"/>
+	<button label="Gem" name="apply_btn"/>
+	<button label="Smid bruger ud fra estate..." name="kick_user_from_estate_btn"/>
+	<button label="Send besked til estate..." name="message_estate_btn"/>
 	<text name="estate_manager_label">
 		Administratorer:
 	</text>
-	<button label="?" name="estate_manager_help" />
-	<button label="Fjern..." name="remove_estate_manager_btn" />
-	<button label="Tilføj..." name="add_estate_manager_btn" />
+	<button label="?" name="estate_manager_help"/>
+	<button label="Fjern..." name="remove_estate_manager_btn"/>
+	<button label="Tilføj..." name="add_estate_manager_btn"/>
 	<text name="allow_resident_label">
 		Godkendte beboere:
 	</text>
-	<button label="?" name="allow_resident_help" />
-	<button label="Fjern..." name="remove_allowed_avatar_btn" />
-	<button label="Tilføj..." name="add_allowed_avatar_btn" />
+	<button label="?" name="allow_resident_help"/>
+	<button label="Fjern..." name="remove_allowed_avatar_btn"/>
+	<button label="Tilføj..." name="add_allowed_avatar_btn"/>
 	<text name="allow_group_label">
 		Tilladte grupper:
 	</text>
-	<button label="?" name="allow_group_help" />
-	<button label="Fjern..." name="remove_allowed_group_btn" />
-	<button label="Tilføj..." name="add_allowed_group_btn" />
+	<button label="?" name="allow_group_help"/>
+	<button label="Fjern..." name="remove_allowed_group_btn"/>
+	<button label="Tilføj..." name="add_allowed_group_btn"/>
 	<text name="ban_resident_label">
 		Blokérede beboere:
 	</text>
-	<button label="?" name="ban_resident_help" />
-	<button label="Fjern..." name="remove_banned_avatar_btn" />
-	<button label="Tilføj..." name="add_banned_avatar_btn" />
+	<button label="?" name="ban_resident_help"/>
+	<button label="Fjern..." name="remove_banned_avatar_btn"/>
+	<button label="Tilføj..." name="add_banned_avatar_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml
new file mode 100644
index 0000000000..5c0bd829d8
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="sidetray_tab_panel">
+	<text name="sidetray_tab_title" value="Side bjælke"/>
+	<button name="show_help" tool_tip="Vis hjælp"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml
index 20e72827f2..4e45b7e328 100644
--- a/indra/newview/skins/default/xui/da/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/da/panel_status_bar.xml
@@ -1,44 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-	<text name="ParcelNameText"
-	     tool_tip="Navn på det land/parcel som du står på. Klik på teksten for yderligere info.">
-		parcel name goes here
-	</text>
-	<text name="BalanceText" tool_tip="Konto balance">
-		Henter...
-	</text>
-	<button label="" label_selected="" name="buycurrency" tool_tip="Køb valuta" />
-	<text name="TimeText" tool_tip="Nuværende [SECOND_LIFE] tid">
-		12:00
-	</text>
-	<string name="StatBarDaysOfWeek">
+	<panel.string name="StatBarDaysOfWeek">
 		Søndag:Mandag:Tirsdag:Onsdag:Torsdag:Fredag:Lørdag
-	</string>
-	<string name="StatBarMonthsOfYear">
+	</panel.string>
+	<panel.string name="StatBarMonthsOfYear">
 		Januar:Februar:Marts:April:Maj:Juni:Juli:August:September:Oktober:November:December
-	</string>
-	<button label="" label_selected="" name="scriptout" tool_tip="Script advarsler og fejl" />
-	<button label="" label_selected="" name="health" tool_tip="Helbred" />
-	<text name="HealthText" tool_tip="Helbred">
-		100%
-	</text>
-	<button label="" label_selected="" name="no_fly" tool_tip="Flyvning ikke tilladt" />
-	<button label="" label_selected="" name="no_build"
-	     tool_tip="Bygning og placering af objekter ikke tilladt" />
-	<button label="" label_selected="" name="no_scripts"
-	     tool_tip="Afvikling af scripts ikke tilladt" />
-	<button label="" label_selected="" name="restrictpush"
-	     tool_tip="Ikke tilladt at skubbe" />
-	<button label="" label_selected="" name="status_no_voice"
-	     tool_tip="Stemme chat ikke tilgængelig" />
-	<button label="" label_selected="" name="buyland" tool_tip="Køb denne parcel" />
-	<button label="" name="menubar_search_bevel_bg" />
-	<line_editor label="Søg" name="search_editor" tool_tip="Søg [SECOND_LIFE]" />
-	<button label="" label_selected="" name="search_btn" tool_tip="Søg [SECOND_LIFE]" />
-	<string name="packet_loss_tooltip">
+	</panel.string>
+	<panel.string name="packet_loss_tooltip">
 		Packet Loss
-	</string>
-	<string name="bandwidth_tooltip">
+	</panel.string>
+	<panel.string name="bandwidth_tooltip">
 		Båndbredde
-	</string>
+	</panel.string>
+	<panel.string name="time">
+		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
+	</panel.string>
+	<panel.string name="timeTooltip">
+		[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
+	</panel.string>
+	<panel.string name="buycurrencylabel">
+		L$ [AMT]
+	</panel.string>
+	<button label="" label_selected="" name="buycurrency" tool_tip="My Balance: Click to buy more L$"/>
+	<text name="TimeText" tool_tip="Nuværende tid (Pacific)">
+		12:00
+	</text>
+	<button name="volume_btn" tool_tip="Kontrol for generel lydstyrke"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/role_actions.xml b/indra/newview/skins/default/xui/da/role_actions.xml
index e4c8c4b93b..5ec90a759a 100644
--- a/indra/newview/skins/default/xui/da/role_actions.xml
+++ b/indra/newview/skins/default/xui/da/role_actions.xml
@@ -1,201 +1,76 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <role_actions>
-	<action_set
-	     description="Disse rettigheder inkluderer adgang til at tilføje og fjerne gruppe medlemmer og tillade nye medlemmer at melde sig ind uden invitation"
-	     name="Membership">
-		<action description="Invitér personer til denne gruppe"
-		     longdescription="Invitér personer til denne gruppe via &apos;Invitér ny person...&apos; knappen i fanen: medlemmer &amp; roller &gt; underfanen: medlemmer"
-		     name="member invite" />
-		<action description="Fjern medlemmer fra denne gruppe"
-		     longdescription="Fjern medlemmer i denne gruppe via &apos;Fjern fra gruppe&apos; knappen i fanen: medlemmer &amp; roller &gt; underfanen: medlemmer. En ejer kan fjerne alle undtagen en anden ejer. Hvis du ikke er en ejer, kan et medlem kun fjernes fra gruppen hvis, og kun hvis, medlemmet kun findes i Alle rollen, og ikke i andre roller. for at fjerne medlemmer fra roller, skal du have rettigheden &apos;Fjern medlemmer fra roller&apos;"
-		     name="member eject" />
-		<action
-		     description="Åben eller luk for &apos;fri tilmelding&apos; og ændre &apos;tilmeldingsgebyr&apos;"
-		     longdescription="Åben for &apos;fri tilmelding&apos; så alle kan blive medlem af gruppen, eller luk for &apos;fri tilmelding&apos; så kun inveterede kan blive medlem. ændre &apos;tilmeldingsgebyr&apos; i gruppe opsætningsbilledet sektionen i Generelt fanen"
-		     name="member options" />
+	<action_set description="Disse rettigheder inkluderer adgang til at tilføje og fjerne gruppe medlemmer og tillade nye medlemmer at melde sig ind uden invitation" name="Membership">
+		<action description="Invitér personer til denne gruppe" longdescription="Invitér personer til denne gruppe via &apos;Invitér ny person...&apos; knappen i fanen: medlemmer &amp; roller &gt; underfanen: medlemmer" name="member invite"/>
+		<action description="Fjern medlemmer fra denne gruppe" longdescription="Fjern medlemmer i denne gruppe via &apos;Fjern fra gruppe&apos; knappen i fanen: medlemmer &amp; roller &gt; underfanen: medlemmer. En ejer kan fjerne alle undtagen en anden ejer. Hvis du ikke er en ejer, kan et medlem kun fjernes fra gruppen hvis, og kun hvis, medlemmet kun findes i Alle rollen, og ikke i andre roller. for at fjerne medlemmer fra roller, skal du have rettigheden &apos;Fjern medlemmer fra roller" name="member eject"/>
+		<action description="Åben eller luk for &apos;fri tilmelding&apos; og ændre &apos;tilmeldingsgebyr&apos;" longdescription="Åben for &apos;fri tilmelding&apos; så alle kan blive medlem af gruppen, eller luk for &apos;fri tilmelding&apos; så kun inveterede kan blive medlem. ændre &apos;tilmeldingsgebyr&apos; i gruppe opsætningsbilledet sektionen i Generelt fanen" name="member options"/>
 	</action_set>
-	<action_set
-	     description="Disse rettigheder inkluderer adgang til at tilføje, fjerne og ændre gruppe-roller, tilføje og fjerne medlemmer i roller, og give rettigheder til roller"
-	     name="Roles">
-		<action description="Opret nye roller"
-		     longdescription="Opret nye roller i fanen: Medlemmer &amp; roller &gt; under-fanen: Roller."
-		     name="role create" />
-		<action description="Slet roller"
-		     longdescription="Slet roller i roller i fanen: Medlemmer &amp; roller &gt; under-fanen: Roller."
-		     name="role delete" />
-		<action
-		     description="Ændre rolle navne, titler, beskrivelser og angivelse af om rollemedlemmer kan ses af andre udenfor gruppen"
-		     longdescription="Ændre rolle navne, titler, beskrivelser og angivelse af om rollemedlemmer kan ses af andre udenfor gruppen. Dette håndteres i bunden af fanen:: Medlemmer &amp; roller &gt; under-fanen: Roller efter at have valgt en rolle."
-		     name="role properties" />
-		<action description="Tildel andre samme roller som dig selv"
-		     longdescription="Tildel andre medlemmer til roller i Tildelte roller sektionen på fanen: Medlemmer &amp; roller &gt; under-fanen: Medlemmer. Et medlem med denne rettighed kan kun tildele andre medlemmer en rolle som tildeleren allerede selv har."
-		     name="role assign member limited" />
-		<action description="Tildele medlemmer enhver rolle"
-		     longdescription="Tildel andre medlemmer til en hvilken som helst rolle i Tildelte roller sektionen på fanen: Medlemmer &amp; roller &gt; under-fanen: Medlemmer. *ADVARSEL* Ethvert medlem i en rolle med denne rettighed kan tildele sig selv - og enhver anden - roller som giver dem flere rettigheder end de havde tidligere, og dermed potentielt få næsten samme magt som ejer. Vær sikker på at vide hvad du ør inden du tildeler denne rettighed."
-		     name="role assign member" />
-		<action description="Fjern medlemmer fra roller"
-		     longdescription="Fjern medlemmer fra roller i in Tildelte roller sektionen på fanen: Medlemmer &amp; roller &gt; under-fanen: Medlemmer. Ejere kan ikke fjernes."
-		     name="role remove member" />
-		<action description="Tildel og fjern rettigheder for roller"
-		     longdescription="Tildel og fjern rettigheder for roller i tilladte rettigheder sektionen på fanen: Medlemmer &amp; roller &gt; under-fanen: Roller. *ADVARSEL* Ethvert medlem i en rolle med denne rettighed kan tildele sig selv - og enhver anden - rettigheder som giver dem flere rettigheder end de havde tidligere, og dermed potentielt få næsten samme magt som ejer. Vær sikker på at vide hvad du gør inden du tildeler denne rettighed."
-		     name="role change actions" />
+	<action_set description="Disse rettigheder inkluderer adgang til at tilføje, fjerne og ændre gruppe-roller, tilføje og fjerne medlemmer i roller, og give rettigheder til roller" name="Roles">
+		<action description="Opret nye roller" longdescription="Opret nye roller i fanen: Medlemmer &amp; roller &gt; under-fanen: Roller." name="role create"/>
+		<action description="Slet roller" longdescription="Slet roller i roller i fanen: Medlemmer &amp; roller &gt; under-fanen: Roller." name="role delete"/>
+		<action description="Ændre rolle navne, titler, beskrivelser og angivelse af om rollemedlemmer kan ses af andre udenfor gruppen" longdescription="Ændre rolle navne, titler, beskrivelser og angivelse af om rollemedlemmer kan ses af andre udenfor gruppen. Dette håndteres i bunden af fanen:: Medlemmer &amp; roller &gt; under-fanen: Roller efter at have valgt en rolle." name="role properties"/>
+		<action description="Tildel andre samme roller som dig selv" longdescription="Tildel andre medlemmer til roller i Tildelte roller sektionen på fanen: Medlemmer &amp; roller &gt; under-fanen: Medlemmer. Et medlem med denne rettighed kan kun tildele andre medlemmer en rolle som tildeleren allerede selv har." name="role assign member limited"/>
+		<action description="Tildele medlemmer enhver rolle" longdescription="Tildel andre medlemmer til en hvilken som helst rolle i Tildelte roller sektionen på fanen: Medlemmer &amp; roller &gt; under-fanen: Medlemmer. *ADVARSEL* Ethvert medlem i en rolle med denne rettighed kan tildele sig selv - og enhver anden - roller som giver dem flere rettigheder end de havde tidligere, og dermed potentielt få næsten samme magt som ejer. Vær sikker på at vide hvad du ør inden du tildeler denne rettighed." name="role assign member"/>
+		<action description="Fjern medlemmer fra roller" longdescription="Fjern medlemmer fra roller i in Tildelte roller sektionen på fanen: Medlemmer &amp; roller &gt; under-fanen: Medlemmer. Ejere kan ikke fjernes." name="role remove member"/>
+		<action description="Tildel og fjern rettigheder for roller" longdescription="Tildel og fjern rettigheder for roller i tilladte rettigheder sektionen på fanen: Medlemmer &amp; roller &gt; under-fanen: Roller. *ADVARSEL* Ethvert medlem i en rolle med denne rettighed kan tildele sig selv - og enhver anden - rettigheder som giver dem flere rettigheder end de havde tidligere, og dermed potentielt få næsten samme magt som ejer. Vær sikker på at vide hvad du gør inden du tildeler denne rettighed." name="role change actions"/>
 	</action_set>
-	<action_set
-	     description="Disse rettigheder inkluderer adgang til at ændre denne gruppes identitetsoplysninger, som f.eks. om gruppen kan ses af andre, gruppens fundats og billede."
-	     name="Group Identity">
-		<action description="Ændre fundats, billede og &apos;Vis i søgning&apos;"
-		     longdescription="Ændre fundats og &apos;Vis i søgning&apos;. Dette gøres under fanen Generelt."
-		     name="group change identity" />
+	<action_set description="Disse rettigheder inkluderer adgang til at ændre denne gruppes identitetsoplysninger, som f.eks. om gruppen kan ses af andre, gruppens fundats og billede." name="Group Identity">
+		<action description="Ændre fundats, billede og &apos;Vis i søgning&apos;" longdescription="Ændre fundats og &apos;Vis i søgning&apos;. Dette gøres under fanen Generelt." name="group change identity"/>
 	</action_set>
-	<action_set
-	     description="Disse rettigheder inkluderer adgang til dedikere, ændre og sælge land fra denne gruppes besiddelser. For at åbne &apos;Om land...&apos; vinduet, højre-klik på jorden og vælg &apos;Om land...&apos;, eller klik på &apos;Om land...&apos; i &apos;Verden&apos; menuen."
-	     name="Parcel Management">
-		<action description="Dedikér eller køb land til gruppen"
-		     longdescription="Dedikér eller køb land til gruppen. Dette gøres i fanen Generelt i &apos;Om land...&apos;."
-		     name="land deed" />
-		<action description="Forlad land og overgiv det til guvernør Linden"
-		     longdescription="Forlad land og overgiv det til guvernør Linden. *ADVARSEL* Ethvert medlem med en rolle med denne rettighed kan overdrage gruppe-ejet land via fanen Generelt i &apos;Om land...&apos; til Lindens ejerskab uden salg! Vær sikker på at vide hvad du ør inden du tildeler denne rettighed."
-		     name="land release" />
-		<action description="Sæt land til salg"
-		     longdescription="Sæt land til salg. *ADVARSEL* Ethvert medlem med en rolle med denne rettighed kan sælge gruppe-ejet land via fanen Generelt i &apos;Om land...&apos;! Vær sikker på at vide hvad du ør inden du tildeler denne rettighed."
-		     name="land set sale info" />
-		<action description="Opdel og saml parceller"
-		     longdescription="Opdel og saml parceller. Dette gøres ved at højreklikke på jorden og vælge &apos;Redigér terræn&apos;"
-		     name="land divide join" />
+	<action_set description="Disse rettigheder inkluderer adgang til dedikere, ændre og sælge land fra denne gruppes besiddelser. For at åbne &apos;Om land...&apos; vinduet, højre-klik på jorden og vælg &apos;Om land...&apos;, eller klik på &apos;Om land...&apos; i &apos;Verden&apos; menuen." name="Parcel Management">
+		<action description="Dedikér eller køb land til gruppen" longdescription="Dedikér eller køb land til gruppen. Dette gøres i fanen Generelt i &apos;Om land...&apos;." name="land deed"/>
+		<action description="Forlad land og overgiv det til guvernør Linden" longdescription="Forlad land og overgiv det til guvernør Linden. *ADVARSEL* Ethvert medlem med en rolle med denne rettighed kan overdrage gruppe-ejet land via fanen Generelt i &apos;Om land...&apos; til Lindens ejerskab uden salg! Vær sikker på at vide hvad du ør inden du tildeler denne rettighed." name="land release"/>
+		<action description="Sæt land til salg" longdescription="Sæt land til salg. *ADVARSEL* Ethvert medlem med en rolle med denne rettighed kan sælge gruppe-ejet land via fanen Generelt i &apos;Om land...&apos;! Vær sikker på at vide hvad du ør inden du tildeler denne rettighed." name="land set sale info"/>
+		<action description="Opdel og saml parceller" longdescription="Opdel og saml parceller. Dette gøres ved at højreklikke på jorden og vælge &apos;Redigér terræn&apos;" name="land divide join"/>
 	</action_set>
-	<action_set
-	     description="Disse rettigheder inkluderer adgang til at ændre parcel navn og en række parametre om f.eks. landingspunkt, teleports m.v.."
-	     name="Parcel Identity">
-		<action
-		     description="Angive om sted skal vises i &apos;vis i Søg steder&apos; og angivelse af kategori"
-		     longdescription="Angive om sted skal vises i &apos;vis i Søg steder&apos; og angivelse af kategori i &apos;Om land...&apos; &gt; Indstillinger fanen."
-		     name="land find places" />
-		<action
-		     description="Ændre parcel navn, beskrivelse, og &apos;Vis i Søg&apos; opsætning"
-		     longdescription="Ændre parcel navn, beskrivelse, og &apos;Vis i Søg&apos; opsætning. Dette håndteres i &apos;Om land...&apos;&gt; Opsætning fanen."
-		     name="land change identity" />
-		<action description="Sæt landingspunkt og teleport muligheder"
-		     longdescription="På en gruppe-ejet parcel kan medlemmer, med en rolle med denne rettighed, sætte landingspunktet og dermed angive hvor indkommende teleporte skal ankomme og desuden angive dealjer om teleporte. Dette håndteres i &apos;Om land...&apos;&gt; Opsætning fanen."
-		     name="land set landing point" />
+	<action_set description="Disse rettigheder inkluderer adgang til at ændre parcel navn og en række parametre om f.eks. landingspunkt, teleports m.v.." name="Parcel Identity">
+		<action description="Angive om sted skal vises i &apos;vis i Søg steder&apos; og angivelse af kategori" longdescription="Angive om sted skal vises i &apos;vis i Søg steder&apos; og angivelse af kategori i &apos;Om land...&apos; &gt; Indstillinger fanen." name="land find places"/>
+		<action description="Ændre parcel navn, beskrivelse, og &apos;Vis i Søg&apos; opsætning" longdescription="Ændre parcel navn, beskrivelse, og &apos;Vis i Søg&apos; opsætning. Dette håndteres i &apos;Om land...&apos;&gt; Opsætning fanen." name="land change identity"/>
+		<action description="Sæt landingspunkt og teleport muligheder" longdescription="På en gruppe-ejet parcel kan medlemmer, med en rolle med denne rettighed, sætte landingspunktet og dermed angive hvor indkommende teleporte skal ankomme og desuden angive dealjer om teleporte. Dette håndteres i &apos;Om land...&apos;&gt; Opsætning fanen." name="land set landing point"/>
 	</action_set>
-	<action_set
-	     description="Disse rettigheder inkluderer adgang til at opsætte parcel indstillinger som f.eks. &apos;Lave objekter&apos;, &apos;Redigere terræn&apos;, samt musik og media indstillinger."
-	     name="Parcel Settings">
-		<action description="Ændre musik og media indstillinger"
-		     longdescription="Ændre oplysninger om streaming musik og film i &apos;Om land...&apos; &gt; Media fanen."
-		     name="land change media" />
-		<action description="Ændre rettighed til &apos;Redigere terræn&apos;"
-		     longdescription="Ændre rettighed til &apos;Redigere terræn&apos;. *ADVARSEL*: Redigere terræn&apos; kan give alle og enhver ret til at ændre terræn og opsætte og flytte Linden planter. Vær sikker på at vide hvad du ør inden du tildeler denne rettighed."
-		     name="land edit" />
-		<action
-		     description="Ændre diverse andre indstillinger i &apos;Om land...&apos;&gt; indstillinger fanen"
-		     longdescription="Giv adgang til at ændre &apos;Sikker (ingen skade)&apos;, &apos;Flyve&apos;, og tillad andre beboere at: &apos;Lave objekter&apos;, &apos;Redigere terræn&apos;, &apos;Lave landemærker&apos;, og &apos;Køre scripts&apos; på gruppe-ejet land via About Land &gt; Indstillinger fanen."
-		     name="land options" />
+	<action_set description="Disse rettigheder inkluderer adgang til at opsætte parcel indstillinger som f.eks. &apos;Lave objekter&apos;, &apos;Redigere terræn&apos;, samt musik og media indstillinger." name="Parcel Settings">
+		<action description="Ændre musik og media indstillinger" longdescription="Ændre oplysninger om streaming musik og film i &apos;Om land...&apos; &gt; Media fanen." name="land change media"/>
+		<action description="Ændre rettighed til &apos;Redigere terræn&apos;" longdescription="Ændre rettighed til &apos;Redigere terræn&apos;. *ADVARSEL*: Redigere terræn&apos; kan give alle og enhver ret til at ændre terræn og opsætte og flytte Linden planter. Vær sikker på at vide hvad du ør inden du tildeler denne rettighed." name="land edit"/>
+		<action description="Ændre diverse andre indstillinger i &apos;Om land...&apos;&gt; indstillinger fanen" longdescription="Giv adgang til at ændre &apos;Sikker (ingen skade)&apos;, &apos;Flyve&apos;, og tillad andre beboere at: &apos;Lave objekter&apos;, &apos;Redigere terræn&apos;, &apos;Lave landemærker&apos;, og &apos;Køre scripts&apos; på gruppe-ejet land via About Land &gt; Indstillinger fanen." name="land options"/>
 	</action_set>
-	<action_set
-	     description="Disse rettigheder inkluderer adgang til at medlemmer kan omgå restriktioner på gruppe-ejede parceller."
-	     name="Parcel Powers">
-		<action description="Tillad altid &apos;Rediger Terræn&apos;"
-		     longdescription="Medlemmer med denne rolle har adgang til at redigere terræn på gruppe-ejede parceller, også selvom denne mulighed ikke er aktiveret på &apos;Om land...&apos; &gt; Indstillinger fanen."
-		     name="land allow edit land" />
-		<action description="Tillad altid at &apos;Flyve&apos;"
-		     longdescription="Medlemmer med denne rolle har adgang til at flyve på gruppe-ejede parceller, også selvom denne mulighed ikke er aktiveret på &apos;Om land...&apos; &gt; Indstillinger fanen."
-		     name="land allow fly" />
-		<action description="Tillad altid &apos;Lave objekter&apos;"
-		     longdescription="Medlemmer med denne rolle har adgang til at lave nye objekter på gruppe-ejede parceller, også selvom denne mulighed ikke er aktiveret på &apos;Om land...&apos; &gt; Indstillinger fanen."
-		     name="land allow create" />
-		<action description="Tillad altid at &apos;Lave landemærker&apos;"
-		     longdescription="Medlemmer med denne rolle har adgang til at lave landemærker på gruppe-ejede parceller, også selvom denne mulighed ikke er aktiveret på &apos;Om land...&apos; &gt; Indstillinger fanen."
-		     name="land allow landmark" />
-		<action description="Tillad altid &apos;sæt til hjem&apos; på gruppe-ejet land"
-		     longdescription="Medlemmer med denne rolle har adgang til at benytte &apos;Verden&apos; menuen og vælge &apos;sæt til hjem&apos; på en parcel der er dedikeret til gruppen."
-		     name="land allow set home" />
+	<action_set description="Disse rettigheder inkluderer adgang til at medlemmer kan omgå restriktioner på gruppe-ejede parceller." name="Parcel Powers">
+		<action description="Tillad altid &apos;Rediger Terræn&apos;" longdescription="Medlemmer med denne rolle har adgang til at redigere terræn på gruppe-ejede parceller, også selvom denne mulighed ikke er aktiveret på &apos;Om land...&apos; &gt; Indstillinger fanen." name="land allow edit land"/>
+		<action description="Tillad altid at &apos;Flyve&apos;" longdescription="Medlemmer med denne rolle har adgang til at flyve på gruppe-ejede parceller, også selvom denne mulighed ikke er aktiveret på &apos;Om land...&apos; &gt; Indstillinger fanen." name="land allow fly"/>
+		<action description="Tillad altid &apos;Lave objekter&apos;" longdescription="Medlemmer med denne rolle har adgang til at lave nye objekter på gruppe-ejede parceller, også selvom denne mulighed ikke er aktiveret på &apos;Om land...&apos; &gt; Indstillinger fanen." name="land allow create"/>
+		<action description="Tillad altid at &apos;Lave landemærker&apos;" longdescription="Medlemmer med denne rolle har adgang til at lave landemærker på gruppe-ejede parceller, også selvom denne mulighed ikke er aktiveret på &apos;Om land...&apos; &gt; Indstillinger fanen." name="land allow landmark"/>
+		<action description="Tillad altid &apos;sæt til hjem&apos; på gruppe-ejet land" longdescription="Medlemmer med denne rolle har adgang til at benytte &apos;Verden&apos; menuen og vælge &apos;sæt til hjem&apos; på en parcel der er dedikeret til gruppen." name="land allow set home"/>
 	</action_set>
-	<action_set
-	     description="Disse rettigheder inkluderer adgang til at medlemmer kan tillade eller forbyde adgang til gruppe-ejede parceller, inkluderende at &apos;fryse&apos; og udsmide beboere."
-	     name="Parcel Access">
-		<action description="Administrér adgangsregler for parceller"
-		     longdescription="Administrér adgangsregler for parceller i &apos;Om land&apos; &gt; &apos;Adgang&apos; fanen."
-		     name="land manage allowed" />
-		<action description="Administrér liste med blokerede beboere på parceller"
-		     longdescription="Administrér liste med blokerede beboere på parceller i &apos;Om land&apos; &gt; &apos;Adgang&apos; fanen."
-		     name="land manage banned" />
-		<action
-		     description="Ændre indstillinger for at &apos;Sælge adgang til&apos; parceller"
-		     longdescription="Ændre indstillinger for at &apos;Sælge adgang til&apos; parceller i &apos;Om land&apos; &gt; &apos;Adgang&apos; fanen."
-		     name="land manage passes" />
-		<action
-		     description="Adgang til at smide beboere ud og &apos;fryse&apos; beboere på parceller"
-		     longdescription="Medlermmer med denne rolle kan håndtere beboere som ikke er velkomne på gruppe-ejet parceller ved at højreklikke på dem, vælge Mere&gt;, og vælge &apos;Smid ud...&apos; eller &apos;Frys...&apos;."
-		     name="land admin" />
+	<action_set description="Disse rettigheder inkluderer adgang til at medlemmer kan tillade eller forbyde adgang til gruppe-ejede parceller, inkluderende at &apos;fryse&apos; og udsmide beboere." name="Parcel Access">
+		<action description="Administrér adgangsregler for parceller" longdescription="Administrér adgangsregler for parceller i &apos;Om land&apos; &gt; &apos;Adgang&apos; fanen." name="land manage allowed"/>
+		<action description="Administrér liste med blokerede beboere på parceller" longdescription="Administrér liste med blokerede beboere på parceller i &apos;Om land&apos; &gt; &apos;Adgang&apos; fanen." name="land manage banned"/>
+		<action description="Ændre indstillinger for at &apos;Sælge adgang til&apos; parceller" longdescription="Ændre indstillinger for at &apos;Sælge adgang til&apos; parceller i &apos;Om land&apos; &gt; &apos;Adgang&apos; fanen." name="land manage passes"/>
+		<action description="Adgang til at smide beboere ud og &apos;fryse&apos; beboere på parceller" longdescription="Medlemmer med denne rolle kan håndtere beboere som ikke er velkomne på gruppe-ejet parceller ved at højreklikke på dem, vælge Mere&gt;, og vælge &apos;Smid ud...&apos; eller &apos;Frys...&apos;." name="land admin"/>
 	</action_set>
-	<action_set
-	     description="Disse rettigheder inkluderer mulighed til at tillade beboere at returnere objekter og placere og flytte Linden planter. Dette er brugbart for at medlemmer kan holde orden og tilpasse landskabet. Denne mulighed skal benyttes med varsomhed, da der ikke er mulighed for at fortryde returnering af objekter og ændringer i landskabet."
-	     name="Parcel Content">
-		<action description="Returnere objekter ejet af gruppen"
-		     longdescription="Returne objekter på gruppe-ejede parceller der er ejet af gruppen. Dette håndteres i &apos;Om land...&apos;&gt; &apos;Objekter&apos; fanen."
-		     name="land return group owned" />
-		<action description="Returnere objekter der er sat til &apos;gruppe&apos;"
-		     longdescription="Returnere objekter på gruppe-ejede parceller, der er &apos;sat til gruppe&apos; i &apos;Om land...&apos;&gt; &apos;Objekter&apos; fanen."
-		     name="land return group set" />
-		<action description="Returnere objekter der ikke er ejet af andre"
-		     longdescription="Returnere objekter på gruppe-ejede parceller, der er &apos;Ejet af andre&apos; i &apos;Om land...&apos;&gt; &apos;Objekter&apos; fanen."
-		     name="land return non group" />
-		<action description="Ændre landskab med Linden planter"
-		     longdescription="Mulighed for at ændre landskabet ved at placere og flytte Linden træer, planter, og græs. Disse genstande kan findes i din beholdnings Library &gt; Objects mappe eller de kan oprettes via &apos;Byg&apos; knappen."
-		     name="land gardening" />
+	<action_set description="Disse rettigheder inkluderer mulighed til at tillade beboere at returnere objekter og placere og flytte Linden planter. Dette er brugbart for at medlemmer kan holde orden og tilpasse landskabet. Denne mulighed skal benyttes med varsomhed, da der ikke er mulighed for at fortryde returnering af objekter og ændringer i landskabet." name="Parcel Content">
+		<action description="Returnere objekter ejet af gruppen" longdescription="Returne objekter på gruppe-ejede parceller der er ejet af gruppen. Dette håndteres i &apos;Om land...&apos;&gt; &apos;Objekter&apos; fanen." name="land return group owned"/>
+		<action description="Returnere objekter der er sat til &apos;gruppe&apos;" longdescription="Returnere objekter på gruppe-ejede parceller, der er &apos;sat til gruppe&apos; i &apos;Om land...&apos;&gt; &apos;Objekter&apos; fanen." name="land return group set"/>
+		<action description="Returnere objekter der ikke er ejet af andre" longdescription="Returnere objekter på gruppe-ejede parceller, der er &apos;Ejet af andre&apos; i &apos;Om land...&apos;&gt; &apos;Objekter&apos; fanen." name="land return non group"/>
+		<action description="Ændre landskab med Linden planter" longdescription="Disse rettigheder inkluderer mulighed til at tillade beboere at returnere objekter og placere og flytte Linden planter. Dette er brugbart for at medlemmer kan holde orden og tilpasse landskabet. Denne mulighed skal benyttes med varsomhed, da der ikke er mulighed for at fortryde returnering af objekter og ændringer i landskabet." name="land gardening"/>
 	</action_set>
-	<action_set
-	     description="Disse rettigheder inkluderer mulighed til at dedikere, ændre og sælge gruppe-ejede objekter. Disse ændringer sker i &apos;Rediger&apos;&gt; &apos;Generelt&apos; fanen."
-	     name="Object Management">
-		<action description="Dediker objekter til gruppe"
-		     longdescription="Dediker objekter til gruppe i &apos;Rediger&apos;&gt; &apos;Generelt&apos; fanen."
-		     name="object deed" />
-		<action description="Manipulér (flyt, kopiér, ændre) gruppe-ejede objekter"
-		     longdescription="Manipulér (flyt, kopiér, ændre) gruppe-ejede objekter i &apos;Rediger&apos;&gt; &apos;Generelt&apos; fanen."
-		     name="object manipulate" />
-		<action description="Sæt gruppe-ejede objekter til salg"
-		     longdescription="Sæt gruppe-ejede objekter til salg i &apos;Rediger&apos;&gt; &apos;Generelt&apos; fanen."
-		     name="object set sale" />
+	<action_set description="Disse rettigheder inkluderer mulighed til at dedikere, ændre og sælge gruppe-ejede objekter. Disse ændringer sker i &apos;Rediger&apos;&gt; &apos;Generelt&apos; fanen." name="Object Management">
+		<action description="Dediker objekter til gruppe" longdescription="Dediker objekter til gruppe i &apos;Rediger&apos;&gt; &apos;Generelt&apos; fanen." name="object deed"/>
+		<action description="Manipulér (flyt, kopiér, ændre) gruppe-ejede objekter" longdescription="Manipulér (flyt, kopiér, ændre) gruppe-ejede objekter i &apos;Rediger&apos;&gt; &apos;Generelt&apos; fanen." name="object manipulate"/>
+		<action description="Sæt gruppe-ejede objekter til salg" longdescription="Sæt gruppe-ejede objekter til salg i &apos;Rediger&apos;&gt; &apos;Generelt&apos; fanen." name="object set sale"/>
 	</action_set>
-	<action_set
-	     description="Disse rettigheder inkluderer mulighed til at håndtere betalinger for gruppen og styre adgang til gruppens kontobevægelser."
-	     name="Accounting">
-		<action description="Betale gruppe regninger og modtage gruppe udbytte"
-		     longdescription="Medlemmer med denne rolle vil automatisk betale gruppe regninger og modtage gruppe udbytte. Det betyder at de vil modtager en andel af indtægter fra salg af gruppe-ejet land og bidrage til betaling af gruppe-relaterede betalinger, som f.eks. betaling for at paceller vises i lister. "
-		     name="accounting accountable" />
+	<action_set description="Disse rettigheder inkluderer mulighed til at håndtere betalinger for gruppen og styre adgang til gruppens kontobevægelser." name="Accounting">
+		<action description="Betale gruppe regninger og modtage gruppe udbytte" longdescription="Medlemmer med denne rolle vil automatisk betale gruppe regninger og modtage gruppe udbytte. Det betyder at de vil modtager en andel af indtægter fra salg af gruppe-ejet land og bidrage til betaling af gruppe-relaterede betalinger, som f.eks. betaling for at paceller vises i lister. " name="accounting accountable"/>
 	</action_set>
-	<action_set
-	     description="Disse rettigheder inkluderer adgang til at kunne sende, modtage og se gruppe beskeder."
-	     name="Notices">
-		<action description="Send beskeder"
-		     longdescription="Medlemmer med denne rolle kan sende beskeder i &apos;Beskeder&apos; fanen."
-		     name="notices send" />
-		<action description="Modtage og se tidligere beskeder"
-		     longdescription="Medlemmer med denne rolle kan modtage og se tidligere beskeder i &apos;Beskeder&apos; fanen."
-		     name="notices receive" />
+	<action_set description="Disse rettigheder inkluderer adgang til at kunne sende, modtage og se gruppe beskeder." name="Notices">
+		<action description="Send beskeder" longdescription="Medlemmer med denne rolle kan sende beskeder i &apos;Beskeder&apos; fanen." name="notices send"/>
+		<action description="Modtage og se tidligere beskeder" longdescription="Medlemmer med denne rolle kan modtage og se tidligere beskeder i &apos;Beskeder&apos; fanen." name="notices receive"/>
 	</action_set>
-	<action_set
-	     description="Disse rettigheder inkluderer adgang til at kunne oprette forslag, stemme på forslag og se historik med forslag."
-	     name="Proposals">
-		<action description="Opret forslag"
-		     longdescription="Medlemmer med denne rolle kan oprette forslag som der kan stemmes om i &apos;Forslag&apos; fanen."
-		     name="proposal start" />
-		<action description="Stem på forslag"
-		     longdescription="Medlemmer med denne rolle kan stemme på forslag i &apos;Forslag&apos; fanen."
-		     name="proposal vote" />
+	<action_set description="Disse rettigheder inkluderer adgang til at kunne oprette forslag, stemme på forslag og se historik med forslag." name="Proposals">
+		<action description="Opret forslag" longdescription="Medlemmer med denne rolle kan oprette forslag som der kan stemmes om i &apos;Forslag&apos; fanen." name="proposal start"/>
+		<action description="Stem på forslag" longdescription="Medlemmer med denne rolle kan stemme på forslag i &apos;Forslag&apos; fanen." name="proposal vote"/>
 	</action_set>
-	<action_set
-	     description="Disse rettigheder styrer hvem der kan deltage i gruppe-chat og gruppe stemme-chat."
-	     name="Chat">
-		<action description="Deltage i gruppe-chat"
-		     longdescription="Medlemmer med denne rolle kan deltage i gruppe-chat sessioner"
-		     name="join group chat" />
-		<action description="Deltag i gruppe stemme-chat"
-		     longdescription="Medlemmer med denne rolle kan deltage i gruppe stemme-chat sessioner.  BEMÆRK: Medlemmet skal også have rollen &apos;Deltage i gruppe-chat&apos; for at denne rolle har effekt."
-		     name="join voice chat" />
-		<action description="Styr gruppe-chat"
-		     longdescription="Medlemmer med denne rolle kan kontrollere adgang og deltagelse i gruppe-chat og gruppe stemme-chat sessioner."
-		     name="moderate group chat" />
+	<action_set description="Disse rettigheder styrer hvem der kan deltage i gruppe-chat og gruppe stemme-chat." name="Chat">
+		<action description="Deltage i gruppe-chat" longdescription="Medlemmer med denne rolle kan deltage i gruppe-chat sessioner" name="join group chat"/>
+		<action description="Deltag i gruppe stemme-chat" longdescription="Medlemmer med denne rolle kan deltage i gruppe stemme-chat sessioner.  BEMÆRK: Medlemmet skal også have rollen &apos;Deltage i gruppe-chat&apos; for at denne rolle har effekt." name="join voice chat"/>
+		<action description="Styr gruppe-chat" longdescription="Medlemmer med denne rolle kan kontrollere adgang og deltagelse i gruppe-chat og gruppe stemme-chat sessioner." name="moderate group chat"/>
 	</action_set>
 </role_actions>
diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
new file mode 100644
index 0000000000..27708f5c7a
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Sæt" name="appearance panel">
+	<string name="No Outfit" value="Intet sæt"/>
+	<filter_editor label="Filtrér sæt" name="Filter"/>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="Vis flere muligheder"/>
+		<button name="newlook_btn" tool_tip="Tilføj nyt sæt"/>
+		<dnd_button name="trash_btn" tool_tip="Fjern valgte del"/>
+		<button label="Bær" name="wear_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml
new file mode 100644
index 0000000000..ae029f5939
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Ting" name="objects panel">
+	<panel label="" name="sidepanel__inventory_panel">
+		<panel name="button_panel">
+			<button label="Profil" name="info_btn"/>
+			<button label="Bær" name="wear_btn"/>
+			<button label="Afspil" name="play_btn"/>
+			<button label="Teleportér" name="teleport_btn"/>
+		</panel>
+	</panel>
+</panel>
-- 
cgit v1.2.3


From bb2b2129130ab174bd6de4d8eb498279afa67f33 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Thu, 4 Feb 2010 19:21:38 -0800
Subject: Logged out notification change at Ts request - added some calmer
 language

---
 .../newview/skins/default/xui/en/notifications.xml | 31 +++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 636db2b59b..22716f4220 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -609,7 +609,7 @@ To place the media on only one face, choose Select Face and click on the desired
       notext="Cancel"
       yestext="OK"/>
   </notification>
-  
+
   <notification
    icon="alertmodal.tga"
    name="MustBeInParcel"
@@ -780,7 +780,7 @@ Save changes to classified [NAME]?
      notext="Don&apos;t Save"
      yestext="Save"/>
   </notification>
-  
+
   <notification
    icon="alertmodal.tga"
    name="ClassifiedInsufficientFunds"
@@ -831,7 +831,7 @@ Please select a proposal to view.
 Please select a history item to view.
   </notification>
 
-<!--   
+<!--
   <notification
    icon="alertmodal.tga"
    name="ResetShowNextTimeDialogs"
@@ -1029,10 +1029,10 @@ Unable to write file [[FILE]]
    icon="alertmodal.tga"
    name="UnsupportedHardware"
    type="alertmodal">
-Warning: Your system does not meet [APP_NAME]&apos;s minimum system requirements. If you continue using [APP_NAME], you may experience poor performance. Unfortunately, the [SUPPORT_SITE] cannot provide technical support for unsupported system configurations.
+Just so you know, your computer does not meet [APP_NAME]&apos;s minimum system requirements. You may experience poor performance. Unfortunately, the [SUPPORT_SITE] can't provide technical support for unsupported system configurations.
 
 MINSPECS
-Do you wish to visit [_URL] for more information?
+Visit [_URL] for more information?
     <url option="0" name="url">
 
 			http://www.secondlife.com/corporate/sysreqs.php
@@ -1048,8 +1048,8 @@ Do you wish to visit [_URL] for more information?
    icon="alertmodal.tga"
    name="UnknownGPU"
    type="alertmodal">
-Your system contains a graphics card that is unknown to [APP_NAME] at this time.
-This is often the case with new hardware that hasn&apos;t been tested yet with [APP_NAME].  [APP_NAME] will most likely run properly, but you may need to adjust your graphics settings to something more appropriate.
+Your system contains a graphics card that [APP_NAME] doesn't recognize.
+This is often the case with new hardware that hasn&apos;t been tested yet with [APP_NAME].  It will probably be ok, but you may need to adjust your graphics settings.
 (Me &gt; Preferences &gt; Graphics).
     <form name="form">
       <ignore name="ignore"
@@ -1980,9 +1980,8 @@ This is usually a temporary failure. Please customize and save the wearable agai
    icon="alertmodal.tga"
    name="YouHaveBeenLoggedOut"
    type="alertmodal">
-You have been logged out of [SECOND_LIFE]:
+Darn. You have been logged out of [SECOND_LIFE]
             [MESSAGE]
-You can still look at existing IM and chat by clicking &apos;View IM &amp; Chat&apos;. Otherwise, click &apos;Quit&apos; to exit [APP_NAME] immediately.
     <usetemplate
      name="okcancelbuttons"
      notext="Quit"
@@ -4643,7 +4642,7 @@ Please select at least one type of content to search (General, Moderate, or Adul
    type="notify">
 [MESSAGE]
   </notification>
-  
+
   <notification
    icon="notify.tga"
    name="EventNotification"
@@ -5173,7 +5172,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th
        text="Decline"/>
     </form>
   </notification>
-  
+
   <notification
    icon="notify.tga"
    name="FriendshipOffered"
@@ -5423,8 +5422,8 @@ Your L$ balance will be updated when processing completes. If processing takes m
 
 The status of your payment can be checked on your Transaction History page on your [http://secondlife.com/account/ Dashboard]
   </notification>
-  
-<!-- 
+
+<!--
   <notification
    icon="notify.tga"
    name="FirstSit"
@@ -5451,7 +5450,7 @@ You have opened the Build Tools. Every object you see around you was created usi
   </notification>
 -->
 
-<!--  
+<!--
   <notification
    icon="notify.tga"
    name="FirstLeftClickNoHit"
@@ -5537,7 +5536,7 @@ To toggle this menu,
    type="notify">
 You are editing a Sculpted prim. Sculpties require a special texture to define their shape.
   </notification>
--->  
+-->
 
   <!--
   <notification
@@ -5826,7 +5825,7 @@ A SLurl was received from an untrusted browser and has been blocked for your sec
    priority="high"
    type="notifytip">
 Multiple SLurls were received from an untrusted browser within a short period.
-They will be blocked for a few seconds for your security. 
+They will be blocked for a few seconds for your security.
   </notification>
 
   <notification name="IMToast" type="notifytoast">
-- 
cgit v1.2.3


From 92ac9932878b4cd0b0369746482c6e1f47d76994 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 4 Feb 2010 22:19:15 -0800
Subject: Fix placement of icon next to linked agent/group names. Suppresses
 rendering of text in LLNormalTextSegment that represent an icon, properly
 computes vertical spacing based on font height, and adds padding to the right
 of the icon. (transplanted from 33be702e47c359ccaeb47f251e10753fd173cc09)

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
index 0f5c5f2be0..209285da2e 100644
--- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
@@ -116,10 +116,10 @@
   follows="left|top"
   font="SansSerif"
   height="20"
-  left="0"
+  left="10"
   max_length="65536"
   name="slurl"
-  top_pad="4"
+  top_pad="20"
   width="150">
     secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect
   </text>
@@ -127,12 +127,11 @@
   follows="left|top"
   font="SansSerif"
   height="20"
-  left="0"
+  left="10"
   max_length="65536"
   name="slurl_group"
-  top_pad="4"
+  top_pad="20"
   width="150">
     secondlife:///app/group/00000000-0000-0000-0000-000000000000/inspect
   </text>
-
 </floater>
-- 
cgit v1.2.3


From bc5ad04d6164d186cf504212ea559405b8608811 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Fri, 5 Feb 2010 09:41:54 +0200
Subject: applying patch for EXT-2357

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_im_container.xml  | 7 ++++++-
 indra/newview/skins/default/xui/en/widgets/tab_container.xml | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index bd25288a9e..0d1a4a831d 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -19,8 +19,13 @@
      left="1"
      name="im_box_tab_container"
      tab_position="bottom"
-     tab_width="80"
+     tab_width="64"
+     tab_max_width = "134"
+     tab_icon_ctrl_width = "16"
+     tab_icon_ctrl_height = "16"
      tab_height="16"
+     use_custom_icon_ctrl="true"
+     tab_icon_ctrl_pad="2"
      top="0"
      width="390" />
     <icon
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index 597c4e83b6..4a163fc1e3 100644
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -5,6 +5,7 @@ label_pad_left - padding to the left of tab button labels
 -->
 <tab_container tab_min_width="60"
                tab_max_width="150"
+               use_custom_icon_ctrl="false"
                halign="center"
                font="SansSerifSmall" 
                tab_height="21"
-- 
cgit v1.2.3


From 553cf40d136e70f4819cb2b72d0483287db81b17 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 5 Feb 2010 12:25:18 +0200
Subject: Updated low bug EXT-4951 - Redundant edit box context menu in list
 items in Panel Picks/Classifieds. Reverted changeset 8956:930bef051fee. Added
 new parameter to control context menu visibility.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_pick_list_item.xml        | 2 +-
 indra/newview/skins/default/xui/en/widgets/text_editor.xml         | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index 0c1418fc2d..9518151b72 100644
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -64,7 +64,7 @@
      layout="topleft"
      left="103"
      name="description"
-     textbox.mouse_opaque="false" 
+     textbox.show_context_menu="false" 
      top_pad="0"
      width="178"
      word_wrap="true" />
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index e62c1278f9..9bcce1685e 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -64,7 +64,7 @@
      layout="topleft"
      left="103"
      name="picture_descr"
-     textbox.mouse_opaque="false" 
+     textbox.show_context_menu="false" 
      top_pad="0"
      width="178"
      word_wrap="true" />
diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
index 23ca8ea338..2ced8b1b4b 100644
--- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- Core parameters are in simple_text_editor.xml -->
 <text_editor
-  allow_html="false"/>
+  allow_html="false"
+  show_context_menu="true"/>
-- 
cgit v1.2.3


From b79b8f87a37888decd3f82e9e255cce641a3955f Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Fri, 5 Feb 2010 13:03:26 +0200
Subject: finished with EXT-2753 - Implement Avatar icons on IM multifloater
 tabs add floater flashing, fix group icon sizes, fix click,some code cleanup,
 ect. also I remove mIconCtrlWidth/Height since its kinda useless -
 mIconCtrlPad do the same thing... IconSize will be btn_height-2*mIconCtrlPad
 - simple and good enough.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 0d1a4a831d..978b40da77 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -21,8 +21,6 @@
      tab_position="bottom"
      tab_width="64"
      tab_max_width = "134"
-     tab_icon_ctrl_width = "16"
-     tab_icon_ctrl_height = "16"
      tab_height="16"
      use_custom_icon_ctrl="true"
      tab_icon_ctrl_pad="2"
-- 
cgit v1.2.3


From 91543fd6caf0478e543f7cdab9b5a9b6b93d332f Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Fri, 5 Feb 2010 14:41:05 +0200
Subject: =?UTF-8?q?fixed=20EXT-4908=20=E2=80=9CReport=20Abuse:=20Popup=20p?=
 =?UTF-8?q?revents=20interaction=20with=20Media=20Browser=E2=80=9D,=20made?=
 =?UTF-8?q?=20HelpReportAbuseEmailLL=20alert=20non-modal;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d16474873f..285f4989c2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3852,7 +3852,7 @@ Are you sure you want to quit?
   <notification
    icon="alertmodal.tga"
    name="HelpReportAbuseEmailLL"
-   type="alertmodal">
+   type="alert">
 Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards].
 
 All reported abuses are investigated and resolved.
-- 
cgit v1.2.3


From 5138d54b8977ecba24f0c7e142ef1c465ae2756c Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Fri, 5 Feb 2010 16:15:07 +0200
Subject: fixed bug	 EXT-4757  URL-name of object is shown as clickable
 HTTP URL in toasts Cause: ServerObjectMessage notification uses hardcoded
 message from simulator. There is no possible to escape object name
 separately. Solution: Whole server message has been escaped using <nolink>
 tag.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 7e4a95c623..02550a2bed 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4763,7 +4763,7 @@ The objects on the selected parcel that are NOT owned by you have been returned
    name="ServerObjectMessage"
    type="notify">
 Message from [NAME]:
-[MSG]
+&lt;nolink&gt;[MSG]&lt;/nolink&gt;
   </notification>
 
   <notification
-- 
cgit v1.2.3


From fd06fb8be5d1b38c875b28412b9c9a8f033855fb Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Fri, 5 Feb 2010 16:53:39 +0200
Subject: fixed  bug  EXT-4135 Region agent limit should be an integer

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_region_general.xml | 1 +
 1 file changed, 1 insertion(+)

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

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 26568c2a28..c06e67a4bb 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -134,6 +134,7 @@
      top="200"
      width="80" />
     <spinner
+     decimal_digits="0"
      follows="left|top"
      height="20"
      increment="1"
-- 
cgit v1.2.3


From 173cb4331499f540890466f416c5773172e581e2 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Fri, 5 Feb 2010 17:34:34 +0200
Subject: fix typo

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d16474873f..ef5b058bfd 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -407,7 +407,7 @@ Do you wish to proceed?
    icon="alertmodal.tga"
    name="JoinGroupNoCost"
    type="alertmodal">
-You are Joining group [NAME].
+You are joining group [NAME].
 Do you wish to proceed?
     <usetemplate
      name="okcancelbuttons"
-- 
cgit v1.2.3


From 87cf2ff1bafa0f0f59778c51bc4b5f63d848087a Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Fri, 5 Feb 2010 17:46:54 +0200
Subject: fix for major EXT-4833  [NUX] Verify the default size/positon of
 certain floaters. exept floater_world_map

--HG--
branch : product-engine
---
 .../skins/default/xui/en/floater_help_browser.xml      | 14 +++++++-------
 indra/newview/skins/default/xui/en/floater_map.xml     |  6 +++---
 indra/newview/skins/default/xui/en/floater_search.xml  | 18 +++++++++---------
 3 files changed, 19 insertions(+), 19 deletions(-)

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

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 be32e917e5..214fb6ce54 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="480"
+ height="600"
  layout="topleft"
  min_height="150"
  min_width="500"
@@ -11,7 +11,7 @@
  save_rect="true"
  single_instance="true"
  title="HELP BROWSER"
- width="620">
+ width="650">
     <floater.string
      name="loading_text">
         Loading...
@@ -20,20 +20,20 @@
      name="done_text">
     </floater.string>
     <layout_stack
-     bottom="480"
+     bottom="600"
      follows="left|right|top|bottom"
      layout="topleft"
      left="5"
      name="stack1"
      top="20"
-     width="610">
+     width="640">
         <layout_panel
          layout="topleft"
          left_delta="0"
          top_delta="0"
          name="external_controls"
          user_resize="false"
-         width="590">
+         width="620">
             <web_browser
              bottom="-11"
              follows="left|right|top|bottom"
@@ -41,8 +41,8 @@
              left="0"
              name="browser"
              top="0"
-             height="500"
-             width="590" />
+             height="610"
+             width="620" />
             <text
              follows="bottom|left"
              height="16"
diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index 1903e7c714..5d35275e17 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -3,12 +3,10 @@
  legacy_header_height="18"
  can_minimize="true" 
  can_resize="true"
- center_horiz="true"
- center_vert="true"
  follows="top|right"
  height="218"
  layout="topleft"
- min_height="60"
+ min_height="174"
  min_width="174"
  name="Map"
  title="Mini Map"
@@ -16,6 +14,8 @@
  save_rect="true"
  save_visibility="true"
  single_instance="true"
+ left="0"
+ top="0"
  width="200">
     <floater.string
      name="mini_map_north">
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index 775e7d66f7..9ca18d455b 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -2,16 +2,16 @@
 <floater
  legacy_header_height="13"
  can_resize="true"
- height="546"
+ height="600"
  layout="topleft"
- min_height="546"
- min_width="670"
+ min_height="400"
+ min_width="450"
  name="floater_search"
  help_topic="floater_search"
  save_rect="true"
  single_instance="true"
  title="FIND"
- width="670">
+ width="650">
     <floater.string
      name="loading_text">
         Loading...
@@ -21,20 +21,20 @@
         Done
     </floater.string>
     <layout_stack
-     bottom="541"
+     bottom="595"
      follows="left|right|top|bottom"
      layout="topleft"
      left="10"
      name="stack1"
      top="20"
-     width="650">
+     width="630">
         <layout_panel
          layout="topleft"
          left_delta="0"
          top_delta="0"
          name="browser_layout"
          user_resize="false"
-         width="650">
+         width="630">
             <web_browser
              bottom="-10"
              follows="left|right|top|bottom"
@@ -42,8 +42,8 @@
              left="0"
              name="browser"
              top="0"
-             height="500"
-             width="650" />
+             height="555"
+             width="630" />
             <text
              follows="bottom|left"
              height="16"
-- 
cgit v1.2.3


From ac8753a7eaab05b47d7da6e5ae8ef5f3aa324273 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Fri, 5 Feb 2010 17:48:49 +0200
Subject: fix for major EXT-4833  [NUX] Verify the default size/positon of
 certain floaters. I don't really like floater_world_map changes. as for me
 now it looks much worse...

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_world_map.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

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 e1df50bf58..34d4b19410 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="535"
+ height="600"
  layout="topleft"
  min_height="520"
  min_width="520"
@@ -14,16 +14,16 @@
  save_visibility="true"
  single_instance="true"
  title="WORLD MAP"
- width="800">
+ width="650">
     <panel
      filename="panel_world_map.xml"
      follows="all"
-     height="500"
+     height="555"
      layout="topleft"
      left="10"
      name="objects_mapview"
      top="25"
-     width="542" />
+     width="375" />
      <panel
      name="layout_panel_1"
      height="22"
@@ -394,7 +394,7 @@
 
     <panel
      follows="right|top|bottom"
-	 height="270"
+	 height="310"
 	 top_pad="0"
 	 width="238">
 	 <icon
@@ -514,7 +514,7 @@
      draw_stripes="false"
      bg_writeable_color="MouseGray"
      follows="all"
-     height="115"
+     height="145"
      layout="topleft"
      left="28"
      name="search_results"
-- 
cgit v1.2.3


From 38376de2b4ba70ae8f88aad81832a0385b743fea Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Fri, 5 Feb 2010 18:25:05 +0200
Subject: implemented task EXT-1312   Navbar icons aren't vertically centered
 on buttons Overlay images have been moved up using new attribute implemented
 in EXT-3232

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_navigation_bar.xml | 2 ++
 1 file changed, 2 insertions(+)

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

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 b2ed51abf3..d484564e0d 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -44,6 +44,7 @@
 	     direction="down"
 	     height="23"
 	     image_overlay="Arrow_Left_Off"
+	     image_bottom_pad="1"
 	     layout="topleft"
 	     left="10"
 	     name="back_btn"
@@ -55,6 +56,7 @@
 	     direction="down"
 	     height="23"
 	     image_overlay="Arrow_Right_Off"
+	     image_bottom_pad="1"
 	     layout="topleft"
 	     left_pad="0"
 	     name="forward_btn"
-- 
cgit v1.2.3


From a46a029a70ead8e09810741abaf35c53adbd2763 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 5 Feb 2010 19:06:57 +0200
Subject: Fixed normal bug EXT-4397 (Call isn't ended after disabling voice).

- Added customizing string with notification about ending call depending on voice availability.

- Added closing of open VCP if voice is disabled.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_outgoing_call.xml | 4 ++--
 indra/newview/skins/default/xui/en/strings.xml               | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
index eb772cc0bd..cc9afe4474 100644
--- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
@@ -89,7 +89,7 @@ No Answer.  Please try again later.
    top="27"
    width="315"
    word_wrap="true">
-    You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnected to Nearby Voice Chat.
+    You have been disconnected from [VOICE_CHANNEL_NAME].  [RECONNECT_NEARBY]
   </text>
   <text
    font="SansSerifLarge"
@@ -100,7 +100,7 @@ No Answer.  Please try again later.
    top="27"
    width="315"
    word_wrap="true">
-    [VOICE_CHANNEL_NAME] has ended the call.  You will now be reconnected to Nearby Voice Chat.
+    [VOICE_CHANNEL_NAME] has ended the call.  [RECONNECT_NEARBY]
   </text>
   <text
      font="SansSerif"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d6db451286..a5dc14c69d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -251,6 +251,7 @@
 	<string name="connected">Connected</string>
 	<string name="unavailable">Voice not available at your current location</string>
 	<string name="hang_up">Disconnected from in-world Voice Chat</string>
+  <string name="reconnect_nearby">You will now be reconnected to Nearby Voice Chat</string>
 	<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
 	<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
 	<string name="ScriptTakeMoney">Take Linden dollars (L$) from you</string>
-- 
cgit v1.2.3


From 95147c4529f6effcd1ed0a1d427f8ddeb033670d Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Fri, 5 Feb 2010 19:15:12 +0200
Subject: Implemented critical task (EXT-4703) Add maturity icons to the Viewer
 2 toolbar. - Added maturity icons to location bar. - Added getting font used
 in LLLineEditor.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/widgets/location_input.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

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

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 626135642b..1d61447e31 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -4,6 +4,8 @@
        Currently that doesn't work because LLUIImage::getWidth/getHeight() return 1 for the images.
 -->
 <location_input font="SansSerifSmall"
+                icon_maturity_general="Parcel_PG_Light"
+                icon_maturity_adult="Parcel_R_Light"
                 add_landmark_image_enabled="Favorite_Star_Active"
                 add_landmark_image_disabled="Favorite_Star_Off"
                 add_landmark_image_hover="Favorite_Star_Over"
@@ -41,6 +43,13 @@
                           scale_image="false"
 			  top="19"
 			  left="-3" />
+  <maturity_icon
+    name="maturity_icon"
+    width="18"
+    height="16"
+    top="20"
+    follows="left|top"
+    />
   <for_sale_button
     name="for_sale_btn"
     image_unselected="Parcel_ForSale_Light"
-- 
cgit v1.2.3


From ddfc6efbeeda5d2b08888a7ae0f04df242326e26 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Fri, 5 Feb 2010 11:32:33 -0800
Subject: EXT-5025 - Tooltips block mouse clicks EXT-4547	[BSI] it is
 possible to highlight multiple layers of chat EXT-3844 	Mouse wheel
 camera zoom is not reflected on View popup slider EXT-3103 	Add an option
 to restrict entering non-ascii symbols in text editor.

reviewed by Leyla
---
 indra/newview/skins/default/xui/en/floater_camera.xml     |  2 ++
 .../skins/default/xui/en/floater_test_text_editor.xml     | 13 +++++++++++++
 indra/newview/skins/default/xui/en/panel_chat_header.xml  |  2 +-
 indra/newview/skins/default/xui/en/widgets/inspector.xml  | 15 +++++++--------
 indra/newview/skins/default/xui/en/widgets/tool_tip.xml   |  5 ++---
 5 files changed, 25 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index a797d54749..2bd8420925 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -82,6 +82,8 @@
               orientation="vertical"
               tool_tip="Zoom camera toward focus"
               top_pad="0"
+              min_val="0"
+              max_val="1" 
               width="18">
              <commit_callback function="Slider.value_changed"/>
            </slider_bar>
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
index dc8f00d5f3..b730f0e511 100644
--- a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
@@ -28,4 +28,17 @@
    width="200">
     This contains long text and should scroll horizontally to the right
   </text_editor>
+  <text_editor
+   height="50"
+   follows="top|left|bottom"
+   font="SansSerif"
+   left="10"
+   name="numeric_text_editor"
+   tool_tip="text editor for numeric text entry only"
+   top_pad="10"
+   text_type="int"
+   width="200">
+    This is text that is NOT a number, so shouldn't appear
+  </text_editor>
+
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 89d632c4c6..51e2256a7d 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -19,7 +19,7 @@
          name="avatar_icon"
          top="3"
          width="18" />
-    <text_editor
+    <text
       allow_scroll="false"
       v_pad = "7"
       read_only = "true"
diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml
index 8ec206023e..23f32253b6 100644
--- a/indra/newview/skins/default/xui/en/widgets/inspector.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- See also settings.xml UIFloater* settings for configuration -->
 <inspector name="inspector"
-          bg_opaque_color="DkGray_66"
-          background_visible="true"
-          bg_opaque_image="none"
-          background_opaque="true"
-          bg_alpha_image="none"
-		  text_color="InspectorTipTextColor"
- />
+           bg_opaque_color="DkGray_66"
+           background_visible="true"
+           bg_opaque_image="none"
+           background_opaque="true"
+           bg_alpha_image="none"
+           mouse_opaque="true" 
+           text_color="InspectorTipTextColor"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
index a19201f7c3..9ca15ae50d 100644
--- a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- See also settings.xml UIFloater* settings for configuration -->
 <tool_tip name="tooltip"
           max_width="200"
           padding="4"
           wrap="true"
           font="SansSerif"
+          mouse_opaque="false" 
           bg_opaque_image="Tooltip"
           background_opaque="true"
           background_visible="true"
-		  text_color="ToolTipTextColor"
- />
+		      text_color="ToolTipTextColor"/>
-- 
cgit v1.2.3


From dcf82b742a90b9004d7cd0a6be6610a6195e693e Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 5 Feb 2010 13:16:56 -0800
Subject: DEV-43688 cycle3 for JA fixing 3 strings

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

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

diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index ffdcf838d3..357b3682ba 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
@@ -46,7 +46,7 @@
 		L$ [AMT]
 	</text>
 	<text name="currency_links">
-		[http://www.secondlife.com/my/account/payment_method_management.php?lang=ja-JP payment method] | [http://www.secondlife.com/my/account/currency.php?lang=ja-JP currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=ja-JP exchange rate]
+		[http://www.secondlife.com/my/account/payment_method_management.php?lang=ja-JP 支払方法] | [http://www.secondlife.com/my/account/currency.php?lang=ja-JP 通貨] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=ja-JP 換算レート]
 	</text>
 	<text name="exchange_rate_note">
 		金額を再入力して最新換算レートを確認します。
-- 
cgit v1.2.3


From dcde802a2d6602dde93451a608a8eac66972fad2 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Fri, 5 Feb 2010 18:09:55 -0500
Subject: Cleaned up "My Profile" side-panels.
 https://jira.secondlife.com/browse/EXT-4335

---
 .../skins/default/xui/en/panel_classified_info.xml | 44 ++++++++---------
 .../default/xui/en/panel_classifieds_list_item.xml |  2 +-
 .../skins/default/xui/en/panel_edit_classified.xml | 56 +++++++++++-----------
 .../skins/default/xui/en/panel_edit_pick.xml       | 47 +++++++++---------
 .../skins/default/xui/en/panel_pick_info.xml       | 34 +++++++------
 .../skins/default/xui/en/panel_pick_list_item.xml  |  2 +-
 indra/newview/skins/default/xui/en/panel_picks.xml | 40 +++++++++-------
 7 files changed, 113 insertions(+), 112 deletions(-)

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

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 31719aad20..34c1923582 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -29,7 +29,7 @@
      layout="topleft"
      name="back_btn"
      picture_style="true"
-     left="10"
+     left="11"
      tab_stop="false"
      top="2"
      width="23" />
@@ -40,7 +40,7 @@
      layout="topleft"
      left_pad="10"
      name="title"
-     text_color="white"
+     text_color="LtGray"
      top="0"
      value="Classified Info"
      use_ellipses="true"
@@ -49,13 +49,13 @@
      color="DkGray2"
      opaque="true"
      follows="all"
-     height="500"
+     height="502"
      layout="topleft"
-     left="10"
+     left="9"
      top_pad="10"
      name="profile_scroll"
      reserve_scroll_corner="false"
-     width="313">
+     width="310">
     <panel
      name="scroll_content_panel"
      follows="left|top"
@@ -65,16 +65,16 @@
      background_visible="false"
      height="500"
      left="0"
-     width="295">
+     width="285">
         <texture_picker
          enabled="false"
-         follows="left|top"
+         follows="left|top|right"
          height="197"
          layout="topleft"
-         left="10"
+         left="11"
          name="classified_snapshot"
-         top="20"
-         width="290" />
+         top="10"
+         width="286" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -181,37 +181,35 @@
     </scroll_container>
     <panel
      follows="left|right|bottom"
-     height="20"
+     height="35"
      layout="topleft"
-     top_pad="8"
-     left="10"
+     top_pad="5"
+     left="9"
      name="buttons">
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Teleport"
          layout="topleft"
          left="0"
          name="teleport_btn"
          top="0"
-         width="90" />
+         width="101" />
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Map"
          layout="topleft"
-         left_pad="10"
+         left_pad="3"
          name="show_on_map_btn"
-         top="0"
-         width="90" />
+         width="100" />
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Edit"
          layout="topleft"
-         right="-1"
          name="edit_btn"
-         top="0"
-         width="90" />
+         left_pad="3"
+         width="101" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index 0c1418fc2d..12ecde1e1e 100644
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -76,6 +76,6 @@
      left_pad="5"
      right="-8"
      name="info_chevron"
-     top_delta="15"
+     top_delta="24"
      width="20" />
 </panel>
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 188ded3dab..a357ba1d97 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -23,7 +23,7 @@
      layout="topleft"
      name="back_btn"
      picture_style="true"
-     left="10"
+     left="11"
      tab_stop="false"
      top="2"
      width="23" />
@@ -31,27 +31,27 @@
      type="string"
      length="1"
      follows="top"
-     font="SansSerifHuge"
-     height="15"
+     font="SansSerifHugeBold"
+     height="26"
      layout="topleft"
      left_pad="10"
      name="title"
-     text_color="white"
-     top="5"
+     text_color="LtGray"
+     top="0"
      width="250">
         Edit Classified
     </text>
    <scroll_container
      color="DkGray2"
      follows="all"
-     height="510"
+     height="502"
      layout="topleft"
-     left="10"
+     left="9"
      top_pad="10"
      name="profile_scroll"
      reserve_scroll_corner="false"
      opaque="true"
-     width="313">
+     width="310">
     <panel
      name="scroll_content_panel"
      follows="left|top"
@@ -65,10 +65,10 @@
     <texture_picker
      follows="left|top|right"
      height="197"
-     width="290"
+     width="286"
      layout="topleft"
-     top="20"
-     left="10"
+     top="10"
+     left="11"
      name="classified_snapshot" />
           <icon
            height="18"
@@ -78,7 +78,7 @@
            name="edit_icon"
            label=""
            tool_tip="Click to select an image"
-           top="27"
+           top="17"
            width="18" />
         <text
          type="string"
@@ -165,29 +165,29 @@
         </text>
         <button
          follows="left|top"
-         height="20"
+         height="23"
          label="Set to Current Location"
          layout="topleft"
-         left="8"
+         left="10"
          top_pad="5"
          name="set_to_curr_location_btn"
-         width="200" />
+         width="156" />
         <combo_box
          follows="left|top" 
-         height="18" 
+         height="23" 
          label=""
 	     left="10" 
          name="category" 
          top_pad="5"
-         width="200" />
+         width="156" />
         <combo_box 
          allow_text_entry="false" 
          follows="left|top" 
-         height="18" 
+         height="23" 
          left="10"
          name="content_type" 
          top_pad="5"
-         width="200">
+         width="156">
          <combo_item 
           name="mature_ci" 
           value="Mature">
@@ -203,10 +203,11 @@
          decimal_digits="0"
          follows="left|top"
          halign="left"
-         height="16"
+         height="23"
          increment="1"
          label_width="20"
          label="L$"
+         v_pad="10"
          layout="topleft"
          left="10"
          value="50"
@@ -228,30 +229,29 @@
     </scroll_container>
     <panel
      follows="left|right|bottom"
-     height="20"
+     height="23"
      label="bottom_panel"
      layout="topleft"
-     left="10"
+     left="9"
      name="bottom_panel"
      top_pad="5"
      width="303">
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Save"
          layout="topleft"
          name="save_changes_btn"
          left="0"
          top="0"
-         width="130" />
+         width="152" />
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Cancel"
          layout="topleft"
          name="cancel_btn"
-         left_pad="5"
-         right="-1"
-         width="130" />
+         left_pad="3"
+         width="152" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 8e39697a16..6ef762dc1d 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -18,7 +18,7 @@
      image_overlay="BackArrow_Off"
      layout="topleft"
      name="back_btn"
-     left="10"
+     left="11"
      tab_stop="false"
      top="2"
      width="23" />
@@ -26,26 +26,26 @@
      type="string"
      length="1"
      follows="top"
-     font="SansSerifHuge"
-     height="15"
+     font="SansSerifHugeBold"
+     height="26"
      layout="topleft"
      left_pad="10"
      name="title"
-     text_color="white"
-     top="5"
+     text_color="LtGray"
+     top="0"
      width="250">
         Edit Pick
     </text>
    <scroll_container
      color="DkGray2"
      follows="all"
-     height="500"
+     height="502"
      layout="topleft"
-     left="10"
+     left="9"
      top_pad="10"
      name="profile_scroll"
      opaque="true"
-     width="313">
+     width="310">
     <panel
      name="scroll_content_panel"
      follows="left|top|right"
@@ -59,11 +59,11 @@
     <texture_picker
      follows="left|top|right"
      height="197"
-     width="280"
+     width="272"
      layout="topleft"
      no_commit_on_selection="true"
-     top="20"
-     left="10"
+     top="10"
+     left="11"
      name="pick_snapshot" />
           <icon
            height="18"
@@ -73,7 +73,7 @@
            name="edit_icon"
            label=""
            tool_tip="Click to select an image"
-           top="27"
+           top="17"
            width="18" />
         <text
          type="string"
@@ -100,7 +100,7 @@
          max_length="63"
          name="pick_name"
          text_color="black"
-         width="280" />
+         width="273" />
         <text
          type="string"
          length="1"
@@ -119,7 +119,7 @@
         <text_editor
          follows="left|top|right"
          height="100"
-         width="280"
+         width="273"
          hide_scrollbar="false"
          layout="topleft"
          left="10"
@@ -158,41 +158,40 @@
         </text>
         <button
          follows="left|top"
-         height="20"
+         height="23"
          label="Set to Current Location"
          layout="topleft"
          left="8"
          top_pad="0"
          name="set_to_curr_location_btn"
-         width="200" />
+         width="156" />
     </panel>
     </scroll_container>
     <panel
      follows="left|right|bottom"
-     height="20"
+     height="23"
      label="bottom_panel"
      layout="topleft"
-     left="10"
+     left="9"
      name="bottom_panel"
      top_pad="5"
      width="303">
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Save [WHAT]"
          layout="topleft"
          name="save_changes_btn"
          left="0"
          top="0"
-         width="130" />
+         width="152" />
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Cancel"
          layout="topleft"
          name="cancel_btn"
-         left_pad="5"
-         right="-1"
-         width="130" />
+         left_pad="3"
+        width="152" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 375f369ba7..097813131f 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -16,7 +16,7 @@
      image_overlay="BackArrow_Off"
      layout="topleft"
      name="back_btn"
-     left="10"
+     left="11"
      tab_stop="false"
      top="2"
      width="23" />
@@ -27,7 +27,7 @@
      layout="topleft"
      left_pad="10"
      name="title"
-     text_color="white"
+     text_color="LtGray"
      top="0"
      value="Pick Info"
      use_ellipses="true"
@@ -36,12 +36,12 @@
      color="DkGray2"
      opaque="true"
      follows="all"
-     height="500"
+     height="502"
      layout="topleft"
-     left="10"
-     top_pad="5"
+     left="9"
+     top_pad="10"
      name="profile_scroll"
-     width="313">
+     width="310">
     <panel
      name="scroll_content_panel"
      follows="left|top|right"
@@ -57,10 +57,10 @@
          follows="left|top|right"
          height="197"
          layout="topleft"
-         left="10"
+         left="11"
          name="pick_snapshot"
-         top="20"
-         width="280" />
+         top="10"
+         width="272" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -115,8 +115,8 @@
      follows="left|right|bottom"
      height="35"
      layout="topleft"
-     top_pad="8"
-     left="10"
+     top_pad="5"
+     left="9"
      name="buttons">
         <button
          follows="bottom|left"
@@ -126,24 +126,22 @@
          left="0"
          name="teleport_btn"
          top="0"
-         width="90" />
+         width="101" />
         <button
          follows="bottom|left"
          height="23"
          label="Map"
          layout="topleft"
-         left_pad="10"
+         left_pad="3"
          name="show_on_map_btn"
-         top="0"
-         width="90" />
+         width="100" />
         <button
          follows="bottom|left"
          height="23"
          label="Edit"
          layout="topleft"
-         right="-1"
          name="edit_btn"
-         top="0"
-         width="90" />
+         left_pad="3"
+         width="101" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index e62c1278f9..5a6636c435 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -76,6 +76,6 @@
      left_pad="5"
      right="-8"
      name="info_chevron"
-     top_delta="15"
+     top_delta="24"
      width="20" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index d31f4d039f..887a89d518 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
+bg_opaque_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
  follows="all"
  height="540"
  label="Picks"
@@ -70,13 +73,15 @@
     </accordion_tab>
  </accordion>
    <panel
-         background_visible="true"
+bg_opaque_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
          bevel_style="none"
          enabled="false"
          auto_resize="false"
          follows="bottom"
-         left="0"
-         height="18"
+         left="1"
+         height="27"
          label="bottom_panel"
          layout="topleft"
          name="edit_panel"
@@ -90,9 +95,9 @@
              image_unselected="OptionsMenu_Off"
               image_disabled="OptionsMenu_Disabled"
              layout="topleft"
-             left="0"
+             left="10"
              name="gear_menu_btn"
-             top="5"
+             top="9"
              width="18" />
             <button
              follows="bottom|left"
@@ -104,7 +109,7 @@
              left_pad="15"
              name="new_btn"
              tool_tip="Create a new pick or classified at the current location"
-             top="5"
+             top="9"
              width="18" />
             <button
              follows="bottom|right"
@@ -115,14 +120,17 @@
              layout="topleft"
              name="trash_btn"
              right="-10"
-             top="5"
+             top="9"
              width="18" />
         </panel>
         <panel
+ bg_opaque_color="DkGray"
+       background_visible="true"
+       background_opaque="true"
          layout="topleft"
          left="0"
          height="30"
-         top_pad="10"
+         top_pad="7"
          name="buttons_cucks"
          width="313">
        <button
@@ -131,35 +139,33 @@
          height="23"
          label="Info"
          layout="topleft"
-         left="5"
+         left="2"
          name="info_btn"
          tab_stop="false"
          tool_tip="Show pick information"
-         top="0"
-         width="55" />
+         top="5"
+         width="95" />
         <button
          enabled="false"
          follows="bottom|left"
          height="23"
          label="Teleport"
          layout="topleft"
-         left_pad="5"
+         left_pad="3"
          name="teleport_btn"
          tab_stop="false"
          tool_tip="Teleport to the corresponding area"
-         top="0"
-         width="77" />
+         width="117" />
         <button
          enabled="false"
          follows="bottom|left"
          height="23"
          label="Map"
          layout="topleft"
-         left_pad="5"
+         left_pad="3"
          name="show_on_map_btn"
          tab_stop="false"
          tool_tip="Show the corresponding area on the World Map"
-         top="0"
-         width="50" />
+         width="90" />
         </panel>
 </panel>
-- 
cgit v1.2.3


From c0a8c1635b044ab28690fa3743838185c34b73f4 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 5 Feb 2010 17:41:56 -0800
Subject: test ill-formed xml

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index b9bc45a10b..6853175d0a 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -53,5 +53,5 @@ 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>
+  <chat_history>
 </floater>
-- 
cgit v1.2.3


From 61b34c61eca35c4a8841942e8bed25f82f9d1f63 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 5 Feb 2010 17:47:01 -0800
Subject: Test: reverting to well-formed xml

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index 6853175d0a..b9bc45a10b 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -53,5 +53,5 @@ 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>
+  </chat_history>
 </floater>
-- 
cgit v1.2.3


From dfdd4a5e7ca9f8f95cb8d6739176d2aeb826baca Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Sat, 6 Feb 2010 08:57:03 -0500
Subject: Changed floater title strings to be more consistent.
 http://jira.secondlife.com/browse/EXT-3719

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index e187eabd3a..0d381fe5cb 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -20,11 +20,11 @@
     </floater.string>
     <floater.string
      name="TitleFetching">
-        Inventory (Fetching [ITEM_COUNT] Items...) [FILTER]
+        MY INVENTORY (Fetching [ITEM_COUNT] Items...) [FILTER]
     </floater.string>
     <floater.string
      name="TitleCompleted">
-        Inventory ([ITEM_COUNT] Items) [FILTER]
+        MY INVENTORY ([ITEM_COUNT] Items) [FILTER]
     </floater.string>
     <floater.string
      name="Fetched">
-- 
cgit v1.2.3


From 4e0fe69c15bb6c54004b1add2907b30813fc277d Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Mon, 8 Feb 2010 14:30:02 +0800
Subject: EXT-4668 Hide URL checkbox is missing from the Sound tab of About
 Land

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

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

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 61ca783d14..44c9284b36 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1825,6 +1825,15 @@ Only large parcels can be listed in search.
              top_delta="0"
              right="-15"
              select_on_focus="true" />
+			<check_box
+             height="16"
+             label="Hide URL"
+             layout="topleft"
+             name="hide_music_url"
+			 tool_tip="Checking this option will hide the music url to any non-authorized viewers of this parcel information."
+			 left_delta="10"
+             top_pad="5"
+             width="292" /> 
             <text
              type="string"
              length="1"
-- 
cgit v1.2.3


From d82be9cfefcde21cfd8d29c2989f66d792501e54 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 8 Feb 2010 15:09:50 +0200
Subject: Update for critical bug EXT-4838 ([NUX] Add empty Groups list
 condition text) - changed text of the message to "Try searching for some
 groups to join."

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 447ac1b123..31ea54cf40 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -237,7 +237,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
              left="0"
              name="group_list"
              no_filtered_groups_msg="No groups"
-             no_groups_msg="[secondlife:///app/search/groups Trying searching for some groups to join.]"
+             no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]"
              top="0"
              width="313" />
             <panel
-- 
cgit v1.2.3


From 9bf24a72cb1ceced8a4ab3861347ef14792799b0 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Mon, 8 Feb 2010 15:53:56 +0200
Subject: Implemented critical task (EXT-4710) Update maturity icons for World
 Map.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_world_map.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

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 34d4b19410..86ac7c8e54 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -279,12 +279,12 @@
          <icon
      follows="top|right"
      height="16"
-     image_name="map_event.tga"
+     image_name="Parcel_PG_Dark"
      layout="topleft"
      mouse_opaque="true"
      name="event"
      left_pad="0"
-     width="16" />
+     width="18" />
       <text
      type="string"
      length="1"
@@ -312,13 +312,13 @@
     <icon
      follows="top|right"
      height="16"
-     image_name="map_event_mature.tga"
+     image_name="Parcel_M_Dark"
      layout="topleft"
      mouse_opaque="true"
      name="events_mature_icon"
      top_delta="0"
      left_pad="0"
-     width="16" />
+     width="18" />
            <text
      type="string"
      length="1"
@@ -345,13 +345,13 @@
     <icon
      follows="top|right"
      height="16"
-     image_name="map_event_adult.tga"
+     image_name="Parcel_R_Dark"
      layout="topleft"
      left_pad="0"
      mouse_opaque="true"
      name="events_adult_icon"
      top_delta="0"
-     width="16" />
+     width="18" />
                 <text
      type="string"
      length="1"
-- 
cgit v1.2.3


From 61013d9d24a4307f9409405ed0c51d28b33b7d25 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Mon, 8 Feb 2010 16:40:06 +0200
Subject: Fixed normal bug (EXT-4212) There's an ability to send non-latin
 group notices but they turn to '????...' in group profile page. - Disabled
 non-ascii input in text editor.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_group_notices.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 5f46ad7860..1f16aea2ef 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -159,6 +159,7 @@ Maximum 200 per group daily
          left_pad="3"
          max_length="511"
          name="create_message"
+         text_type="ascii"
          top_delta="0"
          width="220"
          word_wrap="true" />
-- 
cgit v1.2.3


From 8903719a7bdf07960ed38137e5d5a4f7fe169821 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Mon, 8 Feb 2010 16:40:24 +0200
Subject: Fixed normal bug (EXT-3044) Non-latin chars became invisible in LM
 description after saving. - Disabled non-ascii input in text editor.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_landmark_info.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index d1b22a34bb..6927906d3d 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -269,6 +269,7 @@
                  name="notes_editor"
                  read_only="true"
                  text_readonly_color="white"
+                 text_type="ascii"
                  top_pad="5"
                  width="290"
                  wrap="true" />
-- 
cgit v1.2.3


From 7199c9cc1bbd17eecea33b77a97a5ad7b20d2888 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Mon, 8 Feb 2010 18:05:48 +0200
Subject: EXT-3232 Refactoring: Improved the way of horizontal alignment of
 button's image overlay. Now mLeftHPad/mRightHPad is used instead of
 mImageOverlayLeftPad and mImageOverlayRightPad. Also
 mImgOverlayLabelSpace/imgoverlay_label_space members was added to
 button.(h/xml) to define space between image overlay and button's label

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/widgets/button.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 74d8478551..5c80fb50af 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -11,6 +11,7 @@
         image_right_pad="0"
         image_top_pad="0"
         image_bottom_pad="0"
+        imgoverlay_label_space="1"
         label_color="ButtonLabelColor"
         label_color_selected="ButtonLabelSelectedColor"
         label_color_disabled="ButtonLabelDisabledColor"
-- 
cgit v1.2.3


From d2d6af3dfa0f8a423016f5972d44a9721b1be1ee Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Mon, 8 Feb 2010 18:06:41 +0200
Subject: Fixed critical bug EXT-4970 - Inventory offers by scripted objects
 are discarded when offered objects got the same name. Had to do minor
 refactoring of LLScripFloaterManager in order to fix this issue.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_active_object_row.xml | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_active_object_row.xml b/indra/newview/skins/default/xui/en/panel_active_object_row.xml
index 7657fb8055..bef5f8dafd 100644
--- a/indra/newview/skins/default/xui/en/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/en/panel_active_object_row.xml
@@ -10,10 +10,6 @@
   background_opaque="false"
   background_visible="true"
   bg_alpha_color="0.0 0.0 0.0 0.0" >
-  <string
-   name="unknown_obj">
-    Unknown Object
-  </string>
   <chiclet_script
     name="object_chiclet"
     layout="topleft"
-- 
cgit v1.2.3


From d60d73a9e09dac3fa4508d8eddb8202614ff3536 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Mon, 8 Feb 2010 18:32:53 +0200
Subject: Fixed major bug EXT-5022 (streaming media first use dialog should be
 removed)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 15 ---------------
 1 file changed, 15 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 72ac457882..90381c2af4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1731,21 +1731,6 @@ Multiple parcels selected.
 Try selecting a single parcel.
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="ParcelCanPlayMedia"
-   type="alertmodal">
-This location can play streaming media.
-Streaming media requires a fast Internet connection.
-
-Play streaming media when available?
-(You can change this option later under Preferences &gt; Privacy.)
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Disable"
-     yestext="Play Media"/>
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="CannotDeedLandWaitingForServer"
-- 
cgit v1.2.3


From acc0a2962bc645335f19bb5e6142690ea99df449 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Mon, 8 Feb 2010 19:09:23 +0200
Subject: EXT - 3232 Refactoring: deleted unnecessary image_left_padding,
 image_right_padding members from button.h and button.xml and their the only
 place usage in LLTabContainer::reshapeTuple . Now image overlay placement
 adjustible via: mLeftHPad, mRightHPad, mImageOverlayBottomPad,
 mImageOverlayTopPad, mImgOverlayLabelSpace

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/widgets/button.xml | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 5c80fb50af..1b34a731a5 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -7,8 +7,6 @@
         image_selected="PushButton_Selected"
         image_disabled_selected="PushButton_Selected_Disabled"
         image_disabled="PushButton_Disabled"
-        image_left_pad="0"
-        image_right_pad="0"
         image_top_pad="0"
         image_bottom_pad="0"
         imgoverlay_label_space="1"
-- 
cgit v1.2.3


From 6b92b866e49408622ed02b85a0518b01cdbcf7a9 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Mon, 8 Feb 2010 20:01:52 +0200
Subject: fixed  Bug EXT-3777   	 inspector tool tips and UI tool tips do not
 have round corners Tooltip handler has been added to inspector floater.
 Default background image  of tooltip panel has been changed for inspector.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/widgets/inspector.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml
index 23f32253b6..428b2ce03b 100644
--- a/indra/newview/skins/default/xui/en/widgets/inspector.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml
@@ -2,7 +2,7 @@
 <inspector name="inspector"
            bg_opaque_color="DkGray_66"
            background_visible="true"
-           bg_opaque_image="none"
+           bg_opaque_image="Inspector_Hover"
            background_opaque="true"
            bg_alpha_image="none"
            mouse_opaque="true" 
-- 
cgit v1.2.3


From d0095124d534073db34b2f803f2beddf4e763370 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 8 Feb 2010 11:15:25 -0800
Subject: DEV-43688 Cycle3 manual fix for missing tab_title= translation, JA DE

---
 indra/newview/skins/default/xui/de/panel_side_tray.xml | 14 +++++++-------
 indra/newview/skins/default/xui/ja/panel_side_tray.xml | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/de/panel_side_tray.xml b/indra/newview/skins/default/xui/de/panel_side_tray.xml
index 2cd11cdcef..446117962f 100644
--- a/indra/newview/skins/default/xui/de/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/de/panel_side_tray.xml
@@ -2,26 +2,26 @@
 <!-- Side tray cannot show background because it is always
 	partially on screen to hold tab buttons. -->
 <side_tray name="sidebar">
-	<sidetray_tab description="Seitenleiste auf-/zuklappen." name="sidebar_openclose"/>
-	<sidetray_tab description="Startseite." name="sidebar_home">
+	<sidetray_tab description="Seitenleiste auf-/zuklappen." name="sidebar_openclose" tab_title="Seitenleiste auf-/zuklappen"/>
+	<sidetray_tab description="Startseite." name="sidebar_home" tab_title="Startseite">
 		<panel label="Startseite" name="panel_home"/>
 	</sidetray_tab>
-	<sidetray_tab description="Ihr öffentliches Profil und Auswahl bearbeiten." name="sidebar_me">
+	<sidetray_tab description="Ihr öffentliches Profil und Auswahl bearbeiten." name="sidebar_me" tab_title="Mein Profil">
 		<panel label="Ich" name="panel_me"/>
 	</sidetray_tab>
-	<sidetray_tab description="Freunde, Kontakte und Leute in Ihrer Nähe finden." name="sidebar_people">
+	<sidetray_tab description="Freunde, Kontakte und Leute in Ihrer Nähe finden." name="sidebar_people" tab_title="Leute">
 		<panel_container name="panel_container">
 			<panel label="Gruppeninfo" name="panel_group_info_sidetray"/>
 			<panel label="Ignorierte Einwohner &amp; Objekte" name="panel_block_list_sidetray"/>
 		</panel_container>
 	</sidetray_tab>
-	<sidetray_tab description="Hier finden Sie neue Orte und Orte, die Sie bereits besucht haben." label="Orte" name="sidebar_places">
+	<sidetray_tab description="Hier finden Sie neue Orte und Orte, die Sie bereits besucht haben." label="Orte" name="sidebar_places" tab_title="Orte">
 		<panel label="Orte" name="panel_places"/>
 	</sidetray_tab>
-	<sidetray_tab description="Inventar durchsuchen." name="sidebar_inventory">
+	<sidetray_tab description="Inventar durchsuchen." name="sidebar_inventory" tab_title="Mein Inventar">
 		<panel label="Inventar bearbeiten" name="sidepanel_inventory"/>
 	</sidetray_tab>
-	<sidetray_tab description="Ändern Sie Ihr Aussehen und Ihren aktuellen Look." name="sidebar_appearance">
+	<sidetray_tab description="Ändern Sie Ihr Aussehen und Ihren aktuellen Look." name="sidebar_appearance" tab_title="Mein Aussehen">
 		<panel label="Aussehen bearbeiten" name="sidepanel_appearance"/>
 	</sidetray_tab>
 </side_tray>
diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray.xml b/indra/newview/skins/default/xui/ja/panel_side_tray.xml
index ce5f0b940c..48636f1e3b 100644
--- a/indra/newview/skins/default/xui/ja/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_side_tray.xml
@@ -2,26 +2,26 @@
 <!-- Side tray cannot show background because it is always
 	partially on screen to hold tab buttons. -->
 <side_tray name="sidebar">
-	<sidetray_tab description="サイドバーを表示・非表示" name="sidebar_openclose"/>
-	<sidetray_tab description="ホーム。" name="sidebar_home">
+	<sidetray_tab description="サイドバーを表示・非表示" name="sidebar_openclose" tab_title="サイドバーを開く・閉じる"/>
+	<sidetray_tab description="ホーム。" name="sidebar_home" tab_title="ホーム">
 		<panel label="ホーム" name="panel_home"/>
 	</sidetray_tab>
-	<sidetray_tab description="あなたの公開プロフィールとピックを編集してください。" name="sidebar_me">
+	<sidetray_tab description="あなたの公開プロフィールとピックを編集してください。" name="sidebar_me" tab_title="マイ プロフィール">
 		<panel label="ミー" name="panel_me"/>
 	</sidetray_tab>
-	<sidetray_tab description="フレンド、連絡先、近くの人を探してください。" name="sidebar_people">
+	<sidetray_tab description="フレンド、連絡先、近くの人を探してください。" name="sidebar_people" tab_title="人">
 		<panel_container name="panel_container">
 			<panel label="グループ情報" name="panel_group_info_sidetray"/>
 			<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
 		</panel_container>
 	</sidetray_tab>
-	<sidetray_tab description="行きたい場所、行ったことのある場所を探してください。" label="場所" name="sidebar_places">
+	<sidetray_tab description="行きたい場所、行ったことのある場所を探してください。" label="場所" name="sidebar_places" tab_title="場所">
 		<panel label="場所" name="panel_places"/>
 	</sidetray_tab>
-	<sidetray_tab description="あなたの持ち物を眺めてください。" name="sidebar_inventory">
+	<sidetray_tab description="あなたの持ち物を眺めてください。" name="sidebar_inventory" tab_title="マイ 持ち物">
 		<panel label="持ち物を編集" name="sidepanel_inventory"/>
 	</sidetray_tab>
-	<sidetray_tab description="あなたの容姿や現在の見た目を変更してください。" name="sidebar_appearance">
+	<sidetray_tab description="あなたの容姿や現在の見た目を変更してください。" name="sidebar_appearance" tab_title="マイ 容姿">
 		<panel label="容姿の編集" name="sidepanel_appearance"/>
 	</sidetray_tab>
 </side_tray>
-- 
cgit v1.2.3


From b55dc023bf3cc2a6ac74851c4eb868e1b5a0ea19 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 8 Feb 2010 13:36:40 -0800
Subject: DEV-43688 Cycle3 Tim's resizing of FR GUI, and Noelle's translation
 of tab_title attributes

---
 .../newview/skins/default/xui/fr/floater_about.xml | 10 ++++---
 .../skins/default/xui/fr/floater_about_land.xml    | 32 ++++++++++++----------
 .../skins/default/xui/fr/floater_avatar_picker.xml |  2 +-
 .../default/xui/fr/floater_avatar_textures.xml     |  6 ++--
 .../skins/default/xui/fr/floater_buy_currency.xml  |  5 ++--
 .../skins/default/xui/fr/floater_buy_land.xml      | 21 ++++++++++----
 .../skins/default/xui/fr/floater_color_picker.xml  |  2 +-
 .../default/xui/fr/floater_day_cycle_options.xml   | 16 +++++------
 .../skins/default/xui/fr/floater_env_settings.xml  |  6 ++--
 .../skins/default/xui/fr/floater_god_tools.xml     |  6 ++--
 .../skins/default/xui/fr/floater_inspect.xml       |  2 +-
 .../xui/fr/floater_inventory_item_properties.xml   |  4 +--
 .../xui/fr/floater_inventory_view_finder.xml       |  2 +-
 .../skins/default/xui/fr/floater_joystick.xml      | 28 +++++++++----------
 .../default/xui/fr/floater_live_lsleditor.xml      |  2 +-
 .../skins/default/xui/fr/floater_lsl_guide.xml     |  9 +++---
 .../skins/default/xui/fr/floater_media_browser.xml |  6 ++--
 .../skins/default/xui/fr/floater_mem_leaking.xml   |  6 ++--
 .../skins/default/xui/fr/floater_notification.xml  |  2 +-
 .../skins/default/xui/fr/floater_pay_object.xml    |  8 +++---
 .../skins/default/xui/fr/floater_perm_prefs.xml    |  2 +-
 .../skins/default/xui/fr/floater_postcard.xml      |  8 +++---
 .../xui/fr/floater_preview_gesture_shortcut.xml    |  4 +--
 .../skins/default/xui/fr/floater_report_abuse.xml  |  6 ++--
 .../skins/default/xui/fr/floater_sell_land.xml     |  4 +--
 .../default/xui/fr/floater_settings_debug.xml      |  2 +-
 .../skins/default/xui/fr/floater_snapshot.xml      |  4 +--
 .../skins/default/xui/fr/floater_telehub.xml       |  5 ++--
 .../skins/default/xui/fr/floater_url_entry.xml     |  8 +++---
 .../newview/skins/default/xui/fr/floater_water.xml |  5 ++--
 .../default/xui/fr/floater_windlight_options.xml   |  2 +-
 .../skins/default/xui/fr/inspect_remote_object.xml |  2 +-
 .../skins/default/xui/fr/panel_audio_device.xml    |  2 +-
 .../skins/default/xui/fr/panel_edit_alpha.xml      |  2 +-
 .../skins/default/xui/fr/panel_edit_gloves.xml     |  2 +-
 .../skins/default/xui/fr/panel_edit_jacket.xml     |  2 +-
 .../skins/default/xui/fr/panel_edit_pants.xml      |  2 +-
 .../skins/default/xui/fr/panel_edit_profile.xml    |  2 +-
 .../skins/default/xui/fr/panel_edit_shirt.xml      |  2 +-
 .../skins/default/xui/fr/panel_edit_shoes.xml      |  2 +-
 .../skins/default/xui/fr/panel_edit_skin.xml       |  4 +--
 .../skins/default/xui/fr/panel_edit_skirt.xml      |  2 +-
 .../skins/default/xui/fr/panel_edit_socks.xml      |  2 +-
 .../skins/default/xui/fr/panel_edit_tattoo.xml     |  6 ++--
 .../skins/default/xui/fr/panel_edit_underpants.xml |  2 +-
 .../skins/default/xui/fr/panel_edit_undershirt.xml |  2 +-
 .../skins/default/xui/fr/panel_edit_wearable.xml   |  2 +-
 .../default/xui/fr/panel_group_info_sidetray.xml   |  2 +-
 .../default/xui/fr/panel_group_land_money.xml      | 14 +++++-----
 .../skins/default/xui/fr/panel_group_notices.xml   | 16 +++++------
 .../skins/default/xui/fr/panel_group_roles.xml     | 12 ++++----
 .../newview/skins/default/xui/fr/panel_groups.xml  |  4 +--
 indra/newview/skins/default/xui/fr/panel_login.xml |  2 +-
 .../xui/fr/panel_media_settings_security.xml       |  3 +-
 .../skins/default/xui/fr/panel_nearby_chat.xml     |  6 ++--
 indra/newview/skins/default/xui/fr/panel_notes.xml |  4 +--
 .../default/xui/fr/panel_preferences_advanced.xml  |  2 +-
 .../default/xui/fr/panel_preferences_graphics1.xml |  4 +--
 .../default/xui/fr/panel_preferences_setup.xml     |  2 +-
 .../newview/skins/default/xui/fr/panel_profile.xml |  4 +--
 .../skins/default/xui/fr/panel_region_covenant.xml |  6 ++--
 .../skins/default/xui/fr/panel_region_debug.xml    |  2 +-
 .../skins/default/xui/fr/panel_region_estate.xml   |  6 ++--
 .../skins/default/xui/fr/panel_region_general.xml  |  4 +--
 .../default/xui/fr/panel_region_general_layout.xml | 10 +++----
 .../skins/default/xui/fr/panel_region_texture.xml  |  2 +-
 .../xui/fr/panel_script_limits_my_avatar.xml       |  2 +-
 .../xui/fr/panel_script_limits_region_memory.xml   |  4 +--
 .../skins/default/xui/fr/panel_side_tray.xml       | 14 +++++-----
 indra/newview/skins/default/xui/fr/strings.xml     |  4 +--
 70 files changed, 205 insertions(+), 187 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index 7d6d736c5e..440412c0c0 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -49,19 +49,20 @@ Version Vivox : [VIVOX_VERSION]
 
 
 
-  Pour réussir dans les affaires, soyez audacieux, créatif et différent. - Henry Marchant
+Pour réussir dans les affaires, soyez audacieux, créatif et différent. - Henry Marchant
 			</text_editor>
 		</panel>
 		<panel label="Licences" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+  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)
   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)
+  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.
@@ -73,7 +74,8 @@ Version Vivox : [VIVOX_VERSION]
   
   Tous droits réservés.  Voir licenses.txt pour plus de détails.
 
-  Codage Audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+  Codage Audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 
+  Annex C)
 			</text_editor>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index 4c97551e55..8e2b27aca6 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -12,7 +12,7 @@
 	<floater.string name="Remaining">
 		restantes
 	</floater.string>
-	<tab_container name="landtab">
+	<tab_container name="landtab" tab_min_width="60">
 		<panel label="GÉNÉRAL" name="land_general_panel">
 			<panel.string name="new users only">
 				Nouveaux utilisateurs uniquement
@@ -128,10 +128,10 @@
 			<text name="DwellText">
 				0
 			</text>
-			<button label="Acheter du terrain" label_selected="Acheter le terrain..." left="130" name="Buy Land..." width="125"/>
-			<button label="Infos sur les scripts" name="Scripts..."/>
+			<button label="Acheter du terrain" label_selected="Acheter le terrain..." left_delta="60" name="Buy Land..." width="125"/>
+			<button label="Infos sur les scripts" name="Scripts..." width="110"/>
 			<button label="Acheter pour le groupe" label_selected="Acheter pour le groupe..." name="Buy For Group..."/>
-			<button label="Acheter un pass" label_selected="Acheter un pass..." left="130" name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain." width="125"/>
+			<button label="Acheter un pass" label_selected="Acheter un pass..." left_delta="-127" name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain." width="125"/>
 			<button label="Abandonner le terrain" label_selected="Abandonner le terrain..." name="Abandon Land..."/>
 			<button label="Récupérer le terrain" label_selected="Redemander le terrain…" name="Reclaim Land..."/>
 			<button label="Vente Linden" label_selected="Vente Linden..." name="Linden Sale..." tool_tip="Le terrain doit être la propriété d&apos;un résident, avoir un contenu défini et ne pas être aux enchères."/>
@@ -252,13 +252,13 @@ ou divisé.
 			</text>
 			<button label="Afficher" label_selected="Afficher" name="ShowOther" right="-135" width="60"/>
 			<button label="Retour" label_selected="Renvoyer..." name="ReturnOther..." right="-10" tool_tip="Renvoyer les objets à leurs propriétaires." width="119"/>
-			<text left="14" name="Selected / sat upon:" width="193">
+			<text left="14" name="Selected / sat upon:" width="220">
 				Sélectionnées/où quelqu&apos;un est assis :
 			</text>
-			<text left="214" name="selected_objects_text" width="48">
+			<text left_delta="214" name="selected_objects_text" width="48">
 				[COUNT]
 			</text>
-			<text left="4" name="Autoreturn" width="412">
+			<text left="4" name="Autoreturn" width="440">
 				Renvoi automatique des objets d&apos;autres résidents (minutes, 0 pour désactiver) :
 			</text>
 			<line_editor name="clean other time" right="-6" width="36"/>
@@ -270,9 +270,9 @@ ou divisé.
 			<name_list label="Plus récents" name="owner list">
 				<name_list.columns label="Type" name="type"/>
 				<name_list.columns name="online_status"/>
-				<name_list.columns label="Nom" name="name"/>
-				<name_list.columns label="Nombre" name="count"/>
-				<name_list.columns label="Plus récents" name="mostrecent"/>
+				<name_list.columns label="Nom" name="name" width="100"/>
+				<name_list.columns label="Nombre" name="count" width="100"/>
+				<name_list.columns label="Plus récents" name="mostrecent" width="120"/>
 			</name_list>
 		</panel>
 		<panel label="OPTIONS" name="land_options_panel">
@@ -317,7 +317,7 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 			</text>
 			<check_box label="Tous" left="285" name="edit objects check"/>
 			<check_box label="Groupe" left="395" name="edit group objects check"/>
-			<text left="152" name="allow_label3" width="134">
+			<text left="152" name="allow_label3" width="150">
 				Laisser entrer des objets :
 			</text>
 			<check_box label="Tous" left="285" name="all object entry check"/>
@@ -402,7 +402,8 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 			</text>
 			<line_editor left="97" name="url_description" tool_tip="Texte affiché à côté du bouton Jouer/Charger"/>
 			<text name="Media texture:">
-				Remplacer la texture :
+				Remplacer la 
+texture :
 			</text>
 			<texture_picker label="" left="97" name="media texture" tool_tip="Cliquez pour sélectionner une image"/>
 			<text name="replace_texture_help">
@@ -423,8 +424,9 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 			<check_box label="En boucle" name="media_loop" tool_tip="Jouer le média en boucle. Lorsque le média aura fini de jouer, il recommencera."/>
 		</panel>
 		<panel label="SON" name="land_audio_panel">
-			<text name="MusicURL:">
-				URL de la musique :
+			<text name="MusicURL:" bottom_delta="-28" >
+				URL de la 
+musique :
 			</text>
 			<text name="Sound:">
 				Son :
@@ -455,7 +457,7 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 			<check_box label="Vérification de l&apos;âge [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Bannir les résidents qui n&apos;ont pas vérifié leur âge. Consultez la page [SUPPORT_SITE] pour plus d&apos;informations."/>
 			<check_box label="Autoriser l&apos;accès au groupe : [GROUP]" name="GroupCheck" tool_tip="Définir le groupe à l&apos;onglet Général."/>
 			<check_box label="Vendre des pass à :" name="PassCheck" tool_tip="Autoriser un accès temporaire à cette parcelle"/>
-			<combo_box name="pass_combo">
+			<combo_box name="pass_combo" width="110">
 				<combo_box.item label="Tout le monde" name="Anyone"/>
 				<combo_box.item label="Groupe" name="Group"/>
 			</combo_box>
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
index e784bda2e5..65bb683e4c 100644
--- a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
@@ -20,7 +20,7 @@
 	</string>
 	<tab_container name="ResidentChooserTabs">
 		<panel label="Rechercher" name="SearchPanel">
-			<text name="InstructSearchResidentName">
+			<text name="InstructSearchResidentName" width="240">
 				Saisissez une partie du nom du résident :
 			</text>
 			<button label="OK" label_selected="OK" name="Find"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
index 313c9496a2..983efcdc47 100644
--- a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
@@ -23,8 +23,8 @@
 			<texture_picker label="Œil" name="eyes_iris"/>
 			<texture_picker label="Alpha yeux" name="eyes_alpha"/>
 			<texture_picker label="Haut du corps" name="upper-baked"/>
-			<texture_picker label="Peinture corporelle haut" name="upper_bodypaint"/>
-			<texture_picker label="Sous-vêtements (homme)" name="upper_undershirt"/>
+			<texture_picker label="Peinture corporelle &#10;haut" name="upper_bodypaint"/>
+			<texture_picker label="Sous-vêtements &#10;(homme)" name="upper_undershirt"/>
 			<texture_picker label="Gants" name="upper_gloves"/>
 			<texture_picker label="Chemise" name="upper_shirt"/>
 			<texture_picker label="Veste (haut)" name="upper_jacket"/>
@@ -32,7 +32,7 @@
 			<texture_picker label="Tatouage haut" name="upper_tattoo"/>
 			<texture_picker label="Bas du corps" name="lower-baked"/>
 			<texture_picker label="Peinture corporelle bas" name="lower_bodypaint"/>
-			<texture_picker label="Sous-vêtements (femme)" name="lower_underpants"/>
+			<texture_picker label="Sous-vêtements &#10;(femme)" name="lower_underpants"/>
 			<texture_picker label="Chaussettes" name="lower_socks"/>
 			<texture_picker label="Chaussures" name="lower_shoes"/>
 			<texture_picker label="Pantalon" name="lower_pants"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
index 5ea36d8505..c7437c4603 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
@@ -7,7 +7,8 @@
 		Vous avez besoin de plus de L$
 	</text>
 	<text name="contacting">
-		En train de contacter le Lindex...
+		En train de contacter 
+le Lindex...
 	</text>
 	<text left="5" name="info_buying">
 		Acheter des L$
@@ -59,7 +60,7 @@
 	</text>
 	<button label="Acheter" name="buy_btn"/>
 	<button label="Annuler" name="cancel_btn"/>
-	<text left="5" name="info_cannot_buy" right="-5">
+	<text left="5" name="info_cannot_buy" width="200" right="-5">
 		Achat impossible
 	</text>
 	<button label="Accéder au Web" name="error_web"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
index 1d7eeca3c4..f5cf871844 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
@@ -37,10 +37,10 @@
 		Vous devez accepter le règlement du domaine :
 	</text>
 	<text left="470" name="covenant_timestamp_text"/>
-	<text_editor name="covenant_editor">
+	<text_editor name="covenant_editor" left="510">
 		Chargement...
 	</text_editor>
-	<check_box label="J&apos;accepte le règlement ci-dessus." name="agree_covenant"/>
+	<check_box label="J&apos;accepte le règlement ci-dessus." name="agree_covenant" left="510"/>
 	<text name="info_parcel_label">
 		Parcelle :
 	</text>
@@ -79,9 +79,20 @@ vendu avec objets
 		<combo_box.item label="7,50 US$/mois, facturation trimestrielle" name="US$7.50/month,billedquarterly"/>
 		<combo_box.item label="6,00 US$/mois, facturation annuelle" name="US$6.00/month,billedannually"/>
 	</combo_box>
-	<text name="land_use_action">
-		Augmentez vos frais d&apos;occupation de terrain à 40 US$/mois.
-	</text>
+    <text
+     type="string"
+     length="1"
+     follows="top|left"
+     font="SansSerifBig"
+     height="16"
+     layout="topleft"
+     left="72"
+     name="land_use_action"
+     right="500"
+     top="284"
+     width="400">
+        Augmentez vos frais d&apos;occupation de terrain à 40 US$/mois.
+    </text>
 	<text name="land_use_reason">
 		Vous détenez 1 309 m² de terrain.
 Cette parcelle fait 512 m².
diff --git a/indra/newview/skins/default/xui/fr/floater_color_picker.xml b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
index c509a4783e..8d7fe76b35 100644
--- a/indra/newview/skins/default/xui/fr/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
@@ -25,7 +25,7 @@
 	<text left="8" name="Current color:">
 		Couleur actuelle :
 	</text>
-	<text left="8" name="(Drag below to save.)" width="114">
+	<text left="8" name="(Drag below to save.)" width="220">
 		(Faire glisser dessous pour enregistrer.)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
index 0b36b7b8ca..15cc6cd1ba 100644
--- a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
@@ -59,14 +59,14 @@
 			</text>
 			<button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey" width="89" bottom="-45" />
 			<button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey" width="89" bottom="-70" />
-			<text name="WLCurKeyFrameText">
+			<text name="WLCurKeyFrameText" width="170">
 				Réglages des images-clés :
 			</text>
-			<text name="WLCurKeyTimeText">
+			<text name="WLCurKeyTimeText" width="170">
 				Heure de la clé :
 			</text>
-			<spinner label="Heure" name="WLCurKeyHour" />
-			<spinner label="Min" name="WLCurKeyMin" />
+			<spinner label="Heure" name="WLCurKeyHour" label_width="80" width="74"/>
+			<spinner label="Min" name="WLCurKeyMin" label_width="80"/>
 			<text name="WLCurKeyTimeText2">
 				Préréglages clés :
 			</text>
@@ -78,13 +78,13 @@
 			<text name="DayCycleText2">
 				Durée du cycle :
 			</text>
-			<spinner label="Heure" name="WLLengthOfDayHour" />
+			<spinner label="Heure" name="WLLengthOfDayHour" label_width="80" width="74" />
 			<spinner label="Min" name="WLLengthOfDayMin" />
-			<spinner label="S" name="WLLengthOfDaySec" label_width="10" width="50" left_delta="75"/>
-			<text name="DayCycleText3">
+			<spinner label="S" name="WLLengthOfDaySec" label_width="10" width="50" left_delta="95"/>
+			<text name="DayCycleText3" left="280" width="200">
 				Prévisualiser :
 			</text>
-			<button label="Jouer" label_selected="Jouer" name="WLAnimSky" />
+			<button label="Jouer" label_selected="Jouer" name="WLAnimSky" left_delta="90"/>
 			<button label="Stop !" label_selected="Stop" name="WLStopAnimSky" />
 			<button label="Utiliser heure domaine" label_selected="Aller heure domaine"
 			     name="WLUseLindenTime" />
diff --git a/indra/newview/skins/default/xui/fr/floater_env_settings.xml b/indra/newview/skins/default/xui/fr/floater_env_settings.xml
index 505c9236c7..dd714e85b6 100644
--- a/indra/newview/skins/default/xui/fr/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_env_settings.xml
@@ -3,7 +3,7 @@
 	<floater.string name="timeStr">
 		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
 	</floater.string>
-	<text bottom="-45" name="EnvTimeText">
+	<text bottom="-45" name="EnvTimeText" top="29">
 		Heure de la
 journée
 	</text>
@@ -14,7 +14,7 @@ journée
 		Couverture
 nuageuse
 	</text>
-	<text bottom="-45" name="EnvWaterColorText">
+	<text bottom="-45" name="EnvWaterColorText" top="29">
 		Couleur de
 l&apos;eau
 	</text>
@@ -23,7 +23,7 @@ l&apos;eau
 		Brouillard
 dans l&apos;eau
 	</text>
-	<button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" width="145"/>
+	<button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" width="152"/>
 	<button label="Ciel avancé" left="162" name="EnvAdvancedSkyButton" width="145"/>
 	<button label="Eau avancée" left="316" name="EnvAdvancedWaterButton" width="145"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_god_tools.xml b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
index 0dedf499bb..187814eba2 100644
--- a/indra/newview/skins/default/xui/fr/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
@@ -12,7 +12,7 @@
 			<line_editor left="85" name="region name" width="198"/>
 			<check_box label="Initiation" name="check prelude" tool_tip="Définir cette région comme zone d&apos;initiation."/>
 			<check_box label="Soleil fixe" name="check fixed sun" tool_tip="Définir la position du soleil (comme dans Région et Domaine &gt; Terrain.)"/>
-			<check_box height="32" label="Réinitialiser le domicile  à la téléportation" name="check reset home" tool_tip="Quand les résidents s&apos;en vont par téléportation, réinitialisez leur domicile sur l&apos;emplacement de destination."/>
+			<check_box height="32" label="Réinitialiser le domicile à la téléportation" name="check reset home" tool_tip="Quand les résidents s&apos;en vont par téléportation, réinitialisez leur domicile sur l&apos;emplacement de destination."/>
 			<check_box bottom_delta="-32" label="Visible" name="check visible" tool_tip="Cochez pour rendre la région visible aux non-admins."/>
 			<check_box label="Dégâts" name="check damage" tool_tip="Cochez pour activer les dégâts dans cette région."/>
 			<check_box label="Bloquer le suivi de trafic" name="block dwell" tool_tip="Cochez pour que la région ne comptabilise pas le trafic."/>
@@ -48,8 +48,8 @@
 			<spinner left="320" name="land cost" width="70"/>
 			<button label="Rafraîchir" label_selected="Rafraîchir" name="Refresh" tool_tip="Cliquez ici pour rafraîchir les informations ci-dessus."/>
 			<button label="Appliquer" label_selected="Appliquer" name="Apply" tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus."/>
-			<button label="Sélectionner une région" label_selected="Sélectionner une région" left="136" name="Select Region" tool_tip="Sélectionnez une région entière à l&apos;aide de l&apos;outil Terrain." width="140"/>
-			<button label="Sauvegarde automatique" label_selected="Sauvegarde automatique" left="136" name="Autosave now" tool_tip="Sauvegarde automatique au format gzip." width="140"/>
+			<button label="Sélectionner une région" label_selected="Sélectionner une région" left="136" name="Select Region" tool_tip="Sélectionnez une région entière à l&apos;aide de l&apos;outil Terrain." width="160"/>
+			<button label="Sauvegarde automatique" label_selected="Sauvegarde automatique" left="136" name="Autosave now" tool_tip="Sauvegarde automatique au format gzip." width="160"/>
 		</panel>
 		<panel label="Objets" name="objects">
 			<panel.string name="no_target">
diff --git a/indra/newview/skins/default/xui/fr/floater_inspect.xml b/indra/newview/skins/default/xui/fr/floater_inspect.xml
index de74f47bcf..9b1bdf106d 100644
--- a/indra/newview/skins/default/xui/fr/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inspect.xml
@@ -7,7 +7,7 @@
 		<scroll_list.columns label="Nom" name="object_name"/>
 		<scroll_list.columns label="Propriétaire" name="owner_name"/>
 		<scroll_list.columns label="Créateur" name="creator_name"/>
-		<scroll_list.columns label="Date de création" name="creation_date"/>
+		<scroll_list.columns label="Date de création" name="creation_date" width="114"/>
 	</scroll_list>
 	<button label="Voir le profil du propriétaire..." name="button owner" tool_tip="Voir le profil du propriétaire de l&apos;objet en surbrillance" width="172"/>
 	<button label="Voir le profil du créateur..." left="192" name="button creator" tool_tip="Voir le profil du créateur de l&apos;objet en surbrillance" width="172"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
index b0d5df161c..fca1a329a2 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
@@ -47,11 +47,11 @@
 	<check_box label="Éditer" name="CheckOwnerModify"/>
 	<check_box label="Copier" name="CheckOwnerCopy"/>
 	<check_box label="Revendre" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">
+	<text name="AnyoneLabel" width="80">
 		N&apos;importe qui :
 	</text>
 	<check_box label="Copier" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">
+	<text name="GroupLabel" width="80">
 		Groupe :
 	</text>
 	<check_box label="Partager" name="CheckShareWithGroup"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
index 52f8597dc2..6cd886d4b9 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
@@ -13,7 +13,7 @@
 	<check_box label="Photos" name="check_snapshot"/>
 	<button label="Tout" label_selected="Tout" name="All" width="70"/>
 	<button bottom_delta="0" label="Aucun" label_selected="Aucun" left="83" name="None" width="70"/>
-	<check_box bottom_delta="-20" label="Toujours montrer  les dossiers" name="check_show_empty"/>
+	<check_box bottom_delta="-20" label="Toujours montrer les dossiers" name="check_show_empty"/>
 	<check_box bottom_delta="-36" label="Depuis la déconnexion" name="check_since_logoff"/>
 	<text name="- OR -">
 		Ou il y a...
diff --git a/indra/newview/skins/default/xui/fr/floater_joystick.xml b/indra/newview/skins/default/xui/fr/floater_joystick.xml
index d3a1b6c61b..e00f9564e8 100644
--- a/indra/newview/skins/default/xui/fr/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/fr/floater_joystick.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Joystick" title="CONFIGURATION DU JOYSTICK">
 	<check_box label="Activer :" name="enable_joystick"/>
-	<spinner label="Mapping axe des X " name="JoystickAxis1"/>
-	<spinner label="Mapping axe des Y" name="JoystickAxis2"/>
-	<spinner label="Mapping axe des Z" name="JoystickAxis0"/>
-	<spinner label="Mapping du tangage" label_width="111" left="8" name="JoystickAxis4" width="152"/>
-	<spinner label="Mapping du lacet" name="JoystickAxis5"/>
-	<spinner label="Mapping du roulis" name="JoystickAxis3"/>
-	<spinner label="Mapping du zoom" name="JoystickAxis6"/>
+	<spinner label="Mapping axe des X " name="JoystickAxis1" left="20" width="154" label_width="130"/>
+	<spinner label="Mapping axe des Y" name="JoystickAxis2" width="154" label_width="130"/>
+	<spinner label="Mapping axe des Z" name="JoystickAxis0" width="154" label_width="130"/>
+	<spinner label="Mapping du tangage" label_width="136" left="20" name="JoystickAxis4" width="154"/>
+	<spinner label="Mapping du lacet" name="JoystickAxis5" width="154" label_width="130"/>
+	<spinner label="Mapping du roulis" name="JoystickAxis3" width="154" label_width="130"/>
+	<spinner label="Mapping du zoom" name="JoystickAxis6" left="20" width="154" label_width="130"/>
 	<check_box label="Zoom direct" name="ZoomDirect"/>
-	<check_box label="Curseur 3D" name="Cursor3D"/>
-	<check_box label="Niveau automatique" name="AutoLeveling"/>
+	<check_box label="Curseur 3D" name="Cursor3D" left="300"/>
+	<check_box label="Niveau automatique" name="AutoLeveling" left="400"/>
 	<text name="Control Modes:">
 		Modes de contrôle :
 	</text>
@@ -44,13 +44,13 @@
 	<text name="ZDeadZone">
 		Zone neutre Z
 	</text>
-	<text left="4" name="PitchDeadZone" width="110">
-		Zone neutre Tangage
+	<text left="4" name="PitchDeadZone" width="116">
+		Zone neutre tangage
 	</text>
-	<text name="YawDeadZone">
+	<text name="YawDeadZone" left="10" width="104">
 		Zone neutre lacet
 	</text>
-	<text name="RollDeadZone">
+	<text name="RollDeadZone" left="10" width="104">
 		Zone neutre roulis
 	</text>
 	<text name="Feathering">
@@ -59,7 +59,7 @@
 	<text name="ZoomScale2">
 		Échelle du zoom
 	</text>
-	<text left="6" name="ZoomDeadZone" width="110">
+	<text left="6" name="ZoomDeadZone" width="120">
 		Zone neutre du zoom
 	</text>
 	<button label="Options par défaut du joystick" name="SpaceNavigatorDefaults"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
index b0a2f92f7c..7e7180166d 100644
--- a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
@@ -11,5 +11,5 @@
 	</floater.string>
 	<button label="Réinitialiser" label_selected="Réinitialiser" left="390" name="Reset" width="100"/>
 	<check_box initial_value="true" label="Exécution en cours" left="4" name="running"/>
-	<check_box initial_value="true" label="Mono" left="130" name="mono"/>
+	<check_box initial_value="true" label="Mono" left_delta="160" name="mono"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
index b92c0944de..71d2c42578 100644
--- a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="RÉFÉRENCE LSL">
-	<check_box label="Suivre le curseur" name="lock_check"/>
-	<combo_box label="Verrouiller" left_delta="120" name="history_combo" width="70"/>
-	<button label="Précédente" left_delta="75" name="back_btn"/>
-	<button label="Suivante" name="fwd_btn"/>
+
+    <check_box label="Suivre le curseur" name="lock_check" width="90" />
+	<combo_box label="Verrouiller" left_delta="120" name="history_combo" width="82"/>
+	<button label="Précédente" name="back_btn" left_delta="75"/>
+	<button label="Suivante" name="fwd_btn" width="60"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
index 0677c5d41f..58535eddf5 100644
--- a/indra/newview/skins/default/xui/fr/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
@@ -15,12 +15,12 @@
 			<button label="OK" left_delta="515" name="go"/>
 		</layout_panel>
 		<layout_panel name="time_controls">
-			<button label="en arrière" name="rewind"/>
+			<button label="en arrière" name="rewind" width="60"/>
 			<button label="stop" name="stop"/>
-			<button label="en avant" name="seek"/>
+			<button label="en avant" name="seek" width="60"/>
 		</layout_panel>
 		<layout_panel name="parcel_owner_controls">
-			<button label="Envoyer la page actuelle à la parcelle" name="assign"/>
+			<button label="Envoyer la page actuelle à la parcelle" name="assign" width="220"/>
 		</layout_panel>
 		<layout_panel name="external_controls">
 			<button label="Ouvrir dans mon navigateur web" name="open_browser" width="196"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
index 5993f90cef..d03c4d7544 100644
--- a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
@@ -12,7 +12,7 @@
 		[NOTE2]
 	</text>
 	<button label="Commencer" name="start_btn" width="85"/>
-	<button label="Stop" left="100" name="stop_btn"/>
-	<button label="Libérer" left="177" name="release_btn"/>
-	<button label="Fermer" name="close_btn"/>
+	<button label="Stop" name="stop_btn"/>
+	<button label="Libérer" name="release_btn"/>
+	<button label="Fermer" name="close_btn" left_pad="20"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_notification.xml b/indra/newview/skins/default/xui/fr/floater_notification.xml
index 62727da007..fe4b5f9bd6 100644
--- a/indra/newview/skins/default/xui/fr/floater_notification.xml
+++ b/indra/newview/skins/default/xui/fr/floater_notification.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="notification" title="CONSOLE DE NOTIFICATIONS">
 	<text_editor name="payload">
-		Chargement..
+		Chargement...
 	</text_editor>
 	<combo_box label="Réponse" name="response"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
index c96db77721..9cac739ab0 100644
--- a/indra/newview/skins/default/xui/fr/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
@@ -17,10 +17,10 @@
 	<text left="105" name="object_name_text">
 		...
 	</text>
-	<button label="1 L$" label_selected="1 L$" left="105" name="fastpay 1"/>
-	<button label="5 L$" label_selected="5 L$" left="190" name="fastpay 5"/>
-	<button label="10 L$" label_selected="10 L$" left="105" name="fastpay 10"/>
-	<button label="20 L$" label_selected="20 L$" left="190" name="fastpay 20"/>
+	<button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
+	<button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
+	<button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
+	<button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
 	<text halign="left" left="5" name="amount text">
 		Ou choisissez un montant :
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
index 2be2ae7c88..f83000cf87 100644
--- a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
@@ -4,7 +4,7 @@
 		<button label="?" label_selected="?" name="help"/>
 		<check_box label="Partager avec le groupe" name="share_with_group"/>
 		<check_box label="Autoriser tout le monde à copier" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
+		<text name="NextOwnerLabel" width="260">
 			Le prochain propriétaire pourra :
 		</text>
 		<check_box label="Modifier" name="next_owner_modify"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_postcard.xml b/indra/newview/skins/default/xui/fr/floater_postcard.xml
index 6a9a674fac..489b90eeba 100644
--- a/indra/newview/skins/default/xui/fr/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/fr/floater_postcard.xml
@@ -3,19 +3,19 @@
 	<text name="to_label" width="135">
 		E-mail du destinataire :
 	</text>
-	<line_editor left="143" name="to_form" width="127"/>
+	<line_editor left="143" name="to_form" width="130" left_delta="146"/>
 	<text name="from_label">
 		Votre e-mail :
 	</text>
-	<line_editor left="143" name="from_form" width="127"/>
+	<line_editor left="143" name="from_form" width="130" left_delta="146"/>
 	<text name="name_label">
 		Votre nom :
 	</text>
-	<line_editor left="143" name="name_form" width="127"/>
+	<line_editor left="143" name="name_form" width="130" left_delta="146"/>
 	<text name="subject_label">
 		Sujet :
 	</text>
-	<line_editor left="143" name="subject_form" width="127"/>
+	<line_editor left="143" name="subject_form" width="130" left_delta="146"/>
 	<line_editor label="Saisissez votre sujet ici." name="subject_form"/>
 	<text name="msg_label">
 		Message :
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture_shortcut.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture_shortcut.xml
index 06caf0635d..d866c32882 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture_shortcut.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture_shortcut.xml
@@ -6,8 +6,8 @@
 	<text name="key_label">
 		Clavier :
 	</text>
-	<combo_box label="Aucun" name="modifier_combo"/>
-	<combo_box label="Aucun" name="key_combo"/>
+	<combo_box label="Aucun" name="modifier_combo" width="62"/>
+	<combo_box label="Aucun" name="key_combo" width="62"/>
 	<text name="replace_text" tool_tip="Remplacez le ou les mots-clés par ces mots. Par exemple, si vous remplacez le mot-clé &quot; bonjour &quot; par &quot; salut &quot;, le chat &quot; Je voulais te dire bonjour &quot; devient &quot; Je voulais te dire salut &quot; et le geste correspondant s&apos;affiche.">
 		Remplacer :
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
index b96e15e4bb..215df18bd6 100644
--- a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
@@ -29,13 +29,13 @@
 	<text name="object_name_label">
 		Objet :
 	</text>
-	<text left_delta="70" name="object_name" width="105">
+	<text left_pad="26" name="object_name" width="105">
 		Consetetur Sadipscing
 	</text>
-	<text name="owner_name_label" width="66">
+	<text name="owner_name_label" width="100">
 		Propriétaire :
 	</text>
-	<text left_delta="70" name="owner_name" width="105">
+	<text left_delta="120" name="owner_name" width="105">
 		Hendrerit Vulputate Kamawashi Longname
 	</text>
 	<combo_box name="category_combo" tool_tip="Choisissez la catégorie qui décrit le mieux ce rapport">
diff --git a/indra/newview/skins/default/xui/fr/floater_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
index e950a64c4c..d79726e8e2 100644
--- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
@@ -5,13 +5,13 @@
 			<text name="info_parcel_label">
 				Parcelle :
 			</text>
-			<text name="info_parcel">
+			<text name="info_parcel" left="70">
 				NOM DE LA PARCELLE
 			</text>
 			<text name="info_size_label">
 				Taille :
 			</text>
-			<text name="info_size">
+			<text name="info_size" left="70">
 				[AREA] m²
 			</text>
 			<text bottom_delta="-60" name="info_action">
diff --git a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
index aae4729347..995837e9ee 100644
--- a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
@@ -4,7 +4,7 @@
 		<combo_box.item label="VRAI" name="TRUE"/>
 		<combo_box.item label="FAUX" name="FALSE"/>
 	</combo_box>
-	<color_swatch label="Couleur" name="val_color_swatch"/>
+	<color_swatch label="Couleur" name="val_color_swatch" width="50"/>
 	<spinner label="x" name="val_spinner_1"/>
 	<spinner label="x" name="val_spinner_2"/>
 	<spinner label="x" name="val_spinner_3"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index 486eafef01..74738b7e31 100644
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -45,8 +45,8 @@
 		<combo_box.item label="JPEG" name="JPEG"/>
 		<combo_box.item label="BMP" name="BMP"/>
 	</combo_box>
-	<spinner label="Largeur" label_width="41" name="snapshot_width" width="101"/>
-	<spinner label="Hauteur" label_width="41" left="121" name="snapshot_height" width="101"/>
+	<spinner label="Largeur" label_width="44" name="snapshot_width" width="101"/>
+	<spinner label="Hauteur" label_width="46" left="121" name="snapshot_height" width="101"/>
 	<slider label="Qualité de l&apos;image" name="image_quality_slider"/>
 	<text name="layer_type_label">
 		Capturer :
diff --git a/indra/newview/skins/default/xui/fr/floater_telehub.xml b/indra/newview/skins/default/xui/fr/floater_telehub.xml
index a50cfc25c1..c529ca2736 100644
--- a/indra/newview/skins/default/xui/fr/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/fr/floater_telehub.xml
@@ -10,8 +10,7 @@
 		Pour supprimer, cliquez sur Déconnecter.
 	</text>
 	<text bottom_delta="-18" height="38" name="help_text_not_connected">
-		Sélectionner l&apos;objet et cliquez sur Connecter
-le téléhub.
+		Sélectionner l&apos;objet et cliquez sur Connecter le téléhub.
 	</text>
 	<button label="Connecter le téléhub" name="connect_btn" width="122"/>
 	<button label="Déconnecter" left="142" name="disconnect_btn" width="98"/>
@@ -20,7 +19,7 @@ le téléhub.
 	</text>
 	<button label="Ajouter point" name="add_spawn_point_btn"/>
 	<button label="Supprimer point" name="remove_spawn_point_btn"/>
-	<text name="spawn_point_help">
+	<text name="spawn_point_help" height="100">
 		Sélectionnez l&apos;objet et cliquez sur Ajouter pour indiquer la position.
 Vous pourrez ensuite déplacer ou supprimer l&apos;objet.
 Les positions sont relatives au centre du téléhub.
diff --git a/indra/newview/skins/default/xui/fr/floater_url_entry.xml b/indra/newview/skins/default/xui/fr/floater_url_entry.xml
index 6a90731691..4b2be14569 100644
--- a/indra/newview/skins/default/xui/fr/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/fr/floater_url_entry.xml
@@ -3,11 +3,11 @@
 	<text name="media_label">
 		URL du média :
 	</text>
-	<combo_box left="100" name="media_entry" width="360" />
-	<button label="OK" name="ok_btn" />
+	<combo_box name="media_entry"/>
+	<button label="OK" name="ok_btn" width="30" />
 	<button label="Annuler" name="cancel_btn" />
-	<button label="Effacer" name="clear_btn" />
-	<text name="loading_label">
+	<button label="Effacer" name="clear_btn" left_pad="94"/>
+	<text name="loading_label" left="120">
 		Chargement...
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_water.xml b/indra/newview/skins/default/xui/fr/floater_water.xml
index 287f51d9f7..1a74017330 100644
--- a/indra/newview/skins/default/xui/fr/floater_water.xml
+++ b/indra/newview/skins/default/xui/fr/floater_water.xml
@@ -3,7 +3,7 @@
 	<floater.string name="WLDefaultWaterNames">
 		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
 	</floater.string>
-	<text name="KeyFramePresetsText">
+	<text name="KeyFramePresetsText" width="120">
 		Préréglages eau :
 	</text>
 	<button label="Nouveau" label_selected="Nouveau" name="WaterNewPreset"/>
@@ -12,8 +12,7 @@
 	<tab_container name="Water Tabs">
 		<panel label="Paramètres" name="Settings">
 			<text name="BHText">
-				Couleur du brouillard
-dans l&apos;eau
+				Couleur du brouillard dans l&apos;eau
 			</text>
 			<color_swatch left="75" name="WaterFogColor" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
 			<text name="WaterFogDensText">
diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
index e28de71625..d92fadd048 100644
--- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
@@ -6,7 +6,7 @@
 	<button label="Nouveau" label_selected="Nouveau" name="WLNewPreset"/>
 	<button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WLSavePreset" width="75"/>
 	<button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WLDeletePreset"/>
-	<button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour" left_delta="95" name="WLDayCycleMenuButton" width="150"/>
+	<button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour" left_pad="20" left_delta="95" name="WLDayCycleMenuButton" width="150"/>
 	<tab_container name="WindLight Tabs" width="706">
 		<panel label="Atmosphère" name="Atmosphere">
 			<text name="BHText">
diff --git a/indra/newview/skins/default/xui/fr/inspect_remote_object.xml b/indra/newview/skins/default/xui/fr/inspect_remote_object.xml
index 6d8c44578a..6d7cfadc04 100644
--- a/indra/newview/skins/default/xui/fr/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/fr/inspect_remote_object.xml
@@ -7,7 +7,7 @@
 	<text name="object_name">
 		Nom d&apos;objet de test vraiment très long
 	</text>
-	<text name="object_owner_label">
+	<text name="object_owner_label" width="70">
 		Propriétaire :
 	</text>
 	<text name="object_owner">
diff --git a/indra/newview/skins/default/xui/fr/panel_audio_device.xml b/indra/newview/skins/default/xui/fr/panel_audio_device.xml
index a9540d8346..2caa013f54 100644
--- a/indra/newview/skins/default/xui/fr/panel_audio_device.xml
+++ b/indra/newview/skins/default/xui/fr/panel_audio_device.xml
@@ -6,7 +6,7 @@
 	<text name="Input device (microphone):">
 		Périphérique d&apos;entrée (micro) :
 	</text>
-	<text name="Output device (speakers):">
+	<text name="Output device (speakers):" width="300">
 		Périphérique de sortie (haut-parleurs) :
 	</text>
 	<text name="Input level:">
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml b/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml
index 836dd99097..3b81ef2a5f 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml
@@ -5,6 +5,6 @@
 		<texture_picker label="Alpha haut" name="Upper Alpha" tool_tip="Cliquez pour sélectionner une image"/>
 		<texture_picker label="Alpha tête" name="Head Alpha" tool_tip="Cliquez pour sélectionner une image"/>
 		<texture_picker label="Alpha yeux" name="Eye Alpha" tool_tip="Cliquez pour sélectionner une image"/>
-		<texture_picker label="Alpha cheveux" name="Hair Alpha" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Alpha cheveux" width="80" name="Hair Alpha" tool_tip="Cliquez pour sélectionner une image"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml b/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml
index e37e0b2481..73e136ade6 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml
@@ -2,7 +2,7 @@
 <panel name="edit_gloves_panel">
 	<panel name="avatar_gloves_color_panel">
 		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
-		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
 	</panel>
 	<accordion name="wearable_accordion">
 		<accordion_tab name="gloves_main_tab" title="Gants"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml b/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml
index 759db657a6..cee44eb795 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml
@@ -3,7 +3,7 @@
 	<panel name="avatar_jacket_color_panel">
 		<texture_picker label="Tissu (haut)" name="Upper Fabric" tool_tip="Cliquez pour sélectionner une image"/>
 		<texture_picker label="Tissu (bas)" name="Lower Fabric" tool_tip="Cliquez pour sélectionner une image"/>
-		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
 	</panel>
 	<accordion name="wearable_accordion">
 		<accordion_tab name="jacket_main_tab" title="Veste"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pants.xml b/indra/newview/skins/default/xui/fr/panel_edit_pants.xml
index 5328e885d3..71d82c817f 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_pants.xml
@@ -2,7 +2,7 @@
 <panel name="edit_pants_panel">
 	<panel name="avatar_pants_color_panel">
 		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
-		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
 	</panel>
 	<accordion name="wearable_accordion">
 		<accordion_tab name="pants_main_tab" title="Pantalon"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
index 4a42858861..24cf7844b5 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
@@ -53,7 +53,7 @@
 		</panel>
 	</scroll_container>
 	<panel name="profile_me_buttons_panel">
-		<button label="Enregistrer les changements" name="save_btn"/>
+		<button label="Enregistrer les changements" width="166" name="save_btn"/>
 		<button label="Annuler" name="cancel_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml
index 0fe7d5bbb0..cf28cd8c1e 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml
@@ -2,7 +2,7 @@
 <panel name="edit_shirt_panel">
 	<panel name="avatar_shirt_color_panel">
 		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
-		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
 	</panel>
 	<accordion name="wearable_accordion">
 		<accordion_tab name="shirt_main_tab" title="Chemise"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml b/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml
index 588a2ca7b2..a8e0910a15 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml
@@ -2,7 +2,7 @@
 <panel name="edit_shoes_panel">
 	<panel name="avatar_shoes_color_panel">
 		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
-		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
 	</panel>
 	<accordion name="wearable_accordion">
 		<accordion_tab name="shoes_main_tab" title="Chaussures"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skin.xml b/indra/newview/skins/default/xui/fr/panel_edit_skin.xml
index 649b91d66d..dac005f6b6 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_skin.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_skin_panel">
 	<panel name="avatar_skin_color_panel">
-		<texture_picker label="Tatouage tête" name="Head Tattoos" tool_tip="Cliquez pour sélectionner une image"/>
-		<texture_picker label="Tatouage haut" name="Upper Tattoos" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Tatouage tête" name="Head Tattoos" width="76" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Tatouage haut" name="Upper Tattoos" width="80" tool_tip="Cliquez pour sélectionner une image"/>
 		<texture_picker label="Tatouage bas" name="Lower Tattoos" tool_tip="Cliquez pour sélectionner une image"/>
 	</panel>
 	<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml
index 9d0f13c4e8..e9784b9510 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml
@@ -2,7 +2,7 @@
 <panel name="edit_skirt_panel">
 	<panel name="avatar_skirt_color_panel">
 		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
-		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
 	</panel>
 	<accordion name="wearable_accordion">
 		<accordion_tab name="skirt_main_tab" title="Jupe"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_socks.xml b/indra/newview/skins/default/xui/fr/panel_edit_socks.xml
index 8b062e0145..6fc6a3dc77 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_socks.xml
@@ -2,7 +2,7 @@
 <panel name="edit_socks_panel">
 	<panel name="avatar_socks_color_panel">
 		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
-		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
 	</panel>
 	<accordion name="wearable_accordion">
 		<accordion_tab name="socks_main_tab" title="Chaussettes"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml
index 1faee191e0..7ab2aa6bc9 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_tattoo_panel">
 	<panel name="avatar_tattoo_color_panel">
-		<texture_picker label="Tatouage tête" name="Head Tattoo" tool_tip="Cliquez pour sélectionner une image"/>
-		<texture_picker label="Tatouage haut" name="Upper Tattoo" tool_tip="Cliquez pour sélectionner une image"/>
-		<texture_picker label="Tatouage bas" name="Lower Tattoo" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Tatouage tête" name="Head Tattoo" width="76" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Tatouage haut" name="Upper Tattoo" width="80" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Tatouage bas" name="Lower Tattoo" width="76" tool_tip="Cliquez pour sélectionner une image"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml
index b9164ad862..6323462877 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml
@@ -2,7 +2,7 @@
 <panel name="edit_underpants_panel">
 	<panel name="avatar_underpants_color_panel">
 		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
-		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
 	</panel>
 	<accordion name="wearable_accordion">
 		<accordion_tab name="underpants_main_tab" title="Sous-vêtements (femme)"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml
index 462eff9451..5af733d8a2 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml
@@ -2,7 +2,7 @@
 <panel name="edit_undershirt_panel">
 	<panel name="avatar_undershirt_color_panel">
 		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
-		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
 	</panel>
 	<accordion name="wearable_accordion">
 		<accordion_tab name="undershirt_main_tab" title="Sous-vêtements (homme)"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml
index 24ea030b33..c6ab686b0e 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml
@@ -96,6 +96,6 @@
 	</panel>
 	<panel name="button_panel">
 		<button label="Enregistrer sous" name="save_as_button"/>
-		<button label="Annuler modification" name="revert_button"/>
+		<button label="Annuler modification" width="130" name="revert_button"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
index b2f61fde71..8207fd7735 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
@@ -32,7 +32,7 @@
 	<panel name="button_row">
 		<button label="Créer" label_selected="Nouveau groupe" name="btn_create"/>
 		<button label="Chat de groupe" name="btn_chat"/>
-		<button label="Appel de groupe" name="btn_call"/>
+		<button label="Appel de groupe" width="100" name="btn_call"/>
 		<button label="Enregistrer" label_selected="Enregistrer" name="btn_apply"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
index 3ca22b6e21..e421a35ffa 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
@@ -16,13 +16,13 @@
 	<text name="group_land_heading">
 		Terrain du groupe
 	</text>
-	<scroll_list name="group_parcel_list">
-		<column label="Parcelle" name="name"/>
-		<column label="Région" name="location"/>
-		<column label="Type" name="type"/>
-		<column label="Surface" name="area"/>
-		<column label="" name="hidden"/>
-	</scroll_list>
+	<scroll_list name="group_parcel_list" width="310">
+        <columnlabel="Parcelle"name="name"width="76" />
+        <column         label="Région"         name="location"         width="78" />
+        <column         label="Type"         name="type"         width="70" />
+        <column         label="Surface"         name="area"         width="50" />
+        <column         label=""         name="hidden"         width="-1" />
+    </scroll_list>
 	<button label="Carte" label_selected="Carte" name="map_button"/>
 	<text name="total_contributed_land_label">
 		Total des contributions :
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
index 1ec63cf027..68c74f9322 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
@@ -27,23 +27,23 @@ Vous pouvez désactiver la réception des notices dans l&apos;onglet Général.
 		<text name="lbl">
 			Créer une notice
 		</text>
-		<text bottom_delta="-79" left="20" name="lbl3">
+		<text name="lbl3">
 			Sujet :
 		</text>
-		<line_editor left_delta="61" name="create_subject" width="331"/>
-		<text left="20" name="lbl4">
+		<line_editor name="create_subject" />
+		<text  name="lbl4">
 			Message :
 		</text>
-		<text_editor bottom_delta="-90" height="104" left_delta="61" name="create_message" width="330"/>
-		<text name="lbl5" width="68">
+		<text_editor name="create_message"/>
+		<text name="lbl5" >
 			Pièce-jointe :
 		</text>
-		<line_editor left_delta="74" name="create_inventory_name" width="190"/>
+		<line_editor name="create_inventory_name"/>
 		<text name="string">
 			Faire glisser l&apos;objet et le déposer ici pour le joindre :
 		</text>
-		<button label="Supprimer" label_selected="Supprimer pièce-jointe" left="274" name="remove_attachment" width="140"/>
-		<button label="Envoyer" label_selected="Envoyer" left="274" name="send_notice" width="140"/>
+		<button label="Supprimer" label_selected="Supprimer pièce-jointe" name="remove_attachment"/>
+		<button label="Envoyer" label_selected="Envoyer" left="200" name="send_notice" width="100"/>
 		<group_drop_target name="drop_target" tool_tip="Faites glisser un objet de l&apos;inventaire jusqu&apos;à cette case pour l&apos;envoyer avec la notice. Vous devez avoir l&apos;autorisation de copier et transférer l&apos;objet pour pouvoir le joindre."/>
 	</panel>
 	<panel label="Voir ancienne notice" name="panel_view_past_notice">
diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
index d0c9f2f302..400d4d6aee 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
@@ -6,14 +6,14 @@
 	<panel.string name="want_apply_text">
 		Voulez-vous enregistrer vos modifications ?
 	</panel.string>
-	<tab_container height="164" name="roles_tab_container">
-		<panel height="148" label="MEMBRES" name="members_sub_tab" tool_tip="Membres">
+	<tab_container name="roles_tab_container">
+		<panel label="MEMBRES" name="members_sub_tab" tool_tip="Membres">
 			<panel.string name="help_text">
 				Vous pouvez ajouter ou supprimer les rôles assignés aux membres.
 Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la touche Ctrl enfoncée.
 			</panel.string>
 			<filter_editor label="Filtrer les membres" name="filter_input"/>
-			<name_list bottom_delta="-105" height="104" name="member_list">
+			<name_list name="member_list">
 				<name_list.columns label="Membre" name="name"/>
 				<name_list.columns label="Donation" name="donated" width="116"/>
 				<name_list.columns label="Statut" name="online" width="136"/>
@@ -21,7 +21,7 @@ Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la to
 			<button label="Inviter" name="member_invite" width="165"/>
 			<button label="Expulser" name="member_eject"/>
 		</panel>
-		<panel height="148" label="RÔLES" name="roles_sub_tab">
+		<panel label="RÔLES" name="roles_sub_tab">
 			<panel.string name="help_text">
 				Chaque rôle possède un titre et des
 pouvoirs. Les membres peuvent avoir
@@ -41,13 +41,13 @@ notamment les rôles Tous et Propriétaire.
 				Checkbox_Off
 			</panel.string>
 			<filter_editor label="Filtrer les rôles" name="filter_input"/>
-			<scroll_list bottom_delta="-104" height="104" name="role_list">
+			<scroll_list name="role_list">
 				<scroll_list.columns label="Rôle" name="name"/>
 				<scroll_list.columns label="Titre" name="title"/>
 				<scroll_list.columns label="#" name="members"/>
 			</scroll_list>
 			<button label="Nouveau rôle" name="role_create"/>
-			<button label="Supprimer le rôle" name="role_delete"/>
+			<button label="Supprimer le rôle" width="120" name="role_delete"/>
 		</panel>
 		<panel height="148" label="POUVOIRS" name="actions_sub_tab" tool_tip="Vous pouvez afficher une description du pouvoir et voir quels membres et rôles peuvent s&apos;en servir.">
 			<panel.string name="help_text">
diff --git a/indra/newview/skins/default/xui/fr/panel_groups.xml b/indra/newview/skins/default/xui/fr/panel_groups.xml
index 98320656fb..4cda98b9f7 100644
--- a/indra/newview/skins/default/xui/fr/panel_groups.xml
+++ b/indra/newview/skins/default/xui/fr/panel_groups.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="groups">
 	<scroll_list bottom="50" name="group list"/>
-	<text bottom="16" height="32" name="groupdesc" width="268">
+	<text name="groupdesc">
 		Le groupe actif est en gras.
 	</text>
-	<text bottom="3" name="groupcount">
+	<text name="groupcount" width="280">
 		Vous appartenez à [COUNT] groupes ([MAX] max).
 	</text>
 	<button label="IM/Appel" name="IM" tool_tip="Ouvrir une session de messagerie instantanée"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml
index 8f0561d243..75648d3541 100644
--- a/indra/newview/skins/default/xui/fr/panel_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_login.xml
@@ -23,7 +23,7 @@
 			<text name="start_location_text">
 				Commencer à :
 			</text>
-			<combo_box name="start_location_combo">
+			<combo_box name="start_location_combo" width="152">
 				<combo_box.item label="Dernier emplacement" name="MyLastLocation"/>
 				<combo_box.item label="Domicile" name="MyHome"/>
 				<combo_box.item label="&lt;Saisissez le nom de la région&gt;" name="Typeregionname"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml
index 36d5f4e860..9d070b7aff 100644
--- a/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml
@@ -2,7 +2,8 @@
 <panel label="Sécurité" name="Media Settings Security">
 	<check_box initial_value="false" label="Autoriser l&apos;accès aux styles d&apos;URL spécifiés uniquement" name="whitelist_enable"/>
 	<text name="home_url_fails_some_items_in_whitelist">
-		Les entrées par lesquelles la page d&apos;accueil est rejetée sont indiquées :
+		Les entrées par lesquelles la page 
+d&apos;accueil est rejetée sont indiquées :
 	</text>
 	<button label="Ajouter" name="whitelist_add"/>
 	<button label="Supprimer" name="whitelist_del"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
index fa1ddd2430..f1a7ebb35c 100644
--- a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
@@ -2,8 +2,8 @@
 <!-- All our XML is utf-8 encoded. -->
 <panel name="nearby_chat">
 	<panel name="chat_caption">
-		<text name="sender_name">
-			CHAT PRÈS DE VOUS
-		</text>
+    	<text 
+	name="sender_name" 
+width="170">CHAT PRÈS DE VOUS</text>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_notes.xml b/indra/newview/skins/default/xui/fr/panel_notes.xml
index b1be274616..ba052a0e07 100644
--- a/indra/newview/skins/default/xui/fr/panel_notes.xml
+++ b/indra/newview/skins/default/xui/fr/panel_notes.xml
@@ -14,8 +14,8 @@
 		</layout_panel>
 		<layout_panel name="notes_buttons_panel">
 			<button label="Devenir amis" name="add_friend" tool_tip="Proposer à ce résident de devenir votre ami"/>
-			<button label="IM" name="im" tool_tip="Ouvrir une session IM"/>
-			<button label="Appeler" name="call" tool_tip="Appeler ce résident"/>
+			<button label="IM" name="im" width="30" tool_tip="Ouvrir une session IM"/>
+			<button label="Appeler" name="call" width="60" tool_tip="Appeler ce résident"/>
 			<button label="Carte" name="show_on_map_btn" tool_tip="Afficher le résident sur la carte"/>
 			<button label="Téléporter" name="teleport" tool_tip="Proposez une téléportation"/>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
index 04abcc8aad..0c0cc29e7a 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
@@ -9,7 +9,7 @@
 	<check_box label="Bulles de chat" name="bubble_text_chat"/>
 	<color_swatch name="background" tool_tip="Choisir la couleur des bulles de chat"/>
 	<slider label="Opacité" name="bubble_chat_opacity"/>
-	<text name="AspectRatioLabel1" tool_tip="largeur/hauteur">
+	<text width="140" name="AspectRatioLabel1" tool_tip="largeur/hauteur">
 		Rapport hauteur/largeur
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index 4459244395..9576119eb5 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -17,7 +17,7 @@
 	<text name="QualitySpeed">
 		Qualité et vitesse :
 	</text>
-	<text left="105" name="FasterText">
+	<text left="35" name="FasterText">
 		Plus rapide
 	</text>
 	<text name="BetterText">
@@ -62,7 +62,7 @@
 		<text name="DrawDistanceMeterText2">
 			m
 		</text>
-		<slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount"/>
+		<slider label="Nombre de particules max. :" label_width="147" name="MaxParticleCount"/>
 		<slider label="Qualité post-traitement :" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
 			Détails des rendus :
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
index 68a735df90..f7792f2e63 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -18,7 +18,7 @@
 		kbps
 	</text>
 	<check_box label="Port de connexion personnalisé" name="connection_port_enabled"/>
-	<spinner label="Numéro de port :" name="web_proxy_port"/>
+	<spinnerlabel="Numéro de port :" label_width="95" name="web_proxy_port" width="170"/>
 	<text name="cache_size_label_l">
 		Taille de la mémoire
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile.xml b/indra/newview/skins/default/xui/fr/panel_profile.xml
index 0c33a0f1e0..19c6a3b090 100644
--- a/indra/newview/skins/default/xui/fr/panel_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_profile.xml
@@ -39,8 +39,8 @@
 		</layout_panel>
 		<layout_panel name="profile_buttons_panel">
 			<button label="Devenir amis" name="add_friend" tool_tip="Proposer à ce résident de devenir votre ami"/>
-			<button label="IM" name="im" tool_tip="Ouvrir une session IM"/>
-			<button label="Appeler" name="call" tool_tip="Appeler ce résident"/>
+			<button label="IM" name="im" width="30" tool_tip="Ouvrir une session IM"/>
+			<button label="Appeler" name="call" width="60" tool_tip="Appeler ce résident"/>
 			<button label="Carte" name="show_on_map_btn" tool_tip="Afficher le résident sur la carte"/>
 			<button label="Téléporter" name="teleport" tool_tip="Proposez une téléportation"/>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
index cf9f4e0fd0..cd1d0c4886 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
@@ -18,7 +18,7 @@
 	<text name="estate_cov_lbl">
 		Règlement :
 	</text>
-	<text name="covenant_timestamp_text">
+	<text name="covenant_timestamp_text" width="350">
 		Dernière modification le mercredi 31 décembre 1969 16:00:00
 	</text>
 	<button label="?" name="covenant_help"/>
@@ -27,8 +27,8 @@
 	</text_editor>
 	<button label="Réinitialiser" name="reset_covenant"/>
 	<text name="covenant_help_text">
-		Les changements apportés au règlement apparaîtront sur toutes
-      les parcelles du domaine.
+		Les changements apportés au règlement apparaîtront sur
+toutes les parcelles du domaine.
 	</text>
 	<text bottom_delta="-31" name="covenant_instructions">
 		Faire glisser une note pour changer le règlement de ce domaine.
diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
index 0fabf92889..cb4a74e142 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
@@ -13,7 +13,7 @@
 	<check_box label="Désactiver la physique" name="disable_physics_check" tool_tip="Désactiver tous les effets liés à la physique dans cette région"/>
 	<button label="?" name="disable_physics_help"/>
 	<button bottom_delta="-38" label="Appliquer" name="apply_btn"/>
-	<text bottom_delta="-42" name="objret_text_lbl">
+	<text bottom_delta="-42" name="objret_text_lbl" width="260">
 		Renvoi de l&apos;objet
 	</text>
 	<text name="resident_text_lbl">
diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
index a0282dd940..f9262ea478 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Domaine" name="Estate">
 	<text bottom="-34" name="estate_help_text">
-		Les modifications des paramètres de cet onglet affecteront toutes les régions du domaine.
+		Les modifications des paramètres de cet 
+onglet affecteront toutes les régions du 
+domaine.
 	</text>
-	<text bottom_delta="-34" name="estate_text">
+	<text top_pad="8" bottom_delta="-34" name="estate_text">
 		Domaine :
 	</text>
 	<text name="estate_name">
diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml
index 8a59adbd93..711278d614 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_general.xml
@@ -32,9 +32,9 @@
 	<button label="?" name="parcel_changes_help"/>
 	<check_box label="Ne pas afficher dans la recherche" name="block_parcel_search_check" tool_tip="Afficher cette région et ses parcelles dans les résultats de recherche"/>
 	<button label="?" name="parcel_search_help"/>
-	<spinner label="Nombre maximum d&apos;avatars" label_width="127" name="agent_limit_spin" width="190"/>
+	<spinner label="Nombre maximum d&apos;avatars" name="agent_limit_spin" label_width="160" width="240"/>
 	<button label="?" name="agent_limit_help"/>
-	<spinner label="Bonus objet" label_width="127" name="object_bonus_spin" width="190"/>
+	<spinner label="Bonus objet" name="object_bonus_spin" label_width="160" width="240"/>
 	<button label="?" name="object_bonus_help"/>
 	<text label="Maturité" name="access_text">
 		Catégorie :
diff --git a/indra/newview/skins/default/xui/fr/panel_region_general_layout.xml b/indra/newview/skins/default/xui/fr/panel_region_general_layout.xml
index 0e72bbc9f5..e709100fa2 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_general_layout.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_general_layout.xml
@@ -3,19 +3,19 @@
 	<text name="region_text_lbl">
 		Région :
 	</text>
-	<text name="region_text">
+	<text name="region_text" left_delta="56">
 		inconnu
 	</text>
 	<text name="version_channel_text_lbl">
 		Version :
 	</text>
-	<text name="version_channel_text">
+	<text name="version_channel_text" left_delta="56">
 		inconnu
 	</text>
 	<text name="region_type_lbl">
 		Type :
 	</text>
-	<text name="region_type">
+	<text name="region_type" left_delta="56">
 		inconnu
 	</text>
 	<check_box label="Interdire le terraformage" name="block_terraform_check"/>
@@ -25,8 +25,8 @@
 	<check_box label="Autoriser la revente de terrains" name="allow_land_resell_check"/>
 	<check_box label="Autoriser la fusion/division de terrains" name="allow_parcel_changes_check"/>
 	<check_box label="Interdire l&apos;affichage du terrain dans les recherches" name="block_parcel_search_check" tool_tip="Permettre aux autres résidents de voir cette région et ses parcelles dans les résultats de recherche"/>
-	<spinner label="Nombre maximum d&apos;avatars" name="agent_limit_spin"/>
-	<spinner label="Bonus objet" name="object_bonus_spin"/>
+	<spinner label="Nombre maximum d&apos;avatars" name="agent_limit_spin" label_width="160" width="240"/>
+	<spinner label="Bonus objet" name="object_bonus_spin" label_width="160" width="240"/>
 	<text label="Accès" name="access_text">
 		Catégorie :
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_texture.xml b/indra/newview/skins/default/xui/fr/panel_region_texture.xml
index a7abb49b1a..e95d911c01 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_texture.xml
@@ -39,7 +39,7 @@
 	<text name="height_text_lbl9">
 		Nord-est
 	</text>
-	<text name="height_text_lbl10">
+	<text name="height_text_lbl10" width="460">
 		Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
 	</text>
 	<text name="height_text_lbl11">
diff --git a/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml
index 24656bf379..47d8382e57 100644
--- a/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml
@@ -4,7 +4,7 @@
 		Chargement...
 	</text>
 	<scroll_list name="scripts_list">
-		<scroll_list.columns label="Taille (Ko)" name="size"/>
+		<scroll_list.columns label="Taille (Ko)" width="80" name="size"/>
 		<scroll_list.columns label="URL" name="urls"/>
 		<scroll_list.columns label="Nom de l&apos;objet" name="name"/>
 		<scroll_list.columns label="Endroit" name="location"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml
index 1e5e680c09..9426047ee1 100644
--- a/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml
@@ -13,9 +13,9 @@
 		Chargement...
 	</text>
 	<scroll_list name="scripts_list">
-		<scroll_list.columns label="Taille (Ko)" name="size"/>
+		<scroll_list.columns label="Taille (Ko)" width="80" name="size"/>
 		<scroll_list.columns label="Nom de l&apos;objet" name="name"/>
-		<scroll_list.columns label="Propriétaire d&apos;objet" name="owner"/>
+		<scroll_list.columns label="Propriétaire d&apos;objet" width="140" name="owner"/>
 		<scroll_list.columns label="Parcelle/emplacement" name="location"/>
 	</scroll_list>
 	<button label="Rafraîchir la liste" name="refresh_list_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_side_tray.xml b/indra/newview/skins/default/xui/fr/panel_side_tray.xml
index 3ad1671921..6329324a23 100644
--- a/indra/newview/skins/default/xui/fr/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/fr/panel_side_tray.xml
@@ -2,26 +2,26 @@
 <!-- Side tray cannot show background because it is always
 	partially on screen to hold tab buttons. -->
 <side_tray name="sidebar">
-	<sidetray_tab description="Activer/désactiver le panneau latéral." name="sidebar_openclose"/>
-	<sidetray_tab description="Domicile." name="sidebar_home">
+	<sidetray_tab description="Activer/désactiver le panneau latéral." name="sidebar_openclose" tab_title="Activer/désactiver le panneau latéral"/>
+	<sidetray_tab description="Domicile." name="sidebar_home" tab_title="Accueil">
 		<panel label="domicile" name="panel_home"/>
 	</sidetray_tab>
-	<sidetray_tab description="Modifiez votre profil public et vos Favoris." name="sidebar_me">
+	<sidetray_tab description="Modifiez votre profil public et vos Favoris." name="sidebar_me" tab_title="Mon profil">
 		<panel label="Moi" name="panel_me"/>
 	</sidetray_tab>
-	<sidetray_tab description="Trouvez vos amis, vos contacts et les personnes se trouvant près de vous." name="sidebar_people">
+	<sidetray_tab description="Trouvez vos amis, vos contacts et les personnes se trouvant près de vous." name="sidebar_people" tab_title="Personnes">
 		<panel_container name="panel_container">
 			<panel label="Profil du groupe" name="panel_group_info_sidetray"/>
 			<panel label="Résidents et objets ignorés" name="panel_block_list_sidetray"/>
 		</panel_container>
 	</sidetray_tab>
-	<sidetray_tab description="Trouvez de nouveaux lieux à découvrir et les lieux que vous connaissez déjà." label="Lieux" name="sidebar_places">
+	<sidetray_tab description="Trouvez de nouveaux lieux à découvrir et les lieux que vous connaissez déjà." label="Lieux" name="sidebar_places" tab_title="Endroits">
 		<panel label="Lieux" name="panel_places"/>
 	</sidetray_tab>
-	<sidetray_tab description="Parcourez votre inventaire." name="sidebar_inventory">
+	<sidetray_tab description="Parcourez votre inventaire." name="sidebar_inventory" tab_title="Mon inventaire">
 		<panel label="Modifier l&apos;inventaire" name="sidepanel_inventory"/>
 	</sidetray_tab>
-	<sidetray_tab description="Modifiez votre apparence actuelle." name="sidebar_appearance">
+	<sidetray_tab description="Modifiez votre apparence actuelle." name="sidebar_appearance" tab_title="Mon apparence">
 		<panel label="Changer d&apos;apparence" name="sidepanel_appearance"/>
 	</sidetray_tab>
 </side_tray>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 1888dc1827..c6f73dde21 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1486,8 +1486,8 @@
 	<string name="covenant_last_modified">
 		Dernière modification :
 	</string>
-	<string name="none_text" value=" (aucun) "/>
-	<string name="never_text" value=" (jamais) "/>
+	<string name="none_text" value=" (aucun)"/>
+	<string name="never_text" value=" (jamais)"/>
 	<string name="GroupOwned">
 		Propriété du groupe
 	</string>
-- 
cgit v1.2.3


From fc897b2ed73b8f48aa4d8a00e04e427ce658a777 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 8 Feb 2010 13:43:31 -0800
Subject: DEV-43688 fix bad xml

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

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

diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
index f7792f2e63..d477a9532d 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -18,7 +18,7 @@
 		kbps
 	</text>
 	<check_box label="Port de connexion personnalisé" name="connection_port_enabled"/>
-	<spinnerlabel="Numéro de port :" label_width="95" name="web_proxy_port" width="170"/>
+	<spinner label="Numéro de port :" label_width="95" name="web_proxy_port" width="170"/>
 	<text name="cache_size_label_l">
 		Taille de la mémoire
 	</text>
-- 
cgit v1.2.3


From 4f25dba20dd58d8a2ecc0e9e55f7f470c12a31a0 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 8 Feb 2010 13:45:58 -0800
Subject: DEV-43688 fix bad xml

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

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

diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
index e421a35ffa..02b14cb859 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
@@ -17,7 +17,7 @@
 		Terrain du groupe
 	</text>
 	<scroll_list name="group_parcel_list" width="310">
-        <columnlabel="Parcelle"name="name"width="76" />
+        <column	label="Parcelle" name="name" width="76" />
         <column         label="Région"         name="location"         width="78" />
         <column         label="Type"         name="type"         width="70" />
         <column         label="Surface"         name="area"         width="50" />
-- 
cgit v1.2.3


From a50768669df928e19965f0c4fcc4a40d392b66ef Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 8 Feb 2010 14:00:39 -0800
Subject: DEV-43688 Cycle3 Tim's resizing of JA GUI

---
 indra/newview/skins/default/xui/ja/floater_about.xml       |  3 ++-
 indra/newview/skins/default/xui/ja/floater_about_land.xml  | 14 +++++++-------
 .../skins/default/xui/ja/floater_animation_preview.xml     |  4 ++--
 .../skins/default/xui/ja/floater_avatar_textures.xml       |  4 ++--
 indra/newview/skins/default/xui/ja/floater_bulk_perms.xml  |  2 +-
 indra/newview/skins/default/xui/ja/floater_buy_land.xml    |  4 ++--
 .../skins/default/xui/ja/floater_day_cycle_options.xml     |  4 ++--
 indra/newview/skins/default/xui/ja/floater_god_tools.xml   |  8 +++++---
 indra/newview/skins/default/xui/ja/floater_inspect.xml     |  4 ++--
 indra/newview/skins/default/xui/ja/floater_joystick.xml    |  4 ++--
 .../default/xui/ja/floater_preview_gesture_shortcut.xml    |  4 ++--
 .../newview/skins/default/xui/ja/floater_report_abuse.xml  |  2 +-
 indra/newview/skins/default/xui/ja/floater_telehub.xml     |  5 +----
 indra/newview/skins/default/xui/ja/floater_url_entry.xml   |  8 ++++----
 indra/newview/skins/default/xui/ja/panel_edit_alpha.xml    |  6 +++---
 indra/newview/skins/default/xui/ja/panel_edit_profile.xml  |  2 +-
 indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml   |  6 +++---
 .../skins/default/xui/ja/panel_group_info_sidetray.xml     |  2 +-
 .../skins/default/xui/ja/panel_group_land_money.xml        |  6 +++---
 indra/newview/skins/default/xui/ja/panel_groups.xml        |  2 +-
 indra/newview/skins/default/xui/ja/panel_login.xml         |  4 ++--
 .../skins/default/xui/ja/panel_outfits_inventory.xml       |  2 +-
 .../newview/skins/default/xui/ja/panel_region_covenant.xml |  8 ++++----
 indra/newview/skins/default/xui/ja/panel_region_estate.xml |  2 +-
 .../newview/skins/default/xui/ja/panel_region_general.xml  |  6 +++---
 .../skins/default/xui/ja/panel_region_general_layout.xml   | 10 +++++-----
 .../newview/skins/default/xui/ja/panel_region_texture.xml  |  3 ++-
 .../skins/default/xui/ja/panel_script_limits_my_avatar.xml |  2 +-
 .../default/xui/ja/panel_script_limits_region_memory.xml   |  4 ++--
 29 files changed, 68 insertions(+), 67 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 0fa20ab1ac..78bc355f4b 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -61,7 +61,8 @@ Vivox バージョン： [VIVOX_VERSION]
   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)
+  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.
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index 71a38391cd..49486d791a 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -97,7 +97,7 @@
 			<text name="For Sale: Price L$[PRICE].">
 				価格： L$[PRICE] （L$[PRICE_PER_SQM]/平方メートル）
 			</text>
-			<button label="土地を売る" label_selected="土地を販売..." name="Sell Land..."/>
+			<button label="土地を売る" label_selected="土地を販売..." name="Sell Land..." width="100"/>
 			<text name="For sale to">
 				販売先：[BUYER]
 			</text>
@@ -107,7 +107,7 @@
 			<text name="Selling with no objects in parcel.">
 				オブジェクトは販売しない
 			</text>
-			<button label="土地販売の取り消し" label_selected="土地販売の取り消し" name="Cancel Land Sale"/>
+			<button label="土地販売の取り消し" label_selected="土地販売の取り消し" name="Cancel Land Sale"  width="100"/>
 			<text name="Claimed:">
 				取得日時：
 			</text>
@@ -126,10 +126,10 @@
 			<text name="DwellText">
 				誤
 			</text>
-			<button label="土地の購入" label_selected="土地を購入..." left="130" name="Buy Land..." width="125"/>
-			<button label="スクリプト情報" name="Scripts..."/>
+			<button label="土地の購入" label_selected="土地を購入..." left="130" name="Buy Land..." width="100"/>
+			<button label="スクリプト情報" name="Scripts..." width="100"/>
 			<button label="グループに購入" label_selected="グループ用に購入..." name="Buy For Group..."/>
-			<button label="入場許可を購入" label_selected="入場許可を購入..." left="130" name="Buy Pass..." tool_tip="この土地への一時的なアクセスを許可します。" width="125"/>
+			<button label="入場許可を購入" label_selected="入場許可を購入..." left="130" name="Buy Pass..." tool_tip="この土地への一時的なアクセスを許可します。" width="100"/>
 			<button label="土地の放棄" label_selected="土地を放棄..." name="Abandon Land..."/>
 			<button label="土地を取り戻す" label_selected="土地の返還を要求..." name="Reclaim Land..."/>
 			<button label="リンデンセール" label_selected="Lindenセール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。"/>
@@ -364,7 +364,7 @@
 			<text name="Snapshot:">
 				スナップショット：
 			</text>
-			<texture_picker label="" left="116" name="snapshot_ctrl" tool_tip="写真をクリックして選択"/>
+			<texture_picker label="" name="snapshot_ctrl" tool_tip="写真をクリックして選択"/>
 			<text name="landing_point">
 				着地点: [LANDING]
 			</text>
@@ -400,7 +400,7 @@
 			<text name="Media texture:">
 				テクスチャの置き換え：
 			</text>
-			<texture_picker label="" name="media texture" tool_tip="写真をクリックして選択"/>
+			<texture_picker label="" name="media texture" tool_tip="写真をクリックして選択" left="120"/>
 			<text name="replace_texture_help" width="290">
 				このテクスチャを使用するオブジェクトのプレイをクリックすると、ムービーや Web ページを表示します。  テクスチャを変更するにはサムネイルを選択してください。
 			</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
index c355924f33..f0378f61d7 100644
--- a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
@@ -114,8 +114,8 @@
 	</text>
 	<spinner label="優先順位" name="priority" tool_tip="このアニメーションがどのアニメーションを上書きするかを決めます"/>
 	<check_box label="ループ" name="loop_check" tool_tip="このアニメーションをループ再生します"/>
-	<spinner label="イン(％)" label_width="45" left="70" name="loop_in_point" tool_tip="アニメーションのループ復帰点を設定します" width="100"/>
-	<spinner label="アウト(％)" label_width="60" left="170" name="loop_out_point" tool_tip="アニメーションのループ終了点を設定します" width="100"/>
+	<spinner label="イン(％)" label_width="45" left="60" name="loop_in_point" tool_tip="アニメーションのループ復帰点を設定します" width="100"/>
+	<spinner label="アウト(％)" label_width="50" left="170" name="loop_out_point" tool_tip="アニメーションのループ終了点を設定します" width="100"/>
 	<text name="hand_label">
 		手の動き
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
index a199a10823..ff8b2083ad 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
@@ -3,13 +3,13 @@
 	<floater.string name="InvalidAvatar">
 		無効なアバター
 	</floater.string>
-	<text name="label">
+	<text name="label" width="100">
 		ベークドテクスチャ
 	</text>
 	<text name="composite_label" width="128">
 		合成テクスチャー
 	</text>
-	<button label="テクスチャID一覧をコンソールに書き込む" label_selected="捨てる" name="Dump"/>
+	<button label="テクスチャID一覧をコンソールに書き込む" label_selected="捨てる" name="Dump" width="200"/>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<texture_picker label="髪" name="hair-baked"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
index fbbbd85890..7ac9187aad 100644
--- a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
@@ -43,7 +43,7 @@
 		全員：
 	</text>
 	<check_box label="コピー" name="everyone_copy"/>
-	<text name="NextOwnerLabel">
+	<text name="NextOwnerLabel" left="160">
 		次の所有者：
 	</text>
 	<check_box label="修正" name="next_owner_modify"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
index 13b43d1257..97fae511f6 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
@@ -27,10 +27,10 @@
 	<text name="resellable_changeable_label">
 		この地域で購入した土地：
 	</text>
-	<text name="resellable_clause">
+	<text name="resellable_clause" left="460">
 		再販できる場合とできない場合があります。
 	</text>
-	<text name="changeable_clause">
+	<text name="changeable_clause" left="460">
 		統合または再分割できる場合とできない場合があります。
 	</text>
 	<text name="covenant_text">
diff --git a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
index 2d8b54cdd5..3bd5ed2837 100644
--- a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
@@ -84,10 +84,10 @@
 			<text name="DayCycleText3">
 				プレビュー：
 			</text>
-			<button label="再生" label_selected="再生" name="WLAnimSky" />
+			<button label="再生" label_selected="再生" name="WLAnimSky" left_delta="70"/>
 			<button label="停止!" label_selected="停止" name="WLStopAnimSky" />
 			<button label="不動産の時刻を使用"
-			     label_selected="不動産の時刻に変更" name="WLUseLindenTime" />
+			     label_selected="不動産の時刻に変更" name="WLUseLindenTime" width="140"/>
 			<button label="デイ・テストを保存"
 			     label_selected="デイ・テストを保存" name="WLSaveDayCycle" />
 			<button label="デイ・テストをロード"
diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
index 18380bddc2..075cde8dec 100644
--- a/indra/newview/skins/default/xui/ja/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
@@ -2,7 +2,7 @@
 <floater name="godtools floater" title="ゴッド・ツール">
 	<tab_container name="GodTools Tabs">
 		<panel label="グリッド" name="grid">
-			<button label="すべてのユーザーを追い出す" label_selected="すべてのユーザーを追い出す" name="Kick all users"/>
+			<button label="すべてのユーザーを追い出す" label_selected="すべてのユーザーを追い出す" name="Kick all users" width="160"/>
 			<button label="この地域の地図の表示キャッシュを消去" label_selected="この地域の地図の表示キャッシュを消去" name="Flush This Region&apos;s Map Visibility Caches"/>
 		</panel>
 		<panel label="地域" name="region">
@@ -33,13 +33,15 @@
 			<line_editor name="gridposx" tool_tip="これは、この地域のグリッドxの位置です。"/>
 			<line_editor name="gridposy" tool_tip="これは、この地域のグリッドyの位置です。"/>
 			<text name="Redirect to Grid: ">
-				グリッドにリダイレクト：
+				グリッドにリダ
+イレクト：
 			</text>
 			<text name="billable factor text">
 				請求率：
 			</text>
 			<text name="land cost text">
-				平方メートル当たりL$：
+				平方メートル当
+たりL$：
 			</text>
 			<button label="更新" label_selected="更新" name="Refresh" tool_tip="上記の情報を更新するには、ここをクリックします。"/>
 			<button label="適用" label_selected="適用" name="Apply" tool_tip="上記の変更を適用するには、ここをクリックします。"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml
index b7c657c2f9..63a8fb978b 100644
--- a/indra/newview/skins/default/xui/ja/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml
@@ -9,6 +9,6 @@
 		<scroll_list.columns label="制作者名" name="creator_name"/>
 		<scroll_list.columns label="作成日" name="creation_date"/>
 	</scroll_list>
-	<button label="所有者のプロフィールを表示..." name="button owner" tool_tip="選択されたオブジェクトの所有者のプロフィールを見る"/>
-	<button label="制作者のプロフィールを表示..." name="button creator" tool_tip="選択されたオブジェクトの制作者のプロフィールを見る"/>
+	<button label="所有者のプロフィールを表示..." name="button owner" tool_tip="選択されたオブジェクトの所有者のプロフィールを見る" width="180"/>
+	<button label="制作者のプロフィールを表示..." name="button creator" tool_tip="選択されたオブジェクトの制作者のプロフィールを見る" width="180"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml
index 9d91fe8db9..65eeebe4ed 100644
--- a/indra/newview/skins/default/xui/ja/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/ja/floater_joystick.xml
@@ -71,7 +71,7 @@
 	<spinner left="135" name="AvatarAxisDeadZone0" width="50"/>
 	<spinner left="205" name="BuildAxisDeadZone0" width="50"/>
 	<spinner left="275" name="FlycamAxisDeadZone0" width="50"/>
-	<text left="0" name="PitchDeadZone" width="135">
+	<text left="0" name="PitchDeadZone" width="125">
 		ピッチ・デッド・ゾーン
 	</text>
 	<spinner left="135" name="AvatarAxisDeadZone4" width="50"/>
@@ -83,7 +83,7 @@
 	<spinner left="135" name="AvatarAxisDeadZone5" width="50"/>
 	<spinner left="205" name="BuildAxisDeadZone5" width="50"/>
 	<spinner left="275" name="FlycamAxisDeadZone5" width="50"/>
-	<text left="0" name="RollDeadZone" width="135">
+	<text left="0" name="RollDeadZone" width="125">
 		ロール・デッド・ゾーン
 	</text>
 	<spinner left="205" name="BuildAxisDeadZone3" width="50"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture_shortcut.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture_shortcut.xml
index 596699d6c1..e96a43d0c1 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_gesture_shortcut.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture_shortcut.xml
@@ -6,8 +6,8 @@
 	<text name="key_label">
 		キーボード：
 	</text>
-	<combo_box label="なし" name="modifier_combo"/>
-	<combo_box label="なし" name="key_combo"/>
+	<combo_box label="なし" name="modifier_combo" width="60"/>
+	<combo_box label="なし" name="key_combo" width="60"/>
 	<text name="replace_text" tool_tip="これらの単語にトリガーとなる単語を置き換えます。 例えば、「howdy」と「hello」を置き換えると、「I wanted to say hello」というチャットは、ジェスチャーを交えながらの「I wanted to say howdy」に変わります。">
 		置き換え：
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index ca6faf59c2..964a99c3a4 100644
--- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
@@ -92,7 +92,7 @@
 	<text name="dscr_title">
 		詳細：
 	</text>
-	<text name="bug_aviso">
+	<text name="bug_aviso" width="210">
 		できるだけ具体的に詳しく記入してください。
 	</text>
 	<text name="incomplete_title">
diff --git a/indra/newview/skins/default/xui/ja/floater_telehub.xml b/indra/newview/skins/default/xui/ja/floater_telehub.xml
index bdb92c8e30..79af7a7809 100644
--- a/indra/newview/skins/default/xui/ja/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/ja/floater_telehub.xml
@@ -20,9 +20,6 @@
 	<button label="出現位置を追加" name="add_spawn_point_btn"/>
 	<button label="出現地点を削除" name="remove_spawn_point_btn"/>
 	<text name="spawn_point_help">
-		オブジェクトを選び、「出現地点を追加」をクリックして位置を指定します。
-そうするとそのオブジェクトを移動させたり削除できます。
-位置はテレハブセンターに関連します。
-リストのアイテムを選択してインワールドでハイライトさせます。
+		オブジェクトを選び、「出現地点を追加」をクリックして位置を指定します。そうするとそのオブジェクトを移動させたり削除できます。位置はテレハブセンターに関連します。リストのアイテムを選択してインワールドでハイライトさせます。
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_url_entry.xml b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
index 9d3ca20c7c..8e09e4748a 100644
--- a/indra/newview/skins/default/xui/ja/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
@@ -3,11 +3,11 @@
 	<text name="media_label">
 		メディア URL：
 	</text>
-	<combo_box left="100" name="media_entry" width="360" />
-	<button label="OK" name="ok_btn" width="78"/>
+	<combo_box name="media_entry"/>
+	<button label="OK" name="ok_btn" width="38"/>
 	<button label="キャンセル" name="cancel_btn" width="80"/>
-	<button label="クリア" name="clear_btn" />
-	<text name="loading_label">
+	<button label="クリア" name="clear_btn" left_pad="76"/>
+	<text name="loading_label" left="140">
 		ロード中．．．
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
index 7825d81c53..f2e3e6e993 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_alpha_panel">
 	<panel name="avatar_alpha_color_panel">
-		<texture_picker label="アルファ（下）" name="Lower Alpha" tool_tip="クリックして写真を選択します"/>
-		<texture_picker label="アルファ（上）" name="Upper Alpha" tool_tip="クリックして写真を選択します"/>
-		<texture_picker label="頭部のアルファ" name="Head Alpha" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="アルファ&#10;（下）" name="Lower Alpha" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="アルファ&#10;（上）" name="Upper Alpha" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="頭部のア&#10;ルファ" name="Head Alpha" tool_tip="クリックして写真を選択します"/>
 		<texture_picker label="目のアルファ" name="Eye Alpha" tool_tip="クリックして写真を選択します"/>
 		<texture_picker label="髪のアルファ" name="Hair Alpha" tool_tip="クリックして写真を選択します"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
index 2a850ab29c..d1a2b31934 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
@@ -45,7 +45,7 @@
 				<text name="my_account_link" value="[[URL] マイアカウントに移動]"/>
 				<text name="acc_status_text" value="住人。 支払情報未登録。"/>
 				<text name="title_partner_text" value="マイパートナー："/>
-				<text name="partner_edit_link" value="[[URL] 編集]"/>
+				<text name="partner_edit_link" value="[[URL] 編集]" width="100"/>
 				<panel name="partner_data_panel">
 					<name_box name="partner_text" value="[FIRST] [LAST]"/>
 				</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
index d6aec87b45..78ddae47f9 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_tattoo_panel">
 	<panel name="avatar_tattoo_color_panel">
-		<texture_picker label="頭部のタトゥー" name="Head Tattoo" tool_tip="クリックして写真を選択"/>
-		<texture_picker label="上部のタトゥー" name="Upper Tattoo" tool_tip="クリックして写真を選択"/>
-		<texture_picker label="下部のタトゥー" name="Lower Tattoo" tool_tip="クリックして写真を選択"/>
+		<texture_picker label="頭部のタトゥー" name="Head Tattoo" tool_tip="クリックして写真を選択" width="70"/>
+		<texture_picker label="上部のタトゥー" name="Upper Tattoo" tool_tip="クリックして写真を選択" width="70"/>
+		<texture_picker label="下部のタトゥー" name="Lower Tattoo" tool_tip="クリックして写真を選択" width="70"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
index 0af1ce2ef2..252220b64d 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
@@ -31,7 +31,7 @@
 	</accordion>
 	<panel name="button_row">
 		<button label="作成" label_selected="新しいグループ" name="btn_create"/>
-		<button label="グループチャット" name="btn_chat"/>
+		<button label="グループチャット" name="btn_chat" width="100"/>
 		<button label="グループコール" name="btn_call"/>
 		<button label="保存" label_selected="保存" name="btn_apply"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
index cfbc51a44e..b620a66122 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
@@ -23,7 +23,7 @@
 		<column label="面積" name="area"/>
 		<column label="" name="hidden"/>
 	</scroll_list>
-	<button label="地図" label_selected="地図" name="map_button"/>
+	<button label="地図" label_selected="地図" name="map_button" width="60"/>
 	<text name="total_contributed_land_label">
 		寄付合計：
 	</text>
@@ -48,10 +48,10 @@
 	<string name="land_contrib_error">
 		土地の貢献を設定することができません
 	</string>
-	<text name="your_contribution_units">
+	<text name="your_contribution_units" width="80">
 		平方メートル
 	</text>
-	<text name="your_contribution_max_value">
+	<text name="your_contribution_max_value" width="100">
 		（最大 [AMOUNT]）
 	</text>
 	<text name="group_over_limit_text">
diff --git a/indra/newview/skins/default/xui/ja/panel_groups.xml b/indra/newview/skins/default/xui/ja/panel_groups.xml
index 785fd868ab..337402d32c 100644
--- a/indra/newview/skins/default/xui/ja/panel_groups.xml
+++ b/indra/newview/skins/default/xui/ja/panel_groups.xml
@@ -3,7 +3,7 @@
 	<text name="groupdesc">
 		ｱｸﾃｨﾌﾞなｸﾞﾙｰﾌﾟ名は太字で表示されています
 	</text>
-	<text name="groupcount">
+	<text name="groupcount" width="270">
 		あなたは[COUNT] ｸﾞﾙｰﾌﾟに所属しています (最大[MAX])
 	</text>
 	<button label="IM/コール" name="IM"
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index 82c52abf38..1d18a86b53 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -23,12 +23,12 @@
 			<text name="start_location_text">
 				開始地点：
 			</text>
-			<combo_box name="start_location_combo">
+			<combo_box name="start_location_combo" width="160">
 				<combo_box.item label="最後にログアウトした場所" name="MyLastLocation"/>
 				<combo_box.item label="ホーム" name="MyHome"/>
 				<combo_box.item label="＜地域名を入力＞" name="Typeregionname"/>
 			</combo_box>
-			<button label="ログイン" name="connect_btn"/>
+			<button label="ログイン" name="connect_btn" left_pad="30" width="60"/>
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_new_account_text">
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
index a109b1ab51..6c2d845ad3 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
@@ -7,7 +7,7 @@
 	<panel name="bottom_panel">
 		<button name="options_gear_btn" tool_tip="その他のオプションを表示"/>
 		<dnd_button name="trash_btn" tool_tip="選択したアイテムを削除"/>
-		<button label="アウトフィットを保存する" name="make_outfit_btn" tool_tip="容姿をアウトフィットに保存する"/>
+		<button label="アウトフィットを保存する" name="make_outfit_btn" tool_tip="容姿をアウトフィットに保存する" width="140"/>
 		<button label="装着" name="wear_btn" tool_tip="選択したアウトフィットを着用する"/>
 		<button label="M" name="look_edit_btn"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
index 5f43f93113..d61fd0fe7f 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="約款" name="Covenant">
-	<text font="SansSerifLarge" name="estate_section_lbl">
+	<text font="SansSerifLarge" name="estate_section_lbl" width="200">
 		エステート（不動産）
 	</text>
 	<text name="estate_name_lbl">
@@ -26,13 +26,13 @@
 		この不動産には約款がありません。
 	</text_editor>
 	<button label="リセット" name="reset_covenant"/>
-	<text name="covenant_help_text">
+	<text name="covenant_help_text" left="100">
 		約款の変更は不動産全区画に適用となります。
 	</text>
-	<text name="covenant_instructions">
+	<text name="covenant_instructions" width="390">
 		この不動産約款の変更をする際は、ノートカードをドラッグ＆ドロップしてください。
 	</text>
-	<text bottom_delta="-34" font="SansSerifLarge" name="region_section_lbl">
+	<text bottom_delta="-34" font="SansSerifLarge" name="region_section_lbl" width="200">
 		リージョン（地域）
 	</text>
 	<text name="region_name_lbl">
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 976cfacb3f..de93e47342 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="不動産" name="Estate">
-	<text name="estate_help_text">
+	<text name="estate_help_text" width="400">
 		このタブの設定への変更は、エステート内のすべてのリージョンに影響されます。
 	</text>
 	<text name="estate_text">
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml
index 00be5b6b03..e3d2d2163c 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml
@@ -3,19 +3,19 @@
 	<text name="region_text_lbl">
 		地域：
 	</text>
-	<text left="90" name="region_text">
+	<text left_delta="70" name="region_text">
 		未知
 	</text>
 	<text name="version_channel_text_lbl" width="100">
 		バージョン：
 	</text>
-	<text left="90" name="version_channel_text">
+	<text left_delta="70" name="version_channel_text">
 		不明
 	</text>
 	<text name="region_type_lbl">
 		種類：
 	</text>
-	<text name="region_type">
+	<text name="region_type" left_delta="70">
 		不明
 	</text>
 	<check_box label="土地整備をブロック" name="block_terraform_check"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml b/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml
index 9673953d06..f58a26a7d0 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml
@@ -3,19 +3,19 @@
 	<text name="region_text_lbl">
 		リージョン:
 	</text>
-	<text name="region_text">
+	<text name="region_text" left_delta="70">
 		不明
 	</text>
 	<text name="version_channel_text_lbl">
 		バージョン：
 	</text>
-	<text name="version_channel_text">
+	<text name="version_channel_text" left_delta="70">
 		不明
 	</text>
 	<text name="region_type_lbl">
 		種類：
 	</text>
-	<text name="region_type">
+	<text name="region_type" left_delta="70">
 		不明
 	</text>
 	<check_box label="地形編集をブロック" name="block_terraform_check"/>
@@ -25,8 +25,8 @@
 	<check_box label="土地の再販を許可" name="allow_land_resell_check"/>
 	<check_box label="土地の統合・分割を許可" name="allow_parcel_changes_check"/>
 	<check_box label="土地の検索教示をブロック" name="block_parcel_search_check" tool_tip="このリージョンとリージョン内の区画を検索結果に表示する"/>
-	<spinner label="アバター数上限" name="agent_limit_spin"/>
-	<spinner label="オブジェクトボーナス" name="object_bonus_spin"/>
+	<spinner label="アバター数上限" name="agent_limit_spin" label_width="110" width="190"/>
+	<spinner label="オブジェクトボーナス" name="object_bonus_spin" label_width="110" width="190"/>
 	<text label="レーティング区分" name="access_text">
 		レーティング区分：
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_texture.xml b/indra/newview/skins/default/xui/ja/panel_region_texture.xml
index ea784df127..17e3260460 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_texture.xml
@@ -48,7 +48,8 @@
 		数値は上のテクスチャのブレンド範囲を示します。
 	</text>
 	<text name="height_text_lbl11">
-		計測単位はメートルで、「低」の値は、1番のテクスチャの高さの「最大値」です。「高」の値は、4番のテクスチャの高さの「最低値」です。
+		計測単位はメートルで、「低」の値は、1番のテクスチャの高さの
+「最大値」です。「高」の値は、4番のテクスチャの高さの「最低値」です。
 	</text>
 	<text name="height_text_lbl12">
 		そして「高」の値はテクスチャー#4の高さの下限となります。
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
index e8b5be63ae..1d81304860 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
@@ -4,7 +4,7 @@
 		ローディング...
 	</text>
 	<scroll_list name="scripts_list">
-		<scroll_list.columns label="サイズ （kb）" name="size"/>
+		<scroll_list.columns label="サイズ （kb）" name="size" width="90"/>
 		<scroll_list.columns label="URL" name="urls"/>
 		<scroll_list.columns label="オブジェクト名" name="name"/>
 		<scroll_list.columns label="場所" name="location"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
index fe0b44d8f4..6a62af4ec6 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
@@ -13,9 +13,9 @@
 		ローディング...
 	</text>
 	<scroll_list name="scripts_list">
-		<scroll_list.columns label="サイズ （kb）" name="size"/>
+		<scroll_list.columns label="サイズ （kb）" name="size" width="90"/>
 		<scroll_list.columns label="オブジェクト名" name="name"/>
-		<scroll_list.columns label="オブジェクトの所有者" name="owner"/>
+		<scroll_list.columns label="オブジェクトの所有者" name="owner" width="120"/>
 		<scroll_list.columns label="区画・位置" name="location"/>
 	</scroll_list>
 	<button label="リスト更新" name="refresh_list_btn"/>
-- 
cgit v1.2.3


From b6229addf2419f7eebdfbd6024ddba3444fdc5ff Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 8 Feb 2010 14:55:59 -0800
Subject: DEV-43688 Cycle3 Tim's resizing of DE GUI

---
 .../newview/skins/default/xui/de/floater_about.xml |  3 ++-
 .../skins/default/xui/de/floater_about_land.xml    | 18 ++++++++--------
 .../default/xui/de/floater_animation_preview.xml   |  4 ++--
 .../skins/default/xui/de/floater_avatar_picker.xml |  9 ++++----
 .../default/xui/de/floater_avatar_textures.xml     | 10 +++++----
 .../skins/default/xui/de/floater_bulk_perms.xml    |  2 +-
 .../skins/default/xui/de/floater_buy_currency.xml  |  5 +++--
 .../skins/default/xui/de/floater_buy_land.xml      | 25 +++++++++++-----------
 .../default/xui/de/floater_day_cycle_options.xml   |  6 +++---
 .../skins/default/xui/de/floater_god_tools.xml     | 20 ++++++++---------
 .../skins/default/xui/de/floater_image_preview.xml |  2 +-
 .../skins/default/xui/de/floater_inspect.xml       |  6 +++---
 .../xui/de/floater_inventory_item_properties.xml   |  4 ++--
 .../skins/default/xui/de/floater_lsl_guide.xml     |  2 +-
 .../skins/default/xui/de/floater_media_browser.xml |  4 ++--
 .../skins/default/xui/de/floater_mem_leaking.xml   |  4 ++--
 .../skins/default/xui/de/floater_openobject.xml    |  4 ++--
 .../skins/default/xui/de/floater_pay_object.xml    |  8 +++----
 .../skins/default/xui/de/floater_postcard.xml      | 10 ++++-----
 .../default/xui/de/floater_preview_animation.xml   |  4 ++--
 .../default/xui/de/floater_preview_gesture.xml     |  6 +++---
 .../skins/default/xui/de/floater_report_abuse.xml  |  5 +++--
 .../default/xui/de/floater_script_preview.xml      |  2 +-
 .../skins/default/xui/de/floater_sell_land.xml     |  6 +++---
 .../skins/default/xui/de/floater_snapshot.xml      |  2 +-
 .../newview/skins/default/xui/de/floater_stats.xml |  6 +++---
 .../skins/default/xui/de/floater_telehub.xml       |  6 +++---
 .../skins/default/xui/de/floater_url_entry.xml     |  8 +++----
 .../newview/skins/default/xui/de/floater_water.xml |  2 +-
 .../default/xui/de/floater_whitelist_entry.xml     |  2 +-
 .../skins/default/xui/de/inspect_avatar.xml        |  4 ++--
 .../newview/skins/default/xui/de/inspect_group.xml |  2 +-
 .../skins/default/xui/de/inspect_object.xml        |  2 +-
 .../default/xui/de/panel_block_list_sidetray.xml   |  6 +++---
 .../skins/default/xui/de/panel_edit_alpha.xml      | 12 +++++------
 .../skins/default/xui/de/panel_edit_tattoo.xml     |  6 +++---
 .../skins/default/xui/de/panel_group_invite.xml    |  8 +++----
 .../default/xui/de/panel_group_land_money.xml      |  8 +++----
 .../skins/default/xui/de/panel_group_roles.xml     |  4 ++--
 .../newview/skins/default/xui/de/panel_groups.xml  |  4 ++--
 indra/newview/skins/default/xui/de/panel_login.xml |  2 +-
 .../xui/de/panel_media_settings_security.xml       |  3 ++-
 .../skins/default/xui/de/panel_nearby_chat.xml     |  2 +-
 indra/newview/skins/default/xui/de/panel_notes.xml |  6 +++---
 indra/newview/skins/default/xui/de/panel_picks.xml |  2 +-
 .../newview/skins/default/xui/de/panel_places.xml  |  6 +++---
 .../default/xui/de/panel_preferences_advanced.xml  |  2 +-
 .../default/xui/de/panel_preferences_general.xml   |  2 +-
 .../default/xui/de/panel_preferences_privacy.xml   |  2 +-
 .../newview/skins/default/xui/de/panel_profile.xml |  6 +++---
 .../skins/default/xui/de/panel_profile_view.xml    |  2 +-
 .../skins/default/xui/de/panel_region_covenant.xml |  6 +++---
 .../skins/default/xui/de/panel_region_debug.xml    |  2 +-
 .../skins/default/xui/de/panel_region_texture.xml  | 16 +++++++-------
 .../xui/de/panel_script_limits_my_avatar.xml       |  2 +-
 .../xui/de/panel_script_limits_region_memory.xml   |  6 +++---
 56 files changed, 163 insertions(+), 155 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index 0beb54032f..5f3762c224 100644
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -73,7 +73,8 @@ google-perftools Copyright (c) 2005, Google Inc.
 
 Alle Rechte vorbehalten. Details siehe licenses.txt.
 
-Voice-Chat-Audiocoding: Polycom(R) Siren14(TM) (ITU-T Empf.G.722.1 Anhang C)
+Voice-Chat-Audiocoding: Polycom(R) Siren14(TM)
+(ITU-T Empf.G.722.1 Anhang C)
 			</text_editor>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index cd5abf86e0..aec1179901 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -12,7 +12,7 @@
 	<floater.string name="Remaining">
 		Restzeit
 	</floater.string>
-	<tab_container name="landtab">
+	<tab_container name="landtab" width="489" tab_min_width="40">
 		<panel label="ALLGEMEIN" name="land_general_panel">
 			<panel.string name="new users only">
 				Nur neue Benutzer
@@ -83,7 +83,7 @@
 			<text name="GroupText">
 				Leyla Linden
 			</text>
-			<button label="Festlegen" label_selected="Einstellen..." name="Set..."/>
+			<button label="Festlegen" label_selected="Einstellen..." name="Set..." width="90"/>
 			<check_box label="Übertragung an Gruppe zulassen" name="check deed" tool_tip="Ein Gruppen-Officer kann dieses Land der Gruppe übertragen. Das Land wird dann über die Landzuteilung der Gruppe verwaltet."/>
 			<button label="Übertragung" label_selected="Übertragen..." name="Deed..." tool_tip="Sie können Land nur übertragen, wenn Sie in der ausgewählten Gruppe Officer sind."/>
 			<check_box label="Eigentümer leistet Beitrag durch Übertragung" name="check contrib" tool_tip="Wenn das Land an die Gruppe übertragen wird, trägt der frühere Eigentümer ausreichend Landnutzungsrechte bei, um es zu halten."/>
@@ -101,10 +101,10 @@
 			<text name="For sale to">
 				Zum Verkauf an: [BUYER]
 			</text>
-			<text name="Sell with landowners objects in parcel." width="210">
+			<text name="Sell with landowners objects in parcel." left_delta="-50" width="240">
 				Objekte sind im Verkauf eingeschlossen
 			</text>
-			<text name="Selling with no objects in parcel." width="237">
+			<text name="Selling with no objects in parcel." width="260">
 				Objekte sind im Verkauf nicht eingeschlossen
 			</text>
 			<button bottom="-222" label="Landverkauf abbrechen" label_selected="Landverkauf abbrechen" name="Cancel Land Sale"/>
@@ -230,7 +230,7 @@ werden.
 			<text left="14" name="Owned by parcel owner:" width="200">
 				Im Eigentum des Parzellenbesitzers:
 			</text>
-			<text left="204" name="owner_objects_text" width="48">
+			<text left="204" left_delta="200" name="owner_objects_text" width="48">
 				[COUNT]
 			</text>
 			<button label="Anzeigen" label_selected="Anzeigen" name="ShowOwner" right="-135" width="60"/>
@@ -257,7 +257,7 @@ werden.
 			<text left="204" name="selected_objects_text" width="48">
 				[COUNT]
 			</text>
-			<text left="4" name="Autoreturn" width="380">
+			<text left="4" name="Autoreturn" width="410">
 				Objekte anderer Einwohner automatisch zurückgeben (Minuten, 0 für aus):
 			</text>
 			<line_editor name="clean other time" right="-10" width="56"/>
@@ -269,7 +269,7 @@ werden.
 			<name_list name="owner list">
 				<name_list.columns label="Typ" name="type"/>
 				<name_list.columns label="Name" name="name"/>
-				<name_list.columns label="Zählen" name="count"/>
+				<name_list.columns label="Zählen" name="count" width="80"/>
 				<name_list.columns label="Aktuellster" name="mostrecent"/>
 			</name_list>
 		</panel>
@@ -368,7 +368,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 			<text name="landing_point">
 				Landepunkt: [LANDING]
 			</text>
-			<button label="Festlegen" label_selected="Festlegen" left="234" name="Set" tool_tip="Legt den Landepunkt fest, an dem Besucher ankommen. Legt die Position Ihres Avatars innerhalb dieser Parzelle fest." width="70"/>
+			<button label="Festlegen" label_selected="Festlegen" left="234" right="-88" name="Set" tool_tip="Legt den Landepunkt fest, an dem Besucher ankommen. Legt die Position Ihres Avatars innerhalb dieser Parzelle fest." width="70"/>
 			<button label="Löschen" label_selected="Löschen" left="312" name="Clear" tool_tip="Landepunkt löschen" width="70"/>
 			<text name="Teleport Routing: ">
 				Teleport-Route:
@@ -444,7 +444,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 				Zugang zu dieser Parzelle
 			</text>
 			<check_box label="Öffentlichen Zugang erlauben [MATURITY]" name="public_access"/>
-			<text name="Only Allow">
+			<text name="Only Allow" width="400">
 				Zugang auf Einwohner beschränken, die überprüft wurden von:
 			</text>
 			<check_box label="Zahlungsinformation gespeichert [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Nicht identifizierte Einwohner verbannen."/>
diff --git a/indra/newview/skins/default/xui/de/floater_animation_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_preview.xml
index ce971d158d..be573b524f 100644
--- a/indra/newview/skins/default/xui/de/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_animation_preview.xml
@@ -180,6 +180,6 @@ Maximal erlaubt sind [MAX_LENGTH] Sekunden.
 
 Wir empfehlen exportierte BVH-Dateien aus Poser 4.
 	</text>
-	<button label="Hochladen ([AMOUNT] L$)" name="ok_btn"/>
-	<button label="Abbrechen" name="cancel_btn"/>
+	<button label="Hochladen ([AMOUNT] L$)" name="ok_btn" width="160"/>
+	<button label="Abbrechen" name="cancel_btn" left="180" width="88"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
index bc78ccd7f8..f1281bfb9b 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
@@ -21,11 +21,12 @@
 	<tab_container name="ResidentChooserTabs">
 		<panel label="Suchen" name="SearchPanel">
 			<text name="InstructSearchResidentName">
-				Geben Sie einen Teil des Namens einer Person ein:
+				Geben Sie einen Teil des Namens einer
+Person ein:
 			</text>
-			<line_editor bottom_delta="-36" name="Edit"/>
-			<button label="Los" label_selected="Los" name="Find"/>
-			<scroll_list bottom_delta="-79" height="74" name="SearchResults"/>
+			<line_editor bottom_delta="-76" name="Edit" top_pad="16"/>
+			<button label="Los" label_selected="Los" name="Find" top="70"/>
+			<scroll_list top="80" height="54" name="SearchResults"/>
 		</panel>
 		<panel label="Freunde" name="FriendsPanel">
 			<text name="InstructSelectFriend">
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
index 3be5194a8f..cf1b809aa1 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
@@ -3,10 +3,10 @@
 	<floater.string name="InvalidAvatar">
 		UNGÜLTIGER AVATAR
 	</floater.string>
-	<text name="label">
+	<text name="label" width="120">
 		Gebackene Texturen
 	</text>
-	<text name="composite_label" width="150">
+	<text name="composite_label" width="170">
 		Zusammengesetzte Texturen
 	</text>
 	<button label="Läd IDs in Konsole ab" label_selected="Abladen" name="Dump"/>
@@ -23,7 +23,8 @@
 			<texture_picker label="Auge" name="eyes_iris"/>
 			<texture_picker label="Alpha: Augen" name="eyes_alpha"/>
 			<texture_picker label="Oberkörper" name="upper-baked"/>
-			<texture_picker label="Oberkörper: Körperfarbe" name="upper_bodypaint"/>
+			<texture_picker label="Oberkörper: Körperfarbe" name="upper_bodypaint" width=
+			"140"/>
 			<texture_picker label="Unterhemd" name="upper_undershirt"/>
 			<texture_picker label="Handschuhe" name="upper_gloves"/>
 			<texture_picker label="Hemd" name="upper_shirt"/>
@@ -31,7 +32,8 @@
 			<texture_picker label="Alpha: Oben" name="upper_alpha"/>
 			<texture_picker label="Obere Tattoos" name="upper_tattoo"/>
 			<texture_picker label="Unterkörper" name="lower-baked"/>
-			<texture_picker label="Unterkörper: Körperfarbe" name="lower_bodypaint"/>
+			<texture_picker label="Unterkörper: Körperfarbe" name="lower_bodypaint" width=
+			"140"/>
 			<texture_picker label="Unterhose" name="lower_underpants"/>
 			<texture_picker label="Socken" name="lower_socks"/>
 			<texture_picker label="Schuhe" name="lower_shoes"/>
diff --git a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
index 218c66d298..1d766ac07b 100644
--- a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
@@ -43,7 +43,7 @@
 		Jeder:
 	</text>
 	<check_box label="Kopieren" name="everyone_copy"/>
-	<text name="NextOwnerLabel">
+	<text name="NextOwnerLabel" top="160" left="10">
 		Nächster Eigentümer:
 	</text>
 	<check_box label="Bearbeiten" name="next_owner_modify"/>
diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency.xml b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
index aa6201ec26..72959c7a0c 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
@@ -59,8 +59,9 @@
 	</text>
 	<button label="Jetzt kaufen" name="buy_btn"/>
 	<button label="Abbrechen" name="cancel_btn"/>
-	<text name="info_cannot_buy">
-		Kauf nicht möglich
+	<text name="info_cannot_buy" left="160" width="200" height="40">
+		Kauf nicht
+möglich
 	</text>
 	<button label="Weiter zum Internet" name="error_web"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml
index 4c59f1e8e6..5efa557869 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml
@@ -3,41 +3,41 @@
 	<text name="region_name_label">
 		Region:
 	</text>
-	<text left="580" name="region_name_text">
+	<text left="680" name="region_name_text" left_delta="140">
 		(unbekannt)
 	</text>
 	<text name="region_type_label">
 		Typ:
 	</text>
-	<text left="580" name="region_type_text">
+	<text left="680" name="region_type_text" left_delta="140">
 		(unbekannt)
 	</text>
 	<text name="estate_name_label">
 		Grundstück:
 	</text>
-	<text left="580" name="estate_name_text">
+	<text left="680" name="estate_name_text" left_delta="140">
 		(unbekannt)
 	</text>
 	<text name="estate_owner_label" right="600" width="200">
 		Grundstückseigentümer:
 	</text>
-	<text left="580" name="estate_owner_text">
+	<text left="680" name="estate_owner_text" left_delta="140">
 		(unbekannt)
 	</text>
-	<text name="resellable_changeable_label">
+	<text name="resellable_changeable_label" left="410">
 		Gekauftes Land in dieser Region:
 	</text>
-	<text name="resellable_clause">
+	<text name="resellable_clause" left="410">
 		Wiederverkauf möglich oder nicht möglich.
 	</text>
-	<text name="changeable_clause">
+	<text name="changeable_clause" left="410">
 		Darft oder darf nicht zusammengelegt/unterteilt werden.
 	</text>
-	<text name="covenant_text">
+	<text name="covenant_text" left="410">
 		Sie müssen dem Grundstücksvertrag zustimmen:
 	</text>
 	<text left="470" name="covenant_timestamp_text"/>
-	<text_editor name="covenant_editor">
+	<text_editor name="covenant_editor" left="470">
 		Wird geladen...
 	</text_editor>
 	<check_box label="Ich stimme dem obigen Vertrag zu." name="agree_covenant"/>
@@ -67,7 +67,7 @@ Objekte im Verkauf eingeschlossen
 	<text name="error_message">
 		Irgendetwas stimmt nicht.
 	</text>
-	<button label="Gehe zu Website" name="error_web"/>
+	<button label="Gehe zu Website" name="error_web" top_delta="136"/>
 	<text name="account_action">
 		Macht Sie zum Premium-Mitglied.
 	</text>
@@ -79,8 +79,9 @@ Objekte im Verkauf eingeschlossen
 		<combo_box.item label="7,50 US$/Monat, vierteljährliche Abrechnung" name="US$7.50/month,billedquarterly"/>
 		<combo_box.item label="6,00 US$/Monat, jährliche Abrechnung" name="US$6.00/month,billedannually"/>
 	</combo_box>
-	<text name="land_use_action">
-		Erhöhen Sie Ihre monatlichen Landnutzungsgebühren auf 40 US$/month.
+	<text name="land_use_action" top="270" height="36">
+		Erhöhen Sie Ihre monatlichen Landnutzungsgebühren 
+auf 40 US$/month.
 	</text>
 	<text name="land_use_reason">
 		Sie besitzen 1309 m² Land.
diff --git a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
index 7f4dc4a79e..9baf30fb53 100644
--- a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
@@ -66,7 +66,7 @@
 				Key-Zeit:
 			</text>
 			<spinner label="Std." name="WLCurKeyHour" />
-			<spinner label="Min." name="WLCurKeyMin" />
+			<spinner label="Min." name="WLCurKeyMin" label_width="100" width="66"/>
 			<text name="WLCurKeyTimeText2">
 				Key-Voreinstellung:
 			</text>
@@ -79,8 +79,8 @@
 				Zykluslänge:
 			</text>
 			<spinner label="Std." name="WLLengthOfDayHour" />
-			<spinner label="Min." name="WLLengthOfDayMin" />
-			<spinner label="Sek." name="WLLengthOfDaySec" />
+			<spinner label="Min." name="WLLengthOfDayMin" label_width="100" width="66"/>
+			<spinner label="Sek." name="WLLengthOfDaySec" label_width="100" width="66"/>
 			<text name="DayCycleText3">
 				Vorschau:
 			</text>
diff --git a/indra/newview/skins/default/xui/de/floater_god_tools.xml b/indra/newview/skins/default/xui/de/floater_god_tools.xml
index 716165bb6b..30b151ca58 100644
--- a/indra/newview/skins/default/xui/de/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_god_tools.xml
@@ -11,15 +11,15 @@
 			</text>
 			<check_box label="Startbereich Einleitung" name="check prelude" tool_tip="Diese Region zu einem Startbereich machen."/>
 			<check_box label="Sonne fest" name="check fixed sun" tool_tip="Fixiert den Sonnenstand (wie in „Region/Grundstück“ &gt; „Terrain“."/>
-			<check_box height="32" label="Zuhause auf Teleport  zurücksetzen" name="check reset home" tool_tip="Wenn Einwohner weg teleportieren, ihr Zuhause auf Zielposition setzen."/>
-			<check_box bottom_delta="-32" label="Sichtbar" name="check visible" tool_tip="Diese Region für Nicht-Götter sichtbar machen."/>
+			<check_box label="Zuhause auf Teleport zurücksetzen" name="check reset home" tool_tip="Wenn Einwohner weg teleportieren, ihr Zuhause auf Zielposition setzen."/>
+			<check_box label="Sichtbar" name="check visible" tool_tip="Diese Region für Nicht-Götter sichtbar machen."/>
 			<check_box label="Schaden" name="check damage" tool_tip="Schaden in dieser Region aktivieren."/>
 			<check_box label="Trafficüberwachung blockieren" name="block dwell" tool_tip="In dieser Region die Traffic-Berechnung abschalten."/>
 			<check_box label="Terraformen blockieren" name="block terraform" tool_tip="Das Terraformen von Land verbieten (Benutzen Sie dies um Leuten das Terraformen ihres Landes zu verbieten)"/>
 			<check_box label="Sandkasten" name="is sandbox" tool_tip="Sandkastenregion ein-/ausschalten."/>
-			<button label="Terrain formen" label_selected="Terrain formen" name="Bake Terrain" tool_tip="Das aktuelle Terrain als Standard speichern." width="118"/>
-			<button label="Terrain zurücksetzen" label_selected="Terrain zurücksetzen" name="Revert Terrain" tool_tip="Das aktuelle Terrain mit dem Standard ersetzen." width="118"/>
-			<button label="Terrain tauschen" label_selected="Terrain tauschen" name="Swap Terrain" tool_tip="Aktuelles Terrain gegen Standard austauschen." width="118"/>
+			<button label="Terrain formen" label_selected="Terrain formen" name="Bake Terrain" tool_tip="Das aktuelle Terrain als Standard speichern." width="120"/>
+			<button label="Terrain zurücksetzen" label_selected="Terrain zurücksetzen" name="Revert Terrain" tool_tip="Das aktuelle Terrain mit dem Standard ersetzen." width="120"/>
+			<button label="Terrain tauschen" label_selected="Terrain tauschen" name="Swap Terrain" tool_tip="Aktuelles Terrain gegen Standard austauschen." width="120"/>
 			<text name="estate id">
 				Grundstücks-ID:
 			</text>
@@ -32,11 +32,11 @@
 			</text>
 			<line_editor left_delta="110" name="gridposx" tool_tip="Die X-Rasterposition dieser Region" width="35"/>
 			<line_editor left_delta="45" name="gridposy" tool_tip="Die Y-Rasterposition dieser Region" width="35"/>
-			<text name="Redirect to Grid: ">
+			<text name="Redirect to Grid: " width="110">
 				Auf Raster umleiten:
 			</text>
-			<line_editor left_delta="110" name="redirectx" width="35"/>
-			<line_editor left_delta="45" name="redirecty" width="35"/>
+			<line_editor left_delta="110" name="redirectx" width="35" left_pad="0"/>
+			<line_editor left_delta="45" name="redirecty" width="35" />
 			<text font="SansSerifSmall" name="billable factor text">
 				Abrechnungsfaktor:
 			</text>
@@ -45,8 +45,8 @@
 			</text>
 			<button label="Aktualisieren" label_selected="Aktualisieren" name="Refresh" tool_tip="Klicken Sie hier, um die obigen Informationen zu aktualisieren."/>
 			<button label="Übernehmen" label_selected="Übernehmen" name="Apply" tool_tip="Klicken Sie hier, um die obigen Änderungen zu übernehmen."/>
-			<button label="Region auswählen" label_selected="Region auswählen" left="136" name="Select Region" tool_tip="Die gesamte Region mit dem Landwerkzeug auswählen." width="130"/>
-			<button label="Automatisch speichern" label_selected="Automatisch speichern" left="136" name="Autosave now" tool_tip="gzipped-Status im Autosave-Verzeichnis speichern." width="130"/>
+			<button label="Region auswählen" label_selected="Region auswählen" left="136" name="Select Region" tool_tip="Die gesamte Region mit dem Landwerkzeug auswählen." width="132"/>
+			<button label="Automatisch speichern" label_selected="Automatisch speichern" left="136" name="Autosave now" tool_tip="gzipped-Status im Autosave-Verzeichnis speichern." width="132"/>
 		</panel>
 		<panel label="Objekte" name="objects">
 			<panel.string name="no_target">
diff --git a/indra/newview/skins/default/xui/de/floater_image_preview.xml b/indra/newview/skins/default/xui/de/floater_image_preview.xml
index 7f66234dab..fd675f8808 100644
--- a/indra/newview/skins/default/xui/de/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_image_preview.xml
@@ -28,5 +28,5 @@ Speichern Sie das Bild als 24 Bit Targa (.tga).
 	</text>
 	<check_box label="Verlustfreie Komprimierung verwenden" name="lossless_check"/>
 	<button label="Abbrechen" name="cancel_btn"/>
-	<button label="Hochladen ([AMOUNT] L$)" name="ok_btn"/>
+	<button label="Hochladen ([AMOUNT] L$)" name="ok_btn" width="146"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_inspect.xml b/indra/newview/skins/default/xui/de/floater_inspect.xml
index 939aa964c0..da97ceb2d8 100644
--- a/indra/newview/skins/default/xui/de/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/de/floater_inspect.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater min_width="450" name="inspect" title="OBJEKTE UNTERSUCHEN">
+<floater min_width="460" name="inspect" title="OBJEKTE UNTERSUCHEN" width="460">
 	<floater.string name="timeStamp">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</floater.string>
 	<scroll_list name="object_list" tool_tip="Wählen Sie ein Objekt aus dieser Liste, um es in der Second Life-Welt zu markieren">
 		<scroll_list.columns label="Objektname" name="object_name"/>
-		<scroll_list.columns label="Besitzer" name="owner_name"/>
+		<scroll_list.columns label="Besitzer" name="owner_name" />
 		<scroll_list.columns label="Ersteller" name="creator_name"/>
-		<scroll_list.columns label="Erstellungsdatum" name="creation_date"/>
+		<scroll_list.columns label="Erstellungsdatum" name="creation_date" width="116"/>
 	</scroll_list>
 	<button label="Besitzerprofil einsehen..." name="button owner" tool_tip="Profil des Besitzers des markierten Objekts einsehen" width="155"/>
 	<button label="Erstellerprofil einsehen..." left="175" name="button creator" tool_tip="Profil des ursprünglichen Erstellers des markierten Objekts einsehen" width="155"/>
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
index e894f666c9..f98e23bbc4 100644
--- a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
@@ -59,10 +59,10 @@
 		Nächster Eigentümer:
 	</text>
 	<check_box label="Bearbeiten" name="CheckNextOwnerModify"/>
-	<check_box label="Kopieren" left_delta="85" name="CheckNextOwnerCopy"/>
+	<check_box label="Kopieren" left_delta="55" name="CheckNextOwnerCopy"/>
 	<check_box label="Wiederverkaufen" name="CheckNextOwnerTransfer"/>
 	<check_box label="Zum Verkauf" name="CheckPurchase"/>
-	<combo_box name="combobox sale copy">
+	<combo_box name="combobox sale copy" left_pad="25">
 		<combo_box.item label="Kopieren" name="Copy"/>
 		<combo_box.item label="Original" name="Original"/>
 	</combo_box>
diff --git a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
index 1d6f690d3c..73c21edc67 100644
--- a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="LSL-REFERENZ">
 	<check_box label="Cursor folgen" name="lock_check"/>
-	<combo_box label="Sperren" name="history_combo"/>
+	<combo_box label="Sperren" name="history_combo" left_pad="50" width="80"/>
 	<button label="Zurück" name="back_btn"/>
 	<button label="Weiter" name="fwd_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_media_browser.xml b/indra/newview/skins/default/xui/de/floater_media_browser.xml
index 18adb5ee7f..2d438dfe21 100644
--- a/indra/newview/skins/default/xui/de/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/de/floater_media_browser.xml
@@ -14,8 +14,8 @@
 			<button label="Los" name="go"/>
 		</layout_panel>
 		<layout_panel name="time_controls">
-			<button label="zurückspulen" name="rewind"/>
-			<button label="anhalten" name="stop"/>
+			<button label="zurückspulen" name="rewind" width="100"/>
+			<button label="anhalten" name="stop" left_pad="20"/>
 			<button label="vorwärts" name="seek"/>
 		</layout_panel>
 		<layout_panel name="parcel_owner_controls">
diff --git a/indra/newview/skins/default/xui/de/floater_mem_leaking.xml b/indra/newview/skins/default/xui/de/floater_mem_leaking.xml
index b730146aa6..fdc9b950b6 100644
--- a/indra/newview/skins/default/xui/de/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/de/floater_mem_leaking.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="MemLeak" title="SPEICHERVERLUST SIMULIEREN">
-	<spinner label="Verlustgeschwindigkeit (Bytes pro Frame):" name="leak_speed"/>
-	<spinner label="Max. Speicherverlust (MB):" name="max_leak"/>
+	<spinner label="Verlustgeschwindigkeit (Bytes pro Frame):" name="leak_speed" label_width="224"/>
+	<spinner label="Max. Speicherverlust (MB):" name="max_leak" label_width="224"/>
 	<text name="total_leaked_label">
 		Aktueller Speicherverlust:[SIZE] KB
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_openobject.xml b/indra/newview/skins/default/xui/de/floater_openobject.xml
index f0b6aa498b..c3e7052283 100644
--- a/indra/newview/skins/default/xui/de/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/de/floater_openobject.xml
@@ -3,6 +3,6 @@
 	<text name="object_name">
 		[DESC]:
 	</text>
-	<button label="In Inventar kopieren" label_selected="In Inventar kopieren" name="copy_to_inventory_button" width="132"/>
-	<button label="Kopieren und anziehen" label_selected="Kopieren und anziehen" left="150" name="copy_and_wear_button" width="132"/>
+	<button label="In Inventar kopieren" label_selected="In Inventar kopieren" name="copy_to_inventory_button" width="120"/>
+	<button label="Kopieren und anziehen" label_selected="Kopieren und anziehen" left_pad="6" name="copy_and_wear_button" width="136"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pay_object.xml b/indra/newview/skins/default/xui/de/floater_pay_object.xml
index 92f5ea415e..bc714361cc 100644
--- a/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_pay_object.xml
@@ -17,10 +17,10 @@
 	<text left="105" name="object_name_text">
 		...
 	</text>
-	<button label="1 L$" label_selected="1 L$" left="105" name="fastpay 1"/>
-	<button label="5 L$" label_selected="5 L$" left="190" name="fastpay 5"/>
-	<button label="10 L$" label_selected="10 L$" left="105" name="fastpay 10"/>
-	<button label="20 L$" label_selected="20 L$" left="190" name="fastpay 20"/>
+	<button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
+	<button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
+	<button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
+	<button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
 	<text name="amount text">
 		Oder Betrag auswählen:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_postcard.xml b/indra/newview/skins/default/xui/de/floater_postcard.xml
index 37a0a0ad1d..91e0bb8133 100644
--- a/indra/newview/skins/default/xui/de/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/de/floater_postcard.xml
@@ -3,19 +3,19 @@
 	<text name="to_label">
 		E-Mail des Empfängers:
 	</text>
-	<line_editor left="145" name="to_form" width="125"/>
+	<line_editor left_delta="145" name="to_form" width="125"/>
 	<text name="from_label">
 		Ihre E-Mail:
 	</text>
-	<line_editor left="145" name="from_form" width="125"/>
+	<line_editor left_delta="145" name="from_form" width="125"/>
 	<text name="name_label">
 		Ihr Name:
 	</text>
-	<line_editor left="145" name="name_form" width="125"/>
+	<line_editor left_delta="145" name="name_form" width="125"/>
 	<text name="subject_label">
 		Betreff:
 	</text>
-	<line_editor label="Betreff hier eingeben." left="145" name="subject_form" width="125"/>
+	<line_editor label="Betreff hier eingeben." left_delta="145" name="subject_form" width="125"/>
 	<text name="msg_label">
 		Nachricht:
 	</text>
@@ -25,7 +25,7 @@
 	<check_box label="Im Web veröffentlichen" name="allow_publish_check" tool_tip="Veröffentlicht diese Postkarte im Web."/>
 	<check_box label="Ab-18-Inhalt" name="mature_check" tool_tip="Diese Postkarte enthält nicht jugendfreie Inhalte."/>
 	<button label="?" name="publish_help_btn"/>
-	<text name="fine_print">
+	<text name="fine_print" bottom_delta="21" height="140">
 		Wenn sich der Empfänger bei SL anmeldet, erhalten Sie einen Empfehlungsbonus.
 	</text>
 	<button label="Abbrechen" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_animation.xml b/indra/newview/skins/default/xui/de/floater_preview_animation.xml
index e98faeb1f4..b2e9c2e66d 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_animation.xml
@@ -3,10 +3,10 @@
 	<floater.string name="Title">
 		Animation: [NAME]
 	</floater.string>
-	<text name="desc txt">
+	<text name="desc txt" width="140">
 		Beschreibung:
 	</text>
-	<line_editor left="98" name="desc" width="189"/>
+	<line_editor left="108" name="desc" width="160"/>
 	<button label="In Welt abspielen" label_selected="Stopp" name="Anim play btn" tool_tip="Diese Animation so wiedergeben, dass andere sie sehen können." width="116"/>
 	<button label="Lokal wiedergeben" label_selected="Stopp" left="171" name="Anim audition btn" tool_tip="Diese Animation so wiedergeben, dass nur Sie sie sehen." width="116"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
index 51c41a3209..1426a33d1d 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
@@ -36,7 +36,7 @@
 	<text name="replace_text" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt.">
 		Ersetzen mit:
 	</text>
-	<line_editor name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt."/>
+	<line_editor name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt." left_delta="94" width="160"/>
 	<text name="key_label">
 		Tastenkürzel:
 	</text>
@@ -45,8 +45,8 @@
 	<text name="library_label">
 		Bibliothek:
 	</text>
-	<scroll_list name="library_list"/>
-	<button label="Hinzufügen &gt;&gt;" name="add_btn"/>
+	<scroll_list name="library_list" width="166"/>
+	<button label="Hinzufügen &gt;&gt;" name="add_btn" left_pad="6" width="94"/>
 	<text name="steps_label">
 		Schritte:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
index 3edf5959a2..f471866967 100644
--- a/indra/newview/skins/default/xui/de/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
@@ -23,7 +23,8 @@
 		{128.1, 128.1, 15.4}
 	</text>
 	<text bottom_delta="-38" height="32" name="select_object_label">
-		Klicken Sie auf die Schaltfläche, dann auf das entsprechende Objekt:
+		Klicken Sie auf die Schaltfläche, dann auf das entsprechende 
+Objekt:
 	</text>
 	<button label="" label_selected="" name="pick_btn" tool_tip="Objektauswahl – Wählen Sie ein Objekt als Thema dieses Berichts aus"/>
 	<text name="object_name_label">
@@ -95,7 +96,7 @@
 	<text name="bug_aviso">
 		Bitte beschreiben Sie alles so genau wie möglich.
 	</text>
-	<text_editor bottom_delta="-136" height="130" name="details_edit"/>
+	<text_editor bottom_delta="-136" height="70" name="details_edit"/>
 	<text bottom_delta="-20" name="incomplete_title">
 		* Unvollständige Berichte werden nicht bearbeitet
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_script_preview.xml b/indra/newview/skins/default/xui/de/floater_script_preview.xml
index 27c40aff07..1ea3803aea 100644
--- a/indra/newview/skins/default/xui/de/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_script_preview.xml
@@ -3,7 +3,7 @@
 	<floater.string name="Title">
 		Skript: [NAME]
 	</floater.string>
-	<text name="desc txt">
+	<text name="desc txt" width="120">
 		Beschreibung:
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_sell_land.xml b/indra/newview/skins/default/xui/de/floater_sell_land.xml
index 2bc7356e65..a2c86e7bb0 100644
--- a/indra/newview/skins/default/xui/de/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_sell_land.xml
@@ -5,13 +5,13 @@
 			<text name="info_parcel_label">
 				Parzelle:
 			</text>
-			<text bottom_delta="-5" height="16" name="info_parcel">
+			<text bottom_delta="-5" height="16" name="info_parcel" left="70">
 				PARZELLENNAME
 			</text>
 			<text name="info_size_label">
 				Größe:
 			</text>
-			<text bottom_delta="-21" height="32" name="info_size">
+			<text bottom_delta="-21" height="32" name="info_size" left="70">
 				[AREA] m².
 			</text>
 			<text bottom_delta="-57" height="28" name="info_action">
@@ -20,7 +20,7 @@
 			<text name="price_label">
 				1. Preis festlegen:
 			</text>
-			<text name="price_text">
+			<text name="price_text" >
 				Einen angemessenen Preis auswählen.
 			</text>
 			<text name="price_ld">
diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml
index 80573d69ad..b48c9a77c8 100644
--- a/indra/newview/skins/default/xui/de/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml
@@ -60,7 +60,7 @@
 	<spinner label="Höhe" name="snapshot_height"/>
 	<check_box label="Seitenverhältnis beibehalten" name="keep_aspect_check"/>
 	<slider label="Bildqualität" name="image_quality_slider"/>
-	<text name="layer_type_label" width="63">
+	<text name="layer_type_label" width="66">
 		Aufnehmen:
 	</text>
 	<combo_box label="Bildlayer" left="73" name="layer_types" width="132">
diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml
index dcea484e13..1eb2dd4288 100644
--- a/indra/newview/skins/default/xui/de/floater_stats.xml
+++ b/indra/newview/skins/default/xui/de/floater_stats.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Statistics" title="STATISTIKEN">
-	<scroll_container name="statistics_scroll">
-		<container_view name="statistics_view">
+<floater name="Statistics" title="STATISTIKEN" width="280">
+	<scroll_container name="statistics_scroll" width="280">
+		<container_view name="statistics_view" width="280">
 			<stat_view label="Basic" name="basic">
 				<stat_bar label="FPS" name="fps"/>
 				<stat_bar label="Bandbreite" name="bandwidth"/>
diff --git a/indra/newview/skins/default/xui/de/floater_telehub.xml b/indra/newview/skins/default/xui/de/floater_telehub.xml
index 923b4c0079..4d3c96bc87 100644
--- a/indra/newview/skins/default/xui/de/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/de/floater_telehub.xml
@@ -6,15 +6,15 @@
 	<text name="status_text_not_connected">
 		Kein Telehub verbunden.
 	</text>
-	<text name="help_text_connected">
+	<text name="help_text_connected" width="300">
 		Klicken Sie zum Entfernen auf „Trennen“.
 	</text>
 	<text bottom_delta="-18" height="38" name="help_text_not_connected">
 		Wählen Sie ein Objekt und klicken Sie auf
 „Mit Telehub verbinden“.
 	</text>
-	<button label="Mit Telehub verbinden" name="connect_btn" width="122"/>
-	<button label="Trennen" left="142" name="disconnect_btn" width="98"/>
+	<button label="Mit Telehub verbinden" name="connect_btn" width="134"/>
+	<button label="Trennen" left="152" name="disconnect_btn" width="88"/>
 	<text name="spawn_points_text" width="230">
 		Spawn-Punkte (Positionen, nicht Objekte):
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_url_entry.xml b/indra/newview/skins/default/xui/de/floater_url_entry.xml
index 392d53a33d..f5fa449c85 100644
--- a/indra/newview/skins/default/xui/de/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/de/floater_url_entry.xml
@@ -3,10 +3,10 @@
 	<text name="media_label">
 		Medien-URL:
 	</text>
-	<button label="OK" name="ok_btn" />
-	<button label="Abbrechen" name="cancel_btn" width="75" />
-	<button label="Löschen" name="clear_btn" />
-	<text name="loading_label">
+	<button label="OK" name="ok_btn" width="30"/>
+	<button label="Abbrechen" name="cancel_btn" width="66" />
+	<button label="Löschen" name="clear_btn" left_pad="100"/>
+	<text name="loading_label" left="120">
 		Wird geladen...
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_water.xml b/indra/newview/skins/default/xui/de/floater_water.xml
index ed18dfdfff..ecd6d7ff3e 100644
--- a/indra/newview/skins/default/xui/de/floater_water.xml
+++ b/indra/newview/skins/default/xui/de/floater_water.xml
@@ -3,7 +3,7 @@
 	<floater.string name="WLDefaultWaterNames">
 		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
 	</floater.string>
-	<text name="KeyFramePresetsText">
+	<text name="KeyFramePresetsText" width="116">
 		Voreinstellungen:
 	</text>
 	<button label="Neu" label_selected="Neu" name="WaterNewPreset"/>
diff --git a/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml
index 35a5ec35f7..1332509529 100644
--- a/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml
@@ -5,5 +5,5 @@
 	</text>
 	<line_editor name="whitelist_entry" tool_tip="Eine URL oder URL-Patten in die Whitelist eingeben"/>
 	<button label="OK" name="ok_btn"/>
-	<button label="Abbrechen" name="cancel_btn"/>
+	<button label="Abbrechen" name="cancel_btn" width="80"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/inspect_avatar.xml b/indra/newview/skins/default/xui/de/inspect_avatar.xml
index 489e257867..eedbdc9904 100644
--- a/indra/newview/skins/default/xui/de/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/de/inspect_avatar.xml
@@ -16,9 +16,9 @@
 		Dies ist meine Beschreibung und ich finde sie wirklich gut!
 	</text>
 	<slider name="volume_slider" tool_tip="Lautstärke" value="0.5"/>
-	<button label="Freund hinzufügen" name="add_friend_btn"/>
+	<button label="Freund hinzufügen" name="add_friend_btn" width="110"/>
 	<button label="IM" name="im_btn"/>
-	<button label="Mehr" name="view_profile_btn"/>
+	<button label="Mehr" name="view_profile_btn" width="44" left_delta="120"/>
 	<panel name="moderator_panel">
 		<button label="Voice deaktivieren" name="disable_voice"/>
 		<button label="Voice aktivieren" name="enable_voice"/>
diff --git a/indra/newview/skins/default/xui/de/inspect_group.xml b/indra/newview/skins/default/xui/de/inspect_group.xml
index 81d946be9d..badb47bf08 100644
--- a/indra/newview/skins/default/xui/de/inspect_group.xml
+++ b/indra/newview/skins/default/xui/de/inspect_group.xml
@@ -24,7 +24,7 @@
 	</text>
 	<text name="group_details">
 		Eine Gruppe für Leute, die sich gerne mit Elchen unterhält.
-Hoch solln sie leben!  Elche forever!  Und auch Mungos!
+Hoch solln sie leben!  Elche forever! Und auch Mungos!
 	</text>
 	<text name="group_cost">
 		Mitgliedschaft: 123 L$
diff --git a/indra/newview/skins/default/xui/de/inspect_object.xml b/indra/newview/skins/default/xui/de/inspect_object.xml
index 61f2cc8dc9..bcf4b91527 100644
--- a/indra/newview/skins/default/xui/de/inspect_object.xml
+++ b/indra/newview/skins/default/xui/de/inspect_object.xml
@@ -39,7 +39,7 @@ Besitzer secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
 	</text>
 	<button label="Kaufen" name="buy_btn"/>
 	<button label="Zahlen" name="pay_btn"/>
-	<button label="Kopie nehmen" name="take_free_copy_btn"/>
+	<button label="Kopie nehmen" name="take_free_copy_btn" width="100"/>
 	<button label="Berühren" name="touch_btn"/>
 	<button label="Sitzen" name="sit_btn"/>
 	<button label="Öffnen" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
index eb4832770e..eeb5de749d 100644
--- a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="block_list_panel">
-	<text name="title_text">
+<panel name="block_list_panel" width="300">
+	<text name="title_text" left_pad="5" width="260">
 		Liste der ignorierten Einwohner
 	</text>
-	<scroll_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner"/>
+	<scroll_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/>
 	<button label="Einwohner ignorieren" label_selected="Einwohner ignorieren..." name="Block resident..." tool_tip="Wählen Sie einen Einwohner, um ihn zu ignorieren"/>
 	<button label="Objekt nach Name ignorieren" label_selected="Objekt nach Name ignorieren..." name="Block object by name..." tool_tip="Ein Objekt auswählen, um nach Namen zu ignorieren."/>
 	<button label="Freischalten" label_selected="Freischalten" name="Unblock" tool_tip="Einwohner oder Objekt von der Liste der ignorierten Einwohner oder Objekte entfernen"/>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_alpha.xml b/indra/newview/skins/default/xui/de/panel_edit_alpha.xml
index 4b48950341..b6c53be778 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_alpha.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="edit_alpha_panel">
-	<panel name="avatar_alpha_color_panel">
-		<texture_picker label="Alpha: Unten" name="Lower Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
-		<texture_picker label="Alpha: Oben" name="Upper Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+<panel name="edit_alpha_panel" width="320">
+	<panel name="avatar_alpha_color_panel" width="300">
+		<texture_picker label="Alpha: Unten" name="Lower Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken" width="70"/>
+		<texture_picker label="Alpha: Oben" name="Upper Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken" width="66"/>
 		<texture_picker label="Kopf: Alpha" name="Head Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
-		<texture_picker label="Alpha: Augen" name="Eye Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
-		<texture_picker label="Alpha: Haare" name="Hair Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+		<texture_picker label="Alpha: Augen" name="Eye Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken" width="72"/>
+		<texture_picker label="Alpha: Haare" name="Hair Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken" width="70"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml
index c05a3a6645..12649e9251 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_tattoo_panel">
 	<panel name="avatar_tattoo_color_panel">
-		<texture_picker label="Kopftattoo" name="Head Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
-		<texture_picker label="Obere Tattoos" name="Upper Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
-		<texture_picker label="Untere Tattoos" name="Lower Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+		<texture_picker label="Kopftattoo" name="Head Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken" width="80"/>
+		<texture_picker label="Obere Tattoos" name="Upper Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken" width="80"/>
+		<texture_picker label="Untere Tattoos" name="Lower Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken" width="80"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml
index 8e1fb5e4b2..fb357093bb 100644
--- a/indra/newview/skins/default/xui/de/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_invite.xml
@@ -9,18 +9,18 @@
 	<panel.string name="already_in_group">
 		Einige der ausgewählten Einwohner sind bereits Gruppenmitglieder und haben aus diesem Grund keine Einladung erhalten.
 	</panel.string>
-	<text name="help_text">
+	<text name="help_text" top="10">
 		Sie können mehrere Einwohner auswählen, um diese in Ihre Gruppe einzuladen. Klicken Sie hierzu auf „Einwohnerliste öffnen“.
 	</text>
-	<button label="Einwohnerliste öffnen" name="add_button" tool_tip=""/>
+	<button label="Einwohnerliste öffnen" name="add_button" tool_tip="" top_delta="62"/>
 	<name_list name="invitee_list" tool_tip="Halten Sie zur Mehrfachauswahl die Strg-Taste gedrückt und klicken Sie auf die Namen."/>
 	<button label="Auswahl aus Liste löschen" name="remove_button" tool_tip="Die oben ausgewählten Einwohner von der Einladungsliste entfernen."/>
 	<text name="role_text">
 		Wählen Sie eine Rolle aus:
 	</text>
 	<combo_box name="role_name" tool_tip="Wählen Sie aus der Liste der Rollen, die Sie an Mitglieder vergeben dürfen."/>
-	<button label="Einladungen versenden" name="ok_button"/>
-	<button label="Abbrechen" name="cancel_button"/>
+	<button label="Einladungen versenden" name="ok_button" width="136"/>
+	<button label="Abbrechen" name="cancel_button" width="66"/>
 	<string name="GroupInvitation">
 		Gruppeneinladung
 	</string>
diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
index e9743c5d5d..d6cfb22cfe 100644
--- a/indra/newview/skins/default/xui/de/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
@@ -30,13 +30,13 @@
 	<text name="total_contributed_land_value">
 		[AREA] m².
 	</text>
-	<text name="total_land_in_use_label">
+	<text name="total_land_in_use_label" left="28" width="180">
 		Insgesamt verwendetes Land:
 	</text>
 	<text name="total_land_in_use_value">
 		[AREA] m².
 	</text>
-	<text name="land_available_label">
+	<text name="land_available_label" left="4">
 		Land verfügbar:
 	</text>
 	<text name="land_available_value">
@@ -54,10 +54,10 @@
 	<text name="your_contribution_max_value">
 		([AMOUNT] max.)
 	</text>
-	<text name="group_over_limit_text">
+	<text name="group_over_limit_text" width="300">
 		Um das benutzte Land zu unterstützen, sind weitere Landnutzungsrechte erforderlich.
 	</text>
-	<text name="group_money_heading">
+	<text name="group_money_heading" left="10" top_pad="10">
 		Gruppen-L$
 	</text>
 	<tab_container name="group_money_tab_container">
diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml
index 3103fd65b1..b2e885e639 100644
--- a/indra/newview/skins/default/xui/de/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_roles.xml
@@ -15,8 +15,8 @@ um mehrere Mitglieder auszuwählen.
 			</panel.string>
 			<filter_editor label="Mitglieder filtern" name="filter_input"/>
 			<name_list name="member_list">
-				<name_list.columns label="Mitglied" name="name"/>
-				<name_list.columns label="Übereignung" name="donated"/>
+				<name_list.columns label="Mitglied" name="name" relative_width="0.30"/>
+				<name_list.columns label="Übereignung" name="donated" relative_width="0.33"/>
 				<name_list.columns label="Status" name="online"/>
 			</name_list>
 			<button label="Einladen" name="member_invite"/>
diff --git a/indra/newview/skins/default/xui/de/panel_groups.xml b/indra/newview/skins/default/xui/de/panel_groups.xml
index 95a2ef14f9..f857a6c7ac 100644
--- a/indra/newview/skins/default/xui/de/panel_groups.xml
+++ b/indra/newview/skins/default/xui/de/panel_groups.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="groups">
-	<text name="groupdesc">
+	<text name="groupdesc" width="300">
 		Die derzeit aktive Gruppe ist fett hervorgehoben.
 	</text>
-	<text name="groupcount">
+	<text name="groupcount" width="360">
 		Sie sind Mitglied bei [COUNT] Gruppen (von max. [MAX]).
 	</text>
 	<button label="IM/Anruf" name="IM" tool_tip="Beginnt eine Instant Message-Sitzung" />
diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml
index bd82fc6872..2a6ea42c73 100644
--- a/indra/newview/skins/default/xui/de/panel_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_login.xml
@@ -23,7 +23,7 @@
 			<text name="start_location_text">
 				Hier anfangen:
 			</text>
-			<combo_box name="start_location_combo">
+			<combo_box name="start_location_combo" width="150">
 				<combo_box.item label="Mein letzter Standort" name="MyLastLocation"/>
 				<combo_box.item label="Mein Zuhause" name="MyHome"/>
 				<combo_box.item label="&lt;Region eingeben&gt;" name="Typeregionname"/>
diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_security.xml b/indra/newview/skins/default/xui/de/panel_media_settings_security.xml
index 8ff013f66b..adc0d22ce6 100644
--- a/indra/newview/skins/default/xui/de/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/de/panel_media_settings_security.xml
@@ -2,7 +2,8 @@
 <panel label="Sicherheit" name="Media Settings Security">
 	<check_box initial_value="false" label="Nur Zugriff auf festgelegte URL-Muster zulassen" name="whitelist_enable"/>
 	<text name="home_url_fails_some_items_in_whitelist">
-		Einträge, die für die Startseite nicht akzeptiert werden, sind markiert:
+		Einträge, die für die Startseite nicht akzeptiert
+werden, sind markiert:
 	</text>
 	<button label="Hinzufügen" name="whitelist_add"/>
 	<button label="Löschen" name="whitelist_del"/>
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
index 699bddc6eb..3f4f5a71b5 100644
--- a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
@@ -2,7 +2,7 @@
 <!-- All our XML is utf-8 encoded. -->
 <panel name="nearby_chat">
 	<panel name="chat_caption">
-		<text name="sender_name">
+		<text name="sender_name" width="200">
 			CHAT IN DER NÄHE
 		</text>
 	</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_notes.xml b/indra/newview/skins/default/xui/de/panel_notes.xml
index e6a63fc0c8..374c117cdd 100644
--- a/indra/newview/skins/default/xui/de/panel_notes.xml
+++ b/indra/newview/skins/default/xui/de/panel_notes.xml
@@ -13,10 +13,10 @@
 			</scroll_container>
 		</layout_panel>
 		<layout_panel name="notes_buttons_panel">
-			<button label="Freund hinzufügen" name="add_friend" tool_tip="Bieten Sie dem Einwohner die Freundschaft an"/>
-			<button label="IM" name="im" tool_tip="Instant Messenger öffnen"/>
+			<button label="Freund hinzufügen" name="add_friend" tool_tip="Bieten Sie dem Einwohner die Freundschaft an" width="109"/>
+			<button label="IM" name="im" tool_tip="Instant Messenger öffnen" width="24"/>
 			<button label="Anrufen" name="call" tool_tip="Diesen Einwohner anrufen"/>
-			<button label="Karte" name="show_on_map_btn" tool_tip="Einwohner auf Karte anzeigen"/>
+			<button label="Karte" name="show_on_map_btn" tool_tip="Einwohner auf Karte anzeigen" width="40"/>
 			<button label="Teleportieren" name="teleport" tool_tip="Teleport anbieten"/>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/de/panel_picks.xml b/indra/newview/skins/default/xui/de/panel_picks.xml
index a07bc170f6..df68381082 100644
--- a/indra/newview/skins/default/xui/de/panel_picks.xml
+++ b/indra/newview/skins/default/xui/de/panel_picks.xml
@@ -11,7 +11,7 @@
 	</panel>
 	<panel name="buttons_cucks">
 		<button label="Info" name="info_btn" tool_tip="Auswahl-Information anzeigen"/>
-		<button label="Teleportieren" name="teleport_btn" tool_tip="Zu entsprechendem Standort teleportieren"/>
+		<button label="Teleportieren" name="teleport_btn" tool_tip="Zu entsprechendem Standort teleportieren" width="100"/>
 		<button label="Karte" name="show_on_map_btn" tool_tip="Den entsprechenden Standort auf der Karte anzeigen"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_places.xml b/indra/newview/skins/default/xui/de/panel_places.xml
index 8ee26f4e5f..0b3ed26dce 100644
--- a/indra/newview/skins/default/xui/de/panel_places.xml
+++ b/indra/newview/skins/default/xui/de/panel_places.xml
@@ -5,11 +5,11 @@
 	<filter_editor label="Orte filtern" name="Filter"/>
 	<panel name="button_panel">
 		<button label="Teleportieren" name="teleport_btn" tool_tip="Zu ausgewähltem Standort teleportieren"/>
-		<button label="Karte" name="map_btn"/>
+		<button label="Karte" name="map_btn" width="60"/>
 		<button label="Bearbeiten" name="edit_btn" tool_tip="Landmarken-Info bearbeiten"/>
 		<button name="overflow_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
 		<button label="Schließen" name="close_btn"/>
-		<button label="Abbrechen" name="cancel_btn"/>
-		<button label="Speichern" name="save_btn"/>
+		<button label="Abbrechen" name="cancel_btn" width="66"/>
+		<button label="Speichern" name="save_btn" width="66"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
index 14d4e01586..c9d6faf3ba 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
@@ -8,7 +8,7 @@
 	</panel.string>
 	<check_box label="Blasen-Chat" name="bubble_text_chat"/>
 	<color_swatch name="background" tool_tip="Farbe für Blasen-Chat auswählen"/>
-	<slider label="Deckkraft" name="bubble_chat_opacity"/>
+	<slider label="Deckkraft" name="bubble_chat_opacity" label_width="66"/>
 	<text name="AspectRatioLabel1" tool_tip="Breite/Höhe">
 		Seitenverhältnis
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index 490b0b296b..2af1b72472 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -19,7 +19,7 @@
 	<text name="language_textbox2">
 		(Erfordert Neustart)
 	</text>
-	<text name="maturity_desired_prompt">
+	<text name="maturity_desired_prompt" width="350">
 		Ich möchte auf Inhalt mit folgender Alterseinstufung zugreifen:
 	</text>
 	<text name="maturity_desired_textbox"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
index 0c0924026e..43664f4f8a 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
@@ -23,5 +23,5 @@
 		Speicherort für Protokolle:
 	</text>
 	<button label="Durchsuchen" label_selected="Durchsuchen" name="log_path_button"/>
-	<button label="Ignorierte Einwohner/Objekte" name="block_list"/>
+	<button label="Ignorierte Einwohner/Objekte" name="block_list" width="180"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_profile.xml b/indra/newview/skins/default/xui/de/panel_profile.xml
index 82467eb570..4ce5ed8fba 100644
--- a/indra/newview/skins/default/xui/de/panel_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_profile.xml
@@ -38,10 +38,10 @@
 			</scroll_container>
 		</layout_panel>
 		<layout_panel name="profile_buttons_panel">
-			<button label="Freund hinzufügen" name="add_friend" tool_tip="Bieten Sie dem Einwohner die Freundschaft an"/>
-			<button label="IM" name="im" tool_tip="Instant Messenger öffnen"/>
+			<button label="Freund hinzufügen" name="add_friend" tool_tip="Bieten Sie dem Einwohner die Freundschaft an" width="109"/>
+			<button label="IM" name="im" tool_tip="Instant Messenger öffnen" width="24"/>
 			<button label="Anrufen" name="call" tool_tip="Diesen Einwohner anrufen"/>
-			<button label="Karte" name="show_on_map_btn" tool_tip="Einwohner auf Karte anzeigen"/>
+			<button label="Karte" name="show_on_map_btn" tool_tip="Einwohner auf Karte anzeigen" width="36"/>
 			<button label="Teleportieren" name="teleport" tool_tip="Teleport anbieten"/>
 		</layout_panel>
 		<layout_panel name="profile_me_buttons_panel">
diff --git a/indra/newview/skins/default/xui/de/panel_profile_view.xml b/indra/newview/skins/default/xui/de/panel_profile_view.xml
index 4d59c16e98..f02457dd80 100644
--- a/indra/newview/skins/default/xui/de/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/de/panel_profile_view.xml
@@ -8,7 +8,7 @@
 	</string>
 	<text_editor name="user_name" value="(wird geladen...)"/>
 	<text name="status" value="Online"/>
-	<tab_container name="tabs">
+	<tab_container name="tabs" tab_min_width="60">
 		<panel label="PROFIL" name="panel_profile"/>
 		<panel label="AUSWAHL" name="panel_picks"/>
 		<panel label="NOTIZEN &amp; PRIVATSPHÄRE" name="panel_notes"/>
diff --git a/indra/newview/skins/default/xui/de/panel_region_covenant.xml b/indra/newview/skins/default/xui/de/panel_region_covenant.xml
index 14be8def7e..153082909a 100644
--- a/indra/newview/skins/default/xui/de/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_covenant.xml
@@ -18,7 +18,7 @@
 	<text name="estate_cov_lbl">
 		Vertrag:
 	</text>
-	<text name="covenant_timestamp_text">
+	<text name="covenant_timestamp_text" width="320">
 		Letzte Änderung am Mittwoch, den 31. Dez. 1969, 16:00:00
 	</text>
 	<button label="?" name="covenant_help"/>
@@ -28,7 +28,7 @@
 	<button label="Zurücksetzen" name="reset_covenant"/>
 	<text name="covenant_help_text">
 		Änderungen am Vertrag werden für alle Parzellen auf dem 
-      Grundstück übernommen.
+Grundstück übernommen.
 	</text>
 	<text bottom_delta="-36" name="covenant_instructions">
 		Ziehen Sie eine Notizkarte an diese Stelle, um den Vertrag für dieses Grundstück zu ändern.
@@ -63,7 +63,7 @@
 	<text name="changeable_lbl">
 		Unterteilen:
 	</text>
-	<text name="changeable_clause">
+	<text name="changeable_clause" width="366">
 		Land in dieser Region kann nicht zusammengelegt/geteilt werden.
 	</text>
 	<string name="can_resell">
diff --git a/indra/newview/skins/default/xui/de/panel_region_debug.xml b/indra/newview/skins/default/xui/de/panel_region_debug.xml
index 40befab4dd..920a513308 100644
--- a/indra/newview/skins/default/xui/de/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_debug.xml
@@ -13,7 +13,7 @@
 	<check_box label="Physik deaktivieren" name="disable_physics_check" tool_tip="Physik in dieser Region deaktivieren"/>
 	<button label="?" name="disable_physics_help"/>
 	<button label="Übernehmen" name="apply_btn"/>
-	<text name="objret_text_lbl" width="105">
+	<text name="objret_text_lbl" width="110">
 		Objekt zurückgeben
 	</text>
 	<text name="resident_text_lbl">
diff --git a/indra/newview/skins/default/xui/de/panel_region_texture.xml b/indra/newview/skins/default/xui/de/panel_region_texture.xml
index d489b5bac8..f9997f300a 100644
--- a/indra/newview/skins/default/xui/de/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_texture.xml
@@ -36,14 +36,14 @@
 	<text name="height_text_lbl9">
 		Nordost
 	</text>
-	<spinner label="Niedrig" name="height_start_spin_0"/>
-	<spinner label="Niedrig" name="height_start_spin_1"/>
-	<spinner label="Niedrig" name="height_start_spin_2"/>
-	<spinner label="Niedrig" name="height_start_spin_3"/>
-	<spinner label="Hoch" name="height_range_spin_0"/>
-	<spinner label="Hoch" name="height_range_spin_1"/>
-	<spinner label="Hoch" name="height_range_spin_2"/>
-	<spinner label="Hoch" name="height_range_spin_3"/>
+	<spinner label="Niedrig" name="height_start_spin_0" label_width="40"/>
+	<spinner label="Niedrig" name="height_start_spin_1" label_width="40"/>
+	<spinner label="Niedrig" name="height_start_spin_2" label_width="40"/>
+	<spinner label="Niedrig" name="height_start_spin_3" label_width="40"/>
+	<spinner label="Hoch" name="height_range_spin_0" label_width="40"/>
+	<spinner label="Hoch" name="height_range_spin_1" label_width="40"/>
+	<spinner label="Hoch" name="height_range_spin_2" label_width="40"/>
+	<spinner label="Hoch" name="height_range_spin_3" label_width="40"/>
 	<text name="height_text_lbl10">
 		Diese Werte geben den Mischungsgrad für die obigen Texturen an.
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml
index f6a1d7e9b5..16bf4e8eb4 100644
--- a/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml
@@ -4,7 +4,7 @@
 		Wird geladen...
 	</text>
 	<scroll_list name="scripts_list">
-		<scroll_list.columns label="Größe (KB)" name="size"/>
+		<scroll_list.columns label="Größe (KB)" name="size" width="80"/>
 		<scroll_list.columns label="URLs" name="urls"/>
 		<scroll_list.columns label="Objektname" name="name"/>
 		<scroll_list.columns label="Ort" name="location"/>
diff --git a/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml
index c466c04e86..3eec66fe75 100644
--- a/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml
@@ -13,12 +13,12 @@
 		Wird geladen...
 	</text>
 	<scroll_list name="scripts_list">
-		<scroll_list.columns label="Größe (KB)" name="size"/>
+		<scroll_list.columns label="Größe (KB)" name="size" width="80"/>
 		<scroll_list.columns label="Objektname" name="name"/>
-		<scroll_list.columns label="Objekteigentümer" name="owner"/>
+		<scroll_list.columns label="Objekteigentümer" name="owner" width="130"/>
 		<scroll_list.columns label="Parzelle / Standort" name="location"/>
 	</scroll_list>
-	<button label="Liste aktualisieren" name="refresh_list_btn"/>
+	<button label="Liste aktualisieren" name="refresh_list_btn" width="110"/>
 	<button label="Markieren" name="highlight_btn"/>
 	<button label="Zurückgeben" name="return_btn"/>
 </panel>
-- 
cgit v1.2.3


From 41da63f5e665d793d328e52973cb4de63d3da6a0 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 8 Feb 2010 16:06:20 -0800
Subject: Linguistic fix on behalf of Simone

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

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

diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index b2f8cbed45..b5c02cce0b 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -363,7 +363,7 @@
 			<text name="edit_object">
 				Objekteigenschaften bearbeiten:
 			</text>
-			<check_box label="Flexibler Weg" name="Flexible1D Checkbox Ctrl" tool_tip="Bewirkt, dass sich das Objekt um die Z-Achse biegen kann. (Nur Client-Seite)"/>
+			<check_box label="Flexibler Pfad" name="Flexible1D Checkbox Ctrl" tool_tip="Bewirkt, dass sich das Objekt um die Z-Achse biegen kann. (Nur Client-Seite)"/>
 			<spinner label="Weichheit" name="FlexNumSections"/>
 			<spinner label="Schwerkraft" name="FlexGravity"/>
 			<spinner label="Ziehen" name="FlexFriction"/>
-- 
cgit v1.2.3


From e7889301723e23b94813464a4519ee6a7751f413 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 9 Feb 2010 10:06:52 +0200
Subject: Fixed normal bug EXT - 4878 (Tab labels are no longer obeying halign
 attribute)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 978b40da77..964713adbf 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -24,6 +24,8 @@
      tab_height="16"
      use_custom_icon_ctrl="true"
      tab_icon_ctrl_pad="2"
+     font_halign="left"
+     use_ellipses="true"
      top="0"
      width="390" />
     <icon
-- 
cgit v1.2.3


From 3e15f7887e304737ba3a0cefb1144ac0a3913137 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 9 Feb 2010 10:31:17 +0200
Subject: Fixed normal bug EXT - 5065 ( Buttons are slightly misalign in slider
 (Preferences) )

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_preferences_sound.xml       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 8bff865eb1..ae5e6fbbfa 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -38,7 +38,7 @@
      image_unselected="Audio_Off"
      is_toggle="true"
      layout="topleft"
-     left_pad="10"
+     left_pad="16"
      name="mute_audio"
      tab_stop="false"
      width="16" />
@@ -82,7 +82,7 @@
      image_unselected="Audio_Off"
      is_toggle="true"
      layout="topleft"
-     left_pad="10"
+     left_pad="16"
      name="mute_audio"
      tab_stop="false"
      width="16" />
@@ -116,7 +116,7 @@
      image_unselected="Audio_Off"
      is_toggle="true"
      layout="topleft"
-     left_pad="10"
+     left_pad="16"
      name="mute_audio"
      tab_stop="false"
      width="16" />
@@ -150,7 +150,7 @@
      image_unselected="Audio_Off"
      is_toggle="true"
      layout="topleft"
-     left_pad="10"
+     left_pad="16"
      name="mute_audio"
      tab_stop="false"
      width="16" />
@@ -184,7 +184,7 @@
      image_unselected="Audio_Off"
      is_toggle="true"
      layout="topleft"
-     left_pad="10"
+     left_pad="16"
      name="mute_audio"
      tab_stop="false"
      width="16" />
@@ -218,7 +218,7 @@
      image_unselected="Audio_Off"
      is_toggle="true"
      layout="topleft"
-     left_pad="10"
+     left_pad="16"
      name="mute_audio"
      tab_stop="false"
      width="16" />
@@ -267,7 +267,7 @@
      image_unselected="Audio_Off"
      is_toggle="true"
      layout="topleft"
-     left_pad="10"
+     left_pad="16"
      name="mute_audio"
      tab_stop="false"
      width="16" />
-- 
cgit v1.2.3


From 486b0b5d184525f36bfb0ec50c3d37e1e1d2fc31 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Tue, 9 Feb 2010 15:07:46 +0200
Subject: Fixed normal bug EXT-5109 - IM chiclet buttons missing top border and
 need to move up 1px. Increased chiclet panel height by 1px and moved it to
 center horizontally.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index aad55685d2..0755813389 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -247,7 +247,7 @@
         <layout_panel
          mouse_opaque="false"
          follows="left|right"
-         height="29"
+         height="30"
          layout="topleft"
          top="0"
          name="chiclet_list_panel"
@@ -260,12 +260,12 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
             <chiclet_panel
 	    mouse_opaque="false"
              follows="left|right"
-             height="23"
+             height="24"
              layout="topleft"
              left="1"
              min_width="110"
              name="chiclet_list"
-             top="8"
+             top="7"
              chiclet_padding="4"
              scrolling_offset="40"
              width="189">
-- 
cgit v1.2.3


From 33d1d5bc4df2eaef6ca8f9e4111d8a437763766c Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Tue, 9 Feb 2010 19:18:17 +0200
Subject: Fixed normal bug EXT-651 (Upload Image shortcut (Ctrl-U / Cmd-U) does
 not work)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 22f4d277a4..4e9073bea5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1594,6 +1594,16 @@
          name="Shortcuts"
          tear_off="true"
          visible="false">
+          <menu_item_call
+             label="Image (L$[COST])..."
+             layout="topleft"
+             name="Upload Image"
+             shortcut="control|U">
+            <menu_item_call.on_click
+               function="File.UploadImage"
+               parameter="" />
+            <menu_item_call.on_enable
+               function="File.EnableUpload" />
             <menu_item_check
                label="Search"
                layout="topleft"
-- 
cgit v1.2.3


From 465a3356a2f32362837d5231a21b9151f45f890b Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Tue, 9 Feb 2010 15:08:11 -0800
Subject: returning take to top level of object context menu. Change was
 mistakenly reverted

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 5a9509e284..d66818e91a 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -86,16 +86,6 @@
    <context_menu
          label="Remove  ▶"
          name="Remove">
-   <menu_item_call
-     enabled="false"
-     label="Take"
-     name="Pie Object Take">
-        <menu_item_call.on_click
-         function="Tools.BuyOrTake" />
-        <menu_item_call.on_enable
-         function="Tools.EnableBuyOrTake"
-         parameter="Buy,Take" />
-    </menu_item_call>
    <menu_item_call
          enabled="false"
          label="Report Abuse"
@@ -134,6 +124,16 @@
     </menu_item_call>
     </context_menu>
    <menu_item_separator layout="topleft" />
+       <menu_item_call
+     enabled="false"
+     label="Take"
+     name="Pie Object Take">
+        <menu_item_call.on_click
+         function="Tools.BuyOrTake" />
+        <menu_item_call.on_enable
+         function="Tools.EnableBuyOrTake"
+         parameter="Buy,Take" />
+    </menu_item_call>
    <menu_item_call
    enabled="false"
    label="Take Copy"
-- 
cgit v1.2.3


From 22dccc74a8fbcf3231d932db39781727833b9259 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 9 Feb 2010 19:38:19 -0800
Subject: DEV-43688 Cycle3 JA massive linguistic changes by Rika for better UI,
 post truncation fix

---
 .../skins/default/xui/ja/floater_about_land.xml    | 36 +++++++++----------
 .../default/xui/ja/floater_animation_preview.xml   |  8 ++---
 .../default/xui/ja/floater_avatar_textures.xml     |  2 +-
 .../skins/default/xui/ja/floater_build_options.xml |  2 +-
 .../skins/default/xui/ja/floater_bulk_perms.xml    |  8 ++---
 .../skins/default/xui/ja/floater_buy_contents.xml  | 12 +++----
 .../skins/default/xui/ja/floater_buy_currency.xml  |  2 +-
 .../skins/default/xui/ja/floater_buy_land.xml      | 16 ++++-----
 .../skins/default/xui/ja/floater_buy_object.xml    | 10 +++---
 .../skins/default/xui/ja/floater_camera.xml        |  2 +-
 .../skins/default/xui/ja/floater_color_picker.xml  |  2 +-
 .../skins/default/xui/ja/floater_critical.xml      |  4 +--
 .../skins/default/xui/ja/floater_customize.xml     |  8 ++---
 .../skins/default/xui/ja/floater_image_preview.xml |  6 ++--
 .../skins/default/xui/ja/floater_inspect.xml       |  8 ++---
 .../skins/default/xui/ja/floater_inventory.xml     |  2 +-
 .../xui/ja/floater_inventory_view_finder.xml       |  2 +-
 .../skins/default/xui/ja/floater_land_holdings.xml |  8 ++---
 indra/newview/skins/default/xui/ja/floater_map.xml |  2 +-
 .../skins/default/xui/ja/floater_media_browser.xml |  4 +--
 .../skins/default/xui/ja/floater_mem_leaking.xml   |  6 ++--
 .../skins/default/xui/ja/floater_perm_prefs.xml    |  4 +--
 .../skins/default/xui/ja/floater_postcard.xml      |  8 ++---
 .../skins/default/xui/ja/floater_preferences.xml   |  2 +-
 .../default/xui/ja/floater_preview_animation.xml   |  4 +--
 .../default/xui/ja/floater_preview_gesture.xml     |  2 +-
 .../skins/default/xui/ja/floater_preview_sound.xml |  4 +--
 .../skins/default/xui/ja/floater_report_abuse.xml  |  8 ++---
 .../skins/default/xui/ja/floater_sell_land.xml     |  2 +-
 .../skins/default/xui/ja/floater_snapshot.xml      |  8 ++---
 .../skins/default/xui/ja/floater_sound_preview.xml |  2 +-
 .../skins/default/xui/ja/floater_telehub.xml       |  2 +-
 .../skins/default/xui/ja/floater_texture_ctrl.xml  |  6 ++--
 .../newview/skins/default/xui/ja/floater_tools.xml | 40 +++++++++++-----------
 .../skins/default/xui/ja/floater_window_size.xml   |  2 +-
 .../skins/default/xui/ja/floater_world_map.xml     | 22 ++++++------
 .../skins/default/xui/ja/menu_avatar_self.xml      |  2 +-
 .../default/xui/ja/menu_inspect_self_gear.xml      |  2 +-
 .../skins/default/xui/ja/menu_inventory.xml        | 10 +++---
 indra/newview/skins/default/xui/ja/menu_login.xml  |  2 +-
 indra/newview/skins/default/xui/ja/menu_object.xml |  4 +--
 .../skins/default/xui/ja/menu_people_groups.xml    |  2 +-
 indra/newview/skins/default/xui/ja/menu_slurl.xml  |  2 +-
 indra/newview/skins/default/xui/ja/menu_viewer.xml | 12 +++----
 indra/newview/skins/default/xui/ja/mime_types.xml  | 10 +++---
 .../skins/default/xui/ja/panel_bottomtray.xml      |  4 +--
 .../newview/skins/default/xui/ja/panel_friends.xml | 16 ++++-----
 .../default/xui/ja/panel_group_control_panel.xml   |  2 +-
 .../skins/default/xui/ja/panel_group_general.xml   |  2 +-
 .../skins/default/xui/ja/panel_group_invite.xml    |  2 +-
 .../default/xui/ja/panel_group_land_money.xml      |  2 +-
 .../skins/default/xui/ja/panel_group_notices.xml   |  8 ++---
 .../newview/skins/default/xui/ja/panel_groups.xml  |  6 ++--
 .../skins/default/xui/ja/panel_landmark_info.xml   |  2 +-
 .../skins/default/xui/ja/panel_landmarks.xml       |  6 ++--
 .../skins/default/xui/ja/panel_main_inventory.xml  | 10 +++---
 .../xui/ja/panel_media_settings_general.xml        |  2 +-
 .../xui/ja/panel_media_settings_security.xml       |  2 +-
 .../skins/default/xui/ja/panel_my_profile.xml      |  2 +-
 .../skins/default/xui/ja/panel_navigation_bar.xml  |  4 +--
 indra/newview/skins/default/xui/ja/panel_notes.xml |  6 ++--
 .../default/xui/ja/panel_outfits_inventory.xml     |  8 ++---
 .../newview/skins/default/xui/ja/panel_people.xml  | 22 ++++++------
 indra/newview/skins/default/xui/ja/panel_picks.xml |  6 ++--
 .../skins/default/xui/ja/panel_place_profile.xml   |  7 ++--
 .../default/xui/ja/panel_preferences_alerts.xml    |  4 +--
 .../default/xui/ja/panel_preferences_chat.xml      | 18 +++++-----
 .../default/xui/ja/panel_preferences_general.xml   |  2 +-
 .../default/xui/ja/panel_preferences_graphics1.xml |  2 +-
 .../default/xui/ja/panel_preferences_privacy.xml   |  6 ++--
 .../newview/skins/default/xui/ja/panel_profile.xml |  8 ++---
 .../skins/default/xui/ja/panel_region_covenant.xml |  4 +--
 .../skins/default/xui/ja/panel_region_debug.xml    | 14 ++++----
 .../skins/default/xui/ja/panel_region_estate.xml   |  2 +-
 .../skins/default/xui/ja/panel_region_general.xml  | 12 +++----
 .../default/xui/ja/panel_region_general_layout.xml |  8 ++---
 .../skins/default/xui/ja/panel_status_bar.xml      |  2 +-
 indra/newview/skins/default/xui/ja/strings.xml     | 18 +++++-----
 78 files changed, 266 insertions(+), 265 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index 49486d791a..b3278a8f9e 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -206,7 +206,7 @@
 				[MAX]の内[COUNT]（[DELETED]を削除）
 			</panel.string>
 			<text name="parcel_object_bonus">
-				地域オブジェクトボーナス要因: [BONUS]
+				オブジェクトボーナス: [BONUS]
 			</text>
 			<text name="Simulator primitive usage:" width="500">
 				プリム使用状況：
@@ -263,7 +263,7 @@
 			<text name="Object Owners:" width="150">
 				オブジェクトのオーナー：
 			</text>
-			<button label="リスト更新" label_selected="リスト更新" left="146" name="Refresh List" tool_tip="オブジェクトのリストを更新"/>
+			<button label="リスト更新" label_selected="リスト更新" left="146" name="Refresh List" tool_tip="オブジェクトのリストを更新します"/>
 			<button label="オブジェクトを返却する" label_selected="オブジェクトの返却..." left="256" name="Return objects..."/>
 			<name_list label="カウント" name="owner list">
 				<name_list.columns label="タイプ" name="type"/>
@@ -329,8 +329,8 @@
 				土地オプション：
 			</text>
 			<check_box label="安全（ダメージなし）" name="check safe" tool_tip="チェックを入れるとこの土地でのダメージコンバットが無効になり、「安全」に設定されます。 チェックを外すとダメージコンバットが有効になります。"/>
-			<check_box label="プッシングを制限" name="PushRestrictCheck" tool_tip="スクリプトによるプッシングを制限します。 このオプションを選択することにより、あなたの土地での破壊的行動を妨げることができます。"/>
-			<check_box label="検索に区画を表示（週 L$30）" name="ShowDirectoryCheck" tool_tip="検索結果でこの区画を表示させる"/>
+			<check_box label="プッシングを制限" name="PushRestrictCheck" tool_tip="スクリプトによるプッシングを制限します。 このオプションを選択することにより、あなたの土地での破壊的行動を防ぐことができます。"/>
+			<check_box label="検索に区画を表示（週 L$30）" name="ShowDirectoryCheck" tool_tip="この区画を検索結果に表示します"/>
 			<combo_box name="land category with adult">
 				<combo_box.item label="全カテゴリ" name="item0"/>
 				<combo_box.item label="Linden所在地" name="item1"/>
@@ -383,7 +383,7 @@
 			<text name="with media:">
 				種類：
 			</text>
-			<combo_box name="media type" tool_tip="URL が動画、ウェブ・ページ、その他のメディアの場合に指定します"/>
+			<combo_box name="media type" tool_tip="URL が動画、Webページ、その他のメディアの場合に指定します"/>
 			<text name="at URL:">
 				ホームページ：
 			</text>
@@ -396,20 +396,20 @@
 			<text name="Description:">
 				説明：
 			</text>
-			<line_editor name="url_description" tool_tip="［再生］/［ロード］ボタンの隣に表示されるテキスト"/>
+			<line_editor name="url_description" tool_tip="「再生」「ロード」ボタンの隣に表示されるテキストです"/>
 			<text name="Media texture:">
-				テクスチャの置き換え：
+				テクスチャ置き換え：
 			</text>
 			<texture_picker label="" name="media texture" tool_tip="写真をクリックして選択" left="120"/>
 			<text name="replace_texture_help" width="290">
 				このテクスチャを使用するオブジェクトのプレイをクリックすると、ムービーや Web ページを表示します。  テクスチャを変更するにはサムネイルを選択してください。
 			</text>
 			<check_box label="スケールを自動設定" name="media_auto_scale" tool_tip="このオプションをチェックすると、この区画のコンテンツのスケールが自動的に設定されます。 動作速度と画質が少し低下することがありますが、他のテクスチャーのスケーリングや整列が必要になることはありません。"/>
-			<text name="media_size" tool_tip="レンダリングするウェブ・メディアのサイズ。デフォルトの 0 のままにします。">
+			<text name="media_size" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの 0 のままにします。">
 				サイズ：
 			</text>
-			<spinner name="media_size_width" tool_tip="レンダリングするウェブ・メディアのサイズ。デフォルトの 0 のままにします。"/>
-			<spinner name="media_size_height" tool_tip="レンダリングするウェブ・メディアのサイズ。デフォルトの 0 のままにします。"/>
+			<spinner name="media_size_width" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの 0 のままにします。"/>
+			<spinner name="media_size_height" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの 0 のままにします。"/>
 			<text name="pixels">
 				ピクセル
 			</text>
@@ -425,13 +425,13 @@
 			<text name="Sound:">
 				サウンド：
 			</text>
-			<check_box label="ジェスチャーとオブジェクトの音をこの区画だけに限定" name="check sound local"/>
+			<check_box label="ジェスチャーとオブジェクトの音をこの区画だけに限定する" name="check sound local"/>
 			<text name="Voice settings:">
 				ボイス：
 			</text>
 			<check_box label="ボイスを有効にする" name="parcel_enable_voice_channel"/>
 			<check_box label="ボイスを有効にする（不動産設定）" name="parcel_enable_voice_channel_is_estate_disabled"/>
-			<check_box label="この区画でのボイス使用を制限" name="parcel_enable_voice_channel_parcel"/>
+			<check_box label="ボイスをこの区画に限定する" name="parcel_enable_voice_channel_parcel"/>
 		</panel>
 		<panel label="アクセス" name="land_access_panel">
 			<panel.string name="access_estate_defined">
@@ -441,16 +441,16 @@
 				1つ以上のオプションが、不動産レベルで設定されています。
 			</panel.string>
 			<text name="Limit access to this parcel to:">
-				この区画にアクセス
+				この区画へのアクセス
 			</text>
-			<check_box label="パブリックアクセスを許可 [MATURITY]" name="public_access"/>
+			<check_box label="パブリックアクセスを許可する [MATURITY]" name="public_access"/>
 			<text name="Only Allow">
-				次の住人のアクセス禁止：
+				次の住人のアクセスを許可：
 			</text>
 			<check_box label="支払情報登録済 [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="未確認の住人の立入を禁止します。"/>
 			<check_box label="年齢確認 [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="年齢確認を済ませていない住人の立入を禁止します。 詳しい情報は [SUPPORT_SITE] をご覧下さい。"/>
-			<check_box label="グループ・アクセスを許可：[GROUP]" name="GroupCheck" tool_tip="[一般]タブで、グループを選択してください。"/>
-			<check_box label="入場許可を販売：" name="PassCheck" tool_tip="この区画への一時的なアクセスを許可"/>
+			<check_box label="グループのアクセスを許可：[GROUP]" name="GroupCheck" tool_tip="[一般]タブで、グループを選択してください。"/>
+			<check_box label="入場許可を販売：" name="PassCheck" tool_tip="この区画への一時的なアクセスを許可します"/>
 			<combo_box name="pass_combo">
 				<combo_box.item label="誰でも" name="Anyone"/>
 				<combo_box.item label="グループ" name="Group"/>
@@ -467,7 +467,7 @@
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="禁止" name="BanCheck">
-					立入禁止された住人
+					立入を禁止された住人
 				</text>
 				<name_list name="BannedList" tool_tip="(合計 [LISTED] 人、最大 [MAX] 人）"/>
 				<button label="追加" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
index f0378f61d7..4674df8bec 100644
--- a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
@@ -168,17 +168,17 @@
 		<combo_box.item label="座る" name="Sitting"/>
 		<combo_box.item label="飛ぶ" name="Flying"/>
 	</combo_box>
-	<spinner label="ﾌｪｰｽﾞｲﾝ(秒)" name="ease_in_time" tool_tip="アニメーションのブレンドイン時間（秒）"/>
-	<spinner label="ﾌｪｰｽﾞｱｳﾄ(秒)" name="ease_out_time" tool_tip="アニメーションのブレンドアウト時間（秒）"/>
+	<spinner label="イーズイン(秒)" name="ease_in_time" tool_tip="アニメーションのブレンドイン時間（秒）"/>
+	<spinner label="イーズアウト(秒)" name="ease_out_time" tool_tip="アニメーションのブレンドアウト時間（秒）"/>
 	<button label="" name="play_btn" tool_tip="アニメーションを再生する"/>
 	<button name="pause_btn" tool_tip="アニメーションを一時停止する"/>
 	<button label="" name="stop_btn" tool_tip="アニメーションの再生を停止"/>
 	<slider label="" name="playback_slider"/>
 	<text name="bad_animation_text">
-		アニメーション・ファイルを読み込めません。
+		アニメーションファイルを読み込めません。
  
  Poser 4からエクスポートされたBVHファイルを推奨します。
 	</text>
-	<button label="ｱｯﾌﾟﾛｰﾄﾞL$[AMOUNT]" name="ok_btn"/>
+	<button label="アップロードL$[AMOUNT]" name="ok_btn"/>
 	<button label="取り消し" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
index ff8b2083ad..0ea913e66a 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
@@ -7,7 +7,7 @@
 		ベークドテクスチャ
 	</text>
 	<text name="composite_label" width="128">
-		合成テクスチャー
+		合成テクスチャ
 	</text>
 	<button label="テクスチャID一覧をコンソールに書き込む" label_selected="捨てる" name="Dump" width="200"/>
 	<scroll_container name="profile_scroll">
diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml
index 8d3dba3883..9fd788d9cb 100644
--- a/indra/newview/skins/default/xui/ja/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_build_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="グリッドオプション">
 	<spinner label="グリッドユニット（メートル）" name="GridResolution"/>
-	<spinner label="ｸﾞﾘｯﾄﾞ範囲（ﾒｰﾄﾙ）" name="GridDrawSize"/>
+	<spinner label="グリッドﾞ範囲（メートル）" name="GridDrawSize"/>
 	<check_box label="サブユニットにスナップ" name="GridSubUnit"/>
 	<check_box label="横断面を表示" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="グリッドの透明度">
diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
index 7ac9187aad..be24960c6e 100644
--- a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="コンテンツ権限の編集">
+<floater name="floaterbulkperms" title="中身の権限の編集">
 	<floater.string name="nothing_to_modify_text">
-		選択した中に編集できないコンテンツが含まれています
+		選択した中に編集できないものが含まれています
 	</floater.string>
 	<floater.string name="status_text">
 		[NAME]に権限を設定中です。
@@ -28,12 +28,12 @@
 	<icon name="icon_script" tool_tip="スクリプト"/>
 	<check_box label="サウンド" name="check_sound"/>
 	<icon name="icon_sound" tool_tip="サウンド"/>
-	<check_box label="テクスチャー" name="check_texture"/>
+	<check_box label="テクスチャ" name="check_texture"/>
 	<icon name="icon_texture" tool_tip="テクスチャ"/>
 	<button label="すべてに √" label_selected="全て" name="check_all"/>
 	<button label="クリア" label_selected="なし" name="check_none"/>
 	<text name="newperms">
-		新しいコンテンツ権限
+		新しい中身の権限
 	</text>
 	<text name="GroupLabel">
 		グループ：
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
index 53b7f24141..69d4faf5b8 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater min_width="340" name="floater_buy_contents" title="コンテンツの購入" width="340">
+<floater min_width="340" name="floater_buy_contents" title="中身の購入" width="340">
 	<text name="contains_text" width="320">
-		[NAME]の内容：
+		[NAME]の中身：
 	</text>
 	<scroll_list name="item_list" width="310"/>
 	<text name="buy_text" width="320">
-		コンテンツを[NAME]からL$[AMOUNT]で購入しますか？
+		中身を[NAME]からL$[AMOUNT]で購入しますか？
 	</text>
 	<button label="取り消し" label_selected="取り消し" name="cancel_btn" width="73"/>
 	<button label="購入" label_selected="購入" left_delta="-77" name="buy_btn" width="73"/>
 	<check_box label="今すぐ服を着る" left_delta="-125" name="wear_check"/>
 	<text name="no_copy_text">
-		(コピーなし)
+		(コピー不可)
 	</text>
 	<text name="no_modify_text">
-		(修正なし)
+		(修正不可)
 	</text>
 	<text name="no_transfer_text">
-		(転送なし)
+		(再販・プレゼント不可)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index 357b3682ba..32de533dc4 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
@@ -40,7 +40,7 @@
 		[NAME] L$ [PRICE]
 	</text>
 	<text name="total_label">
-		新しい残高
+		購入後の残高
 	</text>
 	<text name="total_amount">
 		L$ [AMT]
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
index 97fae511f6..f332c3d988 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
@@ -67,12 +67,12 @@
 	<text name="error_message">
 		何か変です
 	</text>
-	<button label="ウェブ・サイトに移動" name="error_web"/>
+	<button label="Webサイトに移動" name="error_web"/>
 	<text name="account_action">
-		プレミアム・メンバーにアップグレード
+		プレミアム会員にアップグレード
 	</text>
 	<text name="account_reason">
-		土地を保有できるのはプレミアム・メンバーだけです
+		土地を保有できるのはプレミアム会員だけです
 	</text>
 	<combo_box name="account_level">
 		<combo_box.item label="月額 9.95米ドル、 月払い" name="US$9.95/month,billedmonthly"/>
@@ -114,10 +114,10 @@
 		再販不可能
 	</string>
 	<string name="can_change">
-		統合／再分割可能
+		統合・再分割可能
 	</string>
 	<string name="can_not_change">
-		統合／再分割不可能
+		統合・再分割不可能
 	</string>
 	<string name="cant_buy_for_group">
 		あなたはアクティブなグループ用の土地購入を許可されていません
@@ -127,7 +127,7 @@
 	</string>
 	<string name="multiple_parcels_selected">
 		複数の異なった区画を選択しました。 
-これより小さなエリアを選択してください。
+これより小さな範囲を選択してください。
 	</string>
 	<string name="no_permission">
 		あなたはアクティブなグループ用の土地購入を許可されていません
@@ -149,7 +149,7 @@
 	</string>
 	<string name="not_owned_by_you">
 		他の使用者に所有された土地が選択されています。 
-これより小さなエリアを選択してください。
+これより小さな範囲を選択してください。
 	</string>
 	<string name="processing">
 		購入処理中...
@@ -203,7 +203,7 @@
 オブジェクト [AMOUNT2] 個サポート
 	</string>
 	<string name="sold_with_objects">
-		オブジェクトと共に販売済み
+		オブジェクト込みで販売
 	</string>
 	<string name="sold_without_objects">
 		オブジェクトは含まれていません
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_object.xml b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
index f807e91573..7a5b7dc140 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="contents" title="オブジェクトのコピーを購入">
 	<text name="contents_text">
-		内容：
+		中身：
 	</text>
 	<text name="buy_text">
 		[NAME]からL$[AMOUNT]で購入しますか？
@@ -12,15 +12,15 @@
 		購入
 	</text>
 	<string name="title_buy_copy_text">
-		次のものを買う
+		次のものを購入
 	</string>
 	<text name="no_copy_text">
-		(コピーなし)
+		(コピー不可)
 	</text>
 	<text name="no_modify_text">
-		(修正なし)
+		(修正不可)
 	</text>
 	<text name="no_transfer_text">
-		(転送なし)
+		(再販・プレゼント不可)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml
index be118273fa..3730bcd385 100644
--- a/indra/newview/skins/default/xui/ja/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera.xml
@@ -11,7 +11,7 @@
 	</floater.string>
 	<panel name="controls">
 		<joystick_track name="cam_track_stick" tool_tip="カメラを上下左右に動かします"/>
-		<panel name="zoom" tool_tip="向いてる方法にカメラをズーム">
+		<panel name="zoom" tool_tip="向いている方法にカメラをズーム">
 			<slider_bar name="zoom_slider" tool_tip="向いている方向にカメラをズーム"/>
 		</panel>
 		<joystick_rotate name="cam_rotate_stick" tool_tip="自分を軸にカメラを回す"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_color_picker.xml b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
index a98da4b8ba..dc87d27a15 100644
--- a/indra/newview/skins/default/xui/ja/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
@@ -18,7 +18,7 @@
 	<text name="l_val_text">
 		輝度：
 	</text>
-	<check_box label="今すぐ適用" name="apply_immediate"/>
+	<check_box label="すぐ適用" name="apply_immediate"/>
 	<button label="" label_selected="" name="color_pipette"/>
 	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
 	<button label="OK" label_selected="OK" name="select_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_critical.xml b/indra/newview/skins/default/xui/ja/floater_critical.xml
index 39f6ee8e3f..f69c24622a 100644
--- a/indra/newview/skins/default/xui/ja/floater_critical.xml
+++ b/indra/newview/skins/default/xui/ja/floater_critical.xml
@@ -3,10 +3,10 @@
 	<button label="続行" label_selected="続行" name="Continue" />
 	<button label="取り消し" label_selected="取り消し" name="Cancel" />
 	<text name="tos_title">
-		クリティカル・メッセージ
+		クリティカルメッセージ
 	</text>
 	<text name="tos_heading">
-		次のメッセージを注意深くお読みください。
+		次のメッセージを注意してよくお読みください。
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/ja/floater_customize.xml b/indra/newview/skins/default/xui/ja/floater_customize.xml
index 7d1809f1ed..27ce1adede 100644
--- a/indra/newview/skins/default/xui/ja/floater_customize.xml
+++ b/indra/newview/skins/default/xui/ja/floater_customize.xml
@@ -50,7 +50,7 @@
 		<panel label="スキン" name="Skin">
 			<button label="スキンの色" label_selected="スキンの色" name="Skin Color"/>
 			<button label="顔の細部" label_selected="顔の細部" name="Face Detail"/>
-			<button label="ﾒｲｸｱｯﾌﾟ" label_selected="ﾒｲｸｱｯﾌﾟ" name="Makeup"/>
+			<button label="メイク" label_selected="メイク" name="Makeup"/>
 			<button label="身体細部" label_selected="身体細部" name="Body Detail"/>
 			<text name="title">
 				[DESC]
@@ -186,10 +186,10 @@
 				シャツ：
 			</text>
 		</panel>
-		<panel label="ズボン" name="Pants">
+		<panel label="パンツ" name="Pants">
 			<texture_picker label="生地" name="Fabric" tool_tip="写真をクリックして選択"/>
 			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-			<button label="新しいズボンを作成" label_selected="新しいズボンを作成" name="Create New"/>
+			<button label="新しいパンツを作成" label_selected="新しいパンツを作成" name="Create New"/>
 			<button label="取り外す" label_selected="取り外す" name="Take Off"/>
 			<button label="保存" label_selected="保存" name="Save"/>
 			<button label="別名で保存..." label_selected="別名で保存..." name="Save As"/>
@@ -216,7 +216,7 @@
 				あなたはこの服の修正を許されていません。
 			</text>
 			<text name="Item Action Label">
-				ズボン：
+				パンツ：
 			</text>
 		</panel>
 		<panel label="靴" name="Shoes">
diff --git a/indra/newview/skins/default/xui/ja/floater_image_preview.xml b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
index 57ed139e54..2e57acf0d2 100644
--- a/indra/newview/skins/default/xui/ja/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
@@ -7,7 +7,7 @@
 		説明：
 	</text>
 	<text name="preview_label">
-		ｲﾒｰｼﾞのﾌﾟﾚﾋﾞｭｰ：
+		プレビュー：
 	</text>
 	<combo_box label="服の種類" name="clothing_type_combo">
 		<combo_box.item label="画像" name="Image"/>
@@ -26,7 +26,7 @@
 
 24bitTarga(.tga)でイメージを保存してください。
 	</text>
-	<check_box label="ロスのない圧縮を使用" name="lossless_check"/>
+	<check_box label="可逆圧縮" name="lossless_check"/>
 	<button label="取り消し" name="cancel_btn"/>
-	<button label="ｱｯﾌﾟﾛｰﾄﾞL$[AMOUNT]" name="ok_btn"/>
+	<button label="アップロードﾞL$[AMOUNT]" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml
index 63a8fb978b..b3825c0b7f 100644
--- a/indra/newview/skins/default/xui/ja/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml
@@ -3,12 +3,12 @@
 	<floater.string name="timeStamp">
 		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</floater.string>
-	<scroll_list name="object_list" tool_tip="このリストからオブジェクトを選択し、この世界で強調表示します。">
-		<scroll_list.columns label="ｵﾌﾞｼﾞｪｸﾄ名" name="object_name"/>
+	<scroll_list name="object_list" tool_tip="リストからオブジェクトを選択し、インワールドで強調表示します。">
+		<scroll_list.columns label="名前" name="object_name"/>
 		<scroll_list.columns label="所有者名" name="owner_name"/>
 		<scroll_list.columns label="制作者名" name="creator_name"/>
 		<scroll_list.columns label="作成日" name="creation_date"/>
 	</scroll_list>
-	<button label="所有者のプロフィールを表示..." name="button owner" tool_tip="選択されたオブジェクトの所有者のプロフィールを見る" width="180"/>
-	<button label="制作者のプロフィールを表示..." name="button creator" tool_tip="選択されたオブジェクトの制作者のプロフィールを見る" width="180"/>
+	<button label="所有者のプロフィールを表示..." name="button owner" tool_tip="選択したオブジェクトの所有者のプロフィールを表示します" width="180"/>
+	<button label="制作者のプロフィールを表示..." name="button creator" tool_tip="選択したオブジェクトの制作者のプロフィールを表示します" width="180"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory.xml b/indra/newview/skins/default/xui/ja/floater_inventory.xml
index 7cf16b8ff2..b113fde94a 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory" title="持ち物">
 	<floater.string name="Title">
-		インベントリ
+		持ち物
 	</floater.string>
 	<floater.string name="TitleFetching">
 		持ち物 （ [ITEM_COUNT]  アイテムを取得中...） [FILTER]
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
index 86bb5dcf62..47a63e5e20 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
@@ -9,7 +9,7 @@
 	<check_box label="オブジェクト" name="check_object"/>
 	<check_box label="スクリプト" name="check_script"/>
 	<check_box label="サウンド" name="check_sound"/>
-	<check_box label="テクスチャー" name="check_texture"/>
+	<check_box label="テクスチャ" name="check_texture"/>
 	<check_box label="スナップショット" name="check_snapshot"/>
 	<button label="すべて" label_selected="すべて" name="All"/>
 	<button label="なし" label_selected="なし" name="None"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
index 474bd32cb0..aca916f22f 100644
--- a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
@@ -7,17 +7,17 @@
 		<column label="面積" name="area"/>
 		<column label="" name="hidden"/>
 	</scroll_list>
-	<button label="テレポート" label_selected="テレポート" name="Teleport" tool_tip="この土地の中心にテレポート"/>
+	<button label="テレポート" label_selected="テレポート" name="Teleport" tool_tip="この土地の中心にテレポートします"/>
 	<button label="地図" label_selected="地図" name="Show on Map" tool_tip="この土地を世界地図に表示します"/>
 	<text name="contrib_label">
-		あなたのグループへの貢献：
+		所属グループへの貢献：
 	</text>
 	<scroll_list name="grant list">
 		<column label="グループ名" name="group"/>
 		<column label="面積" name="area"/>
 	</scroll_list>
 	<text name="allowed_label">
-		現在の支払いプランでの許可された保有地：
+		現在の支払いプランで許可された保有地：
 	</text>
 	<text name="allowed_text">
 		[AREA] 平方メートル
@@ -29,7 +29,7 @@
 		[AREA] 平方メートル
 	</text>
 	<text name="available_label">
-		土地購入可：
+		購入可能な土地：
 	</text>
 	<text name="available_text">
 		[AREA] 平方メートル
diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml
index f3cba7e674..78af3cec07 100644
--- a/indra/newview/skins/default/xui/ja/floater_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_map.xml
@@ -25,7 +25,7 @@
 		北西
 	</floater.string>
 	<floater.string name="ToolTipMsg">
-		[AGENT][REGION] （ダブルクリックで地図を開く）
+		[AGENT][REGION] （ダブルクリックで地図を開きます）
 	</floater.string>
 	<text label="北" name="floater_map_north" text="北">
 		北
diff --git a/indra/newview/skins/default/xui/ja/floater_media_browser.xml b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
index 4f67523eec..c4731b73a3 100644
--- a/indra/newview/skins/default/xui/ja/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
@@ -22,8 +22,8 @@
 			<button label="現在のページを区画に送る" name="assign"/>
 		</layout_panel>
 		<layout_panel name="external_controls">
-			<button label="外部ウェブ・ブラウザで開く" name="open_browser"/>
-			<check_box label="常に外部のウェブ・ブラウザで開く" name="open_always"/>
+			<button label="外部Webブラウザで開く" name="open_browser"/>
+			<check_box label="常に外部のWebブラウザで開く" name="open_always"/>
 			<button label="閉じる" name="close"/>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
index 6167b6db91..f48bb94e32 100644
--- a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="MemLeak" title="メモリリークのシミュレート">
-	<spinner label="リークスピード(1フレームごとのバイト数)：" label_width="244" name="leak_speed"/>
-	<spinner label="リークした最大メモリ数(MB)：" label_width="244" name="max_leak"/>
+	<spinner label="リーク速度(1フレームごとのバイト数)：" label_width="244" name="leak_speed"/>
+	<spinner label="最大メモリリーク(MB)：" label_width="244" name="max_leak"/>
 	<text name="total_leaked_label">
-		現在のリークメモリサイズ： [SIZE] KB
+		現在のメモリリーク： [SIZE] KB
 	</text>
 	<text name="note_label_1">
 		[NOTE1]
diff --git a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
index adbb8596d3..98cda25a81 100644
--- a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
@@ -5,11 +5,11 @@
 		<check_box label="グループで共同管理" name="share_with_group"/>
 		<check_box label="誰に対してもコピーを許可" name="everyone_copy"/>
 		<text name="NextOwnerLabel">
-			次のオーナーができる操作：
+			次の所有者ができる操作：
 		</text>
 		<check_box label="修正" name="next_owner_modify"/>
 		<check_box label="コピー" name="next_owner_copy"/>
-		<check_box label="再販/プレゼント" name="next_owner_transfer"/>
+		<check_box label="再販・プレゼント" name="next_owner_transfer"/>
 	</panel>
 	<button label="OK" label_selected="OK" name="ok"/>
 	<button label="取り消し" label_selected="取り消し" name="cancel"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_postcard.xml b/indra/newview/skins/default/xui/ja/floater_postcard.xml
index b2ca059ccd..5a2b047fe0 100644
--- a/indra/newview/skins/default/xui/ja/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/ja/floater_postcard.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Postcard" title="スナップショットをメール">
 	<text name="to_label">
-		住人のEメール：
+		住人のメール：
 	</text>
 	<line_editor left="145" name="to_form" width="125"/>
 	<text name="from_label">
-		あなたのEメール：
+		あなたのメール：
 	</text>
 	<line_editor left="145" name="from_form" width="125"/>
 	<text name="name_label">
@@ -15,14 +15,14 @@
 	<text name="subject_label">
 		件名：
 	</text>
-	<line_editor label="件名をここに入力" left="145" name="subject_form" width="125"/>
+	<line_editor label="件名を入力してください" left="145" name="subject_form" width="125"/>
 	<text name="msg_label">
 		メッセージ：
 	</text>
 	<text_editor bottom_delta="-120" height="110" name="msg_form">
 		メッセージをここに入力してください。
 	</text_editor>
-	<check_box label="ウェブ上で公開" name="allow_publish_check" tool_tip="このポストカードをウェブ上で公開します。"/>
+	<check_box label="Web上で公開" name="allow_publish_check" tool_tip="このポストカードをWeb上で公開します。"/>
 	<check_box label="成人向けコンテンツ" name="mature_check" tool_tip="このポストカードには成人向け内容が含まれます。"/>
 	<button label="?" left="300" name="publish_help_btn"/>
 	<text name="fine_print">
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml
index 1493219b83..e2893d5eab 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences.xml
@@ -8,7 +8,7 @@
 		<panel label="プライバシー" name="im"/>
 		<panel label="サウンド" name="audio"/>
 		<panel label="チャット" name="chat"/>
-		<panel label="通知" name="msgs"/>
+		<panel label="メッセージ" name="msgs"/>
 		<panel label="セットアップ" name="input"/>
 		<panel label="詳細" name="advanced1"/>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
index fb2f2c7433..2c0d6a0097 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
@@ -6,6 +6,6 @@
 	<text name="desc txt">
 		説明：
 	</text>
-	<button label="世界で再生" label_selected="停止" name="Anim play btn" tool_tip="他人に見えるように再生"/>
-	<button label="ローカルに再生" label_selected="停止" name="Anim audition btn" tool_tip="自分だけが見えるように再生"/>
+	<button label="ワールド再生" label_selected="停止" name="Anim play btn" tool_tip="他人にも見えるように再生します"/>
+	<button label="ローカル再生" label_selected="停止" name="Anim audition btn" tool_tip="自分だけが見えるように再生します"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
index a378700d15..8a0aea717c 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
@@ -38,7 +38,7 @@
 	</text>
 	<line_editor name="replace_editor" tool_tip="トリガー・ワードをこれらの単語に置き換えます。 たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。"/>
 	<text name="key_label">
-		ショートカット・キー：
+		ショートカット：
 	</text>
 	<combo_box label="なし" left="160" name="modifier_combo"/>
 	<combo_box label="なし" name="key_combo"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
index d3c06cbef4..dc334dfc1f 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
@@ -6,6 +6,6 @@
 	<text name="desc txt">
 		説明：
 	</text>
-	<button label="世界で再生" label_selected="世界で再生" name="Sound play btn" tool_tip="他人が聞こえるように再生"/>
-	<button label="ローカルに再生" label_selected="ローカルに再生" name="Sound audition btn" tool_tip="自分だけが聞こえるように再生"/>
+	<button label="ワールド再生" label_selected="ワールド再生" name="Sound play btn" tool_tip="他人にも聞こえるように再生します"/>
+	<button label="ローカル再生" label_selected="ローカル再生" name="Sound audition btn" tool_tip="自分だけが聞こえるように再生します"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index 964a99c3a4..c66f307f23 100644
--- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
@@ -25,7 +25,7 @@
 	<text name="select_object_label">
 		ボタンをクリックしてから、悪意のあるオブジェクトをクリック：
 	</text>
-	<button label="" label_selected="" name="pick_btn" tool_tip="オブジェクト・ピッカー - この報告の主題となるオブジェクトを特定"/>
+	<button label="" label_selected="" name="pick_btn" tool_tip="オブジェクトピッカー - 報告対象のオブジェクトを選択してください"/>
 	<text name="object_name_label">
 		オブジェクト：
 	</text>
@@ -33,13 +33,13 @@
 		Consetetur Sadipscing
 	</text>
 	<text name="owner_name_label">
-		ｵｰﾅｰ：
+		所有者：
 	</text>
 	<text name="owner_name">
 		Hendrerit Vulputate Kamawashi Longname
 	</text>
-	<combo_box name="category_combo" tool_tip="カテゴリー -- この報告に最も適したカテゴリーを選択してください">
-		<combo_box.item label="カテゴリーを選択" name="Select_category"/>
+	<combo_box name="category_combo" tool_tip="カテゴリ -- この報告に最も適したカテゴリを選択してください">
+		<combo_box.item label="カテゴリを選択してください" name="Select_category"/>
 		<combo_box.item label="年齢＞年齢偽証" name="Age__Age_play"/>
 		<combo_box.item label="年齢 &gt; 成人の住人が Teen Second Life にいる" name="Age__Adult_resident_on_Teen_Second_Life"/>
 		<combo_box.item label="年齢 &gt; 未成年の住人がTeen Second Life の外にいる" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
index b06b16bbb3..1e884af5f2 100644
--- a/indra/newview/skins/default/xui/ja/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
@@ -36,7 +36,7 @@
 				2. 特定の人に販売：
 			</text>
 			<text name="sell_to_text" right="-6">
-				販売先の指定なしか、特定の人に販売するか選択してください。
+				販売先の指定なしか、特定の人に販売するかを選択してください。
 			</text>
 			<combo_box name="sell_to">
 				<combo_box.item label="- 1つ選択 -" name="--selectone--"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index 6c84de9b19..4ad54ec7ab 100644
--- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
@@ -28,21 +28,21 @@
 		形式
 	</text>
 	<combo_box label="解像度" name="postcard_size_combo">
-		<combo_box.item label="現在のｳｨﾝﾄﾞｳ" name="CurrentWindow"/>
+		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
 		<combo_box.item label="640x480" name="640x480"/>
 		<combo_box.item label="800x600" name="800x600"/>
 		<combo_box.item label="1024x768" name="1024x768"/>
 		<combo_box.item label="カスタム" name="Custom"/>
 	</combo_box>
 	<combo_box label="解像度" name="texture_size_combo">
-		<combo_box.item label="現在のｳｨﾝﾄﾞｳ" name="CurrentWindow"/>
+		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
 		<combo_box.item label="小（128x128）" name="Small(128x128)"/>
 		<combo_box.item label="中（256x256）" name="Medium(256x256)"/>
 		<combo_box.item label="大（512x512）" name="Large(512x512)"/>
 		<combo_box.item label="カスタム" name="Custom"/>
 	</combo_box>
 	<combo_box label="解像度" name="local_size_combo">
-		<combo_box.item label="現在のｳｨﾝﾄﾞｳ" name="CurrentWindow"/>
+		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
 		<combo_box.item label="320x240" name="320x240"/>
 		<combo_box.item label="640x480" name="640x480"/>
 		<combo_box.item label="800x600" name="800x600"/>
@@ -61,7 +61,7 @@
 	<check_box label="縦横比の固定" name="keep_aspect_check"/>
 	<slider label="画質" name="image_quality_slider"/>
 	<text name="layer_type_label">
-		ｷｬﾌﾟﾁｬ：
+		キャプチャ：
 	</text>
 	<combo_box label="画像レイヤー" name="layer_types">
 		<combo_box.item label="色" name="Colors"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
index a24ba6e075..7d83309c46 100644
--- a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
@@ -9,7 +9,7 @@
 	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
 	<button label="アップロード　（L$[AMOUNT]）" label_selected="アップロード　（L$[AMOUNT]）" name="ok_btn"/>
 	<text name="text">
-		ﾋﾞｯﾄﾚｰﾄ(kbps)：
+		ビットレート(kbps)：
 	</text>
 	<radio_group name="bitrate">
 		<radio_item label="32" name="32"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_telehub.xml b/indra/newview/skins/default/xui/ja/floater_telehub.xml
index 79af7a7809..7318083771 100644
--- a/indra/newview/skins/default/xui/ja/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/ja/floater_telehub.xml
@@ -10,7 +10,7 @@
 		「切断」をクリックして削除します。
 	</text>
 	<text name="help_text_not_connected">
-		物体を選択し「テレハブの接続」をクリックする
+		物体を選択して「テレハブの接続」をクリックしてください。
 	</text>
 	<button label="テレハブの接続" name="connect_btn"/>
 	<button label="切断" name="disconnect_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
index 1500808e60..399cffcce5 100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="texture picker" title="選択： テクスチャ">
+<floater name="texture picker" title="テクスチャの選択">
 	<string name="choose_picture">
 		クリックして写真を選択
 	</string>
@@ -9,12 +9,12 @@
 	<text name="unknown">
 		サイズ： [DIMENSIONS]
 	</text>
-	<button label="ﾃﾞﾌｫﾙﾄ" label_selected="ﾃﾞﾌｫﾙﾄ" name="Default"/>
+	<button label="デフォルト" label_selected="デフォルト" name="Default"/>
 	<button label="なし" label_selected="なし" name="None"/>
 	<button label="ブランク" label_selected="ブランク" name="Blank"/>
 	<check_box label="フォルダを表示" name="show_folders_check"/>
 	<search_editor label="テクスチャをフィルター" name="inventory search editor"/>
-	<check_box label="今すぐ適用" name="apply_immediate_check"/>
+	<check_box label="すぐ適用" name="apply_immediate_check"/>
 	<button label="" label_selected="" name="Pipette"/>
 	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
 	<button label="OK" label_selected="OK" name="Select"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 52d3537d9a..456e30c2b4 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -171,7 +171,7 @@
 				Esbee Linden
 			</text>
 			<text name="Owner:">
-				オーナー：
+				所有者：
 			</text>
 			<text name="Owner Name">
 				Erica Linden
@@ -197,7 +197,7 @@
 			<check_box label="販売対象：" name="checkbox for sale"/>
 			<combo_box name="sale type">
 				<combo_box.item label="コピー" name="Copy"/>
-				<combo_box.item label="コンテンツ" name="Contents"/>
+				<combo_box.item label="中身" name="Contents"/>
 				<combo_box.item label="オリジナル" name="Original"/>
 			</combo_box>
 			<spinner label="価格： L$" name="Edit Cost"/>
@@ -239,9 +239,9 @@
 		</panel>
 		<panel label="形状" name="Object">
 			<check_box label="ロック済み" name="checkbox locked" tool_tip="オブジェクトの移動と削除を禁止します。 この機能を使うと、構築中に意図しない編集を防ぐことができます。"/>
-			<check_box label="物理" name="Physical Checkbox Ctrl" tool_tip="オブジェクトに対する重力の作用と影響を有効にする"/>
+			<check_box label="物理" name="Physical Checkbox Ctrl" tool_tip="オブジェクトに対する重力の作用と影響を有効にします"/>
 			<check_box label="臨時" name="Temporary Checkbox Ctrl" tool_tip="制作後 1 分でオブジェクトは削除されます"/>
-			<check_box label="ファントム" name="Phantom Checkbox Ctrl" tool_tip="オブジェクト同士の衝突またはオブジェクトとアバターの衝突を回避"/>
+			<check_box label="ファントム" name="Phantom Checkbox Ctrl" tool_tip="オブジェクト同士の衝突またはオブジェクトとアバターの衝突を回避します"/>
 			<text name="label position">
 				位置（メートル）
 			</text>
@@ -280,7 +280,7 @@
 				<combo_box.item label="ゴム" name="Rubber"/>
 			</combo_box>
 			<text name="text cut">
-				パスカット (始点/終点)
+				パスカット (始点・終点)
 			</text>
 			<spinner label="B" name="cut begin"/>
 			<spinner label="E" name="cut end"/>
@@ -300,7 +300,7 @@
 				<combo_box.item label="三角形" name="Triangle"/>
 			</combo_box>
 			<text name="text twist">
-				ひねり (始点/終点)
+				ひねり (始点・終点)
 			</text>
 			<spinner label="B" name="Twist Begin"/>
 			<spinner label="E" name="Twist End"/>
@@ -318,13 +318,13 @@
 			<spinner label="X" name="Shear X"/>
 			<spinner label="Y" name="Shear Y"/>
 			<text name="advanced_cut">
-				プロフィールカット (始点/終点)
+				プロフィールカット (始点・終点)
 			</text>
 			<text name="advanced_dimple">
-				くぼみ (始点/終点)
+				くぼみ (始点・終点)
 			</text>
 			<text name="advanced_slice">
-				切り取り (始点/終点)
+				切り取り (始点・終点)
 			</text>
 			<spinner label="B" name="Path Limit Begin"/>
 			<spinner label="E" name="Path Limit End"/>
@@ -340,8 +340,8 @@
 				回転体
 			</text>
 			<texture_picker label="スカルプトテクスチャー" name="sculpt texture control" tool_tip="クリックして写真を選択してください。"/>
-			<check_box label="ミラー" name="sculpt mirror control" tool_tip="スカルプトプリムを X 軸上で反転させる"/>
-			<check_box label="裏返し" name="sculpt invert control" tool_tip="スカルプトプリムを反転させて裏返す"/>
+			<check_box label="ミラー" name="sculpt mirror control" tool_tip="スカルプトプリムを X 軸上で反転させます"/>
+			<check_box label="裏返し" name="sculpt invert control" tool_tip="スカルプトプリムを反転させて裏返します"/>
 			<text name="label sculpt type">
 				縫い目のタイプ
 			</text>
@@ -360,7 +360,7 @@
 			<text name="edit_object">
 				オブジェクトの特徴を編集：
 			</text>
-			<check_box label="フレキシブル・パス" name="Flexible1D Checkbox Ctrl" tool_tip="Z 軸を中心にオブジェクトの屈曲を有効にする（クライアント側のみ）"/>
+			<check_box label="フレキシブル・パス" name="Flexible1D Checkbox Ctrl" tool_tip="Z 軸を中心にオブジェクトの屈曲を有効にします（クライアント側のみ）"/>
 			<spinner label="柔軟性" label_width="72" name="FlexNumSections" width="135"/>
 			<spinner label="重力" label_width="72" name="FlexGravity" width="135"/>
 			<spinner label="ドラッグ" label_width="72" name="FlexFriction" width="135"/>
@@ -369,9 +369,9 @@
 			<spinner label="X軸方向の力" label_width="72" name="FlexForceX" width="135"/>
 			<spinner label="Y軸方向の力" label_width="72" name="FlexForceY" width="135"/>
 			<spinner label="Z軸方向の力" label_width="72" name="FlexForceZ" width="135"/>
-			<check_box label="光" name="Light Checkbox Ctrl" tool_tip="オブジェクトが発光"/>
+			<check_box label="光" name="Light Checkbox Ctrl" tool_tip="オブジェクトが発光します"/>
 			<color_swatch label="" left_delta="74" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
-			<texture_picker label="" name="light texture control" tool_tip="クリックで投影画を選択（遅延レンダリング有効時のみ）"/>
+			<texture_picker label="" name="light texture control" tool_tip="クリックで投影画を選択します（遅延レンダリング有効時のみ）"/>
 			<spinner label="輝度" label_width="72" name="Light Intensity" width="135"/>
 			<spinner label="FOV" name="Light FOV"/>
 			<spinner label="半径" label_width="72" name="Light Radius" width="135"/>
@@ -381,7 +381,7 @@
 		</panel>
 		<panel label="材質" name="Texture">
 			<panel.string name="string repeats per meter">
-				ﾒｰﾄﾙごとに繰返す
+				メートルごとに繰り返す
 			</panel.string>
 			<panel.string name="string repeats per face">
 				面ごとに繰り返す
@@ -453,10 +453,10 @@
 				<text name="media_tex">
 					メディア
 				</text>
-				<button name="add_media" tool_tip="メディアを追加"/>
-				<button name="delete_media" tool_tip="このメディアテクスチャを削除"/>
-				<button name="edit_media" tool_tip="このメディアを編集"/>
-				<button label="揃える" label_selected="メディアを一列に揃える" name="button align" tool_tip="メディアテクスチャを一列に揃える（最初に読み込む必要があります）"/>
+				<button name="add_media" tool_tip="メディアを追加します"/>
+				<button name="delete_media" tool_tip="このメディアテクスチャを削除します"/>
+				<button name="edit_media" tool_tip="このメディアを編集します"/>
+				<button label="揃える" label_selected="メディアを一列に揃える" name="button align" tool_tip="メディアテクスチャを一列に揃えます（最初に読み込む必要があります）"/>
 			</panel>
 		</panel>
 		<panel label="中身" name="Contents">
@@ -475,7 +475,7 @@
 			面積： [AREA] 平方メートル
 		</text>
 		<button label="土地情報" label_selected="土地情報" name="button about land"/>
-		<check_box label="オーナーを表示" name="checkbox show owners" tool_tip="所有者の種類別に区画を色づけ：   緑 = あなたの土地  アクア = あなたのグループ所有地  赤 = 他人が所有する土地  黄色 = 売り出し中  紫 = オークション  グレー = パブリック"/>
+		<check_box label="所有者を表示" name="checkbox show owners" tool_tip="所有者の種類別に区画を色づけます：   緑 = あなたの土地  アクア = あなたのグループ所有地  赤 = 他人が所有する土地  黄色 = 売り出し中  紫 = オークション  グレー = パブリック"/>
 		<text name="label_parcel_modify">
 			区画の編集
 		</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_window_size.xml b/indra/newview/skins/default/xui/ja/floater_window_size.xml
index a31336c0f8..152a5f4806 100644
--- a/indra/newview/skins/default/xui/ja/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/ja/floater_window_size.xml
@@ -4,7 +4,7 @@
 		[RES_X] x [RES_Y]
 	</string>
 	<text name="windowsize_text">
-		ウィンドウのサイズの設定：
+		ウィンドウのサイズを設定：
 	</text>
 	<combo_box name="window_size_combo" tool_tip="横幅 x 高さ">
 		<combo_box.item label="1000 x 700 （標準）" name="item0"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml
index a0f2d98adf..af9c05de91 100644
--- a/indra/newview/skins/default/xui/ja/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml
@@ -2,13 +2,13 @@
 <floater name="worldmap" title="世界地図">
 	<panel name="layout_panel_1">
 		<text name="events_label">
-			レジェンド
+			表記・記号
 		</text>
 	</panel>
 	<panel>
-		<button label="現在地を表示" label_selected="現在地を表示" name="Show My Location" tool_tip="マップを中央に表示する"/>
+		<button label="現在地を表示" label_selected="現在地を表示" name="Show My Location" tool_tip="アバターの位置を地図の中心に表示します"/>
 		<text name="me_label">
-			ミー
+			自分
 		</text>
 		<check_box label="住人" name="people_chk"/>
 		<text name="person_label">
@@ -23,12 +23,12 @@
 			土地販売
 		</text>
 		<text name="by_owner_label">
-			by owner
+			所有者の販売
 		</text>
 		<text name="auction_label">
 			土地オークション
 		</text>
-		<button label="ホームへ" label_selected="ホームへ" name="Go Home" tool_tip="「ホーム」にテレポート"/>
+		<button label="ホームへ" label_selected="ホームへ" name="Go Home" tool_tip="「ホーム」にテレポートします"/>
 		<text name="Home_label">
 			ホーム
 		</text>
@@ -50,14 +50,14 @@
 	</panel>
 	<panel>
 		<text name="find_on_map_label">
-			地図で探す
+			地図上で探す
 		</text>
 	</panel>
 	<panel>
-		<combo_box label="オンラインのフレンド" name="friend combo" tool_tip="フレンドを地図に表示">
+		<combo_box label="オンラインのフレンド" name="friend combo" tool_tip="フレンドを地図上に表示します">
 			<combo_box.item label="オンラインのフレンド" name="item1"/>
 		</combo_box>
-		<combo_box label="マイ ランドマーク" name="landmark combo" tool_tip="地図に表示するランドマーク">
+		<combo_box label="マイ ランドマーク" name="landmark combo" tool_tip="地図上に表示するランドマーク">
 			<combo_box.item label="マイ ランドマーク" name="item1"/>
 		</combo_box>
 		<search_editor label="リージョン名" name="location" tool_tip="地域名を入力してください。"/>
@@ -66,9 +66,9 @@
 			<scroll_list.columns label="" name="icon"/>
 			<scroll_list.columns label="" name="sim_name"/>
 		</scroll_list>
-		<button label="テレポート" label_selected="テレポート" name="Teleport" tool_tip="選択されたロケーションにテレポート"/>
-		<button label="SLurl をコピー" name="copy_slurl" tool_tip="現在地を SLurl としてコピーして、Webで使用します。"/>
-		<button label="選択したリージョンを表示する" label_selected="目的地を表示" name="Show Destination" tool_tip="選択したロケーションを地図の中心にする"/>
+		<button label="テレポート" label_selected="テレポート" name="Teleport" tool_tip="選択した場所にレポートします"/>
+		<button label="SLurl をコピー" name="copy_slurl" tool_tip="現在地を SLurl でコピーして、Webで使用します。"/>
+		<button label="選択したリージョンを表示する" label_selected="目的地を表示" name="Show Destination" tool_tip="選択した場所を地図の中心に表示します"/>
 	</panel>
 	<panel>
 		<text name="zoom_label">
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
index 1bfadf8d45..9d5ce3dada 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
@@ -23,5 +23,5 @@
 	<menu_item_call label="容姿" name="Appearance..."/>
 	<menu_item_call label="フレンド" name="Friends..."/>
 	<menu_item_call label="グループ" name="Groups..."/>
-	<menu_item_call label="マイ プロフィール" name="Profile..."/>
+	<menu_item_call label="プロフィール" name="Profile..."/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
index 76c01d6109..d02701b400 100644
--- a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu name="Gear Menu">
 	<menu_item_call label="立ち上がる" name="stand_up"/>
-	<menu_item_call label="マイ 容姿" name="my_appearance"/>
+	<menu_item_call label="容姿" name="my_appearance"/>
 	<menu_item_call label="プロフィール" name="my_profile"/>
 	<menu_item_call label="フレンド" name="my_friends"/>
 	<menu_item_call label="グループ" name="my_groups"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
index 78c0dd0a78..3d661f96e0 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml
@@ -62,13 +62,13 @@
 	<menu_item_call label="リンクを外す" name="Remove Link"/>
 	<menu_item_call label="削除" name="Delete"/>
 	<menu_item_call label="システムフォルダを削除する" name="Delete System Folder"/>
-	<menu_item_call label="会議チャット開始" name="Conference Chat Folder"/>
+	<menu_item_call label="コンファレンスチャットを開始" name="Conference Chat Folder"/>
 	<menu_item_call label="再生" name="Sound Play"/>
 	<menu_item_call label="ランドマークの情報" name="About Landmark"/>
-	<menu_item_call label="世界で再生" name="Animation Play"/>
-	<menu_item_call label="ローカルに再生" name="Animation Audition"/>
-	<menu_item_call label="インスタント・メッセージを送信" name="Send Instant Message"/>
-	<menu_item_call label="テレポートを贈る..." name="Offer Teleport..."/>
+	<menu_item_call label="ワールド再生" name="Animation Play"/>
+	<menu_item_call label="ローカル再生" name="Animation Audition"/>
+	<menu_item_call label="インスタントメッセージを送信" name="Send Instant Message"/>
+	<menu_item_call label="テレポートを送る..." name="Offer Teleport..."/>
 	<menu_item_call label="会議チャット開始" name="Conference Chat"/>
 	<menu_item_call label="アクティブ" name="Activate"/>
 	<menu_item_call label="非アクティブ" name="Deactivate"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
index 42a95ac3d3..d6f13f0e59 100644
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -24,7 +24,7 @@
 		<menu_item_call label="UI/色の設定" name="UI/Color Settings"/>
 		<menu_item_call label="XUI プレビューツール" name="UI Preview Tool"/>
 		<menu label="UI テスト" name="UI Tests"/>
-		<menu_item_call label="ウィンドウのサイズの設定..." name="Set Window Size..."/>
+		<menu_item_call label="ウィンドウのサイズを設定..." name="Set Window Size..."/>
 		<menu_item_call label="利用規約を表示" name="TOS"/>
 		<menu_item_call label="クリティカルメッセージを表示" name="Critical"/>
 		<menu_item_call label="Web ブラウザのテスト" name="Web Browser Test"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
index a161c01514..d218b48c98 100644
--- a/indra/newview/skins/default/xui/ja/menu_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object.xml
@@ -9,8 +9,8 @@
 	<menu_item_call label="ズームイン" name="Zoom In"/>
 	<context_menu label="装着 &gt;" name="Put On">
 		<menu_item_call label="装着" name="Wear"/>
-		<context_menu label="取り付け &gt;" name="Object Attach"/>
-		<context_menu label="HUD を取り付け &gt;" name="Object Attach HUD"/>
+		<context_menu label="取り付ける &gt;" name="Object Attach"/>
+		<context_menu label="HUD を取り付ける &gt;" name="Object Attach HUD"/>
 	</context_menu>
 	<context_menu label="削除 &gt;" name="Remove">
 		<menu_item_call label="取る" name="Pie Object Take"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
index 4e5dc60a3d..842d79dc4b 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
@@ -3,6 +3,6 @@
 	<menu_item_call label="情報を表示" name="View Info"/>
 	<menu_item_call label="チャット" name="Chat"/>
 	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="有効化" name="Activate"/>
+	<menu_item_call label="アクティブ" name="Activate"/>
 	<menu_item_call label="脱退" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_slurl.xml b/indra/newview/skins/default/xui/ja/menu_slurl.xml
index 2e06c53494..eb24cee7e0 100644
--- a/indra/newview/skins/default/xui/ja/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_slurl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
 	<menu_item_call label="URLについて" name="about_url"/>
-	<menu_item_call label="URLへテレポートする" name="teleport_to_url"/>
+	<menu_item_call label="URLにテレポートする" name="teleport_to_url"/>
 	<menu_item_call label="地図" name="show_on_map"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index db8583ca15..c5d5914f3f 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -49,12 +49,12 @@
 			<menu_item_call label="日没" name="Sunset"/>
 			<menu_item_call label="深夜" name="Midnight"/>
 			<menu_item_call label="エステートタイム" name="Revert to Region Default"/>
-			<menu_item_call label="環境編集" name="Environment Editor"/>
+			<menu_item_call label="自然環境エディター" name="Environment Editor"/>
 		</menu>
 	</menu>
 	<menu label="制作" name="BuildTools">
 		<menu_item_check label="制作" name="Show Build Tools"/>
-		<menu label="制作ツールを選択" name="Select Tool">
+		<menu label="制作ツールを選択する" name="Select Tool">
 			<menu_item_call label="フォーカスツール" name="Focus"/>
 			<menu_item_call label="移動ツール" name="Move"/>
 			<menu_item_call label="編集ツール" name="Edit"/>
@@ -77,9 +77,9 @@
 		<menu_item_call label="選択したものに焦点を合わせる" name="Focus on Selection"/>
 		<menu_item_call label="選択したものをズームする" name="Zoom to Selection"/>
 		<menu label="オブジェクト" name="Object">
-			<menu_item_call label="買う" name="Menu Object Take"/>
+			<menu_item_call label="取る" name="Menu Object Take"/>
 			<menu_item_call label="コピーを取る" name="Take Copy"/>
-			<menu_item_call label="「マイ 持ち物」に保存" name="Save Object Back to My Inventory"/>
+			<menu_item_call label="「持ち物」に保存" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents"/>
 		</menu>
 		<menu label="スクリプト" name="Scripts">
@@ -119,8 +119,8 @@
 	</menu>
 	<menu label="ヘルプ" name="Help">
 		<menu_item_call label="[SECOND_LIFE] ヘルプ" name="Second Life Help"/>
-		<menu_item_call label="嫌がらせを報告" name="Report Abuse"/>
-		<menu_item_call label="バグ報告" name="Report Bug"/>
+		<menu_item_call label="嫌がらせを報告する" name="Report Abuse"/>
+		<menu_item_call label="バグを報告する" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
 	</menu>
 	<menu label="アドバンス" name="Advanced">
diff --git a/indra/newview/skins/default/xui/ja/mime_types.xml b/indra/newview/skins/default/xui/ja/mime_types.xml
index 2f945b2010..54663a0367 100644
--- a/indra/newview/skins/default/xui/ja/mime_types.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types.xml
@@ -2,13 +2,13 @@
 <mimetypes name="default">
 	<widgetset name="web">
 		<label name="web_label">
-			ウェブ・コンテンツ
+			Webコンテンツ
 		</label>
 		<tooltip name="web_tooltip">
-			ここにウェブ・コンテンツがあります。
+			ここにWebコンテンツがあります。
 		</tooltip>
 		<playtip name="web_playtip">
-			ウェブ・コンテンツを表示
+			Webコンテンツを表示
 		</playtip>
 	</widgetset>
 	<widgetset name="movie">
@@ -119,7 +119,7 @@
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">
-			ウェブ・ページ (XHTML)
+			Webページ (XHTML)
 		</label>
 	</mimetype>
 	<mimetype name="application/x-director">
@@ -184,7 +184,7 @@
 	</mimetype>
 	<mimetype menu="1" name="text/html">
 		<label name="text/html_label">
-			ウェブ・ページ
+			Webページ
 		</label>
 	</mimetype>
 	<mimetype menu="1" name="text/plain">
diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray.xml
index 414413a980..81a852522b 100644
--- a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_bottomtray.xml
@@ -17,11 +17,11 @@
 			<button label="視界" name="camera_btn" tool_tip="カメラコントロールの表示・非表示"/>
 		</layout_panel>
 		<layout_panel name="snapshot_panel">
-			<button label="" name="snapshots" tool_tip="スナップショットを撮る"/>
+			<button label="" name="snapshots" tool_tip="スナップショットを撮ります"/>
 		</layout_panel>
 		<layout_panel name="im_well_panel">
 			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Conversations"/>
+				<button name="Unread IM messages" tool_tip="会話"/>
 			</chiclet_im_well>
 		</layout_panel>
 		<layout_panel name="notification_well_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_friends.xml b/indra/newview/skins/default/xui/ja/panel_friends.xml
index 80a68f8258..97e58ceaed 100644
--- a/indra/newview/skins/default/xui/ja/panel_friends.xml
+++ b/indra/newview/skins/default/xui/ja/panel_friends.xml
@@ -4,7 +4,7 @@
 		複数のフレンド
 	</string>
 	<scroll_list name="friend_list" tool_tip="複数のフレンドを選択するには、ShiftキーまたはCtrlキーを押しながら名前をクリックします。">
-		<column name="icon_online_status" tool_tip="オンライン・ステータス"/>
+		<column name="icon_online_status" tool_tip="オンライン状況"/>
 		<column label="名前" name="friend_name" tool_tip="名前"/>
 		<column name="icon_visible_online" tool_tip="フレンドは、あなたがオンラインかどうか確認することができます。"/>
 		<column name="icon_visible_map" tool_tip="フレンドは、地図であなたの居場所を見つけることができます。"/>
@@ -15,18 +15,18 @@
 		<text name="friend_name_label" right="-10">
 			フレンドを選択して権利を変更...
 		</text>
-		<check_box label="オンライン・ステータスの確認を許可する" name="online_status_cb" tool_tip="コーリングカードあるいはフレンドリストでこのフレンドがオンライン状態を確認できるよう設定"/>
-		<check_box label="世界地図上であなたの居場所を検索可能にする" name="map_status_cb" tool_tip="このフレンドが地図で私の位置を発見できるように設定"/>
-		<check_box label="オブジェクトの修正を許可する" name="modify_status_cb" tool_tip="このフレンドがオブジェクトを改造できる許可を与える"/>
+		<check_box label="オンライン状況の確認を許可する" name="online_status_cb" tool_tip="コーリングカードあるいはフレンドリストでこのフレンドがオンライン状況を確認できるよう設定します"/>
+		<check_box label="世界地図上であなたの居場所を検索可能にする" name="map_status_cb" tool_tip="このフレンドが地図で私の位置を発見できるように設定します"/>
+		<check_box label="オブジェクトの修正を許可する" name="modify_status_cb" tool_tip="このフレンドに私のオブジェクトを改造する許可を与えます"/>
 		<text name="process_rights_label">
 			権利変更をプロセス中...
 		</text>
 	</panel>
 	<pad left="-95"/>
-	<button label="IM/コール" name="im_btn" tool_tip="インスタントメッセージ・セッションを開く" width="90"/>
+	<button label="IM・コール" name="im_btn" tool_tip="インスタントメッセージ・セッションを開きます。" width="90"/>
 	<button label="プロフィール" name="profile_btn" tool_tip="写真、グループ、およびその他の情報を表示します。" width="90"/>
-	<button label="テレポート" name="offer_teleport_btn" tool_tip="このフレンドに、あなたの現在のロケーションまでのテレポートを申し出ます。" width="90"/>
-	<button label="支払う" name="pay_btn" tool_tip="リンデンドル (L$) をこのフレンドにあげる" width="90"/>
+	<button label="テレポート" name="offer_teleport_btn" tool_tip="このフレンドに、あなたの現在地へのテレポートを申し出ます。" width="90"/>
+	<button label="支払う" name="pay_btn" tool_tip="リンデンドル (L$) をこのフレンドにあげます。" width="90"/>
 	<button label="削除" name="remove_btn" tool_tip="この人物をフレンドリストから外します。" width="90"/>
-	<button label="追加" name="add_btn" tool_tip="フレンド登録を申し出る" width="90"/>
+	<button label="追加" name="add_btn" tool_tip="フレンド登録を申し出ます。" width="90"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
index 1c89675c1e..f7f575206a 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
@@ -5,7 +5,7 @@
 			<button label="グループ情報" name="group_info_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
-			<button label="グループにコール" name="call_btn"/>
+			<button label="グループコール" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
 			<button label="コール終了" name="end_call_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml
index 538f3800bd..247294c158 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml
@@ -9,7 +9,7 @@
 		一般的なグループ情報が変更されました。
 	</panel.string>
 	<panel.string name="incomplete_member_data_str">
-		メンバー・データを検索
+		メンバーのデータを検索
 	</panel.string>
 	<text_editor name="charter">
 		グループの理念、指針を記入してください
diff --git a/indra/newview/skins/default/xui/ja/panel_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
index dc58359133..a21b340fdd 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="メンバーを招待" name="invite_panel">
 	<panel.string name="confirm_invite_owner_str">
-		本当に新しい所有者を招待しますか?この操作は取り消しできません。
+		本当に新しい所有者を招待しますか？この操作は取り消しできません。
 	</panel.string>
 	<panel.string name="loading">
 		(ローディング．．．)
diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
index b620a66122..0f014bcd2f 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
@@ -18,7 +18,7 @@
 	</text>
 	<scroll_list name="group_parcel_list">
 		<column label="区画" name="name"/>
-		<column label="地域（リージョン）" name="location"/>
+		<column label="地域" name="location"/>
 		<column label="種類" name="type"/>
 		<column label="面積" name="area"/>
 		<column label="" name="hidden"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
index c5168c4d7c..e33d3d854e 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
@@ -21,8 +21,8 @@
 	<text name="notice_list_none_found">
 		見つかりませんでした
 	</text>
-	<button label="新しい通知を作成" label_selected="新しい通知を作成" name="create_new_notice" tool_tip="新しい通知を作成"/>
-	<button label="更新" label_selected="リスト更新" name="refresh_notices" tool_tip="通知リストを更新"/>
+	<button label="新しい通知を作成" label_selected="新しい通知を作成" name="create_new_notice" tool_tip="新しい通知を作成します"/>
+	<button label="更新" label_selected="リスト更新" name="refresh_notices" tool_tip="通知リストを更新します"/>
 	<panel label="新しい通知を作成" name="panel_create_new_notice">
 		<text name="lbl">
 			通知を作成
@@ -31,7 +31,7 @@
 			件名：
 		</text>
 		<text name="lbl4">
-			ﾒｯｾｰｼﾞ：
+			内容：
 		</text>
 		<text name="lbl5">
 			添付：
@@ -54,7 +54,7 @@
 			件名：
 		</text>
 		<text name="lbl4">
-			メッセージ：
+			内容：
 		</text>
 		<button label="添付アイテムを開く" label_selected="添付物を開く" name="open_attachment"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_groups.xml b/indra/newview/skins/default/xui/ja/panel_groups.xml
index 337402d32c..de81a6431a 100644
--- a/indra/newview/skins/default/xui/ja/panel_groups.xml
+++ b/indra/newview/skins/default/xui/ja/panel_groups.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="groups">
 	<text name="groupdesc">
-		ｱｸﾃｨﾌﾞなｸﾞﾙｰﾌﾟ名は太字で表示されています
+		アクティブなグループは太字で表示されています
 	</text>
 	<text name="groupcount" width="270">
-		あなたは[COUNT] ｸﾞﾙｰﾌﾟに所属しています (最大[MAX])
+		[COUNT] のグループに所属しています (最大[MAX])
 	</text>
-	<button label="IM/コール" name="IM"
+	<button label="IM・コール" name="IM"
 	     tool_tip="インスタントメッセージ・セッションを開く" />
 	<button label="情報" name="Info" />
 	<button label="アクティブ" name="Activate" />
diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
index 9129c66a45..87477c2651 100644
--- a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
@@ -36,7 +36,7 @@
 			</panel>
 			<panel name="landmark_edit_panel">
 				<text name="title_label" value="タイトル："/>
-				<text name="notes_label" value="個人的メモ："/>
+				<text name="notes_label" value="メモ："/>
 				<text name="folder_label" value="ランドマークの位置："/>
 			</panel>
 		</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_landmarks.xml b/indra/newview/skins/default/xui/ja/panel_landmarks.xml
index 45767e8c50..151fbf33f2 100644
--- a/indra/newview/skins/default/xui/ja/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_landmarks.xml
@@ -7,8 +7,8 @@
 		<accordion_tab name="tab_library" title="ライブラリ"/>
 	</accordion>
 	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="その他のオプションを表示"/>
-		<button name="add_btn" tool_tip="新しいランドマークを追加"/>
-		<dnd_button name="trash_btn" tool_tip="選択したランドマークを削除"/>
+		<button name="options_gear_btn" tool_tip="その他のオプションを表示します"/>
+		<button name="add_btn" tool_tip="新しいランドマークを追加します"/>
+		<dnd_button name="trash_btn" tool_tip="選択したランドマークを削除します"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
index d533ce5e0d..36c7b75f97 100644
--- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
@@ -9,9 +9,9 @@
 		<inventory_panel label="最新" name="Recent Items"/>
 	</tab_container>
 	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="その他のオプションを表示"/>
-		<button name="add_btn" tool_tip="新しいアイテムの追加"/>
-		<dnd_button name="trash_btn" tool_tip="選択したアイテムを削除"/>
+		<button name="options_gear_btn" tool_tip="その他のオプションを表示します"/>
+		<button name="add_btn" tool_tip="新しいアイテムを追加します"/>
+		<dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します"/>
 	</panel>
 	<menu_bar name="Inventory Menu">
 		<menu label="ファイル" name="File">
@@ -32,7 +32,7 @@
 		<menu label="新規作成" name="Create">
 			<menu_item_call label="フォルダ" name="New Folder"/>
 			<menu_item_call label="スクリプト" name="New Script"/>
-			<menu_item_call label="新しいノートカード" name="New Note"/>
+			<menu_item_call label="ノートカード" name="New Note"/>
 			<menu_item_call label="ジェスチャー" name="New Gesture"/>
 			<menu label="衣類" name="New Clothes">
 				<menu_item_call label="シャツ" name="New Shirt"/>
@@ -40,7 +40,7 @@
 				<menu_item_call label="靴" name="New Shoes"/>
 				<menu_item_call label="靴下" name="New Socks"/>
 				<menu_item_call label="ジャケット" name="New Jacket"/>
-				<menu_item_call label="シャツ" name="New Skirt"/>
+				<menu_item_call label="スカート" name="New Skirt"/>
 				<menu_item_call label="手袋" name="New Gloves"/>
 				<menu_item_call label="下着（上）" name="New Undershirt"/>
 				<menu_item_call label="下着（下）" name="New Underpants"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
index 74e414c381..eba26bbe3d 100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
@@ -20,7 +20,7 @@
 	<check_box initial_value="false" label="自動ズーム" name="auto_zoom"/>
 	<check_box initial_value="false" label="自動メディア再生" name="auto_play"/>
 	<text name="media_setting_note">
-		注： 住人はこの設定を無視できます
+		注意： 住人はこの設定を無視できます
 	</text>
 	<check_box initial_value="false" label="オブジェクトの表面のメディアの自動スケール" name="auto_scale"/>
 	<text name="size_label">
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
index 7822123a30..6accbd4852 100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="セキュリティ" name="Media Settings Security">
-	<check_box initial_value="false" label="指定したURLパターンにのみアクセスを許可する" name="whitelist_enable"/>
+	<check_box initial_value="false" label="指定したURLパターンのみアクセスを許可する" name="whitelist_enable"/>
 	<text name="home_url_fails_some_items_in_whitelist">
 		ホームページに失敗したエントリーがマークされました：
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_my_profile.xml b/indra/newview/skins/default/xui/ja/panel_my_profile.xml
index 4cce3798cf..e74a726d11 100644
--- a/indra/newview/skins/default/xui/ja/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_my_profile.xml
@@ -28,7 +28,7 @@
 						<icon label="" name="real_world_edit_icon" tool_tip="下の「プロフィールの編集」ボタンを押して画像を変更します"/>
 						<text name="title_rw_descr_text" value="現実世界："/>
 					</panel>
-					<text name="title_member_text" value="住人となった日："/>
+					<text name="title_member_text" value="メンバー登録："/>
 					<text name="title_acc_status_text" value="アカウントの状態："/>
 					<text name="acc_status_text">
 						住人。 支払情報未登録。
diff --git a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
index a154442095..b271e86852 100644
--- a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="navigation_bar">
 	<panel name="navigation_panel">
-		<button name="back_btn" tool_tip="前の場所"/>
-		<button name="forward_btn" tool_tip="次の場所"/>
+		<button name="back_btn" tool_tip="前の場所へ戻ります"/>
+		<button name="forward_btn" tool_tip="次の場所へ進みます"/>
 		<button name="home_btn" tool_tip="「ホーム」にテレポート"/>
 		<location_input label="場所" name="location_combo"/>
 		<search_combo_box label="検索" name="search_combo_box" tool_tip="検索">
diff --git a/indra/newview/skins/default/xui/ja/panel_notes.xml b/indra/newview/skins/default/xui/ja/panel_notes.xml
index 1948c54359..6023bf125f 100644
--- a/indra/newview/skins/default/xui/ja/panel_notes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notes.xml
@@ -15,9 +15,9 @@
 		<layout_panel name="notes_buttons_panel">
 			<button label="フレンド登録" name="add_friend" tool_tip="フレンド登録を申し出ます"/>
 			<button label="IM" name="im" tool_tip="インスタントメッセージを開きます"/>
-			<button label="コール" name="call" tool_tip="この住人にコールする"/>
-			<button label="地図" name="show_on_map_btn" tool_tip="住人を地図上で表示する"/>
-			<button label="テレポート" name="teleport" tool_tip="テレポートを送る"/>
+			<button label="コール" name="call" tool_tip="この住人にコールします"/>
+			<button label="地図" name="show_on_map_btn" tool_tip="住人を地図上で表示します"/>
+			<button label="テレポート" name="teleport" tool_tip="テレポートを送ります"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
index 6c2d845ad3..7681ee461f 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
@@ -5,10 +5,10 @@
 		<inventory_panel label="着用中" name="cof_accordionpanel"/>
 	</tab_container>
 	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="その他のオプションを表示"/>
-		<dnd_button name="trash_btn" tool_tip="選択したアイテムを削除"/>
-		<button label="アウトフィットを保存する" name="make_outfit_btn" tool_tip="容姿をアウトフィットに保存する" width="140"/>
-		<button label="装着" name="wear_btn" tool_tip="選択したアウトフィットを着用する"/>
+		<button name="options_gear_btn" tool_tip="その他のオプションを表示します"/>
+		<dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します"/>
+		<button label="アウトフィットを保存する" name="make_outfit_btn" tool_tip="容姿をアウトフィットに保存します" width="140"/>
+		<button label="装着" name="wear_btn" tool_tip="選択したアウトフィットを着用します"/>
 		<button label="M" name="look_edit_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index c955cf6e48..0c3690a10c 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -23,15 +23,15 @@
 			</accordion>
 			<panel label="bottom_panel" name="bottom_panel">
 				<button name="friends_viewsort_btn" tool_tip="オプション"/>
-				<button name="add_btn" tool_tip="フレンド登録を申し出る"/>
-				<button name="del_btn" tool_tip="選択した人をフレンドリストから削除"/>
+				<button name="add_btn" tool_tip="フレンド登録を申し出ます"/>
+				<button name="del_btn" tool_tip="選択した人をフレンドリストから削除します"/>
 			</panel>
 		</panel>
 		<panel label="グループ" name="groups_panel">
 			<panel label="bottom_panel" name="bottom_panel">
 				<button name="groups_viewsort_btn" tool_tip="オプション"/>
-				<button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成"/>
-				<button name="activate_btn" tool_tip="選択したグループをアクティベート"/>
+				<button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
+				<button name="activate_btn" tool_tip="選択したグループをアクティブにします"/>
 			</panel>
 		</panel>
 		<panel label="最新" name="recent_panel">
@@ -42,13 +42,13 @@
 		</panel>
 	</tab_container>
 	<panel name="button_bar">
-		<button label="プロフィール" name="view_profile_btn" tool_tip="写真、グループ、その他住人情報を表示"/>
-		<button label="IM" name="im_btn" tool_tip="インスタントメッセージを開く"/>
-		<button label="コール" name="call_btn" tool_tip="この住人にコールする"/>
+		<button label="プロフィール" name="view_profile_btn" tool_tip="写真、グループ、その他住人情報を表示します"/>
+		<button label="IM" name="im_btn" tool_tip="インスタントメッセージを開きます"/>
+		<button label="コール" name="call_btn" tool_tip="この住人にコールします"/>
 		<button label="共有" name="share_btn"/>
-		<button label="テレポート" name="teleport_btn" tool_tip="テレポートを送る"/>
-		<button label="グループ情報" name="group_info_btn" tool_tip="グループ情報を表示"/>
-		<button label="グループチャット" name="chat_btn" tool_tip="チャットを開始"/>
-		<button label="グループにコールする" name="group_call_btn" tool_tip="このグループにコールする"/>
+		<button label="テレポート" name="teleport_btn" tool_tip="テレポートを送ります"/>
+		<button label="グループ情報" name="group_info_btn" tool_tip="グループ情報を表示します"/>
+		<button label="グループチャット" name="chat_btn" tool_tip="チャットを開始します"/>
+		<button label="グループコール" name="group_call_btn" tool_tip="このグループにコールします"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_picks.xml b/indra/newview/skins/default/xui/ja/panel_picks.xml
index f74bf7a073..4f58c032da 100644
--- a/indra/newview/skins/default/xui/ja/panel_picks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_picks.xml
@@ -10,8 +10,8 @@
 		<button name="new_btn" tool_tip="現在地の新しいピック、またはクラシファイド広告を作成します"/>
 	</panel>
 	<panel name="buttons_cucks">
-		<button label="情報" name="info_btn" tool_tip="ピックの情報を表示"/>
-		<button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポート"/>
-		<button label="地図" name="show_on_map_btn" tool_tip="世界地図に該当するエリアを表示"/>
+		<button label="情報" name="info_btn" tool_tip="ピックの情報を表示します"/>
+		<button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートします"/>
+		<button label="地図" name="show_on_map_btn" tool_tip="世界地図に該当するエリアを表示します"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
index ef4b71c4aa..b9a0744372 100644
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
@@ -86,9 +86,10 @@
 						<button label="土地情報" name="about_land_btn"/>
 					</panel>
 				</accordion_tab>
-				<accordion_tab name="region_information_tab" title="リージョン">
+				<accordion_tab name="region_information_tab" title="リージョン（地域）
+				">
 					<panel>
-						<text name="region_name_label" value="リージョン:"/>
+						<text name="region_name_label" value="地域:"/>
 						<text name="region_name" value="Mooseland"/>
 						<text name="region_type_label" value="種類："/>
 						<text name="region_type" value="Moose"/>
@@ -105,7 +106,7 @@
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="エステート（不動産）">
 					<panel>
-						<text name="estate_name_label" value="エステート（不動産）："/>
+						<text name="estate_name_label" value="不動産："/>
 						<text name="estate_rating_label" value="レーティング区分："/>
 						<text name="estate_owner_label" value="所有者："/>
 						<text name="covenant_label" value="約款："/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
index 16af659326..f0780a6cf8 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
@@ -6,9 +6,9 @@
 	<check_box label="リンデンドルを使用・受け取るとき" name="notify_money_change_checkbox"/>
 	<check_box label="フレンドがログアウト・ログインするとき" name="friends_online_notify_checkbox"/>
 	<text name="show_label" width="300">
-		常に表示する通知：
+		常に表示するメッセージ：
 	</text>
 	<text name="dont_show_label">
-		表示しない通知：
+		表示しないメッセージ：
 	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index ece18a75ca..73d0855273 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -7,27 +7,27 @@
 	</radio_group>
 	<color_swatch label="自分" name="user"/>
 	<text name="text_box1">
-		ミー
+		自分
 	</text>
 	<color_swatch label="その他" name="agent"/>
 	<text name="text_box2">
-		その他
+		他人
 	</text>
 	<color_swatch label="IM" name="im"/>
 	<text name="text_box3">
 		IM
 	</text>
-	<color_swatch label="ｼｽﾃﾑ" name="system"/>
+	<color_swatch label="システム" name="system"/>
 	<text name="text_box4">
-		ｼｽﾃﾑ
+		システム
 	</text>
 	<color_swatch label="エラー" name="script_error"/>
 	<text name="text_box5">
 		エラー
 	</text>
-	<color_swatch label="ｵﾌﾞｼﾞｪｸﾄ" name="objects"/>
+	<color_swatch label="オブジェクト" name="objects"/>
 	<text name="text_box6">
-		ｵﾌﾞｼﾞｪｸﾄ
+		オブジェクト
 	</text>
 	<color_swatch label="所有者" name="owner"/>
 	<text name="text_box7">
@@ -37,9 +37,9 @@
 	<text name="text_box9">
 		URL
 	</text>
-	<check_box initial_value="true" label="チャット中はタイピング動作のアニメーションを再生" name="play_typing_animation"/>
-	<check_box label="オフライン時に受け取った IM をメールで送信" name="send_im_to_email"/>
-	<check_box label="文字チャットの履歴を有効にする" name="plain_text_chat_history"/>
+	<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
+	<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
+	<check_box label="チャット履歴に文字だけで表示する" name="plain_text_chat_history"/>
 	<radio_group name="chat_window" tool_tip="インスタントメッセージを別ウィンドウ、または1つのウィンドウに複数タブで表示（要再起動）">
 		<radio_item label="複数ウィンドウ" name="radio" value="0"/>
 		<radio_item label="1つのウィンドウ" name="radio2" value="1"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 765662b96a..e5be3d7b46 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -48,7 +48,7 @@
 	<check_box initial_value="true" label="小さいアバター名" name="small_avatar_names_checkbox"/>
 	<check_box label="グループタイトルを表示" name="show_all_title_checkbox1"/>
 	<text name="effects_color_textbox">
-		私のビームの色：
+		ビームの色：
 	</text>
 	<text name="title_afk_text">
 		一時退席までの時間：
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 191748fe91..8df829c296 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -55,7 +55,7 @@
 		<text name="AvatarRenderingText">
 			アバター表示：
 		</text>
-		<check_box initial_value="true" label="アバターの精度を上げる" name="AvatarImpostors"/>
+		<check_box initial_value="true" label="アバターの描画を簡略化" name="AvatarImpostors"/>
 		<check_box initial_value="true" label="ハードウェアスキニング" name="AvatarVertexProgram"/>
 		<check_box initial_value="true" label="アバターの布" name="AvatarCloth"/>
 		<slider label="描画距離：" name="DrawDistance"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
index 7a7cb8b96b..12e8b04f84 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
@@ -11,13 +11,13 @@
 	<check_box label="フレンドとグループ以外からはコールとIMを受信しない" name="voice_call_friends_only_check"/>
 	<check_box label="コールが終了したらマイクのスイッチを切る" name="auto_disengage_mic_check"/>
 	<check_box label="Cookieを受け入れる" name="cookies_enabled"/>
-	<check_box label="メディアが有効です" name="media_enabled"/>
+	<check_box label="メディアを有効にする" name="media_enabled"/>
 	<check_box label="メディアを自動再生する" name="autoplay_enabled"/>
 	<text name="Logs:">
 		ログ：
 	</text>
-	<check_box label="コンピューターに近くのチャットログを保存する" name="log_nearby_chat"/>
-	<check_box label="コンピューターに IM ログを保存する" name="log_instant_messages"/>
+	<check_box label="近くのチャットログをコンピューターに保存する" name="log_nearby_chat"/>
+	<check_box label="IM ログをコンピューターに保存する" name="log_instant_messages"/>
 	<check_box label="タイムスタンプを追加する" name="show_timestamps_check_im"/>
 	<text name="log_path_desc">
 		ログの保存場所：
diff --git a/indra/newview/skins/default/xui/ja/panel_profile.xml b/indra/newview/skins/default/xui/ja/panel_profile.xml
index 98969f5ab3..8968b7c61e 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile.xml
@@ -26,7 +26,7 @@
 					<panel name="first_life_image_panel">
 						<text name="title_rw_descr_text" value="現実世界："/>
 					</panel>
-					<text name="title_member_text" value="住人となった日："/>
+					<text name="title_member_text" value="住人登録："/>
 					<text name="title_acc_status_text" value="アカウントの状態："/>
 					<text name="acc_status_text">
 						住人。 支払情報未登録。
@@ -40,9 +40,9 @@
 		<layout_panel name="profile_buttons_panel">
 			<button label="フレンド登録" name="add_friend" tool_tip="フレンド登録を申し出ます"/>
 			<button label="IM" name="im" tool_tip="インスタントメッセージを開きます"/>
-			<button label="コール" name="call" tool_tip="この住人にコールする"/>
-			<button label="地図" name="show_on_map_btn" tool_tip="住人を地図上で表示する"/>
-			<button label="テレポート" name="teleport" tool_tip="テレポートを送る"/>
+			<button label="コール" name="call" tool_tip="この住人にコールします"/>
+			<button label="地図" name="show_on_map_btn" tool_tip="住人を地図上で表示します"/>
+			<button label="テレポート" name="teleport" tool_tip="テレポートを送ります"/>
 		</layout_panel>
 		<layout_panel name="profile_me_buttons_panel">
 			<button label="プロフィールの編集" name="edit_profile_btn" tool_tip="個人的な情報を編集します"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
index d61fd0fe7f..9a517d79e9 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="約款" name="Covenant">
 	<text font="SansSerifLarge" name="estate_section_lbl" width="200">
-		エステート（不動産）
+		不動産
 	</text>
 	<text name="estate_name_lbl">
 		名前：
@@ -33,7 +33,7 @@
 		この不動産約款の変更をする際は、ノートカードをドラッグ＆ドロップしてください。
 	</text>
 	<text bottom_delta="-34" font="SansSerifLarge" name="region_section_lbl" width="200">
-		リージョン（地域）
+		地域
 	</text>
 	<text name="region_name_lbl">
 		名前：
diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
index 4209fb17e5..f6865c12b1 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
@@ -6,11 +6,11 @@
 	<text name="region_text">
 		未知
 	</text>
-	<check_box label="スクリプト無効化" name="disable_scripts_check" tool_tip="この地域のスクリプトをすべて無効化"/>
+	<check_box label="スクリプト無効化" name="disable_scripts_check" tool_tip="この地域のスクリプトをすべて無効にします"/>
 	<button label="?" name="disable_scripts_help"/>
-	<check_box label="衝突を無効化" name="disable_collisions_check" tool_tip="この地域の非アバター衝突を無効化"/>
+	<check_box label="衝突を無効化" name="disable_collisions_check" tool_tip="この地域の非アバター衝突を無効にします"/>
 	<button label="?" name="disable_collisions_help"/>
-	<check_box label="物理作用を無効化" name="disable_physics_check" tool_tip="この地域の物理作用をすべて無効化"/>
+	<check_box label="物理作用を無効化" name="disable_physics_check" tool_tip="この地域の物理作用をすべて無効にします"/>
 	<button label="?" name="disable_physics_help"/>
 	<button label="適用" name="apply_btn"/>
 	<text name="objret_text_lbl" width="120">
@@ -27,14 +27,14 @@
 		オプション:
 	</text>
 	<check_box label="スクリプト付きのもの" name="return_scripts" tool_tip="スクリプトのオブジェクトだけ返却します"/>
-	<check_box label="他人の土地にあるもの" name="return_other_land" tool_tip="他人に属する土地にあるオブジェクトのみを返却"/>
-	<check_box label="この不動産に属するすべてのリージョンのもの" name="return_estate_wide" tool_tip="この不動産に含まれているすべての地域のオブジェクトを返却"/>
+	<check_box label="他人の土地にあるもの" name="return_other_land" tool_tip="他人に属する土地にあるオブジェクトのみを返却します"/>
+	<check_box label="この不動産に属するすべてのリージョンのもの" name="return_estate_wide" tool_tip="この不動産に含まれているすべての地域のオブジェクトを返却します"/>
 	<button label="返却" name="return_btn"/>
 	<button label="上部コライダー取得" name="top_colliders_btn" tool_tip="衝突する可能性が最も高いオブジェクトのリスト"/>
 	<button label="?" name="top_colliders_help"/>
 	<button label="上部スクリプト取得" name="top_scripts_btn" tool_tip="スクリプトの実行に最も時間を費やしているオブジェクトのリスト"/>
 	<button label="?" name="top_scripts_help"/>
-	<button label="地域再起動" name="restart_btn" tool_tip="2分間のカウントダウン後、地域を再起動"/>
+	<button label="地域再起動" name="restart_btn" tool_tip="2分間のカウントダウン後、地域を再起動します"/>
 	<button label="?" name="restart_help"/>
-	<button label="再起動を遅延" name="cancel_restart_btn" tool_tip="地域の再起動を１時間遅延する"/>
+	<button label="再起動を遅延" name="cancel_restart_btn" tool_tip="地域の再起動を１時間遅延します"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index de93e47342..fcc225c333 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -40,7 +40,7 @@
 	<check_box label="太陽固定" name="fixed_sun_check"/>
 	<button label="?" name="fixed_sun_help"/>
 	<slider label="段階" name="sun_hour_slider"/>
-	<check_box label="パブリック・アクセスを許可" name="externally_visible_check"/>
+	<check_box label="パブリックアクセスを許可" name="externally_visible_check"/>
 	<button label="?" name="externally_visible_help"/>
 	<check_box label="直接テレポートを許可" name="allow_direct_teleport"/>
 	<button label="?" name="allow_direct_teleport_help"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml
index e3d2d2163c..168141ee77 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml
@@ -28,9 +28,9 @@
 	<button label="?" name="restrict_pushobject_help"/>
 	<check_box label="土地の再販を許可" name="allow_land_resell_check"/>
 	<button label="?" name="land_resell_help"/>
-	<check_box label="土地の統合／分割を許可" name="allow_parcel_changes_check"/>
+	<check_box label="土地の統合・分割を許可" name="allow_parcel_changes_check"/>
 	<button label="?" name="parcel_changes_help"/>
-	<check_box label="土地の検索表示をブロック" name="block_parcel_search_check" tool_tip="検索結果で、この地域と区画を人に見せる"/>
+	<check_box label="土地の検索表示をブロック" name="block_parcel_search_check" tool_tip="検索結果で、この地域と区画を表示するかどうかの設定です"/>
 	<button label="?" name="parcel_search_help"/>
 	<spinner label="アバター数上限" name="agent_limit_spin"/>
 	<button label="?" name="agent_limit_help"/>
@@ -40,14 +40,14 @@
 		区分：
 	</text>
 	<combo_box label="控えめ" name="access_combo">
-		<combo_box.item label="Adult" name="Adult"/>
+		<combo_box.item label="アダルト" name="Adult"/>
 		<combo_box.item label="控えめ" name="Mature"/>
 		<combo_box.item label="一般" name="PG"/>
 	</combo_box>
 	<button label="?" name="access_help"/>
 	<button label="適用" name="apply_btn"/>
-	<button label="ユーザー1人ホームテレポート" name="kick_btn"/>
-	<button label="ユーザー全員ホームテレポート" name="kick_all_btn"/>
-	<button label="メッセージを地域へ送信..." name="im_btn"/>
+	<button label="ユーザー1名をホームにテレポート" name="kick_btn"/>
+	<button label="ユーザー全員をホームにテレポート" name="kick_all_btn"/>
+	<button label="メッセージを地域に送信..." name="im_btn"/>
 	<button label="テレハブの管理..." name="manage_telehub_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml b/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml
index f58a26a7d0..df7e5d9129 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="リージョン（地域）" name="General">
 	<text name="region_text_lbl">
-		リージョン:
+		地域:
 	</text>
 	<text name="region_text" left_delta="70">
 		不明
@@ -24,9 +24,9 @@
 	<check_box label="プッシュを制限" name="restrict_pushobject"/>
 	<check_box label="土地の再販を許可" name="allow_land_resell_check"/>
 	<check_box label="土地の統合・分割を許可" name="allow_parcel_changes_check"/>
-	<check_box label="土地の検索教示をブロック" name="block_parcel_search_check" tool_tip="このリージョンとリージョン内の区画を検索結果に表示する"/>
+	<check_box label="土地の検索表示をブロック" name="block_parcel_search_check" tool_tip="検索結果で、この地域と区画を表示するかどうかの設定です"/>
 	<spinner label="アバター数上限" name="agent_limit_spin" label_width="110" width="190"/>
-	<spinner label="オブジェクトボーナス" name="object_bonus_spin" label_width="110" width="190"/>
+	<spinner label="物体ボーナス" name="object_bonus_spin" label_width="110" width="190"/>
 	<text label="レーティング区分" name="access_text">
 		レーティング区分：
 	</text>
@@ -38,6 +38,6 @@
 	<button label="適用" name="apply_btn"/>
 	<button label="ユーザー1名をホームにテレポート..." name="kick_btn"/>
 	<button label="ユーザー全員をホームにテレポート..." name="kick_all_btn"/>
-	<button label="リージョンにメッセージを送信..." name="im_btn"/>
+	<button label="メッセージを地域に送信..." name="im_btn"/>
 	<button label="テレハブの管理..." name="manage_telehub_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index 063e584762..8d375aa6cd 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -21,7 +21,7 @@
 	<panel.string name="buycurrencylabel">
 		L$ [AMT]
 	</panel.string>
-	<button label="" label_selected="" name="buycurrency" tool_tip="私の残高"/>
+	<button label="" label_selected="" name="buycurrency" tool_tip="所持金"/>
 	<button label="L$ の購入" name="buyL" tool_tip="クリックして L$ を購入します"/>
 	<text name="TimeText" tool_tip="現在時刻（太平洋）">
 		12：00 AM
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 288ad4bc1d..de628943ad 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -339,7 +339,7 @@
 		リンク
 	</string>
 	<string name="AvatarEditingAppearance">
-		（容姿の編集）
+		（容姿の編集中）
 	</string>
 	<string name="AvatarAway">
 		一時退席中
@@ -588,7 +588,7 @@
 		接続しました
 	</string>
 	<string name="unavailable">
-		あなたの現在のロケーションでは、ボイスを利用できません。
+		現在地では、ボイスを利用できません。
 	</string>
 	<string name="hang_up">
 		インワールドボイスチャットの通話が切断されました
@@ -642,7 +642,7 @@
 		控えめ
 	</string>
 	<string name="SIM_ACCESS_ADULT">
-		Adult
+		アダルト
 	</string>
 	<string name="SIM_ACCESS_DOWN">
 		オフライン
@@ -786,7 +786,7 @@
 		添付アイテムを保存
 	</string>
 	<string name="TeleportOffer">
-		テレポートを渡す
+		テレポートを送る
 	</string>
 	<string name="StartUpNotifications">
 		不在中に新しい通知が届きました。
@@ -833,7 +833,7 @@
 	<string name="InventoryNoTexture">
 		持ち物内にこのテクスチャのコピーがありません
 	</string>
-	<string name="no_transfer" value=" （再販/プレゼント不可）"/>
+	<string name="no_transfer" value=" （再販・プレゼント不可）"/>
 	<string name="no_modify" value=" （編集不可）"/>
 	<string name="no_copy" value=" （コピー不可）"/>
 	<string name="worn" value=" （着用中）"/>
@@ -874,7 +874,7 @@
 	<string name="No Filters" value="いいえ "/>
 	<string name="Since Logoff" value=" - ログオフ以来"/>
 	<string name="InvFolder My Inventory">
-		マイ 持ち物
+		持ち物
 	</string>
 	<string name="InvFolder My Favorites">
 		お気に入り
@@ -1706,7 +1706,7 @@
 		Linden 所在地
 	</string>
 	<string name="Adult">
-		Adult
+		アダルト
 	</string>
 	<string name="Arts&amp;Culture">
 		アートとカルチャー
@@ -3190,7 +3190,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		現在地の詳細を見る
 	</string>
 	<string name="LocationCtrlComboBtnTooltip">
-		マイロケーション履歴
+		マイ ロケーション履歴
 	</string>
 	<string name="LocationCtrlForSaleTooltip">
 		この土地を購入
@@ -3247,7 +3247,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		-- インスタントメッセージの保存開始 --
 	</string>
 	<string name="IM_typing_start_string">
-		[NAME] は入力中...
+		[NAME] は入力中です...
 	</string>
 	<string name="Unnamed">
 		（名前なし）
-- 
cgit v1.2.3


From d3f30dc96e0232f1b1064da93e661e3a850a95fd Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Wed, 10 Feb 2010 11:13:26 +0200
Subject: fix task EXT-5129 Move Group image and founder name into General
 accordion

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_group_general.xml   | 75 +++++++++++++++++++++-
 .../default/xui/en/panel_group_info_sidetray.xml   | 64 +-----------------
 2 files changed, 74 insertions(+), 65 deletions(-)

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

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 618167181f..662fd1ae73 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -20,15 +20,84 @@ Hover your mouse over the options for more help.
      name="incomplete_member_data_str">
         Retrieving member data
     </panel.string>
+   <panel
+      name="group_info_top"
+      follows="top|left"
+      top="0"
+      left="0"
+      height="129"
+      width="313"
+      layout="topleft">
+    <texture_picker
+     follows="left|top"
+     height="110"
+     label=""
+     layout="topleft"
+     left="10"
+     name="insignia"
+     no_commit_on_selection="true"
+     tool_tip="Click to choose a picture"
+     top="5"
+     width="100" />
+    <text
+      font="SansSerifSmall"
+      text_color="White_50"
+      width="190"
+      follows="top|left"
+      layout="topleft"
+      mouse_opaque="false"
+     type="string"
+     height="16"
+     length="1"
+     left_pad="10"
+     name="prepend_founded_by"
+     top_delta="0">
+      Founder:
+    </text>
+    <name_box
+     follows="left|top"
+     height="16"
+     initial_value="(retrieving)"
+     layout="topleft"
+     left_delta="0"
+     link="true"
+     name="founder_name"
+     top_pad="2"
+     use_ellipses="true"
+     width="190" />
+    <text
+    font="SansSerifMedium"
+    text_color="EmphasisColor"
+     type="string"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_delta="0"
+     name="join_cost_text"
+     top_pad="10"
+     visible="true"
+     width="190">
+      Free
+    </text>
+    <button
+     follows="left|top"
+     left_delta="0"
+     top_pad="6"
+     height="23"
+     label="JOIN NOW!"
+     name="btn_join"
+     visible="true"
+     width="120" />
+    </panel>
     <text_editor
      type="string"
      follows="left|top|right"
      left="5"
-     height="150"
+     height="80"
      layout="topleft"
      max_length="511"
      name="charter"
-     top="5"
+     top="105"
      right="-1"
     bg_readonly_color="DkGray2"
     text_readonly_color="White"
@@ -40,7 +109,7 @@ Hover your mouse over the options for more help.
      draw_heading="true"
      follows="left|top|right"
      heading_height="23"
-     height="200"
+     height="160"
      layout="topleft"
      left="0"
      name="visible_members"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 9727c54c6b..375de64923 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -31,7 +31,7 @@ background_visible="true"
       follows="top|left"
       top="0"
       left="0"
-      height="129"
+      height="29"
       width="313"
       layout="topleft">
     <button
@@ -70,66 +70,6 @@ background_visible="true"
      width="270"
      height="20"
      visible="false" />
-    <texture_picker
-     follows="left|top"
-     height="113"
-     label=""
-     layout="topleft"
-     left="10"
-     name="insignia"
-     no_commit_on_selection="true"
-     tool_tip="Click to choose a picture"
-     top_pad="5"
-     width="100" />
-    <text
-      font="SansSerifSmall"
-      text_color="White_50"
-      width="190"
-      follows="top|left"
-      layout="topleft"
-      mouse_opaque="false"
-     type="string"
-     height="16"
-     length="1"
-     left_pad="10"
-     name="prepend_founded_by"
-     top_delta="0">
-      Founder:
-    </text>
-    <name_box
-     follows="left|top"
-     height="16"
-     initial_value="(retrieving)"
-     layout="topleft"
-     left_delta="0"
-     link="true"
-     name="founder_name"
-     top_pad="2"
-     use_ellipses="true"
-     width="190" />
-    <text
-    font="SansSerifMedium"
-    text_color="EmphasisColor"
-     type="string"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="0"
-     name="join_cost_text"
-     top_pad="10"
-     visible="true"
-     width="190">
-      Free
-    </text>
-    <button
-     follows="left|top"
-     left_delta="0"
-     top_pad="6"
-     height="23"
-     label="JOIN NOW!"
-     name="btn_join"
-     visible="true"
-     width="120" />
     </panel>
    <layout_stack
      name="layout"
@@ -137,7 +77,7 @@ background_visible="true"
       follows="all"
      left="0"
      top_pad="0"
-     height="437"
+     height="537"
      width="313"
      border_size="0">
    <layout_panel
-- 
cgit v1.2.3


From ff2296723339af6a1aead36534565856221a467e Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 10 Feb 2010 13:03:11 +0200
Subject: Fixed low bug EXT-5124 - Display buddy icons on online/offline alerts

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 90381c2af4..51f0f6839c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4307,14 +4307,14 @@ Topic: [SUBJECT], Message: [MESSAGE]
    icon="notifytip.tga"
    name="FriendOnline"
    type="notifytip">
-[FIRST] [LAST] is Online
+[NAME_SLURL] is Online
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="FriendOffline"
    type="notifytip">
-[FIRST] [LAST] is Offline
+[NAME_SLURL] is Offline
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 15825cb8992ce692172907714c7cd64a48ed5fa4 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 10 Feb 2010 14:20:23 +0000
Subject: fix 9d63853d2045 / EXT-651 that checkin broke the xml and killed the
 Developer menu - repair it.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 4e9073bea5..df6c7bd9cb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1604,6 +1604,7 @@
                parameter="" />
             <menu_item_call.on_enable
                function="File.EnableUpload" />
+            </menu_item_call>
             <menu_item_check
                label="Search"
                layout="topleft"
-- 
cgit v1.2.3


From d7140c95e3a667ea5d659802956bc0aa5acfda41 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 10 Feb 2010 17:40:56 +0200
Subject: Fixed low bug EXT-5057 (Warning Message in console on every Group
 Chat Message recieved) - removed getting an icon commented out in xml. It
 does not make sense witout image name.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_instant_message.xml | 10 ----------
 1 file changed, 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index a0ad38cf76..34fd3352a3 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -56,16 +56,6 @@
          name="adhoc_icon"
          top="3"
          width="18" />
-        <!--<icon
-         follows="right"
-         height="20"
-         image_name=""
-         layout="topleft"
-         left="3"
-         mouse_opaque="true"
-         name="sys_msg_icon"
-         top="0"
-         width="20" />-->
         <text
          follows="left|right"
          font.style="BOLD"
-- 
cgit v1.2.3


From e8610200433ef636bbd0b594afe9543cebc06689 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Wed, 10 Feb 2010 20:03:20 +0200
Subject: zmg fix for normal EXT-5245 Cannot create a new line in group notice
 creation with enter key

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_group_notices.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 1f16aea2ef..5f46ad7860 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -159,7 +159,6 @@ Maximum 200 per group daily
          left_pad="3"
          max_length="511"
          name="create_message"
-         text_type="ascii"
          top_delta="0"
          width="220"
          word_wrap="true" />
-- 
cgit v1.2.3


From 369c58b09c963d78eae1776d0cbca32d8189cd6a Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Wed, 10 Feb 2010 11:38:00 -0800
Subject: DEV-43688 Cycle3 JA linguistic changes by Rika for better UI, post
 truncation fix

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

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

diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index e5be3d7b46..f216c3acbc 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -33,7 +33,7 @@
 	</text>
 	<combo_box name="start_location_combo">
 		<combo_box.item label="最後にログアウトした場所" name="MyLastLocation" tool_tip="常に最後にいた場所にログイン"/>
-		<combo_box.item label="自宅（ホーム）" name="MyHome" tool_tip="常に自宅（ホーム）にログイン"/>
+		<combo_box.item label="ホーム" name="MyHome" tool_tip="常にホーム（自宅）にログイン"/>
 	</combo_box>
 	<check_box initial_value="true" label="ログイン画面に表示する" name="show_location_checkbox"/>
 	<text name="name_tags_textbox">
-- 
cgit v1.2.3


From 7403d53e68550159cb56e44cc898e337cf672aae Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 10 Feb 2010 21:42:39 +0200
Subject: Fixed normal bug  EXT-4566 ([BSI] private chat end floater reports
 incorrectly who ended the call)

- Added flag to voicechannel which is true when call is ended by agent.

- It is sent to imview via signal and used to properly customize text in outgoing call floater.

--HG--
branch : product-engine
---
 .../newview/skins/default/xui/en/floater_outgoing_call.xml  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
index cc9afe4474..2bafd1bdef 100644
--- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
@@ -96,12 +96,23 @@ No Answer.  Please try again later.
    height="40"
    layout="topleft"
    left="77"
-   name="nearby_P2P"
+   name="nearby_P2P_by_other"
    top="27"
    width="315"
    word_wrap="true">
     [VOICE_CHANNEL_NAME] has ended the call.  [RECONNECT_NEARBY]
   </text>
+  <text
+   font="SansSerifLarge"
+   height="40"
+   layout="topleft"
+   left="77"
+   name="nearby_P2P_by_agent"
+   top="27"
+   width="315"
+   word_wrap="true">
+    You have ended the call.  [RECONNECT_NEARBY]
+  </text>
   <text
      font="SansSerif"
      height="50"
-- 
cgit v1.2.3


From 62c8091693180e4b8daecc224954e19a0a3ff1d6 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Wed, 10 Feb 2010 15:20:11 -0500
Subject: Removed referral text. https://jira.secondlife.com/browse/EXT-3909

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_postcard.xml b/indra/newview/skins/default/xui/en/floater_postcard.xml
index 3a7b6cc832..6f78363b25 100644
--- a/indra/newview/skins/default/xui/en/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/en/floater_postcard.xml
@@ -128,19 +128,9 @@
      width="420">
         Type your message here.
     </text_editor>
-    <text
-     type="string"
-     length="1"
-     bottom_delta="37"
-     follows="left|bottom"
-     layout="topleft"
-     left="12"
-     name="fine_print">
-        If your recipient joins SL, you&apos;ll get a referral bonus.
-    </text>
     <button
      follows="right|bottom"
-     height="20"
+     height="23"
      label="Cancel"
      layout="topleft"
      name="cancel_btn"
@@ -149,7 +139,7 @@
      width="100" />
     <button
      follows="right|bottom"
-     height="20"
+     height="23"
      label="Send"
      layout="topleft"
      left_delta="-106"
-- 
cgit v1.2.3


From 53a9f46b8a3746bbdafa25200527fa8b25c893fc Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Wed, 10 Feb 2010 12:40:23 -0800
Subject: EXT-4357Add a color overlay to the selected tool and shape in build
 tools

---
 .../newview/skins/default/xui/en/floater_tools.xml | 65 ++++++++++------------
 1 file changed, 30 insertions(+), 35 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 5630dfbe8f..23203d227e 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -67,80 +67,75 @@
     </floater.string>
     <button
      follows="left|top"
-     height="20"
-     image_disabled="Tool_Zoom"
-     image_disabled_selected="Tool_Zoom"
-     image_selected="Tool_Zoom_Selected"
-     image_unselected="Tool_Zoom"
+     height="25"
+     image_bottom_pad="1"
+     image_overlay="Tool_Zoom"
+     image_selected="PushButton_Selected_Press"
      layout="topleft"
      left="10"
      name="button focus"
      tool_tip="Focus"
-     width="20">
+     width="35">
 	  <button.commit_callback
 	     function="BuildTool.setTool"
 	     parameter="Focus" />
 	</button>
     <button
      follows="left|top"
-     height="20"
-     image_disabled="Tool_Grab"
-     image_disabled_selected="Tool_Grab"
-     image_selected="Tool_Grab_Selected"
-     image_unselected="Tool_Grab"
+      height="25"
+     image_bottom_pad="1"
+     image_overlay="Tool_Grab"
+     image_selected="PushButton_Selected_Press"
      layout="topleft"
-     left_pad="20"
+     left_pad="10"
      name="button move"
      tool_tip="Move"
-     width="20">
+     width="35">
 	  <button.commit_callback
 	     function="BuildTool.setTool"
 	     parameter="Move" />
 	</button>
     <button
      follows="left|top"
-     height="20"
-     image_disabled="Tool_Face"
-     image_disabled_selected="Tool_Face"
-     image_selected="Tool_Face_Selected"
-     image_unselected="Tool_Face"
+     height="25"
+     image_bottom_pad="1"
+     image_overlay="Tool_Face"
+     image_selected="PushButton_Selected_Press"
      layout="topleft"
-     left_pad="20"
+     left_pad="10"
      name="button edit"
      tool_tip="Edit"
-     width="20">
+     width="35">
 	  <button.commit_callback
 	     function="BuildTool.setTool"
 	     parameter="Edit" />
 	</button>
     <button
      follows="left|top"
-     height="20"
-     image_disabled="Tool_Create"
-     image_disabled_selected="Tool_Create"
-     image_selected="Tool_Create_Selected"
-     image_unselected="Tool_Create"
+      height="25"
+     image_bottom_pad="1"
+     image_overlay="Tool_Create"
+     image_selected="PushButton_Selected_Press"
      layout="topleft"
-     left_pad="20"
+     left_pad="10"
      name="button create"
      tool_tip="Create"
-     width="20">
+     width="35">
 	  <button.commit_callback
 	     function="BuildTool.setTool"
 	     parameter="Create" />
 	</button>
     <button
      follows="left|top"
-     height="20"
-     image_disabled="Tool_Dozer"
-     image_disabled_selected="Tool_Dozer"
-     image_selected="Tool_Dozer_Selected"
-     image_unselected="Tool_Dozer"
+      height="25"
+     image_bottom_pad="1"
+     image_overlay="Tool_Dozer"
+     image_selected="PushButton_Selected_Press"
      layout="topleft"
-     left_pad="20"
+     left_pad="10"
      name="button land"
      tool_tip="Land"
-     width="20">
+     width="35">
 	  <button.commit_callback
 	     function="BuildTool.setTool"
 	     parameter="Land" />
@@ -1043,7 +1038,7 @@ even though the user gets a free copy.
       <check_box
 	   height="15"
 	   width="110"
-	   top_pad="3"
+	   top_pad="5"
 	   label="Show in search"
        layout="topleft"
 	   left="100"
-- 
cgit v1.2.3


From 0e035fd9b8090c59cc7388809ebe0bf25b54cd9d Mon Sep 17 00:00:00 2001
From: "Paul Guslisty pguslisty@productengine.com"
 <Paul Guslisty pguslisty@productengine.com>
Date: Thu, 11 Feb 2010 09:41:20 +0200
Subject: Fixed normal bug EXT - 5104 (Remove names from below Profile image in
 IM windows)

- removed LLTextBox containing avatar name from IM control panel(panel_im_control_panel.xml) and corresponding code in LLPanelIMControlPanel
---
 indra/newview/skins/default/xui/en/panel_im_control_panel.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index c7e5b25e06..28c4adf67c 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -11,15 +11,6 @@
      name="avatar_icon"
      top="-5"
      width="105"/>
-    <text
-     follows="top|left|right"
-     font="SansSerifLarge"
-     height="19"
-     layout="topleft"
-     name="avatar_name"
-     use_ellipses="true"
-     value="Unknown"
-     width="110" />
     <layout_stack
      mouse_opaque="false"
      border_size="0"
@@ -30,7 +21,7 @@
      left="5"
      name="button_stack"
      orientation="vertical"
-     top_pad="-5"
+     top_pad="5"
      width="105">
         <layout_panel
          mouse_opaque="false"
-- 
cgit v1.2.3


From 0133b3d3f95a6f1c07d695ef9f64d736c15d88e4 Mon Sep 17 00:00:00 2001
From: "Paul Guslisty pguslisty@productengine.com"
 <Paul Guslisty pguslisty@productengine.com>
Date: Thu, 11 Feb 2010 13:55:13 +0200
Subject: Fixed low bug EXT - 5197 (Change default help text in my Picks to
 \"You haven't created any Picks or Classifieds. Click the Plus button below
 to create a Pick or Classified.\")

- Replaced old default help text in settings.xml with new one

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_picks.xml | 1 +
 indra/newview/skins/default/xui/en/strings.xml     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 887a89d518..9ef3649d9c 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -24,6 +24,7 @@ bg_opaque_color="DkGray2"
   layout="topleft"
   left="6"
   name="picks_panel_text"
+  wrap="true"
   top="10"
   width="313"/>
  <accordion
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a5dc14c69d..2112f7f19e 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2129,7 +2129,7 @@ this texture in your inventory
 	<string name="ClassifiedUpdateAfterPublish">(will update after publish)</string>
   
   <!-- panel picks -->
-  <string name="NoPicksClassifiedsText">There are no picks/classifieds here</string>
+  <string name="NoPicksClassifiedsText">You haven't created any Picks or Classifieds. Click the Plus button below to create a Pick or Classified.</string>
   <string name="PicksClassifiedsLoadingText">Loading...</string>
 
 	<!-- Multi Preview Floater -->
-- 
cgit v1.2.3


From c3d262cc6d7cabce1f8eb7b43e8c6fc3a46b8246 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 11 Feb 2010 15:18:10 +0200
Subject: Backed out changeset bc651a97431f. This changeset broke fix for 
 EXT-4212 (There's an ability to send non-latin group notices but they turn to
 '????...' in group profile page.)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_group_notices.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 5f46ad7860..1f16aea2ef 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -159,6 +159,7 @@ Maximum 200 per group daily
          left_pad="3"
          max_length="511"
          name="create_message"
+         text_type="ascii"
          top_delta="0"
          width="220"
          word_wrap="true" />
-- 
cgit v1.2.3


From e747e9a3da3166de88dea1af213a36694135b820 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 11 Feb 2010 22:27:49 +0800
Subject: EXT-4837 [NUX] When filter results in null state, provide a message
 suggesting the user try global search.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 4030c7184a..c6a4233c9c 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -37,7 +37,7 @@ halign="center"
      top_pad="4"
      width="305">
         <inventory_panel
-	border="false"
+	       border="false"
          follows="all"
          height="295"
          label="MY INVENTORY"
@@ -48,7 +48,7 @@ halign="center"
          top="16"
          width="290" />
         <inventory_panel
-	border="false"
+	       border="false"
          follows="all"
          height="295"
          label="RECENT"
@@ -67,7 +67,7 @@ halign="center"
      height="30"
      layout="bottomleft"
      left="0"
-	 visible="true"
+	   visible="true"
      name="bottom_panel"
      width="330">
         <button
@@ -118,7 +118,7 @@ halign="center"
      mouse_opaque="false"
      name="Inventory Menu"
      top="0"
-	 visible="true"
+	   visible="true"
      width="290">
         <menu
          height="101"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 31ea54cf40..446bf0dc6e 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -236,7 +236,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
              layout="topleft"
              left="0"
              name="group_list"
-             no_filtered_groups_msg="No groups"
+             no_filtered_groups_msg="[secondlife:///app/search/groups Try fine the group in search?]"
              no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]"
              top="0"
              width="313" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a5dc14c69d..1a7821e014 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1805,7 +1805,7 @@ Clears (deletes) the media and all params from the given face.
 	<string name="LeaveMouselook">Press ESC to return to World View</string>
 
 	<!-- inventory -->
-	<string name="InventoryNoMatchingItems">No matching items found in inventory.</string>
+	<string name="InventoryNoMatchingItems">[secondlife:///app/search/groups No matching items found in inventory.Try "Search"?]</string>
   <string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
 	<string name="InventoryNoTexture">
 		You do not have a copy of
-- 
cgit v1.2.3


From 0762ebdf9871cc1456a1739103e18f8e8676a6a6 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Thu, 11 Feb 2010 10:13:14 -0500
Subject: Added tool tip to Clear History button.
 https://jira.secondlife.com/browse/EXT-5312

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index f7e3ede93c..f78d90c434 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -17,6 +17,7 @@
      follows="left|bottom"
      height="23"
      label="Clear History"
+     tool_tip="Clear login image, last location, teleport history, web, and texture cache"
      layout="topleft"
      left="30"
      name="clear_cache"
-- 
cgit v1.2.3


From 3684b437a0e1c4c8be6d05e3a5f131265b8f1a39 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 11 Feb 2010 23:30:01 +0800
Subject: EXT-5164 Me->My Inventory opens Inventory floater, not side panel

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index df6c7bd9cb..09d86720f2 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -59,11 +59,11 @@
          name="Inventory"
          shortcut="control|shift|I">
             <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="inventory" />
+             function="SidetrayPanelVisible"
+             parameter="sidepanel_inventory" />
             <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="inventory" />
+             function="ShowSidetrayPanel"
+             parameter="sidepanel_inventory" />
         </menu_item_check>
         <menu_item_call
          label="Show Inventory in Side Tray"
-- 
cgit v1.2.3


From 368c992298ff2af912405449dc05f1b23e5cc622 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 11 Feb 2010 23:43:28 +0800
Subject: EXT-5105 Incorrect keyboard shortcut for Inventory in main menu

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 09d86720f2..95ce6d6ff4 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -57,7 +57,7 @@
          label="My Inventory"
          layout="topleft"
          name="Inventory"
-         shortcut="control|shift|I">
+         shortcut="control|I">
             <menu_item_check.on_check
              function="SidetrayPanelVisible"
              parameter="sidepanel_inventory" />
-- 
cgit v1.2.3