summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-04-18 10:07:40 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-04-18 10:07:40 -0400
commitda7cd9f8117757cd6acb0a5e93bc3c60443374f9 (patch)
tree3916874ed180ee9567b4fb76d88d8ce72689c257 /indra/newview/skins/default/xui/en/panel_preferences_chat.xml
parentd534c8009f2573400a21c19b00691536fc3cc23f (diff)
parentb8069d1c250c03e9fffda0a9264bfd04a12f8292 (diff)
merged from 2.6.4-start tag in viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml20
1 files changed, 16 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index a1082d9c32..404537e1f2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -208,15 +208,27 @@
<check_box
control_name="TranslateChat"
enabled="true"
- height="16"
- label="Use machine translation while chatting (powered by Google)"
+ height="16"
layout="topleft"
left="30"
name="translate_chat_checkbox"
- bottom_delta="30"
+ top_pad="5"
width="400" />
+ <!-- *HACK
+ After storm-1109 will be fixed: instead of using this text_box, word_wrap should be applied for "translate_chat_checkbox" check_box's label.-->
+ <text
+ follows="top|left"
+ height="15"
+ layout="topleft"
+ left="50"
+ name="translate_chb_label"
+ top_delta="1"
+ width="450"
+ wrap="true">
+ Use machine translation while chatting (powered by Google)
+ </text>
<text
- bottom_delta="30"
+ top_pad="20"
name="translate_language_text"
follows="left|top"
layout="topleft"