STORM-435 : pull into viewer-development

doc/contributions.txt

@@ -373,22 +373,23 @@ JB Kraft
 Joghert LeSabre
 	VWR-64
 Jonathan Yap
+	STORM-435
 	STORM-523
 	STORM-596
 	STORM-615
 	STORM-616
+	STORM-643
 	STORM-679
 	STORM-723
 	STORM-726
 	STORM-737
-	STORM-869
 	STORM-785
 	STORM-812
 	STORM-829
+	STORM-844
+	STORM-869
 	VWR-17801
 	VWR-24347
-	STORM-844
-	STORM-643
 Kage Pixel
 	VWR-11
 Ken March

indra/newview/llpreviewgesture.cpp

@@ -1597,7 +1597,7 @@ std::string LLPreviewGesture::getLabel(std::vector<std::string> labels)
 	
 	if(v_labels[0]=="Chat")
 	{
-		result=LLTrans::getString("Chat");
+		result=LLTrans::getString("Chat Message");
 	}
     else if(v_labels[0]=="Sound")	
 	{

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

@@ -1948,7 +1948,7 @@ Requests name of an avatar.  When data is available the dataserver event will be
 
 	<!-- Gestures labels -->
     <!-- use value="" because they have preceding spaces -->
-    <string name="Chat"          value=" Chat : " />
+    <string name="Chat Message"  value=" Chat : " />
     <string name="Sound"         value=" Sound : " />
 	<string name="Wait"          value=" --- Wait : " />
 	<string name="AnimFlagStop"  value=" Stop Animation :    " />