merge from PE's viewer-trunk

18 files changed, 140 insertions, 125 deletions

diff --git a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
index 54a8a43edf..837dfa9e8c 100644
--- a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
@@ -66,7 +66,7 @@
 				Key-Zeit:
 			</text>
 			<spinner label="Std." name="WLCurKeyHour" />
-			<spinner label="Min." name="WLCurKeyMin" label_width="100" width="66"/>
+			<spinner label="Min." name="WLCurKeyMin"/>
 			<text name="WLCurKeyTimeText2">
 				Key-Voreinstellung:
 			</text>
@@ -79,8 +79,8 @@
 				Zykluslänge:
 			</text>
 			<spinner label="Std." name="WLLengthOfDayHour" />
-			<spinner label="Min." name="WLLengthOfDayMin" label_width="100" width="66"/>
-			<spinner label="Sek." name="WLLengthOfDaySec" label_width="100" width="66"/>
+			<spinner label="Min." name="WLLengthOfDayMin"/>
+			<spinner label="Sek." name="WLLengthOfDaySec"/>
 			<text name="DayCycleText3">
 				Vorschau:
 			</text>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index fd05f02ceb..b3aeb8cd68 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -3577,4 +3577,7 @@ Missbrauchsbericht
 	<string name="Contents">
 		Inhalt
 	</string>
+    <string name="AvatarBirthDateFormat">
+        [day,datetime,slt]/[mthnum,datetime,slt]/[year,datetime,slt]
+    </string>
 </strings>
diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml
index 2fa112af8c..421f3a72c6 100644
--- a/indra/newview/skins/default/xui/en/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml
@@ -213,7 +213,8 @@
      left="10"
      name="(Drag below to save.)"
      top_pad="66"
-     width="130">
+     width="130"
+     wrap="true">
         (Drag below to save)
     </text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
index 2c0c8d45b3..42a9ff551e 100644
--- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
@@ -7,7 +7,7 @@
  help_topic="day_cycle_floater"
  save_rect="true"
  title="DAY CYCLE EDITOR"
- width="646">
+ width="658">
     <tab_container
      follows="left|top"
      height="255"
@@ -16,7 +16,7 @@
      name="Day Cycle Tabs"
      tab_position="top"
      top="20"
-     width="644">
+     width="656">
         <panel
          border="true"
          follows="left|top|right|bottom"
@@ -27,7 +27,7 @@
          mouse_opaque="false"
          name="Day Cycle"
          top="0"
-         width="642">
+         width="654">
             <multi_slider
              can_edit_text="true"
              control_name="WLTimeSlider"
@@ -313,7 +313,7 @@
              left="555"
              name="WLAddKey"
              top="30"
-             width="80" />
+             width="96" />
             <button
              height="20"
              label="Delete Key"
@@ -322,7 +322,7 @@
              left_delta="0"
              name="WLDeleteKey"
              top_pad="5"
-             width="80" />
+             width="96" />
             <text
              type="string"
              length="1"
@@ -348,7 +348,7 @@
              left="30"
              name="WLCurKeyTimeText"
              top="124"
-             width="100">
+             width="105">
                 Key Time:
             </text>
             <spinner
@@ -361,11 +361,11 @@
              label="Hour"
              label_width="30"
              layout="topleft"
-             left_delta="0"
+             left_delta="25"
              max_val="100"
              name="WLCurKeyHour"
              top_pad="4"
-             width="70" />
+             width="74" />
             <spinner
              control_name="WLCurKeyMin"
              decimal_digits="0"
@@ -402,7 +402,7 @@
              left_delta="0"
              name="WLKeyPresets"
              top_pad="7"
-             width="155" />
+             width="205" />
             <view_border
              bevel_style="none"
              follows="top|left"
@@ -410,7 +410,7 @@
              layout="topleft"
              left="12"
              top="101"
-             width="190" />
+             width="240" />
             <text
              type="string"
              length="1"
@@ -419,7 +419,7 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left="220"
+             left_pad="15"
              name="DayCycleText"
              top="114"
              width="120">
@@ -444,7 +444,7 @@
              layout="topleft"
              left_delta="0"
              name="DayCycleText2"
-             top_pad="9"
+             top_pad="17"
              width="120">
                 Length of Cycle:
             </text>
@@ -462,7 +462,7 @@
              max_val="100"
              name="WLLengthOfDayHour"
              top_pad="4"
-             width="70" />
+             width="74" />
             <spinner
              control_name="WLLengthOfDayMin"
              decimal_digits="0"
@@ -492,57 +492,58 @@
              max_val="59"
              name="WLLengthOfDaySec"
              top_delta="0"
-             width="60" />
+             width="60"/>
             <text
              type="string"
+             halign="right"
              length="1"
              border_visible="true"
              follows="left|top|right"
              font="SansSerif"
              height="16"
              layout="topleft"
-             left="310"
+             left_delta="-23"
              name="DayCycleText3"
              top="114"
-             width="120">
-                Preview:
+             width="85">
+                Preview :
             </text>
             <button
              height="20"
              label="Play"
              label_selected="Play"
              layout="topleft"
-             left_delta="60"
+             left="480"
              name="WLAnimSky"
              top_pad="5"
-             width="50" />
+             width="83" />
             <button
              height="20"
              label="Stop!"
              label_selected="Stop"
              layout="topleft"
-             left_pad="5"
+             left_pad="4"
              name="WLStopAnimSky"
              top_delta="0"
-             width="50" />
+             width="83" />
             <button
              height="20"
              label="Use Estate Time"
              label_selected="Go to Estate Time"
              layout="topleft"
-             left_pad="5"
+             left="480"
              name="WLUseLindenTime"
-             top_delta="0"
-             width="150" />
+             top_pad="9"
+             width="170" />
             <button
              height="20"
              label="Save Test Day"
              label_selected="Save Test Day"
              layout="topleft"
-             left="480"
+             left_delta="0"
              name="WLSaveDayCycle"
-             top="175"
-             width="150" />
+             top_pad="9"
+             width="170" />
             <button
              height="20"
              label="Load Test Day"
@@ -550,8 +551,8 @@
              layout="topleft"
              left_delta="0"
              name="WLLoadDayCycle"
-             top_pad="5"
-             width="150" />
+             top_pad="3"
+             width="170" />
         </panel>
     </tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 59c7f4ed85..2515b60868 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -30,6 +30,9 @@
      name="View Profile">
         <menu_item_call.on_click
          function="Avatar.Profile" />
+        <menu_item_call.on_enable
+         function="ParticipantList.EnableItem"
+         parameter="can_view_profile" />
     </menu_item_call>
     <menu_item_call
      label="Add Friend"
@@ -153,7 +156,7 @@
          function="ParticipantList.ModerateVoice"
          parameter="selected" />
         <on_enable
-         function="ParticipantList.EnableItem"
+         function="ParticipantList.EnableItem.Moderate"
          parameter="can_moderate_voice" />
     </menu_item_call>
     <menu_item_call
@@ -164,7 +167,7 @@
          function="ParticipantList.ModerateVoice"
          parameter="others" />
         <on_enable
-         function="ParticipantList.EnableItem"
+         function="ParticipantList.EnableItem.Moderate"
          parameter="can_moderate_voice" />
     </menu_item_call>
     <menu_item_call
@@ -175,7 +178,7 @@
          function="ParticipantList.ModerateVoice"
          parameter="selected" />
         <on_enable
-         function="ParticipantList.EnableItem"
+         function="ParticipantList.EnableItem.Moderate"
          parameter="can_moderate_voice" />
     </menu_item_call>
     <menu_item_call
@@ -186,7 +189,7 @@
          function="ParticipantList.ModerateVoice"
          parameter="others" />
         <on_enable
-         function="ParticipantList.EnableItem"
+         function="ParticipantList.EnableItem.Moderate"
          parameter="can_moderate_voice" />
     </menu_item_call>
     </context_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_generic_tip.xml b/indra/newview/skins/default/xui/en/panel_generic_tip.xml
index 453ed7c7a6..eea92895f5 100644
--- a/indra/newview/skins/default/xui/en/panel_generic_tip.xml
+++ b/indra/newview/skins/default/xui/en/panel_generic_tip.xml
@@ -3,7 +3,7 @@
  height="40"
  layout="topleft"
  left="0"
- name="panel_system_tip"
+ name="panel_generic_tip"
  top="0"
  width="305">
     <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 b5c2371510..c5f44cd049 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
@@ -42,10 +42,11 @@
 
   <text 
    bottom_delta="-50" 
+   enabled="false"
    follows="top|left" 
    height="15" 
    left="10" 
-   enabled="false">
+   name="owner_label">
     Owner
   </text>
   
@@ -79,10 +80,11 @@
 
   <text 
    bottom_delta="-36" 
+   enabled="false"
    follows="top|left" 
    height="15" 
    left="10" 
-   enabled="false">
+   name="group_label">
     Group:
   </text>
   
@@ -126,10 +128,11 @@
 
   <text 
    bottom_delta="-36" 
+   enabled="false"
    follows="top|left" 
    height="15" 
    left="10" 
-   enabled="false">
+   name="anyone_label">
     Anyone
   </text>
   
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 8131b75b70..8a4a28e188 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -13,10 +13,10 @@
  width="333">
     <string
      name="no_people"
-     value="No people" />
+     value="No recent people. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." />
     <string
      name="no_one_near"
-     value="No one near" />
+     value="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." />
     <string
      name="no_friends_online"
      value="No friends online" />
@@ -35,10 +35,10 @@
      -->
     <string
      name="no_filtered_groups_msg"
-     value="[secondlife:///app/search/groups Try finding the group in search?]" />
+     value="Didn't find what you're looking for? Try [secondlife:///app/search/groups Search]." />
     <string
      name="no_groups_msg"
-     value="[secondlife:///app/search/groups Try searching for some groups to join.]" />
+     value="Looking for Groups to join? Try [secondlife:///app/search/groups Search]." />
     <filter_editor
      follows="left|top|right"
      height="23"
@@ -264,8 +264,8 @@
              top="10"
              width="293"
              wrap="true">
-                To add friends try [secondlife:///app/search/people global search] or use right-click on a Resident to add them as a friend.
-If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map].
+                Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend.
+Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map].
              </text>
         </panel>
         <panel
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 7ab74855a5..0a56f711dd 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -332,21 +332,21 @@
 		increment="8"
 		initial_value="160"
 		label="Draw distance:"
-		label_width="140"
+		label_width="185"
 		layout="topleft"
-		left="216"
+		left="200"
 		max_val="512"
 		min_val="64"
 		name="DrawDistance"
 		top="3"
-		width="255" />
+		width="296" />
 		<text
 		type="string"
 		length="1"
 		follows="left|top"
 		height="12"
 		layout="topleft"
-		left_delta="250"
+		left_delta="291"
 		name="DrawDistanceMeterText2"
 		top_delta="0"
 		width="128">
@@ -360,13 +360,13 @@
 		increment="256"
 		initial_value="4096"
 		label="Max. particle count:"
-		label_width="140"
+		label_width="185"
 		layout="topleft"
-		left="216"
+		left="200"
 		max_val="8192"
 		name="MaxParticleCount"
 		top_pad="7"
-		width="262" />
+		width="303" />
 		<slider
 		control_name="RenderGlowResolutionPow"
 		decimal_digits="0"
@@ -375,7 +375,7 @@
 		increment="1"
 		initial_value="8"
 		label="Post process quality:"
-		label_width="140"
+		label_width="185"
 		layout="topleft"
 		left_delta="0"
 		max_val="9"
@@ -383,7 +383,7 @@
 		name="RenderPostProcess"
 		show_text="false"
 		top_pad="4"
-		width="223">
+		width="264">
 			<slider.commit_callback
 			function="Pref.UpdateSliderText"
 			parameter="PostProcessText" />
@@ -407,14 +407,14 @@
 		increment="0.125"
 		initial_value="160"
 		label="  Objects:"
-		label_width="140"
+		label_width="185"
 		layout="topleft"
 		left_delta="0"
 		max_val="2"
 		name="ObjectMeshDetail"
 		show_text="false"
 		top_pad="6"
-		width="223">
+		width="264">
 			<slider.commit_callback
 			function="Pref.UpdateSliderText"
 			parameter="ObjectMeshDetailText" />
@@ -425,13 +425,13 @@
 		height="16"
 		initial_value="160"
 		label="  Flexiprims:"
-		label_width="140"
+		label_width="185"
 		layout="topleft"
 		left_delta="0"
 		name="FlexibleMeshDetail"
 		show_text="false"
 		top_pad="4"
-		width="223">
+		width="264">
 			<slider.commit_callback
 			function="Pref.UpdateSliderText"
 			parameter="FlexibleMeshDetailText" />
@@ -443,13 +443,13 @@
         increment="0.125"
         initial_value="160"
         label="  Trees:"
-        label_width="140"
+        label_width="185"
         layout="topleft"
         left_delta="0"
         name="TreeMeshDetail"
         show_text="false"
         top_pad="4"
-        width="223">
+        width="264">
            <slider.commit_callback
             function="Pref.UpdateSliderText"
             parameter="TreeMeshDetailText" />
@@ -461,13 +461,13 @@
         increment="0.125"
         initial_value="160"
         label="  Avatars:"
-        label_width="140"
+        label_width="185"
         layout="topleft"
         left_delta="0"
         name="AvatarMeshDetail"
         show_text="false"
         top_pad="4"
-        width="223">
+        width="264">
            <slider.commit_callback
             function="Pref.UpdateSliderText"
             parameter="AvatarMeshDetailText" />
@@ -479,7 +479,7 @@
         increment="0.125"
         initial_value="160"
         label="  Terrain:"
-        label_width="140"
+        label_width="185"
         layout="topleft"
         left_delta="0"
         max_val="2"
@@ -487,7 +487,7 @@
         name="TerrainMeshDetail"
         show_text="false"
         top_pad="4"
-        width="223">
+        width="264">
            <slider.commit_callback
             function="Pref.UpdateSliderText"
             parameter="TerrainMeshDetailText" />
@@ -501,7 +501,7 @@
         increment="8"
         initial_value="160"
         label="  Sky:"
-        label_width="140"
+        label_width="185"
         layout="topleft"
         left_delta="0"
         max_val="128"
@@ -509,7 +509,7 @@
         name="SkyMeshDetail"
         show_text="false"
         top_pad="4"
-        width="223">
+        width="264">
            <slider.commit_callback
             function="Pref.UpdateSliderText"
             parameter="SkyMeshDetailText" />
@@ -520,7 +520,7 @@
         follows="left|top"
         height="12"
         layout="topleft"
-        left="444"
+        left="469"
         name="PostProcessText"
         top="305"
         width="128">
@@ -605,7 +605,7 @@
         follows="left|top"
         height="12"
         layout="topleft"
-        left_delta="-230"
+        left="200"
         name="LightingDetailText"
         top_pad="8"
         width="140">
@@ -616,15 +616,13 @@
         draw_border="false"
         height="38"
         layout="topleft"
-        left_delta="0"
         name="LightingDetailRadio"
         top_pad="5"
-        width="321">
+        width="200">
            <radio_item
             height="16"
             label="Sun and moon only"
             layout="topleft"
-            left="3"
             name="SunMoon"
             value="0"
             top="3"
@@ -633,7 +631,6 @@
             height="16"
             label="Nearby local lights"
             layout="topleft"
-            left_delta="0"
             name="LocalLights"
             value="1"
             top_delta="16"
@@ -645,7 +642,7 @@
         follows="left|top"
         height="12"
         layout="topleft"
-        left="358"
+        left_pad="-30"
         name="TerrainDetailText"
         top="465"
         width="155">
@@ -659,23 +656,21 @@
         left_delta="0"
         name="TerrainDetailRadio"
         top_pad="5"
-        width="321">
+        width="70">
            <radio_item
             height="16"
             label="Low"
             layout="topleft"
-            left="3"
             name="0"
             top="3"
-            width="315" />
+            width="50" />
            <radio_item
             height="16"
             label="High"
             layout="topleft"
-            left_delta="0"
             name="2"
             top_delta="16"
-            width="315" />
+            width="50" />
         </radio_group>
 	</panel>
 	
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 9186efc431..08e36d5e57 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -2,14 +2,14 @@
 <panel
  border="false"
  follows="top|left"
- height="320"
+ height="510"
  help_topic="panel_region_estate_tab"
  label="Estate"
  layout="topleft"
  left="0"
  name="Estate"
  top="320"
- width="480">
+ width="530">
     <text
      type="string"
      length="1"
@@ -20,7 +20,7 @@
      name="estate_help_text"
      top="14"
      word_wrap="true"
-     width="250">
+     width="300">
         Changes to settings on this tab will affect all regions in the estate.
     </text>
     <text
@@ -82,7 +82,7 @@
      layout="topleft"
      left_delta="-4"
      top_pad="5"
-     width="250" />
+     width="300" />
     <check_box
      height="20"
      label="Use Global Time"
@@ -184,14 +184,14 @@
      layout="topleft"
      name="apply_btn"
      top_pad="10"
-     left="78"
+     left="110"
      width="97" />
     <button
      follows="left|top"
      height="23"
      label="Send Message To Estate..."
      layout="topleft"
-     left="20"
+     left="45"
      name="message_estate_btn"
      top_pad="20"
      width="220" />
@@ -200,7 +200,7 @@
      height="23"
      label="Kick Resident from Estate..."
      layout="topleft"
-     left="20"
+     left="45"
      name="kick_user_from_estate_btn"
      top_pad="5"
      width="220" />
@@ -213,7 +213,7 @@
      height="20"
      layout="topleft"
      name="estate_manager_label"
-     right="470"
+     right="520"
      width="200">
         Estate Managers:
     </text>
@@ -222,7 +222,7 @@
      follows="top|left"
      height="71"
      layout="topleft"
-     right="470"
+     right="520"
      top_pad="-5"
      width="200" />
     <name_list
@@ -240,7 +240,7 @@
      label="Remove..."
      layout="topleft"
      name="remove_estate_manager_btn"
-     right="470"
+     right="520"
      top_pad="5"
      width="97" />
     <button
@@ -269,7 +269,7 @@
      follows="top|left"
      height="71"
      layout="topleft"
-     right="470"
+     right="520"
      top_pad="-5"
      width="200" />
     <name_list
@@ -287,7 +287,7 @@
      label="Remove..."
      layout="topleft"
      name="remove_allowed_avatar_btn"
-     right="470"
+     right="520"
      top_pad="5"
      width="97" />
     <button
@@ -316,7 +316,7 @@
      follows="top|left"
      height="71"
      layout="topleft"
-     right="470"
+     right="520"
      top_pad="-5"
      width="200" />
     <name_list
@@ -334,7 +334,7 @@
      label="Remove..."
      layout="topleft"
      name="remove_allowed_group_btn"
-     right="470"
+     right="520"
      top_pad="5"
      width="97" />
     <button
@@ -363,7 +363,7 @@
      follows="top|left"
      height="71"
      layout="topleft"
-     right="470"
+     right="520"
      top_pad="-5"
      width="200" />
     <name_list
@@ -381,7 +381,7 @@
      label="Remove..."
      layout="topleft"
      name="remove_banned_avatar_btn"
-     right="470"
+     right="520"
      top_pad="5"
      width="97" />
     <button
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 813f59ff89..a480266b5a 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3103,4 +3103,10 @@ Abuse Report</string>
   <string name="New Script">New Script</string>
   <string name="New Folder">New Folder</string>
   <string name="Contents">Contents</string>
-</strings>
+
+  <!-- birth date format shared by avatar inspector and profile panels -->
+  <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string>
+  
+  <string name="DefaultMimeType">none/none</string>
+
+  </strings>
diff --git a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
index 47ad16b277..9c3ac1be0e 100644
--- a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
@@ -57,8 +57,8 @@
 			<text name="WL12amHash2">
 				|
 			</text>
-			<button font="SansSerifSmall" width="96" left="546" label="Añadir un punto" label_selected="Añadir un punto" name="WLAddKey"/>
-			<button font="SansSerifSmall" width="96" left="546" label="Quitar un punto" label_selected="Quitar un punto" name="WLDeleteKey"/>
+			<button label="Añadir un punto" label_selected="Añadir un punto" name="WLAddKey"/>
+			<button label="Quitar un punto" label_selected="Quitar un punto" name="WLDeleteKey"/>
 			<text name="WLCurKeyFrameText">
 				Configuración del fotograma clave:
 			</text>
@@ -86,9 +86,9 @@
 			</text>
 			<button label="Probar" label_selected="Probar" name="WLAnimSky"/>
 			<button label="Parar" label_selected="Parar" name="WLStopAnimSky"/>
-			<button width="150" font="SansSerifSmall" label="Usar el horario del estado" label_selected="Ir al horario del estado" name="WLUseLindenTime"/>
-			<button left="440" width="180" font="SansSerifSmall" label="Guardar este tipo de día" label_selected="Guardar este tipo de día" name="WLSaveDayCycle"/>
-			<button left="440" width="180" font="SansSerifSmall" label="Cargar y probar un tipo de día" label_selected="Cargar y probar un tipo de día" name="WLLoadDayCycle"/>
+			<button label="Usar el horario del estado" label_selected="Ir al horario del estado" name="WLUseLindenTime"/>
+			<button label="Guardar este tipo de día" label_selected="Guardar este tipo de día" name="WLSaveDayCycle"/>
+			<button label="Cargar y probar un tipo de día" label_selected="Cargar y probar un tipo de día" name="WLLoadDayCycle"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
index e8122108a8..ec3b246c76 100644
--- a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
@@ -58,15 +58,15 @@
 				|
 			</text>
 			<button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey"/>
-			<button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey" width="89"/>
-			<text name="WLCurKeyFrameText" width="170">
+			<button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey"/>
+			<text name="WLCurKeyFrameText">
 				Réglages des images-clés :
 			</text>
-			<text name="WLCurKeyTimeText" width="170">
+			<text name="WLCurKeyTimeText">
 				Heure de la clé :
 			</text>
-			<spinner label="Heure" name="WLCurKeyHour" label_width="80" width="74"/>
-			<spinner label="Min" name="WLCurKeyMin" label_width="80"/>
+			<spinner label="Heure" name="WLCurKeyHour"/>
+			<spinner label="Min" name="WLCurKeyMin"/>
 			<text name="WLCurKeyTimeText2">
 				Préréglages clés :
 			</text>
@@ -78,9 +78,9 @@
 			<text name="DayCycleText2">
 				Durée du cycle :
 			</text>
-			<spinner label="Heure" name="WLLengthOfDayHour" label_width="80" width="74" />
+			<spinner label="Heure" name="WLLengthOfDayHour"/>
 			<spinner label="Min" name="WLLengthOfDayMin" />
-			<spinner label="S" name="WLLengthOfDaySec" label_width="10" width="50" left_delta="95"/>
+			<spinner label="S" name="WLLengthOfDaySec"/>
 			<text name="DayCycleText3">
 				Prévisualiser :
 			</text>
diff --git a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
index 808c758bb6..98c385d29f 100644
--- a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
@@ -57,8 +57,8 @@
 			<text name="WL12amHash2">
 				|
 			</text>
-			<button font="SansSerifSmall" width="96" left="546" label="Aggiungi voce" label_selected="Aggiungi voce" name="WLAddKey"/>
-			<button font="SansSerifSmall" width="96" left="546" label="Cancella voce" label_selected="Cancella voce" name="WLDeleteKey"/>
+			<button label="Aggiungi voce" label_selected="Aggiungi voce" name="WLAddKey"/>
+			<button label_selected="Cancella voce" name="WLDeleteKey"/>
 			<text name="WLCurKeyFrameText">
 				Impostazioni del fotogramma chiave:
 			</text>
@@ -84,9 +84,9 @@
 			<text name="DayCycleText3">
 				Anteprima:
 			</text>
-			<button width="55" font="SansSerifSmall" label="Avvia" label_selected="Avvia" name="WLAnimSky"/>
-			<button width="55" left_delta="60" font="SansSerifSmall" label="Arresta!" label_selected="Arresta" name="WLStopAnimSky"/>
-			<button left_delta="60" width="150" font="SansSerifSmall" label="Usa l&apos;ora della proprietà" label_selected="Vai all&apos;ora della proprietà" name="WLUseLindenTime"/>
+			<button label="Avvia" label_selected="Avvia" name="WLAnimSky"/>
+			<button label="Arresta!" label_selected="Arresta" name="WLStopAnimSky"/>
+			<button label="Usa l&apos;ora della proprietà" label_selected="Vai all&apos;ora della proprietà" name="WLUseLindenTime"/>
 			<button label="Salva il test del giorno" label_selected="Salva il test del giorno" name="WLSaveDayCycle"/>
 			<button label="Carica il test del giorno" label_selected="Carica il test del giorno" name="WLLoadDayCycle"/>
 		</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
index d02a794219..5bd0cfb106 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -47,12 +47,12 @@
 		<check_box initial_value="true" label="Avatar bidimensionali (Impostor)" name="AvatarImpostors"/>
 		<check_box initial_value="true" label="Hardware Skinning" name="AvatarVertexProgram"/>
 		<check_box initial_value="true" label="Abiti dell&apos;avatar" name="AvatarCloth"/>
-		<slider label="Distanza di disegno:" label_width="158" name="DrawDistance" width="255"/>
+		<slider label="Distanza di disegno:" name="DrawDistance"/>
 		<text name="DrawDistanceMeterText2">
 			m
 		</text>
-		<slider label="Conteggio massimo particelle:" label_width="158" name="MaxParticleCount" width="262"/>
-		<slider label="Qualità in post-produzione:" label_width="158" name="RenderPostProcess" width="223"/>
+		<slider label="Conteggio massimo particelle:" name="MaxParticleCount"/>
+		<slider label="Qualità in post-produzione:" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
 			Dettagli reticolo:
 		</text>
@@ -99,7 +99,7 @@
 		</radio_group>
 	</panel>
 	<button label="Applica" label_selected="Applica" name="Apply"/>
-	<button label="Reimposta" left="110" name="Defaults" width="190"/>
+	<button label="Reimposta" name="Defaults"/>
 	<button label="Avanzate" name="Advanced"/>
 	<button label="Hardware" label_selected="Hardware" name="GraphicsHardwareButton"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
index 7bda25e00f..b924af4e67 100644
--- a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
@@ -84,10 +84,10 @@
 			<text name="DayCycleText3">
 				プレビュー：
 			</text>
-			<button label="再生" label_selected="再生" name="WLAnimSky" left_delta="70"/>
+			<button label="再生" label_selected="再生" name="WLAnimSky"/>
 			<button label="停止" label_selected="停止" name="WLStopAnimSky" />
 			<button label="不動産の時刻を使用"
-			     label_selected="不動産の時刻に変更" name="WLUseLindenTime" width="140"/>
+			     label_selected="不動産の時刻に変更" name="WLUseLindenTime"/>
 			<button label="デイテストを保存"
 			     label_selected="デイテストを保存" name="WLSaveDayCycle" />
 			<button label="デイテストをロード"
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index b9df82adcd..a54d96061f 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -3577,4 +3577,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Contents">
 		コンテンツ
 	</string>
+    <string name="AvatarBirthDateFormat">
+        [year,datetime,slt]/[mthnum,datetime,slt]/[day,datetime,slt]
+    </string>
 </strings>
diff --git a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
index 42f34a3d82..dbca247a2f 100644
--- a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
@@ -30,9 +30,9 @@
 			<text name="WL12am2">
 				24:00
 			</text>
-			<button font="SansSerifSmall" width="96" left="546" label="Adicionar chave" label_selected="Adicionar chave" name="WLAddKey"/>
-			<button font="SansSerifSmall" width="96" left="546" label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText" width="190" left="17">
+			<button label="Adicionar chave" label_selected="Adicionar chave" name="WLAddKey"/>
+			<button label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>
+			<text name="WLCurKeyFrameText">
 				Configurações de Quadro-chave:
 			</text>
 			<text name="WLCurKeyTimeText">
@@ -47,7 +47,7 @@
 			<text name="DayCycleText">
 				Grudar:
 			</text>
-			<combo_box label="5 minutos" name="WLSnapOptions" width="85"/>
+			<combo_box label="5 minutos" name="WLSnapOptions"/>
 			<text name="DayCycleText2">
 				Duração do Ciclo:
 			</text>
@@ -59,7 +59,7 @@
 			</text>
 			<button label="Tocar" label_selected="Tocar" name="WLAnimSky"/>
 			<button label="Pare!" label_selected="Pare" name="WLStopAnimSky"/>
-			<button width="175" font="SansSerifSmall" label="Usar o horário da Propriedade" label_selected="Ir para o horário da Propriedade" name="WLUseLindenTime"/>
+			<button label="Usar o horário da Propriedade" label_selected="Ir para o horário da Propriedade" name="WLUseLindenTime"/>
 			<button label="Salvar o Dia teste" label_selected="Salvar o Dia teste" name="WLSaveDayCycle"/>
 			<button label="Carregar o Dia teste" label_selected="Carregar o Dia teste" name="WLLoadDayCycle"/>
 		</panel>