Merge branch 'next' of git://github.com/imprudence/imprudence into next

Conflicts:
	linden/indra/newview/installers/windows/meta-impy_installer_template.iss
Branding conflict, fixed.
	linden/indra/newview/llviewerwindow.cpp
Already had this change, but merged the minor difference.

2 files changed, 4 insertions, 89 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 e83a930..0d80a21 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
@@ -75,12 +75,9 @@
                                         Gestures
                                 </combo_item>
                         </combo_box>
-                        <check_box bottom_delta="7" enabled="true" follows="left|top" font="SansSerifSmall"
+                        <check_box bottom_delta="0" 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" />
-                        <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 name="toggle_active_speakers_btn"
                              label="&lt;&lt;" label_selected="&gt;&gt;" follows="right|top"
                              bottom_delta="0" left="262" right="305" height="20"
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 cf947ee..566fdad 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
@@ -192,10 +192,10 @@ USE left="270" FOR TABBING OPTIONS
     </panel>
     
     
-    <!-- SPELL CHECKING AND TRANSLATE PANEL -->
+    <!-- SPELL CHECKING PANEL -->
 
 
-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Spell Checking &amp; Translate"
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Spell Checking"
          left="1" mouse_opaque="true" name="spell_check_tab" width="418">
 
 
@@ -252,89 +252,7 @@ USE left="270" FOR TABBING OPTIONS
       <button name="ac_button" label="AutoCorrect..." halign="center"
          tool_tip="Modify the AutoCorrect word list and settings" left="50"
          bottom_delta="-40" width="160" height="20" font="SansSerifSmall" follows="left|top"/>
-
-
-      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
-            height="1" left="55" name="border" width="380" />
-
-
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-          bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
-          mouse_opaque="false" name="text_translate" v_pad="0" width="128">
-        Translate Chat:
-      </text>
-      <check_box bottom_delta="-25" 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_delta="30" 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_delta="-16" drop_shadow_visible="true" enabled="true" follows="left|top"
-           font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
-           mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
-        Translate into this language:
-      </text>
-
-      <combo_box allow_text_entry="false" bottom_delta="-5" enabled="true"
-           follows="left|top" height="16" left="270" max_chars="135"
-           mouse_opaque="true" name="translate_language_combobox" width="160">
-        <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>
-
+      
 
       <button bottom="-20" follows="left|top" font="SansSerifSmall" height="18" label="?"
              name="EmeraldHelp_SpellCheck" tool_tip="Click here for help regarding the settings in this page."