diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-08 14:05:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-08 14:05:16 -0500 |
| commit | 49f2c4f78abc74cb8faf9e844f6ee4cbecc6b3de (patch) | |
| tree | ec42353ef05291a378e50a1499bf2428f7903d93 | |
| parent | 450dc713969e7122047217f3b7e0c36909ee4953 (diff) | |
| parent | c8f88d1d595d3ca0fdf504c1d365edd191791237 (diff) | |
merge changes for storm-1674
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_translation_settings.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 8454dc2782..9358130a24 100644 --- 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 diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml index c03f751265..a212ce7889 100644 --- 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"> |