From f2d61c7371171e0ee1329186116c585aa5de7f52 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 1 Sep 2010 14:41:51 -0700
Subject: VWR-22759 : port of SNOW-667, Automatic language translation of chat
 messages

---
 .../default/xui/it/panel_preferences_chat.xml      | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'indra/newview/skins/default/xui/it/panel_preferences_chat.xml')

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>
-- 
cgit v1.2.3


From 19026c621e338040df59adabdf7055924271f66d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 9 Sep 2010 12:06:26 -0700
Subject: VWR-22759 : port of SNOW-667, fix drop down mangled language spelling

---
 .../skins/default/xui/it/panel_preferences_chat.xml    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default/xui/it/panel_preferences_chat.xml')

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 4da60dae41..48f19c0c27 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -65,18 +65,18 @@
 		<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="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.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>
-- 
cgit v1.2.3


From e5058cdeb3653e47e2b28907324b210cfab92c8f Mon Sep 17 00:00:00 2001
From: eli_linden <eli@lindenlab.com>
Date: Mon, 13 Sep 2010 12:57:44 -0700
Subject: VWR-22975 fix wrong "endonym" for Portuguese language name

---
 indra/newview/skins/default/xui/it/panel_preferences_chat.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/it/panel_preferences_chat.xml')

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 48f19c0c27..d28ed41698 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -71,7 +71,7 @@
 		<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="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)" />
-- 
cgit v1.2.3


From 0bc3a8f977beb4af2d89c5917aaeca8108a3b376 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 11 Oct 2010 18:28:01 -0700
Subject: CT-575 WIP JA DE IT translation for set18

---
 .../default/xui/it/panel_preferences_chat.xml      | 38 +++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'indra/newview/skins/default/xui/it/panel_preferences_chat.xml')

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 d28ed41698..4a1bbdf64a 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -56,27 +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" />
+	<check_box label="Usa la traduzione meccanica durante le chat (tecnologia Google)" name="translate_chat_checkbox"/>
 	<text name="translate_language_text" width="110">
-		Chat Lingua:
+		Traduci chat in:
 	</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.item label="Default di sistema" name="System Default Language"/>
+		<combo_box.item label="English (Inglese)" name="English"/>
+		<combo_box.item label="Dansk (Danese)" name="Danish"/>
+		<combo_box.item label="Deutsch (Tedesco)" name="German"/>
+		<combo_box.item label="Español (Spagnolo)" name="Spanish"/>
+		<combo_box.item label="Français (Francese)" name="French"/>
+		<combo_box.item label="Italiano" name="Italian"/>
+		<combo_box.item label="Magyar (Ungherese)" name="Hungarian"/>
+		<combo_box.item label="Nederlands (Olandese)" name="Dutch"/>
+		<combo_box.item label="Polski (Polacco)" name="Polish"/>
+		<combo_box.item label="Português (Portoghese)" name="Portugese"/>
+		<combo_box.item label="Русский (Russo)" name="Russian"/>
+		<combo_box.item label="Türkçe (Turco)" name="Turkish"/>
+		<combo_box.item label="Українська (Ucraino)" name="Ukrainian"/>
+		<combo_box.item label="中文 (简体) (Cinese)" name="Chinese"/>
+		<combo_box.item label="日本語 (Giapponese)" name="Japanese"/>
+		<combo_box.item label="한국어 (Coreano)" name="Korean"/>
 	</combo_box>
 </panel>
-- 
cgit v1.2.3