Sync notifications with upstream to fix Issue 1913: Unable to log in. ERROR

This commit is contained in:
Inusaito Sayori
2015-05-07 09:33:30 -04:00
parent e71d94aa69
commit 2631ae91e7

View File

@@ -8460,6 +8460,138 @@ Only textures will upload as temporary on Agni and Aditi.
canceltext="Cancel"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_NOT_PERMITTED"
type="alertmodal">
The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set.
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_CONNECT_ERROR"
type="alertmodal">
The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel.
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_NOT_ACCEPTABLE"
type="alertmodal">
The SOCKS 5 proxy "[HOST]:[PORT]" refused the selected authentication system.
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_AUTH_FAIL"
type="alertmodal">
The SOCKS 5 proxy "[HOST]:[PORT]" reported your credentials are invalid.
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_UDP_FWD_NOT_GRANTED"
type="alertmodal">
The SOCKS 5 proxy "[HOST]:[PORT]" refused the UDP associate request.
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_HOST_CONNECT_FAILED"
type="alertmodal">
Could not connect to SOCKS 5 proxy server "[HOST]:[PORT]".
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_UNKNOWN_STATUS"
type="alertmodal">
Unknown proxy error with server "[HOST]:[PORT]".
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_INVALID_HOST"
type="alertmodal">
Invalid SOCKS proxy address or port "[HOST]:[PORT]".
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_BAD_CREDS"
type="alertmodal">
Invalid SOCKS 5 username or password.
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="PROXY_INVALID_HTTP_HOST"
type="alertmodal">
Invalid HTTP proxy address or port "[HOST]:[PORT]".
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="PROXY_INVALID_SOCKS_HOST"
type="alertmodal">
Invalid SOCKS proxy address or port "[HOST]:[PORT]".
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="ChangeProxySettings"
type="alert">
Proxy settings take effect after you restart [APP_NAME].
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
name="AuthRequest"
type="browser">