summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-06-28 19:54:53 -0400
committerLogan Dethrow <log@lindenlab.com>2011-06-28 19:54:53 -0400
commit7717b6f647feb250c0b94d038f72a640a7888915 (patch)
treeb021d01c78cd8fde5df522b11e2a71ebef9ed34b /indra/newview/skins/default/xui/en/notifications.xml
parentf91d40c25949ee8c5b1d5c1babab62d6dd90d0c8 (diff)
STORM-1112 More cleanup of SOCKS 5 proxy code.
Renamed llsocks5.cpp to llproxy.cpp.
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rwxr-xr-xindra/newview/skins/default/xui/en/notifications.xml21
1 files changed, 14 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 06a9baf8c8..7bf742d949 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7164,7 +7164,8 @@ Click and drag anywhere on the world to rotate your view
icon="alertmodal.tga"
name="SOCKS_NOT_PERMITTED"
type="alertmodal">
- The Socks5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set
+ The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set
+ <tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
@@ -7174,7 +7175,8 @@ Click and drag anywhere on the world to rotate your view
icon="alertmodal.tga"
name="SOCKS_CONNECT_ERROR"
type="alertmodal">
- The Socks5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel
+ The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel
+ <tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
@@ -7184,7 +7186,8 @@ Click and drag anywhere on the world to rotate your view
icon="alertmodal.tga"
name="SOCKS_NOT_ACCEPTABLE"
type="alertmodal">
- The Socks5 proxy "[HOST]:[PORT]" refused the selected authentication system
+ The SOCKS 5 proxy "[HOST]:[PORT]" refused the selected authentication system
+ <tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
@@ -7194,7 +7197,8 @@ Click and drag anywhere on the world to rotate your view
icon="alertmodal.tga"
name="SOCKS_AUTH_FAIL"
type="alertmodal">
- The Socks5 proxy "[HOST]:[PORT]" reported your credentials are invalid
+ The SOCKS 5 proxy "[HOST]:[PORT]" reported your credentials are invalid
+ <tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
@@ -7204,7 +7208,8 @@ Click and drag anywhere on the world to rotate your view
icon="alertmodal.tga"
name="SOCKS_UDP_FWD_NOT_GRANTED"
type="alertmodal">
- The Socks5 proxy "[HOST]:[PORT]" refused the UDP associate request
+ The SOCKS 5 proxy "[HOST]:[PORT]" refused the UDP associate request
+ <tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
@@ -7214,7 +7219,8 @@ Click and drag anywhere on the world to rotate your view
icon="alertmodal.tga"
name="SOCKS_HOST_CONNECT_FAILED"
type="alertmodal">
- Could not connect to Socks5 proxy server "[HOST]:[PORT]"
+ Could not connect to SOCKS 5 proxy server "[HOST]:[PORT]"
+ <tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
@@ -7224,7 +7230,8 @@ Click and drag anywhere on the world to rotate your view
icon="alertmodal.tga"
name="ChangeSocks5Settings"
type="alert">
- Socks 5 proxy settings take effect after you restart [APP_NAME].
+ SOCKS 5 proxy settings take effect after you restart [APP_NAME].
+ <tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>