livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-1585

meow-7.2.2
Oz Linden 2011-09-15 15:27:13 -04:00
parent 3981afe7fd 8ed52654d0
commit d3c05d52e5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
View File

@ -29,7 +29,7 @@
height="10"
left_delta="23"
layout="topleft"
name="Proxy location"
name="http_proxy_label"
top_pad="10"
width="300">
HTTP Proxy:
@ -81,7 +81,7 @@
height="10"
layout="topleft"
left_delta="23"
name="Proxy location"
name="socks5_proxy_label"
top_pad="10"
width="300">
SOCKS 5 Proxy:
@ -125,7 +125,7 @@
height="10"
layout="topleft"
left="40"
name="Proxy location"
name="socks_auth_label"
top_pad="15"
width="300">
SOCKS Authentication:
@ -163,6 +163,7 @@
height="10"
layout="topleft"
left_delta="20"
name="socks5_username_label"
top_delta="50"
width="200">
Username:
@ -174,6 +175,7 @@
height="10"
left_pad="15"
layout="topleft"
name="socks5_password_label"
width="200">
Password:
</text>
@ -207,7 +209,7 @@
height="10"
layout="topleft"
left="25"
name="Proxy location"
name="other_proxy_label"
top_pad="18"
width="300">
Other HTTP traffic proxy: