automatic translation feature

2 files changed, 84 insertions, 6 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 54c146d..2e6fee4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -65,9 +65,9 @@
       Control your camera
   </string>
 
-  <layout_stack border="false" bottom="2" follows="left|top|right|bottom" height="250" left="2"
+  <layout_stack border="false" bottom="2" follows="left|top|right|bottom" height="255" left="2"
              orientation="horizontal" width="430" name="panels">
-                <layout_panel border="false" bottom="0" default_tab_group="1" height="130" left="0"
+                <layout_panel border="false" bottom="0" default_tab_group="1" height="135" left="0"
                      min_width="275" name="im_contents_panel" width="305">
                         <combo_box follows="left|top" height="20" label="Gestures" left="5" name="Gesture"
                              width="120">
@@ -75,10 +75,13 @@
                                         Gestures
                                 </combo_item>
                         </combo_box>
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="20" initial_value="false" label="Show muted text" left_delta="125"
+                        <check_box bottom_delta="7" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="20" initial_value="false" label="Show Muted Text" left_delta="125"
                              name="show mutes" radio_style="false" width="116" />
-                        <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
+                        <check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="20" initial_value="false" label="Translate Chat (powered by Google)" left_delta="0"
+                             name="translate chat" radio_style="false" width="100" />
+                        <button bottom_delta="7" follows="right|top" height="20" label="&lt; &lt;"
                              label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn"
                              right="305"
                              tool_tip="Click here to show list of active participants in this IM session."
@@ -107,7 +110,7 @@
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
                                      enabled="true" follows="left|right|bottom" font="SansSerif"
                                      handle_edit_keys_directly="false" height="20" label="Click here to chat."
-                                     left="0" max_length="254" mouse_opaque="true" name="Chat Editor"
+                                     left="105" max_length="2147483647" mouse_opaque="true" name="Chat Editor"
                                      right="-70" select_all_on_focus_received="false" select_on_focus="false"
                                      tab_group="1" />
                                 <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 61c6b23..95d0c33 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -162,4 +162,79 @@
              increment="0.05" initial_val="1" label="Bubble opacity:" left="148" max_val="1"
              min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
              value="0.5" width="225" />
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-420" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+             mouse_opaque="false" name="text_translate_chat" v_pad="0" width="128">
+                Translate Chat:
+        </text>
+        <check_box bottom="-427" control_name="TranslateChat" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Use machine translation while chatting (powered by Google)" left="148" mouse_opaque="true"
+             name="translate_chat" radio_style="false" width="237" />
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-442" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="149"
+             mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
+                Translate into this language:
+        </text> 
+        <combo_box allow_text_entry="true" bottom="-448" enabled="true"
+             follows="left|top" height="16" left_delta="183" max_chars="135"
+             mouse_opaque="true" name="translate_language_combobox" width="146">
+                <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
+                        System Default
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="English" value="en">
+                        English
+                </combo_item>
+                
+                <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
+                
+                <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
+                        Dansk (Danish)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
+                        Deutsch (German)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+                        Español (Spanish)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="French" value="fr">
+                        Français (French)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
+                        Italiano (Italian)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
+                        Magyar (Hungarian)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
+                        Nederlands (Dutch)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
+                        Polski (Polish)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
+                        Portugués (Portuguese)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
+                        Русский (Russian)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
+                        Türkçe (Turkish)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
+                        Українська (Ukrainian)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+                        中文 (简体) (Chinese)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+                        日本語 (Japanese)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+                        한국어 (Korean)
+                </combo_item>
+        </combo_box>
 </panel>