diff options
| author | eli <none@none> | 2011-09-16 11:49:00 -0700 |
|---|---|---|
| committer | eli <none@none> | 2011-09-16 11:49:00 -0700 |
| commit | 48dd723024439ff2011b9f4f0a808aaf4ac9cf6b (patch) | |
| tree | 52f655d7849b4c0a92836092124f1b6bafa61798 /indra/newview/skins/default/xui/en/floater_preferences_proxy.xml | |
| parent | 6e5ff42f9e469489007f28c089e11d1cc7635021 (diff) | |
sync with viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_preferences_proxy.xml')
| -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: |