From 1dbd8f3cd38a1d56314ff351450ba21410dcfd59 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 12 Apr 2011 19:33:38 -0700
Subject: Updated numerous labels in the Web tab

---
 .../default/xui/en-us/panel_preferences_web.xml    | 63 +++++++++-------------
 1 file changed, 25 insertions(+), 38 deletions(-)

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 29ce16c..7de8ef7 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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Web" left="102" mouse_opaque="true" name="web"
+     height="408" label="Web Browser" left="102" mouse_opaque="true" name="web"
      width="517">
 	<radio_group bottom="-45" draw_border="false" follows="top|left" height="40" left="12"
 	     name="use_external_browser" width="480">
@@ -16,66 +16,53 @@
 	<button bottom_delta="-30" enabled="true" follows="left|top" font="SansSerif"
 	     halign="center" height="22" label="Clear Built-In Browser Cache" left="35"
 	     mouse_opaque="true" name="clear_cache" scale_image="true" width="250" />
-	<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="15" mouse_opaque="false" name="cookie_label" v_pad="0"
-	     width="128">
-		Cookies:
-	</text>
-	<check_box bottom_delta="-7" enabled="true" follows="left|top" 
-		 font="SansSerifSmall" height="16" initial_value="false"
-	     label="Accept cookies from sites" left="140" mouse_opaque="true"
+	<check_box bottom_delta="-35" enabled="true" follows="left|top" 
+		   font="SansSerifSmall" height="16" initial_value="false"
+	     label="Accept cookies while using built-in web browser" left="15" mouse_opaque="true"
+       tool_top="Allows the built-in web browser to accept cookies from websites" 
 	     name="cookies_enabled" radio_style="false" width="256" />
-	<button  bottom_delta="-20" enabled="true" follows="left|top" font="SansSerif"
-	     halign="center" height="18" label="Clear Cookies" left_delta="0" 
+	<button  bottom_delta="-25" enabled="true" follows="left|top" font="SansSerif"
+	     halign="center" height="20" label="Clear Cookies" left_delta="20" 
 	     tool_tip="Clear Cookies"
 	     mouse_opaque="true" name="clear_ookies" scale_image="true" width="110" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-24" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="10" left="15" mouse_opaque="false" name="proxy_label" v_pad="0"
-	     width="128">
-		Web Proxy:
-	</text>
-	<check_box bottom_delta="-7" enabled="true"
+	<check_box bottom_delta="-35" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Enable web proxy" left="140" mouse_opaque="true"
+	     label="Enable proxy for built-in web browser" left="15" 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"
+	     bottom_delta="-18" drop_shadow_visible="true" enabled="true"
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="10" left="140" mouse_opaque="false" name="proxy_text_label"
+	     height="10" left_delta="20" mouse_opaque="false" name="proxy_text_label"
 	     v_pad="0" width="128">
 		Address:
 	</text>
 	<line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
-	     height="20" left="217" name="web_proxy_editor"
+	     height="20" left="112" name="web_proxy_editor"
 	     tool_tip="The name or IP address of the proxy you would like to use"
 	     width="200" />
-	<spinner bottom_delta="-25" decimal_digits="0"
+	<spinner bottom_delta="-20" 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="35"
 	     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"
-	     bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+	     bottom_delta="-30" drop_shadow_visible="true" enabled="true"
 	     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">
-		World search:
-	</text>
-	<line_editor bottom_delta="-8" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="18" left="100" name="world_search_editor"
+	     v_pad="0" width="200">
+    Custom All (web) search tab URL:
+  </text>
+	<line_editor bottom_delta="-25" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="18" left="15" name="world_search_editor"
 	     tool_tip="Address of the world search engine you would like to use"
-	     width="355" />
+	     width="400" />
 	<button bottom_delta="-22" enabled="true" follows="left|top" font="SansSerif"
-	     halign="center" height="18" label="Reset" left="100" 
+	     halign="center" height="20" label="Reset" left="15" 
 	     tool_tip="Reset to default"
-	     mouse_opaque="true" name="world_search_reset_default" scale_image="true" width="65" />
+	     mouse_opaque="true" name="world_search_reset_default" scale_image="true" width="80" />
 	<button  bottom_delta="0" enabled="true" follows="left|top" font="SansSerif"
-	     halign="center" height="18" label="Clear" left="170" 
+	     halign="center" height="20" label="Clear" left_delta="85" 
 	     tool_tip="clear field"
-	     mouse_opaque="true" name="world_search_clear" scale_image="true" width="65" />
+	     mouse_opaque="true" name="world_search_clear" scale_image="true" width="80" />
 
 </panel>
-- 
cgit v1.1