From ff5be6efae38ef9734d685cd4f213139678f31ee Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 8 Jun 2010 23:41:17 -0700
Subject: Made viewer preferences obey windows and mac interface guidelines
 (i.e. checkboxes, sliders, and spinners now all use sentence-style instead of
 a random mix of sentence-style and title-style). Also changed a few labels
 for clarification

---
 .../xui/en-us/floater_hardware_settings.xml        |  4 +-
 .../skins/default/xui/en-us/panel_audio.xml        | 14 ++---
 .../xui/en-us/panel_preferences_advanced.xml       | 18 +++----
 .../default/xui/en-us/panel_preferences_audio.xml  | 22 ++++----
 .../default/xui/en-us/panel_preferences_chat.xml   | 16 +++---
 .../xui/en-us/panel_preferences_general.xml        | 34 ++++++------
 .../xui/en-us/panel_preferences_graphics1.xml      | 34 ++++++------
 .../default/xui/en-us/panel_preferences_im.xml     |  6 +--
 .../default/xui/en-us/panel_preferences_input.xml  | 60 +++++++++++-----------
 .../xui/en-us/panel_preferences_network.xml        | 10 ++--
 .../default/xui/en-us/panel_preferences_popups.xml | 14 ++---
 .../default/xui/en-us/panel_preferences_skins.xml  |  2 +-
 .../default/xui/en-us/panel_preferences_voice.xml  |  4 +-
 .../default/xui/en-us/panel_preferences_web.xml    | 14 ++---
 .../xui/en-us/panel_windlight_remote_expanded.xml  |  4 +-
 15 files changed, 128 insertions(+), 128 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
index 5773142..8d5d6b4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
@@ -11,7 +11,7 @@
 	</text>
 	<check_box bottom="-46" control_name="RenderAnisotropic" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Anisotropic Filtering (slower when enabled)" left="148"
+	     label="Anisotropic filtering (slower when enabled)" left="148"
 	     mouse_opaque="true" name="ani" radio_style="false" width="256" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 		bottom="-61" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -59,7 +59,7 @@
 	</text>
 	<check_box bottom_delta="-5" control_name="RenderVBOEnable" enabled="true" follows="left|top"
 		font="SansSerifSmall" height="16" initial_value="true"
-		label="Enable OpenGL Vertex Buffer Objects" left="148"
+		label="Enable OpenGL vertex buffer objects" left="148"
 		mouse_opaque="true" name="vbo" radio_style="false"
 		tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
 		width="315" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
index b9877c8..ee9695e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -2,7 +2,7 @@
 <panel border="false" follows="left|top|right|bottom" height="160"
      label="Audio &amp; Video" name="Media panel" width="175">
 	<slider bottom_delta="-20" control_name="AudioLevelMaster" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="Master"
+	     height="15" increment="0.05" initial_val="0.5" label="Master:"
 	     label_width="55" left="10" max_val="1" min_val="0" mouse_opaque="true"
 	     name="System Volume" show_text="false" volume="true" width="180" />
 	<button bottom_delta="0" control_name="MuteAudio" follows="top|right" height="16"
@@ -10,7 +10,7 @@
 	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
 	     left="150" name="mute_audio" tab_stop="false" toggle="true" width="25" />
 	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="Music"
+	     height="15" increment="0.05" initial_val="0.5" label="Music:"
 	     label_width="55" left="10" max_val="1" min_val="0" name="Music Volume"
 	     show_text="false" volume="true" width="180" />
 	<button bottom_delta="0" control_name="MuteMusic" follows="top|right" height="16"
@@ -18,7 +18,7 @@
 	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
 	     left="150" name="mute_music" tab_stop="false" toggle="true" width="25" />
 	<slider bottom_delta="-20" control_name="AudioLevelMedia" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="Media"
+	     height="15" increment="0.05" initial_val="0.5" label="Media:"
 	     label_width="55" left="10" max_val="1" min_val="0" name="Media Volume"
 	     show_text="false" volume="true" width="180" />
 	<button bottom_delta="0" control_name="MuteMedia" follows="top|right" height="16"
@@ -26,7 +26,7 @@
 	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
 	     left="150" name="mute_media" tab_stop="false" toggle="true" width="25" />
 	<slider bottom_delta="-20" control_name="AudioLevelVoice" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="Voice"
+	     height="15" increment="0.05" initial_val="0.5" label="Voice:"
 	     label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume"
 	     show_text="false" volume="true" width="180" />
 	<button bottom_delta="0" control_name="MuteVoice" follows="top|right" height="16"
@@ -34,7 +34,7 @@
 	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
 	     left="150" name="mute_voice" tab_stop="false" toggle="true" width="25" />
 	<slider bottom_delta="-20" control_name="AudioLevelSFX" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="Sounds"
+	     height="15" increment="0.05" initial_val="0.5" label="Sounds:"
 	     label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume"
 	     show_text="false" volume="true" width="180" />
 	<button bottom_delta="0" control_name="MuteSounds" follows="top|right" height="16"
@@ -42,7 +42,7 @@
 	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
 	     left="150" name="mute_sfx" tab_stop="false" toggle="true" width="25" />
 	<slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="Ambient"
+	     height="15" increment="0.05" initial_val="0.5" label="Ambient:"
 	     label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume"
 	     show_text="false" volume="true" width="180" />
 	<button bottom_delta="0" control_name="MuteAmbient" follows="top|right" height="16"
@@ -50,7 +50,7 @@
 	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
 	     left="150" name="mute_wind" tab_stop="false" toggle="true" width="25" />
 	<slider bottom_delta="-20" control_name="AudioLevelUI" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="UI" label_width="55"
+	     height="15" increment="0.05" initial_val="0.5" label="Interface:" label_width="55"
 	     left="10" max_val="1" min_val="0" name="UI Volume" show_text="false"
 	     volume="true" width="180" />
 	<button bottom_delta="0" control_name="MuteUI" follows="top|right" height="16"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 3adc36d..d1a7489 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -7,32 +7,32 @@
   
   <check_box bottom="-30" enabled="true"
        follows="left|top" font="SansSerifSmall" height="16"
-       initial_value="false" label="Disable Login/Logout Screens" left="12"
+       initial_value="false" label="Disable login/logout screens" left="12"
        mouse_opaque="true" name="disable_log_screen_check" radio_style="false"
        width="217" />
   <check_box bottom_delta="-18" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Disable Teleport Screens" left="12" mouse_opaque="true"
+	     label="Disable teleport screen" left="12" mouse_opaque="true"
 	     name="disable_tp_screen_check" radio_style="false" width="217" />
   <check_box bottom_delta="-25" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
-       label="Show Client Names in Name Tag" left="12" mouse_opaque="true"
+       label="Show client names in nametag" left="12" mouse_opaque="true"
        name="client_name_tag_check" radio_style="false" width="217" />
   <check_box bottom_delta="-18" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
-       label="Broadcast Your Client Name to Others" left="12" mouse_opaque="true"
+       label="Broadcast your client name to others" left="12" mouse_opaque="true"
        name="client_name_tag_broadcast_check" radio_style="false" width="217" />
   <check_box bottom_delta="-25" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
-       label="Enable Shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true"
+       label="Enable shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true"
        name="shadows_check" radio_style="false" width="217" />
   <check_box bottom_delta="-25" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="true"
-       label="Use server-side Windlight settings" left="12" mouse_opaque="true"
+       label="Use server-side WindLight settings" left="12" mouse_opaque="true"
        name="windlight_check" radio_style="false" width="217" />
   <check_box bottom_delta="-18" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
-       label="Use HTTP Textures" left="12" mouse_opaque="true"
+       label="Use HTTP texture fetching" left="12" mouse_opaque="true"
        name="http_texture_check" radio_style="false" width="217" />
   <check_box bottom_delta="-18" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
@@ -41,7 +41,7 @@
   <spinner bottom_delta="-18" decimal_digits="0"
        tool_tip="Interval in seconds between each draw distance increment"
        follows="left|top" height="16" increment="1" initial_val="12"
-       label="Step interval every" label_width="105" left_delta="20" max_val="20"
+       label="Step interval every:" label_width="105" left_delta="20" max_val="20"
        min_val="1" mouse_opaque="true" name="speed_rez_interval_spinner" width="145" />
   <text bottom_delta="0" follows="top|left" height="15" left_delta="150"
 	     name="speed_rez_seconds_text" width="115">
@@ -54,7 +54,7 @@
        name="appearance_anim_check" radio_style="false" width="217" />
   <check_box bottom_delta="-25" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
-       label="Enable Wind" left="12" mouse_opaque="true"
+       label="Enable wind" left="12" mouse_opaque="true"
        name="mute_wind_check" radio_style="false" width="217" />
 
   <button bottom="5" follows="left|top" font="SansSerifSmall" height="20" width="250" 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 383c26f..3f8b99a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -12,20 +12,20 @@
 	     bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
 	     mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
-		Streaming Preferences:
+		Streaming:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-300" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
 	     mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
-		Audio Preferences:
+		Audio:
 	</text>
 	<panel border="true" bottom="-195" enabled="true" filename="panel_audio.xml"
 	     follows="left|top|right|bottom" height="180" label="Volume" left="148"
 	     mouse_opaque="true" name="Volume Panel" width="260" />
 	<check_box bottom="-220" control_name="AudioStreamingMusic" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	     label="Play Streaming Music When Available (uses more bandwidth)"
+	     label="Play streaming music when available (uses more bandwidth)"
 	     left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
 	     width="339" />
   <check_box bottom_delta="-20" control_name="ShowStreamTitle" enabled="true"
@@ -44,26 +44,26 @@
 	     width="338" />
 	<check_box bottom_delta="-25" control_name="MuteWhenMinimized" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	     label="Mute Audio When Window Minimized" left="142" mouse_opaque="true"
+	     label="Mute audio when window minimized" left="142" mouse_opaque="true"
 	     name="mute_when_minimized" radio_style="false" width="215" />
-	<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true"
+	<slider bottom_delta="-25" control_name="AudioLevelDoppler" edit_text="true"
 	     enabled="true" follows="left|top" height="15" increment="0.1"
-	     initial_val="1" label="Doppler Effect" label_width="100" left="148"
+	     initial_val="1" label="Doppler effect:" label_width="100" left="148"
 	     max_val="2" min_val="0" mouse_opaque="true" name="Doppler Effect"
 	     show_text="true" width="250" />
 	<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true"
 	     enabled="true" follows="left|top" height="15" increment="0.1"
-	     initial_val="1" label="Rolloff Factor" label_width="100" left="148"
+	     initial_val="1" label="Rolloff factor:" label_width="100" left="148"
 	     max_val="2" min_val="0" mouse_opaque="true" name="Rolloff Factor"
 	     show_text="true" width="250" />
-	<spinner bottom_delta="-30" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
+	<spinner bottom_delta="-25" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
 	     enabled="true" follows="left|top" height="16" increment="10"
-	     initial_val="10" label="[CURRENCY] Change Threshold" label_width="158" left="148"
+	     initial_val="10" label="[CURRENCY] change threshold:" label_width="158" left="148"
 	     max_val="10000" min_val="0" mouse_opaque="true" name="L$ Change Threshold"
 	     width="212" />
 	<spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold"
 	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="10" initial_val="20" label="Health Change Threshold"
+	     increment="10" initial_val="20" label="Health change threshold:"
 	     label_width="158" left="148" max_val="10000" min_val="0"
-	     mouse_opaque="true" name="Health Change Threshold" width="212" />
+	     mouse_opaque="true" name="Health change threshold" width="212" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 2271597..61c6b23 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -6,7 +6,7 @@
 	     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box" v_pad="0" width="128">
-		Chat Font Size:
+		Font Size:
 	</text>
 	<radio_group bottom="-40" draw_border="true" enabled="true"
 	     follows="left|top" height="30" left="148" mouse_opaque="true"
@@ -28,7 +28,7 @@
 	     bottom="-64" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box2" v_pad="0" width="128">
-		Chat Color:
+		Color:
 	</text>
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
 	     can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
@@ -107,20 +107,20 @@
 	</text>
 	<slider bottom_delta="-25" can_edit_text="false" control_name="ConsoleBackgroundOpacity"
 	     decimal_digits="3" enabled="true" follows="left|top" height="12"
-	     increment="0.05" initial_val="1" label="Console Opacity" left="148" max_val="1"
+	     increment="0.05" initial_val="1" label="Console opacity:" left="148" max_val="1"
 	     min_val="0" mouse_opaque="true" name="console_opacity" show_text="true"
 	     value="0.4" width="225" />
 	<check_box bottom_delta="-25" control_name="ChatFullWidth" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Use full screen width  (Requires restart)" left="148"
+	     label="Use full screen width  (requires restart)" left="148"
 	     mouse_opaque="true" name="chat_full_width_check" radio_style="false"
 	     width="239" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	      bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box6" v_pad="0" width="135">
-		Chat Options:
-	</text>
+    Miscellaneous:
+  </text>
 	<check_box bottom_delta="-8" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Close chat bar after hitting return" left="148" mouse_opaque="true"
@@ -151,7 +151,7 @@
 	     bottom="-379" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box7" v_pad="0" width="128">
-		Bubble Chat:
+		Chat Bubbles:
 	</text>
 	<check_box bottom="-386" control_name="UseChatBubbles" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
@@ -159,7 +159,7 @@
 	     name="bubble_text_chat" radio_style="false" width="237" />
 	<slider bottom="-402" can_edit_text="false" control_name="ChatBubbleOpacity"
 	     decimal_digits="3" enabled="true" follows="left|top" height="12"
-	     increment="0.05" initial_val="1" label="Bubble Opacity" left="148" max_val="1"
+	     increment="0.05" initial_val="1" label="Bubble opacity:" left="148" max_val="1"
 	     min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
 	     value="0.5" width="225" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index db7e487..119772d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -6,36 +6,36 @@
 	     name="default_start_location" width="220">
     <radio_item bottom="-20" height="20" left="0" name="MyHome" width="50"
 		  tool_tip="Log into my home location by default.">
-      My Home
+      My home
     </radio_item>
     <radio_item bottom="-20" height="20" left="100" name="MyLastLocation" width="50"
 		  tool_tip="Log into my last location by default.">
-      My Last Location
+      My last location
     </radio_item>
   </radio_group>
   <check_box bottom="-44" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="true"
-       label="Show Start Location on Login Screen" left="151" mouse_opaque="true"
+       label="Show start location at login screen" left="151" mouse_opaque="true"
        name="show_location_checkbox" radio_style="false" width="256" />
 	<combo_box bottom_delta="-25" follows="left|top" height="18" left="155"
 	     mouse_opaque="true" name="fade_out_combobox" width="146">
 		<combo_item name="Never" value="Never">
-			Never
+			Never show
 		</combo_item>
 		<combo_item name="Show Temporarily" value="Show Temporarily">
-			Show Temporarily
+			Temporarily show
 		</combo_item>
 		<combo_item name="Always" value="Always">
-			Always
+			Always show
 		</combo_item>
 	</combo_box>
 	<check_box bottom_delta="0" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="true"
-	     label="Small Avatar Names" left="330" name="small_avatar_names_checkbox"
+	     label="Small avatar names" left="330" name="small_avatar_names_checkbox"
 	     width="200" />
 	<check_box bottom_delta="-20" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Hide My Name On My Screen" left="151" name="show_my_name_checkbox"
+	     label="Hide my name on my screen" left="151" name="show_my_name_checkbox"
 	     width="200" />
 	<text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
 	     halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0"
@@ -44,11 +44,11 @@
 	</text>
 	<check_box bottom_delta="0" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Hide All Group Titles" left="151" mouse_opaque="true"
+	     label="Hide all group titles" left="151" mouse_opaque="true"
 	     name="show_all_title_checkbox" radio_style="false" width="256" />
 	<check_box bottom_delta="-18" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Hide My Group Title" left="151" name="show_my_title_checkbox"
+	     label="Hide my group title" left="151" name="show_my_title_checkbox"
 	     radio_style="false" width="256" />
   <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
        halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0"
@@ -85,7 +85,7 @@
 	     name="ui_auto_scale" radio_style="false" width="256" />
   <check_box bottom="-260" enabled="true" follows="left|top"
 		   font="SansSerifSmall" height="16" initial_value="false"
-		   label="Go Away/AFK When Idle" left="330" mouse_opaque="true"
+		   label="Go Away/AFK when idle" left="330" mouse_opaque="true"
 		   name="afk_timeout_checkbox" radio_style="false" width="256" />
   <spinner bottom="-260" decimal_digits="0" enabled="true"
 	     follows="left|top" height="16" increment="1" initial_val="300"
@@ -94,10 +94,10 @@
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
        bottom_delta="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
        font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-       mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
-    Mini-map notify:
+       mouse_opaque="true" name="Mini-Map Notify:" v_pad="0" width="128">
+    Mini-Map Notify:
   </text>
-  <check_box bottom_delta="0" enabled="true"
+  <check_box bottom_delta="-4" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Entering chat range" left="151"
 	     mouse_opaque="true" name="mini_map_notify_chat" radio_style="false"
@@ -147,13 +147,13 @@
 	     bottom="-64" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
 	     mouse_opaque="true" name="show_names_textbox" v_pad="0" width="394">
-		Show Names:
+		Nametags:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-184" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
 	     mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
-		Color For My Effects:
+		Selection Beam Color:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-254" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -178,7 +178,7 @@
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
 	     height="18" left_delta="293" mouse_opaque="true" name="language_textbox2"
 	     v_pad="0" width="400">
-		(Requires restart for full effect)
+		(requires restart for full effect)
 	</text>
 	<string name="region_name_prompt">
 		&lt;Type region name&gt;
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index e2bc084..4df33e2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -24,7 +24,7 @@
 	     bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
 	     mouse_opaque="true" name="WindowSizeLabel" v_pad="0" width="128">
-		Window Size:
+		Window size:
 	</text>
 	<combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
 	     height="18" left="185" max_chars="20" mouse_opaque="true"
@@ -50,7 +50,7 @@
 	     bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
 	     mouse_opaque="true" name="DisplayResLabel" v_pad="0" width="128">
-		Display Resolution:
+		Display resolution:
 	</text>
 	<combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
 	     height="18" left="185" max_chars="20" mouse_opaque="true"
@@ -60,7 +60,7 @@
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
 	     left="10" mouse_opaque="true" name="AspectRatioLabel1"
 	     tool_tip="width / height" v_pad="0" width="160">
-		Aspect Ratio:
+		Aspect ratio:
 	</text>
 	<combo_box allow_text_entry="true" bottom="-43" enabled="true" follows="left|top"
 	     height="16" left="185" max_chars="100" mouse_opaque="true"
@@ -93,7 +93,7 @@
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
 	     height="12" left_delta="0" mouse_opaque="true"
 	     name="QualityText" v_pad="0" width="95">
-		Performance:
+		performance:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-86" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -172,22 +172,22 @@
 	</text>
 	<check_box bottom="-153" control_name="RenderObjectBump" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="true"
-	     label="Bump Mapping and Shiny" left="10" mouse_opaque="true"
+	     label="Bump mapping and shiny" left="10" mouse_opaque="true"
 	     name="BumpShiny" radio_style="false" width="256" />
 	<check_box bottom_delta="-17" control_name="VertexShaderEnable" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="true" label="Basic Shaders" left_delta="0"
+	     initial_value="true" label="Basic shaders" left_delta="0"
 	     mouse_opaque="true" name="BasicShaders" radio_style="false"
 	     tool_tip="Disabling this option may prevent some graphics card drivers from crashing."
 	     width="315" />
 	<check_box bottom_delta="-17" control_name="WindLightUseAtmosShaders" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="true" label="Atmospheric Shaders" left_delta="0"
+	     initial_value="true" label="Atmospheric shaders" left_delta="0"
 	     mouse_opaque="true" name="WindLightUseAtmosShaders" radio_style="false"
 	     width="256" />
 	<check_box bottom_delta="-17" control_name="RenderWaterReflections" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="true" label="Water Reflections" left_delta="0"
+	     initial_value="true" label="Water reflections" left_delta="0"
 	     mouse_opaque="true" name="Reflections" radio_style="false" width="256" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-223" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -202,15 +202,15 @@
 	     width="321">
 		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
 		     left="3" mouse_opaque="true" name="0" width="315">
-			Terrain and Trees
+			Terrain and trees
 		</radio_item>
 		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
 		     left="3" mouse_opaque="true" name="1" width="315">
-			All Static Objects
+			All static objects
 		</radio_item>
 		<radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16"
 		     left="3" mouse_opaque="true" name="2" width="315">
-			All Avatars and Objects
+			All avatars and objects
 		</radio_item>
 		<radio_item type="string" length="1" bottom="-67" enabled="true" follows="left|top" height="16"
 		     left="3" mouse_opaque="true" name="3" width="315">
@@ -225,15 +225,15 @@
 	</text>
 	<check_box bottom_delta="-23" control_name="RenderUseImpostors" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	     label="Avatar Impostors" left_delta="0" mouse_opaque="true"
+	     label="Avatar impostors" left_delta="0" mouse_opaque="true"
 	     name="AvatarImpostors" radio_style="false" width="256" />
 	<check_box bottom_delta="-17" control_name="RenderAvatarVP" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	     label="Hardware Skinning" left_delta="0" mouse_opaque="true"
+	     label="Hardware skinning" left_delta="0" mouse_opaque="true"
 	     name="AvatarVertexProgram" radio_style="false" width="256" />
 	<check_box bottom_delta="-17" control_name="RenderAvatarCloth" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	     label="Avatar Cloth" left_delta="0" mouse_opaque="true" name="AvatarCloth"
+	     label="Avatar cloth" left_delta="0" mouse_opaque="true" name="AvatarCloth"
 	     radio_style="false" width="256" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -251,18 +251,18 @@
 	</text>
 	<slider bottom="-135" can_edit_text="false" control_name="RenderFarClip"
 	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="8" initial_val="160" label="Draw Distance:"
+	     increment="8" initial_val="160" label="Draw distance:"
 	     label_width="140" left="215" max_val="512" min_val="32" mouse_opaque="true"
 	     name="DrawDistance" show_text="true" width="255" />
 	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
 	     decimal_digits="0" enabled="true" follows="left|top" height="16"
 	     increment="256" initial_val="4096"
-	     label="Max. Particle Count:" label_width="140" left_delta="0"
+	     label="Max. particle count:" label_width="140" left_delta="0"
 	     max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
 	     show_text="true" width="262" />
 	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderGlowResolutionPow"
 	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="1" initial_val="8" label="Post Process Quality:"
+	     increment="1" initial_val="8" label="Post process quality:"
 	     label_width="140" left_delta="0" max_val="9" min_val="8"
 	     mouse_opaque="true" name="RenderPostProcess" show_text="false" width="223" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index 582e230..58845ad 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -23,7 +23,7 @@
     log in to change
   </string>
   <check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" initial_value="false" label="Send IM to Email ([EMAIL])"
+	     height="16" initial_value="false" label="Send IM to email ([EMAIL])"
 	     left="148" mouse_opaque="true" name="send_im_to_email" radio_style="false"
 	     width="350" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -34,11 +34,11 @@
   </text>
   <check_box bottom="-65" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Main Chat" left="248" mouse_opaque="true"
+	     label="Chat console" left="248" mouse_opaque="true"
 	     name="include_im_in_chat_console" radio_style="false" width="100" />
   <check_box bottom="-65" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Local Chat" left="348" mouse_opaque="true"
+	     label="Local Chat window" left="348" mouse_opaque="true"
 	     name="include_im_in_chat_history" radio_style="false" width="100" />
   <check_box bottom="-85" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 7a5f22d..70c8464 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -6,41 +6,45 @@
 	     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
 	     mouse_opaque="true" name=" Mouselook Options:" v_pad="0" width="266">
-		Mouselook Options:
+		Mouselook:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
 	     mouse_opaque="true" name=" Mouse Sensitivity:" v_pad="0" width="128">
-		Mouse Sensitivity:
+		Mouse sensitivity:
 	</text>
 	<slider_bar bottom="-26" enabled="true" follows="left|top"
 	     height="16" increment="0.25" initial_val="2" left="276" max_val="15"
 	     min_val="0" mouse_opaque="true" name="mouse_sensitivity" width="128" />
 	<check_box bottom_delta="-18" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" label="Invert Mouse" left="148"
+	     font="SansSerifSmall" height="16" label="Invert mouse" left="148"
 	     mouse_opaque="true" name="invert_mouse" radio_style="false" width="128" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <check_box bottom_delta="-18" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+       label="Show avatar in mouselook" left="148" mouse_opaque="true" name="first_person_avatar_visible"
+       radio_style="false" width="256" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
 	     mouse_opaque="true" name=" Auto Fly Options:" v_pad="0" width="266">
-		Auto Fly Options:
-	</text>
-	<check_box bottom_delta="-6" enabled="true" follows="left|top"
+    Auto-Fly:
+  </text>
+  <check_box bottom_delta="-6" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" label="Fly/land on holding up/down"
 	     left="148" mouse_opaque="true" name="automatic_fly" radio_style="false"
 	     width="178" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
 	     mouse_opaque="true" name=" Camera Options:" v_pad="0" width="266">
-		Camera Options:
-	</text>
+    Default Camera:
+  </text>
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
 	     mouse_opaque="true" name="camera_fov_label" v_pad="0" width="128">
-    Camera View Angle:
+    Camera view angle:
   </text>
   <slider bottom_delta="-6" can_edit_text="true"
 	     decimal_digits="2" enabled="true" follows="left|top" width="128" height="16"
@@ -50,9 +54,9 @@
 	     bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
 	     mouse_opaque="true" name="Camera Follow Distance:" v_pad="0" width="128">
-		Camera Follow Distance:
-	</text>
-	<slider bottom_delta="-6" can_edit_text="true" control_name="CameraOffsetScale" 
+    Camera follow distance:
+  </text>
+  <slider bottom_delta="-6" can_edit_text="true" control_name="CameraOffsetScale"
 	     decimal_digits="2" enabled="true" follows="left|top" height="16"
 	     increment=".025" initial_val="1" left="276" min_val=".5" max_val="3"
 	     mouse_opaque="true" name="camera_offset_scale" show_text="false" value="1"
@@ -61,7 +65,7 @@
        bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
        font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
        mouse_opaque="true" name="Camera Transition Time:" v_pad="0" width="128">
-    Camera Transition Time:
+    Camera transition time:
   </text>
   <slider bottom_delta="-6" can_edit_text="true" decimal_digits="1"
        enabled="true" follows="left|top" height="16" increment="0.1"
@@ -71,25 +75,25 @@
 	     bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
 	     mouse_opaque="true" name="Camera Smoothing:" v_pad="0" width="128">
-    Camera Smoothing:
+    Camera smoothing:
   </text>
   <slider bottom_delta="-6" can_edit_text="true"
 	     decimal_digits="1" enabled="true" follows="left|top" height="16"
 	     increment="0.1" initial_val="1" left="276" max_val="9" min_val="0"
 	     mouse_opaque="true" name="camera_position_smoothing" show_text="false" value="2"
 	     width="128" />
-	<check_box bottom_delta="-24" enabled="true"
+  <check_box bottom_delta="-24" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Automatic Edit Camera Movement" left="148" mouse_opaque="true"
+	     label="Automatic edit camera movement" left="148" mouse_opaque="true"
 	     name="edit_camera_movement" radio_style="false"
 	     tool_tip="Use automatic camera positioning when entering and exiting edit mode"
 	     width="201" />
-	<check_box bottom_delta="-18" enabled="true"
+  <check_box bottom_delta="-18" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Automatic Appearance Camera Movement" left="148" mouse_opaque="true"
+	     label="Automatic appearance camera movement" left="148" mouse_opaque="true"
 	     name="appearance_camera_movement" radio_style="false"
 	     tool_tip="Use automatic camera positioning while in edit mode" width="242" />
-	<check_box bottom_delta="-18" enabled="true"
+  <check_box bottom_delta="-18" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Disable camera constraints" left="148" mouse_opaque="true"
 	     name="Disable camera constraints" radio_style="false"
@@ -99,23 +103,19 @@
        label="Disable minimum zoom distance" left="168" mouse_opaque="true"
        name="disable_min_zoom_check" radio_style="false"
        tool_tip="Disables minimum zoom distance for prims and avatars" width="242" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-32" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
 	     mouse_opaque="true" name="text2" v_pad="0" width="128">
-		Avatar Display Options:
+		Joystick:
 	</text>
-	<check_box bottom_delta="-4" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="first_person_avatar_visible"
-	     radio_style="false" width="256" />
-	<button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
-	     label="Joystick Setup" left_delta="0" mouse_opaque="true"
+	<button bottom_delta="-4" follows="left|top" font="SansSerif" height="20"
+	     label="Joystick Setup" left="148" mouse_opaque="true"
 	     name="joystick_setup_button" width="155" />
 
 
 	<text name="double_click_action_label"
-	      bottom_delta="-32" left="10" height="18" width="200"
+	      bottom_delta="-35" left="10" height="18" width="200"
         follows="left|top" font="SansSerifSmall" mouse_opaque="true">
     Double-Click Action:
 	</text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index 655859a..2b9a551 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -6,7 +6,7 @@
 	     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box" v_pad="0" width="200">
-		Maximum Bandwidth:
+		Maximum bandwidth:
 	</text>
 	<slider bottom_delta="-25" can_edit_text="true" control_name="ThrottleBandwidthKBPS"
 	     decimal_digits="0" enabled="true" follows="left|top" height="15"
@@ -25,7 +25,7 @@
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
 	     height="10" left="12" mouse_opaque="false" name="cache_size_label_l"
 	     v_pad="0" width="200">
-		Disk Cache Size (MB):
+		Disk cache size (MB):
 	</text>
 	<slider bottom_delta="-25" can_edit_text="true" control_name="CacheSize"
 	     decimal_digits="0" enabled="true" follows="left|top" height="15"
@@ -40,7 +40,7 @@
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
 	     height="10" left="12" mouse_opaque="false" name="cache_location_label"
 	     v_pad="0" width="200">
-		Disk Cache Location:
+		Disk cache location:
 	</text>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-28"
 	     enabled="false" follows="left|top" font="SansSerif"
@@ -56,12 +56,12 @@
 	     name="reset_cache" scale_image="true" width="100" />
 	<check_box bottom="-173" bottom_delta="-25" control_name="ConnectionPortEnabled"
 	     enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Custom Port Connection" left="12"
+	     initial_value="false" label="Custom port connection" left="12"
 	     mouse_opaque="true" name="connection_port_enabled" radio_style="false"
 	     width="256" />
 	<spinner bottom="-193" bottom_delta="-20" control_name="ConnectionPort"
 	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="1" initial_val="13000" label="Port Number:" label_width="75"
+	     increment="1" initial_val="13000" label="Port number:" label_width="75"
 	     left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true"
 	     name="connection_port" width="150" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
index 35a10a6..2168137 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
@@ -2,21 +2,21 @@
 <panel border="true" bottom="0" height="500" label="Popups" left="0" name="popups"
      title="Popups" width="400">
 	<text bottom="-20" follows="top|left" left="15" width="300" name="dont_show_label">
-		Do not show these popups:
+		Hide These Popups:
 	</text>
 	<scroll_list follows="top|left" height="88" left="15" name="disabled_popups" width="480" />
-	<button follows="top|left" height="20" label="Enable this popup" left="15"
+	<button follows="top|left" height="20" label="Enable This Popup" left="15"
 	     name="enable_popup" width="175" />
-	<button follows="top|left" height="20" label="Enable all popups..." left="200"
+	<button follows="top|left" height="20" label="Enable All Popups" left="200"
 	     name="reset_dialogs_btn"
 	     tool_tip="Enable all of the optional popups and &apos;first time use&apos; notifications."
 	     width="175" bottom_delta="0" />
 	<text follows="top|left" left="15" width="128" name="show_label" bottom_delta="-24">
-		Show these popups:
+		Show These Popups:
 	</text>
 	<scroll_list follows="top|left" height="88" left="15" name="enabled_popups" width="480" />
 	<button bottom_delta="-24" follows="top|left" height="20"
-	     label="Disable all these popups..." left="200"
+	     label="Disable All Popups" left="200"
 	     name="skip_dialogs_btn"
 	     tool_tip="Disable all of the optional popups and &apos;first time use&apos; notifications."
 	     width="175" />
@@ -25,7 +25,7 @@
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
 	     height="10" left="15" mouse_opaque="false" name="text_box2" v_pad="0"
 	     width="270">
-		Offers of notecards, textures and landmarks:
+		Offers of Notecards, Textures and Landmarks:
 	</text>
 	<check_box bottom_delta="-25" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
@@ -37,7 +37,7 @@
 	     name="show_new_inventory" radio_style="false" width="270" />
    	<check_box bottom_delta="-20" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	     label="Automatically show newly accepted objects in inventory" left="18" mouse_opaque="true"
+	     label="Automatically show newly accepted objects in inventory" left="40" mouse_opaque="true"
 	     name="show_in_inventory" radio_style="false" width="270" />
   <check_box bottom_delta="-30" enabled="true"
        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
index 99cae27..f0b789e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -6,7 +6,7 @@
 	     bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
 	     mouse_opaque="true" name="muting_text" v_pad="0" width="400">
-		Select a skin (requires restart):
+		Select a Skin (Requires Restart):
 	</text>
   <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12"
 	     name="skin_selection" width="480">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
index e0a8962..8712be5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
@@ -27,7 +27,7 @@
 	     font="SansSerifSmall" height="16" hide_border="true" hide_scrollbar="true"
 	     left_delta="0" max_length="65535" mouse_opaque="true"
 	     name="push_to_talk_heading" width="445" word_wrap="true">
-		Push To Talk
+		Push To Talk:
 	</text>
 	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-60"
 	     embedded_items="false" enabled="false" follows="left|top"
@@ -61,7 +61,7 @@
 	<text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-25"
 	     embedded_items="false" enabled="true" follows="left|top" height="16"
 	     left="28" name="privacy_heading" width="445">
-		Privacy Options
+		Privacy:
 	</text>
 	<check_box bottom_delta="-20" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index 117e494..76547e8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
@@ -18,11 +18,11 @@
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
 	     height="10" left="15" mouse_opaque="false" name="cache_size_label_l"
 	     v_pad="0" width="128">
-		Browser cache:
+		Browser Cache:
 	</text>
 	<button bottom_delta="-10" enabled="true" follows="left|bottom" font="SansSerif"
 	     halign="center" height="22" label="Clear Now" left="140"
-	     mouse_opaque="true" name="clear_cache" scale_image="true" width="85" />
+	     mouse_opaque="true" name="clear_cache" scale_image="true" width="100" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-30" drop_shadow_visible="true" enabled="true"
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
@@ -43,7 +43,7 @@
 	</text>
 	<check_box bottom_delta="-7" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Enable Web Proxy" left="140" mouse_opaque="true"
+	     label="Enable web proxy" left="140" mouse_opaque="true"
 	     name="web_proxy_enabled" radio_style="false" width="256" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-25" drop_shadow_visible="true" enabled="true"
@@ -58,7 +58,7 @@
 	     width="200" />
 	<spinner bottom_delta="-25" decimal_digits="0"
 	     enabled="true" follows="left|top" height="16" increment="1"
-	     initial_val="80" label="Port Number:" label_width="75" left="140"
+	     initial_val="80" label="Port number:" label_width="75" left="140"
 	     max_val="12000" min_val="10" mouse_opaque="true" name="web_proxy_port"
 	     width="140" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -72,12 +72,12 @@
 	     height="18" left="100" name="world_search_editor"
 	     tool_tip="Address of the world search engine you would like to use"
 	     width="355" />
-	<button bottom_delta="-20" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="16" label="Reset" left="100" 
+	<button bottom_delta="-22" enabled="true" follows="left|bottom" font="SansSerif"
+	     halign="center" height="18" label="Reset" left="100" 
 	     tool_tip="Reset to default"
 	     mouse_opaque="true" name="world_search_reset_default" scale_image="true" width="65" />
 	<button  bottom_delta="0" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="16" label="Clear" left="170" 
+	     halign="center" height="18" label="Clear" left="170" 
 	     tool_tip="clear field"
 	     mouse_opaque="true" name="world_search_clear" scale_image="true" width="65" />
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
index 347e913..3849efd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
@@ -5,13 +5,13 @@
 	<panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="67" left="0" width="182" />
 	<slider bottom="-20" can_edit_text="false" control_name="RenderFarClip"
        decimal_digits="0" enabled="true" height="18"
-       increment="8" initial_val="160" label="Draw Distance:"
+       increment="8" initial_val="160" label="Draw distance:"
        label_width="78" left="6" max_val="512" min_val="32" mouse_opaque="true"
        name="DrawDistance" show_text="true" width="170" />
   <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
        decimal_digits="0" enabled="true" follows="left|top" height="18"
        increment="256" initial_val="4096"
-       label="Max. Particles:" label_width="78" left_delta="0"
+       label="Max. particles:" label_width="78" left_delta="0"
        max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
        show_text="true" width="176" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-- 
cgit v1.1