merge changes for storm-1674

2011-11-08 14:05:16 -05:00 · 2011-11-08 14:05:16 -05:00 · 49f2c4f78a
parent 450dc71396 c8f88d1d59
commit 49f2c4f78a
2 changed files with 2 additions and 1 deletions
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@ -583,6 +583,7 @@ Jonathan Yap
 	STORM-910
 	STORM-1642
 	STORM-1659
+	STORM-1674
 Kadah Coba
 	STORM-1060
 Jondan Lundquist
--- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
@ -4,7 +4,7 @@
 height="310"
 layout="topleft"
 name="floater_translation_settings"
- help_topic="environment_editor_floater"
+ help_topic="translation_settings"
 save_rect="true"
 title="CHAT TRANSLATION SETTINGS"
 width="485">