From 6d5534b37f9af2e03b2ca486a902e0cecc3b5e1c Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 16 Dec 2012 22:05:47 +0100
Subject: [PATCH] RLVa: Fixed localizability of RLVa notification strings

---
 indra/newview/rlvcommon.h                           | 3 ++-
 indra/newview/skins/default/xui/en/rlva_strings.xml | 6 +++---
 indra/newview/skins/default/xui/pl/rlva_strings.xml | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/indra/newview/rlvcommon.h b/indra/newview/rlvcommon.h
index 23937e8559..678a339878 100644
--- a/indra/newview/rlvcommon.h
+++ b/indra/newview/rlvcommon.h
@@ -19,6 +19,7 @@
 
 #include "llavatarname.h"
 #include "llselectmgr.h"
+#include "lltrans.h"
 #include "llviewercontrol.h"
 
 #include "rlvdefines.h"
@@ -160,7 +161,7 @@ public:
 
 	static void notifyBlocked(const std::string& strNotifcation, const LLSD& sdArgs = LLSD());
 	static void notifyBlockedGeneric()	{ notifyBlocked(RLV_STRING_BLOCKED_GENERIC); }
-	static void notifyBlockedViewXXX(LLAssetType::EType assetType) { notifyBlocked(RLV_STRING_BLOCKED_VIEWXXX, LLSD().with("[TYPE]", LLAssetType::lookup(assetType))); }
+	static void notifyBlockedViewXXX(LLAssetType::EType assetType) { notifyBlocked(RLV_STRING_BLOCKED_VIEWXXX, LLSD().with("[TYPE]", LLTrans::getString(LLAssetType::lookupHumanReadable(assetType)))); }
 	static void notifyFailedAssertion(const std::string& strAssert, const std::string& strFile, int nLine);
 
 	static void sendBusyMessage(const LLUUID& idTo, const std::string& strMsg, const LLUUID& idSession = LLUUID::null);
diff --git a/indra/newview/skins/default/xui/en/rlva_strings.xml b/indra/newview/skins/default/xui/en/rlva_strings.xml
index 8337286c98..568dc8d7bc 100644
--- a/indra/newview/skins/default/xui/en/rlva_strings.xml
+++ b/indra/newview/skins/default/xui/en/rlva_strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<rlva_strings>
+<rlva_strings name="rlv_root">
 
-  <strings>
+  <strings name="rlv_strings">
     <!-- Primarily used when @showloc restricted -->
     <string name="hidden_generic">(Hidden)</string>
     <string name="hidden_parcel">(Hidden parcel)</string>
@@ -37,7 +37,7 @@
   </strings>
 
   <!-- Generic names used to replace resident names when @shownames restricted -->
-  <anonyms>
+  <anonyms name="rlv_anonyms">
     <anonym>A resident</anonym>
     <anonym>This resident</anonym>
     <anonym>That resident</anonym>
diff --git a/indra/newview/skins/default/xui/pl/rlva_strings.xml b/indra/newview/skins/default/xui/pl/rlva_strings.xml
index 5627d3806e..6e3df28c75 100644
--- a/indra/newview/skins/default/xui/pl/rlva_strings.xml
+++ b/indra/newview/skins/default/xui/pl/rlva_strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<rlva_strings>
-  <strings>
+<rlva_strings name="rlv_root">
+  <strings name="rlv_strings">
     <string name="hidden_generic">(Ukryte)</string>
     <string name="hidden_parcel">(Ukryta działka)</string>
     <string name="hidden_region">(Ukryty region)</string>
@@ -20,7 +20,7 @@
       Rezydent, któremu zaproponowałeś/aś teleport ma uniemożliwione odbieranie ich na tą chwilę, spróbuj później.
     </string>
   </strings>
-  <anonyms>
+  <anonyms name="rlv_anonyms">
     <anonym>Rezydent</anonym>
     <anonym>Osoba</anonym>
     <anonym>Nieznajomy</anonym>