From 89de8e5b552b997335a429ad41f86e4200441b11 Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Mon, 31 Aug 2009 13:26:35 -0700
Subject: Port over the new build scripts from para-test, tweek
 update_version_files to use the repo revision number for now.

---
 indra/newview/English.lproj/InfoPlist.strings | 4 ++--
 indra/newview/Info-SecondLife.plist           | 2 +-
 indra/newview/res/viewerRes.rc                | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 735424c647..28853ba032 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -2,6 +2,6 @@
 
 CFBundleName = "Second Life";
 
-CFBundleShortVersionString = "Second Life version 2.0.0.0";
-CFBundleGetInfoString = "Second Life version 2.0.0.0, Copyright 2004-2009 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 2.0.0.2425";
+CFBundleGetInfoString = "Second Life version 2.0.0.2425, Copyright 2004-2009 Linden Research, Inc.";
 
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 7264044d37..c0a33feaec 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.0.0.0</string>
+	<string>2.0.0.2425</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index 87a8bd5787..a5ee78df2c 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -138,8 +138,8 @@ TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION 2,0,0,2425
+ PRODUCTVERSION 2,0,0,2425
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -156,12 +156,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "2.0.0.0"
+            VALUE "FileVersion", "2.0.0.2425"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright � 2001-2008, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "2.0.0.0"
+            VALUE "ProductVersion", "2.0.0.2425"
         END
     END
     BLOCK "VarFileInfo"
-- 
cgit v1.2.3


From 2149be5df273e4b68bae3c797f26e507bb7951be Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Mon, 31 Aug 2009 17:16:02 -0700
Subject: Attempt to invoke the code signer differently

---
 indra/newview/viewer_manifest.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index ae3b1ba43e..6476e56681 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -395,9 +395,14 @@ class WindowsManifest(ViewerManifest):
         self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
         # self.remove(self.dst_path_of(tempfile))
         # If we're on a build machine, sign the code using our Authenticode certificate. JC
-        sign_py = 'C:\\buildscripts\\code-signing\\sign.py'
+        sign_py = os.path.expandvars("${SIGN}")
+        if not sign_py or sign_py == "${SIGN}":
+            sign_py = 'C:\\buildscripts\\code-signing\\sign.py'
+        python = os.path.expandvars("${PYTHON}")
+        if not python or python == "${PYTHON}":
+            python = 'python'
         if os.path.exists(sign_py):
-            self.run_command(sign_py + ' ' + self.dst_path_of(installer_file))
+            self.run_command("%s %s %s" % (python, sign_py self.dst_path_of(installer_file)))
         else:
             print "Skipping code signing,", sign_py, "does not exist"
         self.created_path(self.dst_path_of(installer_file))
-- 
cgit v1.2.3


From 7eafa3209c6b8a7ef9b7d677943752f5345ff3f2 Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Mon, 31 Aug 2009 18:34:03 -0700
Subject: Fix syntax error in viewer_manifest.py

---
 indra/newview/viewer_manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 6476e56681..66ebd607c4 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -402,7 +402,7 @@ class WindowsManifest(ViewerManifest):
         if not python or python == "${PYTHON}":
             python = 'python'
         if os.path.exists(sign_py):
-            self.run_command("%s %s %s" % (python, sign_py self.dst_path_of(installer_file)))
+            self.run_command("%s %s %s" % (python, sign_py, self.dst_path_of(installer_file)))
         else:
             print "Skipping code signing,", sign_py, "does not exist"
         self.created_path(self.dst_path_of(installer_file))
-- 
cgit v1.2.3


From 1a6be4eb17372273b74fd9b849799372f23a15e9 Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Mon, 31 Aug 2009 20:09:56 -0700
Subject: Quote any backslashes so they get preserved when invoking python.

---
 indra/newview/viewer_manifest.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 66ebd607c4..024f2f655c 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -398,6 +398,8 @@ class WindowsManifest(ViewerManifest):
         sign_py = os.path.expandvars("${SIGN}")
         if not sign_py or sign_py == "${SIGN}":
             sign_py = 'C:\\buildscripts\\code-signing\\sign.py'
+        else:
+            sign_py = sign_py.replace('\\', '\\\\')
         python = os.path.expandvars("${PYTHON}")
         if not python or python == "${PYTHON}":
             python = 'python'
-- 
cgit v1.2.3


From a6ff5974c36f8ea860b2065c549333d8cfc6a458 Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Tue, 1 Sep 2009 09:00:02 -0700
Subject: Also quite the backslashes in the argument for the sign command

---
 indra/newview/viewer_manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 024f2f655c..99c9abfddf 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -404,7 +404,7 @@ class WindowsManifest(ViewerManifest):
         if not python or python == "${PYTHON}":
             python = 'python'
         if os.path.exists(sign_py):
-            self.run_command("%s %s %s" % (python, sign_py, self.dst_path_of(installer_file)))
+            self.run_command("%s %s %s" % (python, sign_py, self.dst_path_of(installer_file).replace('\\', '\\\\')))
         else:
             print "Skipping code signing,", sign_py, "does not exist"
         self.created_path(self.dst_path_of(installer_file))
-- 
cgit v1.2.3


From 359fb947411654e7d345709448db6ff316551d96 Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Tue, 1 Sep 2009 11:04:15 -0700
Subject: Sync up with a number of SVN changes that snuck in via weird merges

---
 indra/newview/da.lproj/language.txt                |   1 +
 indra/newview/es.lproj/language.txt                |   1 +
 indra/newview/featuretable.txt                     |   3 +-
 indra/newview/featuretable_linux.txt               |   2 +-
 indra/newview/featuretable_mac.txt                 |   2 +-
 indra/newview/fr.lproj/language.txt                |   1 +
 indra/newview/hu.lproj/language.txt                |   1 +
 indra/newview/installers/windows/lang_fr.nsi       | Bin 8118 -> 8114 bytes
 indra/newview/it.lproj/language.txt                |   1 +
 indra/newview/llappviewermacosx.h                  |   1 -
 indra/newview/lldrawpoolsky.h                      |   4 -
 indra/newview/nl.lproj/language.txt                |   1 +
 indra/newview/pl.lproj/language.txt                |   1 +
 indra/newview/pt.lproj/language.txt                |   1 +
 indra/newview/ru.lproj/language.txt                |   1 +
 .../skins/default/xui/da/floater_avatar_picker.xml |  47 ++++++++---
 .../skins/default/xui/da/floater_build_options.xml |   4 +-
 .../skins/default/xui/da/floater_bulk_perms.xml    |  44 ++++++++++
 .../skins/default/xui/da/floater_buy_currency.xml  |   2 +-
 .../skins/default/xui/da/floater_font_test.xml     |   6 ++
 .../skins/default/xui/da/floater_inspect.xml       |  18 ++---
 .../skins/default/xui/da/floater_joystick.xml      |  38 ++++-----
 .../skins/default/xui/da/floater_lagmeter.xml      |  16 ++--
 .../skins/default/xui/da/floater_land_holdings.xml |  19 ++---
 .../skins/default/xui/da/floater_lsl_guide.xml     |   2 +-
 .../skins/default/xui/da/floater_perm_prefs.xml    |  16 ++++
 .../default/xui/da/floater_preview_notecard.xml    |  11 ++-
 .../skins/default/xui/da/floater_sound_preview.xml |   2 +-
 .../skins/default/xui/da/floater_statistics.xml    |   2 +
 .../skins/default/xui/da/floater_telehub.xml       |   8 +-
 .../skins/default/xui/da/menu_inventory.xml        |   1 +
 .../newview/skins/default/xui/da/menu_mini_map.xml |   8 ++
 .../skins/default/xui/da/panel_group_general.xml   |  55 ++++++-------
 .../skins/default/xui/da/panel_group_invite.xml    |   9 ++-
 .../default/xui/da/panel_group_land_money.xml      |  46 ++++++-----
 .../skins/default/xui/da/panel_group_roles.xml     |  12 +--
 .../newview/skins/default/xui/da/panel_groups.xml  |   4 +-
 .../skins/default/xui/da/panel_region_covenant.xml |  71 +++++++++++-----
 .../skins/default/xui/da/panel_region_estate.xml   |   2 +-
 .../skins/default/xui/da/panel_region_general.xml  |  73 ++++++++++-------
 .../skins/default/xui/da/panel_region_terrain.xml  |   4 +-
 .../skins/default/xui/da/teleport_strings.xml      |  25 +++---
 .../skins/default/xui/de/floater_mute_object.xml   |   4 +-
 .../skins/default/xui/en/widgets/filter_editor.xml |  16 ++--
 .../skins/default/xui/en/widgets/list_view.xml     |  12 +--
 .../skins/default/xui/en/widgets/split_button.xml  |  48 +++++------
 .../skins/default/xui/es/floater_about_land.xml    |  26 +++---
 .../skins/default/xui/es/floater_avatar_picker.xml |   8 +-
 .../skins/default/xui/es/floater_build_options.xml |   6 +-
 .../skins/default/xui/es/floater_buy_contents.xml  |   2 +-
 .../skins/default/xui/es/floater_buy_currency.xml  |  12 +--
 .../skins/default/xui/es/floater_color_picker.xml  |   3 +-
 .../default/xui/es/floater_day_cycle_options.xml   |  12 +--
 .../skins/default/xui/es/floater_env_settings.xml  |  15 ++--
 .../skins/default/xui/es/floater_gesture.xml       |   5 +-
 .../skins/default/xui/es/floater_inspect.xml       |  10 +--
 .../xui/es/floater_inventory_view_finder.xml       |  10 +--
 .../skins/default/xui/es/floater_lagmeter.xml      |  13 +--
 .../skins/default/xui/es/floater_land_holdings.xml |   2 +-
 .../default/xui/es/floater_live_lsleditor.xml      |   4 +-
 .../skins/default/xui/es/floater_lsl_guide.xml     |   4 +-
 .../skins/default/xui/es/floater_media_browser.xml |   9 ++-
 .../skins/default/xui/es/floater_mute_object.xml   |   7 +-
 indra/newview/skins/default/xui/es/floater_pay.xml |   9 ++-
 .../skins/default/xui/es/floater_pay_object.xml    |  10 +--
 .../skins/default/xui/es/floater_preferences.xml   |   5 +-
 .../default/xui/es/floater_preview_animation.xml   |   4 +-
 .../skins/default/xui/es/floater_script_search.xml |  16 ++--
 .../skins/default/xui/es/floater_select_key.xml    |   2 +-
 .../skins/default/xui/es/floater_telehub.xml       |  18 +++--
 .../skins/default/xui/es/floater_texture_ctrl.xml  |   4 +-
 .../newview/skins/default/xui/es/floater_tools.xml |  68 ++++++++--------
 .../skins/default/xui/es/floater_top_objects.xml   |  21 ++---
 .../skins/default/xui/es/floater_url_entry.xml     |   3 +-
 .../newview/skins/default/xui/es/floater_water.xml |  22 ++---
 .../default/xui/es/floater_windlight_options.xml   |  20 ++---
 .../skins/default/xui/es/panel_group_general.xml   |  12 +--
 .../skins/default/xui/es/panel_group_invite.xml    |  17 ++--
 .../default/xui/es/panel_group_land_money.xml      |  15 ++--
 .../skins/default/xui/es/panel_group_notices.xml   |  17 ++--
 .../skins/default/xui/es/panel_group_roles.xml     |  46 ++++++-----
 .../newview/skins/default/xui/es/panel_groups.xml  |   8 +-
 .../skins/default/xui/es/panel_region_covenant.xml |  10 ++-
 .../skins/default/xui/es/panel_region_debug.xml    |  16 ++--
 .../skins/default/xui/es/panel_region_estate.xml   |  16 ++--
 .../skins/default/xui/es/panel_region_general.xml  |  10 +--
 .../skins/default/xui/es/panel_region_terrain.xml  |  16 ++--
 .../skins/default/xui/es/panel_region_texture.xml  |   2 +-
 .../skins/default/xui/fr/floater_customize.xml     |  22 ++---
 .../skins/default/xui/fr/floater_inventory.xml     |   4 +-
 .../xui/fr/floater_inventory_view_finder.xml       |   8 +-
 .../skins/default/xui/fr/floater_mem_leaking.xml   |   6 +-
 .../skins/default/xui/it/floater_about_land.xml    |   6 +-
 .../skins/default/xui/it/floater_avatar_picker.xml |   8 +-
 .../skins/default/xui/it/floater_build_options.xml |   6 +-
 .../skins/default/xui/it/floater_buy_contents.xml  |   6 +-
 .../skins/default/xui/it/floater_buy_currency.xml  |   6 +-
 .../default/xui/it/floater_day_cycle_options.xml   |  30 +++----
 .../skins/default/xui/it/floater_env_settings.xml  |  14 ++--
 .../skins/default/xui/it/floater_gesture.xml       |  11 +--
 .../skins/default/xui/it/floater_inspect.xml       |  10 +--
 .../xui/it/floater_inventory_view_finder.xml       |   2 +-
 .../skins/default/xui/it/floater_joystick.xml      |  49 ++++++------
 .../skins/default/xui/it/floater_lagmeter.xml      |  17 ++--
 .../skins/default/xui/it/floater_land_holdings.xml |  10 +--
 .../default/xui/it/floater_live_lsleditor.xml      |   4 +-
 .../skins/default/xui/it/floater_lsl_guide.xml     |   4 +-
 .../skins/default/xui/it/floater_media_browser.xml |   9 ++-
 .../skins/default/xui/it/floater_mute_object.xml   |   6 +-
 indra/newview/skins/default/xui/it/floater_pay.xml |  21 ++---
 .../skins/default/xui/it/floater_pay_object.xml    |  23 +++---
 .../skins/default/xui/it/floater_preferences.xml   |   3 +-
 .../default/xui/it/floater_preview_animation.xml   |   4 +-
 .../skins/default/xui/it/floater_script_search.xml |  16 ++--
 .../skins/default/xui/it/floater_telehub.xml       |  18 +++--
 .../skins/default/xui/it/floater_top_objects.xml   |  31 +++----
 .../skins/default/xui/it/floater_url_entry.xml     |   4 +-
 .../newview/skins/default/xui/it/floater_water.xml |  44 +++++-----
 .../default/xui/it/floater_windlight_options.xml   |  32 ++++----
 .../newview/skins/default/xui/it/panel_friends.xml |   2 +-
 .../skins/default/xui/it/panel_group_general.xml   |   2 +-
 .../skins/default/xui/it/panel_group_invite.xml    |   4 +-
 .../default/xui/it/panel_group_land_money.xml      |  23 +++---
 .../skins/default/xui/it/panel_group_notices.xml   |  31 ++++---
 .../skins/default/xui/it/panel_group_roles.xml     |  44 +++++-----
 .../newview/skins/default/xui/it/panel_groups.xml  |  10 ++-
 .../skins/default/xui/it/panel_region_covenant.xml |  30 ++++---
 .../skins/default/xui/it/panel_region_debug.xml    |  12 +--
 .../skins/default/xui/it/panel_region_estate.xml   |  16 ++--
 .../skins/default/xui/it/panel_region_general.xml  |  22 ++---
 .../skins/default/xui/it/panel_region_terrain.xml  |   8 +-
 .../skins/default/xui/it/panel_region_texture.xml  |   6 +-
 .../skins/default/xui/it/teleport_strings.xml      |  18 ++---
 .../skins/default/xui/ja/floater_buy_contents.xml  |  13 +--
 .../default/xui/ja/floater_wearable_save_as.xml    |   2 +-
 .../default/xui/ja/panel_group_land_money.xml      |   3 +-
 .../skins/default/xui/nl/floater_about_land.xml    |  12 +--
 .../skins/default/xui/nl/floater_buy_contents.xml  |   2 +-
 .../skins/default/xui/nl/floater_color_picker.xml  |   5 +-
 .../skins/default/xui/nl/floater_env_settings.xml  |   7 +-
 .../skins/default/xui/nl/floater_inspect.xml       |   8 +-
 .../skins/default/xui/nl/floater_joystick.xml      |  11 +--
 .../skins/default/xui/nl/floater_mute_object.xml   |   8 +-
 .../skins/default/xui/nl/floater_openobject.xml    |   4 +-
 indra/newview/skins/default/xui/nl/floater_pay.xml |   4 +-
 .../skins/default/xui/nl/floater_pay_object.xml    |  12 +--
 .../skins/default/xui/nl/floater_perm_prefs.xml    |   2 +-
 .../skins/default/xui/nl/floater_select_key.xml    |   4 +-
 .../skins/default/xui/nl/floater_telehub.xml       |  16 +++-
 .../skins/default/xui/nl/floater_texture_ctrl.xml  |   6 +-
 .../newview/skins/default/xui/nl/floater_tools.xml |  86 ++++++++++----------
 .../skins/default/xui/nl/floater_top_objects.xml   |  26 +++---
 .../skins/default/xui/nl/floater_url_entry.xml     |   4 +-
 .../newview/skins/default/xui/nl/floater_water.xml |   5 +-
 .../newview/skins/default/xui/nl/panel_friends.xml |  12 +--
 .../skins/default/xui/nl/panel_group_general.xml   |  19 ++---
 .../skins/default/xui/nl/panel_group_invite.xml    |   9 ++-
 .../skins/default/xui/nl/panel_group_notices.xml   |  24 ++++--
 .../skins/default/xui/nl/panel_group_roles.xml     |  34 +++++---
 .../newview/skins/default/xui/nl/panel_groups.xml  |  14 ++--
 .../skins/default/xui/nl/panel_region_estate.xml   |  16 ++--
 .../skins/default/xui/nl/panel_region_general.xml  |   4 +-
 .../skins/default/xui/pl/floater_joystick.xml      |  89 +++++++++++----------
 .../skins/default/xui/pl/floater_preview_sound.xml |   2 +-
 .../skins/default/xui/pl/floater_telehub.xml       |   4 +-
 .../newview/skins/default/xui/pl/floater_tools.xml |  30 +++----
 .../skins/default/xui/pt/floater_about_land.xml    |   6 +-
 .../skins/default/xui/pt/floater_avatar_picker.xml |  12 +--
 .../skins/default/xui/pt/floater_build_options.xml |   6 +-
 .../skins/default/xui/pt/floater_buy_contents.xml  |   6 +-
 .../skins/default/xui/pt/floater_color_picker.xml  |   6 +-
 .../default/xui/pt/floater_day_cycle_options.xml   |  28 +++----
 .../skins/default/xui/pt/floater_env_settings.xml  |  12 +--
 .../skins/default/xui/pt/floater_inspect.xml       |  10 +--
 .../xui/pt/floater_inventory_view_finder.xml       |   6 +-
 .../skins/default/xui/pt/floater_joystick.xml      |  41 +++++-----
 .../skins/default/xui/pt/floater_lagmeter.xml      |  13 +--
 .../skins/default/xui/pt/floater_land_holdings.xml |  10 +--
 .../default/xui/pt/floater_live_lsleditor.xml      |   2 +-
 .../skins/default/xui/pt/floater_lsl_guide.xml     |   4 +-
 .../skins/default/xui/pt/floater_mute_object.xml   |   5 +-
 indra/newview/skins/default/xui/pt/floater_pay.xml |   2 +-
 .../skins/default/xui/pt/floater_preferences.xml   |   3 +-
 .../skins/default/xui/pt/floater_preview_sound.xml |   4 +-
 .../skins/default/xui/pt/floater_script_search.xml |  16 ++--
 .../skins/default/xui/pt/floater_telehub.xml       |  18 +++--
 .../newview/skins/default/xui/pt/floater_tools.xml |  61 +++++++-------
 .../skins/default/xui/pt/floater_top_objects.xml   |  13 +--
 .../skins/default/xui/pt/floater_url_entry.xml     |   1 +
 .../newview/skins/default/xui/pt/floater_water.xml |  23 +++---
 .../default/xui/pt/floater_windlight_options.xml   |  23 +++---
 .../newview/skins/default/xui/pt/panel_friends.xml |  12 +--
 .../skins/default/xui/pt/panel_group_general.xml   |   6 +-
 .../skins/default/xui/pt/panel_group_invite.xml    |  10 +--
 .../default/xui/pt/panel_group_land_money.xml      |  11 +--
 .../skins/default/xui/pt/panel_group_notices.xml   |  21 +++--
 .../skins/default/xui/pt/panel_group_roles.xml     |  45 ++++++-----
 .../newview/skins/default/xui/pt/panel_groups.xml  |  17 ++--
 .../skins/default/xui/pt/panel_region_covenant.xml |  20 +++--
 .../skins/default/xui/pt/panel_region_debug.xml    |  10 +--
 .../skins/default/xui/pt/panel_region_estate.xml   |   4 +-
 .../skins/default/xui/pt/panel_region_terrain.xml  |  10 +--
 .../skins/default/xui/pt/panel_region_texture.xml  |   2 +-
 indra/newview/tr.lproj/language.txt                |   1 +
 indra/newview/uk.lproj/language.txt                |   1 +
 indra/newview/zh-Hans.lproj/language.txt           |   1 +
 206 files changed, 1572 insertions(+), 1270 deletions(-)
 create mode 100644 indra/newview/da.lproj/language.txt
 create mode 100644 indra/newview/es.lproj/language.txt
 create mode 100644 indra/newview/fr.lproj/language.txt
 create mode 100644 indra/newview/hu.lproj/language.txt
 create mode 100644 indra/newview/it.lproj/language.txt
 create mode 100644 indra/newview/nl.lproj/language.txt
 create mode 100644 indra/newview/pl.lproj/language.txt
 create mode 100644 indra/newview/pt.lproj/language.txt
 create mode 100644 indra/newview/ru.lproj/language.txt
 create mode 100644 indra/newview/skins/default/xui/da/floater_bulk_perms.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_font_test.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_perm_prefs.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_statistics.xml
 create mode 100644 indra/newview/skins/default/xui/da/menu_mini_map.xml
 create mode 100644 indra/newview/tr.lproj/language.txt
 create mode 100644 indra/newview/uk.lproj/language.txt
 create mode 100644 indra/newview/zh-Hans.lproj/language.txt

(limited to 'indra/newview')

diff --git a/indra/newview/da.lproj/language.txt b/indra/newview/da.lproj/language.txt
new file mode 100644
index 0000000000..316d25d903
--- /dev/null
+++ b/indra/newview/da.lproj/language.txt
@@ -0,0 +1 @@
+da
\ No newline at end of file
diff --git a/indra/newview/es.lproj/language.txt b/indra/newview/es.lproj/language.txt
new file mode 100644
index 0000000000..6c4381495c
--- /dev/null
+++ b/indra/newview/es.lproj/language.txt
@@ -0,0 +1 @@
+es
\ No newline at end of file
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 05bdf64b42..d557df3d92 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 19
+version 20
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -245,6 +245,7 @@ RenderVBOEnable				1	0
 list Intel
 RenderAnisotropic			1	0
 RenderLightingDetail		1	0
+RenderUseImpostors			0	0
 
 list GeForce2
 RenderAnisotropic			1	0
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 09105b8d88..57d712ede7 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -1,4 +1,4 @@
-version 19
+version 20
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index fd2496d8ad..15974c0691 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 19
+version 20
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
diff --git a/indra/newview/fr.lproj/language.txt b/indra/newview/fr.lproj/language.txt
new file mode 100644
index 0000000000..717280ac26
--- /dev/null
+++ b/indra/newview/fr.lproj/language.txt
@@ -0,0 +1 @@
+fr
\ No newline at end of file
diff --git a/indra/newview/hu.lproj/language.txt b/indra/newview/hu.lproj/language.txt
new file mode 100644
index 0000000000..6c604cf2a9
--- /dev/null
+++ b/indra/newview/hu.lproj/language.txt
@@ -0,0 +1 @@
+hu
\ No newline at end of file
diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi
index d23615de91..008c240ed7 100644
Binary files a/indra/newview/installers/windows/lang_fr.nsi and b/indra/newview/installers/windows/lang_fr.nsi differ
diff --git a/indra/newview/it.lproj/language.txt b/indra/newview/it.lproj/language.txt
new file mode 100644
index 0000000000..c91971434c
--- /dev/null
+++ b/indra/newview/it.lproj/language.txt
@@ -0,0 +1 @@
+it
\ No newline at end of file
diff --git a/indra/newview/llappviewermacosx.h b/indra/newview/llappviewermacosx.h
index 0928916a57..bc841fc3a7 100644
--- a/indra/newview/llappviewermacosx.h
+++ b/indra/newview/llappviewermacosx.h
@@ -55,7 +55,6 @@ protected:
 	virtual void handleSyncCrashTrace();
 
 	std::string generateSerialNumber();
-	virtual bool initLogging();
 	virtual bool initParseCommandLine(LLCommandLineParser& clp);
 };
 
diff --git a/indra/newview/lldrawpoolsky.h b/indra/newview/lldrawpoolsky.h
index f35b114730..8595d73aee 100644
--- a/indra/newview/lldrawpoolsky.h
+++ b/indra/newview/lldrawpoolsky.h
@@ -36,14 +36,12 @@
 #include "lldrawpool.h"
 
 class LLSkyTex;
-class LLHeavenBody;
 class LLGLSLShader;
 
 class LLDrawPoolSky : public LLFacePool
 {
 private:
 	LLSkyTex			*mSkyTex;
-	LLHeavenBody		*mHB[2]; // Sun and Moon
 	LLGLSLShader		*mShader;
 
 public:
@@ -69,8 +67,6 @@ public:
 	/*virtual*/ void renderForSelect();
 	/*virtual*/ void endRenderPass(S32 pass);
 	void setSkyTex(LLSkyTex* const st) { mSkyTex = st; }
-	void setSun(LLHeavenBody* sun_flag) { mHB[0] = sun_flag; }
-	void setMoon(LLHeavenBody* moon) { mHB[1] = moon; }
 
 	void renderSkyCubeFace(U8 side);
 	void renderHeavenlyBody(U8 hb, LLFace* face);
diff --git a/indra/newview/nl.lproj/language.txt b/indra/newview/nl.lproj/language.txt
new file mode 100644
index 0000000000..d5f5c2a19c
--- /dev/null
+++ b/indra/newview/nl.lproj/language.txt
@@ -0,0 +1 @@
+nl
\ No newline at end of file
diff --git a/indra/newview/pl.lproj/language.txt b/indra/newview/pl.lproj/language.txt
new file mode 100644
index 0000000000..55239f3c18
--- /dev/null
+++ b/indra/newview/pl.lproj/language.txt
@@ -0,0 +1 @@
+pl
\ No newline at end of file
diff --git a/indra/newview/pt.lproj/language.txt b/indra/newview/pt.lproj/language.txt
new file mode 100644
index 0000000000..9e3340eca2
--- /dev/null
+++ b/indra/newview/pt.lproj/language.txt
@@ -0,0 +1 @@
+pt
\ No newline at end of file
diff --git a/indra/newview/ru.lproj/language.txt b/indra/newview/ru.lproj/language.txt
new file mode 100644
index 0000000000..adc719b423
--- /dev/null
+++ b/indra/newview/ru.lproj/language.txt
@@ -0,0 +1 @@
+ru
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
index d2c8f3a003..f93f0a3525 100644
--- a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
@@ -1,15 +1,40 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatarpicker" title="Vælg beboer">
-	<text name="instruct_search_resident_name">
-		Skriv en del eller hele navnet på beboeren:
-	</text>
-	<button label="Find" label_selected="Find" name="Find" />
-	<text name="Or select their calling card:">
-		Eller vælg deres visitkort:
-	</text>
-	<button label="Luk" label_selected="Luk" name="Close" />
-	<button label="Vælg" label_selected="Vælg" name="Select" />
-	<string name="NotFound">
+	<tab_container name="ResidentChooserTabs">
+		<panel label="Søg" name="SearchPanel">
+			<text name="InstructSearchResidentName">
+				Indtast en del af beboerens navn:
+			</text>
+			<button label="Find" label_selected="Find" name="Find"/>
+		</panel>
+		<panel label="Visitkort" name="CallingCardsPanel">
+			<text name="InstructSelectCallingCard">
+				Vælg et visitkort:
+			</text>
+		</panel>
+		<panel label="Nær ved mig" name="NearMePanel">
+			<text name="InstructSelectResident">
+				Vælg beboere i nærheden:
+			</text>
+			<button label="Gentegn liste" label_selected="Gentegn liste" name="Refresh"/>
+			<slider label="Område" name="near_me_range"/>
+			<text name="meters">
+				meter
+			</text>
+		</panel>
+	</tab_container>
+	<button label="Vælg" label_selected="Vælg" name="Select"/>
+	<button label="Annullér" label_selected="Annullér" name="Cancel"/>
+	<string name="not_found">
 		&apos;[TEXT]&apos; ikke fundet
 	</string>
+	<string name="no_one_near">
+		Ingen i nærheden
+	</string>
+	<string name="no_results">
+		Ingen resultater
+	</string>
+	<string name="searching">
+		Søger...
+	</string>
 </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 7e5b61bd84..3b3e14ad64 100644
--- a/indra/newview/skins/default/xui/da/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/da/floater_build_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="build options floater" title="Gitter indstillinger">
-	<spinner label="Gitter enhed (meter)" name="GridResolution" />
-	<spinner label="Gitter rækkevidde (meter)" name="GridDrawSize" />
+	<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" />
diff --git a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
new file mode 100644
index 0000000000..77ae7fe060
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterbulkperms" title="Masse-ændring af rettigheder på indhold">
+	<text name="applyto">
+		Indholdstyper
+	</text>
+	<check_box label="Animationer" name="check_animation"/>
+	<check_box label="Kropsdele" name="check_bodypart"/>
+	<check_box label="Tøj" name="check_clothing"/>
+	<check_box label="Bevægelser" name="check_gesture"/>
+	<check_box label="Landemærker" name="check_landmark"/>
+	<check_box label="Noter" name="check_notecard"/>
+	<check_box label="Objekter" name="check_object"/>
+	<check_box label="Scripts" name="check_script"/>
+	<check_box label="Lyde" name="check_sound"/>
+	<check_box label="Teksturer" name="check_texture"/>
+	<button label="Vælg alle" label_selected="Alle" name="check_all"/>
+	<button label="Fravælg alle" label_selected="Ingen" name="check_none"/>
+	<text name="newperms">
+		Nye rettigheder
+	</text>
+	<check_box label="Del med gruppe" name="share_with_group"/>
+	<check_box label="Tillad enhver at kopiere" name="everyone_copy"/>
+	<text name="NextOwnerLabel">
+		Næste ejer kan:
+	</text>
+	<check_box label="Redigere" name="next_owner_modify"/>
+	<check_box label="Kopiére" name="next_owner_copy"/>
+	<check_box label="Sælge/Give væk" name="next_owner_transfer"/>
+	<button label="Hjælp" name="help"/>
+	<button label="Gem" name="apply"/>
+	<button label="Luk" name="close"/>
+	<string name="nothing_to_modify_text">
+		Valgte indeholder ikke noget som kan redigeres.
+	</string>
+	<string name="status_text">
+		Sætter rettigheder på [NAME]
+	</string>
+	<string name="start_text">
+		Påbegynder forespørgsel på rettighedsændringer...
+	</string>
+	<string name="done_text">
+		Afsluttet forespørgsel på rettighedsændringer.
+	</string>
+</floater>
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 da2e7dbd66..1c5876572b 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
@@ -63,6 +63,6 @@ og prøv igen.
 	<button label="Annullér" name="cancel_btn" />
 	<button label="Køb" name="buy_btn" />
 	<string name="buy_currency">
-		Buy L$ [LINDENS] for approx. US$ [USD]
+		Køb L$ [LINDENS] for ca. US$ [USD]
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_font_test.xml b/indra/newview/skins/default/xui/da/floater_font_test.xml
new file mode 100644
index 0000000000..7d8ef1b310
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_font_test.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="contents" title="Font test">
+	<text name="linea">
+		OverrideTest, skal vises her som fonten &apos;Times&apos;. (Fra default/xui/en-us)
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_inspect.xml b/indra/newview/skins/default/xui/da/floater_inspect.xml
index 8361733e23..56c3f6f784 100644
--- a/indra/newview/skins/default/xui/da/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/da/floater_inspect.xml
@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="inspect" >
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="inspect" title="Inspecér objekter">
 	<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" />
+		<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>
-	<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" />
+	<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"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_joystick.xml b/indra/newview/skins/default/xui/da/floater_joystick.xml
index 72439ac4e0..7a4d570f85 100644
--- a/indra/newview/skins/default/xui/da/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/da/floater_joystick.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Joystick" title="Joystick opsætning">
 	<check_box name="enable_joystick">
 		Aktiver Joystick:
 	</check_box>
-	<spinner label="X akse mapping" name="JoystickAxis1" />
-	<spinner label="Y akse mapping" name="JoystickAxis2" />
-	<spinner label="Z akse mapping" name="JoystickAxis0" />
-	<spinner label="Hældning mapping" name="JoystickAxis4" />
-	<spinner label="Drejning mapping" name="JoystickAxis5" />
-	<spinner label="Rulning mapping" name="JoystickAxis3" />
-	<spinner label="Zoom mapping" name="JoystickAxis6" />
-	<check_box label="Direkte zoom" name="ZoomDirect" />
-	<check_box label="3D Cursor" name="Cursor3D" />
-	<check_box label="Auto opret" name="AutoLeveling" />
-	<text type="string" length="1" name="Control Modes:">
+	<spinner label="X akse mapping" name="JoystickAxis1"/>
+	<spinner label="Y akse mapping" name="JoystickAxis2"/>
+	<spinner label="Z akse mapping" name="JoystickAxis0"/>
+	<spinner label="Hældning mapping" name="JoystickAxis4"/>
+	<spinner label="Drejning mapping" name="JoystickAxis5"/>
+	<spinner label="Rulning mapping" name="JoystickAxis3"/>
+	<spinner label="Zoom mapping" name="JoystickAxis6"/>
+	<check_box label="Direkte zoom" name="ZoomDirect"/>
+	<check_box label="3D Cursor" name="Cursor3D"/>
+	<check_box label="Auto opret" name="AutoLeveling"/>
+	<text length="1" name="Control Modes:" type="string">
 		Kontrollér:
 	</text>
 	<check_box name="JoystickAvatarEnabled">
@@ -64,18 +64,20 @@
 	<text name="Feathering">
 		Respons
 	</text>
-	<slider label="" name="AvatarFeathering" />
-	<slider label="" name="BuildFeathering" />
-	<slider label="" name="FlycamFeathering" />
+	<slider label="" name="AvatarFeathering"/>
+	<slider label="" name="BuildFeathering"/>
+	<slider label="" name="FlycamFeathering"/>
 	<text name="ZoomScale2">
 		Zoom følsomhed
 	</text>
-	<spinner label="" name="FlycamAxisScale6" />
+	<spinner label="" name="FlycamAxisScale6"/>
 	<text name="ZoomDeadZone">
 		Zoom min. udslag
 	</text>
-	<spinner label="" name="FlycamAxisDeadZone6" />
-	<button label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults" />
+	<spinner label="" name="FlycamAxisDeadZone6"/>
+	<button label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults"/>
+	<button label="OK" label_selected="OK" name="ok_btn"/>
+	<button label="Annullér" label_selected="Annullér" name="cancel_btn"/>
 	<string name="JoystickMonitor">
 		Joystick Overvågning
 	</string>
diff --git a/indra/newview/skins/default/xui/da/floater_lagmeter.xml b/indra/newview/skins/default/xui/da/floater_lagmeter.xml
index b2cbebfe52..7e7c2dc0d3 100644
--- a/indra/newview/skins/default/xui/da/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/da/floater_lagmeter.xml
@@ -1,29 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_lagmeter" title="Lag måler">
-	<button label="" label_selected="" name="client_lagmeter" />
+	<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" />
+	<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" />
+	<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" />
+	<button label="?" name="server_help"/>
+	<button label="&gt;&gt;" name="minimize"/>
 	<string name="max_title_msg">
 		Lag måler
 	</string>
@@ -126,9 +125,6 @@
 	<string name="server_frame_time_normal_msg">
 		Normal
 	</string>
-	<string name="server_frame_time_normal_msg">
-		Normal
-	</string>
 	<string name="server_physics_cause_msg">
 		Mulig årsag: For mange fysiske objekter
 	</string>
diff --git a/indra/newview/skins/default/xui/da/floater_land_holdings.xml b/indra/newview/skins/default/xui/da/floater_land_holdings.xml
index fcb159664c..bd623e7b75 100644
--- a/indra/newview/skins/default/xui/da/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/da/floater_land_holdings.xml
@@ -1,19 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="land holdings floater" title="Mit land">
 	<scroll_list name="parcel list">
-		<column label="Navn" name="name" />
-		<column label="Lokation" name="location" />
-		<column label="Område" name="area" />
-		<column label="" name="hidden" />
+		<column label="Navn" 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="Teleport" label_selected="Teleport" name="Teleport"  />
-	<button label="Vis på kort" label_selected="Vis på kort" name="Show on Map"  />
+	<button label="Teleport" label_selected="Teleport" name="Teleport" tool_tip="Teleport til centrum på dette land."/>
+	<button label="Vis på kort" label_selected="Vis på kort" name="Show on Map" tool_tip="Vis dette land på verdenskortet."/>
 	<text name="contrib_label">
 		Bidrag til dine grupper:
 	</text>
 	<scroll_list name="grant list">
-		<column label="Gruppe" name="group" />
-		<column label="Område" name="area" />
+		<column label="Gruppe" name="group"/>
+		<column label="Område" name="area"/>
 	</scroll_list>
 	<text name="allowed_label">
 		Tilladt land ifølge nuværende betalingsaftale:
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 07ea6930ea..d345409859 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" ?>
 <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" />
+	<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" />
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_perm_prefs.xml b/indra/newview/skins/default/xui/da/floater_perm_prefs.xml
new file mode 100644
index 0000000000..f4b9b0a664
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_perm_prefs.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="perm prefs" title="Standard tilladelser ved hentning">
+	<panel label="Tilladelser" name="permissions">
+		<button label="?" label_selected="?" name="help"/>
+		<check_box label="Del med gruppe" name="share_with_group"/>
+		<check_box label="Tillad enhver at kopiere" name="everyone_copy"/>
+		<text name="NextOwnerLabel">
+			Næste ejer kan:
+		</text>
+		<check_box label="Redigere" name="next_owner_modify"/>
+		<check_box label="Kopiére" name="next_owner_copy"/>
+		<check_box label="Sælge/Give væk" name="next_owner_transfer"/>
+	</panel>
+	<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_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
index c9bee41b6a..169172222f 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview notecard" title="Note:">
-	<button label="Gem" label_selected="Gem" name="Save" />
-	<text type="string" length="1" name="desc txt">
+	<button label="Gem" label_selected="Gem" name="Save"/>
+	<text length="1" name="desc txt" type="string">
 		Beskrivelse:
 	</text>
-	<text_editor type="string" length="1" name="Notecard Editor">
+	<text_editor length="1" name="Notecard Editor" type="string">
 		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>
diff --git a/indra/newview/skins/default/xui/da/floater_sound_preview.xml b/indra/newview/skins/default/xui/da/floater_sound_preview.xml
index c0d2f76ea9..606d290e1d 100644
--- a/indra/newview/skins/default/xui/da/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_sound_preview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Name/Description" title="sound.wav">
+<floater name="Sound Preview" title="sound.wav">
 	<text name="name_label">
 		Navn:
 	</text>
diff --git a/indra/newview/skins/default/xui/da/floater_statistics.xml b/indra/newview/skins/default/xui/da/floater_statistics.xml
new file mode 100644
index 0000000000..0443553d50
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_statistics.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="stats floater" title="Statistik"/>
diff --git a/indra/newview/skins/default/xui/da/floater_telehub.xml b/indra/newview/skins/default/xui/da/floater_telehub.xml
index 32c5448508..cd1fb33831 100644
--- a/indra/newview/skins/default/xui/da/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/da/floater_telehub.xml
@@ -14,15 +14,15 @@
 	</text>
 	<button label="Forbind telehub" name="connect_btn" />
 	<button label="Afslut" name="disconnect_btn" />
-	<text name="spawn_points_text">
+	<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" />
 	<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 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/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml
index 2c47703ef2..fd5ebe5c82 100644
--- a/indra/newview/skins/default/xui/da/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory.xml
@@ -55,6 +55,7 @@
 	<menu_item_call label="Aktivér" name="Activate" />
 	<menu_item_call label="Deaktivér" name="Deactivate" />
 	<menu_item_call label="Tag af dig selv" name="Detach From Yourself" />
+	<menu_item_call label="Tilbage til sidste position" name="Restore to Last Position"/>
 	<menu_item_call label="Tag på" name="Object Wear" />
 	<menu label="Vedhæft" name="Attach To" />
 	<menu label="Vedhæft til HUD" name="Attach To HUD" />
diff --git a/indra/newview/skins/default/xui/da/menu_mini_map.xml b/indra/newview/skins/default/xui/da/menu_mini_map.xml
new file mode 100644
index 0000000000..2a711dc5be
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_mini_map.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="popup">
+	<menu_item_call label="Zoom tæt" name="Zoom Close"/>
+	<menu_item_call label="Zoom mellem" name="Zoom Medium"/>
+	<menu_item_call label="Zoom langt" name="Zoom Far"/>
+	<menu_item_call label="Stop Tracking" name="Stop Tracking"/>
+	<menu_item_call label="Profil..." name="Profile"/>
+</menu>
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 393ac49725..4281ec6792 100644
--- a/indra/newview/skins/default/xui/da/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_general.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="Generelt" name="general_tab">
 	<string name="help_text">
 		Generel-fanen indeholder generel information om
@@ -10,28 +10,26 @@ Bevæg din mus over mulighederne for mere hjælp.
 	<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" />
+	<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">
+	<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" />
+	<texture_picker label="Gruppe distinktioner" name="insignia" tool_tip="Klik for at vælge et billede"/>
 	<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" />
+	<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>
@@ -39,34 +37,37 @@ Bevæg din mus over mulighederne for mere hjælp.
 		(Ejere er vist med fed skrift)
 	</text>
 	<name_list name="visible_members">
-		<column label="Medlemsnavn" name="name" />
-		<column label="Titel" name="title" />
-		<column label="Senest på d." name="online" />
+		<column label="Medlemsnavn" name="name"/>
+		<column label="Titel" name="title"/>
+		<column label="Senest på d." name="online"/>
 	</name_list>
 	<text name="text_group_preferences">
 		Gruppeindstillinger
 	</text>
 	<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: L$" 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." />
-
+		<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: L$" 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"/>
+		<combo_box name="group_mature_check" tool_tip="Angiver om din gruppes information anses som &apos;mature&apos;." width="150">
+			<combo_item name="select_mature">
+				- Vælg indholdsrating -
+			</combo_item>
+			<combo_item name="mature">
+				Mature indhold
+			</combo_item>
+			<combo_item name="pg">
+				PG indhold
+			</combo_item>
+		</combo_box>
 		<panel name="title_container">
 			<text name="active_title_label">
 				Min aktive titel
 			</text>
-			<combo_box length="150" name="active_title"
-			     tool_tip="Angiver den titel der vises i din avatars navnefelt, når denne gruppe er aktiv." />
+			<combo_box length="150" 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 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>
 	<string name="incomplete_member_data_str">
 		Henter medlemsinformationer
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 6efc93daac..813007aee0 100644
--- a/indra/newview/skins/default/xui/da/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_invite.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Invitér et medlem" name="invite_panel">
 	<text name="help_text">
-		Du kan invitere flere beboere til at 
-blive medlem af din gruppe. Klik &apos;Åben  
-personvælger&apos; for at begynde.
+		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" />
+	<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"
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 2ab8935609..029922c413 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,10 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?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.
+		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.
 	</string>
-	<button label="?" name="help_button" />
+	<button label="?" name="help_button"/>
 	<string name="cant_view_group_land_text">
 		Du har ikke tilladelse til at se gruppeejet land.
 	</string>
@@ -18,29 +17,30 @@ bidrag. Planlægning, detaljer og salgsfaneblade viser information om gruppens 
 		Gruppeejet land
 	</text>
 	<scroll_list name="group_parcel_list">
-		<column label="Grundens navn" name="name" />
-		<column label="Region" name="location" />
-		<column label="Område" name="area" />
-		<column label="" name="hidden" />
+		<column label="Grundens navn" 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="Vis på kort" label_selected="Vis på kort" name="map_button"/>
 	<text name="total_contributed_land_label">
 		Total bidrag:
 	</text>
 	<text name="total_contributed_land_value">
-		[AREA] kvadratmeter
+		[AREA] m²
 	</text>
 	<text name="total_land_in_use_label">
 		Total land i brug:
 	</text>
 	<text name="total_land_in_use_value">
-		[AREA] kvadratmeter
+		[AREA] m²
 	</text>
 	<text name="land_available_label">
 		Tilgængeligt land:
 	</text>
 	<text name="land_available_value">
-		[AREA] kvadratmeter
+		[AREA] m²
 	</text>
 	<text name="your_contribution_label">
 		Dit bidrag:
@@ -49,32 +49,34 @@ bidrag. Planlægning, detaljer og salgsfaneblade viser information om gruppens 
 		Ikke muligt at lave dit bidrag til landet.
 	</string>
 	<text name="your_contribution_max_value">
-		kvadratmeter ([AMOUNT] maks.)
+		m² ([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">
+			<text_editor name="group_money_planning_text">
+				Beregner...
+			</text_editor>
+		</panel>
 		<panel label="Detaljer" name="group_money_details_tab">
 			<text_editor name="group_money_details_text">
 				Beregner...
 			</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="Gå tilbage i tid"/>
+			<button label="Efter &gt;" label_selected="Efter &gt;" name="later_details_button" tool_tip="Gå frem i tid"/>
 		</panel>
 		<panel label="Salg" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
 				Beregner...
 			</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="Gå tilbage i tid"/>
+			<button label="Efter &gt;" label_selected="Efter &gt;" name="later_sales_button" tool_tip="Gå frem i tid"/>
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_roles.xml b/indra/newview/skins/default/xui/da/panel_group_roles.xml
index 2af84858a1..5c2fd356d8 100644
--- a/indra/newview/skins/default/xui/da/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_roles.xml
@@ -11,7 +11,7 @@
 		<text name="static">
 			Medlemmer &amp; roller
 		</text>
-		<text name="static2">
+		<text name="static2" width="400">
 			Gruppemedlemmer får tildelt roller med rettigheder. Disse indstillinger kan 
 let tilpasses efter ønske, så gruppen kan vokse og blive mere fleksibel.
 		</text>
@@ -20,10 +20,10 @@ let tilpasses efter ønske, så gruppen kan vokse og blive mere fleksibel.
 		<text name="static">
 			Roller
 		</text>
-		<text name="role_properties_modifiable">
-			Vælg en rolle nedenfor.  Du kan ændre dens navn, beskrivelse og medlemstitel.
+		<text name="role_properties_modifiable" width="400">
+			Vælg en rolle nedenfor. Du kan ændre dens navn, beskrivelse og medlemstitel.
 		</text>
-		<text name="role_properties_not_modifiable">
+		<text name="role_properties_not_modifiable" width="400">
 			Vælg rolle forneden for at se dens egenskaber, medlemmer og rettigheder.
 		</text>
 		<text name="role_actions_modifiable">
@@ -51,7 +51,7 @@ der har denne rettighed.
 				<column label="Doneret leje" name="donated" />
 				<column label="Sidst på den" name="online" />
 			</name_list>
-			<button label="Inviter ny person ..." name="member_invite" />
+			<button label="Invitér nyt medlem..." name="member_invite"/>
 			<button label="Udmeld" name="member_eject" />
 			<string name="help_text">
 				Du kan tilføje eller fjerne roller, der er tildelt medlemmerne.
@@ -67,7 +67,7 @@ klik på deres navne.
 				<column label="Titel" name="title" />
 				<column label="Medlemmer" name="members" />
 			</scroll_list>
-			<button label="Opret ny rolle ..." name="role_create" />
+			<button label="Opret ny rolle..." name="role_create" />
 			<button label="Slet rolle" name="role_delete" />
 			<string name="help_text">
 				Roller har en titel og en tilladelsesliste med rettigheder,
diff --git a/indra/newview/skins/default/xui/da/panel_groups.xml b/indra/newview/skins/default/xui/da/panel_groups.xml
index b3a09b0082..4c7b924bcc 100644
--- a/indra/newview/skins/default/xui/da/panel_groups.xml
+++ b/indra/newview/skins/default/xui/da/panel_groups.xml
@@ -3,10 +3,10 @@
 	<scroll_list name="group list">
 		<column label="" name="name" />
 	</scroll_list>
-	<text type="string" length="1" name="groupdesc">
+	<text type="string" length="1" name="groupdesc" width="300">
 		Din nuværende aktive gruppe er fremhævet i listen.
 	</text>
-	<text type="string" length="1" name="groupcount">
+	<text type="string" length="1" name="groupcount" width="300">
 		Du er medlem i [COUNT] grupper (ud af maksimalt [MAX]).
 	</text>
 	<button label="IM/Opkald" name="IM" tool_tip="Åbner IM session" />
diff --git a/indra/newview/skins/default/xui/da/panel_region_covenant.xml b/indra/newview/skins/default/xui/da/panel_region_covenant.xml
index 63a2f90e36..394664f1f1 100644
--- a/indra/newview/skins/default/xui/da/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_covenant.xml
@@ -1,39 +1,67 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Covenant" name="Covenant">
+	<text name="estate_section_lbl">
+		Estate:
+	</text>
+	<text name="estate_name_lbl">
+		Navn:
+	</text>
+	<text name="estate_name_text">
+		mainland
+	</text>
+	<text name="estate_owner_lbl">
+		Ejer:
+	</text>
+	<text name="estate_owner_text">
+		(ingen)
+	</text>
+	<text name="covenant_timestamp_text">
+		Sidst ændret Ons Dec 31 16:00:00 1969
+	</text>
+	<button label="?" name="covenant_help"/>
+	<text_editor name="covenant_editor">
+		Der er ikke angivet nogen regler for denne estate.
+	</text_editor>
+	<button label="Reset" name="reset_covenant"/>
 	<text name="covenant_help_text">
-		Ændringer i regel information vil blive vist i alle parceller til denne estate.
+		Ændringer i regler vil blive vist i alle parceller til denne estate.
 	</text>
-	<text name="region_name_lbl">
+	<text name="covenant_instructions">
+		Træk og slip et notecard her for at ændre regler for denne estate.
+	</text>
+	<text name="region_section_lbl">
 		Region:
 	</text>
+	<text name="region_name_lbl">
+		Navn:
+	</text>
 	<text name="region_name_text">
-		(ukendt)
+		leyla
 	</text>
-	<text name="estate_name_lbl">
-		Estate:
+	<text name="region_landtype_lbl">
+		Type:
 	</text>
-	<text name="estate_name_text">
-		(ukendt)
+	<text name="region_landtype_text">
+		Mainland / Homestead
 	</text>
-	<text name="estate_owner_lbl">
-		Estate ejer:
+	<text name="region_maturity_lbl">
+		Rating:
 	</text>
-	<text name="estate_owner_text">
-		(ukendt)
+	<text name="region_maturity_text">
+		Adult
+	</text>
+	<text name="resellable_lbl">
+		Videresalg:
 	</text>
 	<text name="resellable_clause">
-		Valgfrit om købt land i denne region må sælges videre
+		Land i denne region må ikke sælges videre.
 	</text>
-	<text name="changeable_clause">
-		Valgfrit om købt land i denne region må deles eller samles.
+	<text name="changeable_lbl">
+		Opdel:
 	</text>
-	<text name="covenent_instructions">
-		Træk og slip et notecard her for at ændre regler for dette estate.
+	<text name="changeable_clause">
+		Land i denne region må ikke deles eller samles.
 	</text>
-	<text_editor name="covenant_editor">
-		Henter...
-	</text_editor>
-	<button label="Reset" name="reset_covenant" />
 	<string name="can_resell">
 		Købt land i denne region må sælges videre
 	</string>
@@ -46,5 +74,4 @@
 	<string name="can_not_change">
 		Købt land i denne region må ikke deles eller samles.
 	</string>
-	<button label="?" name="covenant_help" />
 </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 108763d544..0a439f8c62 100644
--- a/indra/newview/skins/default/xui/da/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_estate.xml
@@ -34,7 +34,7 @@ regioner i dette estate.
 	<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">
+	<text name="abuse_email_text" width="260">
 		Send beskeder misbrug til email adresse:
 	</text>
 	<string name="email_unsupported">
diff --git a/indra/newview/skins/default/xui/da/panel_region_general.xml b/indra/newview/skins/default/xui/da/panel_region_general.xml
index 5f0e71f63d..e4b722c20d 100644
--- a/indra/newview/skins/default/xui/da/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_general.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="Region" name="General">
 	<text name="region_text_lbl">
 		Region:
@@ -12,35 +12,48 @@
 	<text name="version_channel_text">
 		ukendt
 	</text>
-	<check_box label="Blokér for redigering af terræn" name="block_terraform_check" />
-	<button label="?" name="terraform_help" />
-	<check_box label="Blokér for flyvning" name="block_fly_check" />
-	<button label="?" name="fly_help" />
-	<check_box label="Tillad skader" name="allow_damage_check" />
-	<button label="?" name="damage_help" />
-	<check_box label="Begræns skubning" name="restrict_pushobject" />
-	<button label="?" name="restrict_pushobject_help" />
-	<check_box label="Tillad at sælge land" name="allow_land_resell_check" />
-	<button label="?" name="land_resell_help" />
-	<check_box label="Tillad at samle/dele land" name="allow_parcel_changes_check" />
-	<button label="?" name="parcel_changes_help" />
-	<check_box label="Blokér visning af land i Søgning" name="block_parcel_search_check"
-	     tool_tip="Lad beboere se denne region og dens parceller i søgeresultater" />
-	<button label="?" name="parcel_search_help" />
-	<spinner label="Max besøgende" name="agent_limit_spin" />
-	<button label="?" name="agent_limit_help" />
-	<spinner label="Objekt bonus" name="object_bonus_spin" />
-	<button label="?" name="object_bonus_help" />
+	<text name="region_type_lbl">
+		Type:
+	</text>
+	<text name="region_type">
+		ukendt
+	</text>
+	<check_box label="Blokér for redigering af terræn" name="block_terraform_check"/>
+	<button label="?" name="terraform_help"/>
+	<check_box label="Blokér for flyvning" name="block_fly_check"/>
+	<button label="?" name="fly_help"/>
+	<check_box label="Tillad skader" name="allow_damage_check"/>
+	<button label="?" name="damage_help"/>
+	<check_box label="Begræns skubning" name="restrict_pushobject"/>
+	<button label="?" name="restrict_pushobject_help"/>
+	<check_box label="Tillad at sælge land" name="allow_land_resell_check"/>
+	<button label="?" name="land_resell_help"/>
+	<check_box label="Tillad at samle/dele land" name="allow_parcel_changes_check"/>
+	<button label="?" name="parcel_changes_help"/>
+	<check_box label="Blokér visning af land i Søgning" name="block_parcel_search_check" tool_tip="Lad beboere se denne region og dens parceller i søgeresultater"/>
+	<button label="?" name="parcel_search_help"/>
+	<spinner label="Max besøgende" name="agent_limit_spin"/>
+	<button label="?" name="agent_limit_help"/>
+	<spinner label="Objekt bonus" name="object_bonus_spin"/>
+	<button label="?" name="object_bonus_help"/>
 	<text label="Indhold" name="access_text">
-		Indhold:
+		Rating:
 	</text>
-
-
-
-	<button label="?" name="access_help" />
-	<button label="Gem" name="apply_btn" />
-	<button label="Send en beboer hjem ..." name="kick_btn" />
-	<button label="Send alle beboere hjem..." name="kick_all_btn" />
-	<button label="Send besked til region..." name="im_btn" />
-	<button label="Vedligehold telehub..." name="manage_telehub_btn" />
+	<combo_box label="Mature" name="access_combo">
+		<combo_item name="Adult">
+			Adult
+		</combo_item>
+		<combo_item name="Mature">
+			Mature
+		</combo_item>
+		<combo_item name="PG">
+			PG
+		</combo_item>
+	</combo_box>
+	<button label="?" name="access_help"/>
+	<button label="Gem" name="apply_btn"/>
+	<button label="Send en beboer hjem ..." name="kick_btn"/>
+	<button label="Send alle beboere hjem..." name="kick_all_btn"/>
+	<button label="Send besked til region..." name="im_btn"/>
+	<button label="Vedligehold telehub..." name="manage_telehub_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_region_terrain.xml b/indra/newview/skins/default/xui/da/panel_region_terrain.xml
index 4ff81112d3..14ef0060b1 100644
--- a/indra/newview/skins/default/xui/da/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_terrain.xml
@@ -13,9 +13,9 @@
 	<spinner label="Max sænkning af land" name="terrain_lower_spin" />
 	<button label="?" name="terrain_lower_help" />
 	<check_box label="Benyt solopsætning fra estate" name="use_estate_sun_check" />
-	<button label="?" name="use_estate_sun_help" />
+	<button label="?" name="use_estate_sun_help" left="430"/>
 	<check_box label="Fast sol-position" name="fixed_sun_check" />
-	<button label="?" name="fixed_sun_help" />
+	<button label="?" name="fixed_sun_help" left="430"/>
 	<slider label="Fase" name="sun_hour_slider" />
 	<button label="Gem" name="apply_btn" />
 	<button label="Download RAW terræn fil..." name="download_raw_btn"
diff --git a/indra/newview/skins/default/xui/da/teleport_strings.xml b/indra/newview/skins/default/xui/da/teleport_strings.xml
index 78052b4ef5..cc75abbb26 100644
--- a/indra/newview/skins/default/xui/da/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/da/teleport_strings.xml
@@ -2,21 +2,18 @@
 <teleport_messages>
 	<message_set name="errors">
 		<message name="invalid_tport">
-			Der er problemer med at håndtere din teleport.
-Det kan være nødvendigt at logge ud og ind for at kunne skifte teleportere.
+			Der er problemer med at håndtere din teleport. Det kan være nødvendigt at logge ud og ind for at kunne skifte teleportere.
 Hvis du bliver ved med at have problemet kan du checke teknisk support på:
-www.secondlife.com/support.
+www.secondlife.com/support
 		</message>
 		<message name="invalid_region_handoff">
-			Problem registreret i forbindelse med skift til ny region. 
-Det kan være nødvendigt at logge ud og ind for at kunne skifte regioner.
+			Problem registreret i forbindelse med skift til ny region. Det kan være nødvendigt at logge ud og ind for at kunne skifte regioner.
 Hvis du bliver ved med at have problemet kan du checke teknisk support på:
-www.secondlife.com/support.
+www.secondlife.com/support
 		</message>
 		<message name="blocked_tport">
 			Beklager, teleport er blokeret lige nu. Prøv igen senere.
-Hvis du stadig ikke kan teleporte, prøv venligst at logge ud og ligge
-ind for at løse dette problem.
+Hvis du stadig ikke kan teleporte, prøv venligst at logge ud og ligge ind for at løse dette problem.
 		</message>
 		<message name="nolandmark_tport">
 			Beklager, systemet kunne ikke finde landmærke destinationen.
@@ -29,24 +26,20 @@ Prøv igen om lidt.
 			Beklager, du har ikke adgang til denne teleport destination.
 		</message>
 		<message name="missing_attach_tport">
-			Dine vedhæng er ikke ankommet endnu. Prøv at vente lidt endnu
-eller log ud og ind igen før du prøver at teleporte igen.
+			Dine vedhæng er ikke ankommet endnu. Prøv at vente lidt endnu eller log ud og ind igen før du prøver at teleporte igen.
 		</message>
 		<message name="too_many_uploads_tport">
 			Tekniske problemer hindrer at din teleport kan gennemføres.
 Prøv venligst igen om lidt eller vælg et mindre travlt område.
 		</message>
 		<message name="expired_tport">
-			Beklager, men systemet kunne ikke fuldføre din teleport
-i rimelig tid. Prøv venligst igen om lidt.
+			Beklager, men systemet kunne ikke fuldføre din teleport i rimelig tid. Prøv venligst igen om lidt.
 		</message>
 		<message name="expired_region_handoff">
-			Beklager, men systemet kunne ikke fuldføre skift til anden region
-i rimelig tid. Prøv venligst igen om lidt.
+			Beklager, men systemet kunne ikke fuldføre skift til anden region i rimelig tid. Prøv venligst igen om lidt.
 		</message>
 		<message name="no_host">
-			Ikke muligt at fine teleport destination. Destinationen kan
-være midlertidig utilgængelig eller findes ikke mere. 
+			Ikke muligt at fine teleport destination. Destinationen kan være midlertidig utilgængelig eller findes ikke mere. 
 Prøv evt. igen om lidt.
 		</message>
 		<message name="no_inventory_host">
diff --git a/indra/newview/skins/default/xui/de/floater_mute_object.xml b/indra/newview/skins/default/xui/de/floater_mute_object.xml
index 02eafbcb68..60c6ff008c 100644
--- a/indra/newview/skins/default/xui/de/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_mute_object.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="mute by name" title="Objekt nach Name stummschalten">
 	<text name="message">
-		Stummschalten nach Name betrifft nur Chat und IM, keine Sounds.
-Sie müssen den Objektnamen exakt angeben.
+		Stummschalten nach Name betrifft nur Chat und IM, keine
+Sounds. Sie müssen den Objektnamen exakt angeben.
 	</text>
 	<line_editor name="object_name">
 		Objektname
diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
index d7736832a3..a34b005448 100644
--- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<filter_editor select_on_focus="true"
-               background_image_disabled="TextField_Search_Disabled"
-               background_image_focused="TextField_Search_Active">
-  <clear_filter_button label="" 
-                       image_unselected="Icon_Close_Foreground"
-                       image_selected="Icon_Close_Press" />
-</filter_editor>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<filter_editor select_on_focus="true"
+               background_image_disabled="TextField_Search_Disabled"
+               background_image_focused="TextField_Search_Active">
+  <clear_filter_button label="" 
+                       image_unselected="Icon_Close_Foreground"
+                       image_selected="Icon_Close_Press" />
+</filter_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/list_view.xml b/indra/newview/skins/default/xui/en/widgets/list_view.xml
index c66aeb57a0..2e976bc755 100644
--- a/indra/newview/skins/default/xui/en/widgets/list_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/list_view.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<list_view
-  fg_selected_color="ListViewSelectedFgColor"
-  bg_selected_color="ListViewSelectedBgColor"
-  bg_color="ListViewBgColor"
-  />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<list_view
+  fg_selected_color="ListViewSelectedFgColor"
+  bg_selected_color="ListViewSelectedBgColor"
+  bg_color="ListViewBgColor"
+  />
diff --git a/indra/newview/skins/default/xui/en/widgets/split_button.xml b/indra/newview/skins/default/xui/en/widgets/split_button.xml
index b0367b599b..c0d3c6d7f6 100644
--- a/indra/newview/skins/default/xui/en/widgets/split_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/split_button.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<split_button 
- font="SansSerifSmall"
- arrow_position="left"
- follows="right|top">
-    <split_button.arrow_button 
-     name="Arrow Button"
-     label=""
-     font="SansSerifSmall"
-     scale_image="true"
-     image_selected="camera_presets/camera_presets_arrow.png"
-     image_unselected="camera_presets/camera_presets_arrow.png"
-     image_disabled_selected="camera_presets/camera_presets_arrow.png" 
-     image_disabled="camera_presets/camera_presets_arrow.png"
-     width="10"/>
-    <split_button.items_panel
-     background_visible="true"
-     border="true"
-     bg_alpha_color="1 1 1 1"
-     bg_opaq_color="1 1 1 1"
-     layout="topleft"
-     name="item_buttons"
-    />
-</split_button>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<split_button 
+ font="SansSerifSmall"
+ arrow_position="left"
+ follows="right|top">
+    <split_button.arrow_button 
+     name="Arrow Button"
+     label=""
+     font="SansSerifSmall"
+     scale_image="true"
+     image_selected="camera_presets/camera_presets_arrow.png"
+     image_unselected="camera_presets/camera_presets_arrow.png"
+     image_disabled_selected="camera_presets/camera_presets_arrow.png" 
+     image_disabled="camera_presets/camera_presets_arrow.png"
+     width="10"/>
+    <split_button.items_panel
+     background_visible="true"
+     border="true"
+     bg_alpha_color="1 1 1 1"
+     bg_opaq_color="1 1 1 1"
+     layout="topleft"
+     name="item_buttons"
+    />
+</split_button>
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index 767b384a2d..0e256bd8b8 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -47,13 +47,13 @@
 			<text length="1" name="For sale to" type="string">
 				En venta a: [BUYER]
 			</text>
-			<text length="1" name="Sell with landowners objects in parcel." type="string">
+			<text width="216" length="1" name="Sell with landowners objects in parcel." type="string">
 				Los objetos se incluyen en la venta.
 			</text>
-			<text length="1" name="Selling with no objects in parcel." type="string">
+			<text width="216" length="1" name="Selling with no objects in parcel." type="string">
 				Los objetos no se incluyen en la venta.
 			</text>
-			<button font="SansSerifSmall" left="275" width="165" label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" name="Cancel Land Sale"/>
+			<button font="SansSerifSmall" bottom="-245" left="275" width="165" label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" name="Cancel Land Sale"/>
 			<text length="1" name="Claimed:" type="string">
 				Reclamada:
 			</text>
@@ -194,7 +194,7 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 			<text length="1" name="Simulator primitive usage:" type="string">
 				Simulador de uso de prims:
 			</text>
-			<text name="objects_available"  left="214" width="230" >
+			<text name="objects_available"  left="204" width="250" >
 				[COUNT] de un máximo de [MAX] ([AVAILABLE] disponibles)
 			</text>
 			<string name="objects_available_text">
@@ -206,19 +206,19 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 			<text length="1" name="Primitives parcel supports:" type="string" width="200">
 				Prims que admite la parcela:
 			</text>
-			<text name="object_contrib_text" left="214" width="152">
+			<text name="object_contrib_text" left="204" width="152">
 				[COUNT]
 			</text>
 			<text length="1" name="Primitives on parcel:" type="string">
 				Prims en la parcela:
 			</text>
-			<text name="total_objects_text" left="214"  width="48">
+			<text name="total_objects_text" left="204"  width="48">
 				[COUNT]
 			</text>
 			<text length="1" name="Owned by parcel owner:" type="string" left="14" width="180" >
 				Del propietario de la parcela:
 			</text>
-			<text name="owner_objects_text" left="214"  width="48">
+			<text name="owner_objects_text" left="204"  width="48">
 				[COUNT]
 			</text>
 			<button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/>
@@ -226,7 +226,7 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 			<text length="1" name="Set to group:" type="string" left="14"  width="180">
 				Del grupo:
 			</text>
-			<text name="group_objects_text" left="214"  width="48">
+			<text name="group_objects_text" left="204"  width="48">
 				[COUNT]
 			</text>
 			<button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/>
@@ -234,7 +234,7 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 			<text length="1" name="Owned by others:" type="string" left="14" width="128">
 				Propiedad de otros:
 			</text>
-			<text name="other_objects_text" left="214"  width="48">
+			<text name="other_objects_text" left="204"  width="48">
 				[COUNT]
 			</text>
 			<button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/>
@@ -242,7 +242,7 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 			<text length="1" name="Selected / sat upon:" type="string" left="14" width="193" >
 				Seleccionados / con gente sentada:
 			</text>
-			<text name="selected_objects_text" left="214"  width="48">
+			<text name="selected_objects_text" left="204"  width="48">
 				[COUNT]
 			</text>
 			<text name="Autoreturn" left="4" width="412" >
@@ -299,7 +299,7 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
 			<string name="search_disabled_permissions_tooltip">
 				Esta opción no esta activada porque usted no puede modificar las opciones de la parcela.
 			</string>
-			<combo_box name="land category with adult">
+			<combo_box name="land category with adult" left="282" width="140">
 				<combo_item name="AnyCategory">
 					Cualquier categoría
 				</combo_item>
@@ -340,7 +340,7 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
 					Otra
 				</combo_item>
 			</combo_box>
-			<combo_box name="land category">
+			<combo_box name="land category" left="282" width="140">
 				<combo_item name="AnyCategory">
 					Cualquier categoría
 				</combo_item>
@@ -378,7 +378,7 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
 					Otra
 				</combo_item>
 			</combo_box>
-			<button label="?" label_selected="?" name="?"/>
+			<button label="?" label_selected="?" name="?" left="427"/>
 			<check_box label="Contenido &apos;Mature&apos;" name="MatureCheck" tool_tip=""/>
 			<string name="mature_check_mature">
 				Contenido &apos;Mature&apos;
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
index 105111f29f..68a56ac678 100644
--- a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
@@ -14,13 +14,15 @@
 		</panel>
 		<panel label="Cercanos" name="NearMePanel">
 			<text name="InstructSelectResident">
-				Seleccionar un residente cercano:
+				Seleccionar un
+residente cercano:
 			</text>
-			<button label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh"/>
-			<slider label="Alcance" name="near_me_range"/>
+			<button font="SansSerifSmall" left_delta="1" width="115" label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh"/>
+			<slider label="Alcance" name="near_me_range" bottom_delta="-36"/>
 			<text name="meters">
 				Metros
 			</text>
+		<scroll_list bottom_delta="-169" height="159" name="NearMe"  />
 		</panel>
 	</tab_container>
 	<button label="Elegir" label_selected="Elegir" name="Select"/>
diff --git a/indra/newview/skins/default/xui/es/floater_build_options.xml b/indra/newview/skins/default/xui/es/floater_build_options.xml
index bbb5b0e36d..c3e4acacf0 100644
--- a/indra/newview/skins/default/xui/es/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_build_options.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="Opciones de la cuadrícula">
-	<spinner label="Unidad de la cuadrícula (metros)" name="GridResolution"/>
-	<spinner label="Graduación de la cuadrícula (metros)" name="GridDrawSize"/>
+	<spinner label="Unidad de la cuadrícula (metros)" name="GridResolution" width="250" label_width="192"/>
+	<spinner label="Graduación de la cuadrícula (metros)" name="GridDrawSize" width="250" label_width="192"/>
 	<check_box label="Activar subunidades" name="GridSubUnit"/>
 	<check_box label="Ver la sección transversal" name="GridCrossSection"/>
-	<slider label="Opacidad de la cuadrícula" name="GridOpacity"/>
+	<slider label="Opacidad de la cuadrícula" name="GridOpacity" width="250"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_contents.xml b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
index e93b8bce2d..2346798f94 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
@@ -6,7 +6,7 @@
 	<text name="buy_text">
 		¿Comprar por [AMOUNT] L$ a [NAME]?
 	</text>
-	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn" width="73"/>
 	<button label="Comprar" label_selected="Comprar" name="buy_btn"/>
 	<check_box label="Vestirse ahora la ropa" name="wear_check"/>
 	<string name="no_copy_text">
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
index b26a9c7494..a01e07e694 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
@@ -22,14 +22,14 @@
 	<text name="buy_action">
 		[NAME] [PRICE] L$
 	</text>
-	<text name="currency_action">
-		Comprar L$
+	<text name="currency_action" width="50">
+		Comprar 
 	</text>
-	<line_editor name="currency_amt">
+	<line_editor name="currency_amt" width="65" left_delta="50">
 		1234
 	</line_editor>
-	<text name="currency_est">
-		por, aprox., [USD] US$
+	<text name="currency_est" width="138" left_delta="68">
+		L$  por, aprox., [USD] US$
 	</text>
 	<text name="getting_data">
 		Obteniendo los datos...
@@ -63,6 +63,6 @@ Aumente la cantidad a comprar.
 	<button label="Cancelar" name="cancel_btn"/>
 	<button label="Comprar" name="buy_btn"/>
 	<string name="buy_currency">
-		Comprar L$ [LINDENS] por, aprox., [USD] U$D
+		Compre [LINDENS] L$ por, aprox., [USD] US$
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_color_picker.xml b/indra/newview/skins/default/xui/es/floater_color_picker.xml
index 238853c58d..c220c48cb0 100644
--- a/indra/newview/skins/default/xui/es/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/es/floater_color_picker.xml
@@ -25,6 +25,7 @@
 		Color actual:
 	</text>
 	<text name="(Drag below to save.)">
-		(Arrástrelo abajo para guardarlo)
+		(Arrástrelo abajo
+ para guardarlo.)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
index dd74505239..9ee7fc3ead 100644
--- a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
@@ -57,9 +57,9 @@
 			<text name="WL12amHash2">
 				|
 			</text>
-			<button label="Añadir un punto" label_selected="Añadir un punto" name="WLAddKey"/>
-			<button label="Quitar un punto" label_selected="Quitar un punto" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
+			<button font="SansSerifSmall" width="96" left="546" label="Añadir un punto" label_selected="Añadir un punto" name="WLAddKey"/>
+			<button font="SansSerifSmall" width="96" left="546" label="Quitar un punto" label_selected="Quitar un punto" name="WLDeleteKey"/>
+			<text font="SansSerifSmall" name="WLCurKeyFrameText" width="190">
 				Configuración del fotograma clave:
 			</text>
 			<text name="WLCurKeyTimeText">
@@ -86,9 +86,9 @@
 			</text>
 			<button label="Probar" label_selected="Probar" name="WLAnimSky"/>
 			<button label="Parar" label_selected="Parar" name="WLStopAnimSky"/>
-			<button label="Usar el horario del estado" label_selected="Ir al horario del estado" name="WLUseLindenTime"/>
-			<button label="Guardar este tipo de día" label_selected="Guardar este tipo de día" name="WLSaveDayCycle"/>
-			<button label="Cargar y probar un tipo de día" label_selected="Cargar y probar un tipo de día" name="WLLoadDayCycle"/>
+			<button width="150" font="SansSerifSmall" label="Usar el horario del estado" label_selected="Ir al horario del estado" name="WLUseLindenTime"/>
+			<button left="440" width="180" font="SansSerifSmall" label="Guardar este tipo de día" label_selected="Guardar este tipo de día" name="WLSaveDayCycle"/>
+			<button left="440" width="180" font="SansSerifSmall" label="Cargar y probar un tipo de día" label_selected="Cargar y probar un tipo de día" name="WLLoadDayCycle"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_env_settings.xml b/indra/newview/skins/default/xui/es/floater_env_settings.xml
index 8b9bfe7362..65710fc5ed 100644
--- a/indra/newview/skins/default/xui/es/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_env_settings.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Environment Editor Floater" title="Editor del entorno">
 	<text name="EnvTimeText">
-		Duración de un día
+		Duración de
+un día
 	</text>
 	<text name="EnvTimeText2">
 		12:00 PM
@@ -10,14 +11,16 @@
 		Nubosidad
 	</text>
 	<text name="EnvWaterColorText">
-		Color del agua
+		Color del
+agua
 	</text>
 	<color_swatch label="" name="EnvWaterColor" tool_tip="Pulse para abrir el selector de color"/>
 	<text name="EnvWaterFogText">
-		Claridad del agua
+		Claridad del
+agua
 	</text>
-	<button label="Usar el horario del estado" name="EnvUseEstateTimeButton"/>
-	<button label="Cielo avanzado" name="EnvAdvancedSkyButton"/>
-	<button label="Agua avanzada" name="EnvAdvancedWaterButton"/>
+	<button bottom="-144" label="Usar el horario del estado" name="EnvUseEstateTimeButton" width="155"/>
+	<button label="Cielo avanzado" name="EnvAdvancedSkyButton" width="155" left="167" />
+	<button label="Agua avanzada" name="EnvAdvancedWaterButton" width="155" left="326"/>
 	<button label="?" name="EnvSettingsHelpButton"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_gesture.xml b/indra/newview/skins/default/xui/es/floater_gesture.xml
index 4f19286d01..e7f1a7aca2 100644
--- a/indra/newview/skins/default/xui/es/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_gesture.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gestures" title="Gestos disponibles">
 	<text name="help_label">
-		Pulse dos veces en un gesto para reproducir las animaciones y sonidos.
+		Pulse dos veces en un gesto para reproducir las animaciones
+y sonidos.
 	</text>
-	<scroll_list name="gesture_list">
+	<scroll_list bottom_delta="-385" height="360"  name="gesture_list">
 		<column label="Botón" name="trigger"/>
 		<column label="Tecla" name="shortcut"/>
 		<column label="Nombre" name="name"/>
diff --git a/indra/newview/skins/default/xui/es/floater_inspect.xml b/indra/newview/skins/default/xui/es/floater_inspect.xml
index 7a9f76de0f..026081bc04 100644
--- a/indra/newview/skins/default/xui/es/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/es/floater_inspect.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="inspect" title="Examinar objetos">
+<floater name="inspect" title="Examinar objetos" min_width="450">
 	<scroll_list name="object_list" tool_tip="Seleccione un objeto de esta lista para realzarlo en el mundo">
 		<column label="Nombre del objeto" name="object_name"/>
-		<column label="Nombre del propietario" name="owner_name"/>
-		<column label="Nombre del creador" name="creator_name"/>
+		<column label="Propietario" name="owner_name"/>
+		<column label="Creador" name="creator_name"/>
 		<column label="Fecha de creación" name="creation_date"/>
 	</scroll_list>
-	<button label="Ver el perfil del propietario..." label_selected="" name="button owner" tool_tip="Ver el perfil del propietario del objeto realzado"/>
-	<button label="Ver el perfil del creadir..." label_selected="" name="button creator" tool_tip="Ver el perfil del creador original del objeto realzado"/>
+	<button width="185" label="Ver el perfil del propietario..." label_selected="" name="button owner" tool_tip="Ver el perfil del propietario del objeto realzado"/>
+	<button width="165" left="205" label="Ver el perfil del creador..." label_selected="" name="button creator" tool_tip="Ver el perfil del creador original del objeto realzado"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
index d341de17e9..d0283afa38 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
@@ -11,14 +11,14 @@
 	<check_box label="Sonidos" name="check_sound"/>
 	<check_box label="Texturas" name="check_texture"/>
 	<check_box label="Fotos" name="check_snapshot"/>
-	<button label="Todo" label_selected="Todo" name="All"/>
-	<button label="Nada" label_selected="Nada" name="None"/>
-	<check_box label="Mostrar siempre las carpetas" name="check_show_empty"/>
-	<check_box label="Desde el fin de sesión" name="check_since_logoff"/>
+	<button label="Todo" label_selected="Todo" name="All" width="70"/>
+	<button label="Nada" label_selected="Nada" name="None" width="70" bottom_delta="0" left="83"/>
+	<check_box label="Mostrar siempre las&#10;carpetas" name="check_show_empty"/>
+	<check_box label="Desde el fin de sesión" name="check_since_logoff" bottom_delta="-36"/>
 	<text length="1" name="- OR -" type="string">
 		- O -
 	</text>
 	<spinner label="horas atrás" name="spin_hours_ago"/>
 	<spinner label="días atrás" name="spin_days_ago"/>
-	<button label="Cerrar" label_selected="Cerrar" name="Close"/>
+	<button label="Cerrar" label_selected="Cerrar" name="Close" bottom_delta="-30"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_lagmeter.xml b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
index 7d499750de..1af0bb065c 100644
--- a/indra/newview/skins/default/xui/es/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
@@ -4,23 +4,26 @@
 	<text name="client">
 		Cliente:
 	</text>
-	<text name="client_text">
+	<text name="client_text" font="SansSerifSmall">
 		Normal
 	</text>
+	<text left="30" name="client_lag_cause" right="-10" />
 	<button label="" label_selected="" name="network_lagmeter" tool_tip="Estado del lag de la red"/>
 	<text name="network">
 		Red:
 	</text>
-	<text name="network_text">
+	<text name="network_text" font="SansSerifSmall">
 		Normal
 	</text>
+	<text left="30" name="network_lag_cause" right="-10" />
 	<button label="" label_selected="" name="server_lagmeter" tool_tip="Estado del lag del servidor"/>
 	<text name="server">
 		Servidor:
 	</text>
-	<text name="server_text">
+	<text name="server_text" font="SansSerifSmall">
 		Normal
 	</text>
+	<text left="30" name="server_lag_cause" right="-32" />
 	<button label="?" name="server_help"/>
 	<button label="&gt;&gt;" name="minimize"/>
 	<string name="max_title_msg">
@@ -117,10 +120,10 @@
 		20
 	</string>
 	<string name="server_frame_time_critical_msg">
-		Frecuencia del simulador -framerate- por debajo de [SERVER_FRAME_RATE_CRITICAL]
+		Frecuencia (framerate) por debajo de [SERVER_FRAME_RATE_CRITICAL]
 	</string>
 	<string name="server_frame_time_warning_msg">
-		Frecuencia del simulador -framerate- entre [SERVER_FRAME_RATE_CRITICAL] y [SERVER_FRAME_RATE_WARNING]
+		Frecuencia (framerate) entre [SERVER_FRAME_RATE_CRITICAL] y [SERVER_FRAME_RATE_WARNING]
 	</string>
 	<string name="server_frame_time_normal_msg">
 		Normal
diff --git a/indra/newview/skins/default/xui/es/floater_land_holdings.xml b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
index 5c08b04055..5df319905d 100644
--- a/indra/newview/skins/default/xui/es/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
@@ -8,7 +8,7 @@
 		<column label="" name="hidden"/>
 	</scroll_list>
 	<button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportar al centro de este terreno."/>
-	<button label="Mostrar en el mapa" label_selected="Mostrar en el mapa" name="Show on Map" tool_tip="Mostrar este terreno en el mapa del mundo."/>
+	<button width="130" label="Mostrar en el mapa" label_selected="Mostrar en el mapa" name="Show on Map" tool_tip="Mostrar este terreno en el mapa del mundo."/>
 	<text name="contrib_label">
 		Contribuciones a sus grupos:
 	</text>
diff --git a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
index 00a6995575..226c3482af 100644
--- a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="Script: script nuevo">
 	<button label="Reiniciar" label_selected="Reiniciar" name="Reset"/>
-	<check_box label="Ejecutándose" name="running"/>
-	<check_box label="Mono" name="mono"/>
+	<check_box label="Ejecutándose" name="running" left="4"/>
+	<check_box label="Mono" name="mono" left="106"/>
 	<string name="not_allowed">
 		No está autorizado para ver este script.
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
index c1e431f274..859a2d3812 100644
--- a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="Wiki de LSL">
 	<check_box label="Seguir al cursor" name="lock_check"/>
-	<combo_box label="Bloquear" name="history_combo"/>
-	<button label="Atrás" name="back_btn"/>
+	<combo_box label="Bloquear" name="history_combo" left_delta="120" width="70"/>
+	<button label="Atrás" name="back_btn" left_delta="75"/>
 	<button label="Adelante" name="fwd_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_media_browser.xml b/indra/newview/skins/default/xui/es/floater_media_browser.xml
index 9b60b28537..79c8980c02 100644
--- a/indra/newview/skins/default/xui/es/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/es/floater_media_browser.xml
@@ -2,10 +2,11 @@
 <floater name="floater_about" title="Navegador">
 	<layout_stack name="stack1">
 		<layout_panel name="nav_controls">
-			<button label="Atrás" name="back"/>
-			<button label="Adelante" name="forward"/>
-			<button label="Actualizar" name="reload"/>
-			<button label="Ir" name="go"/>
+			<button label="Atrás" name="back" width="75"/>
+			<button label="Adelante" name="forward" left_delta="75"  width="70"/>
+			<button label="Actualizar" name="reload" left_delta="75"/>
+			<combo_box left_delta="75" name="address" width="510"/>
+			<button label="Ir" name="go" left_delta="515"/>
 		</layout_panel>
 		<layout_panel name="parcel_owner_controls">
 			<button label="Enviar a la parcela la URL actual" name="assign"/>
diff --git a/indra/newview/skins/default/xui/es/floater_mute_object.xml b/indra/newview/skins/default/xui/es/floater_mute_object.xml
index a2b87b67ab..0cf38c09ee 100644
--- a/indra/newview/skins/default/xui/es/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/es/floater_mute_object.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="mute by name" title="Ignorar un objeto según su nombre">
-	<text name="message">
-		Ignorar según el nombre sólo afecta al chat y los MI del objeto, no a sus sonidos.
+	<text name="message" bottom_delta="-40">
+		Ignorar según el nombre sólo afecta al chat y los MI del
+objeto, no a sus sonidos. 
 Debe escribir exactamente el nombre del objeto.
 	</text>
-	<line_editor name="object_name">
+	<line_editor name="object_name" bottom_delta="-58">
 		Nombre del objeto
 	</line_editor>
 	<button label="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/es/floater_pay.xml b/indra/newview/skins/default/xui/es/floater_pay.xml
index 9770e90bf4..136e6a6f01 100644
--- a/indra/newview/skins/default/xui/es/floater_pay.xml
+++ b/indra/newview/skins/default/xui/es/floater_pay.xml
@@ -6,16 +6,17 @@
 	<button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
 	<button label="Pagar" label_selected="Pagar" name="pay btn"/>
 	<button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
-	<text length="1" name="payee_label" type="string">
+	<text length="1" name="payee_label" type="string" left="5" width="105">
 		Pagar al residente:
 	</text>
-	<text length="1" name="payee_name" type="string">
+	<text length="1" name="payee_name" type="string" left="115">
 		[FIRST] [LAST]
 	</text>
-	<text length="1" name="fastpay text" type="string">
+	<text length="1" name="fastpay text" type="string" width="100" halign="left">
 		Pago rápido:
 	</text>
-	<text length="1" name="amount text" type="string">
+	<text length="1" name="amount text" type="string" left="4" >
 		Cantidad:
 	</text>
+	<line_editor left="60" name="amount" width="55"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pay_object.xml b/indra/newview/skins/default/xui/es/floater_pay_object.xml
index 86b3af76f8..770ecc6ae5 100644
--- a/indra/newview/skins/default/xui/es/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/es/floater_pay_object.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
-	<text length="1" name="payee_group" type="string">
+	<text length="1" name="payee_group" type="string" left="5" width="110">
 		Pagar al grupo:
 	</text>
-	<text length="1" name="payee_resident" type="string">
+	<text length="1" name="payee_resident" type="string" left="5" width="110">
 		Pagar al residente:
 	</text>
-	<text length="1" name="payee_name" type="string">
+	<text length="1" name="payee_name" type="string" left="120" width="180">
 		[FIRST] [LAST]
 	</text>
-	<text length="1" name="object_name_label" type="string">
+	<text length="1" name="object_name_label" type="string" left="5" width="110">
 		A través del objeto:
 	</text>
-	<text length="1" name="object_name_text" type="string">
+	<text length="1" name="object_name_text" type="string" left="120" width="180">
 		...
 	</text>
 	<text length="1" name="fastpay text" type="string">
diff --git a/indra/newview/skins/default/xui/es/floater_preferences.xml b/indra/newview/skins/default/xui/es/floater_preferences.xml
index 56e99e2285..df7fc93dd9 100644
--- a/indra/newview/skins/default/xui/es/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/es/floater_preferences.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Preferences" title="Preferencias">
+<floater name="Preferences" title="Preferencias" min_width="350" width="646">
 	<button label="OK" label_selected="OK" name="OK"/>
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<button label="Aplicar" label_selected="Aplicar" name="Apply"/>
-	<button label="Acerca de" label_selected="Acerca de" name="About..."/>
+	<button label="Acerca de..." label_selected="Acerca de..." name="About..." />
 	<button label="Ayuda" label_selected="Ayuda" name="Help"/>
+	<tab_container name="pref core" tab_width="146" width="646" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_animation.xml b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
index cea2273089..0f2762022a 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
@@ -3,6 +3,6 @@
 	<text length="1" name="desc txt" type="string">
 		Descripción:
 	</text>
-	<button label="Ejecutarla en el mundo" label_selected="Parar" name="Anim play btn" tool_tip="Ejecutar esta animación de modo que puedan verla los demás."/>
-	<button label="Ejecutarla para usted" label_selected="Parar" name="Anim audition btn" tool_tip="Ejecutar esta animación de modo que sólo la vea usted."/>
+	<button left="12" width="142" label="Ejecutarla en el mundo" label_selected="Parar" name="Anim play btn" tool_tip="Ejecutar esta animación de modo que puedan verla los demás."/>
+	<button left="156" width="136" label="Ejecutarla para usted" label_selected="Parar" name="Anim audition btn" tool_tip="Ejecutar esta animación de modo que sólo la vea usted."/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_script_search.xml b/indra/newview/skins/default/xui/es/floater_script_search.xml
index 9cabed9e36..dc05370c2b 100644
--- a/indra/newview/skins/default/xui/es/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_search.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script search" title="Buscar en el script">
-	<check_box label="Indiferente mays./mins." name="case_text"/>
-	<button label="Buscar" label_selected="Buscar" name="search_btn"/>
-	<button label="Reemplazar" label_selected="Reemplazar" name="replace_btn"/>
-	<button label="Reemplazar todos" label_selected="Reemplazar todos" name="replace_all_btn"/>
-	<text length="1" name="txt" type="string">
+<floater name="script search" title="Buscar en el script" width="320">
+	<check_box label="Indiferente mays./mins." name="case_text" left="75"/>
+	<button label="Buscar" label_selected="Buscar" name="search_btn" width="85"/>
+	<button label="Reemplazar" label_selected="Reemplazar" name="replace_btn" left="100" width="85"/>
+	<button label="Reemplazar todos" label_selected="Reemplazar todos" name="replace_all_btn" left="190" width="122"/>
+	<text length="1" name="txt" type="string" width="65">
 		Buscar
 	</text>
-	<text length="1" name="txt2" type="string">
+	<text length="1" name="txt2" type="string" width="65">
 		Reemplazar
 	</text>
+	<line_editor left="75" name="search_text" width="240" />
+	<line_editor left="75" name="replace_text" width="240" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_select_key.xml b/indra/newview/skins/default/xui/es/floater_select_key.xml
index 132985864c..9c889df63a 100644
--- a/indra/newview/skins/default/xui/es/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/es/floater_select_key.xml
@@ -2,6 +2,6 @@
 <floater name="modal container" title="">
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<text name="Save item as:">
-		Pulse una tecla para seleccionar
+		Pulse una tecla para seleccionarla
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_telehub.xml b/indra/newview/skins/default/xui/es/floater_telehub.xml
index 921577751a..74084e9db9 100644
--- a/indra/newview/skins/default/xui/es/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/es/floater_telehub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="telehub" title="Punto de Teleporte">
+<floater name="telehub" title="Punto de Teleporte" min_height="310" height="310">
 	<text name="status_text_connected">
 		Punto de Teleporte conectado al objeto [OBJECT]
 	</text>
@@ -9,20 +9,24 @@
 	<text name="help_text_connected">
 		Para quitar, pulse Desconectar.
 	</text>
-	<text name="help_text_not_connected">
-		Seleccione el objeto y pulse Conectar el Punto de Teleporte.
+	<text name="help_text_not_connected" height="38" bottom_delta="-18">
+		Seleccione el objeto y pulse Conectar el Punto
+de Teleporte.
 	</text>
 	<button label="Conectar el Punto de Teleporte" name="connect_btn"/>
 	<button label="Desconectar" name="disconnect_btn"/>
 	<text name="spawn_points_text">
-		Spawn Points (positions, not objects):
+		Sucursales (posiciónes, no objetos):
 	</text>
 	<button label="Añadir sucursales" name="add_spawn_point_btn"/>
 	<button label="Quitar sucursales" name="remove_spawn_point_btn"/>
 	<text name="spawn_point_help">
-		Seleccione el objeto y pulse Añadir para especificar la posición.
+		Seleccione el objeto y pulse Añadir para
+especificar la posición.
 Hecho eso, puede mover o borrar el objeto.
-Las posiciones son relativas al centro del Punto de Teleporte.
-Seleccione un ítem de la lista para mostrar su posición en el mundo.
+Las posiciones son relativas al centro del
+Punto de Teleporte.
+Seleccione un ítem de la lista para mostrar su
+posición en el mundo.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
index 8c3882f0c8..477d546806 100644
--- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
@@ -9,8 +9,8 @@
 	<text length="1" name="unknown" type="string">
 		Dimensiones: [DIMENSIONS]
 	</text>
-	<button label="Por defecto" label_selected="Por defecto" name="Default"/>
-	<button label="Ninguna" label_selected="Ninguna" name="None"/>
+	<button label="Por defecto" label_selected="Por defecto" name="Default" width="84"/>
+	<button label="Ninguna" label_selected="Ninguna" name="None" left="90"/>
 	<button label="Blanca" label_selected="Blanca" name="Blank"/>
 	<check_box label="Ver las carpetas" name="show_folders_check"/>
 	<search_editor label="Escriba aquí para buscar una" name="inventory search editor"/>
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 15c66c8366..e6ff6b0fa5 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Construir" width="288">
 	<button label="" label_selected="" name="button focus" tool_tip="Visión"/>
 	<button label="" label_selected="" name="button move" tool_tip="Mover"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Editar"/>
@@ -19,7 +19,7 @@
 	<text name="text ruler mode">
 		Ajuste:
 	</text>
-	<combo_box name="combobox grid mode">
+	<combo_box name="combobox grid mode" width="82">
 		<combo_item name="World">
 			Mundo
 		</combo_item>
@@ -34,8 +34,8 @@
 	<check_box label="Estirar las texturas" name="checkbox stretch textures"/>
 	<check_box label="Usar la cuadrícula" name="checkbox snap to grid"/>
 	<button label="Opciones..." label_selected="Opciones..." name="Options..."/>
-	<text name="text status">
-		Arrastrar para mover, arrastrar + Mayús. para copiar
+	<text name="text status" width="280">
+		Arrastrar para mover, Mayús.+arrastrar para copiar
 	</text>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
@@ -63,7 +63,7 @@
 	<check_box label="Suavizar" name="radio smooth"/>
 	<check_box label="Escarpar" name="radio noise"/>
 	<check_box label="Restablecer" name="radio revert"/>
-	<button label="Aplicar" label_selected="Aplicar" name="button apply to selection" tool_tip="Modificar el terreno seleccionado"/>
+	<button label="Aplicar" label_selected="Aplicar" name="button apply to selection" tool_tip="Modificar el terreno seleccionado" left="146"/>
 	<text name="Bulldozer:">
 		Bulldozer:
 	</text>
@@ -73,13 +73,13 @@
 	<text name="Strength:">
 		Fuerza
 	</text>
-	<text name="obj_count">
+	<text name="obj_count" left="134">
 		Objetos seleccionados: [COUNT]
 	</text>
-	<text name="prim_count">
+	<text name="prim_count" left="134">
 		primitivas: [COUNT]
 	</text>
-	<tab_container name="Object Info Tabs">
+	<tab_container name="Object Info Tabs" tab_max_width="62" tab_min_width="30" width="288">
 		<panel label="General" name="General">
 			<text name="Name:">
 				Nombre:
@@ -144,12 +144,12 @@
 				El próximo propietario puede:
 			</text>
 			<check_box label="Modificarlo" name="checkbox next owner can modify"/>
-			<check_box label="Copiarlo" name="checkbox next owner can copy"/>
-			<check_box label="Revenderlo/Darlo" name="checkbox next owner can transfer"/>
-			<text name="label click action">
+			<check_box label="Copiarlo" name="checkbox next owner can copy" left_delta="80"/>
+			<check_box label="Revenderlo/Darlo" name="checkbox next owner can transfer" left_delta="67"/>
+			<text name="label click action" width="180">
 				Al pulsarlo con el botón izquierdo:
 			</text>
-			<combo_box name="clickaction">
+			<combo_box name="clickaction" width="192">
 				<combo_item name="Touch/grab(default)">
 					Tocar/Agarrar (por defecto)
 				</combo_item>
@@ -206,7 +206,7 @@
 				Debe seleccionar todo el objeto para definir los permisos.
 			</string>
 			<string name="Cost Default">
-				Precio:           L$
+				Precio:         L$
 			</string>
 			<string name="Cost Total">
 				Precio total:  L$
@@ -223,7 +223,7 @@
 		</panel>
 		<panel label="Objeto" name="Object">
 			<text name="select_single">
-				Seleccione un único prim para editar los parámetros.
+				Seleccione un sólo prim para editarlo.
 			</text>
 			<text name="edit_object">
 				Modificar los parámetros del objeto:
@@ -277,7 +277,7 @@
 				</combo_item>
 			</combo_box>
 			<text name="label basetype">
-				Tipo de objeto para construir
+				Tipo de objeto a construir
 			</text>
 			<combo_box name="comboBaseType">
 				<combo_item name="Box">
@@ -334,7 +334,7 @@
 				</combo_item>
 			</combo_box>
 			<text name="text twist">
-				La torsión: Inicio y Fin
+				Torsión: Inicio y Fin
 			</text>
 			<spinner label="I" name="Twist Begin"/>
 			<spinner label="F" name="Twist End"/>
@@ -397,9 +397,9 @@
 				</combo_item>
 			</combo_box>
 		</panel>
-		<panel label="Características" name="Features">
+		<panel label="Caracter." name="Features">
 			<text name="select_single">
-				Seleccione un sólo prim para editar las características.
+				Seleccione un sólo prim para editarlo.
 			</text>
 			<text name="edit_object">
 				Editar las características del objeto:
@@ -431,11 +431,11 @@
 			<text name="glow label">
 				Resplandor
 			</text>
-			<check_box label="Brillo al máximo" name="checkbox fullbright"/>
+			<check_box label="Brillo al &#10;máximo" name="checkbox fullbright" bottom_delta="-21"/>
 			<text name="tex gen">
 				Detallado
 			</text>
-			<combo_box name="combobox texgen">
+			<combo_box name="combobox texgen" width="86">
 				<combo_item name="Default">
 					Por defecto
 				</combo_item>
@@ -530,27 +530,29 @@
 				Rotación (grados)
 			</text>
 			<string name="string repeats per meter">
-				Repeticiones por metro
+				Repeticiones por m.
 			</string>
 			<string name="string repeats per face">
 				Repeticiones por cara
 			</string>
 			<text name="rpt">
-				Repeticiones por metro
+				Repeticiones por m.
 			</text>
-			<button label="Aplicar" label_selected="Aplicar" name="button apply"/>
+			<spinner left="118" name="TexRot" width="62" />
+			<spinner left="118" name="rptctrl" width="62" />
+			<button label="Aplicar" label_selected="Aplicar" name="button apply" left_delta="72"/>
 			<text name="tex offset">
 				Desplazar
 			</text>
 			<spinner label="Horizontal (U)" name="TexOffsetU"/>
 			<spinner label="Vertical (V)" name="TexOffsetV"/>
-			<text name="textbox autofix">
+			<text name="textbox autofix" width="180">
 				Centrar la textura para los media
 (primero debe subirla)
 			</text>
-			<button label="Alinear" label_selected="Alinear" name="button align"/>
+			<button label="Alinear" label_selected="Alinear" name="button align" left="180"/>
 		</panel>
-		<panel label="Contenido" name="Contents">
+		<panel label="Contenido " name="Contents">
 			<button label="Script nuevo" label_selected="Script nuevo" name="button new script"/>
 			<button label="Permisos..." name="button permissions"/>
 		</panel>
@@ -565,19 +567,19 @@
 		<text name="label_area">
 			Superficie: [AREA] m²
 		</text>
-		<button label="Acerca del terreno..." label_selected="Acerca del terreno..." name="button about land"/>
+		<button label="Acerca del terreno..." label_selected="Acerca del terreno..." name="button about land" width="140"/>
 		<check_box label="Mostrar los propietarios" name="checkbox show owners" tool_tip="El color de las parcelas es según su propietario"/>
-		<button label="?" label_selected="?" name="button show owners help"/>
+		<button label="?" label_selected="?" name="button show owners help" left_delta="150"/>
 		<text name="label_parcel_modify">
 			Modificar la parcela
 		</text>
-		<button label="Subdividir..." label_selected="Subdividir..." name="button subdivide land"/>
-		<button label="Unir..." label_selected="Unir..." name="button join land"/>
+		<button label="Subdividir..." label_selected="Subdividir..." name="button subdivide land" width="140"/>
+		<button label="Unir..." label_selected="Unir..." name="button join land" width="140"/>
 		<text name="label_parcel_trans">
 			Transacciones de terreno
 		</text>
-		<button label="Comprar terreno..." label_selected="Comprar terreno..." name="button buy land"/>
-		<button label="Abandonar el terreno..." label_selected="Abandonar el terreno..." name="button abandon land"/>
+		<button label="Comprar terreno..." label_selected="Comprar terreno..." name="button buy land" width="140"/>
+		<button label="Abandonar el terreno..." label_selected="Abandonar el terreno..." name="button abandon land" width="140"/>
 	</panel>
 	<string name="status_rotate">
 		Arrastre las bandas de color para girar el objeto
@@ -586,7 +588,7 @@
 		Pulse y arrastre para estirar el lado seleccionado
 	</string>
 	<string name="status_move">
-		Arrastrar para mover, arrastrar + Mayús. para copiar
+		Arrastrar para mover, Mayús.+arrastrar para copiar
 	</string>
 	<string name="status_modifyland">
 		Mantenga pulsado para modificar el terreno
diff --git a/indra/newview/skins/default/xui/es/floater_top_objects.xml b/indra/newview/skins/default/xui/es/floater_top_objects.xml
index ce0c22062b..95f2c39d42 100644
--- a/indra/newview/skins/default/xui/es/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/es/floater_top_objects.xml
@@ -11,23 +11,26 @@
 		<column label="Tiempo" name="time"/>
 		<column label="Tiempo en Mono" name="mono_time"/>
 	</scroll_list>
+	<line_editor font="SansSerifSmall" left="140" name="id_editor" width="280"/>
+	<line_editor font="SansSerifSmall" left="140" name="object_name_editor" width="280"/>
+	<line_editor font="SansSerifSmall" left="140" name="owner_name_editor" width="280"/>
 	<text name="id_text">
 		ID del objeto:
 	</text>
-	<button label="Mostrar la baliza" name="show_beacon_btn"/>
+	<button label="Mostrar la baliza" name="show_beacon_btn" width="115"/>
 	<text name="obj_name_text">
 		Nombre del objeto:
 	</text>
-	<button label="Filtro" name="filter_object_btn"/>
-	<text name="owner_name_text">
+	<button label="Filtro" name="filter_object_btn" width="115"/>
+	<text name="owner_name_text" width="130">
 		Nombre del propietario:
 	</text>
-	<button label="Filtro" name="filter_owner_btn"/>
-	<button label="Devolver lo seleccionado" name="return_selected_btn"/>
-	<button label="Devolver todo" name="return_all_btn"/>
-	<button label="Desactivar lo seleccionado" name="disable_selected_btn"/>
-	<button label="Desactivar todo" name="disable_all_btn"/>
-	<button label="Actualizar" name="refresh_btn"/>
+	<button label="Filtro" name="filter_owner_btn" width="115"/>
+	<button label="Devolver lo seleccionado" name="return_selected_btn" width="170"/>
+	<button label="Devolver todo" name="return_all_btn" left="190"/>
+	<button label="Desactivar lo seleccionado" name="disable_selected_btn" width="170"/>
+	<button label="Desactivar todo" name="disable_all_btn" left="190"/>
+	<button label="Actualizar" name="refresh_btn" width="115"/>
 	<string name="top_scripts_title">
 		Scripts según su uso
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_url_entry.xml b/indra/newview/skins/default/xui/es/floater_url_entry.xml
index abdd69b090..f7c85ff068 100644
--- a/indra/newview/skins/default/xui/es/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/es/floater_url_entry.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="url_entry" title="">
 	<text name="media_label">
-		URL para media:
+		URL del media:
 	</text>
+	<combo_box left="106" name="media_entry" width="354" />
 	<button label="OK" name="ok_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>
 	<button label="Limpiar" name="clear_btn"/>
diff --git a/indra/newview/skins/default/xui/es/floater_water.xml b/indra/newview/skins/default/xui/es/floater_water.xml
index 5a759af5ff..934fc7882b 100644
--- a/indra/newview/skins/default/xui/es/floater_water.xml
+++ b/indra/newview/skins/default/xui/es/floater_water.xml
@@ -11,20 +11,20 @@
 			<text name="BHText">
 				Color del agua
 			</text>
-			<button label="?" name="WaterFogColorHelp"/>
+			<button label="?" name="WaterFogColorHelp" left="175" />
 			<color_swatch label="" name="WaterFogColor" tool_tip="Pulse para abrir el selector de color"/>
 			<text name="WaterFogDensText">
 				Transparencia
 			</text>
-			<button label="?" name="WaterFogDensityHelp"/>
+			<button label="?" name="WaterFogDensityHelp" left="175" />
 			<text name="WaterUnderWaterFogModText">
 				Modificar la claridad del agua
 			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp"/>
+			<button label="?" name="WaterUnderWaterFogModHelp" left="175" />
 			<text name="BDensText">
 				Tamaño de las ondulaciones
 			</text>
-			<button label="?" name="WaterNormalScaleHelp"/>
+			<button label="?" name="WaterNormalScaleHelp" left="405"/>
 			<text name="BHText2">
 				1
 			</text>
@@ -37,29 +37,29 @@
 			<text name="HDText">
 				Escala de Fresnel
 			</text>
-			<button label="?" name="WaterFresnelScaleHelp"/>
+			<button label="?" name="WaterFresnelScaleHelp" left="405"/>
 			<text name="FresnelOffsetText">
 				Coeficiente de reflexión
 			</text>
-			<button label="?" name="WaterFresnelOffsetHelp"/>
+			<button label="?" name="WaterFresnelOffsetHelp" left="405"/>
 			<text name="DensMultText">
 				Refracción de la superficie
 			</text>
-			<button label="?" name="WaterScaleAboveHelp"/>
+			<button label="?" name="WaterScaleAboveHelp" left="640"/>
 			<text name="WaterScaleBelowText">
 				Refracción bajo la superficie
 			</text>
-			<button label="?" name="WaterScaleBelowHelp"/>
+			<button label="?" name="WaterScaleBelowHelp" left="640"/>
 			<text name="MaxAltText">
 				Desenfoque
 			</text>
-			<button label="?" name="WaterBlurMultiplierHelp"/>
+			<button label="?" name="WaterBlurMultiplierHelp" left="640"/>
 		</panel>
 		<panel label="Imagen" name="Waves">
 			<text name="BHText">
 				Sentido de la onda grande
 			</text>
-			<button label="?" name="WaterWave1Help"/>
+			<button label="?" name="WaterWave1Help" left="170"/>
 			<text name="WaterWave1DirXText">
 				X
 			</text>
@@ -69,7 +69,7 @@
 			<text name="BHText2">
 				Sentido de la onda pequeña
 			</text>
-			<button label="?" name="WaterWave2Help"/>
+			<button label="?" name="WaterWave2Help" left="170"/>
 			<text name="WaterWave2DirXText">
 				X
 			</text>
diff --git a/indra/newview/skins/default/xui/es/floater_windlight_options.xml b/indra/newview/skins/default/xui/es/floater_windlight_options.xml
index 79b70d4d59..e240dea0b5 100644
--- a/indra/newview/skins/default/xui/es/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_windlight_options.xml
@@ -6,7 +6,7 @@
 	<button label="Nuevo" label_selected="Nuevo" name="WLNewPreset"/>
 	<button label="Guardar" label_selected="Guardar" name="WLSavePreset"/>
 	<button label="Borrar" label_selected="Borrar" name="WLDeletePreset"/>
-	<button label="Editor del ciclo de un día" label_selected="Editor del ciclo de un día" name="WLDayCycleMenuButton"/>
+	<button font="SansSerifSmall" width="150" left_delta="90" label="Editor del ciclo de un día" label_selected="Editor del ciclo de un día" name="WLDayCycleMenuButton"/>
 	<tab_container name="WindLight Tabs">
 		<panel label="Atmósfera" name="Atmosphere">
 			<text name="BHText">
@@ -122,7 +122,7 @@
 			<text name="WLCloudColorText">
 				Color de las nubes
 			</text>
-			<button label="?" name="WLCloudColorHelp"/>
+			<button label="?" name="WLCloudColorHelp" left="190" />
 			<text name="BHText">
 				R
 			</text>
@@ -138,7 +138,7 @@
 			<text name="WLCloudColorText2">
 				Posición/Densidad de las nubes
 			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
+			<button label="?" name="WLCloudDensityHelp" left="190"/>
 			<text name="BHText5">
 				X
 			</text>
@@ -156,11 +156,12 @@
 				Altitud de las nubes
 			</text>
 			<button label="?" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				Detalle de las nubes (Posición/Densidad)
+			<text name="WLCloudDetailText" font="SansSerifSmall">
+				Detalle de las nubes
+(Posición/Densidad)
 			</text>
 			<button label="?" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
+			<text name="BHText8" bottom="-113">
 				X
 			</text>
 			<text name="BHText9">
@@ -169,18 +170,19 @@
 			<text name="BHText10">
 				D
 			</text>
+			<slider bottom="-127" name="WLCloudDetailX"/>
 			<text name="WLCloudScrollXText">
-				Velocidad de las nubes: X
+				Velocidad de X
 			</text>
 			<button label="?" name="WLCloudScrollXHelp"/>
 			<check_box label="Bloquear" name="WLCloudLockX"/>
 			<text name="WLCloudScrollYText">
-				Velocidad de las nubes: Y
+				Velocidad de Y
 			</text>
 			<button label="?" name="WLCloudScrollYHelp"/>
 			<check_box label="Bloquear" name="WLCloudLockY"/>
 			<check_box label="Incluir nubes clásicas" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp"/>
+			<button label="?" name="WLClassicCloudsHelp" left="618"/>
 		</panel>
 	</tab_container>
 	<string name="WLDefaultSkyNames">
diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml
index e5fd4b3aae..68245ffb70 100644
--- a/indra/newview/skins/default/xui/es/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_general.xml
@@ -37,9 +37,9 @@ Ponga su ratón sobre las opciones para más información.
 		(los propietarios aparecen en negrilla)
 	</text>
 	<name_list name="visible_members">
-		<column label="Nombre del miembro" name="name"/>
-		<column label="Etiqueta" name="title"/>
-		<column label="Última conexión" name="online"/>
+		<column label="Nombre del miembro" name="name" relwidth="0.40"/>
+		<column label="Etiqueta" name="title" relwidth="0.25"/>
+		<column label="Última conexión" name="online" relwidth="0.35"/>
 	</name_list>
 	<text name="text_group_preferences">
 		Preferencias del grupo
@@ -47,9 +47,9 @@ Ponga su ratón sobre las opciones para más información.
 	<panel name="preferences_container">
 		<check_box label="Mostrar en la búsqueda" name="show_in_group_list" tool_tip="Dejar que la gente vea este grupo en los resultados de la búsqueda."/>
 		<check_box label="Inscripción libre" name="open_enrollement" tool_tip="Definir si se admiten al grupo nuevos miembros sin que sea preciso invitárseles."/>
-		<check_box label="Cuota de inscripción en L$" name="check_enrollment_fee" tool_tip="Define si se requiere una cuota para entrar al grupo."/>
-		<spinner name="spin_enrollment_fee" tool_tip="Cuando está marcado &apos;Cuota de inscripción&apos;, los miembros nuevos deben pagar esta cuota para entrar al grupo."/>
-		<combo_box name="group_mature_check" tool_tip="Establece si la información de su grupo es &apos;mature&apos;.">
+		<check_box label="Cuota de inscripción&#10; en L$:" name="check_enrollment_fee" tool_tip="Define si se requiere una cuota para entrar al grupo."/>
+		<spinner width="60" left_delta="130" name="spin_enrollment_fee" tool_tip="Cuando está marcado &apos;Cuota de inscripción&apos;, los miembros nuevos deben pagar esta cuota para entrar al grupo."/>
+		<combo_box bottom_delta="-38" width="150" name="group_mature_check" tool_tip="Establece si la información de su grupo es &apos;mature&apos;.">
 			<combo_item name="select_mature">
 				- Elegir Calificación -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml
index 5f5f2c6e2e..f66f0c473a 100644
--- a/indra/newview/skins/default/xui/es/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Invitar a un miembro" name="invite_panel">
-	<text name="help_text">
-		Puede seleccionar a varios residentes para 
-invitarles a su grupo. Para empezar, pulse
-&apos;Abrir el selector de residentes&apos;.
+<panel label="Invitar a un miembro" name="invite_panel" width="224">
+	<text name="help_text" height="72" bottom_delta="-96" width="214">
+		Puede seleccionar a varios residentes
+para invitarles a su grupo. Para
+empezar, pulse &apos;Abrir el selector de
+residentes&apos;.
 	</text>
-	<button label="Abrir el selector de residentes" name="add_button" tool_tip=""/>
-	<name_list name="invitee_list" tool_tip="Para seleccionar a varios residentes, mantenga pulsada la tecla Ctrl y vaya pulsando sus nombres."/>
-	<button label="Eliminar de la lista a los seleccionados" name="remove_button" tool_tip="Elimina los residentes seleccionados de la lista de invitaciones."/>
+	<button bottom_delta="-10" label="Abrir el selector de residentes" name="add_button" tool_tip=""/>
+	<name_list height="156" bottom_delta="-160" name="invitee_list" tool_tip="Para seleccionar a varios residentes, mantenga pulsada la tecla Ctrl y vaya pulsando sus nombres."/>
+	<button left_delta="-7" width="214" label="Eliminar de la lista a los seleccionados" name="remove_button" tool_tip="Elimina los residentes seleccionados de la lista de invitaciones."/>
 	<text name="role_text">
 		Elegir qué rol asignarles:
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
index 32473b8133..b4ea0dbeda 100644
--- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
@@ -13,17 +13,17 @@
 	<string name="loading_txt">
 		Cargando...
 	</string>
-	<text name="group_land_heading">
+	<text name="group_land_heading" width="250">
 		Terreno propiedad del grupo
 	</text>
 	<scroll_list name="group_parcel_list">
-		<column label="Parcela" name="name"/>
-		<column label="Región" name="location"/>
-		<column label="Tipo" name="type"/>
-		<column label="Superficie" name="area"/>
+		<column label="Parcela" name="name" width="100"/>
+		<column label="Región" name="location" width="100"/>
+		<column label="Tipo" name="type" width="100"/>
+		<column label="Superficie" name="area" width="81"/>
 		<column label="" name="hidden"/>
 	</scroll_list>
-	<button label="Mostrar en el mapa" label_selected="Mostrar en el mapa" name="map_button"/>
+	<button label="Mostrar en el mapa" label_selected="Mostrar en el mapa" name="map_button" left="282" width="130"/>
 	<text name="total_contributed_land_label">
 		Contribución total:
 	</text>
@@ -52,7 +52,8 @@
 		m² ([AMOUNT] máx.)
 	</text>
 	<text name="group_over_limit_text">
-		Los miembros del grupo deben contribuir con más créditos de terreno para mantener el terreno en uso.
+		Los miembros del grupo deben contribuir con más créditos de terreno
+para mantener el terreno en uso.
 	</text>
 	<text name="group_money_heading">
 		L$ del grupo
diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml
index 8215575362..1ca673332b 100644
--- a/indra/newview/skins/default/xui/es/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_notices.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Avisos" name="notices_tab">
 	<text name="help_text">
-		Los avisos son una forma rápida de comunicación dentro
-de un grupo, difundiendo un mensaje y,
-si se quiere, añadiéndole un ítem. Los avisos sólo
-los reciben los miembros del grupo cuyo rol
-tiene adjudicada tal habilidad. Puede desactivar
-los avisos en la pestaña General
+		Los avisos son una forma rápida de comunicación dentro de un grupo, difundiendo un mensaje y, si se quiere, añadiéndole un ítem. Los avisos sólo los reciben los miembros del grupo cuyo rol tiene adjudicada tal habilidad. Puede desactivar los avisos en la pestaña General.
 	</text>
 	<text name="no_notices_text">
 		No hay avisos pasados.
@@ -16,9 +11,9 @@ los avisos en la pestaña General
 		Archivo de avisos del grupo
 	</text>
 	<text name="lbl2">
-		Los avisos se mantienen durante 14 días. Pulse en la lista de abajo el que quiere ver.
-Pulse el botón &apos;Actualizar&apos; para comprobar si se han recibido avisos nuevos.
-Las listas de avisos tienen un límite de 200 avisos por día.
+		Los avisos se mantienen durante 14 días. Pulse en la lista de abajo el que 
+quiere ver. Pulse el botón &apos;Actualizar&apos; para comprobar si se han recibido avisos 
+nuevos. Las listas de avisos tienen un límite de 200 avisos por día.
 	</text>
 	<scroll_list name="notice_list">
 		<column label="Asunto" name="subject"/>
@@ -35,8 +30,8 @@ Las listas de avisos tienen un límite de 200 avisos por día.
 			Crear un aviso
 		</text>
 		<text name="lbl2">
-			Para enviar un aviso, debe escribir un asunto. Puede añadir un ítem
-al aviso arrastrándolo desde su inventario a este panel. 
+			Para enviar un aviso, debe escribir un asunto. Puede añadir un
+ítem al aviso arrastrándolo desde su inventario a este panel. 
 Los ítems anexados deben ser copiables y transferibles,
 y no se puede enviar una carpeta.
 		</text>
diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml
index 8cc1a4ba9d..2739a3da5e 100644
--- a/indra/newview/skins/default/xui/es/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml
@@ -12,7 +12,9 @@
 			Miembros y Roles
 		</text>
 		<text name="static2">
-			Los miembros del grupo tienen asignados roles con distintas capacidades. Estas configuraciones son fácilmente personalizables, para facilitar una mayor flexibilidad y organización.
+			Los miembros del grupo tienen asignados roles con distintas capacidades.
+Estas configuraciones son fácilmente personalizables, para facilitar una 
+mayor flexibilidad y organización.
 		</text>
 	</panel>
 	<panel name="roles_header">
@@ -20,12 +22,14 @@
 			Roles
 		</text>
 		<text name="role_properties_modifiable">
-			Elija un rol de los de abajo. Puede modificar su nombre, su descripción, y la etiqueta de los miembros.
+			Elija un rol de los de abajo. Puede modificar su nombre, su
+descripción, y la etiqueta de los miembros.
 		</text>
 		<text name="role_properties_not_modifiable">
-			Elija un rol de los de abajo para ver sus propiedades, miembros, y qué capacidades tiene asignadas.
+			Elija un rol de los de abajo para ver sus propiedades, miembros, y qué
+capacidades tiene asignadas.
 		</text>
-		<text name="role_actions_modifiable">
+		<text bottom_delta="-28" name="role_actions_modifiable">
 			También puede asignar capacidades al rol.
 		</text>
 		<text name="role_actions_not_modifiable">
@@ -37,29 +41,32 @@
 			Capacidades
 		</text>
 		<text name="static2">
-			Puede ver una descripción de la capacidad, y qué miembros y roles pueden realizarla.
+			Puede ver una descripción de la capacidad, y qué miembros y roles pueden
+realizarla.
 		</text>
 	</panel>
-	<tab_container name="roles_tab_container">
-		<panel label="Miembros" name="members_sub_tab" tool_tip="Miembros">
-			<button label="Buscar" name="search_button"/>
-			<button label="Verlos todos" name="show_all_button"/>
-			<name_list name="member_list">
+	<tab_container height="164" name="roles_tab_container">
+		<panel height="148" label="Miembros" name="members_sub_tab" tool_tip="Miembros">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Buscar" name="search_button" width="75"/>
+			<button label="Verlos todos" name="show_all_button" left_delta="80"/>
+			<name_list name="member_list" bottom_delta="-105" height="104" >
 				<column label="Nombre del miembro" name="name"/>
 				<column label="Cuotas donadas" name="donated"/>
 				<column label="Última conexión" name="online"/>
 			</name_list>
-			<button label="Invitar a un nuevo miembro..." name="member_invite"/>
+			<button label="Invitar a un nuevo miembro..." name="member_invite" width="175"/>
 			<button label="Expulsar del grupo" name="member_eject"/>
 			<string name="help_text">
 				Puede añadir o quitar los roles asignados a los miembros.
 Seleccione varios nombres manteniendo pulsada la tecla Ctrl y pulsando en cada uno de ellos.
 			</string>
 		</panel>
-		<panel label="Roles" name="roles_sub_tab">
-			<button label="Buscar" name="search_button"/>
-			<button label="Verlos todos" name="show_all_button"/>
-			<scroll_list name="role_list">
+		<panel height="148" label="Roles" name="roles_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Buscar" name="search_button" width="75"/>
+			<button label="Verlos todos" name="show_all_button" left_delta="80"/>
+			<scroll_list name="role_list" bottom_delta="-104" height="104">
 				<column label="Nombre del rol" name="name"/>
 				<column label="Etiqueta" name="title"/>
 				<column label="Miembros" name="members"/>
@@ -73,10 +80,11 @@ Seleccione varios nombres manteniendo pulsada la tecla Ctrl y pulsando en cada u
 				Los roles de &apos;Todos&apos; y &apos;Propietarios&apos; son especiales, y no pueden eliminarse.
 			</string>
 		</panel>
-		<panel label="Capacidades" name="actions_sub_tab">
-			<button label="Buscar" name="search_button"/>
-			<button label="Verlos todos" name="show_all_button"/>
-			<scroll_list name="action_list" tool_tip="Elija una capacidad para verla más en detalle.">
+		<panel height="148" label="Capacidades" name="actions_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Buscar" name="search_button" width="75"/>
+			<button label="Verlos todos" name="show_all_button" left_delta="80"/>
+			<scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Elija una capacidad para verla más en detalle.">
 				<column label="" name="icon"/>
 				<column label="" name="action"/>
 			</scroll_list>
diff --git a/indra/newview/skins/default/xui/es/panel_groups.xml b/indra/newview/skins/default/xui/es/panel_groups.xml
index 1259ded62f..232de85522 100644
--- a/indra/newview/skins/default/xui/es/panel_groups.xml
+++ b/indra/newview/skins/default/xui/es/panel_groups.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="groups">
-	<text name="groupdesc">
-		El grupo que tiene activado actualmente se muestra en negrilla
+	<scroll_list bottom="50" name="group list"/>
+	<text bottom="16" height="32" name="groupdesc" width="268">
+		El grupo que tiene activado actualmente se
+muestra en negrilla.
 	</text>
-	<text name="groupcount">
+	<text bottom="3" name="groupcount" width="268">
 		Pertenece a [COUNT] grupo/s (de un máximo de [MAX]).
 	</text>
 	<button label="MI/Llamar" name="IM" tool_tip="Abrir una sesión de mensajes instantáneos"/>
diff --git a/indra/newview/skins/default/xui/es/panel_region_covenant.xml b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
index 3f9e782bd7..220479098b 100644
--- a/indra/newview/skins/default/xui/es/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
@@ -22,14 +22,15 @@
 		Última modificación el miér. 31 de dic. de 1969, 16:00:00
 	</text>
 	<button label="?" name="covenant_help"/>
-	<text_editor name="covenant_editor">
+	<text_editor name="covenant_editor" bottom="-263" height="178" >
 		No se ha aportado un contrato para este estado.
 	</text_editor>
 	<button label="Cambiar" name="reset_covenant"/>
 	<text name="covenant_help_text">
-		Los cambios en el contrato se mostrarán en todas las parcelas del estado.
+		Los cambios en el contrato se mostrarán en todas las parcelas
+      del estado.
 	</text>
-	<text name="covenant_instructions">
+	<text name="covenant_instructions" bottom_delta="-31" >
 		Para cambiar el contrato de este estado, arrastre y suelte una nota.
 	</text>
 	<text name="region_section_lbl">
@@ -75,6 +76,7 @@
 		El terreno comprado en esta región se podrá unir o subdividir.
 	</string>
 	<string name="can_not_change">
-		El terreno comprado en esta región no se podrá unir ni subdividir.
+		El terreno comprado en esta región no se podrá unir ni
+subdividir.
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_debug.xml b/indra/newview/skins/default/xui/es/panel_region_debug.xml
index a722235243..a7999cc54d 100644
--- a/indra/newview/skins/default/xui/es/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_debug.xml
@@ -7,13 +7,13 @@
 		desconocida
 	</text>
 	<check_box label="Desactivar los scripts" name="disable_scripts_check" tool_tip="Descativar todos los scripts en esta región"/>
-	<button label="?" name="disable_scripts_help"/>
+	<button label="?" name="disable_scripts_help" left="215"/>
 	<check_box label="Desactivar las colisiones" name="disable_collisions_check" tool_tip="Desactiva las colisiones (no las de avatares) en esta región"/>
-	<button label="?" name="disable_collisions_help"/>
+	<button label="?" name="disable_collisions_help" left="215"/>
 	<check_box label="Desactivar las propiedades físicas" name="disable_physics_check" tool_tip="Desactiva toda la física en esta región"/>
-	<button label="?" name="disable_physics_help"/>
+	<button label="?" name="disable_physics_help" left="215"/>
 	<button label="Aplicar" name="apply_btn"/>
-	<text name="objret_text_lbl">
+	<text name="objret_text_lbl" width="130">
 		Devolver el objeto
 	</text>
 	<text name="resident_text_lbl">
@@ -30,10 +30,10 @@
 	<check_box label="Devolver sólo los objetos que están en terreno de otro" name="return_other_land" tool_tip="Devolver sólo los objetos que están en terreno de otro"/>
 	<check_box label="Devolver los objetos de cualquier región de este estado" name="return_estate_wide" tool_tip="Devolver los objetos de todas las regiones que forman este estado"/>
 	<button label="Devolver" name="return_btn"/>
-	<button label="Listar los objetos que colisionan..." name="top_colliders_btn" tool_tip="Lista de los objetos con más posibles colisiones potenciales"/>
-	<button label="?" name="top_colliders_help"/>
-	<button label="Listar los scripts según su uso..." name="top_scripts_btn" tool_tip="Lista de los objetos que más tiempo emplean ejecutando scripts"/>
-	<button label="?" name="top_scripts_help"/>
+	<button width="280" label="Listar los objetos que colisionan..." name="top_colliders_btn" tool_tip="Lista de los objetos con más posibles colisiones potenciales"/>
+	<button label="?" name="top_colliders_help" left="297"/>
+	<button width="280" label="Listar los scripts según su uso..." name="top_scripts_btn" tool_tip="Lista de los objetos que más tiempo emplean ejecutando scripts"/>
+	<button label="?" name="top_scripts_help" left="297"/>
 	<button label="Reiniciar la región" name="restart_btn" tool_tip="Cuenta atrás de 2 minutos y reiniciar la región"/>
 	<button label="?" name="restart_help"/>
 	<button label="Retrasar el reinicio" name="cancel_restart_btn" tool_tip="Retrasar una hora el reinicio de la región"/>
diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml
index 93155d828d..f16ec89cb0 100644
--- a/indra/newview/skins/default/xui/es/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Estado" name="Estate">
 	<text name="estate_help_text">
-		Los cambios en las configuraciones de esta pestaña afectarán a todas
-las regiones de este estado.
+		Los cambios en las configuraciones de esta 
+pestaña afectarán a todas las regiones del estado.
 	</text>
 	<text name="estate_text">
 		Estado:
@@ -24,16 +24,16 @@ las regiones de este estado.
 	<check_box label="Permitir el acceso público" name="externally_visible_check"/>
 	<button label="?" name="externally_visible_help"/>
 	<text name="Only Allow">
-		Impedir el acceso a:
+		Impedir el acceso a Residentes...
 	</text>
-	<check_box label="Residentes sin información de pago archivada" name="limit_payment" tool_tip="Impedir el acceso a los residentes no identificados."/>
-	<check_box label="Residentes de los que no se ha verificado si son adultos" name="limit_age_verified" tool_tip="Impedir el acceso a residentes que no hayan verificado su edad. Para más información, vea  support.secondlife.com"/>
+	<check_box label="sin información de pago archivada" name="limit_payment" tool_tip="Impedir el acceso a los residentes no identificados."/>
+	<check_box label="que no han verificado si son adultos" name="limit_age_verified" tool_tip="Impedir el acceso a residentes que no hayan verificado su edad. Para más información, vea  support.secondlife.com"/>
 	<check_box label="Permitir el chat de voz" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Permitir el teleporte a cualquier punto" name="allow_direct_teleport"/>
 	<button label="?" name="allow_direct_teleport_help"/>
-	<text name="abuse_email_text">
-		Dirección de correo electrónico para infracciones:
+	<text name="abuse_email_text" width="260">
+		Dirección de correo-e para infracciones:
 	</text>
 	<string name="email_unsupported">
 		Característica no disponible
@@ -63,7 +63,7 @@ las regiones de este estado.
 	<text name="ban_resident_label">
 		Residentes con el acceso prohibido:
 	</text>
-	<button label="?" name="ban_resident_help"/>
+	<button label="?" name="ban_resident_help" right="476"/>
 	<button label="Quitar..." name="remove_banned_avatar_btn"/>
 	<button label="Añadir..." name="add_banned_avatar_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml
index 64169e427b..155161489e 100644
--- a/indra/newview/skins/default/xui/es/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_general.xml
@@ -30,11 +30,11 @@
 	<button label="?" name="land_resell_help"/>
 	<check_box label="Permitir unir/dividir el terreno" name="allow_parcel_changes_check"/>
 	<button label="?" name="parcel_changes_help"/>
-	<check_box label="Bloquear el mostrar el terreno en la búsqueda." name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda."/>
+	<check_box label="Bloquear el mostrar el terreno en &#10;la búsqueda." name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda."/>
 	<button label="?" name="parcel_search_help"/>
-	<spinner label="Nº máximo de avatares" name="agent_limit_spin"/>
+	<spinner label="Nº máximo de avatares" name="agent_limit_spin" label_width="120" width="180"/>
 	<button label="?" name="agent_limit_help"/>
-	<spinner label="Plus de objetos" name="object_bonus_spin"/>
+	<spinner label="Plus de objetos" name="object_bonus_spin" label_width="120" width="180"/>
 	<button label="?" name="object_bonus_help"/>
 	<text label="Calificación" name="access_text">
 		Calificación:
@@ -54,6 +54,6 @@
 	<button label="Aplicar" name="apply_btn"/>
 	<button label="Teleportar a su Base a un usuario..." name="kick_btn"/>
 	<button label="Teleportar a su Base a todos los usuarios..." name="kick_all_btn"/>
-	<button label="Enviar un mensaje a toda la región..." name="im_btn"/>
-	<button label="Administrar el Punto de Teleporte..." name="manage_telehub_btn"/>
+	<button label="Enviar un mensaje a toda la región..." name="im_btn" width="250" />
+	<button label="Administrar el Punto de Teleporte..." name="manage_telehub_btn" width="210"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
index df333c0c5e..903b826a0b 100644
--- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
@@ -8,9 +8,9 @@
 	</text>
 	<spinner label="Nivel del agua" name="water_height_spin"/>
 	<button label="?" name="water_height_help"/>
-	<spinner label="Límite de elevación del terreno" name="terrain_raise_spin"/>
+	<spinner label="Límite de elevación del &#10;terreno" name="terrain_raise_spin"/>
 	<button label="?" name="terrain_raise_help"/>
-	<spinner label="Límite de bajada del terreno" name="terrain_lower_spin"/>
+	<spinner label="Límite de bajada del &#10;terreno" name="terrain_lower_spin" bottom_delta="-34"/>
 	<button label="?" name="terrain_lower_help"/>
 	<check_box label="Usar el Sol del estado" name="use_estate_sun_check"/>
 	<button label="?" name="use_estate_sun_help"/>
@@ -18,10 +18,10 @@
 	<button label="?" name="fixed_sun_help"/>
 	<slider label="Fase" name="sun_hour_slider"/>
 	<button label="Aplicar" name="apply_btn"/>
-	<button label="Descargar el RAW del terreno..." name="download_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/>
-	<button label="?" name="download_raw_help"/>
-	<button label="Subir un RAW para el terreno..." name="upload_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/>
-	<button label="?" name="upload_raw_help"/>
-	<button label="Predeterminar este terreno" name="bake_terrain_btn" tool_tip="Definir el terreno actual como punto medio para los límites de elevación/bajada"/>
-	<button label="?" name="bake_terrain_help"/>
+	<button width="230" label="Descargar el RAW del terreno..." name="download_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/>
+	<button left="246" label="?" name="download_raw_help"/>
+	<button width="230" label="Subir un RAW para el terreno..." name="upload_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/>
+	<button left="246" label="?" name="upload_raw_help"/>
+	<button width="230" label="Predeterminar este terreno" name="bake_terrain_btn" tool_tip="Definir el terreno actual como punto medio para los límites de elevación/bajada"/>
+	<button left="246" label="?" name="bake_terrain_help"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_texture.xml b/indra/newview/skins/default/xui/es/panel_region_texture.xml
index d7f42ac41c..5540358f97 100644
--- a/indra/newview/skins/default/xui/es/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_texture.xml
@@ -6,7 +6,7 @@
 	<text name="region_text">
 		desconocida
 	</text>
-	<text name="detail_texture_text">
+	<text name="detail_texture_text" width="380">
 		Texturas del terreno (se requieren archivos .tga de 512x512 y 24 bites)
 	</text>
 	<text name="height_text_lbl">
diff --git a/indra/newview/skins/default/xui/fr/floater_customize.xml b/indra/newview/skins/default/xui/fr/floater_customize.xml
index b1d7edbe52..89b3705570 100644
--- a/indra/newview/skins/default/xui/fr/floater_customize.xml
+++ b/indra/newview/skins/default/xui/fr/floater_customize.xml
@@ -183,7 +183,7 @@ votre avatar. Vous pouvez aussi en créer de nouveaux et les porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de chemise, faites-en glisser une de votre inventaire
+				Pour porter une nouvelle chemise, faites-en glisser une de votre inventaire
 jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
 			</text>
 			<text length="1" name="no modify instructions" type="string">
@@ -217,7 +217,7 @@ jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porte
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de pantalon, faites-en glisser un de votre inventaire
+				Pour porter un nouveau pantalon, faites-en glisser un de votre inventaire
 jusqu&apos;à votre avatar. Vous pouvez aussi en créer un nouveau et le porter.
 			</text>
 			<text length="1" name="no modify instructions" type="string">
@@ -244,7 +244,7 @@ jusqu&apos;à votre avatar. Vous pouvez aussi en créer un nouveau et le porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de chaussures, faites-en glisser une paire de votre
+				Pour porter de nouvelles chaussures, faites-en glisser une paire de votre
 inventaire jusqu&apos;à votre avatar. Vous pouvez aussi en créer une
 nouvelle paire et la porter.
 			</text>
@@ -279,7 +279,7 @@ nouvelle paire et la porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de chaussettes, faites-en glisser une paire de votre
+				Pour porter de nouvelles chaussettes, faites-en glisser une paire de votre
 inventaire jusqu&apos;à votre avatar. Vous pouvez aussi en créer une
 nouvelle paire et la porter.
 			</text>
@@ -314,8 +314,8 @@ nouvelle paire et la porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de veste, faites-en glisser une de votre inventaire jusqu&apos;à
-votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
+				Pour porter une nouvelle veste, faites-en glisser une de votre inventaire 
+jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
 			</text>
 			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
@@ -349,7 +349,7 @@ votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de gants, faites-en glisser une paire à partir de votre
+				Pour porter de nouveaux gants, faites-les glisser à partir de votre
 inventaire. Vous pouvez aussi en créer une nouvelle paire et la porter.
 			</text>
 			<text length="1" name="no modify instructions" type="string">
@@ -383,7 +383,7 @@ inventaire. Vous pouvez aussi en créer une nouvelle paire et la porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de sous-vêtement, faites-en glisser une paire à partir de
+				Pour porter de nouveaux sous-vêtements, faites-les glisser à partir de
 votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
 			</text>
 			<text length="1" name="no modify instructions" type="string">
@@ -418,7 +418,7 @@ votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de sous-vêtement, faites-en glisser une paire à partir de
+				Pour porter de nouveaux sous-vêtements, faites-les glisser à partir de
 votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
 			</text>
 			<text length="1" name="no modify instructions" type="string">
@@ -453,8 +453,8 @@ votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de jupe, faites-en glisser une à partir de votre inventaire.
-Vous pouvez aussi en créer une nouvelle et la porter.
+				Pour porter une nouvelle jupe, faites-en glisser une à partir de votre 
+inventaire. Vous pouvez aussi en créer une nouvelle et la porter.
 			</text>
 			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory.xml b/indra/newview/skins/default/xui/fr/floater_inventory.xml
index 071c0ae133..7173025d18 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory.xml
@@ -29,8 +29,8 @@
 				<menu_item_call label="Nouvelle veste" name="New Jacket"/>
 				<menu_item_call label="Nouvelle jupe" name="New Skirt"/>
 				<menu_item_call label="Nouveaux gants" name="New Gloves"/>
-				<menu_item_call label="Nouveau tricot" name="New Undershirt"/>
-				<menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/>
+				<menu_item_call label="Nouveaux sous-vêtements (haut)" name="New Undershirt"/>
+				<menu_item_call label="Nouveaux sous-vêtements (bas)" name="New Underpants"/>
 			</menu>
 			<menu name="New Body Parts">
 				<menu_item_call label="Nouvelle silhouette" name="New Shape"/>
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 090f5f6bc9..cb7e618232 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
@@ -12,13 +12,13 @@
 	<check_box label="Textures" name="check_texture"/>
 	<check_box label="Photos" name="check_snapshot"/>
 	<button label="Tout" label_selected="Tout" name="All" width="70"/>
-	<button label="Aucun" label_selected="Aucun" name="None" width="70" bottom="-260" left="83"/>
-	<check_box label="Toujours montrer &#10;les dossiers" name="check_show_empty" bottom="-284"/>
-	<check_box label="Depuis la déconnexion" name="check_since_logoff" bottom="-318"/>
+	<button label="Aucun" label_selected="Aucun" name="None" width="70" bottom_delta="0" left="83"/>
+	<check_box label="Toujours montrer &#10;les dossiers" name="check_show_empty" bottom_delta="-20"/>
+	<check_box label="Depuis la déconnexion" name="check_since_logoff" bottom_delta="-36"/>
 	<text length="1" name="- OR -" type="string">
 		Ou il y a...
 	</text>
 	<spinner label="Heures" name="spin_hours_ago"/>
 	<spinner label="Jours" name="spin_days_ago"/>
-	<button label="Fermer" label_selected="Fermer" name="Close"/>
+	<button label="Fermer" label_selected="Fermer" name="Close" bottom_delta="-30"/>
 </floater>
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 a22d0a2934..8ee3a23b95 100644
--- a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
@@ -11,8 +11,8 @@
 	<text name="note_label_2">
 		[NOTE2]
 	</text>
-	<button label="Commencer" name="start_btn" />
-	<button label="Stop" name="stop_btn" />
-	<button label="Libérer" name="release_btn" />
+	<button label="Commencer" name="start_btn" width="85"/>
+	<button label="Stop" name="stop_btn" left="100"/>
+	<button label="Libérer" name="release_btn"  left="177"/>
 	<button label="Fermer" name="close_btn" />
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index e4ad34bf50..6e70a04cab 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -303,7 +303,7 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
 			<string name="search_disabled_permissions_tooltip">
 				Questa opzione è disabilitata perchè tu non puoi modificare le opzioni di questo terreno.
 			</string>
-			<combo_box name="land category with adult">
+			<combo_box name="land category with adult" left="282" width="140">
 				<combo_item name="AnyCategory">
 					Tutte le categorie
 				</combo_item>
@@ -344,7 +344,7 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
 					Altro
 				</combo_item>
 			</combo_box>
-			<combo_box name="land category">
+			<combo_box name="land category" left="282" width="140">
 				<combo_item name="AnyCategory">
 					Tutte le categorie
 				</combo_item>
@@ -382,7 +382,7 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
 					Altro
 				</combo_item>
 			</combo_box>
-			<button label="?" label_selected="?" name="?"/>
+			<button label="?" label_selected="?" name="?" left="427"/>
 			<check_box label="Contenuto Mature" name="MatureCheck" tool_tip=" "/>
 			<string name="mature_check_mature">
 				Contenuto Mature
diff --git a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
index 4e63c3b7d6..a223e30fb5 100644
--- a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
@@ -14,13 +14,15 @@
 		</panel>
 		<panel label="Vicino a me" name="NearMePanel">
 			<text name="InstructSelectResident">
-				Seleziona un residente nelle vicinanze:
+				Seleziona un residente
+nelle vicinanze:
 			</text>
-			<button label="Aggiorna la lista" label_selected="Aggiorna l&apos;elenco" name="Refresh"/>
-			<slider label="Range" name="near_me_range"/>
+			<button font="SansSerifSmall" left_delta="6" width="110" label="Aggiorna la lista" label_selected="Aggiorna l&apos;elenco" name="Refresh"/>
+			<slider label="Range" name="near_me_range" bottom_delta="-36"/>
 			<text name="meters">
 				Metri
 			</text>
+		<scroll_list bottom_delta="-169" height="159" name="NearMe"  />
 		</panel>
 	</tab_container>
 	<button label="Seleziona" label_selected="Seleziona" name="Select"/>
diff --git a/indra/newview/skins/default/xui/it/floater_build_options.xml b/indra/newview/skins/default/xui/it/floater_build_options.xml
index 340d70851c..2c60aeda2b 100644
--- a/indra/newview/skins/default/xui/it/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/it/floater_build_options.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="Opzioni della griglia">
-	<spinner label="Unità di misura della griglia (metri)" name="GridResolution"/>
-	<spinner label="Estensione della griglia (metri)" name="GridDrawSize"/>
+	<spinner label="Unità di misura della griglia (metri)" name="GridResolution" width="250" label_width="192"/>
+	<spinner label="Estensione della griglia (metri)" name="GridDrawSize" width="250" label_width="192"/>
 	<check_box label="Abilita sotto-unità di movimento" name="GridSubUnit"/>
 	<check_box label="Mostra piani d&apos;intersezione" name="GridCrossSection"/>
-	<slider label="Trasparenza della griglia" name="GridOpacity"/>
+	<slider label="Trasparenza della griglia" name="GridOpacity" width="250"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_contents.xml b/indra/newview/skins/default/xui/it/floater_buy_contents.xml
index dce10d5493..2836f98970 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_contents.xml
@@ -6,9 +6,9 @@
 	<text name="buy_text">
 		Compra per [AMOUNT]L$ da [NAME]?
 	</text>
-	<button label="Annulla" label_selected="Annulla" name="cancel_btn"/>
-	<button label="Compra" label_selected="Compra" name="buy_btn"/>
-	<check_box label="Indossa adesso l&apos;indumento" name="wear_check"/>
+	<button label="Annulla" label_selected="Annulla" name="cancel_btn" width="73"/>
+	<button label="Compra" label_selected="Compra" name="buy_btn" width="73" left_delta="-77"/>
+	<check_box label="Indossa adesso &#10;l&apos;indumento" name="wear_check" bottom="-234" left_delta="-125"/>
 	<string name="no_copy_text">
 		(non copiabile)
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency.xml b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
index aa840b4de4..a24f0dbe7a 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
@@ -22,14 +22,14 @@
 	<text name="buy_action">
 		[NAME] [PRICE]L$
 	</text>
-	<text name="currency_action">
+	<text name="currency_action" width="45">
 		Compra 
 	</text>
 	<line_editor name="currency_amt">
 		1234
 	</line_editor>
 	<text name="currency_est">
-		L$ per circa [USD]US$
+		L$  per circa [USD]US$
 	</text>
 	<text name="getting_data">
 		Dati in ricezione...
@@ -64,6 +64,6 @@ Devi aumentare l&apos;importo da acquistare.
 	<button label="Cancella" name="cancel_btn"/>
 	<button label="Acquista" name="buy_btn"/>
 	<string name="buy_currency">
-		Compra [LINDENS] L$ per circa [USD] US$
+		acquistare [LINDENS] L$ per circa [USD] US$
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
index cac43c9b8a..4c62d4f5a2 100644
--- a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
@@ -4,31 +4,31 @@
 		<panel label="Ciclo giorno/notte" name="Day Cycle">
 			<button label="?" name="WLDayCycleHelp"/>
 			<text name="WL12am">
-				12
+				0:00
 			</text>
 			<text name="WL3am">
-				3
+				3:00
 			</text>
 			<text name="WL6am">
-				6
+				6:00
 			</text>
 			<text name="WL9amHash">
-				9
+				9:00
 			</text>
 			<text name="WL12pmHash">
-				24
+				12:00
 			</text>
 			<text name="WL3pm">
-				15
+				15:00
 			</text>
 			<text name="WL6pm">
-				18
+				18:00
 			</text>
 			<text name="WL9pm">
-				21
+				21:00
 			</text>
 			<text name="WL12am2">
-				12
+				24:00
 			</text>
 			<text name="WL12amHash">
 				|
@@ -57,9 +57,9 @@
 			<text name="WL12amHash2">
 				|
 			</text>
-			<button label="Aggiungi voce" label_selected="Aggiungi voce" name="WLAddKey"/>
-			<button label="Cancella voce" label_selected="Cancella voce" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
+			<button font="SansSerifSmall" width="96" left="546" label="Aggiungi voce" label_selected="Aggiungi voce" name="WLAddKey"/>
+			<button font="SansSerifSmall" width="96" left="546" label="Cancella voce" label_selected="Cancella voce" name="WLDeleteKey"/>
+			<text name="WLCurKeyFrameText" width="210" left="17">
 				Impostazioni del fotogramma chiave:
 			</text>
 			<text name="WLCurKeyTimeText">
@@ -84,9 +84,9 @@
 			<text name="DayCycleText3">
 				Anteprima:
 			</text>
-			<button label="Avvia" label_selected="Avvia" name="WLAnimSky"/>
-			<button label="Arresta!" label_selected="Arresta" name="WLStopAnimSky"/>
-			<button label="Usa l&apos;ora della proprietà" label_selected="Vai all&apos;ora della proprietà" name="WLUseLindenTime"/>
+			<button width="55" font="SansSerifSmall" label="Avvia" label_selected="Avvia" name="WLAnimSky"/>
+			<button width="55" left_delta="60" font="SansSerifSmall" label="Arresta!" label_selected="Arresta" name="WLStopAnimSky"/>
+			<button left_delta="60" width="150" font="SansSerifSmall" label="Usa l&apos;ora della proprietà" label_selected="Vai all&apos;ora della proprietà" name="WLUseLindenTime"/>
 			<button label="Salva il test del giorno" label_selected="Salva il test del giorno" name="WLSaveDayCycle"/>
 			<button label="Carica il test del giorno" label_selected="Carica il test del giorno" name="WLLoadDayCycle"/>
 		</panel>
diff --git a/indra/newview/skins/default/xui/it/floater_env_settings.xml b/indra/newview/skins/default/xui/it/floater_env_settings.xml
index 58fbff5dc9..36f97bda81 100644
--- a/indra/newview/skins/default/xui/it/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/it/floater_env_settings.xml
@@ -1,22 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Environment Editor Floater" title="Editor dell&apos;ambiente">
 	<text name="EnvTimeText">
-		Ora del giorno
+		Ora del
+giorno
 	</text>
 	<text name="EnvTimeText2">
 		12:00 PM
 	</text>
 	<text name="EnvCloudText">
-		Intensità delle Nuvole
+		Intensità delle
+Nuvole
 	</text>
 	<text name="EnvWaterColorText">
-		Colore dell&apos;Acqua
+		Colore
+dell&apos;Acqua
 	</text>
 	<color_swatch label="" name="EnvWaterColor" tool_tip="Clicca per aprire la tavolozza dei colori"/>
 	<text name="EnvWaterFogText">
-		Nebbiosità dell&apos;acqua
+		Nebbiosità
+dell&apos;acqua
 	</text>
-	<button label="Usa orario della regione" name="EnvUseEstateTimeButton"/>
+	<button bottom="-144" label="Usa orario della regione" name="EnvUseEstateTimeButton" width="145"/>
 	<button label="Cielo avanzato" name="EnvAdvancedSkyButton"/>
 	<button label="Acqua avanzata" name="EnvAdvancedWaterButton"/>
 	<button label="?" name="EnvSettingsHelpButton"/>
diff --git a/indra/newview/skins/default/xui/it/floater_gesture.xml b/indra/newview/skins/default/xui/it/floater_gesture.xml
index 27008e97a1..997e13ecb5 100644
--- a/indra/newview/skins/default/xui/it/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/it/floater_gesture.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gestures" title="Gesture attive">
 	<text name="help_label">
-		Fai doppio click su una gesture per azionare animazioni e suoni.
+		Fai doppio click su una gesture per azionare animazioni
+e suoni.
 	</text>
-	<scroll_list name="gesture_list">
-		<column label="Frase scatenante" name="trigger"/>
-		<column label="Pulsante" name="shortcut"/>
-		<column label="Nome" name="name"/>
+	<scroll_list bottom_delta="-385" height="360" name="gesture_list">
+		<column label="Frase scatenante" name="trigger" width="106"/>
+		<column label="Pulsante" name="shortcut" width="65"/>
+		<column label="Nome" name="name" width="129"/>
 	</scroll_list>
 	<button label="Nuova" name="new_gesture_btn"/>
 	<button label="Modifica" name="edit_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_inspect.xml b/indra/newview/skins/default/xui/it/floater_inspect.xml
index cbf2935c77..6028c40557 100644
--- a/indra/newview/skins/default/xui/it/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/it/floater_inspect.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="inspect" title="Ispeziona oggetti">
+<floater name="inspect" title="Ispeziona oggetti" min_width="450">
 	<scroll_list name="object_list" tool_tip="Seleziona un oggetto da questo elenco per evidenziarlo inworld">
 		<column label="Nome dell&apos;oggetto" name="object_name"/>
-		<column label="Nome del proprietario" name="owner_name"/>
-		<column label="Nome del creatore" name="creator_name"/>
+		<column label="Proprietario" name="owner_name"/>
+		<column label="Creatore" name="creator_name"/>
 		<column label="Data di creazione" name="creation_date"/>
 	</scroll_list>
-	<button label="Vedi il profilo del proprietario..." label_selected="" name="button owner" tool_tip="Vedi il profilo del proprietario dell&apos;oggetto evidenziato"/>
-	<button label="Vedi il profilo del creatore..." label_selected="" name="button creator" tool_tip="Vedi il profilo del creatore originale dell&apos;oggetto evidenziato"/>
+	<button width="185" label="Vedi il profilo del proprietario..." label_selected="" name="button owner" tool_tip="Vedi il profilo del proprietario dell&apos;oggetto evidenziato"/>
+	<button width="165" left="205" label="Vedi il profilo del creatore..." label_selected="" name="button creator" tool_tip="Vedi il profilo del creatore originale dell&apos;oggetto evidenziato"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
index 935e1d7049..c2c05b4023 100644
--- a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory Finder" title="Inventario_Cose_recenti">
+<floater name="Inventory Finder" title="Inventario_Cose_recenti" width="165">
 	<check_box label="Animazioni" name="check_animation"/>
 	<check_box label="Biglietti da visita" name="check_calling_card"/>
 	<check_box label="Abiti" name="check_clothing"/>
diff --git a/indra/newview/skins/default/xui/it/floater_joystick.xml b/indra/newview/skins/default/xui/it/floater_joystick.xml
index dcd637f199..ced227a845 100644
--- a/indra/newview/skins/default/xui/it/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/it/floater_joystick.xml
@@ -3,23 +3,24 @@
 	<check_box name="enable_joystick">
 		Abilita Joystick:
 	</check_box>
-	<spinner label="Mapping asse X" name="JoystickAxis1"/>
-	<spinner label="Mapping asse Y" name="JoystickAxis2"/>
-	<spinner label="Mapping asse Z" name="JoystickAxis0"/>
-	<spinner label="Mapping della direzione o Pitch" name="JoystickAxis4"/>
-	<spinner label="Mapping dell&apos;altitudine o Yaw" name="JoystickAxis5"/>
-	<spinner label="Mapping del Roll" name="JoystickAxis3"/>
-	<spinner label="Mapping dello Zoom" name="JoystickAxis6"/>
-	<check_box label="Zoom diretto" name="ZoomDirect"/>
+	<text left="120" name="joystick_type" width="380"/>
+	<spinner label="Mapping: asse X" name="JoystickAxis1" label_width="140" width="180" left="12"/>
+	<spinner label="Mapping: asse Y" name="JoystickAxis2" label_width="134" width="174" left="205"/>
+	<spinner label="Mapping: asse Z" name="JoystickAxis0" label_width="94" width="134" left="390"/>
+	<spinner label="Mapping: direzione o Pitch" name="JoystickAxis4" label_width="140" width="180" left="12"/>
+	<spinner label="Mapping: altitudine o Yaw" name="JoystickAxis5" label_width="134" width="174" left="205"/>
+	<spinner label="Mapping del Roll" name="JoystickAxis3" label_width="94" width="134" left="390"/>
+	<spinner label="Mapping dello Zoom" name="JoystickAxis6" label_width="140" width="180" left="12"/>
+	<check_box label="Zoom diretto" name="ZoomDirect" left="205"/>
 	<check_box label="Cursore 3D" name="Cursor3D"/>
 	<check_box label="Auto livellamento" name="AutoLeveling"/>
-	<text name="Control Modes:">
+	<text name="Control Modes:" left="3" width="113">
 		Modalità di controllo:
 	</text>
 	<check_box name="JoystickAvatarEnabled">
 		Avatar
 	</check_box>
-	<check_box name="JoystickBuildEnabled">
+	<check_box name="JoystickBuildEnabled" left="192">
 		Costruire
 	</check_box>
 	<check_box name="JoystickFlycamEnabled">
@@ -34,14 +35,14 @@
 	<text name="ZScale">
 		Regolazione Z
 	</text>
-	<text name="PitchScale">
-		Regolazione della direzione o Pitch
+	<text name="PitchScale" left="3" width="112">
+		Regolazione: Pitch
 	</text>
-	<text name="YawScale">
-		Regolazione dell&apos;altitudine o Yaw
+	<text name="YawScale" left="3" width="112">
+		Regolazione: Yaw
 	</text>
-	<text name="RollScale">
-		Regolazione del Roll
+	<text name="RollScale" left="3" width="112">
+		Regolazione: Roll
 	</text>
 	<text name="XDeadZone">
 		Angolo morto X
@@ -52,22 +53,22 @@
 	<text name="ZDeadZone">
 		Angolo morto Z
 	</text>
-	<text name="PitchDeadZone">
-		Angolo morto della direzione o Pitch
+	<text name="PitchDeadZone" left="3" width="112">
+		Angolo morto: Pitch
 	</text>
-	<text name="YawDeadZone">
-		Angolo morto dell&apos;altitudine o Yaw
+	<text name="YawDeadZone" left="3" width="112">
+		Angolo morto: Yaw
 	</text>
-	<text name="RollDeadZone">
-		Angolo morto del Roll
+	<text name="RollDeadZone" left="3" width="112">
+		Angolo morto: Roll
 	</text>
 	<text name="Feathering">
 		Smussamento
 	</text>
-	<text name="ZoomScale2">
+	<text name="ZoomScale2" width="135" left="6">
 		Regolazione dello zoom
 	</text>
-	<text name="ZoomDeadZone">
+	<text name="ZoomDeadZone" width="135" left="6">
 		Angolo morto dello zoom
 	</text>
 	<button label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults"/>
diff --git a/indra/newview/skins/default/xui/it/floater_lagmeter.xml b/indra/newview/skins/default/xui/it/floater_lagmeter.xml
index d14f12ea4a..af70ad9d31 100644
--- a/indra/newview/skins/default/xui/it/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/it/floater_lagmeter.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_lagmeter" title="Misuratore del lag">
 	<button label="" label_selected="" name="client_lagmeter" tool_tip="Stato del lag del programma in locale"/>
+	<text left="30" name="client_lag_cause" right="-10" />
+	<text left="30" name="network_lag_cause" right="-10" />
+	<text left="30" name="server_lag_cause" right="-32" />
 	<text name="client">
 		Programma in locale:
 	</text>
-	<text name="client_text">
+	<text name="client_text" left="145" font="SansSerifSmall">
 		Normale
 	</text>
 	<button label="" label_selected="" name="network_lagmeter" tool_tip="Stato del lag del network"/>
 	<text name="network">
 		Network:
 	</text>
-	<text name="network_text">
+	<text name="network_text" font="SansSerifSmall">
 		Normale
 	</text>
 	<button label="" label_selected="" name="server_lagmeter" tool_tip="Stato del lag del server"/>
 	<text name="server">
 		Server:
 	</text>
-	<text name="server_text">
+	<text name="server_text" font="SansSerifSmall">
 		Normale
 	</text>
 	<button label="?" name="server_help"/>
@@ -48,10 +51,10 @@
 		Normale, finestra sullo sfondo
 	</string>
 	<string name="client_frame_time_critical_msg">
-		Velocità dei frame del programma in locale al di sotto di [CLIENT_FRAME_RATE_CRITICAL]
+		Velocità dei frame al di sotto di [CLIENT_FRAME_RATE_CRITICAL]
 	</string>
 	<string name="client_frame_time_warning_msg">
-		Velocità dei frame del programma in locale tra [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
+		Velocità dei frame tra [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
 	</string>
 	<string name="client_frame_time_normal_msg">
 		Normale
@@ -117,10 +120,10 @@
 		20
 	</string>
 	<string name="server_frame_time_critical_msg">
-		Velocità del simulatore al di sotto di [SERVER_FRAME_RATE_CRITICAL]
+		Velocità dei frame al di sotto di [SERVER_FRAME_RATE_CRITICAL]
 	</string>
 	<string name="server_frame_time_warning_msg">
-		Velocità del simulatore tra [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
+		Velocità dei frame tra [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
 	</string>
 	<string name="server_frame_time_normal_msg">
 		Normale
diff --git a/indra/newview/skins/default/xui/it/floater_land_holdings.xml b/indra/newview/skins/default/xui/it/floater_land_holdings.xml
index 6ac84b854f..85661c28d7 100644
--- a/indra/newview/skins/default/xui/it/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/it/floater_land_holdings.xml
@@ -7,7 +7,7 @@
 		<column label="Area" name="area"/>
 	</scroll_list>
 	<button label="Teletrasportati" label_selected="Teletrasportati" name="Teleport" tool_tip="Teletrasportati al centro di questo terreno."/>
-	<button label="Mostra sulla mappa" label_selected="Mostra sulla mappa" name="Show on Map" tool_tip="Mostra questo terreno sulla mappa."/>
+	<button width="130" label="Mostra sulla mappa" label_selected="Mostra sulla mappa" name="Show on Map" tool_tip="Mostra questo terreno sulla mappa."/>
 	<text name="contrib_label">
 		Contributi ai tuoi gruppi:
 	</text>
@@ -19,21 +19,21 @@
 		Proprietà di terreni consentite per l&apos;attuale piano di pagamento:
 	</text>
 	<text name="allowed_text">
-		[AREA] metri quadrati
+		[AREA] m²
 	</text>
 	<text name="current_label">
 		Attuale proprietà di terreni:
 	</text>
 	<text name="current_text">
-		[AREA] metri quadrati
+		[AREA] m²
 	</text>
 	<text name="available_label">
 		Quantità disponibile per ulteriori acquisti di terreno:
 	</text>
 	<text name="available_text">
-		[AREA] metri quadrati
+		[AREA] m²
 	</text>
 	<string name="area_string">
-		[AREA] metri quadrati
+		[AREA] m²
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
index 55195a00f1..bb1f6116cf 100644
--- a/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="Script: Nuovo script">
 	<button label="Ripristina" label_selected="Ripristina" name="Reset"/>
-	<check_box label="In esecuzione" name="running"/>
-	<check_box label="Mono" name="mono"/>
+	<check_box label="In esecuzione" name="running" left="4"/>
+	<check_box label="Mono" name="mono" left="106"/>
 	<string name="not_allowed">
 		Non sei autorizzato a visualizzare questo script.
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_lsl_guide.xml b/indra/newview/skins/default/xui/it/floater_lsl_guide.xml
index 6a27703ad6..ec62dd087d 100644
--- a/indra/newview/skins/default/xui/it/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/it/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="LSL Wiki">
 	<check_box label="Segui il cursore" name="lock_check"/>
-	<combo_box label="Blocca" name="history_combo"/>
-	<button label="Indietro" name="back_btn"/>
+	<combo_box label="Blocca" name="history_combo" left_delta="120" width="70"/>
+	<button label="Indietro" name="back_btn" left_delta="75"/>
 	<button label="Avanti" name="fwd_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_media_browser.xml b/indra/newview/skins/default/xui/it/floater_media_browser.xml
index 1c906f5a4d..4d3462b348 100644
--- a/indra/newview/skins/default/xui/it/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/it/floater_media_browser.xml
@@ -2,10 +2,11 @@
 <floater name="floater_about" title="Browser multimediale">
 	<layout_stack name="stack1">
 		<layout_panel name="nav_controls">
-			<button label="Indietro" name="back"/>
-			<button label="Avanti" name="forward"/>
-			<button label="Ricarica" name="reload"/>
-			<button label="Vai" name="go"/>
+			<button label="Indietro" name="back" width="75"/>
+			<button label="Avanti" name="forward" left_delta="75"  width="70"/>
+			<button label="Ricarica" name="reload" left_delta="75"/>
+			<combo_box left_delta="75" name="address" width="510"/>
+			<button label="Vai" name="go" left_delta="515"/>
 		</layout_panel>
 		<layout_panel name="parcel_owner_controls">
 			<button label="Invia questo URL al terreno" name="assign"/>
diff --git a/indra/newview/skins/default/xui/it/floater_mute_object.xml b/indra/newview/skins/default/xui/it/floater_mute_object.xml
index 4b7370bad0..6bacdcab41 100644
--- a/indra/newview/skins/default/xui/it/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/it/floater_mute_object.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="mute by name" title="Ignora l&apos;oggetto dal nome">
 	<text name="message">
-		Ignora per nome ha effetti sull&apos;oggetto in chat e IM, non nei suoni.
-Devi scrivere esattamente il nome dell&apos;oggetto.
+		Ignora per nome ha effetti sull&apos;oggetto in chat e IM, non
+nei suoni. Devi scrivere esattamente il nome dell&apos;oggetto.
 	</text>
 	<line_editor name="object_name">
 		Nome dell&apos;oggetto
 	</line_editor>
-	<button label="Ok" name="OK"/>
+	<button label="OK" name="OK"/>
 	<button label="Annulla" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pay.xml b/indra/newview/skins/default/xui/it/floater_pay.xml
index dbf374a67c..4889f97ec7 100644
--- a/indra/newview/skins/default/xui/it/floater_pay.xml
+++ b/indra/newview/skins/default/xui/it/floater_pay.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
-	<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"/>
-	<button label="Paga" label_selected="Paga" name="pay btn"/>
-	<button label="Annulla" label_selected="Annulla" name="cancel btn"/>
-	<text name="payee_label">
+	<button label="1 L$" label_selected="1 L$" name="fastpay 1" left="118" width="80" />
+	<button label="5 L$" label_selected="5 L$" name="fastpay 5" left="210"/>
+	<button label="10 L$" label_selected="10 L$" name="fastpay 10" left="118" width="80" />
+	<button label="20 L$" label_selected="20 L$" name="fastpay 20" left="210"/>
+	<button label="Paga" label_selected="Paga" name="pay btn" left="127"/>
+	<button label="Annulla" label_selected="Annulla" name="cancel btn" left="210"/>
+	<text name="payee_label" left="5" width="105">
 		Paga residente:
 	</text>
-	<text name="payee_name">
+	<text name="payee_name" left="115">
 		[FIRST] [LAST]
 	</text>
-	<text name="fastpay text">
+	<text name="fastpay text" width="110" halign="left">
 		Pagamento veloce:
 	</text>
-	<text name="amount text">
+	<text name="amount text" left="4" >
 		Ammontare:
 	</text>
+	<line_editor left="70" name="amount" width="49"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pay_object.xml b/indra/newview/skins/default/xui/it/floater_pay_object.xml
index 021b2d7647..c41c0ba41e 100644
--- a/indra/newview/skins/default/xui/it/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/it/floater_pay_object.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
-	<text name="payee_group">
+	<text name="payee_group" width="100" halign="left">
 		Paga il gruppo:
 	</text>
-	<text name="payee_resident">
+	<text name="payee_resident" width="120" halign="left">
 		Paga il residente:
 	</text>
-	<text name="payee_name">
+	<text name="payee_name" left="120">
 		[FIRST] [LAST]
 	</text>
-	<text name="object_name_label">
+	<text name="object_name_label" left="5" width="110" halign="left">
 		Mediante l&apos;oggetto:
 	</text>
-	<text name="object_name_text">
+	<text name="object_name_text" left="120" >
 		...
 	</text>
-	<text name="fastpay text">
+	<text name="fastpay text" width="115" halign="left">
 		Pagamento diretto:
 	</text>
-	<text name="amount text">
+	<text name="amount text" left="5" halign="left">
 		Ammontare:
 	</text>
-	<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"/>
+	<button label="1 L$" label_selected="1 L$" name="fastpay 1" left="125" width="70"/>
+	<button label="5 L$" label_selected="5 L$" name="fastpay 5" left="200" width="70"/>
+	<button label="10 L$" label_selected="10 L$" name="fastpay 10" left="125" width="70"/>
+	<button label="20 L$" label_selected="20 L$" name="fastpay 20" left="200" width="70"/>
 	<button label="Paga" label_selected="Paga" name="pay btn"/>
 	<button label="Cancella" label_selected="Cancella" name="cancel btn"/>
+	<line_editor left="74" name="amount" width="50" />
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_preferences.xml b/indra/newview/skins/default/xui/it/floater_preferences.xml
index 726b6dd70b..6277300bee 100644
--- a/indra/newview/skins/default/xui/it/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/it/floater_preferences.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Preferences" title="Preferenze">
+<floater name="Preferences" title="Preferenze" min_width="350" width="646">
 	<button label="OK" label_selected="OK" name="OK"/>
 	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
 	<button label="Applica" label_selected="Applica" name="Apply"/>
 	<button label="Informazioni..." label_selected="Informazioni..." name="About..."/>
 	<button label="Aiuto" label_selected="Aiuto" name="Help"/>
+	<tab_container name="pref core" tab_width="146" width="646" />
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_preview_animation.xml b/indra/newview/skins/default/xui/it/floater_preview_animation.xml
index 95a8a96066..e9e0252613 100644
--- a/indra/newview/skins/default/xui/it/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_animation.xml
@@ -3,6 +3,6 @@
 	<text name="desc txt">
 		Descrizione:
 	</text>
-	<button label="Esegui inworld" label_selected="Ferma" name="Anim play btn" tool_tip="Esegui questa animazione così che altri possano vederla."/>
-	<button label="Esegui localmente" label_selected="Ferma" name="Anim audition btn" tool_tip="Esegui questa animazione così che solo tu possa vederla."/>
+	<button left="20" width="131" label="Esegui inworld" label_selected="Ferma" name="Anim play btn" tool_tip="Esegui questa animazione così che altri possano vederla."/>
+	<button left="162" width="125" label="Esegui localmente" label_selected="Ferma" name="Anim audition btn" tool_tip="Esegui questa animazione così che solo tu possa vederla."/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_script_search.xml b/indra/newview/skins/default/xui/it/floater_script_search.xml
index ebd8ee359f..470fb76135 100644
--- a/indra/newview/skins/default/xui/it/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/it/floater_script_search.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script search" title="Cerca Script">
-	<check_box label="Senza distinzione tra maiuscole e minuscole" name="case_text"/>
-	<button label="Cerca" label_selected="Cerca" name="search_btn"/>
-	<button label="Sostituisci" label_selected="Sostituisci" name="replace_btn"/>
-	<button label="Sostituisci tutto" label_selected="Sostituisci tutto" name="replace_all_btn"/>
-	<text name="txt">
+<floater name="script search" title="Cerca Script" width="320">
+	<check_box label="Senza distinzione tra maiuscole e minuscole" name="case_text" left="65"/>
+	<button label="Cerca" label_selected="Cerca" name="search_btn" width="85"/>
+	<button label="Sostituisci" label_selected="Sostituisci" name="replace_btn" left="100" width="85"/>
+	<button label="Sostituisci tutto" label_selected="Sostituisci tutto" name="replace_all_btn" left="190" width="122"/>
+	<text name="txt" width="60">
 		Cerca
 	</text>
-	<text name="txt2">
+	<text name="txt2" width="60">
 		Sostituisci
 	</text>
+	<line_editor left="65" name="search_text" width="240" />
+	<line_editor left="65" name="replace_text" width="240" />
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_telehub.xml b/indra/newview/skins/default/xui/it/floater_telehub.xml
index 5de215522d..0c5199dbc7 100644
--- a/indra/newview/skins/default/xui/it/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/it/floater_telehub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="telehub" title="Telehub">
+<floater name="telehub" title="Telehub" min_height="310" height="310" width="286">
 	<text name="status_text_connected">
 		Telehub connesso all&apos;oggetto [OBJECT]
 	</text>
@@ -10,19 +10,23 @@
 		Per rimuovere, clicca Disconnetti.
 	</text>
 	<text name="help_text_not_connected">
-		Seleziona l&apos;oggetto e clicca connetti Telehub.
+		Seleziona l&apos;oggetto e clicca Connetti Telehub.
 	</text>
 	<button label="Connetti Telehub" name="connect_btn"/>
 	<button label="Disconnetti" name="disconnect_btn"/>
-	<text name="spawn_points_text">
+	<text name="spawn_points_text" width="265">
 		Rigenera i punti (posizioni, non oggetti):
 	</text>
-	<button label="Aggiungi punti rigenerazione" name="add_spawn_point_btn"/>
-	<button label="Rimuovi punti rigenerazione" name="remove_spawn_point_btn"/>
+	<scroll_list name="spawn_points_list" width="265" />
+	<button width="165" label="Aggiungi punti rigenerazione" name="add_spawn_point_btn"/>
+	<button width="105" left="175" label="Rimuovi punti" name="remove_spawn_point_btn"/>
 	<text name="spawn_point_help">
-		Seleziona un oggetto e clicca su aggiungi per specificarne la posizione.
+		Seleziona un oggetto e clicca su aggiungi per
+specificarne la posizione.
 Potrai quindi muovere o rimuovere l&apos;oggetto.
 Le posizioni sono relative al centro del telehub.
-Seleziona un elemento per vederne la posizione globale.
+
+Seleziona un elemento per vederne la posizione
+globale.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_top_objects.xml b/indra/newview/skins/default/xui/it/floater_top_objects.xml
index ff6e9eb730..470e21769c 100644
--- a/indra/newview/skins/default/xui/it/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/it/floater_top_objects.xml
@@ -4,30 +4,33 @@
 		In caricamento...
 	</text>
 	<scroll_list name="objects_list">
-		<column label="Punteggio" name="score"/>
-		<column label="Nome" name="name"/>
-		<column label="Proprietario" name="owner"/>
-		<column label="Ubicazione" name="location"/>
-		<column label="Ora" name="time"/>
-		<column label="Ora (Mono)" name="mono_time"/>
+		<column label="Punteggio" name="score" width="84"/>
+		<column label="Nome" name="name" width="84"/>
+		<column label="Proprietario" name="owner" width="84"/>
+		<column label="Ubicazione" name="location" width="84"/>
+		<column label="Ora" name="time" width="84"/>
+		<column label="Ora (Mono)" name="mono_time" width="84"/>
 	</scroll_list>
+	<line_editor font="SansSerifSmall" left="90" name="id_editor" width="280"/>
+	<line_editor font="SansSerifSmall" left="90" name="object_name_editor" width="280"/>
+	<line_editor font="SansSerifSmall" left="90" name="owner_name_editor" width="280"/>
 	<text name="id_text">
 		ID oggetto:
 	</text>
-	<button label="Mostra segnali luminosi" name="show_beacon_btn"/>
+	<button label="Mostra segnali luminosi" name="show_beacon_btn" width="150"/>
 	<text name="obj_name_text">
 		Nome oggetto:
 	</text>
-	<button label="Filtro" name="filter_object_btn"/>
+	<button label="Filtro" name="filter_object_btn" width="150"/>
 	<text name="owner_name_text">
 		Nome oggetto:
 	</text>
-	<button label="Filtro" name="filter_owner_btn"/>
-	<button label="Restituisci selezionato" name="return_selected_btn"/>
-	<button label="Restituisci tutti" name="return_all_btn"/>
-	<button label="Disabilita selezionato" name="disable_selected_btn"/>
-	<button label="Disabilita per tutti" name="disable_all_btn"/>
-	<button label="Aggiorna" name="refresh_btn"/>
+	<button label="Filtro" name="filter_owner_btn" width="150"/>
+	<button label="Restituisci selezionato" name="return_selected_btn" width="150"/>
+	<button label="Restituisci tutti" name="return_all_btn" left="170"/>
+	<button label="Disabilita selezionato" name="disable_selected_btn" width="150"/>
+	<button label="Disabilita per tutti" name="disable_all_btn" left="170"/>
+	<button label="Aggiorna" name="refresh_btn" width="150"/>
 	<string name="top_scripts_title">
 		Script pesanti
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_url_entry.xml b/indra/newview/skins/default/xui/it/floater_url_entry.xml
index 2968b19d80..9ad1a0dce5 100644
--- a/indra/newview/skins/default/xui/it/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/it/floater_url_entry.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="url_entry" title="">
 	<text name="media_label">
-		Media URL:
+		URL Media:
 	</text>
 	<button label="OK" name="ok_btn"/>
 	<button label="Annulla" name="cancel_btn"/>
-	<button label="Cancella" name="clear_btn"/>
+	<button label="Elimina" name="clear_btn"/>
 	<text name="loading_label">
 		In caricamento...
 	</text>
diff --git a/indra/newview/skins/default/xui/it/floater_water.xml b/indra/newview/skins/default/xui/it/floater_water.xml
index 6665d97e2a..33f91ed1c8 100644
--- a/indra/newview/skins/default/xui/it/floater_water.xml
+++ b/indra/newview/skins/default/xui/it/floater_water.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Water Floater" title="Editor avanzato dell&apos;acqua">
-	<text name="KeyFramePresetsText">
+	<text name="KeyFramePresetsText" width="224">
 		Impostazioni predeterminate dell&apos;acqua:
 	</text>
+	<combo_box left_delta="230" name="WaterPresetsCombo" width="150" />
 	<button label="Nuovo" label_selected="Nuovo" name="WaterNewPreset"/>
 	<button label="Salva" label_selected="Salva" name="WaterSavePreset"/>
 	<button label="Cancella" label_selected="Cancella" name="WaterDeletePreset"/>
@@ -11,20 +12,21 @@
 			<text name="BHText">
 				Colore della nebbiosità dell&apos;acqua
 			</text>
-			<button label="?" name="WaterFogColorHelp"/>
+			<button label="?" name="WaterFogColorHelp" left="209"/>
 			<color_swatch label="" name="WaterFogColor" tool_tip="Clicca per aprire la selezione colore"/>
-			<text name="WaterFogDensText">
-				Esponente di densità  della nebbia dell&apos;acqua
+			<text name="WaterFogDensText" font="SansSerifSmall">
+				Esponente di densità della nebbia&#10; dell&apos;acqua
 			</text>
-			<button label="?" name="WaterFogDensityHelp"/>
-			<text name="WaterUnderWaterFogModText">
+			<slider bottom_delta="-40" name="WaterFogDensity"/>
+			<button label="?" name="WaterFogDensityHelp" left="209"/>
+			<text name="WaterUnderWaterFogModText" font="SansSerifSmall" bottom="-140">
 				Regolatore effetto nebbia subacquea
 			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp"/>
+			<button label="?" name="WaterUnderWaterFogModHelp" left="209"/>
 			<text name="BDensText">
 				Scala di riflessione delle onde
 			</text>
-			<button label="?" name="WaterNormalScaleHelp"/>
+			<button label="?" name="WaterNormalScaleHelp" left="415"/>
 			<text name="BHText2">
 				1
 			</text>
@@ -37,29 +39,31 @@
 			<text name="HDText">
 				Scala Fresnel
 			</text>
-			<button label="?" name="WaterFresnelScaleHelp"/>
+			<button label="?" name="WaterFresnelScaleHelp" left="415"/>
 			<text name="FresnelOffsetText">
 				Offset Fresnel
 			</text>
-			<button label="?" name="WaterFresnelOffsetHelp"/>
-			<text name="DensMultText">
-				Scala di rifrazione nell&apos;acqua dall&apos;alto
+			<button label="?" name="WaterFresnelOffsetHelp" left="415"/>
+			<text name="DensMultText" font="SansSerifSmall">
+				Scala di rifrazione nell&apos;acqua&#10; dall&apos;alto
 			</text>
-			<button label="?" name="WaterScaleAboveHelp"/>
-			<text name="WaterScaleBelowText">
-				Scala di rifrazione nell&apos;acqua dal basso
+			<slider bottom_delta="-40" name="WaterScaleAbove"/>
+			<button label="?" name="WaterScaleAboveHelp" left="650"/>
+			<text name="WaterScaleBelowText" font="SansSerifSmall" bottom="-70">
+				Scala di rifrazione nell&apos;acqua&#10; dal basso
 			</text>
-			<button label="?" name="WaterScaleBelowHelp"/>
-			<text name="MaxAltText">
+			<slider bottom_delta="-40" name="WaterScaleBelow"/>
+			<button label="?" name="WaterScaleBelowHelp" left="650"/>
+			<text name="MaxAltText" bottom="-122">
 				Moltiplicatore della sfocatura
 			</text>
-			<button label="?" name="WaterBlurMultiplierHelp"/>
+			<button label="?" name="WaterBlurMultiplierHelp" left="650"/>
 		</panel>
 		<panel label="Immagine" name="Waves">
 			<text name="BHText">
 				Direzione della grande onda
 			</text>
-			<button label="?" name="WaterWave1Help"/>
+			<button label="?" name="WaterWave1Help" left="170"/>
 			<text name="WaterWave1DirXText">
 				X
 			</text>
@@ -69,7 +73,7 @@
 			<text name="BHText2">
 				Direzione della piccola onda
 			</text>
-			<button label="?" name="WaterWave2Help"/>
+			<button label="?" name="WaterWave2Help" left="170"/>
 			<text name="WaterWave2DirXText">
 				X
 			</text>
diff --git a/indra/newview/skins/default/xui/it/floater_windlight_options.xml b/indra/newview/skins/default/xui/it/floater_windlight_options.xml
index aa99e1d883..5076c777dc 100644
--- a/indra/newview/skins/default/xui/it/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/it/floater_windlight_options.xml
@@ -4,15 +4,15 @@
 		Cieli predefiniti:
 	</text>
 	<button label="Nuovo" label_selected="Nuovo" name="WLNewPreset"/>
-	<button label="Salva" label_selected="Salva" name="WLSavePreset"/>
-	<button label="Elimina" label_selected="Elimina" name="WLDeletePreset"/>
-	<button label="Editor del ciclo giorno/notte" label_selected="Editor del ciclo giorno/notte" name="WLDayCycleMenuButton"/>
+	<button label="Salva" label_selected="Salva" name="WLSavePreset" left_delta="72"/>
+	<button label="Elimina" label_selected="Elimina" name="WLDeletePreset" left_delta="72"/>
+	<button font="SansSerifSmall"  width="165" left_delta="85" label="Editor del ciclo giorno/notte" label_selected="Editor del ciclo giorno/notte" name="WLDayCycleMenuButton"/>
 	<tab_container name="WindLight Tabs">
 		<panel label="Atmosfera" name="Atmosphere">
 			<text name="BHText">
 				Blu dell&apos;Orizzonte
 			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
+			<button label="?" name="WLBlueHorizonHelp" left="189"/>
 			<text name="BHText2">
 				R
 			</text>
@@ -25,14 +25,14 @@
 			<text name="BHText5">
 				I
 			</text>
-			<text name="BDensText">
+			<text name="BDensText" font="SansSerifSmall">
 				Altezza della Foschia all&apos;Orizzonte
 			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
+			<button label="?" name="WLHazeHorizonHelp" left="189" />
 			<text name="BDensText2">
 				Densità del Blu
 			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
+			<button label="?" name="WLBlueDensityHelp" />
 			<text name="BHText6">
 				R
 			</text>
@@ -52,15 +52,15 @@
 			<text name="DensMultText">
 				Moltiplicatore di Densità
 			</text>
-			<button label="?" name="WLDensityMultHelp"/>
+			<button label="?" name="WLDensityMultHelp" left="645"/>
 			<text name="WLDistanceMultText">
 				Moltiplicatore della Distanza
 			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
+			<button label="?" name="WLDistanceMultHelp" left="645"/>
 			<text name="MaxAltText">
 				Altitudine Massima
 			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
+			<button label="?" name="WLMaxAltitudeHelp" left="645"/>
 		</panel>
 		<panel label="Illuminazione" name="Lighting">
 			<text name="SLCText">
@@ -151,15 +151,15 @@
 			<text name="WLCloudCoverageText">
 				Copertura delle Nuvole
 			</text>
-			<button label="?" name="WLCloudCoverageHelp"/>
+			<button label="?" name="WLCloudCoverageHelp" left="415"/>
 			<text name="WLCloudScaleText">
 				Altitudine delle Nuvole
 			</text>
-			<button label="?" name="WLCloudScaleHelp"/>
+			<button label="?" name="WLCloudScaleHelp" left="415"/>
 			<text name="WLCloudDetailText">
 				Dettagli Nuvole (XY/ Densità)
 			</text>
-			<button label="?" name="WLCloudDetailHelp"/>
+			<button label="?" name="WLCloudDetailHelp" left="415"/>
 			<text name="BHText8">
 				X
 			</text>
@@ -170,17 +170,17 @@
 				D
 			</text>
 			<text name="WLCloudScrollXText">
-				Scorrimento delle nuvole X
+				Scorrimento delle X
 			</text>
 			<button label="?" name="WLCloudScrollXHelp"/>
 			<check_box label="Blocca" name="WLCloudLockX"/>
 			<text name="WLCloudScrollYText">
-				Scorrimento delle nuvole Y
+				Scorrimento delle Y
 			</text>
 			<button label="?" name="WLCloudScrollYHelp"/>
 			<check_box label="Blocca" name="WLCloudLockY"/>
 			<check_box label="Mostra le Nuvole Classiche" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp"/>
+			<button label="?" name="WLClassicCloudsHelp" left="645"/>
 		</panel>
 	</tab_container>
 	<string name="WLDefaultSkyNames">
diff --git a/indra/newview/skins/default/xui/it/panel_friends.xml b/indra/newview/skins/default/xui/it/panel_friends.xml
index 78e0d542f3..e2eb3dd6e7 100644
--- a/indra/newview/skins/default/xui/it/panel_friends.xml
+++ b/indra/newview/skins/default/xui/it/panel_friends.xml
@@ -16,5 +16,5 @@
 	<button label="Teleport..." name="offer_teleport_btn" tool_tip="Offri a questo amico un teleport per dove sei tu ora"/>
 	<button label="Paga..." name="pay_btn" tool_tip="Dai Linden dollar (L$) a questo amico"/>
 	<button label="Rimuovi..." name="remove_btn" tool_tip="Rimuovi questa persona dalla tua lista amici"/>
-	<button label="Aggiungi come amico..." name="add_btn" tool_tip="Offri amicizia ad un residente"/>
+	<button label="Aggiungi..." name="add_btn" tool_tip="Offri amicizia ad un residente"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_general.xml b/indra/newview/skins/default/xui/it/panel_group_general.xml
index cc044a2e56..2c04ec776c 100644
--- a/indra/newview/skins/default/xui/it/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_general.xml
@@ -48,7 +48,7 @@ Passa il mouse sulle opzioni per un aiuto aggiuntivo.
 		<check_box label="Mostra nella ricerca" name="show_in_group_list" tool_tip="Lascia che i residenti vedano questo gruppo nella ricerca."/>
 		<check_box label="Iscrizione libera" name="open_enrollement" tool_tip="Imposta se questo gruppo permette ai nuovi membri di unirsi senza essere invitati."/>
 		<check_box label="Tassa di iscrizione: L$" name="check_enrollment_fee" tool_tip="Imposta se richiedere una tassa di iscrizione per unirsi al gruppo."/>
-		<spinner name="spin_enrollment_fee" tool_tip="I nuovi membri devono pagare questa tassa per unirsi al gruppo. La tassa di iscrizione è selezionata."/>
+		<spinner width="60" left_delta="136" name="spin_enrollment_fee" tool_tip="I nuovi membri devono pagare questa tassa per unirsi al gruppo. La tassa di iscrizione è selezionata."/>
 		<combo_box name="group_mature_check" tool_tip="Imposta se le informazioni sul tuo gruppo sono da considerarsi Mature.">
 			<combo_item name="select_mature">
 				- Seleziona -
diff --git a/indra/newview/skins/default/xui/it/panel_group_invite.xml b/indra/newview/skins/default/xui/it/panel_group_invite.xml
index d75b3a46e8..cc426f7cd2 100644
--- a/indra/newview/skins/default/xui/it/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_invite.xml
@@ -2,8 +2,8 @@
 <panel label="Invita una persona" name="invite_panel">
 	<text name="help_text">
 		Puoi selezionare più di un residente 
-da invitare nel tuo gruppo. Clicca su &apos;Scelta
-residenti&apos; per iniziare.
+da invitare nel tuo gruppo. Clicca su
+&apos;Scelta residenti&apos; per iniziare.
 	</text>
 	<button label="Scelta residenti" name="add_button" tool_tip=""/>
 	<name_list name="invitee_list" tool_tip="Tieni premuto il tasto ctrl e clicca i nomi dei residenti per avere una selezione multipla."/>
diff --git a/indra/newview/skins/default/xui/it/panel_group_land_money.xml b/indra/newview/skins/default/xui/it/panel_group_land_money.xml
index 907ce8ea5a..5f54d8cd25 100644
--- a/indra/newview/skins/default/xui/it/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_land_money.xml
@@ -13,7 +13,7 @@
 	<string name="loading_txt">
 		Attendi...
 	</string>
-	<text name="group_land_heading">
+	<text name="group_land_heading" width="250">
 		Terra posseduta dal gruppo
 	</text>
 	<scroll_list name="group_parcel_list">
@@ -22,24 +22,24 @@
 		<column label="Tipo" name="type"/>
 		<column label="Area" name="area"/>
 	</scroll_list>
-	<button label="Mostra sulla mappa" label_selected="Mostra sulla mappa" name="map_button"/>
+	<button label="Mostra sulla mappa" label_selected="Mostra sulla mappa" name="map_button" left="282" width="130"/>
 	<text name="total_contributed_land_label">
 		Total Contribution:
 	</text>
 	<text name="total_contributed_land_value">
-		[AREA] metri quadri
+		[AREA] m²
 	</text>
 	<text name="total_land_in_use_label">
 		Terra totale in uso:
 	</text>
 	<text name="total_land_in_use_value">
-		[AREA] metri quadri
+		[AREA] m²
 	</text>
 	<text name="land_available_label">
 		Terra disponibile:
 	</text>
 	<text name="land_available_value">
-		[AREA] metri quadri
+		[AREA] m²
 	</text>
 	<text name="your_contribution_label">
 		Il tuo contributo:
@@ -48,10 +48,11 @@
 		Non è possibile impostare i tuoi contributi in terra.
 	</string>
 	<text name="your_contribution_max_value">
-		metri quadri ([AMOUNT] massimo)
+		m² ([AMOUNT] massimo)
 	</text>
 	<text name="group_over_limit_text">
-		I membri del gruppo devono contribuire con più crediti per mantenere la quantità  di terra in uso.
+		I membri del gruppo devono contribuire con più crediti per mantenere
+la quantità  di terra in uso.
 	</text>
 	<text name="group_money_heading">
 		L$ del gruppo
@@ -66,15 +67,15 @@
 			<text_editor name="group_money_details_text">
 				Calcolo...
 			</text_editor>
-			<button label="&lt; Precedente" label_selected="&lt; Precedente" name="earlier_details_button" tool_tip="Vai ai dettagli precedenti"/>
-			<button label="Successivo &gt;" label_selected="Successivo &gt;" name="later_details_button" tool_tip="Vai ai dettagli successivi"/>
+			<button width="90" label="&lt; Precedente" label_selected="&lt; Precedente" name="earlier_details_button" tool_tip="Vai ai dettagli precedenti"/>
+			<button left_delta="260" width="90" label="Successivo &gt;" label_selected="Successivo &gt;" name="later_details_button" tool_tip="Vai ai dettagli successivi"/>
 		</panel>
 		<panel label="Vendite" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
 				Calcolo...
 			</text_editor>
-			<button label="&lt; Precedente" label_selected="&lt; Precedente" name="earlier_sales_button" tool_tip="Vai ai dettagli precedenti"/>
-			<button label="Successivo &gt;" label_selected="Successivo &gt;" name="later_sales_button" tool_tip="Vai ai dettagli successivi"/>
+			<button width="90" label="&lt; Precedente" label_selected="&lt; Precedente" name="earlier_sales_button" tool_tip="Vai ai dettagli precedenti"/>
+			<button left_delta="260" width="90" label="Successivo &gt;" label_selected="Successivo &gt;" name="later_sales_button" tool_tip="Vai ai dettagli successivi"/>
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_notices.xml b/indra/newview/skins/default/xui/it/panel_group_notices.xml
index 7f1f37d67e..6bf0f1e8c0 100644
--- a/indra/newview/skins/default/xui/it/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_notices.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Notice" name="notices_tab">
 	<string name="help_text">
-		Le notice sono un modo veloce per comunicare in un 
-gruppo diffondendo un messaggio e recapitando un 
-eventuale oggetto allegato. Le notice arrivano solo ai
-membri del gruppo il cui ruolo è abilitato a riceverli.
-Puoi disattivare la ricezione delle notice
-nella finestra principale.
+		Le notice sono un modo veloce per comunicare in un gruppo diffondendo un messaggio e recapitando un eventuale oggetto allegato. Le notice arrivano solo ai membri del gruppo il cui ruolo è abilitato a riceverli.
+Puoi disattivare la ricezione delle notice nella finestra principale.
 	</string>
 	<string name="no_notices_text">
 		Non ci sono vecchie notice.
@@ -16,9 +12,9 @@ nella finestra principale.
 		Archivio delle notice del gruppo
 	</text>
 	<text name="lbl2">
-		Le notice sono conservate per 14 giorni. Clicca la notice qui sotto che desideri leggere.
-Clicca il bottone &apos;Aggiorna&apos; per controllare se sono arrivate nuove notice.
-Il numero delle notice è limitato a 200 notice per gruppo al giorno.
+		Le notice sono conservate per 14 giorni. Clicca la notice qui sotto che desideri 
+leggere. Clicca il bottone &apos;Aggiorna&apos; per controllare se sono arrivate nuove 
+notice. Il numero delle notice è limitato a 200 notice per gruppo al giorno.
 	</text>
 	<scroll_list name="notice_list">
 		<column label="Oggetto" name="subject"/>
@@ -36,19 +32,22 @@ Il numero delle notice è limitato a 200 notice per gruppo al giorno.
 		</text>
 		<text name="lbl2">
 			Devi scrivere l&apos;oggetto della notice per poterla inviare.
-Puoi aggiungere un solo allegato alla notice trascinandolo
-dal tuo inventario in questa finestra. L&apos;allegato deve essere copiabile e cedibile,
-e non puoi allegare una cartella.
+Puoi aggiungere un solo allegato alla notice trascinandolo dal 
+tuo inventario in questa finestra. L&apos;allegato deve essere 
+copiabile e cedibile, e non puoi allegare una cartella.
 		</text>
-		<text name="lbl3">
+		<text name="lbl3" left="20">
 			Oggetto:
 		</text>
-		<text name="lbl4">
+		<line_editor name="create_subject" width="251" left_delta="61"/>
+		<text name="lbl4" left="15" width="60">
 			Messaggio:
 		</text>
-		<text name="lbl5">
+		<text_editor name="create_message" left_delta="66" width="330"/>
+		<text name="lbl5" width="68">
 			Allega:
 		</text>
+		<line_editor name="create_inventory_name" width="190" left_delta="74"/>
 		<button label="Rimuovi allegato" label_selected="Rimuovi allegato" name="remove_attachment"/>
 		<button label="Invia la notice" label_selected="Invia la notice" name="send_notice"/>
 		<panel name="drop_target" tool_tip="Trascina un oggetto dall&apos;inventario sulla casella del messaggio per inviarlo con la notice. Devi avere il permesso di copia e trasferimento dell&apos;oggetto per poterlo inviare con la notice."/>
@@ -58,7 +57,7 @@ e non puoi allegare una cartella.
 			Notice archiviate
 		</text>
 		<text name="lbl2">
-			Per mandare una nuova notice, clicca il bottone &apos;Crea una nuova notice&apos; qui sopra.
+			Per mandare una nuova notice, clicca &apos;Crea una nuova notice&apos; qui sopra.
 		</text>
 		<text name="lbl3">
 			Oggetto:
diff --git a/indra/newview/skins/default/xui/it/panel_group_roles.xml b/indra/newview/skins/default/xui/it/panel_group_roles.xml
index 2629b91db5..8dfdd5a46e 100644
--- a/indra/newview/skins/default/xui/it/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_roles.xml
@@ -12,8 +12,9 @@
 			Membri &amp; Ruoli
 		</text>
 		<text name="static2">
-			I membri del Gruppo hanno ricevuto ruoli con delle abilità. Queste impostazioni possono 
-essere facilmente personalizzate, permettendo una maggiore organizzazione e flessibilità.
+			I membri del Gruppo hanno ricevuto ruoli con delle abilità. Queste
+impostazioni possono essere facilmente personalizzate, permettendo 
+una maggiore organizzazione e flessibilità.
 		</text>
 	</panel>
 	<panel name="roles_header">
@@ -21,12 +22,14 @@ essere facilmente personalizzate, permettendo una maggiore organizzazione e fles
 			Ruoli
 		</text>
 		<text name="role_properties_modifiable">
-			Seleziona un ruolo qui sotto. È possibile modificarne il nome, la descrizione e il titolo.
+			Seleziona un ruolo qui sotto. È possibile modificarne il nome,
+la descrizione e il titolo.
 		</text>
 		<text name="role_properties_not_modifiable">
-			Seleziona un ruolo qui sotto per vederne le proprietà, i membri e i permessi abilitati.
+			Seleziona un ruolo qui sotto per vederne le proprietà, i membri
+e i permessi abilitati.
 		</text>
-		<text name="role_actions_modifiable">
+		<text bottom_delta="-28" name="role_actions_modifiable">
 			Puoi anche assegnare abilità al ruolo.
 		</text>
 		<text name="role_actions_not_modifiable">
@@ -42,16 +45,17 @@ essere facilmente personalizzate, permettendo una maggiore organizzazione e fles
 eseguire tali abilità.
 		</text>
 	</panel>
-	<tab_container name="roles_tab_container">
-		<panel label="Membri" name="members_sub_tab" tool_tip="Membri">
-			<button label="Cerca" name="search_button"/>
-			<button label="Mostra tutti" name="show_all_button"/>
-			<name_list name="member_list">
+	<tab_container height="164" name="roles_tab_container">
+		<panel height="148" label="Membri" name="members_sub_tab" tool_tip="Membri">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Cerca" name="search_button" width="75"/>
+			<button label="Mostra tutti" name="show_all_button" left_delta="80"/>
+			<name_list name="member_list" bottom_delta="-105" height="104" >
 				<column label="Nome del membro" name="name"/>
 				<column label="Contributo donato" name="donated"/>
 				<column label="Ultimo accesso" name="online"/>
 			</name_list>
-			<button label="Invita un nuovo membro ..." name="member_invite"/>
+			<button label="Invita un nuovo membro..." name="member_invite" width="165"/>
 			<button label="Espellere dal gruppo" name="member_eject"/>
 			<string name="help_text">
 				Puoi aggiungere o rimuovere i ruoli assegnati ai membri. 
@@ -59,10 +63,11 @@ Seleziona più membri tenendo premuto il tasto Ctrl e
 cliccando sui loro nomi.
 			</string>
 		</panel>
-		<panel label="Ruoli" name="roles_sub_tab">
-			<button label="Cerca" name="search_button"/>
-			<button label="Mostra tutti" name="show_all_button"/>
-			<scroll_list name="role_list">
+		<panel height="148" label="Ruoli" name="roles_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Cerca" name="search_button" width="75"/>
+			<button label="Mostra tutti" name="show_all_button" left_delta="80"/>
+			<scroll_list name="role_list" bottom_delta="-104" height="104">
 				<column label="Nome del ruolo" name="name"/>
 				<column label="Titolo" name="title"/>
 				<column label="Membri" name="members"/>
@@ -79,10 +84,11 @@ compresi il ruolo base o &apos;Membro&apos; e il ruolo del Capogruppo.
 				I ruoli &apos;Membro&apos; e &apos;Capogruppo&apos; sono ruoli speciali e non possono essere eliminati.
 			</string>
 		</panel>
-		<panel label="Abilità" name="actions_sub_tab">
-			<button label="Cerca" name="search_button"/>
-			<button label="Visualizza tutto" name="show_all_button"/>
-			<scroll_list name="action_list" tool_tip="Seleziona una abilità per vederne maggiori dettagli."/>
+		<panel height="148" label="Abilità" name="actions_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Cerca" name="search_button" width="75"/>
+			<button label="Visualizza tutto" name="show_all_button" left_delta="80"/>
+			<scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Seleziona una abilità per vederne maggiori dettagli."/>
 			<string name="help_text">
 				Le abilità permettono ai membri nei ruoli di fare cose specifiche
 in questo gruppo. C&apos;è una vasta gamma di abilità.
diff --git a/indra/newview/skins/default/xui/it/panel_groups.xml b/indra/newview/skins/default/xui/it/panel_groups.xml
index 75bccb71a3..43fd36710e 100644
--- a/indra/newview/skins/default/xui/it/panel_groups.xml
+++ b/indra/newview/skins/default/xui/it/panel_groups.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="groups">
-	<text name="groupdesc">
-		Il tuo gruppo attualmente attivo è visualizzato in grassetto.
+	<scroll_list bottom="50" name="group list"/>
+	<text bottom="16" height="32" name="groupdesc" width="268">
+		Il tuo gruppo attualmente attivo è visualizzato
+in grassetto.
 	</text>
-	<text name="groupcount">
-		Appartieni a [COUNT] gruppi (su un massimo di [MAX]).
+	<text bottom="3" name="groupcount" width="268">
+		Appartieni a [COUNT] gruppo/i (su un massimo di [MAX]).
 	</text>
 	<button label="IM/Chiama" name="IM" tool_tip="Apri una sessione di IM/Instant Messages"/>
 	<button label="Informazioni" name="Info"/>
diff --git a/indra/newview/skins/default/xui/it/panel_region_covenant.xml b/indra/newview/skins/default/xui/it/panel_region_covenant.xml
index 802156ea0b..9dfecde317 100644
--- a/indra/newview/skins/default/xui/it/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_covenant.xml
@@ -22,15 +22,17 @@
 		Ultima modifica Merc 31 Dic 1969 16:00:00
 	</text>
 	<button label="?" name="covenant_help"/>
-	<text_editor name="covenant_editor">
+	<text_editor name="covenant_editor"  bottom="-247" height="162" >
 		Per questa proprietà non è stato emesso alcun regolamento.
 	</text_editor>
 	<button label="Ripristina" name="reset_covenant"/>
-	<text name="covenant_help_text">
-		Le modifiche nel regolamento saranno visibili su tutti i terreni della proprietà.
+	<text  bottom="-25" name="covenant_help_text">
+		Le modifiche nel regolamento saranno visibili su tutti i terreni
+      della proprietà.
 	</text>
-	<text name="covenant_instructions">
-		Trascina e rilascia una notecard per cambiare il regolamento di questa proprietà.
+	<text  bottom_delta="-36" name="covenant_instructions">
+		Trascina e rilascia una notecard per cambiare il regolamento di
+      questa proprietà.
 	</text>
 	<text name="region_section_lbl">
 		Regione:
@@ -38,31 +40,31 @@
 	<text name="region_name_lbl">
 		Nome:
 	</text>
-	<text name="region_name_text">
+	<text name="region_name_text" left="126">
 		leyla
 	</text>
 	<text name="region_landtype_lbl">
 		Tipo:
 	</text>
-	<text name="region_landtype_text">
+	<text name="region_landtype_text" left="126">
 		Mainland / Homestead
 	</text>
-	<text name="region_maturity_lbl">
+	<text name="region_maturity_lbl" width="115">
 		Categoria di accesso:
 	</text>
-	<text name="region_maturity_text">
+	<text name="region_maturity_text" left="126">
 		Adult
 	</text>
 	<text name="resellable_lbl">
 		Rivendita:
 	</text>
-	<text name="resellable_clause">
+	<text name="resellable_clause" left="126">
 		La terra in questa regione non può essere rivenduta.
 	</text>
 	<text name="changeable_lbl">
 		Suddividi:
 	</text>
-	<text name="changeable_clause">
+	<text name="changeable_clause" left="126">
 		La terra in questa regione non può essere unita/suddivisa.
 	</text>
 	<string name="can_resell">
@@ -72,9 +74,11 @@
 		Un terreno acquistato in questa regione non può essere rivenduto.
 	</string>
 	<string name="can_change">
-		Un terreno acquistato in questa regione può essere unito o suddiviso.
+		Un terreno acquistato in questa regione può essere unito o
+suddiviso.
 	</string>
 	<string name="can_not_change">
-		Un terreno acquistato in questa regione non può essere unito o suddiviso.
+		Un terreno acquistato in questa regione non può essere unito o
+suddiviso.
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_debug.xml b/indra/newview/skins/default/xui/it/panel_region_debug.xml
index fddc14e85c..85fb968ab4 100644
--- a/indra/newview/skins/default/xui/it/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_debug.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Debug - individuazione errori" name="Debug">
+<panel label="Debug" name="Debug">
 	<text name="region_text_lbl">
 		Regione:
 	</text>
@@ -13,7 +13,7 @@
 	<check_box label="Disabilita la fisica" name="disable_physics_check" tool_tip="Disabilita tutta la fisica dei corpi in questa regione"/>
 	<button label="?" name="disable_physics_help"/>
 	<button label="Applica" name="apply_btn"/>
-	<text name="objret_text_lbl">
+	<text name="objret_text_lbl" width="130">
 		Restituisci oggetti
 	</text>
 	<text name="resident_text_lbl">
@@ -30,10 +30,10 @@
 	<check_box label="Restituisci solo gli oggetti che sono sulle terre altrui" name="return_other_land" tool_tip="Restituisci solo gli oggetti che sono in terreni appartenenti a qualcun altro"/>
 	<check_box label="Restituisci gli oggetti in ogni regione di questi possedimenti" name="return_estate_wide" tool_tip="Restituisci tutti gli oggetti nelle varie regioni che costituiscono l&apos;insieme dei possedimenti terrieri"/>
 	<button label="Restituisci" name="return_btn"/>
-	<button label="Visualizza l&apos;elenco dei maggiori collidenti..." name="top_colliders_btn" tool_tip="Elenco degli oggetti che stanno potenzialmente subendo le maggiori collisioni"/>
-	<button label="?" name="top_colliders_help"/>
-	<button label="Visualizza l&apos;elenco degli script più pesanti..." name="top_scripts_btn" tool_tip="Elenco degli oggetti che impiegano più tempo a far girare gli script"/>
-	<button label="?" name="top_scripts_help"/>
+	<button width="280" label="Visualizza l&apos;elenco dei maggiori collidenti..." name="top_colliders_btn" tool_tip="Elenco degli oggetti che stanno potenzialmente subendo le maggiori collisioni"/>
+	<button label="?" name="top_colliders_help" left="297"/>
+	<button width="280" label="Visualizza l&apos;elenco degli script più pesanti..." name="top_scripts_btn" tool_tip="Elenco degli oggetti che impiegano più tempo a far girare gli script"/>
+	<button label="?" name="top_scripts_help" left="297"/>
 	<button label="Riavvia la regione" name="restart_btn" tool_tip="Dai 2 minuti di tempo massimo e fai riavviare la regione"/>
 	<button label="?" name="restart_help"/>
 	<button label="Ritarda il riavvio" name="cancel_restart_btn" tool_tip="Ritarda il riavvio della regione di un&apos;ora"/>
diff --git a/indra/newview/skins/default/xui/it/panel_region_estate.xml b/indra/newview/skins/default/xui/it/panel_region_estate.xml
index a27e3a716c..5b95b7378b 100644
--- a/indra/newview/skins/default/xui/it/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_estate.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Proprietà immobiliari" name="Estate">
 	<text name="estate_help_text">
-		I cambiamenti alle impostazioni in questa finestra avranno effetto su tutte
-le regioni della proprietà.
+		I cambiamenti alle impostazioni in questa finestra 
+avranno effetto su tutte le regioni della proprietà.
 	</text>
-	<text name="estate_text">
+	<text name="estate_text" width="140">
 		Proprietà immobiliari:
 	</text>
 	<text name="estate_name">
@@ -24,15 +24,15 @@ le regioni della proprietà.
 	<check_box label="Permetti accesso pubblico" name="externally_visible_check"/>
 	<button label="?" name="externally_visible_help"/>
 	<text name="Only Allow">
-		Limita l&apos;accesso a:
+		Limita l&apos;accesso a residenti...
 	</text>
-	<check_box label="residenti che hanno dato informazioni di pagamento" name="limit_payment" tool_tip="Blocca residenti non identificati."/>
+	<check_box label="che hanno dato info. di pagamento" name="limit_payment" tool_tip="Blocca residenti non identificati."/>
 	<check_box label="Adulti con età verificata" name="limit_age_verified" tool_tip="Blocca residenti che non hanno verificato la loro età. Per maggiori informazioni vai a support.secondlife.com."/>
 	<check_box label="Permetti la chat voice" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Permetti teleport diretto" name="allow_direct_teleport"/>
 	<button label="?" name="allow_direct_teleport_help"/>
-	<text name="abuse_email_text">
+	<text name="abuse_email_text" width="230">
 		Indirizzo email per la denuncia di abuso:
 	</text>
 	<string name="email_unsupported">
@@ -40,8 +40,8 @@ le regioni della proprietà.
 	</string>
 	<button label="?" name="abuse_email_address_help"/>
 	<button label="Applica" name="apply_btn"/>
-	<button label="Espelli persona dalle proprietà..." name="kick_user_from_estate_btn"/>
-	<button label="Manda un messaggio ai residenti di tutte le tue proprietà..." name="message_estate_btn"/>
+	<button font="SansSerifSmall" label="Espelli persona dalle proprietà..." name="kick_user_from_estate_btn"/>
+	<button font="SansSerifSmall" label="Manda un messaggio di le proprietà..." name="message_estate_btn"/>
 	<text name="estate_manager_label">
 		Manager delle proprietà:
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_region_general.xml b/indra/newview/skins/default/xui/it/panel_region_general.xml
index fffe51770e..d3afc1c63a 100644
--- a/indra/newview/skins/default/xui/it/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_general.xml
@@ -3,19 +3,19 @@
 	<text name="region_text_lbl">
 		Regione:
 	</text>
-	<text name="region_text">
+	<text name="region_text" left="70">
 		sconosciuta
 	</text>
 	<text name="version_channel_text_lbl">
 		Versione:
 	</text>
-	<text name="version_channel_text">
+	<text name="version_channel_text" left="70">
 		sconosciuta
 	</text>
 	<text name="region_type_lbl">
 		Tipo:
 	</text>
-	<text name="region_type">
+	<text name="region_type" left="70">
 		sconosciuto
 	</text>
 	<check_box label="Proibisci la modifica del terreno" name="block_terraform_check"/>
@@ -27,19 +27,19 @@
 	<check_box label="Limita gli urti" name="restrict_pushobject"/>
 	<button label="?" name="restrict_pushobject_help"/>
 	<check_box label="Abilita la rivendita del terreno" name="allow_land_resell_check"/>
-	<button label="?" name="land_resell_help"/>
+	<button label="?" name="land_resell_help" left="260"/>
 	<check_box label="Abilita unione/suddivisione del terreno" name="allow_parcel_changes_check"/>
-	<button label="?" name="parcel_changes_help"/>
+	<button label="?" name="parcel_changes_help" left="260" />
 	<check_box label="Proibisci che il terreno appaia nelle ricerche" name="block_parcel_search_check" tool_tip="Permetti che le persone vedano questa regione e le sue suddivisioni nei risultati delle ricerche"/>
-	<button label="?" name="parcel_search_help"/>
-	<spinner label="Limite massimo di avatar" name="agent_limit_spin"/>
+	<button label="?" name="parcel_search_help" left="260"/>
+	<spinner label="Limite massimo di avatar" name="agent_limit_spin" label_width="135" width="190"/>
 	<button label="?" name="agent_limit_help"/>
-	<spinner label="Bonus di oggetti" name="object_bonus_spin"/>
+	<spinner label="Bonus di oggetti" name="object_bonus_spin" label_width="135" width="190"/>
 	<button label="?" name="object_bonus_help"/>
-	<text label="Maturità" name="access_text">
+	<text label="Maturità" name="access_text" width="120">
 		Categoria di accesso:
 	</text>
-	<combo_box label="Mature" name="access_combo">
+	<combo_box label="Mature" name="access_combo" left="126" width="74">
 		<combo_item name="Adult">
 			Adult
 		</combo_item>
@@ -55,5 +55,5 @@
 	<button label="Teletrasporta a casa un utente..." name="kick_btn"/>
 	<button label="Teletrasporta a casa tutti gli utenti..." name="kick_all_btn"/>
 	<button label="Invia messaggio alla regione..." name="im_btn"/>
-	<button label="Gestisci snodo di teleport..." name="manage_telehub_btn"/>
+	<button label="Gestisci snodo di teleport..." name="manage_telehub_btn" width="210"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
index 70072275eb..92044bae11 100644
--- a/indra/newview/skins/default/xui/it/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
@@ -8,9 +8,9 @@
 	</text>
 	<spinner label="Altezza dell&apos;acqua" name="water_height_spin"/>
 	<button label="?" name="water_height_help"/>
-	<spinner label="Limite di altezza del terreno" name="terrain_raise_spin"/>
+	<spinner label="Limite di altezza del &#10;terreno" name="terrain_raise_spin"/>
 	<button label="?" name="terrain_raise_help"/>
-	<spinner label="Limite di abbassamento del terreno" name="terrain_lower_spin"/>
+	<spinner label="Limite di abbassamento &#10;del terreno" name="terrain_lower_spin" bottom_delta="-34"/>
 	<button label="?" name="terrain_lower_help"/>
 	<check_box label="Usa il sole della regione" name="use_estate_sun_check"/>
 	<button label="?" name="use_estate_sun_help"/>
@@ -22,6 +22,6 @@
 	<button label="?" name="download_raw_help"/>
 	<button label="Carica terreno RAW..." name="upload_raw_btn" tool_tip="Disponibile solo per i proprietari del terreno, non per i manager"/>
 	<button label="?" name="upload_raw_help"/>
-	<button label="Trasforma il terreno" name="bake_terrain_btn" tool_tip="Imposta il terreno corrente come punto medio per i limiti di innalzamento/abbassamento"/>
-	<button label="?" name="bake_terrain_help"/>
+	<button width="170" label="Trasforma il terreno" name="bake_terrain_btn" tool_tip="Imposta il terreno corrente come punto medio per i limiti di innalzamento/abbassamento"/>
+	<button left="190" label="?" name="bake_terrain_help"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_texture.xml b/indra/newview/skins/default/xui/it/panel_region_texture.xml
index 4e39db9b1d..254700e9f1 100644
--- a/indra/newview/skins/default/xui/it/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_texture.xml
@@ -6,7 +6,7 @@
 	<text name="region_text">
 		sconosciuto
 	</text>
-	<text name="detail_texture_text">
+	<text name="detail_texture_text" width="380">
 		Texture del terreno (è necessario siano 512x512, 24 bit .tga files)
 	</text>
 	<text name="height_text_lbl">
@@ -48,10 +48,10 @@
 		Questi valori rappresentano l&apos;intervallo di miscelazione delle texture qui sopra.
 	</text>
 	<text name="height_text_lbl11">
-		Misurato in metri, il valore più BASSO corrisponde all&apos;altezza MASSIMA della Texture #1,
+		Misurato in metri, il valore più BASSO corrisponde all&apos;altezza MASSIMA della
 	</text>
 	<text name="height_text_lbl12">
-		e il valore più ALTO all&apos;altezza MINIMA della Texture #4.
+		  Texture #1, e il valore più ALTO all&apos;altezza MINIMA della Texture #4.
 	</text>
 	<button label="Applica" name="apply_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/teleport_strings.xml b/indra/newview/skins/default/xui/it/teleport_strings.xml
index 4ef802dc5b..57e81bc41e 100644
--- a/indra/newview/skins/default/xui/it/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/it/teleport_strings.xml
@@ -25,7 +25,7 @@ www.secondlife.com/support
 			Gli oggetti da te indossati non sono ancoa arrivati. Attendi ancora qualche secondo o scollegati e ricollegati prima di provare a teleportarti.
 		</message>
 		<message name="too_many_uploads_tport">
-			La gestione dati della regione è al momento occupata e la tua richiesta di teletrasporto non può essere soddisfatta entro breve tempo. Per favore prova di nuovo tra qualche minuto o spostati in un&apos;area meno affollata.
+			Il server della regione è al momento occupato e la tua richiesta di teletrasporto non può essere soddisfatta entro breve tempo. Per favore prova di nuovo tra qualche minuto o spostati in un&apos;area meno affollata.
 		</message>
 		<message name="expired_tport">
 			Spiacenti, il sistema non riesce a soddisfare la tua richiesta di teletrasporto entro un tempo ragionevole. Riprova tra qualche minuto.
@@ -42,34 +42,34 @@ www.secondlife.com/support
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
-			In invio verso la destinazione.
+			In invio a destinazione.
 		</message>
 		<message name="redirecting">
 			In reindirizzamento ad una nuova destinazione.
 		</message>
 		<message name="relaying">
-			In ritrasmissione alla destinazione.
+			In reinvio a destinazione.
 		</message>
 		<message name="sending_home">
-			In invio la richiesta di ubicazione casa.
+			In invio verso la destinazione casa.
 		</message>
 		<message name="sending_landmark">
-			In invio la richiesta della destinazione del landmark.
+			In invio verso la destinazione del landmark.
 		</message>
 		<message name="completing">
 			Teletrasporto completato
 		</message>
 		<message name="resolving">
-			Destinazione in elaborazione.
+			Elaborazione della destinazione in corso...
 		</message>
 		<message name="contacting">
-			Si sta contattando la nuova regione.
+			Contattando la nuova regione.
 		</message>
 		<message name="arriving">
-			In arrivo...
+			In arrivo a destinazione...
 		</message>
 		<message name="requesting">
-			Teletrasporto in avvio...
+			Avvio teletrasporto....
 		</message>
 	</message_set>
 </teleport_messages>
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 1ea10324b3..8bf660d71d 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_buy_contents" title="コンテンツを購入">
-	<text name="contains_text">
+<floater name="floater_buy_contents" title="コンテンツを購入" width="340" min_width="340">
+	<text name="contains_text" width="320">
 		[NAME]の内容：
 	</text>
-	<text name="buy_text">
+	<scroll_list name="item_list" width="310"/>
+	<text name="buy_text" width="320">
 		コンテンツを[NAME]からL$[AMOUNT]で購入しますか？
 	</text>
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn" />
-	<button label="購入" label_selected="購入" name="buy_btn" />
-	<check_box label="今すぐ服を着る" name="wear_check" />
+	<button label="取り消し" label_selected="取り消し" name="cancel_btn" width="73"/>
+	<button label="購入" label_selected="購入" name="buy_btn" width="73" left_delta="-77"/>
+	<check_box label="今すぐ服を着る" name="wear_check" left_delta="-125"/>
 	<text name="no_copy_text">
 		(コピーなし)
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml
index 8286d29973..693446b21a 100644
--- a/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml
@@ -6,6 +6,6 @@
 		アイテムを別名で保存：
 	</text>
 	<line_editor name="name ed">
-		新規[DESC]
+		New [DESC]
 	</line_editor>
 </floater>
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 f55dbf9009..019d42c40a 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
@@ -52,7 +52,8 @@
 		平方メートル ([AMOUNT]最大)
 	</text>
 	<text name="group_over_limit_text">
-		使用中の土地をサポートするには、グループ・メンバーがさらに多くの土地クレジットを提供する必要があります。
+		使用中の土地をサポートするには、グループ・メンバーがさらに多
+くの土地クレジットを提供する必要があります。
 	</text>
 	<text name="group_money_heading">
 		グループL$
diff --git a/indra/newview/skins/default/xui/nl/floater_about_land.xml b/indra/newview/skins/default/xui/nl/floater_about_land.xml
index a3e3b246fe..f2aa9ff47c 100644
--- a/indra/newview/skins/default/xui/nl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/nl/floater_about_land.xml
@@ -147,31 +147,31 @@
 			<text name="region_name_lbl">
 				Naam:
 			</text>
-			<text name="region_name_text">
+			<text name="region_name_text" left="114">
 				leyla
 			</text>
 			<text name="region_landtype_lbl">
 				Type:
 			</text>
-			<text name="region_landtype_text">
+			<text name="region_landtype_text" left="114">
 				Mainland / Homestead
 			</text>
 			<text name="region_maturity_lbl">
 				Inhoudscategorie:
 			</text>
-			<text name="region_maturity_text">
+			<text name="region_maturity_text" left="114">
 				Adult
 			</text>
 			<text name="resellable_lbl">
 				Doorverkopen:
 			</text>
-			<text name="resellable_clause">
+			<text name="resellable_clause" left="114">
 				Land in deze regio mag niet worden doorverkocht.
 			</text>
 			<text name="changeable_lbl">
 				Opsplitsen:
 			</text>
-			<text name="changeable_clause">
+			<text name="changeable_clause" left="114" width="340">
 				Land in deze regio mag niet worden samengevoegd/opgesplitst.
 			</text>
 			<string name="can_resell">
@@ -405,7 +405,7 @@ of opgedeeld.
 				(none)
 			</string>
 			<button width="70" label="Instellen" label_selected="Instellen" name="Set" tool_tip="Stelt het landingspunt in waar bezoekers arriveren. Wordt ingesteld op uw avatar&apos;s positie binnen dit perceel."/>
-			<button width="70" left="311" label="Opschonen" label_selected="Opschonen" name="Clear" tool_tip="Landingspunt leegmaken"/>
+			<button width="80" left="311" label="Opschonen" label_selected="Opschonen" name="Clear" tool_tip="Landingspunt leegmaken"/>
 			<text name="Teleport Routing: ">
 				Teleport routering:
 			</text>
diff --git a/indra/newview/skins/default/xui/nl/floater_buy_contents.xml b/indra/newview/skins/default/xui/nl/floater_buy_contents.xml
index 0c513c923a..df0614b3d2 100644
--- a/indra/newview/skins/default/xui/nl/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/nl/floater_buy_contents.xml
@@ -6,7 +6,7 @@
 	<text name="buy_text">
 		Koop voor L$[AMOUNT] van [NAME]?
 	</text>
-	<button label="Annuleren" label_selected="Annuleren" name="cancel_btn"/>
+	<button label="Annuleren" label_selected="Annuleren" name="cancel_btn" width="73"/>
 	<button label="Koop" label_selected="Koop" name="buy_btn"/>
 	<check_box label="Draag kleding nu" name="wear_check"/>
 	<string name="no_copy_text">
diff --git a/indra/newview/skins/default/xui/nl/floater_color_picker.xml b/indra/newview/skins/default/xui/nl/floater_color_picker.xml
index 24b242e15c..25294e17e2 100644
--- a/indra/newview/skins/default/xui/nl/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/nl/floater_color_picker.xml
@@ -18,13 +18,14 @@
 	<text name="l_val_text">
 		Lum:
 	</text>
-	<check_box label="Meteen toepassen" name="apply_immediate"/>
+	<check_box label="Direct toepassen" name="apply_immediate"/>
 	<button label="Annuleren" label_selected="Annuleren" name="cancel_btn"/>
 	<button label="Selecteer" label_selected="Selecteer" name="select_btn"/>
 	<text name="Current color:">
 		Huidige kleur:
 	</text>
 	<text name="(Drag below to save.)">
-		(Sleep naar beneden om op te slaan.)
+		(Sleep naar beneden 
+ om op te slaan.)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_env_settings.xml b/indra/newview/skins/default/xui/nl/floater_env_settings.xml
index d212f544c5..d66c0b2205 100644
--- a/indra/newview/skins/default/xui/nl/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/nl/floater_env_settings.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Environment Editor Floater" title="Omgeving editor">
-	<text name="EnvTimeText">
-		Tijd van de dag
+	<text bottom="-42" name="EnvTimeText">
+		Tijd van de 
+dag
 	</text>
-	<text name="EnvTimeText2">
+	<text bottom_delta="-36" name="EnvTimeText2">
 		0:00
 	</text>
 	<text name="EnvCloudText">
diff --git a/indra/newview/skins/default/xui/nl/floater_inspect.xml b/indra/newview/skins/default/xui/nl/floater_inspect.xml
index d4fa75d94f..96c9d59f90 100644
--- a/indra/newview/skins/default/xui/nl/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/nl/floater_inspect.xml
@@ -2,10 +2,10 @@
 <floater name="inspect" title="Objecten inspecteren">
 	<scroll_list name="object_list" tool_tip="Selecteer een object van deze lijst om het in-wereld te markeren">
 		<column label="Objectnaam" name="object_name"/>
-		<column label="Eigenaarnaam" name="owner_name"/>
-		<column label="Makernaam:" name="creator_name"/>
+		<column label="Eigenaar" name="owner_name"/>
+		<column label="Maker" name="creator_name"/>
 		<column label="Aanmaakdatum" name="creation_date"/>
 	</scroll_list>
-	<button label="Bekijk eigenaarprofiel..." label_selected="" name="button owner" tool_tip="Bekijk het profiel van de eigenaar van het gemarkeerde object"/>
-	<button label="Bekijk makerprofiel..." label_selected="" name="button creator" tool_tip="Bekijk het profiel van de originele maker van het gemarkeerde object"/>
+	<button label="Toon profiel eigenaar..." label_selected="" name="button owner" tool_tip="Bekijk het profiel van de eigenaar van het gemarkeerde object"/>
+	<button label="Toon profiel maker..." label_selected="" name="button creator" tool_tip="Bekijk het profiel van de originele maker van het gemarkeerde object"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_joystick.xml b/indra/newview/skins/default/xui/nl/floater_joystick.xml
index 27556a89f8..dcdddd0492 100644
--- a/indra/newview/skins/default/xui/nl/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/nl/floater_joystick.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Joystick" title="Joystick configuratie">
-	<check_box name="enable_joystick">
-		Joystick inschakelen
+	<check_box name="enable_joystick" width="80">
+		Joystick inschakelen:
 	</check_box>
+	<text left="146" name="joystick_type" width="360"/>
 	<spinner label="X-as mapping" name="JoystickAxis1"/>
 	<spinner label="Y-as mapping" name="JoystickAxis2"/>
 	<spinner label="Z-as mapping" name="JoystickAxis0"/>
@@ -52,7 +53,7 @@
 	<text name="ZDeadZone">
 		Z dode zone
 	</text>
-	<text name="PitchDeadZone">
+	<text name="PitchDeadZone" left="4" width="110">
 		Stampen dode zone
 	</text>
 	<text name="YawDeadZone">
@@ -70,9 +71,9 @@
 	<text name="ZoomDeadZone">
 		Zoom dode zone
 	</text>
-	<button label="SpaceNavigator standaardwaarden" name="SpaceNavigatorDefaults"/>
+	<button label="SpaceNavigator standaardwaarden" name="SpaceNavigatorDefaults" width="200" font="SansSerifSmall"/>
 	<button label="OK" label_selected="OK" name="ok_btn"/>
-	<button label="Annuleren" label_selected="Annuleren" name="cancel_btn"/>
+	<button label="Annuleren" label_selected="Annuleren" name="cancel_btn" left_delta="110"/>
 	<string name="JoystickMonitor">
 		Joystick monitor
 	</string>
diff --git a/indra/newview/skins/default/xui/nl/floater_mute_object.xml b/indra/newview/skins/default/xui/nl/floater_mute_object.xml
index efc12f29e2..ca3b34c3a2 100644
--- a/indra/newview/skins/default/xui/nl/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/nl/floater_mute_object.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="mute by name" title="Negeer object op naam">
-	<text name="message">
-		Negeer op naam heeft alleen invloed op object chat en IM, niet op geluiden. U dient de naam van het object exact te typen.
+	<text name="message" bottom_delta="-40">
+		Negeer op naam heeft alleen invloed op object chat
+en IM, niet op geluiden. U dient de naam van het object 
+exact te typen.
 	</text>
-	<line_editor name="object_name">
+	<line_editor name="object_name" bottom_delta="-58">
 		Object naam
 	</line_editor>
 	<button label="Ok" name="OK"/>
diff --git a/indra/newview/skins/default/xui/nl/floater_openobject.xml b/indra/newview/skins/default/xui/nl/floater_openobject.xml
index 58ca71505a..10b502be1c 100644
--- a/indra/newview/skins/default/xui/nl/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/nl/floater_openobject.xml
@@ -3,6 +3,6 @@
 	<text name="object_name">
 		[DESC]:
 	</text>
-	<button label="Kopiëren naar inventaris" label_selected="Kopiëren naar inventaris" name="copy_to_inventory_button"/>
-	<button label="Kopiëren en dragen" label_selected="Kopiëren en dragen" name="copy_and_wear_button"/>
+	<button label="Kopiëren naar inventaris" label_selected="Kopiëren naar inventaris" name="copy_to_inventory_button" width="140"/>
+	<button label="Kopiëren en dragen" label_selected="Kopiëren en dragen" name="copy_and_wear_button" left="164"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_pay.xml b/indra/newview/skins/default/xui/nl/floater_pay.xml
index 3255412439..4018ebdc93 100644
--- a/indra/newview/skins/default/xui/nl/floater_pay.xml
+++ b/indra/newview/skins/default/xui/nl/floater_pay.xml
@@ -6,10 +6,10 @@
 	<button label="L$20" label_selected="L$20" name="fastpay 20"/>
 	<button label="Betaal" label_selected="Betaal" name="pay btn"/>
 	<button label="Annuleren" label_selected="Annuleren" name="cancel btn"/>
-	<text name="payee_label">
+	<text name="payee_label" width="100">
 		Betaal inwoner:
 	</text>
-	<text name="payee_name">
+	<text name="payee_name" left="110">
 		[FIRST] [LAST]
 	</text>
 	<text name="fastpay text">
diff --git a/indra/newview/skins/default/xui/nl/floater_pay_object.xml b/indra/newview/skins/default/xui/nl/floater_pay_object.xml
index 23a161ac14..d3826648f2 100644
--- a/indra/newview/skins/default/xui/nl/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/nl/floater_pay_object.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
-	<text name="payee_group">
+	<text name="payee_group" left="5" width="90" halign="left">
 		Betaal groep:
 	</text>
-	<text name="payee_resident">
+	<text name="payee_resident" left="5" width="90" halign="left">
 		Betaal inwoner:
 	</text>
-	<text name="payee_name">
+	<text name="payee_name" left="100" width="200">
 		[FIRST] [LAST]
 	</text>
-	<text name="object_name_label">
+	<text name="object_name_label" left="5" width="90" halign="left">
 		Via object:
 	</text>
-	<text name="object_name_text">
+	<text name="object_name_text" left="100" width="200">
 		...
 	</text>
-	<text name="fastpay text">
+	<text name="fastpay text" halign="left">
 		Snel betalen:
 	</text>
 	<text name="amount text">
diff --git a/indra/newview/skins/default/xui/nl/floater_perm_prefs.xml b/indra/newview/skins/default/xui/nl/floater_perm_prefs.xml
index d19b5523f5..c1c9492286 100644
--- a/indra/newview/skins/default/xui/nl/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/nl/floater_perm_prefs.xml
@@ -9,7 +9,7 @@
 		</text>
 		<check_box label="Wijzigen" name="next_owner_modify"/>
 		<check_box label="Kopiëren" name="next_owner_copy"/>
-		<check_box label="Verkopen/weggeven" name="next_owner_transfer"/>
+		<check_box label="Verkopen/weggeven" name="next_owner_transfer" left_delta="80"/>
 	</panel>
 	<button label="OK" label_selected="OK" name="ok"/>
 	<button label="Annuleren" label_selected="Annuleren" name="cancel"/>
diff --git a/indra/newview/skins/default/xui/nl/floater_select_key.xml b/indra/newview/skins/default/xui/nl/floater_select_key.xml
index da97c03a6c..c8daa10ab6 100644
--- a/indra/newview/skins/default/xui/nl/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/nl/floater_select_key.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" title="">
 	<button label="Annuleren" label_selected="Annuleren" name="Cancel"/>
-	<text name="Save item as:">
-		Druk een toets om te selecteren
+	<text name="Save item as:" left="12" width="220">
+		Druk op een toets om die te selecteren
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_telehub.xml b/indra/newview/skins/default/xui/nl/floater_telehub.xml
index b1fc80cf3c..5a8abc208a 100644
--- a/indra/newview/skins/default/xui/nl/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/nl/floater_telehub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="telehub" title="Telehub">
+<floater name="telehub" title="Telehub" width="292">
 	<text name="status_text_connected">
 		Telehub verbonden met object [OBJECT]
 	</text>
@@ -13,13 +13,21 @@
 		Selecteer objecten klik Verbind telehub
 	</text>
 	<button label="Verbind telehub" name="connect_btn"/>
-	<button label="Verbinding verbreken" name="disconnect_btn"/>
+	<button label="Verbinding verbreken" name="disconnect_btn" width="128"/>
 	<text name="spawn_points_text">
 		Spawnpunten (posities, niet objecten):
 	</text>
+	<scroll_list bottom_delta="-44" draw_border="true" follows="left|top" font="SansSerifSmall"
+	     height="40" left="10" multi_select="false" name="spawn_points_list"
+	     width="230" />
+
 	<button label="Spawn toevoegen" name="add_spawn_point_btn"/>
 	<button label="Verwijder Spawn" name="remove_spawn_point_btn"/>
-	<text name="spawn_point_help">
-		Selecteer object en klik Toevoegen om positie te specificeren. U kunt het object daarna verplaatsen of verwijderen. Posities zijn relatief ten opzichte van het middelpunt van de telehub. Selecteer een item in de lijst om de positie in de wereld te tonen.
+	<text name="spawn_point_help" width="290">
+		Selecteer object en klik Toevoegen om positie 
+te specificeren. U kunt het object daarna verplaatsen 
+of verwijderen. Posities zijn relatief ten opzichte 
+van het middelpunt van de telehub. Selecteer een 
+item in de lijst om de positie in de wereld te tonen.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/nl/floater_texture_ctrl.xml
index 440a31097d..13a68747c6 100644
--- a/indra/newview/skins/default/xui/nl/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/nl/floater_texture_ctrl.xml
@@ -9,12 +9,12 @@
 	<text name="unknown">
 		Afmetingen: [DIMENSIONS]
 	</text>
-	<button label="Standaard" label_selected="Standaard" name="Default"/>
-	<button label="Geen" label_selected="Geen" name="None"/>
+	<button label="Standaard" label_selected="Standaard" name="Default" width="70"/>
+	<button label="Geen" label_selected="Geen" name="None" left="80"/>
 	<button label="Blanco" label_selected="Blanco" name="Blank"/>
 	<check_box label="Toon mappen" name="show_folders_check"/>
 	<search_editor label="Type hier om te zoeken" name="inventory search editor"/>
-	<check_box label="Meteen toepassen" name="apply_immediate_check"/>
+	<check_box label="Direct toepassen" name="apply_immediate_check"/>
 	<button label="Annuleren" label_selected="Annuleren" name="Cancel"/>
 	<button label="Selecteren" label_selected="Selecteren" name="Select"/>
 	<string name="pick title">
diff --git a/indra/newview/skins/default/xui/nl/floater_tools.xml b/indra/newview/skins/default/xui/nl/floater_tools.xml
index c7f99195dd..42cf22aa15 100644
--- a/indra/newview/skins/default/xui/nl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/nl/floater_tools.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Bouwen" width="288">
 	<button label="" label_selected="" name="button focus" tool_tip="Focus"/>
 	<button label="" label_selected="" name="button move" tool_tip="Verplaats"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Bewerk"/>
 	<button label="" label_selected="" name="button create" tool_tip="Maak"/>
 	<button label="" label_selected="" name="button land" tool_tip="Land"/>
 	<check_box label="Zoom" name="radio zoom"/>
-	<check_box label="Draaien (Ctrl)" name="radio orbit"/>
+	<check_box label="Roteren (Ctrl)" name="radio orbit"/>
 	<check_box label="Verplaatsen (Ctrl-Shift)" name="radio pan"/>
 	<check_box label="Verplaatsen" name="radio move"/>
 	<check_box label="Optillen (Ctrl)" name="radio lift"/>
-	<check_box label="Draaien (Ctrl-Shift)" name="radio spin"/>
+	<check_box label="Roteren (Ctrl-Shift)" name="radio spin"/>
 	<check_box label="Positie" name="radio position"/>
-	<check_box label="Draaien (Ctrl)" name="radio rotate"/>
+	<check_box label="Roteren (Ctrl)" name="radio rotate"/>
 	<check_box label="Uitrekken (Ctrl-Shift)" name="radio stretch"/>
 	<check_box label="Selecteer textuur" name="radio select face"/>
 	<check_box label="Bewerk gekoppelde onderdelen" name="checkbox edit linked parts"/>
 	<text name="text ruler mode">
 		Liniaal:
 	</text>
-	<combo_box name="combobox grid mode">
+	<combo_box name="combobox grid mode" width="78" left_delta="38">
 		<combo_item name="World">
 			Wereld
 		</combo_item>
@@ -30,18 +30,18 @@
 			Referentie
 		</combo_item>
 	</combo_box>
-	<check_box label="Beide zijden uitrekken" name="checkbox uniform"/>
-	<check_box label="Texturen uitrekken" name="checkbox stretch textures"/>
-	<check_box label="Gebruik grid" name="checkbox snap to grid"/>
-	<button label="Opties..." label_selected="Opties..." name="Options..."/>
-	<text name="text status">
+	<check_box left="136" label="Beide zijden uitrekken" name="checkbox uniform"/>
+	<check_box left="136" label="Texturen uitrekken" name="checkbox stretch textures"/>
+	<check_box left="136" label="Gebruik grid" name="checkbox snap to grid"/>
+	<button label="Opties..." label_selected="Opties..." name="Options..." height="18" bottom_delta="-15"/>
+	<text name="text status" width="280">
 		Sleep om te verplaatsen, Shift-slepen om te kopiëren
 	</text>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Kubus"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
 	<button label="" label_selected="" name="ToolPyramid" tool_tip="Piramide"/>
 	<button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetrahedron"/>
-	<button label="" label_selected="" name="ToolCylinder" tool_tip="Cylinder"/>
+	<button label="" label_selected="" name="ToolCylinder" tool_tip="Cilinder"/>
 	<button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Halve cilinder"/>
 	<button label="" label_selected="" name="ToolCone" tool_tip="Kegel"/>
 	<button label="" label_selected="" name="ToolHemiCone" tool_tip="Halve kegel"/>
@@ -73,13 +73,13 @@
 	<text name="Strength:">
 		Sterkte
 	</text>
-	<text name="obj_count">
+	<text name="obj_count" left="134">
 		Geselecteerde objecten: [COUNT]
 	</text>
-	<text name="prim_count">
+	<text name="prim_count" left="134">
 		primitieven: [COUNT]
 	</text>
-	<tab_container name="Object Info Tabs">
+	<tab_container name="Object Info Tabs" tab_max_width="62" tab_min_width="30" width="288">
 		<panel label="Algemeen" name="General">
 			<text name="Name:">
 				Naam:
@@ -95,7 +95,7 @@
 			</text>
 			<button label="Profiel..." label_selected="Profiel..." name="button creator profile"/>
 			<text name="Owner:">
-				Eigenaar
+				Eigenaar:
 			</text>
 			<text name="Owner Name">
 				Thrax Linden
@@ -112,7 +112,7 @@
 				Permissies:
 			</text>
 			<text name="perm_modify">
-				U kunt dit object wijzigen
+				U kunt dit object wijzigen.
 			</text>
 			<check_box label="Deel met groep" name="checkbox share with group" tool_tip="Alle leden van de ingestelde groep toestaan om te delen en uw permissies voor dit object te gebruiken. U moet &apos;Overdragen&apos; om rolbeperkingen in te schakelen."/>
 			<string name="text deed continued">
@@ -144,12 +144,12 @@
 				Volgende eigenaar kan:
 			</text>
 			<check_box label="Wijzigen" name="checkbox next owner can modify"/>
-			<check_box label="Kopiëren" name="checkbox next owner can copy"/>
-			<check_box label="Verkopen/weggeven" name="checkbox next owner can transfer"/>
+			<check_box label="Kopiëren" name="checkbox next owner can copy" left_delta="80"/>
+			<check_box label="Verkopen/weggeven" name="checkbox next owner can transfer" left_delta="67"/>
 			<text name="label click action">
 				Wanneer links-geklikt:
 			</text>
-			<combo_box name="clickaction">
+			<combo_box name="clickaction" width="178">
 				<combo_item name="Touch/grab(default)">
 					Aanraken/pakken (standaard)
 				</combo_item>
@@ -191,19 +191,19 @@
 				F:
 			</text>
 			<string name="text modify info 1">
-				U kunt dit object wijzigen
+				U kunt dit object wijzigen.
 			</string>
 			<string name="text modify info 2">
-				U kunt deze objecten wijzigen
+				U kunt deze objecten wijzigen.
 			</string>
 			<string name="text modify info 3">
-				U kunt dit object niet wijzigen
+				U kunt dit object niet wijzigen.
 			</string>
 			<string name="text modify info 4">
-				U kunt deze objecten niet wijzigen
+				U kunt deze objecten niet wijzigen.
 			</string>
 			<string name="text modify warning">
-				U moet het hele object selecteren om permissies in te stellen
+				U moet het hele object selecteren om permissies in te stellen.
 			</string>
 			<string name="Cost Default">
 				Prijs:           L$
@@ -358,7 +358,7 @@
 				Deuk begin en einde
 			</text>
 			<text name="advanced_slice">
-				Uitsnede Begin en Einde
+				Uitsnede begin en einde
 			</text>
 			<spinner label="B" name="Path Limit Begin"/>
 			<spinner label="E" name="Path Limit End"/>
@@ -370,7 +370,7 @@
 			<text name="text radius delta">
 				Straal
 			</text>
-			<text name="text revolutions">
+			<text name="text revolutions" width="84">
 				Omwentelingen
 			</text>
 			<texture_picker label="Sculpt textuur" name="sculpt texture control" tool_tip="Klik om een afbeelding te kiezen"/>
@@ -405,14 +405,14 @@
 				Bewerk objectkenmerken:
 			</text>
 			<check_box label="Flexibiliteit" name="Flexible1D Checkbox Ctrl" tool_tip="Staat toe dat objecten kunnen buigen om de Z-as. (alleen aan de client kant)"/>
-			<spinner label="Zachtheid" name="FlexNumSections"/>
-			<spinner label="Zwaartekracht" name="FlexGravity"/>
-			<spinner label="Slepen" name="FlexFriction"/>
-			<spinner label="Wind" name="FlexWind"/>
-			<spinner label="Spanning" name="FlexTension"/>
-			<spinner label="Kracht X" name="FlexForceX"/>
-			<spinner label="Kracht Y" name="FlexForceY"/>
-			<spinner label="Kracht Z" name="FlexForceZ"/>
+			<spinner label="Zachtheid" name="FlexNumSections" width="143" label_width="80"/>
+			<spinner label="Zwaartekracht" name="FlexGravity" width="143" label_width="80"/>
+			<spinner label="Slepen" name="FlexFriction" width="143" label_width="80"/>
+			<spinner label="Wind" name="FlexWind" width="143" label_width="80"/>
+			<spinner label="Spanning" name="FlexTension" width="143" label_width="80"/>
+			<spinner label="Kracht X" name="FlexForceX" width="143" label_width="80"/>
+			<spinner label="Kracht Y" name="FlexForceY" width="143" label_width="80"/>
+			<spinner label="Kracht Z" name="FlexForceZ" width="143" label_width="80"/>
 			<check_box label="Licht" name="Light Checkbox Ctrl" tool_tip="Zorgt dat het object licht uitstraalt"/>
 			<text name="label color">
 				Kleur
@@ -425,13 +425,13 @@
 		<panel label="Textuur" name="Texture">
 			<texture_picker label="Textuur" name="texture control" tool_tip="Klik om een afbeelding te kiezen"/>
 			<color_swatch label="Kleur" name="colorswatch" tool_tip="Klik om kleurkiezer to openen"/>
-			<text name="color trans">
+			<text name="color trans" width="100">
 				Transparantie %
 			</text>
 			<text name="glow label">
 				Gloed
 			</text>
-			<check_box label="Volledige helderheid" name="checkbox fullbright"/>
+			<check_box label="Volledige &#10;helderheid" name="checkbox fullbright" bottom_delta="-21"/>
 			<text name="tex gen">
 				Mapping
 			</text>
@@ -536,7 +536,7 @@
 				Herhalingen per zijde
 			</string>
 			<text name="rpt">
-				Herhalingen per meter
+				Herhalingen per m
 			</text>
 			<button label="Toepassen" label_selected="Toepassen" name="button apply"/>
 			<text name="tex offset">
@@ -545,13 +545,15 @@
 			<spinner label="Horizontaal (U)" name="TexOffsetU"/>
 			<spinner label="Verticaal (V)" name="TexOffsetV"/>
 			<text name="textbox autofix">
-				Mediatextuur uitlijnen (moet eerst laden)
+				Mediatextuur uitlijnen
+(moet eerst laden)
 			</text>
-			<button label="Uitlijnen" label_selected="Uitlijnen" name="button align"/>
+			<button label="Uitlijnen" label_selected="Uitlijnen" name="button align" left="155" />
 		</panel>
 		<panel label="Inhoud" name="Contents">
 			<button label="Nieuw script" label_selected="Nieuw script..." name="button new script"/>
 			<button label="Permissies..." name="button permissions"/>
+		<panel name="ContentsInventory" width="272" />
 		</panel>
 	</tab_container>
 	<panel name="land info panel">
@@ -559,14 +561,14 @@
 			Perceel Informatie
 		</text>
 		<text name="label_area_price">
-			Prijs: L$[PRICE] voor [AREA] m2.
+			Prijs: L$[PRICE] voor [AREA] m².
 		</text>
 		<text name="label_area">
-			Gebied: [AREA] m2.
+			Gebied: [AREA] m².
 		</text>
 		<button label="Over land..." label_selected="Over land..." name="button about land"/>
 		<check_box label="Toon Eigenaren" name="checkbox show owners" tool_tip="Kleur percelen op basis van hun eigendom"/>
-		<button label="?" label_selected="?" name="button show owners help"/>
+		<button label="?" label_selected="?" name="button show owners help" left_delta="105"/>
 		<text name="label_parcel_modify">
 			Wijzig Perceel
 		</text>
diff --git a/indra/newview/skins/default/xui/nl/floater_top_objects.xml b/indra/newview/skins/default/xui/nl/floater_top_objects.xml
index e79ee4ea56..cc252352eb 100644
--- a/indra/newview/skins/default/xui/nl/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/nl/floater_top_objects.xml
@@ -4,29 +4,29 @@
 		Laden…
 	</text>
 	<scroll_list name="objects_list">
-		<column label="Score" name="score"/>
-		<column label="Naam" name="name"/>
-		<column label="Eigenaar" name="owner"/>
-		<column label="Locatie" name="location"/>
-		<column label="Tijd" name="time"/>
-		<column label="Mono tijd" name="mono_time"/>
+		<column label="Score" name="score" width="84"/>
+		<column label="Naam" name="name" width="84"/>
+		<column label="Eigenaar" name="owner" width="84"/>
+		<column label="Locatie" name="location" width="84"/>
+		<column label="Tijd" name="time" width="84"/>
+		<column label="Mono tijd" name="mono_time" width="84"/>
 	</scroll_list>
-	<text name="id_text">
+	<text name="id_text" left="2">
 		Object ID:
 	</text>
 	<button label="Toon baken" name="show_beacon_btn"/>
-	<text name="obj_name_text">
+	<text name="obj_name_text" left="2">
 		Object naam:
 	</text>
 	<button label="Filter" name="filter_object_btn"/>
-	<text name="owner_name_text">
+	<text name="owner_name_text" left="2">
 		Eigenaar naam:
 	</text>
 	<button label="Filter" name="filter_owner_btn"/>
-	<button label="Geselecteerde retourneren" name="return_selected_btn"/>
-	<button label="Alles retourneren" name="return_all_btn"/>
-	<button label="Geselecteerde uitschakelen" name="disable_selected_btn"/>
-	<button label="Alles uitschakelen" name="disable_all_btn"/>
+	<button label="Geselecteerde retourneren" name="return_selected_btn" width="170"/>
+	<button label="Alles retourneren" name="return_all_btn" left="190"/>
+	<button label="Geselecteerde uitschakelen" name="disable_selected_btn" width="170"/>
+	<button label="Alles uitschakelen" name="disable_all_btn" left="190"/>
 	<button label="Verversen" name="refresh_btn"/>
 	<string name="top_scripts_title">
 		Top scripts
diff --git a/indra/newview/skins/default/xui/nl/floater_url_entry.xml b/indra/newview/skins/default/xui/nl/floater_url_entry.xml
index 23ea21bcc5..6926f09390 100644
--- a/indra/newview/skins/default/xui/nl/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/nl/floater_url_entry.xml
@@ -4,8 +4,8 @@
 		Media URL:
 	</text>
 	<button label="OK" name="ok_btn"/>
-	<button label="Annuleren" name="cancel_btn"/>
-	<button label="Leegmaken" name="clear_btn"/>
+	<button label="Annuleren" name="cancel_btn" width="80"/>
+	<button label="Leegmaken" name="clear_btn" width="80"/>
 	<text name="loading_label">
 		Laden…
 	</text>
diff --git a/indra/newview/skins/default/xui/nl/floater_water.xml b/indra/newview/skins/default/xui/nl/floater_water.xml
index 38ec15d1a0..2238008fd8 100644
--- a/indra/newview/skins/default/xui/nl/floater_water.xml
+++ b/indra/newview/skins/default/xui/nl/floater_water.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Water Floater" title="Geavanceerde water editor">
+	<combo_box bottom="-50" height="18" left_delta="116" name="WaterPresetsCombo" width="150" />
 	<text name="KeyFramePresetsText">
 		Watervoorinstellingen
 	</text>
-	<button label="Nieuw" label_selected="Nieuw" name="WaterNewPreset"/>
+	<button label="Nieuw" label_selected="Nieuw" name="WaterNewPreset" left_delta="190"/>
 	<button label="Opslaan" label_selected="Opslaan" name="WaterSavePreset"/>
-	<button label="Verwijderen" label_selected="Verwijderen" name="WaterDeletePreset"/>
+	<button label="Verwijderen" label_selected="Verwijderen" name="WaterDeletePreset" width="80"/>
 	<tab_container name="Water Tabs">
 		<panel label="Instellingen" name="Settings">
 			<text name="BHText">
diff --git a/indra/newview/skins/default/xui/nl/panel_friends.xml b/indra/newview/skins/default/xui/nl/panel_friends.xml
index 2f43ee0a53..eaf6e5d55b 100644
--- a/indra/newview/skins/default/xui/nl/panel_friends.xml
+++ b/indra/newview/skins/default/xui/nl/panel_friends.xml
@@ -11,10 +11,10 @@
 		<column name="icon_edit_mine" tool_tip="Vriend kan objecten wijzigen, verwijderen of oppakken"/>
 		<column name="icon_edit_theirs" tool_tip="U kunt de objecten van deze vriend bewerken"/>
 	</scroll_list>
-	<button label="IM/Oproepen" name="im_btn" tool_tip="Open Instant Message sessie"/>
-	<button label="Profiel" name="profile_btn" tool_tip="Toon afbeelding, groepen en andere informatie"/>
-	<button label="Teleport..." name="offer_teleport_btn" tool_tip="Bied deze vriend een teleport naar uw huidige locatie aan"/>
-	<button label="Betaal..." name="pay_btn" tool_tip="Geef Linden dollars (L$) aan deze vriend"/>
-	<button label="Verwijderen..." name="remove_btn" tool_tip="Verwijder deze persoon van uw vriendenlijst"/>
-	<button label="Toevoegen..." name="add_btn" tool_tip="Bied vriendschap aan een inwoner aan"/>
+	<button label="IM/Oproepen" name="im_btn" tool_tip="Open Instant Message sessie" width="86"/>
+	<button label="Profiel" name="profile_btn" tool_tip="Toon afbeelding, groepen en andere informatie" width="86"/>
+	<button label="Teleport..." name="offer_teleport_btn" tool_tip="Bied deze vriend een teleport naar uw huidige locatie aan" width="86"/>
+	<button label="Betaal..." name="pay_btn" tool_tip="Geef Linden dollars (L$) aan deze vriend" width="86"/>
+	<button label="Verwijderen..." name="remove_btn" tool_tip="Verwijder deze persoon van uw vriendenlijst" width="86"/>
+	<button label="Toevoegen..." name="add_btn" tool_tip="Bied vriendschap aan een inwoner aan" width="86"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/nl/panel_group_general.xml b/indra/newview/skins/default/xui/nl/panel_group_general.xml
index 9982a527f4..7b78c845cd 100644
--- a/indra/newview/skins/default/xui/nl/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/nl/panel_group_general.xml
@@ -16,18 +16,18 @@ Laat uw muis boven de opties zweven voor meer help.
 	<text name="prepend_founded_by">
 		Opgericht door
 	</text>
-	<text name="founder_name">
+	<text name="founder_name" left_delta="84">
 		(wachten)
 	</text>
-	<text name="group_charter_label">
+	<text name="group_charter_label" width="244">
 		Groepcharter
 	</text>
 	<texture_picker label="Groepinsigne" name="insignia" tool_tip="Klik om een afbeelding te kiezen"/>
-	<text_editor name="charter">
+	<text_editor name="charter" width="244">
 		Groepcharter
 	</text_editor>
 	<button label="Deelnemen (L$0)" label_selected="Deelnemen (L$0)" name="join_button"/>
-	<button label="Gedetailleerde weergave" label_selected="Gedetailleerde weergave" name="info_button"/>
+	<button label="Gedetailleerde weergave" label_selected="Gedetailleerde weergave" name="info_button" width="154"/>
 	<text name="text_owners_and_visible_members">
 		Eigenaren en zichtbare leden
 	</text>
@@ -43,10 +43,10 @@ Laat uw muis boven de opties zweven voor meer help.
 		Groepvoorkeuren
 	</text>
 	<panel name="preferences_container">
-		<check_box label="Toon in zoeken" name="show_in_group_list" tool_tip="Laat mensen deze groep zien in zoekresultaten."/>
+		<check_box label="Toon in zoeken" name="show_in_group_list" tool_tip="Stelt in of deze groep zichtbaar is in de zoekresultaten."/>
 		<check_box label="Vrije toegang" name="open_enrollement" tool_tip="Stelt in of deze groep toestaat dat nieuwe leden lid kunnen worden zonder uitgenodigd te zijn."/>
 		<check_box label="Contributiebijdrage: L$" name="check_enrollment_fee" tool_tip="Stelt in of er een contributiebijdrage vereist is om lid te worden van de groep."/>
-		<spinner name="spin_enrollment_fee" tool_tip="Nieuwe leden moeten deze bijdrage betalen om deel te nemen aan de groep wanneer &quot;Contributie bijdrage&quot; is aangevinkt."/>
+		<spinner name="spin_enrollment_fee" tool_tip="Nieuwe leden moeten deze bijdrage betalen om deel te nemen aan de groep wanneer &quot;Contributie bijdrage&quot; is aangevinkt." width="58" left_delta="142"/>
 		<combo_box name="group_mature_check" tool_tip="Stelt in of uw groepsinformatie als mature beschouwd wordt.">
 			<combo_item name="select_mature">
 				- Selecteer -
@@ -64,14 +64,15 @@ Laat uw muis boven de opties zweven voor meer help.
 			</text>
 			<combo_box name="active_title" tool_tip="Stelt de titel in die in uw avatar&apos;s naamlabel verschijnt wanneer deze groep actief is."/>
 		</panel>
-		<check_box label="Ontvang groepsberichten" name="receive_notices" tool_tip="Stelt in of u berichten van deze groep wilt ontvangen. Verwijder het vinkje wanneer u spam ontvangt van deze groep."/>
+		<check_box label="Ontvang groepsberichten" name="receive_notices" tool_tip="Stelt in of u berichten van deze groep wilt ontvangen. Verwijder het vinkje wanneer u spam ontvangt van deze groep." left_delta="-4"/>
 		<check_box label="Toon deze groep in mijn profiel" name="list_groups_in_profile" tool_tip="Stelt in of u deze groep in uw profiel wil laten zien"/>
 	</panel>
 	<string name="incomplete_member_data_str">
 		Ledendata ophalen
 	</string>
 	<string name="confirm_group_create_str">
-		Het maken van deze groep zal u L$100 kosten. Weet u echt, echt, ECHT zeker dat u L$100 wil besteden om deze groep te maken? 
-Wees u ervan bewust dat, indien niemand anders binnen 48 uur lid wordt van deze groep, deze ontmanteld zal worden, waarbij de groepsnaam onbeschikbaar zal blijven voor toekomstig gebruik.
+		Het maken van deze groep zal u L$ 100 kosten. Weet u ECHT héél zeker dat u L$ 100 wilt betalen om deze groep te maken?
+
+WEES U ER VAN BEWUST, dat als er niemand binnen 48 uur lid wordt van deze groep, deze weer ontmanteld zal worden. Hierbij zal ook de groepsnaam onbeschikbaar blijven voor toekomstig gebruik!
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/nl/panel_group_invite.xml b/indra/newview/skins/default/xui/nl/panel_group_invite.xml
index 004fdc4bee..e012d88ff5 100644
--- a/indra/newview/skins/default/xui/nl/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/nl/panel_group_invite.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Nodig een lid uit" name="invite_panel">
 	<text name="help_text">
-		U kunt meerdere inwoners selecteren om voor uw groep uit te nodigen. Klik &apos;Open inwonerkiezer&apos; om te starten.
+		U kunt meerdere inwoners selecteren 
+om voor uw groep uit te nodigen. Klik 
+&apos;Open inwonerkiezer&apos; om te starten.
 	</text>
 	<button label="Open inwonerkiezer" name="add_button" tool_tip=""/>
 	<name_list name="invitee_list" tool_tip="Houd de Ctrl-toets vast en klik de namen van de inwoners om meerdere te selecteren."/>
 	<button label="Verwijder geselecteerden van lijst" name="remove_button" tool_tip="Verwijderd hierboven geselecteerde inwoners van de uitnodigingslijst."/>
 	<text name="role_text">
-		Kies welke rol aan hen wordt toegewezen:
+		Kies welke rol aan hen wordt 
+toegewezen:
 	</text>
-	<combo_box name="role_name" tool_tip="Kies uit de lijst met rollen waarvoor u toestemming heeft om leden toe te wijzen."/>
+	<combo_box name="role_name" tool_tip="Kies uit de lijst met rollen waarvoor u toestemming heeft om leden toe te wijzen." bottom_delta="-30"/>
 	<button label="Verzend uitnodigingen" name="ok_button"/>
 	<button label="Annuleren" name="cancel_button"/>
 	<string name="confirm_invite_owner_str">
diff --git a/indra/newview/skins/default/xui/nl/panel_group_notices.xml b/indra/newview/skins/default/xui/nl/panel_group_notices.xml
index 41aff527dd..68f3c87f7d 100644
--- a/indra/newview/skins/default/xui/nl/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/nl/panel_group_notices.xml
@@ -11,7 +11,9 @@
 		Groepsberichtenarchief
 	</text>
 	<text name="lbl2">
-		Berichten worden 14 dagen bewaard. Klik hieronder het bericht dat u wilt bekijken. Klik de &apos;Verversen&apos; knop om te controleren of nieuwe berichten zijn ontvangen. Berichtenlijsten zijn gelimiteerd tot 200 berichten groep per dag.
+		Berichten worden 14 dagen bewaard. Klik hieronder het bericht dat u wilt 
+bekijken. Klik de &apos;Verversen&apos; knop om te controleren of nieuwe berichten zijn 
+ontvangen. Berichtenlijsten zijn gelimiteerd tot 200 berichten groep per dag.
 	</text>
 	<scroll_list name="notice_list">
 		<column label="Onderwerp" name="subject"/>
@@ -28,18 +30,25 @@
 			Maak een bericht
 		</text>
 		<text name="lbl2">
-			U dient een onderwerp in te voeren om een bericht te versturen. U kunt een enkel item aan een bericht toevoegen door het van uw inventaris naar dit paneel te slepen. Bevestigde items moeten kopieerbaar en overdraagbaar zijn en u kunt geen mappen versturen.
+			U dient een onderwerp in te voeren om een bericht te versturen. 
+U kunt een enkel item aan een bericht toevoegen door het van 
+uw inventaris naar dit paneel te slepen. Bevestigde items 
+moeten kopieerbaar en overdraagbaar zijn en u kunt geen 
+mappen versturen.
 		</text>
-		<text name="lbl3">
+		<text bottom_delta="-79" halign="right" left="10" name="lbl3" width="60">
 			Onderwerp:
 		</text>
-		<text name="lbl4">
+		<line_editor name="create_subject" width="331" left_delta="71"/>
+		<text bottom_delta="-18" halign="right" left="10" name="lbl4" width="60">
 			Bericht:
 		</text>
-		<text name="lbl5">
+		<text_editor name="create_message" bottom_delta="-90" height="104" left_delta="71" width="330"/>
+		<line_editor name="create_inventory_name" width="190" left_delta="71"/>
+		<text name="lbl5" left="10">
 			Bevestig:
 		</text>
-		<button label="Verwijder bevestiging:" label_selected="Verwijder bevestiging:" name="remove_attachment"/>
+		<button label="Verwijder bevestiging" label_selected="Verwijder bevestiging" name="remove_attachment"/>
 		<button label="Verzend bericht" label_selected="Verzend bericht" name="send_notice"/>
 		<panel name="drop_target" tool_tip="Sleep een inventarisitem op het berichtvenster om het met het bericht mee te sturen. U dient permissie te hebben om het object te kopiëren en over te dragen wilt u het met het bericht mee kunnen sturen."/>
 	</panel>
@@ -56,6 +65,7 @@
 		<text name="lbl4">
 			Bericht:
 		</text>
-		<button label="Open bevestiging" label_selected="Open bevestiging" name="open_attachment"/>
+		<button label="Open bevestiging" label_selected="Open bevestiging" name="open_attachment" width="118"/>
+		<line_editor left="128" name="view_inventory_name" width="256"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/nl/panel_group_roles.xml b/indra/newview/skins/default/xui/nl/panel_group_roles.xml
index 50aabb0433..ffaaa8137a 100644
--- a/indra/newview/skins/default/xui/nl/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/nl/panel_group_roles.xml
@@ -12,7 +12,9 @@
 			Leden &amp; Rollen
 		</text>
 		<text name="static2">
-			Groepsleden krijgen Rollen met Mogelijkheden toegekend. Deze instellingen kunnen eenvoudig aangepast worden, zodat meer organisatie en flexibiliteit mogelijk is.
+			Groepsleden krijgen Rollen met Mogelijkheden toegekend. Deze instellingen
+kunnen eenvoudig aangepast worden, zodat meer organisatie en flexibiliteit
+mogelijk is.
 		</text>
 	</panel>
 	<panel name="roles_header">
@@ -20,12 +22,14 @@
 			Rollen
 		</text>
 		<text name="role_properties_modifiable">
-			Selecteer een Rol hieronder. U kunt zijn Naam, Omschrijving en Lid Titel wijzigen.
+			Selecteer een Rol hieronder. U kunt zijn Naam, Omschrijving en
+Lid Titel wijzigen.
 		</text>
 		<text name="role_properties_not_modifiable">
-			Selecteer een Rol hieronder om zijn eigenschappen, Leden en toegestane Mogelijkheden te bekijken.
+			Selecteer een Rol hieronder om zijn eigenschappen, Leden en
+toegestane Mogelijkheden te bekijken.
 		</text>
-		<text name="role_actions_modifiable">
+		<text bottom_delta="-28" name="role_actions_modifiable">
 			U kunt ook Mogelijkheden aan de Rol toekennen.
 		</text>
 		<text name="role_actions_not_modifiable">
@@ -37,14 +41,16 @@
 			Mogelijkheden
 		</text>
 		<text name="static2">
-			U kunt de Omschrijving van een Mogelijkheid bekijken en welke Rollen en Leden de Mogelijkheid kunnen uitvoeren.
+			U kunt de Omschrijving van een Mogelijkheid bekijken en welke Rollen en
+Leden de Mogelijkheid kunnen uitvoeren.
 		</text>
 	</panel>
-	<tab_container name="roles_tab_container">
-		<panel label="Leden" name="members_sub_tab" tool_tip="Leden">
+	<tab_container height="164" name="roles_tab_container">
+		<panel height="148" label="Leden" name="members_sub_tab" tool_tip="Leden">
+			<line_editor bottom="127" name="search_text"/>
 			<button label="Zoeken" name="search_button"/>
 			<button label="Alles Tonen" name="show_all_button"/>
-			<name_list name="member_list">
+			<name_list  bottom_delta="-105" height="104" name="member_list">
 				<column label="Lid Naam" name="name"/>
 				<column label="Gedoneerde Tier" name="donated"/>
 				<column label="Laatste Login" name="online"/>
@@ -55,15 +61,16 @@
 				U kunt Rollen aan Leden toewijzen of van Leden afnemen. Selecteer meerdere Leden door de Ctrl toets ingedrukt te houden en op hun namen te klikken.
 			</string>
 		</panel>
-		<panel label="Rollen" name="roles_sub_tab">
+		<panel height="148" label="Rollen" name="roles_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
 			<button label="Zoeken" name="search_button"/>
 			<button label="Alles Tonen" name="show_all_button"/>
-			<scroll_list name="role_list">
+			<scroll_list bottom_delta="-104" height="104" name="role_list">
 				<column label="Rol Naam" name="name"/>
 				<column label="Titel" name="title"/>
 				<column label="Leden" name="members"/>
 			</scroll_list>
-			<button label="Nieuwe Rol Maken ..." name="role_create"/>
+			<button label="Nieuwe Rol Maken..." name="role_create"/>
 			<button label="Rol Verwijderen" name="role_delete"/>
 			<string name="help_text">
 				Rollen hebben een titel en een toegestane lijst met Mogelijkheden die Leden kunnen uitvoeren. Leden kunnen tot 1 of meer Rollen behoren. Een groep kan tot 10 Rollen bevatten, inclusief de Iedereen en Eigenaren Rollen.
@@ -72,10 +79,11 @@
 				De &apos;Iedereen&apos; en &apos;Eigenaren&apos; Rollen zijn speciaal en kunnen niet verwijderd worden.
 			</string>
 		</panel>
-		<panel label="Mogelijkheden" name="actions_sub_tab">
+		<panel height="148" label="Mogelijkheden" name="actions_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
 			<button label="Zoeken" name="search_button"/>
 			<button label="Alles Tonen" name="show_all_button"/>
-			<scroll_list name="action_list" tool_tip="Selecteer een Mogelijkheid om meer details te bekijken."/>
+			<scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Selecteer een Mogelijkheid om meer details te bekijken."/>
 			<string name="help_text">
 				Mogelijkheden stellen leden in staat om specifieke dingen in een groep te doen. Er is een brede variëteit aan Mogelijkheden.
 			</string>
diff --git a/indra/newview/skins/default/xui/nl/panel_groups.xml b/indra/newview/skins/default/xui/nl/panel_groups.xml
index 5b66eddb73..a0c77b83ff 100644
--- a/indra/newview/skins/default/xui/nl/panel_groups.xml
+++ b/indra/newview/skins/default/xui/nl/panel_groups.xml
@@ -3,13 +3,13 @@
 	<text name="groupdesc">
 		Uw huidige actieve groep wordt vet getoond.
 	</text>
-	<text name="groupcount">
+	<text name="groupcount" width="300">
 		U behoort tot [COUNT] groepen (maximaal [MAX]).
 	</text>
-	<button label="IM/Oproepen" name="IM" tool_tip="Open Instant Message sessie"/>
-	<button label="Info" name="Info"/>
-	<button label="Activeren" name="Activate"/>
-	<button label="Verlaten" name="Leave"/>
-	<button label="Maak…" name="Create"/>
-	<button label="Zoeken…" name="Search..."/>
+	<button label="IM/Oproepen" name="IM" tool_tip="Open Instant Message sessie" width="86"/>
+	<button label="Info" name="Info" width="86"/>
+	<button label="Activeren" name="Activate" width="86"/>
+	<button label="Verlaten" name="Leave" width="86"/>
+	<button label="Maak…" name="Create" width="86"/>
+	<button label="Zoeken…" name="Search..." width="86"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/nl/panel_region_estate.xml b/indra/newview/skins/default/xui/nl/panel_region_estate.xml
index 731887dc5d..7a5fa801d9 100644
--- a/indra/newview/skins/default/xui/nl/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/nl/panel_region_estate.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Estate" name="Estate">
 	<text name="estate_help_text">
-		Wijzigingen van instellingen op dit tabblad zullen alle regio&apos;s in de estate beïnvloeden.
+		Wijzigingen van instellingen op dit tabblad
+zullen alle regio&apos;s in de estate beïnvloeden.
 	</text>
 	<text name="estate_text">
 		Estate:
@@ -10,7 +11,7 @@
 		(onbekend)
 	</text>
 	<text name="owner_text">
-		Eigenaar
+		Eigenaar:
 	</text>
 	<text name="estate_owner">
 		(onbekend)
@@ -25,21 +26,22 @@
 	<text name="Only Allow">
 		Beperk toegang tot:
 	</text>
-	<check_box label="Inwoners met betalingsinformatie opgeslagen" name="limit_payment" tool_tip="Verban ongeïdentificeerde inwoners."/>
-	<check_box label="Leeftijdgeverifieerde volwassenen" name="limit_age_verified" tool_tip="Verban inwoners die hun leeftijd niet geverifieerd hebben. Zie support.secondlife.com voor meer informatie."/>
+	<check_box label="Inwoners met betalingsinformatie &#10;opgeslagen" name="limit_payment" tool_tip="Verban ongeïdentificeerde inwoners."/>
+	<check_box label="Leeftijdgeverifieerde volwassenen" name="limit_age_verified" tool_tip="Verban inwoners die hun leeftijd niet geverifieerd hebben. Zie support.secondlife.com voor meer informatie." bottom_delta="-30"/>
 	<check_box label="Voice chat toestaan" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Directe teleport toestaan" name="allow_direct_teleport"/>
 	<button label="?" name="allow_direct_teleport_help"/>
-	<text name="abuse_email_text">
+	<text name="abuse_email_text" bottom_delta="-23">
 		Misbruik e-mail adres:
 	</text>
+	<line_editor bottom_delta="-14" name="abuse_email_address" />
 	<string name="email_unsupported">
 		Optie niet ondersteund
 	</string>
 	<button label="?" name="abuse_email_address_help"/>
-	<button label="Toepassen" name="apply_btn"/>
-	<button label="Gebruiker verwijderen van estate" name="kick_user_from_estate_btn"/>
+	<button label="Toepassen" name="apply_btn" bottom_delta="-22"/>
+	<button label="Gebruiker verwijderen van estate..." name="kick_user_from_estate_btn"/>
 	<button label="Zend bericht naar estate..." name="message_estate_btn"/>
 	<text name="estate_manager_label">
 		Estate beheerders:
diff --git a/indra/newview/skins/default/xui/nl/panel_region_general.xml b/indra/newview/skins/default/xui/nl/panel_region_general.xml
index 9ed822ac13..fe69fe9d9a 100644
--- a/indra/newview/skins/default/xui/nl/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/nl/panel_region_general.xml
@@ -29,9 +29,9 @@
 	<check_box label="Landverkoop toestaan" name="allow_land_resell_check"/>
 	<button label="?" name="land_resell_help"/>
 	<check_box label="Samenvoegen/opsplitsen land toestaan" name="allow_parcel_changes_check"/>
-	<button label="?" name="parcel_changes_help"/>
+	<button label="?" name="parcel_changes_help" left="240"/>
 	<check_box label="Blokkeer zichtbaarheid land in zoeken" name="block_parcel_search_check" tool_tip="Laat mensen deze regio en zijn percelen in zoekresultaten zien"/>
-	<button label="?" name="parcel_search_help"/>
+	<button label="?" name="parcel_search_help" left="240"/>
 	<spinner label="Agent limiet" name="agent_limit_spin"/>
 	<button label="?" name="agent_limit_help"/>
 	<spinner label="Object bonus" name="object_bonus_spin"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml
index 8ce113514b..8e21f225ca 100755
--- a/indra/newview/skins/default/xui/pl/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml
@@ -3,6 +3,7 @@
   <check_box name="enable_joystick">
 		Aktywuj Joystick:
 	</check_box>
+	<text left="130" name="joystick_type" width="360"/>
   <spinner label="Kalibracja Osi X" left="20" width="170" label_width="130"  name="JoystickAxis1"/>
   <spinner label="Kalibracja Osi Y" left="210" width="170" label_width="130" name="JoystickAxis2" />
   <spinner label="Kalibracja Osi Z" left="400" width="170" label_width="130" name="JoystickAxis0" />
@@ -13,104 +14,104 @@
   <check_box label="Bezpośrednie" left="205" name="ZoomDirect" />
   <check_box label="Kursor 3D" left="340" name="Cursor3D" />
   <check_box label="Automatyczne" left="450" name="AutoLeveling" />
-  <text length="1" left="42" name="Control Modes:" type="string">
+  <text length="1" left="22" name="Control Modes:" type="string">
 		Kontroluj:
 	</text>
-  <check_box left="150" width="90" name="JoystickAvatarEnabled">
+  <check_box left="130" width="90" name="JoystickAvatarEnabled">
 		Awatara
 	</check_box>
-  <check_box left="249" width="90" name="JoystickBuildEnabled">
+  <check_box left="205" width="90" name="JoystickBuildEnabled">
 		Budowanie
 	</check_box>
-  <check_box left="340" width="90" name="JoystickFlycamEnabled">
+  <check_box left="282" width="90" name="JoystickFlycamEnabled">
 		Kamerę podczas latania
 	</check_box>
-  <text width="124" name="XScale">
+  <text width="104" name="XScale">
 		Skala X
 	</text>
-  <spinner left="153" name="AvatarAxisScale1" />
-  <spinner left="218" name="BuildAxisScale1" />
+  <spinner left="133" name="AvatarAxisScale1" />
+  <spinner left="208" name="BuildAxisScale1" />
   <spinner left="283" name="FlycamAxisScale1" />
-  <text width="124" name="YScale">
+  <text width="104" name="YScale">
 		Skala Y
 	</text>
-  <spinner left="153" name="AvatarAxisScale2" />
-  <spinner left="218" name="BuildAxisScale2" />
+  <spinner left="133" name="AvatarAxisScale2" />
+  <spinner left="208" name="BuildAxisScale2" />
   <spinner left="283" name="FlycamAxisScale2" />
-  <text width="124" name="ZScale">
+  <text width="104" name="ZScale">
 		Skala Z
 	</text>
-  <spinner left="153" name="AvatarAxisScale0" />
-  <spinner left="218" name="BuildAxisScale0" />
+  <spinner left="133" name="AvatarAxisScale0" />
+  <spinner left="208" name="BuildAxisScale0" />
   <spinner left="283" name="FlycamAxisScale0" />
-  <text width="124" name="PitchScale">
+  <text width="104" name="PitchScale">
 		Skala Wznoszenia
 	</text>
-  <spinner left="153" name="AvatarAxisScale4" />
-  <spinner left="218" name="BuildAxisScale4" />
+  <spinner left="133" name="AvatarAxisScale4" />
+  <spinner left="208" name="BuildAxisScale4" />
   <spinner left="283" name="FlycamAxisScale4" />
-  <text width="124" name="YawScale">
+  <text width="104" name="YawScale">
 		Skala Odchylania
 	</text>
-  <spinner left="153" name="AvatarAxisScale5" />
-  <spinner left="218" name="BuildAxisScale5" />
+  <spinner left="133" name="AvatarAxisScale5" />
+  <spinner left="208" name="BuildAxisScale5" />
   <spinner left="283" name="FlycamAxisScale5" />
-  <text width="124" name="RollScale">
+  <text width="104" name="RollScale">
 		Skala Obrotu
 	</text>
-  <spinner left="218" name="BuildAxisScale3" />
+  <spinner left="208" name="BuildAxisScale3" />
   <spinner left="283" name="FlycamAxisScale3" />
-  <text width="124" name="XDeadZone">
+  <text width="104" name="XDeadZone">
 		Tolerancja Osi X
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone1" />
-  <spinner left="218" name="BuildAxisDeadZone1" />
+  <spinner left="133" name="AvatarAxisDeadZone1" />
+  <spinner left="208" name="BuildAxisDeadZone1" />
   <spinner left="283" name="FlycamAxisDeadZone1" />
-  <text width="124" name="YDeadZone">
+  <text width="104" name="YDeadZone">
 		Tolerancja Osi Y
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone2" />
-  <spinner left="218" name="BuildAxisDeadZone2" />
+  <spinner left="133" name="AvatarAxisDeadZone2" />
+  <spinner left="208" name="BuildAxisDeadZone2" />
   <spinner left="283" name="FlycamAxisDeadZone2" />
-  <text width="124" name="ZDeadZone">
+  <text width="104" name="ZDeadZone">
 		Tolerancja Osi Z
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone0" />
-  <spinner left="218" name="BuildAxisDeadZone0" />
+  <spinner left="133" name="AvatarAxisDeadZone0" />
+  <spinner left="208" name="BuildAxisDeadZone0" />
   <spinner left="283" name="FlycamAxisDeadZone0" />
-  <text width="124" name="PitchDeadZone">
+  <text width="104" name="PitchDeadZone">
 		Tolerancja Wznoszenia
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone4" />
-  <spinner left="218" name="BuildAxisDeadZone4" />
+  <spinner left="133" name="AvatarAxisDeadZone4" />
+  <spinner left="208" name="BuildAxisDeadZone4" />
   <spinner left="283" name="FlycamAxisDeadZone4" />
-  <text width="124" name="YawDeadZone">
+  <text width="104" name="YawDeadZone">
 		Tolerancja Odchylania
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone5" />
-  <spinner left="218" name="BuildAxisDeadZone5" />
+  <spinner left="133" name="AvatarAxisDeadZone5" />
+  <spinner left="208" name="BuildAxisDeadZone5" />
   <spinner left="283" name="FlycamAxisDeadZone5" />
-  <text width="124" name="RollDeadZone">
+  <text width="104" name="RollDeadZone">
 		Tolerancja Obrotu
 	</text>
-  <spinner left="218" name="BuildAxisDeadZone3" />
+  <spinner left="208" name="BuildAxisDeadZone3" />
   <spinner left="283" name="FlycamAxisDeadZone3" />
-  <text width="124" name="Feathering">
+  <text width="104" name="Feathering">
 		Przenikanie
 	</text>
-  <slider left="145" label="" name="AvatarFeathering" />
-  <slider left="210" label="" name="BuildFeathering" />
+  <slider left="125" label="" name="AvatarFeathering" />
+  <slider left="200" label="" name="BuildFeathering" />
   <slider left="275" label="" name="FlycamFeathering" />
-  <text width="124" name="ZoomScale2">
+  <text width="104" name="ZoomScale2">
 		Skala Powiększania
 	</text>
   <spinner left="283" label="" name="FlycamAxisScale6" />
-  <text width="124" name="ZoomDeadZone">
+  <text width="104" name="ZoomDeadZone">
 		Tolerancja Powiększania
 	</text>
   <spinner left="283" label="" name="FlycamAxisDeadZone6" />
   <button left="366" label="Ustawienia Domyślne" name="SpaceNavigatorDefaults" />
-  <button label="OK" label_selected="OK" name="ok_btn" />
+  <button left="366" label="OK" label_selected="OK" name="ok_btn" />
   <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
   <string name="JoystickMonitor">
 		Monitor Joysticka
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
index c9dd20128d..0c8684a8cf 100755
--- a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
@@ -8,5 +8,5 @@
 	     tool_tip="Dźwięk będzie słyszalny tylko dla Ciebie." />
 	<button label="Odtwarzaj w Świecie" label_selected="Odtwarzaj w Świecie"
 	     name="Sound play btn"
-	     tool_tip="Dźwięk będzie słyszalny przez wszystkich." />
+	     tool_tip="Dźwięk będzie słyszalny przez wszystkich." width="130" left_delta="-136"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_telehub.xml b/indra/newview/skins/default/xui/pl/floater_telehub.xml
index b4cf098878..917ab95ecc 100755
--- a/indra/newview/skins/default/xui/pl/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/pl/floater_telehub.xml
@@ -12,8 +12,8 @@
 	<text name="help_text_not_connected">
 		Wybierz obiekt i kliknij Połącz z teleporterem
 	</text>
-	<button label="Połącz z teleporterem" name="connect_btn" width="122" />
-	<button label="Rozłącz" name="disconnect_btn" left="142" width="98"/>
+	<button label="Połącz z teleporterem" name="connect_btn" width="132" />
+	<button label="Rozłącz" name="disconnect_btn" left="152" width="88"/>
 	<text name="spawn_points_text" width="250">
 		Punkty Składowe (pozycje - nie obiekty!):
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index 380943f4ad..c896222646 100755
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Buduj">
 	<button label="" label_selected="" name="button focus" tool_tip="Zbliżenie"/>
 	<button label="" label_selected="" name="button move" tool_tip="Przesunięcie"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Edycja"/>
@@ -311,10 +311,10 @@
 				</combo_item>
 			</combo_box>
 			<text name="text cut">
-				Wykrój
+				Wykrój początek i koniec
 			</text>
-			<spinner label="B" name="cut begin"/>
-			<spinner label="E" name="cut end"/>
+			<spinner label="P" name="cut begin"/>
+			<spinner label="K" name="cut end"/>
 			<text name="text hollow">
 				Wydrążenie
 			</text>
@@ -343,8 +343,8 @@
 			<text name="text twist">
 				Skręcenie
 			</text>
-			<spinner label="B" name="Twist Begin"/>
-			<spinner label="E" name="Twist End"/>
+			<spinner label="P" name="Twist Begin"/>
+			<spinner label="K" name="Twist End"/>
 			<text name="scale_taper">
 				Zwężenie
 			</text>
@@ -367,8 +367,8 @@
 			<text name="advanced_slice">
 				Przetnij początek i koniec
 			</text>
-			<spinner label="B" name="Path Limit Begin"/>
-			<spinner label="E" name="Path Limit End"/>
+			<spinner label="P" name="Path Limit Begin"/>
+			<spinner label="K" name="Path Limit End"/>
 			<text name="text taper2">
 				Zwężenie
 			</text>
@@ -434,15 +434,15 @@
 		<panel label="Tekstura" name="Texture">
 			<texture_picker label="Tekstura" name="texture control" tool_tip="Kliknij by wybrać obraz"/>
 			<color_swatch label="Kolor" name="colorswatch" tool_tip="Kliknij by wybrać kolor"/>
-			<text name="color trans">
-				Przezroczystość %
+			<text name="color trans" left="170" width="99">
+				Przezroczystość%
 			</text>
-			<spinner name="ColorTrans"/>
-			<text name="glow label">
+			<spinner left="170" name="ColorTrans"/>
+			<text name="glow label" left="170">
 				Blask
 			</text>
-			<spinner name="glow"/>
-			<check_box label="Jaskrawość" name="checkbox fullbright"/>
+			<spinner left="170" name="glow"/>
+			<check_box label="Jaskrawość" name="checkbox fullbright" left="170"/>
 			<text name="tex gen">
 				Mapowanie
 			</text>
@@ -561,7 +561,7 @@
 				Dopasuj Teksturę Mediów
 (najpierw załaduj)
 			</text>
-			<button label="Dopasuj" label_selected="Dopasuj" name="button align"/>
+			<button label="Dopasuj" label_selected="Dopasuj" name="button align" left="160"/>
 		</panel>
 		<panel label="Treść" name="Contents">
 			<button label="Nowy Skrypt" label_selected="Nowy Skrypt..." name="button new script"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index 4426378075..79db9db822 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -301,7 +301,7 @@ Apenas lotes maiores podem ser listados na busca.
 			<string name="search_disabled_permissions_tooltip">
 				Esta opção está desabilitada porque você não pode modificar as opções deste lote.
 			</string>
-			<combo_box name="land category with adult">
+			<combo_box name="land category with adult" left="265" width="155">
 				<combo_item name="AnyCategory">
 					Qualquer Categoria
 				</combo_item>
@@ -342,7 +342,7 @@ Apenas lotes maiores podem ser listados na busca.
 					Outros
 				</combo_item>
 			</combo_box>
-			<combo_box left="276" name="land category" width="146">
+			<combo_box name="land category" left="265" width="155">
 				<combo_item name="AnyCategory">
 					Qualquer Categoria
 				</combo_item>
@@ -409,7 +409,7 @@ Apenas lotes maiores podem ser listados na busca.
 			<text length="1" name="Teleport Routing: " type="string">
 				Rota de Tele-transporte:
 			</text>
-			<combo_box left="140" name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote." width="140">
+			<combo_box width="160" left="140" name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote.">
 				<combo_item length="1" name="Blocked" type="string">
 					Bloqueado
 				</combo_item>
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
index 8f433a635d..4e1598c8fa 100644
--- a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="avatarpicker" title="Escolha o Residente">
-	<tab_container name="ResidentChooserTabs">
+<floater name="avatarpicker" title="Escolha o Residente" min_width="285" width="285">
+	<tab_container name="ResidentChooserTabs" width="275">
 		<panel label="Buscar" name="SearchPanel">
 			<text name="InstructSearchResidentName">
 				Digite parte do nome do Residente:
@@ -14,13 +14,15 @@
 		</panel>
 		<panel label="Próximo a Mim" name="NearMePanel">
 			<text name="InstructSelectResident">
-				Selecione residente próximo:
+				Selecione residente
+próximo:
 			</text>
-			<button label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh"/>
-			<slider label="Faixa" name="near_me_range"/>
+			<button font="SansSerifSmall" left_delta="1" width="115" label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh"/>
+			<slider label="Faixa" name="near_me_range" bottom_delta="-36"/>
 			<text name="meters">
 				Metros
 			</text>
+		<scroll_list bottom_delta="-169" height="159" name="NearMe"  />
 		</panel>
 	</tab_container>
 	<button label="Selecionar" label_selected="Selecionar" name="Select"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_build_options.xml b/indra/newview/skins/default/xui/pt/floater_build_options.xml
index 4dfebc3abd..ebc9d0f0c8 100644
--- a/indra/newview/skins/default/xui/pt/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_build_options.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="Opções de grade">
-	<spinner label="Uni. Grade (metros)" name="GridResolution"/>
-	<spinner label="Ext. da Grade (metros)" name="GridDrawSize"/>
+	<spinner label="Uni. Grade (metros)" name="GridResolution" width="180" label_width="122"/>
+	<spinner label="Ext. da Grade (metros)" name="GridDrawSize" width="180" label_width="122"/>
 	<check_box label="Habilitar ajuste de sub-grade" name="GridSubUnit"/>
 	<check_box label="Mostrar as seções de cruzamento" name="GridCrossSection"/>
-	<slider label="Opacidade da grade" name="GridOpacity"/>
+	<slider label="Opacidade da grade" name="GridOpacity" width="220"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
index 0c1fb77a08..3e8713d59e 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
@@ -6,9 +6,9 @@
 	<text name="buy_text">
 		Comprar por L$[AMOUNT] de(a) [NAME]?
 	</text>
-	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
-	<button label="Comprar" label_selected="Comprar" name="buy_btn"/>
-	<check_box label="Vestir roupa agora" name="wear_check"/>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn" width="73"/>
+	<button label="Comprar" label_selected="Comprar" name="buy_btn" width="73" left_delta="-77"/>
+	<check_box label="Vestir roupa agora" name="wear_check" left_delta="-130"/>
 	<string name="no_copy_text">
 		(sem copiar)
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_color_picker.xml b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
index 475280b013..95dd53ccd4 100644
--- a/indra/newview/skins/default/xui/pt/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
@@ -19,12 +19,14 @@
 		Lum:
 	</text>
 	<check_box label="Aplicar imediatamente" name="apply_immediate"/>
-	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button left_delta="150" name="color_pipette" />
+	<button left_delta="55" label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
 	<button label="Selecionar" label_selected="Selecionar" name="select_btn"/>
 	<text name="Current color:">
 		Cor atual:
 	</text>
 	<text name="(Drag below to save.)">
-		(Arraste abaixo para salvar.)
+		(Arraste abaixo
+ para salvar.)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
index 5049b87a56..f02cca9c25 100644
--- a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
@@ -4,35 +4,35 @@
 		<panel label="Ciclo do dia" name="Day Cycle">
 			<button label="?" name="WLDayCycleHelp"/>
 			<text name="WL12am">
-				12:00 meia-noite
+				0:00
 			</text>
 			<text name="WL3am">
-				3:00 da manhã
+				3:00
 			</text>
 			<text name="WL6am">
-				6:00 da manhã
+				6:00
 			</text>
 			<text name="WL9amHash">
-				9:00 da manhã
+				9:00
 			</text>
 			<text name="WL12pmHash">
-				12:00 meio dia
+				12:00
 			</text>
 			<text name="WL3pm">
-				3:00 da tarde
+				15:00
 			</text>
 			<text name="WL6pm">
-				6:00 da tarde
+				18:00
 			</text>
 			<text name="WL9pm">
-				9:00 da noite
+				21:00
 			</text>
 			<text name="WL12am2">
-				12:00 meia noite
+				24:00
 			</text>
-			<button label="Add Key" label_selected="Adicionar chave" name="WLAddKey"/>
-			<button label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
+			<button font="SansSerifSmall" width="96" left="546" label="Adicionar chave" label_selected="Adicionar chave" name="WLAddKey"/>
+			<button font="SansSerifSmall" width="96" left="546" label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>
+			<text name="WLCurKeyFrameText" width="190" left="17">
 				Configurações de Quadro-chave:
 			</text>
 			<text name="WLCurKeyTimeText">
@@ -47,7 +47,7 @@
 			<text name="DayCycleText">
 				Grudar:
 			</text>
-			<combo_box label="5 minutos" name="WLSnapOptions"/>
+			<combo_box label="5 minutos" name="WLSnapOptions" width="85"/>
 			<text name="DayCycleText2">
 				Duração do Ciclo:
 			</text>
@@ -59,7 +59,7 @@
 			</text>
 			<button label="Tocar" label_selected="Tocar" name="WLAnimSky"/>
 			<button label="Pare!" label_selected="Pare" name="WLStopAnimSky"/>
-			<button label="Usar o horário da Propriedade" label_selected="Ir para o horário da Propriedade" name="WLUseLindenTime"/>
+			<button width="175" font="SansSerifSmall" label="Usar o horário da Propriedade" label_selected="Ir para o horário da Propriedade" name="WLUseLindenTime"/>
 			<button label="Salvar o Dia teste" label_selected="Salvar o Dia teste" name="WLSaveDayCycle"/>
 			<button label="Carregar o Dia teste" label_selected="Carregar o Dia teste" name="WLLoadDayCycle"/>
 		</panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_env_settings.xml b/indra/newview/skins/default/xui/pt/floater_env_settings.xml
index b1c85a32b7..d3ed760551 100644
--- a/indra/newview/skins/default/xui/pt/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_env_settings.xml
@@ -7,17 +7,19 @@
 		12:00 PM
 	</text>
 	<text name="EnvCloudText">
-		Cobertura de Nuvens
+		Cobertura de
+Nuvens
 	</text>
 	<text name="EnvWaterColorText">
 		Cor da água
 	</text>
 	<color_swatch label="" name="EnvWaterColor" tool_tip="Clique para abrir o Editor de cores"/>
 	<text name="EnvWaterFogText">
-		Névoa da água
+		Névoa da
+água
 	</text>
-	<button label="Usar hora da propriedade" name="EnvUseEstateTimeButton"/>
-	<button label="Céu Avançado" name="EnvAdvancedSkyButton"/>
-	<button label="Água Avançada" name="EnvAdvancedWaterButton"/>
+	<button bottom="-144" label="Usar hora da propriedade" name="EnvUseEstateTimeButton" width="155"/>
+	<button label="Céu Avançado" name="EnvAdvancedSkyButton" width="155" left="167"/>
+	<button label="Água Avançada" name="EnvAdvancedWaterButton" width="155" left="326"/>
 	<button label="?" name="EnvSettingsHelpButton"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inspect.xml b/indra/newview/skins/default/xui/pt/floater_inspect.xml
index f3d4b0f33f..f3c23f008e 100644
--- a/indra/newview/skins/default/xui/pt/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inspect.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="inspect" title="Inspecionar Objeto">
+<floater name="inspect" title="Inspecionar Objeto" min_width="450">
 	<scroll_list name="object_list" tool_tip="Selecione um objeto nesta lista para destacá-lo in-world">
 		<column label="Nome do Objeto" name="object_name"/>
-		<column label="Nome do Proprietário" name="owner_name"/>
-		<column label="Nome do Criador" name="creator_name"/>
+		<column label="Proprietário" name="owner_name"/>
+		<column label="Criador" name="creator_name"/>
 		<column label="Data de Criação" name="creation_date"/>
 	</scroll_list>
-	<button label="Ver Perfil do Proprietário..." label_selected="" name="button owner" tool_tip="Veja o perfil do proprietário do objeto destacado"/>
-	<button label="Ver perfil do criador..." label_selected="" name="button creator" tool_tip="Veja o perfil do criador original do objeto destacado"/>
+	<button width="185" label="Ver Perfil do Proprietário..." label_selected="" name="button owner" tool_tip="Veja o perfil do proprietário do objeto destacado"/>
+	<button width="165" left="205" label="Ver perfil do criador..." label_selected="" name="button creator" tool_tip="Veja o perfil do criador original do objeto destacado"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
index 634e236650..ed36826800 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory Finder" title="itens_de_inventário_recentes">
+<floater name="Inventory Finder" title="itens_de_inventário_recentes" width="165">
 	<check_box label="Animação" name="check_animation"/>
 	<check_box label="Cartões de chamadas" name="check_calling_card"/>
 	<check_box label="Roupas" name="check_clothing"/>
@@ -13,8 +13,8 @@
 	<check_box label="Fotos" name="check_snapshot"/>
 	<button label="Tudo" label_selected="Tudo" name="All"/>
 	<button label="Nenhum" label_selected="Nenhum" name="None"/>
-	<check_box label="Sempre mostrar as pastas" name="check_show_empty"/>
-	<check_box label="Desde o Logoff" name="check_since_logoff"/>
+	<check_box label="Sempre mostrar as pastas" name="check_show_empty" left="3"/>
+	<check_box label="Desde o Logoff" name="check_since_logoff" left="3"/>
 	<text length="1" name="- OR -" type="string">
 		- OU -
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_joystick.xml b/indra/newview/skins/default/xui/pt/floater_joystick.xml
index 6c2e4a5144..0bc3928710 100644
--- a/indra/newview/skins/default/xui/pt/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pt/floater_joystick.xml
@@ -3,14 +3,15 @@
 	<check_box name="enable_joystick">
 		Habilitar Joystick:
 	</check_box>
-	<spinner label="Mapeamento do eixo X" name="JoystickAxis1"/>
-	<spinner label="Mapeamento do eixo Y" name="JoystickAxis2"/>
-	<spinner label="Mapeamento do Eixo Z" name="JoystickAxis0"/>
-	<spinner label="Mapeamento da Elevação" name="JoystickAxis4"/>
-	<spinner label="Mapeamento da Guinada" name="JoystickAxis5"/>
-	<spinner label="Mapeamento da Rolagem" name="JoystickAxis3"/>
-	<spinner label="Mapeamento do Zoom" name="JoystickAxis6"/>
-	<check_box label="Zoom Direto" name="ZoomDirect"/>
+	<text left="135" name="joystick_type" width="360"/>
+	<spinner label="Mapeamento: eixo X" name="JoystickAxis1" label_width="124" width="164"/>
+	<spinner label="Mapeamento: eixo Y" name="JoystickAxis2" label_width="124" width="164"/>
+	<spinner label="Mapeamento: eixo Z" name="JoystickAxis0" label_width="124" width="164"/>
+	<spinner label="Mapeamento: Elevação" name="JoystickAxis4" label_width="124" width="164"/>
+	<spinner label="Mapeamento: Guinada" name="JoystickAxis5" label_width="124" width="164"/>
+	<spinner label="Mapeamento: Rolagem" name="JoystickAxis3" label_width="124" width="164"/>
+	<spinner label="Mapeamento: Zoom" name="JoystickAxis6" label_width="124" width="164"/>
+	<check_box label="Zoom Direto" name="ZoomDirect" left="194"/>
 	<check_box label="Cursor 3D" name="Cursor3D"/>
 	<check_box label="Nível Automático" name="AutoLeveling"/>
 	<text name="Control Modes:">
@@ -19,7 +20,7 @@
 	<check_box name="JoystickAvatarEnabled">
 		Avatar
 	</check_box>
-	<check_box name="JoystickBuildEnabled">
+	<check_box name="JoystickBuildEnabled" left="192">
 		Construir
 	</check_box>
 	<check_box name="JoystickFlycamEnabled">
@@ -34,13 +35,13 @@
 	<text name="ZScale">
 		Escala Z
 	</text>
-	<text name="PitchScale">
+	<text name="PitchScale" left="3" width="115">
 		Escala de Elevação
 	</text>
-	<text name="YawScale">
+	<text name="YawScale" left="3" width="115">
 		Escala da Guinada
 	</text>
-	<text name="RollScale">
+	<text name="RollScale" left="3" width="115">
 		Escala de Rolagem
 	</text>
 	<text name="XDeadZone">
@@ -52,14 +53,14 @@
 	<text name="ZDeadZone">
 		Zona Morta Z
 	</text>
-	<text name="PitchDeadZone">
-		Zona Morta da Elevação
+	<text name="PitchDeadZone" left="3" width="115">
+		Zona Morta: Elevação
 	</text>
-	<text name="YawDeadZone">
-		Zona Morta da Guinada
+	<text name="YawDeadZone" left="3" width="115">
+		Zona Morta: Guinada
 	</text>
-	<text name="RollDeadZone">
-		Zona Morta de Rolagem
+	<text name="RollDeadZone" left="3" width="115">
+		Zona Morta: Rolagem
 	</text>
 	<text name="Feathering">
 		Alisar
@@ -67,10 +68,10 @@
 	<text name="ZoomScale2">
 		Escala de Zoom
 	</text>
-	<text name="ZoomDeadZone">
+	<text name="ZoomDeadZone" width="110" left="4">
 		Zona Morta de Zoom
 	</text>
-	<button label="Padrões do Navegador Espacial" name="SpaceNavigatorDefaults"/>
+	<button label="Padrões do SpaceNavigator" name="SpaceNavigatorDefaults" font="SansSerifSmall"/>
 	<button label="OK" label_selected="OK" name="ok_btn"/>
 	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
 	<string name="JoystickMonitor">
diff --git a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
index 9dbad7099e..6657641992 100644
--- a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_lagmeter" title="Medidor de Atraso">
 	<button label="" label_selected="" name="client_lagmeter" tool_tip="Status de atraso no Cliente"/>
+	<text left="30" name="client_lag_cause" right="-10" />
+	<text left="30" name="network_lag_cause" right="-10" />
+	<text left="30" name="server_lag_cause" right="-32" />
 	<text name="client">
 		Cliente:
 	</text>
-	<text name="client_text">
+	<text name="client_text" font="SansSerifSmall">
 		Normal
 	</text>
 	<button label="" label_selected="" name="network_lagmeter" tool_tip="Status de atraso na rede"/>
 	<text name="network">
 		Rede:
 	</text>
-	<text name="network_text">
+	<text name="network_text" font="SansSerifSmall">
 		Normal
 	</text>
 	<button label="" label_selected="" name="server_lagmeter" tool_tip="Status de atraso no servidor"/>
 	<text name="server">
 		Servidor:
 	</text>
-	<text name="server_text">
+	<text name="server_text" font="SansSerifSmall">
 		Normal
 	</text>
 	<button label="?" name="server_help"/>
@@ -117,10 +120,10 @@
 		20
 	</string>
 	<string name="server_frame_time_critical_msg">
-		Taxa de quadros do simulador abaixo de  [SERVER_FRAME_RATE_CRITICAL]
+		Taxa de quadros abaixo de [SERVER_FRAME_RATE_CRITICAL]
 	</string>
 	<string name="server_frame_time_warning_msg">
-		Taxa de quadros do simulador entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
+		Taxa de quadros entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
 	</string>
 	<string name="server_frame_time_normal_msg">
 		Normal
diff --git a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
index 1a640c9793..4734d665ef 100644
--- a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
@@ -7,7 +7,7 @@
 		<column label="Área" name="area"/>
 	</scroll_list>
 	<button label="Teletransporte" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para o centro do terreno."/>
-	<button label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map" tool_tip="Mostrar esse terreno no mapa do mundo."/>
+	<button width="130" label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map" tool_tip="Mostrar esse terreno no mapa do mundo."/>
 	<text name="contrib_label">
 		Contribuições para os seus grupos:
 	</text>
@@ -15,22 +15,22 @@
 		<column label="Grupo" name="group"/>
 		<column label="Área" name="area"/>
 	</scroll_list>
-	<text name="allowed_label">
+	<text name="allowed_label" width="380">
 		Propriedades de terreno permitidas com o plano de pagamento atual:
 	</text>
-	<text name="allowed_text">
+	<text name="allowed_text" left_delta="390">
 		[AREA] m²
 	</text>
 	<text name="current_label">
 		Propriedades de terrenos atuais:
 	</text>
-	<text name="current_text">
+	<text name="current_text" left_delta="390">
 		[AREA] m²
 	</text>
 	<text name="available_label">
 		Disponível para compra de terras:
 	</text>
-	<text name="available_text">
+	<text name="available_text" left_delta="390">
 		[AREA] m²
 	</text>
 	<string name="area_string">
diff --git a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
index af45fa5873..d2654de589 100644
--- a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
@@ -2,7 +2,7 @@
 <floater name="script ed float" title="Script: Novo Script">
 	<button label="Resetar" label_selected="Resetar" name="Reset"/>
 	<check_box label="Correndo" name="running"/>
-	<check_box label="Mono" name="mono"/>
+	<check_box label="Mono" name="mono" left="86"/>
 	<string name="not_allowed">
 		Você não tem permissão para visualizar este script.
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
index e7e4a22937..4f60ef23a6 100644
--- a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="script ed float" title="LSL Wiki">
 	<check_box label="Seguir o Cursor" name="lock_check" />
-	<combo_box label="Bloquear" name="history_combo" />
-	<button label="Anterior" name="back_btn" />
+	<combo_box label="Bloquear" name="history_combo"  left_delta="120" width="70"/>
+	<button label="Anterior" name="back_btn"  left_delta="75"/>
 	<button label="Posterior" name="fwd_btn" />
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_mute_object.xml b/indra/newview/skins/default/xui/pt/floater_mute_object.xml
index d967f527ae..7ec0051a7d 100644
--- a/indra/newview/skins/default/xui/pt/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/pt/floater_mute_object.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="mute by name" title="Silenciar objeto pelo nome">
 	<text name="message">
-		Silenciar pelo nome afeta apenas conversa de objeto e MI, não sons. Você deve digitar o nome exato do objeto.
+		Silenciar pelo nome afeta apenas conversa de objeto e MI,
+não sons. Você deve digitar o nome exato do objeto.
 	</text>
 	<line_editor name="object_name">
 		Nome do objeto
 	</line_editor>
-	<button label="Ok" name="OK"/>
+	<button label="OK" name="OK"/>
 	<button label="Cancelar" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pay.xml b/indra/newview/skins/default/xui/pt/floater_pay.xml
index 6b094d07f6..2eb1c5c1bf 100644
--- a/indra/newview/skins/default/xui/pt/floater_pay.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pay.xml
@@ -9,7 +9,7 @@
 	<text type="string" length="1" name="payee_label" width="110" left="5">
 		Pagar residente:
 	</text>
-	<text type="string" length="1" name="payee_name" left="110">
+	<text type="string" length="1" name="payee_name" left="115">
 		[FIRST] [LAST]
 	</text>
 	<text type="string" length="1" name="fastpay text" width="120" halign="left">
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences.xml b/indra/newview/skins/default/xui/pt/floater_preferences.xml
index eb28e99713..0e9ef768b5 100644
--- a/indra/newview/skins/default/xui/pt/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preferences.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Preferences" title="Preferências">
+<floater name="Preferences" title="Preferências" min_width="332" width="628">
 	<button label="OK" label_selected="OK" name="OK"/>
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<button label="Aplicar" label_selected="Aplicar" name="Apply"/>
 	<button label="Sobre" label_selected="Sobre" name="About..."/>
 	<button label="Ajuda" label_selected="Ajuda" name="Help"/>
+	<tab_container name="pref core" tab_width="128" width="628" />
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
index b61508480d..b62146b92a 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
@@ -3,6 +3,6 @@
 	<text length="1" name="desc txt" type="string">
 		Descrição:
 	</text>
-	<button label="Executar in-World" label_selected="Executar in-World" name="Sound play btn" tool_tip="Executar este som para que todos possam ouvi-lo."/>
-	<button label="Executar Localmente" label_selected="Executar Localmente" name="Sound audition btn" tool_tip="Executar este som somente para você ouvir."/>
+	<button left_delta="-132" label="Executar in-World" label_selected="Executar in-World" name="Sound play btn" tool_tip="Executar este som para que todos possam ouvi-lo."/>
+	<button width="135" left="152" label="Executar Localmente" label_selected="Executar Localmente" name="Sound audition btn" tool_tip="Executar este som somente para você ouvir."/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_script_search.xml b/indra/newview/skins/default/xui/pt/floater_script_search.xml
index aaf1ea4339..5c1393107f 100644
--- a/indra/newview/skins/default/xui/pt/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_search.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script search" title="Busca de Script">
-	<check_box label="Não diferenciar Maiúsculas de Minúsculas" name="case_text"/>
-	<button label="Buscar" label_selected="Buscar" name="search_btn"/>
-	<button label="Substituir" label_selected="Substituir" name="replace_btn"/>
-	<button label="Substituir Tudo" label_selected="Substituir Tudo" name="replace_all_btn"/>
-	<text length="1" name="txt" type="string">
+<floater name="script search" title="Busca de Script" width="320">
+	<check_box label="Não diferenciar Maiúsculas de Minúsculas" name="case_text" left="75"/>
+	<button label="Buscar" label_selected="Buscar" name="search_btn" width="85"/>
+	<button label="Substituir" label_selected="Substituir" name="replace_btn" left="100" width="85"/>
+	<button label="Substituir Tudo" label_selected="Substituir Tudo" name="replace_all_btn" left="190" width="122"/>
+	<text length="1" name="txt" type="string" width="65">
 		Buscar
 	</text>
-	<text length="1" name="txt2" type="string">
+	<text length="1" name="txt2" type="string" width="65">
 		Substituir
 	</text>
+	<line_editor left="75" name="search_text" width="240" />
+	<line_editor left="75" name="replace_text" width="240" />
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_telehub.xml b/indra/newview/skins/default/xui/pt/floater_telehub.xml
index f2634be852..11886c7cab 100644
--- a/indra/newview/skins/default/xui/pt/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/pt/floater_telehub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="telehub" title="Telehub">
+<floater name="telehub" title="Telehub" min_height="310" height="310" width="286">
 	<text name="status_text_connected">
 		Telehub conectado ao objeto [OBJECT]
 	</text>
@@ -14,15 +14,19 @@
 	</text>
 	<button label="Conectar Telehub" name="connect_btn"/>
 	<button label="Desconectar" name="disconnect_btn"/>
-	<text name="spawn_points_text">
+	<text name="spawn_points_text" width="265">
 		Pontos de Nascimento (posições, não objetos):
 	</text>
-	<button label="Adicionar Nascimento" name="add_spawn_point_btn"/>
-	<button label="Remover Nascimento" name="remove_spawn_point_btn"/>
+	<scroll_list name="spawn_points_list" width="265" />
+	<button width="135" label="Adicionar Nascimento" name="add_spawn_point_btn"/>
+	<button width="130" label="Remover Nascimento" name="remove_spawn_point_btn" left="150"/>
 	<text name="spawn_point_help">
-		Selecione um objeto e clique Adicionar para especificar
-a posição. Em seguida, você pode mover ou apagar o objeto.
+		Selecione um objeto e clique Adicionar para
+especificar a posição.
+Em seguida, você pode mover ou apagar o objeto.
 As posições são relativas ao centro do telehub.
-Selecione um item na lista para mostrar a posição in-world.
+
+Selecione um item na lista para mostrar a posição
+in-world.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index 9a3d14c0ea..4f5054da73 100644
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Construir" width="288">
 	<button label="" label_selected="" name="button focus" tool_tip="Foco"/>
 	<button label="" label_selected="" name="button move" tool_tip="Mover"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Editar"/>
@@ -34,7 +34,7 @@
 	<check_box label="Esticar Texturas" name="checkbox stretch textures"/>
 	<check_box label="Usar Grade" name="checkbox snap to grid"/>
 	<button label="Opções..." label_selected="Opções..." name="Options..."/>
-	<text name="text status">
+	<text name="text status" width="280">
 		Arraste para mover, shift+Arrastar para Copiar
 	</text>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
@@ -73,13 +73,13 @@
 	<text name="Strength:">
 		Força
 	</text>
-	<text name="obj_count">
+	<text name="obj_count" left="134">
 		Objetos selecionados: [COUNT]
 	</text>
-	<text name="prim_count">
+	<text name="prim_count" left="134">
 		primitivas: [COUNT]
 	</text>
-	<tab_container name="Object Info Tabs">
+	<tab_container name="Object Info Tabs" tab_max_width="60" tab_min_width="30" width="288">
 		<panel label="Comum" name="General">
 			<text name="Name:">
 				Nome:
@@ -105,7 +105,7 @@
 				Grupo:
 			</text>
 			<text name="Group Name Proxy">
-				Os Lindens
+				The Lindens
 			</text>
 			<button label="Definir..." label_selected="Definir..." name="button set group"/>
 			<text name="Permissions:">
@@ -144,12 +144,12 @@
 				Próximo Proprietário pode:
 			</text>
 			<check_box label="Modificar" name="checkbox next owner can modify"/>
-			<check_box label="Copiar" name="checkbox next owner can copy"/>
-			<check_box label="Revender/Dar" name="checkbox next owner can transfer"/>
-			<text name="label click action">
+			<check_box label="Copiar" name="checkbox next owner can copy" left_delta="80"/>
+			<check_box label="Revender/Dar" name="checkbox next owner can transfer" left_delta="67"/>
+			<text name="label click action" width="220">
 				Quando clicado com o botão esquerdo:
 			</text>
-			<combo_box name="clickaction">
+			<combo_box name="clickaction" width="192">
 				<combo_item name="Touch/grab(default)">
 					Tocar/Pegar (padrão)
 				</combo_item>
@@ -176,7 +176,7 @@
 				B:
 			</text>
 			<text name="O:">
-				O;
+				O:
 			</text>
 			<text name="G:">
 				G:
@@ -222,7 +222,7 @@
 			</string>
 		</panel>
 		<panel label="Objeto" name="Object">
-			<text name="select_single">
+			<text name="select_single" width="272">
 				Selecione apenas uma primitiva para editar os parâmetros.
 			</text>
 			<text name="edit_object">
@@ -306,10 +306,10 @@
 				</combo_item>
 			</combo_box>
 			<text name="text cut">
-				Recorte inicial e final
+				Recorte Início e final
 			</text>
-			<spinner label="B" name="cut begin"/>
-			<spinner label="E" name="cut end"/>
+			<spinner label="I" name="cut begin"/>
+			<spinner label="F" name="cut end"/>
 			<text name="text hollow">
 				Vazio
 			</text>
@@ -336,8 +336,8 @@
 			<text name="text twist">
 				Torcer no Início e final
 			</text>
-			<spinner label="B" name="Twist Begin"/>
-			<spinner label="E" name="Twist End"/>
+			<spinner label="I" name="Twist Begin"/>
+			<spinner label="F" name="Twist End"/>
 			<text name="scale_taper">
 				Afinar
 			</text>
@@ -351,17 +351,17 @@
 			</text>
 			<spinner label="X" name="Shear X"/>
 			<spinner label="Y" name="Shear Y"/>
-			<text name="advanced_cut">
-				Perfil Recortado no Início e Final
+			<text name="advanced_cut" width="156">
+				Perfil Recortado no Início e fim
 			</text>
 			<text name="advanced_dimple">
-				Cova Início e Final
+				Cova Início e final
 			</text>
 			<text name="advanced_slice">
-				Pedaço Início (B) e Fim (E)
+				Pedaço Início e fim 
 			</text>
-			<spinner label="B" name="Path Limit Begin"/>
-			<spinner label="E" name="Path Limit End"/>
+			<spinner label="I" name="Path Limit Begin"/>
+			<spinner label="F" name="Path Limit End"/>
 			<text name="text taper2">
 				Afinar
 			</text>
@@ -398,7 +398,7 @@
 			</combo_box>
 		</panel>
 		<panel label="Recursos" name="Features">
-			<text name="select_single">
+			<text name="select_single" width="272">
 				Selecione apenas uma primitiva para editar suas características.
 			</text>
 			<text name="edit_object">
@@ -425,7 +425,7 @@
 		<panel label="Textura" name="Texture">
 			<texture_picker label="Textura" name="texture control" tool_tip="Clique para escolher uma imagem"/>
 			<color_swatch label="Cor" name="colorswatch" tool_tip="Clique para abrir o Seletor de Cores"/>
-			<text name="color trans">
+			<text name="color trans" width="100">
 				Transparência %
 			</text>
 			<text name="glow label">
@@ -463,7 +463,7 @@
 			<text name="label bumpiness">
 				Ondulação
 			</text>
-			<combo_box name="combobox bumpiness">
+			<combo_box name="combobox bumpiness" width="100" >
 				<combo_item name="None">
 					Nenhum
 				</combo_item>
@@ -477,7 +477,7 @@
 					Granulação
 				</combo_item>
 				<combo_item name="bark">
-					casca
+					Casca
 				</combo_item>
 				<combo_item name="bricks">
 					Tijolos
@@ -507,7 +507,7 @@
 					Revestimento
 				</combo_item>
 				<combo_item name="stonetile">
-					empedrado
+					Empedrado
 				</combo_item>
 				<combo_item name="stucco">
 					Grafiato
@@ -516,7 +516,7 @@
 					Sulcos
 				</combo_item>
 				<combo_item name="weave">
-					weave
+					Weave
 				</combo_item>
 			</combo_box>
 			<text name="tex scale">
@@ -552,6 +552,7 @@
 		<panel label="Conteúdo" name="Contents">
 			<button label="Novo Script" label_selected="Novo Script..." name="button new script"/>
 			<button label="Permissões..." name="button permissions"/>
+			<panel name="ContentsInventory" width="272" />
 		</panel>
 	</tab_container>
 	<panel name="land info panel">
@@ -566,7 +567,7 @@
 		</text>
 		<button label="Sobre a Terra..." label_selected="Sobre a Terra..." name="button about land"/>
 		<check_box label="Mostrar donos" name="checkbox show owners" tool_tip="Colorir lotes de acordo com seus donos"/>
-		<button label="?" label_selected="?" name="button show owners help"/>
+		<button label="?" label_selected="?" name="button show owners help" left_delta="100"/>
 		<text name="label_parcel_modify">
 			Modificar Lote
 		</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
index 694100297d..cd94b51b16 100644
--- a/indra/newview/skins/default/xui/pt/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
@@ -19,14 +19,17 @@
 		Nome do Objeto:
 	</text>
 	<button label="Filtro" name="filter_object_btn"/>
-	<text name="owner_name_text">
+	<text name="owner_name_text" width="130">
 		Nome do Proprietário:
 	</text>
+	<line_editor font="SansSerifSmall" left="140" name="id_editor" width="280"/>
+	<line_editor font="SansSerifSmall" left="140" name="object_name_editor" width="280"/>
+	<line_editor font="SansSerifSmall" left="140" name="owner_name_editor" width="280"/>
 	<button label="Filtro" name="filter_owner_btn"/>
-	<button label="Retornar Selecionado" name="return_selected_btn"/>
-	<button label="Retornar Tudo" name="return_all_btn"/>
-	<button label="Desabilitar Selecionado" name="disable_selected_btn"/>
-	<button label="Desabilitar Tudo" name="disable_all_btn"/>
+	<button label="Retornar Selecionado" name="return_selected_btn" width="170"/>
+	<button label="Retornar Tudo" name="return_all_btn" left="190"/>
+	<button label="Desabilitar Selecionado" name="disable_selected_btn" width="170"/>
+	<button label="Desabilitar Tudo" name="disable_all_btn" left="190"/>
 	<button label="Atualizar" name="refresh_btn"/>
 	<string name="top_scripts_title">
 		Principais Scripts
diff --git a/indra/newview/skins/default/xui/pt/floater_url_entry.xml b/indra/newview/skins/default/xui/pt/floater_url_entry.xml
index a4ae5e2e3d..48af8de363 100644
--- a/indra/newview/skins/default/xui/pt/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/pt/floater_url_entry.xml
@@ -3,6 +3,7 @@
 	<text name="media_label">
 		URL da Mídia:
 	</text>
+	<combo_box left="100" name="media_entry" width="360" />
 	<button label="OK" name="ok_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>
 	<button label="Limpar" name="clear_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_water.xml b/indra/newview/skins/default/xui/pt/floater_water.xml
index 007eb3f6ba..ceb4414058 100644
--- a/indra/newview/skins/default/xui/pt/floater_water.xml
+++ b/indra/newview/skins/default/xui/pt/floater_water.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Water Floater" title="Editor de Água Avançado">
-	<text name="KeyFramePresetsText">
+	<text name="KeyFramePresetsText" width="154">
 		Pré-configurações da Água:
 	</text>
+	<combo_box left_delta="160" name="WaterPresetsCombo" width="150" />
 	<button label="Novo" label_selected="Novo" name="WaterNewPreset"/>
 	<button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/>
 	<button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/>
@@ -16,15 +17,15 @@
 			<text name="WaterFogDensText">
 				Expoente da Densidade de névoa
 			</text>
-			<button label="?" name="WaterFogDensityHelp"/>
+			<button label="?" name="WaterFogDensityHelp" left="209"/>
 			<text name="WaterUnderWaterFogModText">
 				Modificador da névoa Subaquática
 			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp"/>
+			<button label="?" name="WaterUnderWaterFogModHelp" left="209"/>
 			<text name="BDensText">
 				Escala da Marola de Reflexão
 			</text>
-			<button label="?" name="WaterNormalScaleHelp"/>
+			<button label="?" name="WaterNormalScaleHelp" left="415"/>
 			<text name="BHText2">
 				1
 			</text>
@@ -37,29 +38,29 @@
 			<text name="HDText">
 				Escala de Fresnel
 			</text>
-			<button label="?" name="WaterFresnelScaleHelp"/>
+			<button label="?" name="WaterFresnelScaleHelp" left="415"/>
 			<text name="FresnelOffsetText">
 				Deslocamento de Fresnel
 			</text>
-			<button label="?" name="WaterFresnelOffsetHelp"/>
+			<button label="?" name="WaterFresnelOffsetHelp" left="415"/>
 			<text name="DensMultText">
 				Refratar a Escala para Cima
 			</text>
-			<button label="?" name="WaterScaleAboveHelp"/>
+			<button label="?" name="WaterScaleAboveHelp" left="640"/>
 			<text name="WaterScaleBelowText">
 				Refratar a Escala para Baixo
 			</text>
-			<button label="?" name="WaterScaleBelowHelp"/>
+			<button label="?" name="WaterScaleBelowHelp" left="640"/>
 			<text name="MaxAltText">
 				Multiplicador de Difusão
 			</text>
-			<button label="?" name="WaterBlurMultiplierHelp"/>
+			<button label="?" name="WaterBlurMultiplierHelp" left="640"/>
 		</panel>
 		<panel label="Imagem" name="Waves">
 			<text name="BHText">
 				Direção da Onda Maior
 			</text>
-			<button label="?" name="WaterWave1Help"/>
+			<button label="?" name="WaterWave1Help" left="170"/>
 			<text name="WaterWave1DirXText">
 				X
 			</text>
@@ -69,7 +70,7 @@
 			<text name="BHText2">
 				Direção da Onda Pequena
 			</text>
-			<button label="?" name="WaterWave2Help"/>
+			<button label="?" name="WaterWave2Help" left="170"/>
 			<text name="WaterWave2DirXText">
 				X
 			</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
index f86775c770..0de8bd22f8 100644
--- a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="WindLight floater" title="Editor de Céu Avançado">
-	<text name="KeyFramePresetsText">
+	<text name="KeyFramePresetsText" width="130">
 		Pré-definições de Céu:
 	</text>
+	<combo_box left_delta="130" name="WLPresetsCombo"/>
 	<button label="Novo" label_selected="Novo" name="WLNewPreset"/>
-	<button label="Salvar" label_selected="Salvar" name="WLSavePreset"/>
-	<button label="Deletar" label_selected="Deletar" name="WLDeletePreset"/>
-	<button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" name="WLDayCycleMenuButton" width="150" left_delta="95" />
+	<button label="Salvar" label_selected="Salvar" name="WLSavePreset" left_delta="72"/>
+	<button label="Deletar" label_selected="Deletar" name="WLDeletePreset" left_delta="72"/>
+	<button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" name="WLDayCycleMenuButton" width="150" left_delta="84" />
 	<tab_container name="WindLight Tabs">
 		<panel label="Atmosfera" name="Atmosphere">
 			<text name="BHText">
@@ -52,15 +53,15 @@
 			<text name="DensMultText">
 				Multiplicador de Densidade
 			</text>
-			<button label="?" name="WLDensityMultHelp"/>
+			<button label="?" name="WLDensityMultHelp" left="635"/>
 			<text name="WLDistanceMultText">
 				Multiplicador de Distância
 			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
+			<button label="?" name="WLDistanceMultHelp" left="635"/>
 			<text name="MaxAltText">
 				Altitude Máxima
 			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
+			<button label="?" name="WLMaxAltitudeHelp" left="635"/>
 		</panel>
 		<panel label="Iluminação" name="Lighting">
 			<text name="SLCText">
@@ -156,10 +157,10 @@
 				Escala da Nuvem
 			</text>
 			<button label="?" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				Detalhe da Nuvem  (XY/Densidade)
+			<text name="WLCloudDetailText" font="SansSerifSmall">
+				Detalhe da Nuvem (XY/Densidade)
 			</text>
-			<button label="?" name="WLCloudDetailHelp"/>
+			<button label="?" name="WLCloudDetailHelp" left="421"/>
 			<text name="BHText8">
 				X
 			</text>
@@ -180,7 +181,7 @@
 			<button label="?" name="WLCloudScrollYHelp"/>
 			<check_box label="Travar" name="WLCloudLockY"/>
 			<check_box label="Desenhar Nuvens Clássicas" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp"/>
+			<button label="?" name="WLClassicCloudsHelp" left="645"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/panel_friends.xml b/indra/newview/skins/default/xui/pt/panel_friends.xml
index afd7b79eaa..d430d637ad 100644
--- a/indra/newview/skins/default/xui/pt/panel_friends.xml
+++ b/indra/newview/skins/default/xui/pt/panel_friends.xml
@@ -11,10 +11,10 @@
 		<column name="icon_edit_mine" tool_tip="Amigo pode editar, apagar ou pegar seus objetos"/>
 		<column name="icon_edit_theirs" tool_tip="Você pode editar os objetos deste amigo"/>
 	</scroll_list>
-	<button label="MI/Chamar" name="im_btn" tool_tip="Abrir sessão de Mensagem Instantânea"/>
-	<button label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos e outras informações"/>
-	<button label="Teletransporte..." name="offer_teleport_btn" tool_tip="Oferecer a este amigo o teletransporte para sua localização atual"/>
-	<button label="Pagar..." name="pay_btn" tool_tip="Dar Linden dólares (L$) a este amigo"/>
-	<button label="Remover..." name="remove_btn" tool_tip="Remover esta pessoa de sua lista de amigos"/>
-	<button label="Adicionar..." name="add_btn" tool_tip="Oferecer amizade a um residente"/>
+	<button width="86" label="MI/Chamar" name="im_btn" tool_tip="Abrir sessão de Mensagem Instantânea"/>
+	<button width="86" label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos e outras informações"/>
+	<button width="86" label="Teletransp..." name="offer_teleport_btn" tool_tip="Oferecer a este amigo o teletransporte para sua localização atual"/>
+	<button width="86" label="Pagar..." name="pay_btn" tool_tip="Dar Linden dólares (L$) a este amigo"/>
+	<button width="86" label="Remover..." name="remove_btn" tool_tip="Remover esta pessoa de sua lista de amigos"/>
+	<button width="86" label="Adicionar..." name="add_btn" tool_tip="Oferecer amizade a um residente"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml
index f4941eabd9..185ed77576 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml
@@ -14,7 +14,7 @@
 	<text name="prepend_founded_by">
 		Fundado por:
 	</text>
-	<text name="founder_name">
+	<text name="founder_name" left_delta="74" >
 		(espera)
 	</text>
 	<text name="group_charter_label">
@@ -44,8 +44,8 @@
 		<check_box label="Mostre na busca" name="show_in_group_list" tool_tip="Deixe as pessoas verem este grupo nos resultados de busca."/>
 		<check_box label="Adesão aberta" name="open_enrollement" tool_tip="Definir se este grupo permite que novos membros entrem sem serem convidados"/>
 		<check_box label="Taxa de adesão: L$" name="check_enrollment_fee" tool_tip="Define se é necessária uma taxa de adesão para se unir ao grupo."/>
-		<spinner name="spin_enrollment_fee" tool_tip="Os novos membros devem pagar esta taxa para se unir ao grupo quando a Taxa de Adesão está marcada."/>
-		<combo_box name="group_mature_check" tool_tip="Define se a informação do seu grupo é considerada mature.">
+		<spinner width="60" left_delta="120"  name="spin_enrollment_fee" tool_tip="Os novos membros devem pagar esta taxa para se unir ao grupo quando a Taxa de Adesão está marcada."/>
+		<combo_box width="170" name="group_mature_check" tool_tip="Define se a informação do seu grupo é considerada mature.">
 			<combo_item name="select_mature">
 				- Selecionar Maturidade -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
index e9c7bab3db..a02a17139b 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Convidar um membro" name="invite_panel">
-	<text name="help_text">
+<panel label="Convidar um membro" name="invite_panel" width="224">
+	<text name="help_text" width="214">
 		Voce pode selecionar vários residentes
-para convidar ao seu grupo. Clique &apos;Abrir
-Seletor de Residente&apos; para iniciar.
+para convidar ao seu grupo. Clique
+&apos;Abrir Seletor de Residente&apos; para iniciar.
 	</text>
 	<button label="Abrir Seletor de Residente" name="add_button" tool_tip=""/>
 	<name_list name="invitee_list" tool_tip="Mantenha apertada a tecla Control e clique nos nomes dos residentes para uma seleção múltipla."/>
-	<button label="Remove Selected from List" name="remove_button" tool_tip="Remove os residentes selecionados acima  da lista de convite."/>
+	<button left_delta="-7" width="214" label="Remove os selecionados acima da lista" name="remove_button" tool_tip="Remove os residentes selecionados acima da lista de convite."/>
 	<text name="role_text">
 		Escolha que Função atribuir a eles:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
index f5e96869d7..103da6d67d 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
@@ -13,7 +13,7 @@
 	<string name="loading_txt">
 		Carregando...
 	</string>
-	<text name="group_land_heading">
+	<text name="group_land_heading" width="250">
 		Terra percentente ao grupo
 	</text>
 	<scroll_list name="group_parcel_list">
@@ -22,7 +22,7 @@
 		<column label="Tipo" name="type"/>
 		<column label="Área" name="area"/>
 	</scroll_list>
-	<button label="Mostrar no Mapa" label_selected="Mostrar no Mapa" name="map_button"/>
+	<button label="Mostrar no Mapa" label_selected="Mostrar no Mapa" name="map_button" left="282" width="130"/>
 	<text name="total_contributed_land_label">
 		Contribuição Total:
 	</text>
@@ -51,7 +51,8 @@
 		m² ([AMOUNT] máxima)
 	</text>
 	<text name="group_over_limit_text">
-		Membros do grupo precisam contribuir com mais créditos de Terra para garantir a terra em uso.
+		Membros do grupo precisam contribuir com mais créditos de Terra para
+garantir a terra em uso.
 	</text>
 	<text name="group_money_heading">
 		Grupo L$
@@ -66,8 +67,8 @@
 			<text_editor name="group_money_details_text">
 				Computando...
 			</text_editor>
-			<button label="&lt; Cedo" label_selected="&lt; Cedo" name="earlier_details_button" tool_tip="Voltar no Tempo"/>
-			<button label="Tarde &gt;" label_selected="Tarde &gt;" name="later_details_button" tool_tip="Adiantar o Tempo"/>
+			<button label="&lt; Mais Cedo" label_selected="&lt; Cedo" name="earlier_details_button" tool_tip="Voltar no Tempo"/>
+			<button label="Mais Tarde &gt;" label_selected="Tarde &gt;" name="later_details_button" tool_tip="Adiantar o Tempo"/>
 		</panel>
 		<panel label="Vendas" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
index 1285a24ace..008e8144c6 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Notícias" name="notices_tab">
 	<text name="help_text">
-		As notícias são uma maneira rápida de
-comunicar-se através de um grupo transmitindo uma mensagem e
-entregando um item anexo, opcionalmente. As notícias vão apenas a membros
-do grupo que têm a função habilitada para receber notícias. Você pode desligar
-Notícias na aba Geral.
+		As notícias são uma maneira rápida de comunicar-se através de um grupo transmitindo uma mensagem e entregando um item anexo, opcionalmente. As notícias vão apenas a membros do grupo que têm a função habilitada para receber notícias. Você pode desligar Notícias na aba Geral.
 	</text>
 	<text name="no_notices_text">
 		Não existem notícias anteriores.
@@ -15,9 +11,9 @@ Notícias na aba Geral.
 		Arquivo de notícias do grupo
 	</text>
 	<text name="lbl2">
-		As notícias são mantidas por 14 dias. Clique na notícia abaixo que você deseja ver.
-Clique no botão “Atualizar” para verificar se novas notícias foram recebidas.
-Listas de aviso estão limitadas a 200 por grupo, diariamente.
+		As notícias são mantidas por 14 dias. Clique na notícia abaixo que você deseja 
+ver. Clique no botão “Atualizar” para verificar se novas notícias foram 
+recebidas. Listas de aviso estão limitadas a 200 por grupo, diariamente.
 	</text>
 	<scroll_list name="notice_list">
 		<column label="Assunto" name="subject"/>
@@ -39,15 +35,18 @@ adicionar um item simples à notícia, arrastando-o do seu
 Inventário para o painel. Itens anexados devem ser copiáveis
 e transferíveis e você não pode mandar uma pasta.
 		</text>
-		<text name="lbl3">
+		<text name="lbl3" left="20">
 			Assunto:
 		</text>
-		<text name="lbl4">
+		<line_editor name="create_subject" width="251" left_delta="61"/>
+		<text name="lbl4" left="15" width="60">
 			Mensagem:
 		</text>
-		<text name="lbl5">
+		<text_editor name="create_message" left_delta="66" width="330"/>
+		<text name="lbl5" width="68">
 			Anexo:
 		</text>
+		<line_editor name="create_inventory_name" width="190" left_delta="74"/>
 		<button label="Remover o anexo" label_selected="Remover o anexo" name="remove_attachment"/>
 		<button label="Enviar notícia" label_selected="Enviar notícia" name="send_notice"/>
 		<panel name="drop_target" tool_tip="Arraste um item do inventário para dentro da caixa de mensagem para enviá-lo com a notícia. Você deve ter permissão para copiar e transferir o objeto, para enviá-lo com a notícia."/>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
index 32ed839bd8..087cf0c107 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
@@ -13,7 +13,8 @@
 		</text>
 		<text name="static2">
 			São atribuídas funções com habilidades aos membros do grupo. 
-Estes ajustes podem ser facilmente customizados para uma flexibilidade e organização maiores.
+Estes ajustes podem ser facilmente customizados para uma flexibilidade
+e organização maiores.
 		</text>
 	</panel>
 	<panel name="roles_header">
@@ -21,12 +22,14 @@ Estes ajustes podem ser facilmente customizados para uma flexibilidade e organiz
 			Funções
 		</text>
 		<text name="role_properties_modifiable">
-			Selecionar uma função abaixo. Você pode modificar o nome, a descrição e o título do membro.
+			Selecionar uma função abaixo. Você pode modificar o nome, a descrição
+e o título do membro.
 		</text>
 		<text name="role_properties_not_modifiable">
-			Selecione uma função abaixo para ver suas propriedades, membros e habilidades permitidas.
+			Selecione uma função abaixo para ver suas propriedades, membros e
+habilidades permitidas.
 		</text>
-		<text name="role_actions_modifiable">
+		<text bottom_delta="-28" name="role_actions_modifiable">
 			Você também pode atribuir habilidades à função.
 		</text>
 		<text name="role_actions_not_modifiable">
@@ -38,28 +41,31 @@ Estes ajustes podem ser facilmente customizados para uma flexibilidade e organiz
 			Habilidades
 		</text>
 		<text name="static2">
-			Você pode ver a descrição de uma habilidade e quais funções e membros podem executar essa habilidade.
+			Você pode ver a descrição de uma habilidade e quais funções e membros
+podem executar essa habilidade.
 		</text>
 	</panel>
-	<tab_container name="roles_tab_container">
-		<panel label="Membros" name="members_sub_tab" tool_tip="Membros">
-			<button label="Pesquisar" name="search_button"/>
-			<button label="Mostrar todos" name="show_all_button"/>
-			<name_list name="member_list">
+	<tab_container height="164" name="roles_tab_container">
+		<panel height="148" label="Membros" name="members_sub_tab" tool_tip="Membros">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Pesquisar" name="search_button" width="75"/>
+			<button label="Mostrar todos" name="show_all_button" left_delta="80"/>
+			<name_list name="member_list" bottom_delta="-105" height="104" >
 				<column label="Nome do membro" name="name"/>
 				<column label="Tarifa doada" name="donated"/>
 				<column label="Último login" name="online"/>
 			</name_list>
-			<button label="Convidar Novo Membro ..." name="member_invite"/>
+			<button label="Convidar Novo Membro..." name="member_invite" width="165"/>
 			<button label="Ejetar do Grupo" name="member_eject"/>
 			<string name="help_text">
 				Você pode adicionar ou remover as funções designadas aos membros. Selecione vários membros, segurando a tecla Ctrl e clicando em seus nomes.
 			</string>
 		</panel>
-		<panel label="Funções" name="roles_sub_tab">
-			<button label="Busca" name="search_button"/>
-			<button label="Mostrar todos" name="show_all_button"/>
-			<scroll_list name="role_list">
+		<panel height="148" label="Funções" name="roles_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Busca" name="search_button" width="75"/>
+			<button label="Mostrar todos" name="show_all_button" left_delta="80"/>
+			<scroll_list name="role_list" bottom_delta="-104" height="104">
 				<column label="Nome da função" name="name"/>
 				<column label="Título" name="title"/>
 				<column label="Membro" name="members"/>
@@ -75,10 +81,11 @@ permitidas que os membros podem executar. Os membros poderão ter um ou mais fun
 				As funções &apos;todos&apos; e &apos;donos&apos; são especiais e não podem ser deletadas.
 			</string>
 		</panel>
-		<panel label="Habilidades" name="actions_sub_tab">
-			<button label="Busca" name="search_button"/>
-			<button label="Mostrar todos" name="show_all_button"/>
-			<scroll_list name="action_list" tool_tip="Selecione uma habilidade para ver mais detalhes."/>
+		<panel height="148" label="Habilidades" name="actions_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Busca" name="search_button" width="75"/>
+			<button label="Mostrar todos" name="show_all_button" left_delta="80"/>
+			<scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Selecione uma habilidade para ver mais detalhes."/>
 			<string name="help_text">
 				As habilidades permitem que os membros nas funções façam coisas específicas dentro do grupo.
 Há uma grande variedade de habilidades.
diff --git a/indra/newview/skins/default/xui/pt/panel_groups.xml b/indra/newview/skins/default/xui/pt/panel_groups.xml
index 8a886ef8b1..aaea1178a6 100644
--- a/indra/newview/skins/default/xui/pt/panel_groups.xml
+++ b/indra/newview/skins/default/xui/pt/panel_groups.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="groups">
-	<text name="groupdesc">
+	<text name="groupdesc" width="268">
 		Seu grupo ativo atual es&apos;ta mostrado em negrito.
 	</text>
-	<text name="groupcount">
+	<text name="groupcount" width="300">
 		Você pertence a [COUNT] grupos (de no máximo [MAX]).
-aximo
 	</text>
-	<button label="MI/Chamada" name="IM" tool_tip="Abrir sessão de Mensagem Instantânea"/>
-	<button label="Informações" name="Info"/>
-	<button label="Ativar" name="Activate"/>
-	<button label="Deixar" name="Leave"/>
-	<button label="Criar..." name="Create"/>
-	<button label="Buscar..." name="Search..."/>
+	<button width="86" label="MI/Chamada" name="IM" tool_tip="Abrir sessão de Mensagem Instantânea"/>
+	<button width="86" label="Informações" name="Info"/>
+	<button width="86" label="Ativar" name="Activate"/>
+	<button width="86" label="Deixar" name="Leave"/>
+	<button width="86" label="Criar..." name="Create"/>
+	<button width="86" label="Buscar..." name="Search..."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
index 6218e4eafb..4977a1fac9 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
@@ -22,20 +22,22 @@
 		Última modificação: Quarta, 31 de dezembro de 1969 às 16:00:00 horas
 	</text>
 	<button label="?" name="covenant_help"/>
-	<text_editor name="covenant_editor">
+	<text_editor name="covenant_editor" bottom="-247" height="162" >
 		Não há nenhuma regra fornecida para esta Propriedade.
 	</text_editor>
 	<button label="Resetar" name="reset_covenant"/>
 	<text bottom="-25" name="covenant_help_text">
-		As mudanças das regras serão mostradas em todos os lotes da propriedade.
+		As mudanças das regras serão mostradas em todos os lotes
+      da propriedade.
 	</text>
-	<text name="covenant_instructions">
-		Arraste e solte um notecard, para mudar as Regras desta Propriedade.
+	<text  bottom_delta="-36" name="covenant_instructions">
+		Arraste e solte um notecard, para mudar as Regras desta
+      Propriedade.
 	</text>
-	<text name="region_section_lbl">
+	<text bottom_delta="-36" name="region_section_lbl">
 		Região:
 	</text>
-	<text bottom_delta="-31" name="region_name_lbl">
+	<text name="region_name_lbl">
 		Nome:
 	</text>
 	<text name="region_name_text">
@@ -72,9 +74,11 @@
 		Terras compradas na região não poderão ser revendidas.
 	</string>
 	<string name="can_change">
-		O terreno comprado nesta região pode ser compartilhado ou subdividido.
+		O terreno comprado nesta região pode ser compartilhado ou
+subdividido.
 	</string>
 	<string name="can_not_change">
-		O terreno comprado nesta região não pode ser compartilhado ou subdividido.
+		O terreno comprado nesta região não pode ser compartilhado
+ou subdividido.
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
index 93c5d27648..724df20155 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
@@ -13,7 +13,7 @@
 	<check_box label="Desabilitar física" name="disable_physics_check" tool_tip="Desabilitar toda a físíca nesta região"/>
 	<button label="?" name="disable_physics_help"/>
 	<button label="Aplicar" name="apply_btn"/>
-	<text name="objret_text_lbl">
+	<text name="objret_text_lbl" width="130">
 		Retornar objeto
 	</text>
 	<text name="resident_text_lbl">
@@ -30,10 +30,10 @@
 	<check_box label="Retornar apenas aqueles objetos na terra de alguém" name="return_other_land" tool_tip="Retornar apenas objetos que estejam na terra pertencente a alguém"/>
 	<check_box label="Retornar objetos em cada região desta propriedade" name="return_estate_wide" tool_tip="Retornar objetos em todas as regiões que constituem esta propriedade"/>
 	<button label="Retornar" name="return_btn"/>
-	<button label="Pegar os principais colidentes..." name="top_colliders_btn" tool_tip="Lista dos objetos que experimentam as mais potenciais colisões"/>
-	<button label="?" name="top_colliders_help"/>
-	<button label="Pegar Principais Scripts..." name="top_scripts_btn" tool_tip="Lista de objetos gastando mais tempo rodando scripts"/>
-	<button label="?" name="top_scripts_help"/>
+	<button width="280" label="Pegar os principais colidentes..." name="top_colliders_btn" tool_tip="Lista dos objetos que experimentam as mais potenciais colisões"/>
+	<button label="?" name="top_colliders_help" left="297"/>
+	<button width="280" label="Pegar Principais Scripts..." name="top_scripts_btn" tool_tip="Lista de objetos gastando mais tempo rodando scripts"/>
+	<button label="?" name="top_scripts_help" left="297"/>
 	<button label="Reiniciar a Região" name="restart_btn" tool_tip="Dar 2 minutos de contagem regressiva e reiniciar a região"/>
 	<button label="?" name="restart_help"/>
 	<button label="Atrasar o Reinicio" name="cancel_restart_btn" tool_tip="Atrasar o reinicio da região por uma hora"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index c236b95ca1..f43402be15 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -24,9 +24,9 @@ todas as regiões desta propriedade.
 	<check_box label="Permitir acesso público" name="externally_visible_check"/>
 	<button label="?" name="externally_visible_help"/>
 	<text name="Only Allow">
-		Acesso restrito a:
+		Acesso restrito a Residentes...
 	</text>
-	<check_box label="Residentes com informações de pagamento em arquivo" name="limit_payment" tool_tip="Banir residentes não identificados."/>
+	<check_box label="com info. de pagamento em arquivo" name="limit_payment" tool_tip="Banir residentes não identificados."/>
 	<check_box label="Adultos com idade verificada" name="limit_age_verified" tool_tip="Banir residentes que não tenham confirmado a sua idade. Ver support.secondlife.com para mais informações."/>
 	<check_box label="Permitir conversa de voz" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
index 9b8fc48fb9..b9b0e9d90f 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
@@ -8,9 +8,9 @@
 	</text>
 	<spinner label="Altura da água" name="water_height_spin"/>
 	<button label="?" name="water_height_help"/>
-	<spinner label="Limite do aumento do terreno" name="terrain_raise_spin"/>
+	<spinner label="Limite do aumento do &#10;terreno" name="terrain_raise_spin"/>
 	<button label="?" name="terrain_raise_help"/>
-	<spinner label="Limite mais baixo do terreno" name="terrain_lower_spin"/>
+	<spinner label="Limite mais baixo do &#10;terreno" name="terrain_lower_spin" bottom_delta="-34"/>
 	<button label="?" name="terrain_lower_help"/>
 	<check_box label="Usar o sol da propriedade" name="use_estate_sun_check"/>
 	<button label="?" name="use_estate_sun_help"/>
@@ -18,10 +18,10 @@
 	<button label="?" name="fixed_sun_help"/>
 	<slider label="Fase" name="sun_hour_slider"/>
 	<button label="Aplicar" name="apply_btn"/>
-	<button label="Download de terreno RAW ..." name="download_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários."/>
+	<button label="Download de terreno RAW..." name="download_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários."/>
 	<button label="?" name="download_raw_help"/>
 	<button label="Upload de terreno RAW..." name="upload_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários."/>
 	<button label="?" name="upload_raw_help"/>
-	<button label="Nivelar o terreno" name="bake_terrain_btn" tool_tip="Ajustar terreno atual como o ponto médio para os limites de aumento/decréscimo"/>
-	<button label="?" name="bake_terrain_help"/>
+	<button width="170" label="Nivelar o terreno" name="bake_terrain_btn" tool_tip="Ajustar terreno atual como o ponto médio para os limites de aumento/decréscimo"/>
+	<button left="190" label="?" name="bake_terrain_help"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_texture.xml b/indra/newview/skins/default/xui/pt/panel_region_texture.xml
index 8d7bdfe97b..4787b59a8d 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_texture.xml
@@ -6,7 +6,7 @@
 	<text name="region_text">
 		desconhecido
 	</text>
-	<text name="detail_texture_text">
+	<text name="detail_texture_text" width="380">
 		Texturas de Terreno (requer 512x512, arquivos 24 bit .tga )
 	</text>
 	<text name="height_text_lbl">
diff --git a/indra/newview/tr.lproj/language.txt b/indra/newview/tr.lproj/language.txt
new file mode 100644
index 0000000000..44266bf283
--- /dev/null
+++ b/indra/newview/tr.lproj/language.txt
@@ -0,0 +1 @@
+tr
\ No newline at end of file
diff --git a/indra/newview/uk.lproj/language.txt b/indra/newview/uk.lproj/language.txt
new file mode 100644
index 0000000000..fbc658f6f9
--- /dev/null
+++ b/indra/newview/uk.lproj/language.txt
@@ -0,0 +1 @@
+uk
\ No newline at end of file
diff --git a/indra/newview/zh-Hans.lproj/language.txt b/indra/newview/zh-Hans.lproj/language.txt
new file mode 100644
index 0000000000..147d659917
--- /dev/null
+++ b/indra/newview/zh-Hans.lproj/language.txt
@@ -0,0 +1 @@
+zh
\ No newline at end of file
-- 
cgit v1.2.3


From 40743eaf99c9cbfee08f0bb44bc7c614bc660f34 Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Tue, 1 Sep 2009 13:36:08 -0700
Subject: Try double-quoting backslashes

---
 indra/newview/viewer_manifest.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 99c9abfddf..e85fddbc99 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -399,12 +399,12 @@ class WindowsManifest(ViewerManifest):
         if not sign_py or sign_py == "${SIGN}":
             sign_py = 'C:\\buildscripts\\code-signing\\sign.py'
         else:
-            sign_py = sign_py.replace('\\', '\\\\')
+            sign_py = sign_py.replace('\\', '\\\\\\\\')
         python = os.path.expandvars("${PYTHON}")
         if not python or python == "${PYTHON}":
             python = 'python'
         if os.path.exists(sign_py):
-            self.run_command("%s %s %s" % (python, sign_py, self.dst_path_of(installer_file).replace('\\', '\\\\')))
+            self.run_command("%s %s %s" % (python, sign_py, self.dst_path_of(installer_file).replace('\\', '\\\\\\\\')))
         else:
             print "Skipping code signing,", sign_py, "does not exist"
         self.created_path(self.dst_path_of(installer_file))
-- 
cgit v1.2.3