From cff5251f064005f213a905f6eb41b5b7ef8c954b Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Fri, 12 Aug 2011 14:23:43 -0400
Subject: LLProxy: xui string cleanup.

---
 indra/newview/llfloaterpreference.cpp                  |  2 +-
 .../skins/default/xui/en/floater_preferences_proxy.xml |  2 +-
 indra/newview/skins/default/xui/en/notifications.xml   | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 61eac7bf14..bd9efdd409 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -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
 		}
 	}
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"
-- 
cgit v1.2.3