10 files changed, 308 insertions, 12 deletions

diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
index 20a376f152..7d17f80268 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
@@ -56,4 +56,27 @@
 		<radio_item label="Separate vinduer" name="radio" value="0"/>
 		<radio_item label="Faner" name="radio2" value="1"/>
 	</radio_group>
+	<check_box label="OversÊt Chat" name="translate_chat_checkbox" />
+	<text name="translate_language_text" width="110">
+		Chat Sprog:
+	</text>
+	<combo_box name="translate_language_combobox" width="146">
+		<combo_box.item label="System standard" name="System Default Language"/>
+		<combo_box.item label="English (Engelsk)" name="English"/>
+		<combo_box.item label="Dansk" name="Danish"/>
+		<combo_box.item label="Deutsch (Tysk)" name="German"/>
+		<combo_box.item label="Español (Spansk)" name="Spanish"/>
+		<combo_box.item label="Français (Fransk)" name="French"/>
+		<combo_box.item label="Italiano (Italiensk)" name="Italian" />
+		<combo_box.item label="Magyar (Ungarsk)" name="Hungarian" />
+		<combo_box.item label="Nederlands (Hollandsk)" name="Dutch" />
+		<combo_box.item label="Polski (Polsk)" name="Polish" />
+		<combo_box.item label="Portugués (Portugisisk)" name="Portugese" />
+		<combo_box.item label="РусскОй (Russisk)" name="Russian" />
+		<combo_box.item label="TÌrkçe (Tyrkisk)" name="Turkish" />
+		<combo_box.item label="УкраїМська (Ukrainsk)" name="Ukrainian" />
+		<combo_box.item label="äž­æ–‡ (简䜓) (Kinesisk)" name="Chinese" />
+		<combo_box.item label="日本語 (Japansk)" name="Japanese" />
+		<combo_box.item label="한국얎 (Koreansk)" name="Korean" />
+	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 5c91b34a21..d8039dd380 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -56,4 +56,27 @@
 		<radio_item label="Getrennte Fenster" name="radio" value="0"/>
 		<radio_item label="Registerkarten" name="radio2" value="1"/>
 	</radio_group>
+	<check_box label="Übersetzen Chat" name="translate_chat_checkbox" />
+	<text name="translate_language_text">
+		Chat-Sprache:
+	</text>
+	<combo_box name="translate_language_combobox" width="200">
+		<combo_box.item name="System Default Language" label="Betriebssystem-Einstellung" />
+		<combo_box.item name="English" label="English (Englisch)" />
+		<combo_box.item name="Danish" label="Danks (DÀnisch)" />
+		<combo_box.item name="German" label="Deutsch" />
+		<combo_box.item name="Spanish" label="Español (Spanisch)" />
+		<combo_box.item name="French" label="Français (Französisch)" />
+		<combo_box.item name="Italian" label="Italiano (Italienisch)" />
+		<combo_box.item name="Hungarian" label="Magyar (Ungarisch)" />
+		<combo_box.item name="Dutch" label="Nederlands (NiederlÀndisch)" />
+		<combo_box.item name="Polish" label="Polski (Polnisch)" />
+		<combo_box.item name="Portugese" label="Português (Portugiesisch)" />
+		<combo_box.item name="Russian" label="РусскОй (Russian)" />
+		<combo_box.item name="Turkish" label="TÌrkçe (TÌrkisch)" />
+		<combo_box.item name="Ukrainian" label="УкраїМська (Ukrainisch)" />
+		<combo_box.item name="Chinese" label="äž­æ–‡ (简䜓) (Chinesisch)" />
+		<combo_box.item name="Japanese" label="日本語 (Japanisch)" />
+		<combo_box.item name="Korean" label="한국얎 (Koreanisch)" />
+	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 3b26c2ab59..4c5113aa55 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -14,7 +14,7 @@
  can_dock="true"
  bevel_style="in"
  height="300"
- min_width="150"
+ min_width="235"
  layout="topleft"
  name="nearby_chat"
  help_topic="nearby_chat"
@@ -24,15 +24,25 @@
  save_visibility="true"
  single_instance="true"
  width="320">
+            <check_box
+             bottom_delta="36"
+             control_name="TranslateChat"
+             enabled="true"
+             height="16"
+             label="Translate chat (powered by Google)"
+             layout="topleft"
+             left="5"
+             name="translate_chat_checkbox"
+             width="230" />
   <chat_history
     parse_urls="true"
     bg_readonly_color="ChatHistoryBgColor"
     bg_writeable_color="ChatHistoryBgColor"
     follows="all"
     left="5"
-    top="20"
+    top_delta="17"
     layout="topleft"
-    height="275"
+    height="260"
     name="chat_history"
     parse_highlights="true"
     text_color="ChatHistoryTextColor"
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 ba967d3e2c..9e53180d1f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -104,7 +104,7 @@
      layout="topleft"
      left="190"
      name="agent"
-     top_pad="-17"
+     top_pad="-15"
      width="44" >
 		<color_swatch.init_callback
 		 function="Pref.getUIColor"
@@ -135,7 +135,7 @@
      layout="topleft"
      left="360"
      name="im"
-     top_pad="-17"
+     top_pad="-15"
      width="44">
 		<color_swatch.init_callback
 		 function="Pref.getUIColor"
@@ -166,7 +166,7 @@
      layout="topleft"
      left="40"
      name="system"
-     top_pad="40"
+     top_pad="22"
      width="44" >
 		<color_swatch.init_callback
 		 function="Pref.getUIColor"
@@ -196,7 +196,7 @@
      layout="topleft"
      left="190"
      name="script_error"
-     top_pad="-17"
+     top_pad="-15"
      width="44">
 		<color_swatch.init_callback
 		 function="Pref.getUIColor"
@@ -226,7 +226,7 @@
      layout="topleft"
      left="360"
      name="objects"
-     top_pad="-17"
+     top_pad="-15"
      width="44" >
 		<color_swatch.init_callback
 		 function="Pref.getUIColor"
@@ -256,7 +256,7 @@
      layout="topleft"
      left="40"
      name="owner"
-     top_pad="40"
+     top_pad="22"
      width="44" >
 		<color_swatch.init_callback
 		 function="Pref.getUIColor"
@@ -286,7 +286,7 @@
      layout="topleft"
      left="190"
      name="links"
-     top_pad="-17"
+     top_pad="-15"
      width="44" >
 		<color_swatch.init_callback
 		 function="Pref.getUIColor"
@@ -316,7 +316,7 @@
      layout="topleft"
      left="30"
      name="play_typing_animation"
-     top_pad="40"
+     top_pad="32"
      width="400" />
     <check_box
      enabled="false"
@@ -343,7 +343,7 @@
      left="30"
      height="20"
      width="170"
-     top_pad="20">
+     top_pad="14">
      Show IMs in:
     </text>
     <text
@@ -386,4 +386,106 @@
       top_pad="5"
       width="150" />
     </radio_group>
+    <check_box
+     control_name="TranslateChat"
+     enabled="true"
+     height="16"
+     label="Use machine translation while chatting (powered by Google)"
+     layout="topleft"
+     left="30"
+     name="translate_chat_checkbox"
+     bottom_delta="40"
+     width="400" />
+    <text
+     bottom_delta="30"
+     name="translate_language_text"
+     follows="left|top"
+     layout="topleft"
+     left_delta="20"
+     height="20"
+     width="110">
+     Translate chat into: 
+    </text>
+    <combo_box
+     allow_text_entry="true"
+     bottom_delta="3"
+     control_name="TranslateLanguage"
+     enabled="true"
+     follows="left|top"
+     height="23"
+     left_delta="110"
+     max_chars="135"
+     mouse_opaque="true"
+     name="translate_language_combobox"
+     width="146">
+        <combo_box.item
+         label="System Default"
+         name="System Default Language"
+         value="default" />
+        <combo_box.item
+         label="English"
+         name="English"
+         value="en" />
+        <!-- After "System Default" and "English", please keep the rest of these combo_box.items in alphabetical order by the first character in the string. -->
+        <combo_box.item
+         label="Dansk (Danish)"
+         name="Danish"
+         value="da" />
+        <combo_box.item
+         label="Deutsch (German)"
+         name="German"
+         value="de" />
+        <combo_box.item
+         label="Español (Spanish)"
+         name="Spanish"
+         value="es" />
+        <combo_box.item
+         label="Français (French)"
+         name="French"
+         value="fr" />
+        <combo_box.item
+         label="Italiano (Italian)"
+         name="Italian"
+         value="it" />
+        <combo_box.item
+         label="Magyar (Hungarian)"
+         name="Hungarian"
+         value="hu" />
+        <combo_box.item
+         label="Nederlands (Dutch)"
+         name="Dutch"
+         value="nl" />
+        <combo_box.item
+         label="Polski (Polish)"
+         name="Polish"
+         value="pl" />
+        <combo_box.item
+         label="Portugués (Portuguese)"
+         name="Portugese"
+         value="pt" />
+        <combo_box.item
+         label="РусскОй (Russian)"
+         name="Russian"
+         value="ru" />
+        <combo_box.item
+         label="TÌrkçe (Turkish)"
+         name="Turkish"
+         value="tr" />
+        <combo_box.item
+         label="УкраїМська (Ukrainian)"
+         name="Ukrainian"
+         value="uk" />
+        <combo_box.item
+         label="äž­æ–‡ (简䜓) (Chinese)"
+         name="Chinese"
+         value="zh" />
+        <combo_box.item
+         label="日本語 (Japanese)"
+         name="Japanese"
+         value="ja" />
+        <combo_box.item
+         label="한국얎 (Korean)"
+         name="Korean"
+         value="ko" />
+    </combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index fc8c908788..14d84e5edf 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -56,4 +56,27 @@
 		<radio_item label="Varias ventanas" name="radio" value="0"/>
 		<radio_item label="Pestañas" name="radio2" value="1"/>
 	</radio_group>
+	<check_box label="Traducir Chat" name="translate_chat_checkbox" />
+	<text name="translate_language_text">
+		Idioma de chat:
+	</text>
+	<combo_box name="translate_language_combobox">
+		<combo_box.item name="System Default Language" label="Predeterminado del sistema" />
+		<combo_box.item name="English" label="English (Inglés)" />
+		<combo_box.item name="Danish" label="Dansk (Danés)" />
+		<combo_box.item name="German" label="Deutsch (Alemán)" />
+		<combo_box.item name="Spanish" label="Español" />
+		<combo_box.item name="French" label="Français (Francés)" />
+		<combo_box.item name="Italian" label="Italiano" />
+		<combo_box.item name="Hungarian" label="Magyar (Húngaro)" />
+		<combo_box.item name="Dutch" label="Nederlands (Neerlandés)" />
+		<combo_box.item name="Polish" label="Polski (Polaco)" />
+		<combo_box.item name="Portugese" label="Portugués (Portugués)" />
+		<combo_box.item name="Russian" label="РусскОй (Ruso)" />
+		<combo_box.item name="Turkish" label="TÌrkçe (Turco)" />
+		<combo_box.item name="Ukrainian" label="УкраїМська (Ucraniano)" />
+		<combo_box.item name="Chinese" label="äž­æ–‡ (简䜓) (Chino)" />
+		<combo_box.item name="Japanese" label="日本語 (Japonés)" />
+		<combo_box.item name="Korean" label="한국얎 (Coreano)" />
+	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 76f3319525..cee1a23789 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -56,4 +56,27 @@
 		<radio_item label="Plusieurs fenêtres" name="radio" value="0"/>
 		<radio_item label="Onglets" name="radio2" value="1"/>
 	</radio_group>
+		<check_box label="Traduire Chat" name="translate_chat_checkbox" />
+	<text name="translate_language_text">
+		Langue de chat :
+	</text>
+	<combo_box name="translate_language_combobox">
+		<combo_box.item name="System Default Language" label="Choix par défaut" />
+		<combo_box.item name="English" label="English (Anglais" />
+		<combo_box.item name="Danish" label="Dansk (Danois)" />
+		<combo_box.item name="German" label="Deutsch (Allemand)" />
+		<combo_box.item name="Spanish" label="Español (Espagnol)" />
+		<combo_box.item name="French" label="Français" />
+		<combo_box.item name="Italian" label="Italiano (Italien)" />
+		<combo_box.item name="Hungarian" label="Magyar (Hongrois)" />
+		<combo_box.item name="Dutch" label="Nederlands (Néerlandais)" />
+		<combo_box.item name="Polish" label="Polski (Polonais)" />
+		<combo_box.item name="Portugese" label="Portugués (Portugais)" />
+		<combo_box.item name="Russian" label="РусскОй (Russe)" />
+		<combo_box.item name="Turkish" label="TÌrkçe (Turc)" />
+		<combo_box.item name="Ukrainian" label="УкраїМська (Ukrainien)" />
+		<combo_box.item name="Chinese" label="äž­æ–‡ (简䜓) (Chinois)" />
+		<combo_box.item name="Japanese" label="日本語 (Japonais)" />
+		<combo_box.item name="Korean" label="한국얎 (Coréen)" />
+	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index fb8ddf607d..4da60dae41 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -56,4 +56,27 @@
 		<radio_item label="Finestre separate" name="radio" value="0"/>
 		<radio_item label="Schede" name="radio2" value="1"/>
 	</radio_group>
+	<check_box label="Traduci Chat" name="translate_chat_checkbox" />
+	<text name="translate_language_text" width="110">
+		Chat Lingua:
+	</text>
+	<combo_box name="translate_language_combobox" width="146">
+		<combo_box.item name="System Default Language" label="Default di sistema" />
+		<combo_box.item name="English" label="English" />
+		<combo_box.item name="Danish" label="Dansk (Danese)" />
+		<combo_box.item name="German" label="Deutsch (Tedesco)" />
+		<combo_box.item name="Spanish" label="Español (Spagnolo)" />
+		<combo_box.item name="French" label="Français (Francese)" />
+		<combo_box.item name="Italian" label="Italiano" />
+		<combo_box.item name="Hungarian" label="Magyar (Ungherese)" />
+		<combo_box.item name="Dutch" label="Nederlands (Olandese)" />
+		<combo_box.item name="Polish" label="Polski (Polacco)" />
+		<combo_box.item name="Portugese" label="Portugués (Portoghese)" />
+		<combo_box.item name="Russian" label="РусскОй (Russo)" />
+		<combo_box.item name="Turkish" label="TÌrkçe (Turco)" />
+		<combo_box.item name="Ukrainian" label="УкраїМська (Ukraino)" />
+		<combo_box.item name="Chinese" label="äž­æ–‡ (简䜓) (Cinese)" />
+		<combo_box.item name="Japanese" label="日本語 (Giapponese)" />
+		<combo_box.item name="Korean" label="한국얎 (Coreano)" />
+	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index 86f880de09..a053529436 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -56,4 +56,27 @@
 		<radio_item label="別々のウィンドウ" name="radio" value="0"/>
 		<radio_item label="タブ" name="radio2" value="1"/>
 	</radio_group>
+		<check_box label="翻蚳チャット" name="translate_chat_checkbox" />
+	<text name="translate_language_text">
+		チャット蚀語:
+	</text>
+	<combo_box name="translate_language_combobox">
+		<combo_box.item name="System Default Language" label="システム・デフォルト" />
+		<combo_box.item name="English" label="English (英語)" />
+		<combo_box.item name="Danish" label="Dansk (デンマヌク語)" />
+		<combo_box.item name="German" label="Deutsch (ドむツ語)" />
+		<combo_box.item name="Spanish" label="Español (スペむン語)" />
+		<combo_box.item name="French" label="Français (フランス語)" />
+		<combo_box.item name="Italian" label="Italiano むタリア語" />
+		<combo_box.item name="Hungarian" label="Magyar (ハンガリヌ語)" />
+		<combo_box.item name="Dutch" label="Nederlands オランダ語" />
+		<combo_box.item name="Polish" label="Polski (ポヌランド語)" />
+		<combo_box.item name="Portugese" label="Português (ポルトガル語)" />
+		<combo_box.item name="Russian" label="РусскОй (ロシア語)" />
+		<combo_box.item name="Turkish" label="TÃŒrkçe トルコ語" />
+		<combo_box.item name="Ukrainian" label="УкраїМська (りクラむナ語)" />
+		<combo_box.item name="Chinese" label="äž­æ–‡ (简䜓) (䞭囜語)" />
+		<combo_box.item name="Japanese" label="日本語" />
+		<combo_box.item name="Korean" label="한국얎 (韓囜語)" />
+	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index 5805df402c..424fe7b8df 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -56,4 +56,27 @@
 		<radio_item label="Osobne okna" name="radio" value="0"/>
 		<radio_item label="Etykiety" name="radio2" value="1"/>
 	</radio_group>
+	<check_box label="Przetłumacz Czat" name="translate_chat_checkbox" />
+	<text name="translate_language_text">
+		Czat Język:
+	</text>
+	<combo_box name="translate_language_combobox">
+		<combo_box.item name="System Default Language" label="Domyślny" />
+		<combo_box.item name="English" label="English (Angielski)" />
+		<combo_box.item name="Danish" label="Dansk (Duński)" />
+		<combo_box.item name="German" label="Deutsch (Niemiecki)" />
+		<combo_box.item name="Spanish" label="Español (Hiszpański)" />
+		<combo_box.item name="French" label="Français (Francuski)" />
+		<combo_box.item name="Italian" label="Italiano (Włoski)" />
+		<combo_box.item name="Hungarian" label="Magyar (Węgierski)" />
+		<combo_box.item name="Dutch" label="Nederlands (Niderlandzki)" />
+		<combo_box.item name="Polish" label="Polski" />
+		<combo_box.item name="Portugese" label="Portugués (Portugalski)" />
+		<combo_box.item name="Russian" label="РусскОй (Rosyjski)" />
+		<combo_box.item name="Turkish" label="TÌrkçe (Turecki)" />
+		<combo_box.item name="Ukrainian" label="УкраїМська (Ukraiński)" />
+		<combo_box.item name="Chinese" label="äž­æ–‡ (简䜓) (Chiński)" />
+		<combo_box.item name="Japanese" label="日本語 (Japoński)" />
+		<combo_box.item name="Korean" label="한국얎 (Koreański)" />
+	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index 02b0ef35fe..5b0c546406 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -56,4 +56,27 @@
 		<radio_item label="Janelas separadas" name="radio" value="0"/>
 		<radio_item label="Guias" name="radio2" value="1"/>
 	</radio_group>
+	<check_box label="Traduzir Chat" name="translate_chat_checkbox" />
+	<text name="translate_language_text">
+		Chat Língua:
+	</text>
+	<combo_box name="translate_language_combobox">
+		<combo_box.item name="System Default Language" label="Padrão do Sistema" />
+		<combo_box.item name="English" label="English (Inglês)" />
+		<combo_box.item name="Danish" label="Dansk (Dinamarquês)" />
+		<combo_box.item name="German" label="Deutsch (Alemão)" />
+		<combo_box.item name="Spanish" label="Español (Espanhol)" />
+		<combo_box.item name="French" label="Français (Francês)" />
+		<combo_box.item name="Italian" label="Italiano" />
+		<combo_box.item name="Hungarian" label="Magyar (Húngaro)" />
+		<combo_box.item name="Dutch" label="Nederlands (Holandês)" />
+		<combo_box.item name="Polish" label="Polski (Polonês)" />
+		<combo_box.item name="Portugese" label="Português" />
+		<combo_box.item name="Russian" label="РусскОй (Russo)" />
+		<combo_box.item name="Turkish" label="TÌrkçe (Turco)" />
+		<combo_box.item name="Ukrainian" label="УкраїМська (Ucraniano)" />
+		<combo_box.item name="Chinese" label="äž­æ–‡ (简䜓) (Chinês)" />
+		<combo_box.item name="Japanese" label="日本語 (Japonês)" />
+		<combo_box.item name="Korean" label="한국얎 (Coreano)" />
+	</combo_box>
 </panel>