Merged in latest svn-imports-viewer-20 changes.

37 files changed, 1143 insertions, 615 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index f106796cd9..2c09689ec6 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -384,12 +384,12 @@
   <texture name="TaskPanel_BG" file_name="taskpanel/TaskPanel_BG.png" preload="false" scale.left="4" scale.top="146" scale.right="146" scale.bottom="4" />
   <texture name="TaskPanel_Tab_Unselected" file_name="taskpanel/TaskPanel_Tab_Over.png" preload="false" scale.left="5" scale.top="30" scale.right="36" scale.bottom="5" />
 
-  <texture name="TextField_Search_Disabled" file_name="widgets/TextField_Search_Disabled.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
-  <texture name="TextField_Off" file_name="widgets/TextField_Off.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
-  <texture name="TextField_Search_Active" file_name="widgets/TextField_Search_Active.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
-  <texture name="TextField_Search_Off" file_name="widgets/TextField_Search_Off.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
-  <texture name="TextField_Disabled" file_name="widgets/TextField_Disabled.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
-  <texture name="TextField_Active" file_name="widgets/TextField_Active.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
+  <texture name="TextField_Search_Disabled" file_name="widgets/TextField_Search_Disabled.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+  <texture name="TextField_Off" file_name="widgets/TextField_Off.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+  <texture name="TextField_Search_Active" file_name="widgets/TextField_Search_Active.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+  <texture name="TextField_Search_Off" file_name="widgets/TextField_Search_Off.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+  <texture name="TextField_Disabled" file_name="widgets/TextField_Disabled.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+  <texture name="TextField_Active" file_name="widgets/TextField_Active.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
 
   <texture name="Toast_CloseBtn" file_name="windows/Toast_CloseBtn.png" preload="true" />
   <texture name="Toast" file_name="windows/Toast.png" preload="true" />
@@ -513,11 +513,6 @@
   <texture name="toggle_button_off" file_name="toggle_button_off.png" preload="true" />
   <texture name="toggle_button_selected" file_name="toggle_button_selected.png" preload="true" />
 
-<!--TODO: REPLACE CODE REFERENCE TO THIS ART WITH Icon_Minimize_Background above -->
-  <texture name="minimize_inactive.tga" preload="true" />
-  <texture name="minimize.tga" preload="true" />
-  <texture name="minimize_pressed.tga"	preload="true" />
-
   <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4" />
 
   <texture name="rounded_square.tga"	file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
diff --git a/indra/newview/skins/default/xui/da/floater_camera.xml b/indra/newview/skins/default/xui/da/floater_camera.xml
index 0eb090d2e4..c52f7ab832 100644
--- a/indra/newview/skins/default/xui/da/floater_camera.xml
+++ b/indra/newview/skins/default/xui/da/floater_camera.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater" title="">
-	<string name="rotate_tooltip">
+<floater name="camera_floater" title="">
+	<floater.string name="rotate_tooltip">
 		Roter kamera omkring fokus
-	</string>
-	<string name="zoom_tooltip">
+	</floater.string>
+	<floater.string name="zoom_tooltip">
 		Zoom kamera mod fokus
-	</string>
-	<string name="move_tooltip">
+	</floater.string>
+	<floater.string name="move_tooltip">
 		Flyt kamera op og ned, til venstre og højre
-	</string>
+	</floater.string>
+	<panel name="controls">
+		<joystick_track name="cam_track_stick" tool_tip="Flyt kamera op og ned, til venstre og højre"/>
+		<joystick_zoom name="zoom" tool_tip="Zoom kamera mod fokus"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_color_picker.xml b/indra/newview/skins/default/xui/da/floater_color_picker.xml
index e6cc5774ed..c8e1fc813b 100644
--- a/indra/newview/skins/default/xui/da/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/da/floater_color_picker.xml
@@ -26,6 +26,6 @@
 		Nuværende Farve:
 	</text>
 	<text name="(Drag below to save.)">
-		(Træk ned og gem.)
+		(Træk ned og gem)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml
index 198b5b07f2..f44db713d8 100644
--- a/indra/newview/skins/default/xui/de/floater_camera.xml
+++ b/indra/newview/skins/default/xui/de/floater_camera.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater">
-	<string name="rotate_tooltip">
+<floater name="camera_floater">
+	<floater.string name="rotate_tooltip">
 		Kamera um Fokus drehen
-	</string>
-	<string name="zoom_tooltip">
+	</floater.string>
+	<floater.string name="zoom_tooltip">
 		Kamera auf Fokus zoomen
-	</string>
-	<string name="move_tooltip">
+	</floater.string>
+	<floater.string name="move_tooltip">
 		Kamera nach oben, unten, links und rechts bewegen
-	</string>
+	</floater.string>
+	<panel name="controls">
+		<joystick_track name="cam_track_stick" tool_tip="Kamera nach oben, unten, links und rechts bewegen"/>
+		<joystick_zoom name="zoom" tool_tip="Kamera auf Fokus zoomen"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_color_picker.xml b/indra/newview/skins/default/xui/de/floater_color_picker.xml
index f53a1135dc..fa2f616249 100644
--- a/indra/newview/skins/default/xui/de/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/de/floater_color_picker.xml
@@ -27,6 +27,6 @@
 	</text>
 	<text name="(Drag below to save.)">
 (Nach unten ziehen,
- um zu speichern.)
+ um zu speichern)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index f76e4acbc9..e1f8011cbe 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -84,38 +84,7 @@
              top="52"
              width="132" />
         </panel>
-        <panel
-         border="true"
-         height="150"
-         label="Calling Cards"
-         layout="topleft"
-         left_delta="-1"
-         name="CallingCardsPanel"
-         top_delta="134"
-         width="135">
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="InstructSelectCallingCard"
-             top="8"
-             width="220">
-                Select a calling card:
-            </text>
-            <inventory_panel
-             allow_multi_select="false"
-             border="true"
-             follows="left|top|right|bottom"
-             height="110"
-             layout="topleft"
-             left_delta="0"
-             name="InventoryPanel"
-             top_pad="7"
-             width="115" />
-        </panel>
+
         <panel
          border="none"
          height="150"
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
index 5a29c6a319..8ed2047a27 100644
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
@@ -316,13 +316,16 @@
    height="40"
    follows="top|left|bottom"
    layout="topleft"
-   name="test_text_editor"
+   name="test_text_box"
    tool_tip="text box"
    top_pad="5"
    width="200">
       Text box
 with
 multiple lines
+and too
+many
+line to actually fit
   </text>
   <!-- And a third column -->
   
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 053215f8ae..c65206d629 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2688,7 +2688,7 @@
              height="18"
              layout="topleft"
              left="20"
-             max_length="63"
+			 read_only="true"
              name="media_info"
              select_on_focus="true"
              top_delta="12"
diff --git a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
index 0eb2c5e1be..4f501b65f3 100644
--- a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater

- can_minimize="false"

- height="108"

- layout="topleft"

- name="whitelist_entry"

- width="390">

-

-  <text type="string" length="1" bottom="20" follows="top|left" height="15" layout="topleft"

-     left="10" name="media_label" top="20">

-        Enter a URL or URL pattern to add to the list of allowed domains

-    </text>

-

-  <line_editor bottom_delta="40" enabled="true" follows="left|top" font="SansSerif"

-	     height="20" left="10" name="whitelist_entry"

-	     tool_tip="Enter a URL or URL pattern to White List"

-	     width="350" />

-

-  <button follows="top|left" height="20" font="SansSerifSmall" label="OK"

-     layout="topleft" left="10" name="ok_btn" bottom_delta="28" width="64" />

-  

-  <button follows="top|left" height="20" font="SansSerifSmall" label="Cancel"

-     layout="topleft" left_pad="5" name="cancel_btn" bottom_delta="0" width="64" />

-</floater>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_minimize="false"
+ height="108"
+ layout="topleft"
+ name="whitelist_entry"
+ width="390">
+
+  <text type="string" length="1" bottom="20" follows="top|left" height="15" layout="topleft"
+     left="10" name="media_label" top="20">
+        Enter a URL or URL pattern to add to the list of allowed domains
+    </text>
+
+  <line_editor bottom_delta="40" enabled="true" follows="left|top" font="SansSerif"
+	     height="20" left="10" name="whitelist_entry"
+	     tool_tip="Enter a URL or URL pattern to White List"
+	     width="350" />
+
+  <button follows="top|left" height="20" font="SansSerifSmall" label="OK"
+     layout="topleft" left="10" name="ok_btn" bottom_delta="28" width="64" />
+  
+  <button follows="top|left" height="20" font="SansSerifSmall" label="Cancel"
+     layout="topleft" left_pad="5" name="cancel_btn" bottom_delta="0" width="64" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index b44acebbcf..1af07c35be 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -5,16 +5,16 @@
 -->
 <floater
  bevel_style="in"
- bg_alpha_color="PanelDefaultBackgroundColor"
+ bg_opaque_color="MouseGray"
  can_close="false"
  can_minimize="false"
- height="190"
+ height="138"
  layout="topleft"
  name="inspect_avatar"
  single_instance="true"
  sound_flags="0"
  visible="true"
- width="300">
+ width="245">
   <!-- Allowed fields include:
 	[BORN_ON] ("12/3/2008")
 	[SL_PROFILE] (Second Life profile),
@@ -36,107 +36,116 @@
     Partner: [PARTNER]
   </string>
   <text
-     follows="left|top|right|bottom"
-     font="SansSerifHugeBold"
-     height="70"
-     left="10"
+     follows="all"
+     font="SansSerifLargeBold"
+     height="18"
+     left="8"
      name="user_name"
+     top="5"
      text_color="white"
-     top="20"
      use_ellipses="true"
-     value="Test Name"
-     width="280"
-     word_wrap="true" />
-    <text
-     follows="left|top|right|bottom"
-     font="SansSerifBig"
-     height="20"
-     left="10"
-     name="user_subtitle"
-     text_color="white"
-     top="45"
-     width="150" />
+     value="Grumpity ProductEngine"
+     width="240"
+     word_wrap="false" />
     <!-- Leave text fields blank so it doesn't flash when data arrives off the network -->
     <text
-     follows="left|top|right|bottom"
-     height="20"
-     left="10"
+     follows="all"
+     height="16"
+     left="8"
+     value="Grumpity ProductEngine moose moose"
      name="user_details"
-     text_color="white"
-     top="85"
-     width="290"
-     word_wrap="true" />
+     top_pad="0"
+     width="170"
+     use_ellipses="true"
+     word_wrap="false" />
     <text
-     follows="left|top|right|bottom"
-     height="20"
-     left="10"
+     follows="all"
+   font="SansSerifSmallBold"
+   text_color="White"
+   height="18"
+   left="8"
+     name="user_subtitle"
+     use_ellipses="true"
+     top_pad="0"
+     width="170" />
+    <text
+     follows="all"
+     height="16"
+     left="8"
      name="user_partner"
-     text_color="white"
-     top="105"
-     width="290"
-     word_wrap="true" />
-    <avatar_icon
-     follows="left|top|right|bottom"
-     height="60"
-     left="230"
-     mouse_opaque="true"
-     name="avatar_icon" 
-     top="15"
-     width="60" />
+     top_pad="8"
+     width="240"
+     use_ellipses="true"
+     word_wrap="false" />
     <slider
      follows="top|left"
-     height="30"
+     height="23"
      increment="0.05"
-     left="20"
+     left="1"
      max_val="0.95"
      min_val="0.05"
      name="volume_slider"
      show_text="false"
      tool_tip="Voice Volume"
-     top="125"
+     top_pad="0"
      value="0.5"
-     width="240" />
+     width="150" />
     <button
-     follows="left|top|right|bottom"
+     follows="all"
      height="16"
-     image_disabled="icn_speaker_dark.tga"
-     image_disabled_selected="icn_speaker-muted_dark.tga"
-     image_hover_selected="icn_speaker-muted_dark.tga"
-     image_selected="icn_speaker-muted_dark.tga"
-     image_unselected="icn_speaker_dark.tga"
+     image_disabled="Inv_Sound"
+     image_disabled_selected="Inv_Sound"
+     image_hover_selected="Inv_Sound"
+     image_selected="Inv_Sound"
+     image_unselected="Inv_Sound"
      is_toggle="true"
-     left="265"
+     left_pad="0"
+     top_delta="4"
      name="mute_btn"
      picture_style="true"
-     top="132"
-     width="32" />
+     width="16" />
+    <avatar_icon
+     follows="all"
+     height="38"
+     right="-25"
+     bevel_style="in"
+     border_style="line"
+     mouse_opaque="true"
+     name="avatar_icon"
+     top="24"
+     width="38" />
     <button
      follows="top|left"
-     font="SansSerif"
-     height="20"
+     height="18"
+     image_disabled="ForwardArrow_Disabled"
+     image_selected="ForwardArrow_Press"
+     image_unselected="ForwardArrow_Off"
+     layout="topleft"
+     name="view_profile_btn"
+     picture_style="true"
+     right="-8"
+     top="35"
+     left_delta="110"
+     tab_stop="false"
+     width="18" />
+    <button
+     follows="bottom|left"
+     height="23"
      label="Add Friend"
-     left="10"
+     left="8"
+     top="246"
      name="add_friend_btn"
-     top_pad="10"
-     width="105" />
-    <button
-     follows="top|left"
-     font="SansSerif"
-     height="20"
-     label="View Profile"
-     left_delta="110"
-     name="view_profile_btn"
-     top_delta="0"
-     width="105" />
+     width="100" />
     <menu_button
      follows="top|left"
-     height="20"
-     image_overlay="windows\Icon_Gear_Foreground.png"
-     image_overlay_alignment="center"
+     height="18"
+     image_disabled="OptionsMenu_Disabled"
+     image_selected="OptionsMenu_Press"
+     image_unselected="OptionsMenu_Off"
      menu_filename="menu_inspect_avatar_gear.xml"
      name="gear_btn"
      picture_style="true"
-     top_delta="0"
-     left_delta="110"
-     width="60"/>
+     right="-10"
+     top="249"
+     width="18" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index cc56f630b0..97df28aa30 100644
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -17,8 +17,8 @@
  width="300">
   <string name="Creator">By [CREATOR]</string>
   <string name="CreatorAndOwner">
-By [CREATOR]
-Owned by [OWNER]
+by [CREATOR]
+owner [OWNER]
   </string>
   <!-- *TODO: Might need to change to [AMOUNT] if icon contains "L$" -->
   <string name="Price">L$[AMOUNT]</string>
@@ -28,57 +28,59 @@ Owned by [OWNER]
   <text
      follows="all"
      font="SansSerifLargeBold"
-     height="20"
+     height="16"
      left="8"
      name="object_name"
-     text_color="white"
-     top="8"
+     text_color="White"
+     top="5"
      use_ellipses="true"
      value="Test Object Name That Is Really Long"
-     width="268" />
+     width="291" />
   <text
    follows="all"
    font="SansSerif"
    height="30"
-   left="10"
+   left="8"
    name="object_creator"
    top_pad="0"
-   width="280">
-By Longavatarname Johnsonlongstonnammer
-Owned by James Linden
-  </text>
-  <text
-   follows="all"
-   height="45"
-   left="100"
-   name="object_description"
-   top_pad="4"
-   width="200"
-   word_wrap="true">
-This is a really long description for an object being as how it is at least 80 characters in length and maybe more like 120 at this point. Who knows, really?
+   use_ellipses="true"
+   width="275">
+by Longavatarname Johnsonlongstonnammer
+owner James Linden
   </text>
   <!-- *TODO: Replace this icon -->
   <icon
   name="price_icon"
-  image_name="Favorite_Star_Active"
-  left="5"
+  image_name="Icon_For_Sale"
+  left="7"
   width="16"
   height="16"
-  top="79"
+  top="52"
   follows="left|top"
   />
   <text
    follows="all"
    font="SansSerifSmallBold"
-   height="45"
-   left="22"
+   height="16"
+   left_pad="5"
    name="price_text"
    text_color="white"
-   top="80"
+   top="54"
    font_shadow="none"
-   width="80">
+   width="150">
 L$300,000
   </text>
+    <text
+   follows="all"
+   height="30"
+   left="8"
+   name="object_description"
+   top_pad="0"
+   width="291"
+   use_ellipses="true"
+   word_wrap="true">
+This is a really long description for an object being as how it is at least 80 characters in length and maybe more like 120 at this point. Who knows, really?
+  </text>
   <!-- Overlapping buttons for all default actions.  Show "Buy" if
   for sale, "Sit" if can sit, etc. -->
   <button
@@ -88,7 +90,7 @@ L$300,000
      label="Buy"
      left="10"
      name="buy_btn"
-     top="116"
+     top="114"
      width="100" />
   <button
    follows="top|left"
@@ -136,27 +138,30 @@ L$300,000
    top_delta="0"
    width="100" />
   <!-- non-overlapping buttons here -->
-  <menu_button
+    <menu_button
      follows="top|left"
-     height="23"
-     image_overlay="Icon_Gear_Foreground"
-     image_overlay_alignment="center"
-   right="-8"
-     menu_filename="menu_inspect_object_gear.xml" 
+     height="18"
+     image_disabled="OptionsMenu_Disabled"
+     image_selected="OptionsMenu_Press"
+     image_unselected="OptionsMenu_Off"
+     menu_filename="menu_inspect_avatar_gear.xml"
      name="gear_btn"
      picture_style="true"
-   top_delta="0"
-     width="30" />
-    <button
+     right="-10"
+     top_delta="5"
+     width="18" />
+   <button
      follows="top|left"
-     height="22"
-     image_overlay="TabIcon_Close_Off"
+     height="18"
+     image_disabled="ForwardArrow_Disabled"
+     image_selected="ForwardArrow_Press"
+     image_unselected="ForwardArrow_Off"
      layout="topleft"
      name="more_info_btn"
      picture_style="true"
-     right="-8"
-     top="7"
+     right="-5"
+     top="20"
      left_delta="110"
      tab_stop="false"
-     width="20" />
+     width="18" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml
index 71418d446a..c523185034 100644
--- a/indra/newview/skins/default/xui/en/language_settings.xml
+++ b/indra/newview/skins/default/xui/en/language_settings.xml
@@ -6,7 +6,13 @@
 	<string name="MicrosoftLocale">english</string>
 	<string name="DarwinLocale">C</string>
 	<string name="LinuxLocale">C</string>
-	
+  
+  <!-- Note: for plural nouns, see strings.xml.  For example:
+       AgeYearsA = singular,
+       AgeYearsB = plural,
+       AgeYearsC = plural for non-English languages like Russian
+       For example, LLTrans::getCountString("AgeYears", 3) is plural form B
+       in English and form C in Russian -->
 	<!-- 
 	datetimeToCodes["wkday"]	= "%a";		// Thu
 	datetimeToCodes["weekday"]	= "%A";		// Thursday
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2c77f61da6..b0839ce255 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -361,18 +361,6 @@
             </menu_item_call>
         </menu>
         <menu_item_check
-         label="Search"
-         layout="topleft"
-         name="Search"
-         shortcut="control|F">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="search" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="search" />
-        </menu_item_check>
-        <menu_item_check
          label="World Map"
          layout="topleft"
          name="World Map"
@@ -1072,6 +1060,18 @@
          name="Shortcuts"
          tear_off="true"
          visible="false">
+            <menu_item_check
+               label="Search"
+               layout="topleft"
+               name="Search"
+               shortcut="control|F">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="search" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="search" />
+            </menu_item_check>
             <menu_item_call
              enabled="false"
              label="Release Keys"
@@ -2503,7 +2503,6 @@
          tear_off="true">
             <menu_item_check
              label="Axes"
-             layout="topleft"
              name="Axes">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2514,7 +2513,6 @@
             </menu_item_check>
             <menu_item_check
              label="Tangent Basis"
-             layout="topleft"
              name="Tangent Basis">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2525,7 +2523,6 @@
             </menu_item_check>
             <menu_item_call
              label="Selected Texture Info Basis"
-             layout="topleft"
              name="Selected Texture Info Basis"
              shortcut="control|alt|shift|T">
                 <menu_item_call.on_click
@@ -2533,7 +2530,6 @@
             </menu_item_call>
             <menu_item_check
              label="Wireframe"
-             layout="topleft"
              name="Wireframe"
              shortcut="control|shift|R">
                 <menu_item_check.on_check
@@ -2544,7 +2540,6 @@
             </menu_item_check>
             <menu_item_check
              label="Object-Object Occlusion"
-             layout="topleft"
              name="Object-Object Occlusion"
              shortcut="control|shift|O">
                 <menu_item_check.on_check
@@ -2558,7 +2553,6 @@
             </menu_item_check>
           <menu_item_check
              label="Framebuffer Objects"
-             layout="topleft"
              name="Framebuffer Objects">
             <menu_item_check.on_check
              function="CheckControl"
@@ -2571,7 +2565,6 @@
            </menu_item_check>
           <menu_item_check
                        label="Deferred Rendering"
-                       layout="topleft"
                        name="Deferred Rendering">
             <menu_item_check.on_check
              function="CheckControl"
@@ -2584,7 +2577,6 @@
           </menu_item_check>
           <menu_item_check
                    label="Global Illumintation"
-                   layout="topleft"
                    name="Global Illumination">
             <menu_item_check.on_check
              function="CheckControl"
@@ -2595,10 +2587,11 @@
             <menu_item_check.on_enable
                  function="Advanced.EnableRenderDeferredGI" />
           </menu_item_check>
-
+          
+          <menu_item_separator />
+          
           <menu_item_check
              label="Debug GL"
-             layout="topleft"
              name="Debug GL">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2609,7 +2602,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Pipeline"
-             layout="topleft"
              name="Debug Pipeline">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2620,7 +2612,6 @@
             </menu_item_check>
             <menu_item_check
              label="Fast Alpha"
-             layout="topleft"
              name="Fast Alpha">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2631,7 +2622,6 @@
             </menu_item_check>
             <menu_item_check
              label="Animation Textures"
-             layout="topleft"
              name="Animation Textures">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2642,7 +2632,6 @@
             </menu_item_check>
             <menu_item_check
              label="Disable Textures"
-             layout="topleft"
              name="Disable Textures">
                 <menu_item_check.on_check
                  function="Advanced.CheckDisableTextures"
@@ -2652,7 +2641,6 @@
             </menu_item_check>
             <menu_item_check
              label="Texture Atlas"
-             layout="topleft"
              name="Texture Atlas">
               <menu_item_check.on_check
                function="Advanced.CheckTextureAtlas"
@@ -2662,7 +2650,6 @@
             </menu_item_check>
               <menu_item_check
              label="Render Attached Lights"
-             layout="topleft"
              name="Render Attached Lights">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2673,7 +2660,6 @@
             </menu_item_check>
             <menu_item_check
              label="Render Attached Particles"
-             layout="topleft"
              name="Render Attached Particles">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2682,6 +2668,16 @@
                  function="Advanced.HandleAttchedLightParticles"
                  parameter="RenderAttachedParticles" />
             </menu_item_check>
+            <menu_item_check
+             label="Hover Highlight Objects"
+             name="Hover Highlight Objects">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="RenderHighlightEnable" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="RenderHighlightEnable" />
+            </menu_item_check>
         </menu>
         <menu
          create_jump_keys="true"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 829c2e02d8..f141a909a8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -761,7 +761,7 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now?
 	name="url"
 	openexternally = "1">
 
-			http://join/secondlife.com/
+			http://join.secondlife.com/
     </url>
     <usetemplate
      name="okcancelbuttons"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index 5d9baf4019..f1e2560356 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -64,7 +64,7 @@
 
   <web_browser 
    border_visible="false" 
-   bottom_delta="-120" 
+   bottom_delta="-133" 
    follows="top|left"
    left="120" 
    name="preview_media" 
@@ -83,7 +83,7 @@
   </text>
 
   <text 
-   bottom_delta="-20" 
+   bottom_delta="-5" 
    follows="top|left" 
    height="15"
    left="10" 
@@ -161,32 +161,85 @@
    radio_style="false" 
    width="150" />
 
-  <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" initial_value="false"
-	     label="Use Default Alternative Image" left="10" mouse_opaque="true"
-	     name="alt_image_enable" radio_style="false" width="150" />
+  <check_box 
+   bottom_delta="-25" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Use Default Alternative Image" 
+   left="10" 
+   mouse_opaque="true"
+   name="alt_image_enable" 
+   radio_style="false" 
+   width="150" />
 
-  <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" initial_value="false"
-	     label="Auto Play Media" left="10" mouse_opaque="true"
-	     name="auto_play" radio_style="false" width="150" />
-  <text bottom_delta="-14" follows="top|left" height="15" left="30" width="340" 
-        enabled="false" name="">
+  <check_box 
+   bottom_delta="-25" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Auto Play Media" 
+   left="10" 
+   mouse_opaque="true"
+   name="auto_play" 
+   radio_style="false" 
+   width="150" />
+   
+  <text 
+   bottom_delta="-14" 
+   follows="top|left" 
+   height="15" 
+   left="30" 
+   width="340" 
+   enabled="false" 
+   name="meida_setting_note">
     Note: Residents can override this setting
   </text>
 
-  <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" initial_value="false"
-	     label="Auto Scale Media on Face of Object" left="10" mouse_opaque="true"
-	     name="auto_scale" radio_style="false" width="150" />
-  <text bottom_delta="-20" follows="top|left" height="15" left="30" name="">
+  <check_box 
+   bottom_delta="-25" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Auto Scale Media on Face of Object" 
+   left="10" 
+   mouse_opaque="true"
+   name="auto_scale" 
+   radio_style="false" 
+   width="150" />
+   
+  <text 
+   bottom_delta="-20" 
+   follows="top|left" 
+   height="15" 
+   left="30" 
+   name="">
     Size:
   </text>
-  <spinner bottom_delta="0"
-	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="1" initial_val="256" label="" label_width="0"
-	     left_delta="40" max_val="2048" min_val="0" mouse_opaque="true"
-	     name="width_pixels" width="50" />
+  
+  <spinner 
+   bottom_delta="0"
+   decimal_digits="0" 
+   enabled="true" 
+   follows="left|top" 
+   height="16"
+   increment="1" 
+   initial_val="256" 
+   label="" 
+   label_width="0"
+   left_delta="40" 
+   max_val="2048" 
+   min_val="0" 
+   mouse_opaque="true"
+   name="width_pixels" 
+   width="50" />
+   
   <text bottom_delta="0" follows="top|left" height="15" left_delta="60" name="">
     X
   </text>
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
index f11364874a..0cc1406d62 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
@@ -1,49 +1,137 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" enabled="true" follows="left|top|right|bottom"
-    height="500" label="Controls" left="102" mouse_opaque="true"
-    name="Media settings for controls" width="365">
+<panel 
+ border="true" 
+ enabled="true" 
+ follows="left|top|right|bottom"
+ height="500" 
+ label="Controls" 
+ left="102" 
+ mouse_opaque="true"
+ name="Media settings for controls" 
+ width="365">
 
-  <text bottom_delta="-50" follows="top|left" height="15" left="10" name="" enabled="false">
+  <text 
+   bottom_delta="-50" 
+   follows="top|left" 
+   height="15" 
+   left="10" 
+   name="media_perms_label_owner" 
+   enabled="false">
     Owner
   </text>
-  <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall"
-         height="16" initial_value="false"
-         label="Disable Navigation &amp; Interactivity" left="30" mouse_opaque="true"
-         name="perms_owner_interact" radio_style="false" width="250" />
+  
+  <check_box 
+   bottom_delta="-22" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Disable Navigation &amp; Interactivity" 
+   left="30" 
+   mouse_opaque="true"
+   name="perms_owner_interact" 
+   radio_style="false" 
+   width="250" />
 
-  <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall"
-         height="16" initial_value="false"
-         label="Hide Control Bar" left="30" mouse_opaque="true"
-         name="perms_owner_control" radio_style="false" width="250" />
+  <check_box 
+   bottom_delta="-22" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Hide Control Bar" 
+   left="30" 
+   mouse_opaque="true"
+   name="perms_owner_control" 
+   radio_style="false" 
+   width="250" />
 
-  <text bottom_delta="-36" follows="top|left" height="15" left="10" name="perms_group_name_label" enabled="false">
+  <text 
+   bottom_delta="-36" 
+   follows="top|left" 
+   height="15" 
+   left="10" 
+   name="media_perms_label_group" 
+   enabled="false">
     Group
   </text>
-  <name_box bottom_delta="-5" enabled="false" follows="left|top" font="SansSerif"
-	     height="20" left="60" name="perms_group_name"
-       value ="" 
-	     width="200" />
-  <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall"
-         height="16" initial_value="false"
-         label="Disable Navigation &amp; Interactivity" left="30" mouse_opaque="true"
-         name="perms_group_interact" radio_style="false" width="250" />
+  
+  <name_box 
+   bottom_delta="-5" 
+   enabled="false" 
+   follows="left|top" 
+   font="SansSerif"
+   height="20" left="60" 
+   name="perms_group_name"
+   value ="" 
+   width="200" />
+   
+  <check_box 
+   bottom_delta="-22" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Disable Navigation &amp; Interactivity" 
+   left="30" 
+   mouse_opaque="true"
+   name="perms_group_interact" 
+   radio_style="false" 
+   width="250" />
 
-  <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall"
-         height="16" initial_value="false"
-         label="Hide Control Bar" left="30" mouse_opaque="true"
-         name="perms_group_control" radio_style="false" width="250" />
+  <check_box 
+   bottom_delta="-22" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Hide Control Bar" 
+   left="30" 
+   mouse_opaque="true"
+   name="perms_group_control" 
+   radio_style="false" 
+   width="250" />
 
-  <text bottom_delta="-36" follows="top|left" height="15" left="10" name="" enabled="false">
+  <text 
+   bottom_delta="-36" 
+   follows="top|left" 
+   height="15" 
+   left="10" 
+   name="media_perms_label_anyone" 
+   enabled="false">
     Anyone
   </text>
-  <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall"
-         height="16" initial_value="false"
-         label="Disable Navigation &amp; Interactivity" left="30" mouse_opaque="true"
-         name="perms_anyone_interact" radio_style="false" width="250" />
+  
+  <check_box 
+   bottom_delta="-22" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Disable Navigation &amp; Interactivity" 
+   left="30" 
+   mouse_opaque="true"
+   name="perms_anyone_interact" 
+   radio_style="false" 
+   width="250" />
 
-  <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall"
-         height="16" initial_value="false"
-         label="Hide Control Bar" left="30" mouse_opaque="true"
-         name="perms_anyone_control" radio_style="false" width="250" />
+  <check_box 
+   bottom_delta="-22" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Hide Control Bar" 
+   left="30" 
+   mouse_opaque="true"
+   name="perms_anyone_control" 
+   radio_style="false" 
+   width="250" />
 
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 8b9fe2cf77..696e0b3c33 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -60,7 +60,7 @@
          left="5"
          name="teleport_btn"
          top="0"
-         width="90" />
+         width="70" />
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
@@ -70,7 +70,7 @@
          left_pad="5"
          name="map_btn"
          top="0"
-         width="80" />
+         width="50" />
         <button
          enabled="false"
          follows="bottom|left"
@@ -83,40 +83,54 @@
          top="0"
          width="60" />
         <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         label="Edit"
+         layout="topleft"
+         left_pad="5"
+         name="edit_btn"
+         top="0"
+         width="50" />
+        <button
          follows="bottom|right"
          font="SansSerifSmallBold"
          height="25"
          label="▼"
          layout="topleft"
-         left_pad="5"
          name="overflow_btn"
+         right="-10"
          top="0"
          width="30" />
         <button
-         follows="bottom|left"
+         follows="bottom|right"
          font="SansSerifSmallBold"
          height="25"
-         image_disabled="widgets/SegmentedBtn_Left_Disabled.png"
-         image_selected="widgets/SegmentedBtn_Left_Selected.png"
-         image_unselected="widgets/SegmentedBtn_Left_Off.png"
-         label="Create"
+         label="Close"
          layout="topleft"
-         left="5"
-         name="create_landmark_btn"
+         name="close_btn"
+         right="-10"
          top="0"
-         width="70" />
+         width="60" />
         <button
-         follows="bottom|left"
+         follows="bottom|right"
          font="SansSerifSmallBold"
          height="25"
-         image_disabled="widgets/ComboButton_Disabled.png"
-         image_selected="widgets/ComboButton_Selected.png"
-         image_unselected="widgets/ComboButton_Off.png"
-         label="▼"
+         label="Cancel"
+         layout="topleft"
+         name="cancel_btn"
+         right="-10"
+         top="0"
+         width="60" />
+        <button
+         follows="bottom|right"
+         font="SansSerifSmallBold"
+         height="25"
+         label="Save"
          layout="topleft"
-         left_pad="0"
-         name="folder_menu_btn"
+         name="save_btn"
+         right="-75"
          top="0"
-         width="20" />
+         width="60" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index b4212aaa34..9cf699ad46 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -43,7 +43,7 @@
 	    layout="topleft"
 	    top="0"
 	    left="0"
-	    width="284"
+	    width="300"
 	    height="700">
 	 <panel
 	    follows="left|top"
@@ -52,7 +52,7 @@
 	    left="10"
 	    name="second_life_image_panel"
 	    top="10"
-	    width="280">
+	    width="285">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
@@ -94,7 +94,7 @@
 	 top_pad="10"
          left="10"
          name="first_life_image_panel"
-         width="280">
+         width="285">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
@@ -122,7 +122,7 @@
              height="90"
              layout="topleft"
              name="fl_description_edit"
-             width="180"
+             width="170"
              expanded_bg_visible="true"
              expanded_bg_color="black">
                 Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
index 3b1b049ff2..9845a9eb78 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
@@ -4,7 +4,7 @@
  bottom="0"
  follows="left|top|right"
  height="30"
- width="305"
+ width="333"
  layout="topleft"
  left="0"
  name="sidetray_tab_panel">
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3a5347fe12..d124a4cdfa 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -44,23 +44,12 @@
 	
 	
 	<!-- Tooltip, lltooltipview.cpp -->
-	<!-- *TODO: Most of these are now unused, eliminate them -->
 	<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
 	<string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
 	<string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->
 	<string name="TooltipPublic">Public</string> <!-- Public permissions on an object -->
 	<string name="TooltipIsGroup">(Group)</string> <!-- The name before this text is that of a group -->
-	<string name="TooltipFlagScript">Script</string>
-	<string name="TooltipFlagPhysics">Physics</string>
-	<string name="TooltipFlagTouch">Touch</string>
-	<string name="TooltipFlagL$">L$</string>
-	<string name="TooltipFlagDropInventory">Drop Inventory</string>
-	<string name="TooltipFlagPhantom">Phantom</string>
-	<string name="TooltipFlagTemporary">Temporary</string>
-	<string name="TooltipFlagRightClickMenu">(Right-click for menu)</string>
-	<string name="TooltipFreeToCopy">Free to copy</string>
 	<string name="TooltipForSaleL$">For Sale: L$[AMOUNT]</string> <!-- L$ version -->
-	<string name="TooltipForSaleMsg">For Sale: [MESSAGE]</string> <!-- Message (RetrievingData) -->
 	<string name="TooltipFlagGroupBuild">Group Build</string>
 	<string name="TooltipFlagNoBuild">No Build</string>
 	<string name="TooltipFlagNoEdit">Group Build</string>
@@ -1940,16 +1929,23 @@ this texture in your inventory
   <string name="DaysOld">[AGEDAYS] old</string>
   <string name="TodayOld">Joined today</string>
   
-  <!-- AgeYearsA = singular, AgeYearsB = plural, see logic in
-      LLTrans::getCountString() -->
+  <!-- AgeYearsA = singular,
+       AgeYearsB = plural,
+       AgeYearsC = plural for non-English languages like Russian
+       For example, LLTrans::getCountString("AgeYears", 3) is plural form B
+       in English and form C in Russian -->
   <string name="AgeYearsA">[COUNT] year</string>
   <string name="AgeYearsB">[COUNT] years</string>
+  <string name="AgeYearsC">[COUNT] years</string>
   <string name="AgeMonthsA">[COUNT] month</string>
   <string name="AgeMonthsB">[COUNT] months</string>
+  <string name="AgeMonthsC">[COUNT] months</string>
   <string name="AgeWeeksA">[COUNT] week</string>
   <string name="AgeWeeksB">[COUNT] weeks</string>
+  <string name="AgeWeeksC">[COUNT] weeks</string>
   <string name="AgeDaysA">[COUNT] day</string>
   <string name="AgeDaysB">[COUNT] days</string>
+  <string name="AgeDaysC">[COUNT] days</string>
 
   <!-- Account types, see LLAvatarPropertiesProcessor -->
   <string name="AcctTypeResident">Resident</string>
@@ -2177,6 +2173,9 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	<string name="'">'</string>	
 	<string name="---">---</string>										
 
+	<!-- media -->
+	<string name="Multiple Media">Multiple Media</string>
+	
 	<!-- OSMessageBox messages -->
 	<string name="MBCmdLineError">
 		An error was found parsing the command line.
@@ -2246,225 +2245,585 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	</string>
 
 	<!-- Avatar Shape Information -->
-    <string name="Attached Earlobes">Attached Earlobes</string>
-	<string name="Arm Length">Arm Length</string>	
-    <string name="Back Bangs Down">Back Bangs Down</string>
-    <string name="Back Bangs Up">Back Bangs Up</string>
-    <string name="Back Hair Down">Back Hair Down</string>
-    <string name="Back Hair Up">Back Hair Up</string>
-    <string name="Belly Size">Belly Size</string>	
-	<string name="Blonde Hair">Blonde Hair</string>
-    <string name="Big Eyeball">Big Eyeball</string>
-    <string name="Big Hair Back">Big Hair: Back</string>
-    <string name="Big Hair Front">Big Hair: Front</string>
-    <string name="Big Hair Top">Big Hair: Top</string>
-	<string name="Body Fat">Body Fat</string>
-    <string name="Body Thickness">Body Thickness</string>
-    <string name="Breast Buoyancy">Breast Buoyancy</string>
-    <string name="Breast Cleavage">Breast Cleavage</string>
-	<string name="Breast Size">Breast Size</string>
-    <string name="Bridge Width">Bridge Width</string>
-    <string name="Brow Size">Brow Size</string>
-    <string name="Butt Size">Butt Size</string>
-    <string name="Cheek Bones">Cheek Bones</string>
-    <string name="Chest Size">Chest Size</string>
-    <string name="Chin Angle">Chin Angle</string>
-    <string name="Chin Cleft">Chin Cleft</string>
-    <string name="Chin Depth">Chin Depth</string>
-    <string name="Chin-Neck">Chin-Neck</string>
-	<string name="Collar Back">Collar Back</string>
-	<string name="Collar Front">Collar Front</string>
-    <string name="Crooked Nose">Crooked Nose</string>
-    <string name="Cuff Flare">Cuff Flare</string>
-    <string name="Ear Angle">Ear Angle</string>
-    <string name="Ear Size">Ear Size</string>
-    <string name="Ear Tips">Ear Tips</string>
-    <string name="Egg Head">Egg Head</string>
-    <string name="Eye Bags">Eye Bags</string>
-	<string name="Eye Color">Eye Color</string>
-    <string name="Eye Depth">Eye Depth</string>
-	<string name="Eye Lightness">Eye Lightness</string>
-    <string name="Eye Opening">Eye Opening</string>
-    <string name="Eye Pop">Eye Pop</string>
-    <string name="Eye Size">Eye Size</string>
-    <string name="Eye Spacing">Eye Spacing</string>
-    <string name="Eyeball Size">Eyeball Size</string>
-    <string name="Eyebrow Arc">Eyebrow Arc</string>
-    <string name="Eyebrow Height">Eyebrow Height</string>
-    <string name="Eyebrow Points">Eyebrow Points</string>
-    <string name="Eyelash Length">Eyelash Length</string>
-	<string name="Eyeliner">Eyeliner</string>
-	<string name="Eyeliner Color">Eyeliner Color</string>
-	<string name="Face Shear">Face Shear</string>
-	<string name="Facial Definitionr">Facial Definition</string>
-    <string name="Fat Head">Fat Head</string>
-    <string name="Fat Lower Lip">Fat Lower Lip</string>
-    <string name="Fat Torso">Fat Torso</string>
-    <string name="Fat Upper Lip">Fat Upper Lip</string>
-    <string name="Foot Size">Foot Size</string>
-	<string name="Freckles">Freckles</string>
-    <string name="Front Bangs Down">Front Bangs Down</string>
-    <string name="Front Bangs Up">Front Bangs Up</string>
-    <string name="Front Hair Down">Front Hair Down</string>
-    <string name="Front Hair Up">Front Hair Up</string>
-	<string name="Forehead Angle">Forehead Angle</string>
-    <string name="Full Hair Sides">Full Hair Sides</string>
-	<string name="Glove Fingers">Glove Fingers</string> 
-	<string name="Glove Length">Glove Length</string>
-    <string name="Hair Thickess">Hair Thickess</string>
-    <string name="Hair Tilted Left">Hair Tilted Left</string>
-    <string name="Hair Tilted Right">Hair Tilted Right</string>
-    <string name="Hair Volume">Hair: Volume</string>
-	<string name="Hand Size">Hand Size</string>
-	<string name="Head Length">Head Length</string>
-    <string name="Head Shape">Head Shape</string>
-    <string name="Head Size">Head Size</string>
-    <string name="Head Stretch">Head Stretch</string>
-    <string name="Heel Height">Heel Height</string>
-    <string name="Heel Shape">Heel Shape</string>
-    <string name="Height">Height</string>
-    <string name="Hip Width">Hip Width</string>
-	<string name="Hip Length">Hip Length</string>
-    <string name="Inner Eye Corner">Inner Eye Corner</string>
-    <string name="Jacket Length">Jacket Length</string>
-    <string name="Jacket Wrinkles">Jacket Wrinkles</string>
-    <string name="Jowls">Jowls</string>	
-    <string name="Jaw Angle">Jaw Angle</string>
-    <string name="Jaw Jut">Jaw Jut</string>
-    <string name="Jaw Shape">Jaw Shape</string>
-    <string name="Knee Angle">Knee Angle</string>
-    <string name="Left Part">Left Part</string>
-    <string name="Leg Muscles">Leg Muscles</string>
-	<string name="Leg Length">Leg Length</string>
-    <string name="Lip Cleft">Lip Cleft</string>
-    <string name="Lip Cleft Depth">Lip Cleft Depth</string>
-    <string name="Lip Fullness">Lip Fullness</string>
-	<string name="Lip Pinkness">Lip Pinkness</string>
-    <string name="Lip Ratio">Lip Ratio</string>
-    <string name="Lip Thickness">Lip Thickness</string>	
-    <string name="Lip Width">Lip Width</string>
-    <string name="Longcuffs">Longcuffs</string>
-    <string name="Love Handles">Love Handles</string>
-    <string name="Lower Bridge">Lower Bridge</string>
-    <string name="Lower Cheeks">Lower Cheeks</string>
-    <string name="Middle Part">Middle Part</string>
-    <string name="Mouth Corner">Mouth Corner</string>
-    <string name="Mouth Position">Mouth Position</string>
-	<string name="Nail Polish">Nail Polish</string>
-	<string name="Nail Polish Color">Nail Polish Color</string>
-	<string name="Neck Length">Neck Length</string>
-	<string name="Neck Thickness">Neck Thickness</string>
-    <string name="Nose Size">Nose Size</string>
-    <string name="Nose Thickness">Nose Thickness</string>
-    <string name="Nose Tip Angle">Nose Tip Angle</string>
-    <string name="Nose Tip Shape">Nose Tip Shape</string>
-    <string name="Nose Width">Nose Width</string>
-    <string name="Nostril Division">Nostril Division</string>
-    <string name="Nostril Width">Nostril Width</string>
-    <string name="Open Front">Open Front</string>
-	<string name="Lipstick Color">Lipstick Color</string>
-	<string name="Lipstick">Lipstick</string>
-	<string name="Lipgloss">Lipgloss</string>
-	<string name="Blush">Blush</string>
-	<string name="Blush Color">Blush Color</string>
-	<string name="Blush Opacity">Blush Opacity</string>
-	<string name="Inner Shadow">Inner Shadow</string>
-	<string name="In Shdw Color">Inner Shadow Color</string>
-	<string name="In Shdw Opacity">Inner Shadow Opacity</string>
-	<string name="Body Definition">Body Definition</string>
-	<string name="Body Freckles">Body Freckles</string>
-	<string name="Facial Definition">Facial Definition</string>
-	<string name="Hair Front">Hair: Front</string>
-	<string name="Hair Sides">Hair: Sides</string>
-	<string name="Hair Back">Hair: Back</string>
-	<string name="Front Fringe">Front Fringe</string>
-	<string name="Side Fringe">Side Fringe</string>
-	<string name="Back Fringe">Back Fringe</string>
-	<string name="Hair Sweep">Hair Sweep</string>
-	<string name="Pigtails">Pigtails</string>
-	<string name="Ponytail">Ponytail</string>
-	<string name="Hair Tilt">Hair Tilt</string>
-	<string name="Eyebrow Size">Eyebrow Size</string>
-	<string name="Eyebrow Density">Eyebrow Density</string>
-	<!-- string name="Hair Thickess">Hair Thickess</string    Need a second string for Body Parts > Hair > Facial? -->
-	<string name="Sideburns">Sideburns</string>
-	<string name="Moustache">Moustache</string>
-	<string name="Soulpatch">Soulpatch</string>
-	<string name="Chin Curtains">Chin Curtains</string>
-    <string name="Outer Eye Corner">Outer Eye Corner</string>
-	<string name="Outer Shadow">Outer Shadow</string>
-	<string name="Out Shdw Opacity">Outer Shadow Opacity</string>
-	<string name="Out Shdw Color">Outer Shadow Color</string>	
-    <string name="Package">Package</string>
-    <string name="Pants Crotch">Pants Crotch</string> 
-	<string name="Pants Fit">Pants Fit</string>
-	<string name="Pants Length">Pants Length</string>
-	<string name="Pants Waist">Pants Waist</string>
-	<string name="Pants Wrinkles">Pants Wrinkles</string>
-    <string name="Part Bangs">Part Bangs</string>
-    <string name="Pectorals">Pectorals</string>
-    <string name="Platform Height">Platform Height</string>
-    <string name="Platform Width">Platform Width</string>
-	<string name="Pigment">Pigment</string>
-    <string name="Puffy Eyelids">Puffy Eyelids</string>
-	<string name="Rainbow Color">Rainbow Color</string>
-	<string name="Red Hair">Red Hair</string>
-    <string name="Right Part">Right Part</string>
-    <string name="Round Forehead">Round Forehead</string>
-	<string name="Rosy Complexion">Rosy Complexion</string>
-    <string name="Ruddiness">Ruddiness</string>
-    <string name="Rumpled Hair">Rumpled Hair</string>
-    <string name="Saddle Bags">Saddle Bags</string>
-    <string name="Scrawny Leg">Scrawny Leg</string>
-    <string name="Shear Back">Shear Back</string>
-    <string name="Shear Face">Shear Face</string>
-    <string name="Shear Front">Shear Front</string>
-    <string name="Shift Mouth">Shift Mouth</string>
-	<string name="Shirt Bottom">Shirt Bottom</string>
-    <string name="Shirt Fit">Shirt Fit</string>
-	<string name="Shirt Wrinkles">Shirt Wrinkles</string>
-	<string name="Shoe Height">Shoe Height</string>
-    <string name="Shoulders">Shoulders</string>
-    <string name="Side Bangs Down">Side Bangs Down</string>
-    <string name="Side Bangs Up">Side Bangs Up</string>
-    <string name="Sides Hair Down">Sides Hair Down</string>
-    <string name="Sides Hair Up">Sides Hair Up</string>
-    <string name="Skirt Fit">Skirt Fit</string>
-	<string name="Skirt Length">Skirt Length</string>
-    <string name="Slanted Forehead">Slanted Forehead</string> 
-	<string name="Sleeve Length">Sleeve Length</string>
-    <string name="Sleeve Looseness">Sleeve Looseness</string> 
-	<string name="Slit Back">Slit: Back</string> 
-	<string name="Slit Front">Slit: Front</string> 
-	<string name="Slit Left">Slit: Left</string> 
-	<string name="Slit Right">Slit: Right</string> 
-	<string name="Socks Length">Socks Length</string>
-    <string name="Spiked Hair">Spiked Hair</string>
-    <string name="Squash/Stretch Head">Squash/Stretch Head</string>
-    <string name="Swept Back Hair">Swept Back Hair</string>
-    <string name="Swept Forward Hair">Swept Forward Hair</string>
-    <string name="Taper Back">Taper Back</string>
-    <string name="Taper Front">Taper Front</string>
-    <string name="Toe Shape">Toe Shape</string>
-    <string name="Toe Thickness">Toe Thickness</string>
-	<string name="Toe Length">Toe Length</string>
-	<string name="Torso Length">Torso Length</string>
-    <string name="Torso Muscles">Torso Muscles</string>
-    <string name="Torso Scrawny">Torso Scrawny</string>
-    <string name="Upper Bridge">Upper Bridge</string>
-    <string name="Upper Cheeks">Upper Cheeks</string>
-    <string name="Upper Chin Cleft">Upper Chin Cleft</string>
-    <string name="Upper Eyelid Fold">Upper Eyelid Fold</string>
-	<string name="Waist Height">Waist Height</string>
-	<string name="White Hair">White Hair</string>
-    <string name="big belly skirt">big belly skirt</string>
-    <string name="bigbutt skirt">bigbutt skirt</string>
-    <string name="bustle skirt">Bustle Skirt</string>
-    <string name="legs skirt">legs skirt</string>
-    <string name="loose skirt">loose skirt</string>
-    <string name="poofy skirt">poofy skirt</string>
-    <string name="tight skirt">tight skirt</string>	
-	<string name="wrinkles">Wrinkles</string>	
+<string name="5 O'Clock Shadow">5 O'Clock Shadow</string>
+<string name="5 O'Clock Shadow bump">5 O'Clock Shadow bump</string>
+<string name="All White">All White</string>
+<string name="Anime Eyes">Anime Eyes</string>
+<string name="Arced">Arced</string>
+<string name="Arm Length">Arm Length</string>
+<string name="Attached">Attached</string>
+<string name="Attached Earlobes">Attached Earlobes</string>
+<string name="BELLY">BELLY</string>
+<string name="Back Bangs">Back Bangs</string>
+<string name="Back Bangs Down">Back Bangs Down</string>
+<string name="Back Bangs Up">Back Bangs Up</string>
+<string name="Back Fringe">Back Fringe</string>
+<string name="Back Hair">Back Hair</string>
+<string name="Back Hair Down">Back Hair Down</string>
+<string name="Back Hair Up">Back Hair Up</string>
+<string name="Baggy">Baggy</string>
+<string name="Bangs">Bangs</string>
+<string name="Bangs Down">Bangs Down</string>
+<string name="Bangs Up">Bangs Up</string>
+<string name="Beady Eyes">Beady Eyes</string>
+<string name="Belly Size">Belly Size</string>
+<string name="Big">Big</string>
+<string name="Big Butt">Big Butt</string>
+<string name="Big Eyeball">Big Eyeball</string>
+<string name="Big Hair Back">Big Hair Back</string>
+<string name="Big Hair Front">Big Hair Front</string>
+<string name="Big Hair Top">Big Hair Top</string>
+<string name="Big Head">Big Head</string>
+<string name="Big Pectorals">Big Pectorals</string>
+<string name="Big Spikes">Big Spikes</string>
+<string name="Black">Black</string>
+<string name="Blonde">Blonde</string>
+<string name="Blonde Hair">Blonde Hair</string>
+<string name="Blush">Blush</string>
+<string name="Blush Color">Blush Color</string>
+<string name="Blush Opacity">Blush Opacity</string>
+<string name="Body Definition">Body Definition</string>
+<string name="Body Fat">Body Fat</string>
+<string name="Body Freckles">Body Freckles</string>
+<string name="Body Thick">Body Thick</string>
+<string name="Body Thickness">Body Thickness</string>
+<string name="Body Thin">Body Thin</string>
+<string name="Bottom">Bottom</string>
+<string name="Bottom Left">Bottom Left</string>
+<string name="Bottom Right">Bottom Right</string>
+<string name="Bottom bump">Bottom bump</string>
+<string name="Bow Legged">Bow Legged</string>
+<string name="Breast Buoyancy">Breast Buoyancy</string>
+<string name="Breast Cleavage">Breast Cleavage</string>
+<string name="Breast Size">Breast Size</string>
+<string name="Bridge Width">Bridge Width</string>
+<string name="Broad">Broad</string>
+<string name="Brow Size">Brow Size</string>
+<string name="Bug Eyes">Bug Eyes</string>
+<string name="Bugged Eyes">Bugged Eyes</string>
+<string name="Bulbous">Bulbous</string>
+<string name="Bulbous Nose">Bulbous Nose</string>
+<string name="Bump base">Bump base</string>
+<string name="Bump upperdef">Bump upperdef</string>
+<string name="Bushy Eyebrows">Bushy Eyebrows</string>
+<string name="Bushy Hair">Bushy Hair</string>
+<string name="Butt Size">Butt Size</string>
+<string name="CHEST">CHEST</string>
+<string name="Center">Center</string>
+<string name="Center 2">Center 2</string>
+<string name="Chaplin">Chaplin</string>
+<string name="Cheek Bones">Cheek Bones</string>
+<string name="Chest">Chest</string>
+<string name="Chest Size">Chest Size</string>
+<string name="Chin">Chin</string>
+<string name="Chin Angle">Chin Angle</string>
+<string name="Chin Cleft">Chin Cleft</string>
+<string name="Chin Curtains">Chin Curtains</string>
+<string name="Chin Curtains bump">Chin Curtains bump</string>
+<string name="Chin Depth">Chin Depth</string>
+<string name="Chin Heavy">Chin Heavy</string>
+<string name="Chin In">Chin In</string>
+<string name="Chin Out">Chin Out</string>
+<string name="Chin-Neck">Chin-Neck</string>
+<string name="Clear">Clear</string>
+<string name="Cleft">Cleft</string>
+<string name="Close Set Eyes">Close Set Eyes</string>
+<string name="Closed">Closed</string>
+<string name="Closed Back">Closed Back</string>
+<string name="Closed Front">Closed Front</string>
+<string name="Closed Left">Closed Left</string>
+<string name="Closed Right">Closed Right</string>
+<string name="Coin Purse">Coin Purse</string>
+<string name="Collar Back">Collar Back</string>
+<string name="Collar Back Height Cloth">Collar Back Height Cloth</string>
+<string name="Collar Back Shadow Height">Collar Back Shadow Height</string>
+<string name="Collar Back bump">Collar Back bump</string>
+<string name="Collar Front">Collar Front</string>
+<string name="Collar Front Height Cloth">Collar Front Height Cloth</string>
+<string name="Collar Front Shadow Height">Collar Front Shadow Height</string>
+<string name="Collar Front bump">Collar Front bump</string>
+<string name="Corner Down">Corner Down</string>
+<string name="Corner Normal">Corner Normal</string>
+<string name="Corner Up">Corner Up</string>
+<string name="Creased">Creased</string>
+<string name="Crooked Nose">Crooked Nose</string>
+<string name="Cropped Hair">Cropped Hair</string>
+<string name="Cuff Flare">Cuff Flare</string>
+<string name="Dark">Dark</string>
+<string name="Dark Green">Dark Green</string>
+<string name="Darker">Darker</string>
+<string name="Deep">Deep</string>
+<string name="Default Heels">Default Heels</string>
+<string name="Default Toe">Default Toe</string>
+<string name="Dense">Dense</string>
+<string name="Dense hair">Dense hair</string>
+<string name="Double Chin">Double Chin</string>
+<string name="Downturned">Downturned</string>
+<string name="Duffle Bag">Duffle Bag</string>
+<string name="Ear Angle">Ear Angle</string>
+<string name="Ear Size">Ear Size</string>
+<string name="Ear Tips">Ear Tips</string>
+<string name="Egg Head">Egg Head</string>
+<string name="Eye Bags">Eye Bags</string>
+<string name="Eye Color">Eye Color</string>
+<string name="Eye Depth">Eye Depth</string>
+<string name="Eye Lightness">Eye Lightness</string>
+<string name="Eye Opening">Eye Opening</string>
+<string name="Eye Pop">Eye Pop</string>
+<string name="Eye Size">Eye Size</string>
+<string name="Eye Spacing">Eye Spacing</string>
+<string name="Eyeball Size">Eyeball Size</string>
+<string name="Eyebrow Arc">Eyebrow Arc</string>
+<string name="Eyebrow Density">Eyebrow Density</string>
+<string name="Eyebrow Density Bump">Eyebrow Density Bump</string>
+<string name="Eyebrow Height">Eyebrow Height</string>
+<string name="Eyebrow Points">Eyebrow Points</string>
+<string name="Eyebrow Size">Eyebrow Size</string>
+<string name="Eyebrow Size Bump">Eyebrow Size Bump</string>
+<string name="Eyelash Length">Eyelash Length</string>
+<string name="Eyeliner">Eyeliner</string>
+<string name="Eyeliner Color">Eyeliner Color</string>
+<string name="Eyes Back">Eyes Back</string>
+<string name="Eyes Bugged">Eyes Bugged</string>
+<string name="Eyes Forward">Eyes Forward</string>
+<string name="Eyes Long Head">Eyes Long Head</string>
+<string name="Eyes Shear Left Up">Eyes Shear Left Up</string>
+<string name="Eyes Shear Right Up">Eyes Shear Right Up</string>
+<string name="Eyes Short Head">Eyes Short Head</string>
+<string name="Eyes Spread">Eyes Spread</string>
+<string name="Eyes Sunken">Eyes Sunken</string>
+<string name="Eyes Together">Eyes Together</string>
+<string name="Face Shear">Face Shear</string>
+<string name="Facial Definition">Facial Definition</string>
+<string name="Far Set Eyes">Far Set Eyes</string>
+<string name="Fat">Fat</string>
+<string name="Fat Head">Fat Head</string>
+<string name="Fat Lips">Fat Lips</string>
+<string name="Fat Lower">Fat Lower</string>
+<string name="Fat Lower Lip">Fat Lower Lip</string>
+<string name="Fat Torso">Fat Torso</string>
+<string name="Fat Upper">Fat Upper</string>
+<string name="Fat Upper Lip">Fat Upper Lip</string>
+<string name="Female">Female</string>
+<string name="Fingerless">Fingerless</string>
+<string name="Fingers">Fingers</string>
+<string name="Flared Cuffs">Flared Cuffs</string>
+<string name="Flat">Flat</string>
+<string name="Flat Butt">Flat Butt</string>
+<string name="Flat Head">Flat Head</string>
+<string name="Flat Toe">Flat Toe</string>
+<string name="Foot Size">Foot Size</string>
+<string name="Forehead Angle">Forehead Angle</string>
+<string name="Forehead Heavy">Forehead Heavy</string>
+<string name="Freckles">Freckles</string>
+<string name="Front Bangs Down">Front Bangs Down</string>
+<string name="Front Bangs Up">Front Bangs Up</string>
+<string name="Front Fringe">Front Fringe</string>
+<string name="Front Hair">Front Hair</string>
+<string name="Front Hair Down">Front Hair Down</string>
+<string name="Front Hair Up">Front Hair Up</string>
+<string name="Full Back">Full Back</string>
+<string name="Full Eyeliner">Full Eyeliner</string>
+<string name="Full Front">Full Front</string>
+<string name="Full Hair Sides">Full Hair Sides</string>
+<string name="Full Sides">Full Sides</string>
+<string name="Glossy">Glossy</string>
+<string name="Glove Fingers">Glove Fingers</string>
+<string name="Glove Fingers bump">Glove Fingers bump</string>
+<string name="Glove Length">Glove Length</string>
+<string name="Glove Length bump">Glove Length bump</string>
+<string name="HEAD">HEAD</string>
+<string name="Hair">Hair</string>
+<string name="Hair Back">Hair Back</string>
+<string name="Hair Front">Hair Front</string>
+<string name="Hair Sides">Hair Sides</string>
+<string name="Hair Sweep">Hair Sweep</string>
+<string name="Hair Thickess">Hair Thickess</string>
+<string name="Hair Thickness">Hair Thickness</string>
+<string name="Hair Tilt">Hair Tilt</string>
+<string name="Hair Tilted Left">Hair Tilted Left</string>
+<string name="Hair Tilted Right">Hair Tilted Right</string>
+<string name="Hair Volume">Hair Volume</string>
+<string name="Hand Size">Hand Size</string>
+<string name="Handlebars">Handlebars</string>
+<string name="Head Length">Head Length</string>
+<string name="Head Shape">Head Shape</string>
+<string name="Head Size">Head Size</string>
+<string name="Head Stretch">Head Stretch</string>
+<string name="Heel Height">Heel Height</string>
+<string name="Heel Shape">Heel Shape</string>
+<string name="Height">Height</string>
+<string name="High">High</string>
+<string name="High Heels">High Heels</string>
+<string name="High Jaw">High Jaw</string>
+<string name="High Platforms">High Platforms</string>
+<string name="High and Tight">High and Tight</string>
+<string name="Higher">Higher</string>
+<string name="Hip Length">Hip Length</string>
+<string name="Hip Width">Hip Width</string>
+<string name="In">In</string>
+<string name="In Shdw Color">In Shdw Color</string>
+<string name="In Shdw Opacity">In Shdw Opacity</string>
+<string name="Inner Eye Corner">Inner Eye Corner</string>
+<string name="Inner Eye Shadow">Inner Eye Shadow</string>
+<string name="Inner Shadow">Inner Shadow</string>
+<string name="Jacket Collar Back bump">Jacket Collar Back bump</string>
+<string name="Jacket Collar Front bump">Jacket Collar Front bump</string>
+<string name="Jacket Length">Jacket Length</string>
+<string name="Jacket Sleeve Length bump">Jacket Sleeve Length bump</string>
+<string name="Jacket Wrinkles">Jacket Wrinkles</string>
+<string name="Jaw Angle">Jaw Angle</string>
+<string name="Jaw Jut">Jaw Jut</string>
+<string name="Jaw Shape">Jaw Shape</string>
+<string name="Join">Join</string>
+<string name="Jowls">Jowls</string>
+<string name="Knee Angle">Knee Angle</string>
+<string name="Knock Kneed">Knock Kneed</string>
+<string name="L Forearm">L Forearm</string>
+<string name="L Lower Leg">L Lower Leg</string>
+<string name="L Upper Arm">L Upper Arm</string>
+<string name="L Upper Leg">L Upper Leg</string>
+
+<string name="Large">Large</string>
+<string name="Large Hands">Large Hands</string>
+<string name="Left">Left</string>
+<string name="Left Ear">Left Ear</string>
+<string name="Left Eyeball">Left Eyeball</string>
+<string name="Left Foot">Left Foot</string>
+<string name="Left Hand">Left Hand</string>
+<string name="Left Hip">Left Hip</string>
+<string name="Left Part">Left Part</string>
+<string name="Left Pec">Left Pec</string>
+<string name="Left Shoulder">Left Shoulder</string>
+<string name="Leg Length">Leg Length</string>
+<string name="Leg Muscles">Leg Muscles</string>
+<string name="Less">Less</string>
+<string name="Less Body Fat">Less Body Fat</string>
+<string name="Less Curtains">Less Curtains</string>
+<string name="Less Freckles">Less Freckles</string>
+<string name="Less Full">Less Full</string>
+<string name="Less Gravity">Less Gravity</string>
+<string name="Less Love">Less Love</string>
+<string name="Less Muscles">Less Muscles</string>
+<string name="Less Muscular">Less Muscular</string>
+<string name="Less Rosy">Less Rosy</string>
+<string name="Less Round">Less Round</string>
+<string name="Less Saddle">Less Saddle</string>
+<string name="Less Square">Less Square</string>
+<string name="Less Volume">Less Volume</string>
+<string name="Less soul">Less soul</string>
+<string name="Light">Light</string>
+<string name="Lighter">Lighter</string>
+<string name="Lip Cleft">Lip Cleft</string>
+<string name="Lip Cleft Depth">Lip Cleft Depth</string>
+<string name="Lip Fullness">Lip Fullness</string>
+<string name="Lip Pinkness">Lip Pinkness</string>
+<string name="Lip Ratio">Lip Ratio</string>
+<string name="Lip Thickness">Lip Thickness</string>
+<string name="Lip Width">Lip Width</string>
+<string name="Lipgloss">Lipgloss</string>
+<string name="Lipstick">Lipstick</string>
+<string name="Lipstick Color">Lipstick Color</string>
+<string name="Long">Long</string>
+<string name="Long Head">Long Head</string>
+<string name="Long Hips">Long Hips</string>
+<string name="Long Legs">Long Legs</string>
+<string name="Long Neck">Long Neck</string>
+<string name="Long Pigtails">Long Pigtails</string>
+<string name="Long Ponytail">Long Ponytail</string>
+<string name="Long Torso">Long Torso</string>
+<string name="Long arms">Long arms</string>
+<string name="Longcuffs">Longcuffs</string>
+<string name="Loose Lower Clothing">Loose Lower Clothing</string>
+<string name="Loose Pants">Loose Pants</string>
+<string name="Loose Shirt">Loose Shirt</string>
+<string name="Loose Sleeves">Loose Sleeves</string>
+<string name="Loose Upper Clothing">Loose Upper Clothing</string>
+<string name="Love Handles">Love Handles</string>
+<string name="Low">Low</string>
+<string name="Low Heels">Low Heels</string>
+<string name="Low Jaw">Low Jaw</string>
+<string name="Low Platforms">Low Platforms</string>
+<string name="Low and Loose">Low and Loose</string>
+<string name="Lower">Lower</string>
+<string name="Lower Bridge">Lower Bridge</string>
+<string name="Lower Cheeks">Lower Cheeks</string>
+<string name="Lower Clothes Shading">Lower Clothes Shading</string>
+<string name="Male">Male</string>
+<string name="Middle Part">Middle Part</string>
+<string name="More">More</string>
+<string name="More Blush">More Blush</string>
+<string name="More Body Fat">More Body Fat</string>
+<string name="More Curtains">More Curtains</string>
+<string name="More Eyeshadow">More Eyeshadow</string>
+<string name="More Freckles">More Freckles</string>
+<string name="More Full">More Full</string>
+<string name="More Gravity">More Gravity</string>
+<string name="More Lipstick">More Lipstick</string>
+<string name="More Love">More Love</string>
+<string name="More Lower Lip">More Lower Lip</string>
+<string name="More Muscles">More Muscles</string>
+<string name="More Muscular">More Muscular</string>
+<string name="More Rosy">More Rosy</string>
+<string name="More Round">More Round</string>
+<string name="More Saddle">More Saddle</string>
+<string name="More Sloped">More Sloped</string>
+<string name="More Square">More Square</string>
+<string name="More Upper Lip">More Upper Lip</string>
+<string name="More Vertical">More Vertical</string>
+<string name="More Volume">More Volume</string>
+<string name="More soul">More soul</string>
+<string name="Moustache">Moustache</string>
+<string name="Moustache bump">Moustache bump</string>
+<string name="Mouth">Mouth</string>
+<string name="Mouth Corner">Mouth Corner</string>
+<string name="Mouth Position">Mouth Position</string>
+<string name="Mowhawk">Mowhawk</string>
+<string name="Muscular">Muscular</string>
+<string name="Mutton Chops">Mutton Chops</string>
+<string name="NECK">NECK</string>
+<string name="Nail Polish">Nail Polish</string>
+<string name="Nail Polish Color">Nail Polish Color</string>
+<string name="Narrow">Narrow</string>
+<string name="Narrow Back">Narrow Back</string>
+<string name="Narrow Front">Narrow Front</string>
+<string name="Narrow Lips">Narrow Lips</string>
+<string name="Natural">Natural</string>
+<string name="Neck Length">Neck Length</string>
+<string name="Neck Thickness">Neck Thickness</string>
+<string name="No Blush">No Blush</string>
+<string name="No Eyeliner">No Eyeliner</string>
+<string name="No Eyeshadow">No Eyeshadow</string>
+<string name="No Heels">No Heels</string>
+<string name="No Lipgloss">No Lipgloss</string>
+<string name="No Lipstick">No Lipstick</string>
+<string name="No Part">No Part</string>
+<string name="No Polish">No Polish</string>
+<string name="No Red">No Red</string>
+<string name="No Spikes">No Spikes</string>
+<string name="No White">No White</string>
+<string name="No Wrinkles">No Wrinkles</string>
+<string name="None">None</string>
+<string name="Normal Lower">Normal Lower</string>
+<string name="Normal Upper">Normal Upper</string>
+<string name="Nose">Nose</string>
+<string name="Nose Left">Nose Left</string>
+<string name="Nose Right">Nose Right</string>
+<string name="Nose Size">Nose Size</string>
+<string name="Nose Thickness">Nose Thickness</string>
+<string name="Nose Tip Angle">Nose Tip Angle</string>
+<string name="Nose Tip Shape">Nose Tip Shape</string>
+<string name="Nose Width">Nose Width</string>
+<string name="Nostril Division">Nostril Division</string>
+<string name="Nostril Width">Nostril Width</string>
+<string name="NotHair">NotHair</string>
+<string name="Old">Old</string>
+<string name="Opaque">Opaque</string>
+<string name="Open">Open</string>
+<string name="Open Back">Open Back</string>
+<string name="Open Front">Open Front</string>
+<string name="Open Left">Open Left</string>
+<string name="Open Right">Open Right</string>
+<string name="Orange">Orange</string>
+<string name="Out">Out</string>
+<string name="Out Shdw Color">Out Shdw Color</string>
+<string name="Out Shdw Opacity">Out Shdw Opacity</string>
+<string name="Outer Eye Corner">Outer Eye Corner</string>
+<string name="Outer Eye Shadow">Outer Eye Shadow</string>
+<string name="Outer Shadow">Outer Shadow</string>
+<string name="Overbite">Overbite</string>
+<string name="PELVIS">PELVIS</string>
+<string name="Package">Package</string>
+<string name="Painted Nails">Painted Nails</string>
+<string name="Pale">Pale</string>
+<string name="Pants Crotch">Pants Crotch</string>
+<string name="Pants Fit">Pants Fit</string>
+<string name="Pants Length">Pants Length</string>
+<string name="Pants Length Cloth">Pants Length Cloth</string>
+<string name="Pants Length Shadow">Pants Length Shadow</string>
+<string name="Pants Waist">Pants Waist</string>
+<string name="Pants Wrinkles">Pants Wrinkles</string>
+<string name="Part">Part</string>
+<string name="Part Bangs">Part Bangs</string>
+<string name="Pectorals">Pectorals</string>
+<string name="Pelvis">Pelvis</string>
+<string name="Pigment">Pigment</string>
+<string name="Pigtails">Pigtails</string>
+<string name="Pink">Pink</string>
+<string name="Pinker">Pinker</string>
+<string name="Platform Height">Platform Height</string>
+<string name="Platform Width">Platform Width</string>
+<string name="Pointy">Pointy</string>
+<string name="Pointy Heels">Pointy Heels</string>
+<string name="Pointy Toe">Pointy Toe</string>
+<string name="Ponytail">Ponytail</string>
+<string name="Poofy Skirt">Poofy Skirt</string>
+<string name="Pop Left Eye">Pop Left Eye</string>
+<string name="Pop Right Eye">Pop Right Eye</string>
+<string name="Puffy">Puffy</string>
+<string name="Puffy Eyelids">Puffy Eyelids</string>
+<string name="R Forearm">R Forearm</string>
+<string name="R Lower Leg">R Lower Leg</string>
+<string name="R Upper Arm">R Upper Arm</string>
+<string name="R Upper Leg">R Upper Leg</string>
+<string name="Rainbow Color">Rainbow Color</string>
+<string name="Red Hair">Red Hair</string>
+<string name="Red Skin">Red Skin</string>
+<string name="Regular">Regular</string>
+<string name="Regular Muscles">Regular Muscles</string>
+<string name="Right">Right</string>
+<string name="Right Ear">Right Ear</string>
+<string name="Right Eyeball">Right Eyeball</string>
+<string name="Right Foot">Right Foot</string>
+<string name="Right Hand">Right Hand</string>
+<string name="Right Hip">Right Hip</string>
+<string name="Right Part">Right Part</string>
+<string name="Right Pec">Right Pec</string>
+<string name="Right Shoulder">Right Shoulder</string>
+<string name="Rosy Complexion">Rosy Complexion</string>
+<string name="Round">Round</string>
+<string name="Round Forehead">Round Forehead</string>
+<string name="Ruddiness">Ruddiness</string>
+<string name="Ruddy">Ruddy</string>
+<string name="Rumpled Hair">Rumpled Hair</string>
+<string name="Saddle Bags">Saddle Bags</string>
+<string name="Saddlebags">Saddlebags</string>
+<string name="Scrawny">Scrawny</string>
+<string name="Scrawny Leg">Scrawny Leg</string>
+<string name="Separate">Separate</string>
+<string name="Shading">Shading</string>
+<string name="Shadow hair">Shadow hair</string>
+<string name="Shallow">Shallow</string>
+<string name="Shear Back">Shear Back</string>
+<string name="Shear Face">Shear Face</string>
+<string name="Shear Front">Shear Front</string>
+<string name="Shear Left">Shear Left</string>
+<string name="Shear Left Up">Shear Left Up</string>
+<string name="Shear Right">Shear Right</string>
+<string name="Shear Right Up">Shear Right Up</string>
+<string name="Sheared Back">Sheared Back</string>
+<string name="Sheared Front">Sheared Front</string>
+<string name="Shift Left">Shift Left</string>
+<string name="Shift Mouth">Shift Mouth</string>
+<string name="Shift Right">Shift Right</string>
+<string name="Shirt Bottom">Shirt Bottom</string>
+<string name="Shirt Bottom Cloth">Shirt Bottom Cloth</string>
+<string name="Shirt Fit">Shirt Fit</string>
+<string name="Shirt Shadow Bottom">Shirt Shadow Bottom</string>
+<string name="Shirt Wrinkles">Shirt Wrinkles</string>
+<string name="Shoe Height">Shoe Height</string>
+<string name="Shoe Height bump">Shoe Height bump</string>
+<string name="Short">Short</string>
+<string name="Short Arms">Short Arms</string>
+<string name="Short Legs">Short Legs</string>
+<string name="Short Neck">Short Neck</string>
+<string name="Short Pigtails">Short Pigtails</string>
+<string name="Short Ponytail">Short Ponytail</string>
+<string name="Short Sideburns">Short Sideburns</string>
+<string name="Short Torso">Short Torso</string>
+<string name="Short hips">Short hips</string>
+<string name="Shoulders">Shoulders</string>
+<string name="Side Bangs">Side Bangs</string>
+<string name="Side Bangs Down">Side Bangs Down</string>
+<string name="Side Bangs Up">Side Bangs Up</string>
+<string name="Side Fringe">Side Fringe</string>
+<string name="Sideburns">Sideburns</string>
+<string name="Sideburns bump">Sideburns bump</string>
+<string name="Sides Hair">Sides Hair</string>
+<string name="Sides Hair Down">Sides Hair Down</string>
+<string name="Sides Hair Up">Sides Hair Up</string>
+<string name="Skinny">Skinny</string>
+<string name="Skinny Neck">Skinny Neck</string>
+<string name="Skirt Fit">Skirt Fit</string>
+<string name="Skirt Length">Skirt Length</string>
+<string name="Skull">Skull</string>
+<string name="Slanted Forehead">Slanted Forehead</string>
+<string name="Sleeve Length">Sleeve Length</string>
+<string name="Sleeve Length Cloth">Sleeve Length Cloth</string>
+<string name="Sleeve Length Shadow">Sleeve Length Shadow</string>
+<string name="Sleeve Length bump">Sleeve Length bump</string>
+<string name="Sleeve Looseness">Sleeve Looseness</string>
+<string name="Slit Back">Slit Back</string>
+<string name="Slit Front">Slit Front</string>
+<string name="Slit Left">Slit Left</string>
+<string name="Slit Right">Slit Right</string>
+<string name="Small">Small</string>
+<string name="Small Hands">Small Hands</string>
+<string name="Small Head">Small Head</string>
+<string name="Smooth">Smooth</string>
+<string name="Smooth Hair">Smooth Hair</string>
+<string name="Socks Length">Socks Length</string>
+<string name="Socks Length bump">Socks Length bump</string>
+<string name="Some">Some</string>
+<string name="Soulpatch">Soulpatch</string>
+<string name="Soulpatch bump">Soulpatch bump</string>
+<string name="Sparse">Sparse</string>
+<string name="Spiked Hair">Spiked Hair</string>
+<string name="Spine">Spine</string>
+<string name="Square">Square</string>
+<string name="Square Toe">Square Toe</string>
+<string name="Squash Head">Squash Head</string>
+<string name="Squash/Stretch Head">Squash/Stretch Head</string>
+<string name="Stomach">Stomach</string>
+<string name="Stretch Head">Stretch Head</string>
+<string name="Sunken">Sunken</string>
+<string name="Sunken Chest">Sunken Chest</string>
+<string name="Sunken Eyes">Sunken Eyes</string>
+<string name="Sweep Back">Sweep Back</string>
+<string name="Sweep Forward">Sweep Forward</string>
+<string name="Swept Back">Swept Back</string>
+<string name="Swept Back Hair">Swept Back Hair</string>
+<string name="Swept Forward">Swept Forward</string>
+<string name="Swept Forward Hair">Swept Forward Hair</string>
+<string name="Tall">Tall</string>
+<string name="Taper Back">Taper Back</string>
+<string name="Taper Front">Taper Front</string>
+<string name="Thick Heels">Thick Heels</string>
+<string name="Thick Neck">Thick Neck</string>
+<string name="Thick Toe">Thick Toe</string>
+<string name="Thickness">Thickness</string>
+<string name="Thin">Thin</string>
+<string name="Thin Eyebrows">Thin Eyebrows</string>
+<string name="Thin Lips">Thin Lips</string>
+<string name="Thin Nose">Thin Nose</string>
+<string name="Tight Chin">Tight Chin</string>
+<string name="Tight Cuffs">Tight Cuffs</string>
+<string name="Tight Pants">Tight Pants</string>
+<string name="Tight Shirt">Tight Shirt</string>
+<string name="Tight Skirt">Tight Skirt</string>
+<string name="Tight Sleeves">Tight Sleeves</string>
+<string name="Tilt Left">Tilt Left</string>
+<string name="Tilt Right">Tilt Right</string>
+<string name="Toe Shape">Toe Shape</string>
+<string name="Toe Thickness">Toe Thickness</string>
+<string name="Top">Top</string>
+<string name="Top Left">Top Left</string>
+<string name="Top Right">Top Right</string>
+<string name="Torso Length">Torso Length</string>
+<string name="Torso Muscles">Torso Muscles</string>
+<string name="Torso Scrawny">Torso Scrawny</string>
+<string name="Unattached">Unattached</string>
+<string name="Uncreased">Uncreased</string>
+<string name="Underbite">Underbite</string>
+<string name="Unnatural">Unnatural</string>
+<string name="Upper Bridge">Upper Bridge</string>
+<string name="Upper Cheeks">Upper Cheeks</string>
+<string name="Upper Chin Cleft">Upper Chin Cleft</string>
+<string name="Upper Clothes Shading">Upper Clothes Shading</string>
+<string name="Upper Eyelid Fold">Upper Eyelid Fold</string>
+<string name="Upturned">Upturned</string>
+<string name="Very Red">Very Red</string>
+<string name="Waist Height">Waist Height</string>
+<string name="Waist Height Cloth">Waist Height Cloth</string>
+<string name="Waist Height Shadow">Waist Height Shadow</string>
+<string name="Well-Fed">Well-Fed</string>
+<string name="White Hair">White Hair</string>
+<string name="Wide">Wide</string>
+<string name="Wide Back">Wide Back</string>
+<string name="Wide Front">Wide Front</string>
+<string name="Wide Lips">Wide Lips</string>
+<string name="Wild">Wild</string>
+<string name="Wrinkles">Wrinkles</string>
 	
     <!-- Favorites Bar -->
     <string name="location_ctrl_add_landmark">Add to My Landmarks</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
index d7369d0726..0dbca318b6 100644
--- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
@@ -20,7 +20,9 @@
                               image_unselected="DropDown_Off"
                               image_selected="DropDown_Selected"
                               image_disabled="DropDown_Disabled" />
-  <combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" />
+  <combo_box.combo_list bg_writeable_color="MenuDefaultBgColor"
+                        background_visible="true"
+                         />
   <combo_box.combo_editor name="Combo Text Entry"
                           select_on_focus="true"
                           font="SansSerifSmall" />
diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
index bcfc2f6472..6381dce1d6 100644
--- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
+++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
@@ -2,6 +2,7 @@
 <expandable_text
  max_height="300" >
  <textbox
+   more_label="More" 
   follows="left|top"
   name="text"
   use_ellipses="true"
@@ -9,16 +10,6 @@
   tab_stop="true"
   v_pad="2"
   h_pad="3" >
-  <expand_textbox 
-   name="expand"
-   follows="bottom|right"
-   visible="false"
-   bg_visible="false"
-   tab_stop="false"
-   v_pad="0"
-   h_pad="0"
-   text="[http://www.DUMMY.com More]" 
-   tool_tip="Click to expand text"/>
  </textbox>
  <scroll
   name="scroll"
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
index 824a815a99..4520768216 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
@@ -12,7 +12,7 @@
              draw_stripes="true"
              scroll_bar_bg_visible="false"
              scroll_bar_bg_color="black"
-             background_visible="false"
+             background_visible="true"
              heading_height="23"
              draw_border="false"
              draw_heading="false" />
diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml
index 7d78a8fa20..5914c21b2b 100644
--- a/indra/newview/skins/default/xui/en/widgets/text.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <text allow_html="true"
       clip_to_rect="false"
+      mouse_opaque="false" 
       name="text_box" 
       font="SansSerifSmall"
       font_shadow="soft" 
@@ -17,4 +18,5 @@
       border_visible="false" 
       hover="false" 
       text_color="LabelTextColor"
-      v_pad="-1"/>
+      v_pad="-1"
+      max_length="4096"/>
diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml
index 0246f0d440..3aeb4e5771 100644
--- a/indra/newview/skins/default/xui/es/floater_camera.xml
+++ b/indra/newview/skins/default/xui/es/floater_camera.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move floater" title="">
-	<string name="rotate_tooltip">
+<floater name="camera_floater" title="">
+	<floater.string name="rotate_tooltip">
 		Girar la cámara alrededor de lo enfocado
-	</string>
-	<string name="zoom_tooltip">
+	</floater.string>
+	<floater.string name="zoom_tooltip">
 		Hacer zoom con la cámara en lo enfocado
-	</string>
-	<string name="move_tooltip">
-		Mover la cámara arriba y abajo, izquierda y derecha.
-	</string>
+	</floater.string>
+	<floater.string name="move_tooltip">
+		Mover la cámara arriba y abajo, izquierda y derecha
+	</floater.string>
+	<panel name="controls">
+		<joystick_track name="cam_track_stick" tool_tip="Mover la cámara arriba y abajo, izquierda y derecha"/>
+		<joystick_zoom name="zoom" tool_tip="Hacer zoom con la cámara en lo enfocado"/>
+	</panel>
 </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 c220c48cb0..616c373d18 100644
--- a/indra/newview/skins/default/xui/es/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/es/floater_color_picker.xml
@@ -26,6 +26,6 @@
 	</text>
 	<text name="(Drag below to save.)">
 		(Arrástrelo abajo
- para guardarlo.)
+ para guardarlo)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml
index 9f280b7265..8ea640853f 100644
--- a/indra/newview/skins/default/xui/fr/floater_camera.xml
+++ b/indra/newview/skins/default/xui/fr/floater_camera.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater">
-	<string name="rotate_tooltip">
+<floater name="camera_floater">
+	<floater.string name="rotate_tooltip">
 		Faire tourner la caméra autour du point central
-	</string>
-	<string name="zoom_tooltip">
+	</floater.string>
+	<floater.string name="zoom_tooltip">
 		Zoomer en direction du point central
-	</string>
-	<string name="move_tooltip">
+	</floater.string>
+	<floater.string name="move_tooltip">
 		Déplacer la caméra vers le haut et le bas, la gauche et la droite
-	</string>
+	</floater.string>
+	<panel name="controls">
+		<joystick_track name="cam_track_stick" tool_tip="Déplacer la caméra vers le haut et le bas, la gauche et la droite"/>
+		<joystick_zoom name="zoom" tool_tip="Zoomer en direction du point central"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_color_picker.xml b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
index adab86dac0..94bcad070e 100644
--- a/indra/newview/skins/default/xui/fr/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
@@ -27,6 +27,6 @@
 	</text>
 	<text left="8" name="(Drag below to save.)" width="114">
 		(Faire glisser dessous
-pour enregistrer.)
+pour enregistrer)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_camera.xml b/indra/newview/skins/default/xui/it/floater_camera.xml
index 9655ed2211..823be8f4a1 100644
--- a/indra/newview/skins/default/xui/it/floater_camera.xml
+++ b/indra/newview/skins/default/xui/it/floater_camera.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move floater" title="">
-	<string name="rotate_tooltip">
+<floater name="camera_floater" title="">
+	<floater.string name="rotate_tooltip">
 		Ruota la telecamera Intorno all&apos;Inquadratura
-	</string>
-	<string name="zoom_tooltip">
+	</floater.string>
+	<floater.string name="zoom_tooltip">
 		Avvicina la telecamera nell&apos;inquadratura
-	</string>
-	<string name="move_tooltip">
+	</floater.string>
+	<floater.string name="move_tooltip">
 		Muovi la telecamera su e giù e a sinistra e destra
-	</string>
+	</floater.string>
+	<panel name="controls">
+		<joystick_track name="cam_track_stick" tool_tip="Muovi la telecamera su e giù e a sinistra e destra"/>
+		<joystick_zoom name="zoom" tool_tip="Avvicina la telecamera nell&apos;inquadratura"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_color_picker.xml b/indra/newview/skins/default/xui/it/floater_color_picker.xml
index 93188c29ac..1e6d7bc3f0 100644
--- a/indra/newview/skins/default/xui/it/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/it/floater_color_picker.xml
@@ -33,6 +33,6 @@
 	</text>
 	<text name="(Drag below to save.)">
 		(Trascina qui sotto
- per salvare.)
+ per salvare)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml
index 46e7b1990d..bb87b194a4 100644
--- a/indra/newview/skins/default/xui/ja/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater">
-	<string name="rotate_tooltip">
+<floater name="camera_floater">
+	<floater.string name="rotate_tooltip">
 		フォーカスを中心にカメラを回転
-	</string>
-	<string name="zoom_tooltip">
+	</floater.string>
+	<floater.string name="zoom_tooltip">
 		フォーカスに向けてカメラをズーム
-	</string>
-	<string name="move_tooltip">
+	</floater.string>
+	<floater.string name="move_tooltip">
 		カメラを上下左右に移動
-	</string>
+	</floater.string>
+	<panel name="controls">
+		<joystick_track name="cam_track_stick" tool_tip="カメラを上下左右に移動"/>
+		<joystick_zoom name="zoom" tool_tip="フォーカスに向けてカメラをズーム"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_camera.xml b/indra/newview/skins/default/xui/nl/floater_camera.xml
index a6b843a0a2..81a3ed8a58 100644
--- a/indra/newview/skins/default/xui/nl/floater_camera.xml
+++ b/indra/newview/skins/default/xui/nl/floater_camera.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move floater" title="">
-	<string name="rotate_tooltip">
+<floater name="camera_floater" title="">
+	<floater.string name="rotate_tooltip">
 		Roteer camera rond focus
-	</string>
-	<string name="zoom_tooltip">
+	</floater.string>
+	<floater.string name="zoom_tooltip">
 		Zoom camera naar focus
-	</string>
-	<string name="move_tooltip">
+	</floater.string>
+	<floater.string name="move_tooltip">
 		Beweeg camera omhoog en omlaag, links en rechts
-	</string>
+	</floater.string>
+	<panel name="controls">
+		<joystick_track name="cam_track_stick" tool_tip="Beweeg camera omhoog en omlaag, links en rechts"/>
+		<joystick_zoom name="zoom" tool_tip="Zoom camera naar focus"/>
+	</panel>
 </floater>
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 25294e17e2..a357e874f7 100644
--- a/indra/newview/skins/default/xui/nl/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/nl/floater_color_picker.xml
@@ -26,6 +26,6 @@
 	</text>
 	<text name="(Drag below to save.)">
 		(Sleep naar beneden 
- om op te slaan.)
+ om op te slaan)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml
index 24da91c081..5957018144 100755
--- a/indra/newview/skins/default/xui/pl/floater_camera.xml
+++ b/indra/newview/skins/default/xui/pl/floater_camera.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater" title="">
-	<string name="rotate_tooltip">
+<floater name="camera_floater" title="">
+	<floater.string name="rotate_tooltip">
 		Obracaj kamerę wokół obiektu
-	</string>
-	<string name="zoom_tooltip">
+	</floater.string>
+	<floater.string name="zoom_tooltip">
 		Najedź kamerą w kierunku obiektu
-	</string>
-	<string name="move_tooltip">
+	</floater.string>
+	<floater.string name="move_tooltip">
 		Poruszaj kamerą w dół/górę oraz w prawo/lewo
-	</string>
+	</floater.string>
+	<panel name="controls">
+		<joystick_track name="cam_track_stick" tool_tip="Poruszaj kamerą w dół/górę oraz w prawo/lewo"/>
+		<joystick_zoom name="zoom" tool_tip="Najedź kamerą w kierunku obiektu"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
index a380423cdf..d6ffe1837a 100755
--- a/indra/newview/skins/default/xui/pl/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
@@ -26,6 +26,6 @@
 		Obecny Kolor:
 	</text>
 	<text name="(Drag below to save.)">
-		(Przeciągnij tutaj.)
+		(Przeciągnij tutaj)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_camera.xml b/indra/newview/skins/default/xui/pt/floater_camera.xml
index 4dc6997606..b61e261148 100644
--- a/indra/newview/skins/default/xui/pt/floater_camera.xml
+++ b/indra/newview/skins/default/xui/pt/floater_camera.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move floater" title="">
-	<string name="rotate_tooltip">
+<floater name="camera_floater" title="">
+	<floater.string name="rotate_tooltip">
 		Girar a Câmera ao redor do Foco
-	</string>
-	<string name="zoom_tooltip">
+	</floater.string>
+	<floater.string name="zoom_tooltip">
 		Aproximar a Câmera in direção ao Foco
-	</string>
-	<string name="move_tooltip">
-		Mover a Câmera Para Cima e Para Baixo, Para a Esquerda e Para a Direita
-	</string>
+	</floater.string>
+	<floater.string name="move_tooltip">
+		Mover a Câmera para Cima e para Baixo, para a Esquerda e para a Direita
+	</floater.string>
+	<panel name="controls">
+		<joystick_track name="cam_track_stick" tool_tip="Mover a Câmera para Cima e para Baixo, para a Esquerda e para a Direita"/>
+		<joystick_zoom name="zoom" tool_tip="Aproximar a Câmera in direção ao Foco"/>
+	</panel>
 </floater>
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 95dd53ccd4..76da972b5d 100644
--- a/indra/newview/skins/default/xui/pt/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
@@ -27,6 +27,6 @@
 	</text>
 	<text name="(Drag below to save.)">
 		(Arraste abaixo
- para salvar.)
+ para salvar)
 	</text>
 </floater>