diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-15 15:27:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-15 15:27:13 -0400 |
| commit | d3c05d52e5b26084280f048de9e321e3bb6b5ece (patch) | |
| tree | 386f883ebacbbc14553d5952870abee4aba0ae4b /indra | |
| parent | 3981afe7fd1e8121139465488e3d13a36de8fa8f (diff) | |
| parent | 8ed52654d05d981dd8a5d63b7cb5445bdcabb271 (diff) | |
merge changes for storm-1585
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_preferences_proxy.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml index 449731ab89..93bfe53aae 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml @@ -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: |