diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-06-08 15:17:19 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-06-08 15:17:19 -0400 |
| commit | 7cb18f5318e0cafab434513d8563688c21d3747c (patch) | |
| tree | c0309e20557d955b05fb6b8bd2e96adaef625a08 /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | 0de24f857ac359e04d7def2afa7d8efe5a4cef97 (diff) | |
| parent | 74d9bf0d5525426feae4ea21e2a81034ddcf4d7f (diff) | |
Merged STORM-1112 with viewer-development. Fixed license in socks5.cpp and socks5.h.
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ce96c488b4..815e8f96ab 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7159,6 +7159,76 @@ Click and drag anywhere on the world to rotate your view </notification> <notification + icon="alertmodal.tga" + name="SOCKS_NOT_PERMITTED" + type="alertmodal"> + The Socks5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="SOCKS_CONNECT_ERROR" + type="alertmodal"> + The Socks5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="SOCKS_NOT_ACCEPTABLE" + type="alertmodal"> + The Socks5 proxy "[HOST]:[PORT]" refused the selected authentication system + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="SOCKS_AUTH_FAIL" + type="alertmodal"> + The Socks5 proxy "[HOST]:[PORT]" reported your credentials are invalid + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="SOCKS_UDP_FWD_NOT_GRANTED" + type="alertmodal"> + The Socks5 proxy "[HOST]:[PORT]" refused the UDP associate request + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="SOCKS_HOST_CONNECT_FAILED" + type="alertmodal"> + Could not connect to Socks5 proxy server "[HOST]:[PORT]" + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="ChangeSocks5Settings" + type="alert"> + Socks 5 proxy settings take effect after you restart [APP_NAME]. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification name="AuthRequest" type="browser"> The site at '<nolink>[HOST_NAME]</nolink>' in realm '[REALM]' requires a user name and password. |