From 6a654c0dd2d50e299bc169ed20ffefeda8fa0872 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 17 Nov 2011 20:00:44 +0100
Subject: [PATCH] (no name) mark for nameless objects made localizable + German
 translation

---
 indra/newview/llviewermessage.cpp                         | 8 +++-----
 .../skins/default/xui/de/panel_preferences_chat.xml       | 2 +-
 indra/newview/skins/default/xui/de/strings.xml            | 3 +++
 indra/newview/skins/default/xui/en/strings.xml            | 1 +
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index d442eb52d7..1daa11b481 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -169,9 +169,6 @@ LLFrameTimer gThrottleTimer;
 const U32 OFFER_THROTTLE_MAX_COUNT=5; //number of items per time period
 const F32 OFFER_THROTTLE_TIME=10.f; //time period in seconds
 
-// no name object substitute name -KC
-const static std::string NO_NAME_OBJECT = "(no name)";
-
 //script permissions
 const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] = 
 	{ 
@@ -3539,9 +3536,10 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 		if (chat.mSourceType == CHAT_SOURCE_OBJECT && boost::regex_search(from_name, whitespace_exp))
 		{
 			//[FIRE-2434 Mark Unamed Objects based on setting
-			if (gSavedSettings.getBOOL("FSMarkObjects"))
+			static LLCachedControl<bool> FSMarkObjects(gSavedSettings, "FSMarkObjects");
+			if (FSMarkObjects)
 			{
-				chat.mFromName = NO_NAME_OBJECT;
+				chat.mFromName = LLTrans::getString("no_name_object");
 			}
 			else
 			{
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 30fa833e62..a16dad4af4 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -125,7 +125,7 @@
             <check_box name="FSShowChatChannel" label="Kanalauswahl in Eingabezeile anzeigen"/>
             <check_box label="Haupteingabezeile für Chat automatisch verstecken" name="AutohideChatBar" tool_tip="Eingabezeile in der unteren Buttonleiste automatisch verstecken und nur zur Eingabe anzeigen"/>
             <check_box label="Chatleiste nach Senden deaktivieren" name="CloseChatOnReturn"/>
-            <check_box name="FSMarkObjects" label="Objektename als (no name) anzeigen um Vortäuschungen zu unterbinden"/>
+            <check_box name="FSMarkObjects" label="Objektename als (unbenannt) anzeigen um Vortäuschungen zu unterbinden"/>
 
             <!-- Groups -->
             <text name="group_enhancements">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 40ac03a916..77ba81cf29 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -880,6 +880,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ST_NO_JOINT">
 		HAUPTVERZEICHNIS oder VERBINDUNG nicht gefunden.
 	</string>
+	<string name="no_name_object">
+		(unbenannt)
+	</string>
 	<string name="whisper">
 		flüstert:
 	</string>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 61d67aea6b..e2ac1ac0a4 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -395,6 +395,7 @@ Please try logging in again in a minute.</string>
 	<string name="ST_NO_JOINT">Can't find ROOT or JOINT.</string>
 
 	<!-- Chat -->
+	<string name="no_name_object">(no name)</string>
 	<string name="whisper">whispers:</string>
 	<string name="shout">shouts:</string>
 	<string name="ringing">Connecting to in-world Voice Chat...</string>