summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences_proxy.xml2
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml18
2 files changed, 10 insertions, 10 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 020ee52c18..fb5f85bf58 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -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
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6867305b70..5aa66b2bd3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -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"