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

LLProxy: xui string cleanup.

meow-7.2.2
Logan Dethrow 2011-08-12 14:23:43 -04:00
parent 1fa2afbe20
commit cff5251f06
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterpreference.cpp
View File

@ -1972,7 +1972,7 @@ void LLFloaterPreferenceProxy::onClose(bool app_quitting)
// it will not be updated until next restart.
if (LLStartUp::getStartupState()>STATE_LOGIN_WAIT)
{
LLNotifications::instance().add("ChangeSocks5Settings", LLSD(), LLSD());
LLNotifications::instance().add("ChangeProxySettings", LLSD(), LLSD());
mSocksSettingsDirty = false; // we have notified the user now be quiet again
}
}

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

@ -4,7 +4,7 @@
height="500"
layout="topleft"
name="Proxy Settings Floater"
help_topic="proxy_settings_floater"
help_topic="proxysettings"
title="Proxy Settings"
width="500">
<check_box

18
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -7160,7 +7160,7 @@ Click and drag anywhere on the world to rotate your view
icon="alertmodal.tga"
name="SOCKS_NOT_PERMITTED"
type="alertmodal">
The SOCKS 5 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"
@ -7171,7 +7171,7 @@ Click and drag anywhere on the world to rotate your view
icon="alertmodal.tga"
name="SOCKS_CONNECT_ERROR"
type="alertmodal">
The SOCKS 5 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"
@ -7182,7 +7182,7 @@ Click and drag anywhere on the world to rotate your view
icon="alertmodal.tga"
name="SOCKS_NOT_ACCEPTABLE"
type="alertmodal">
The SOCKS 5 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"
@ -7193,7 +7193,7 @@ Click and drag anywhere on the world to rotate your view
icon="alertmodal.tga"
name="SOCKS_AUTH_FAIL"
type="alertmodal">
The SOCKS 5 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"
@ -7204,7 +7204,7 @@ Click and drag anywhere on the world to rotate your view
icon="alertmodal.tga"
name="SOCKS_UDP_FWD_NOT_GRANTED"
type="alertmodal">
The SOCKS 5 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"
@ -7215,7 +7215,7 @@ 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 SOCKS 5 proxy server "[HOST]:[PORT]"
Could not connect to SOCKS 5 proxy server "[HOST]:[PORT]".
<tag>fail</tag>
<usetemplate
name="okbutton"
@ -7226,7 +7226,7 @@ Click and drag anywhere on the world to rotate your view
icon="alertmodal.tga"
name="SOCKS_UNKNOWN_STATUS"
type="alertmodal">
Unknown SOCKS error with server "[HOST]:[PORT]"
Unknown proxy error with server "[HOST]:[PORT]".
<tag>fail</tag>
<usetemplate
name="okbutton"
@ -7279,9 +7279,9 @@ Click and drag anywhere on the world to rotate your view
<notification
icon="alertmodal.tga"
name="ChangeSocks5Settings"
name="ChangeProxySettings"
type="alert">
SOCKS 5 proxy settings take effect after you restart [APP_NAME].
Proxy settings take effect after you restart [APP_NAME].
<tag>fail</tag>
<usetemplate
name="okbutton"