Commits

Scott Lawrence  committed 7c0465f Merge

merge changes for storm-891

  • Participants
  • Parent commits 8a2d5e0, b1915d6

Comments (0)

Files changed (2)

File indra/newview/llviewermessage.cpp

 	{
 		LLSD args;
 		std::string new_msg =LLNotifications::instance().getGlobalString(message);
-		args["MESSAGE"] = new_msg;
+
+		std::string localized_msg;
+		bool is_message_localized = LLTrans::findString(localized_msg, new_msg);
+
+		args["MESSAGE"] = is_message_localized ? localized_msg : new_msg;
 		LLNotificationsUtil::add("SystemMessageTip", args);
 	}
 }

File indra/newview/skins/default/xui/en/strings.xml

 		The session initialization is timed out
 	</string>
   
+  <string name="Home position set.">Home position set.</string>
+  
   <string name="voice_morphing_url">http://secondlife.com/landing/voicemorphing</string>
 
   <!-- Financial operations strings -->