Merging revisions 132612-133369 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-22

DEV-38453 Conversion to 2.0: Modernize and rearrange the nodes of the localized XUI; NO CHANGES TO ENGLISH.
- match the new structures/widget language of the post-skinning work
- restore some strings.xml entries from the former ui_strings.xml file
- copy the Low/Mid/High translations into strings.xml
- strip out all superfluous length= and type= parameters; these default to the EN value anyway

I intentionally did not yet rearrange menu_viewer.xml, since it is still in flux in English

1 files changed, 27 insertions, 21 deletions

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 b32e1fb3e1..aa40f97fe3 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat" name="chat">
-	<text length="1" name="text_box" type="string">
+	<text name="text_box">
 		Tamanho da Fonte 
 do Chat:
 	</text>
@@ -9,45 +9,51 @@ do Chat:
 		<radio_item name="radio2" label="Médio" />
 		<radio_item name="radio3" label="Grande" />
 	</radio_group>
-	<text length="1" name="text_box2" type="string">
-		Cor do Chat:
-	</text>
 	<color_swatch label="Você" name="user"/>
+	<text name="text_box1">
+		Você
+	</text>
 	<color_swatch label="Outros" name="agent"/>
+	<text name="text_box2">
+		Outros
+	</text>
 	<color_swatch label="MI" name="im"/>
+	<text name="text_box3">
+		MI
+	</text>
 	<color_swatch label="Sistema" name="system"/>
+	<text name="text_box4">
+		Sistema
+	</text>
 	<color_swatch label="Erros" name="script_error"/>
+	<text name="text_box5">
+		Erros
+	</text>
 	<color_swatch label="Objetos" name="objects"/>
+	<text name="text_box6">
+		Objetos
+	</text>
 	<color_swatch label="Dono" name="owner"/>
+	<text name="text_box7">
+		Dono
+	</text>
 	<color_swatch label="Bolha" name="background"/>
+	<text name="text_box8">
+		Bolha
+	</text>
 	<color_swatch label="URLs" name="links"/>
-	<text length="1" name="text_box8" type="string">
-		Erros de Script:
+	<text name="text_box9">
+		URLs
 	</text>
 	<check_box label="Mostrar Erros de Script e avisos como chat comum" name="script_errors_as_chat"/>
-	<text length="1" name="text_box3" type="string">
-		Console do Chat:
-	</text>
 	<spinner label="Ocultar Chat depois" label_width="108" name="fade_chat_time" width="160"/>
-	<text left="310" length="1" name="text_box4" type="string">
-		(segundos)
-	</text>
 	<spinner left="373" name="max_chat_count"/>
-	<text left="435" length="1" name="text_box5" type="string" width="94">
-		(# linhas)
-	</text>
 	<slider label="Opacidade" name="console_opacity"/>
 	<check_box label="Use a largura total da tela (Precisa reiniciar)" name="chat_full_width_check"/>
-	<text length="1" name="text_box6" type="string">
-		Opções do Chat:
-	</text>
 	<check_box label="Feche a barra de conversa após pressionar retornar" name="close_chat_on_return_check"/>
 	<check_box label="Teclas de Setas sempre movem o avatar durante a conversa" name="arrow_keys_move_avatar_check"/>
 	<check_box label="Mostrar a hora na conversa local" name="show_timestamps_check"/>
 	<check_box label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
-	<text length="1" name="text_box7" type="string">
-		Chat com bolha:
-	</text>
 	<check_box label="Mostrar bolhas do chat" name="bubble_text_chat"/>
 	<slider label="Opacidade" name="bubble_chat_opacity"/>
 </panel>