From a86dba93c641056fc08ff9dc4bd173bc4b56036f Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 30 May 2009 19:31:48 -0500
Subject: Converted the new XUI XML files to the proper line endings.

---
 .../skins/default/xui/de/floater_beacons.xml       |  30 +-
 .../skins/default/xui/en-us/floater_beacons.xml    |  48 +-
 .../skins/default/xui/fr/floater_beacons.xml       |  30 +-
 .../skins/default/xui/fr/panel_voice_remote.xml    |  10 +-
 .../skins/default/xui/ja/floater_beacons.xml       |  30 +-
 .../default/xui/pt/floater_active_speakers.xml     |  16 +-
 .../skins/default/xui/pt/floater_beacons.xml       |  30 +-
 .../skins/default/xui/pt/floater_camera.xml        |  24 +-
 .../default/xui/pt/floater_day_cycle_options.xml   | 134 ++--
 .../skins/default/xui/pt/floater_env_settings.xml  |  46 +-
 .../default/xui/pt/floater_hardware_settings.xml   |  76 +-
 .../newview/skins/default/xui/pt/floater_hud.xml   |   4 +-
 .../xui/pt/floater_instant_message_group.xml       |  60 +-
 .../skins/default/xui/pt/floater_lagmeter.xml      | 304 ++++----
 .../skins/default/xui/pt/floater_landmark_ctrl.xml |  20 +-
 .../skins/default/xui/pt/floater_media_browser.xml |  40 +-
 .../skins/default/xui/pt/floater_mem_leaking.xml   |  24 +-
 .../skins/default/xui/pt/floater_mute_object.xml   |  22 +-
 .../default/xui/pt/floater_preview_classified.xml  |   4 +-
 .../skins/default/xui/pt/floater_preview_event.xml |   4 +-
 .../skins/default/xui/pt/floater_preview_url.xml   |   4 +-
 .../skins/default/xui/pt/floater_region_info.xml   |   4 +-
 .../default/xui/pt/floater_sim_release_message.xml |  20 +-
 .../skins/default/xui/pt/floater_url_entry.xml     |  24 +-
 .../newview/skins/default/xui/pt/floater_water.xml | 170 ++---
 .../default/xui/pt/floater_windlight_options.xml   | 372 ++++-----
 .../newview/skins/default/xui/pt/menu_login.xml    |  26 +-
 .../newview/skins/default/xui/pt/menu_slurl.xml    |  12 +-
 .../newview/skins/default/xui/pt/mime_types.xml    | 460 +++++------
 .../skins/default/xui/pt/panel_audio_device.xml    |  30 +-
 .../newview/skins/default/xui/pt/panel_friends.xml |  28 +-
 .../skins/default/xui/pt/panel_media_controls.xml  |  76 +-
 .../default/xui/pt/panel_media_remote_expanded.xml |  56 +-
 .../default/xui/pt/panel_preferences_skins.xml     |  28 +-
 .../default/xui/pt/panel_preferences_voice.xml     |  14 +-
 .../default/xui/pt/panel_speaker_controls.xml      |  76 +-
 .../skins/default/xui/pt/panel_voice_controls.xml  |  14 +-
 .../skins/default/xui/pt/panel_voice_enable.xml    |  34 +-
 .../skins/default/xui/pt/panel_voice_options.xml   |   8 +-
 .../default/xui/pt/panel_voice_remote_expanded.xml |   8 +-
 .../indra/newview/skins/default/xui/pt/strings.xml | 842 ++++++++++-----------
 .../default/xui/zh/floater_active_speakers.xml     |  44 +-
 .../skins/default/xui/zh/floater_chatterbox.xml    |   4 +-
 .../default/xui/zh/floater_day_cycle_options.xml   | 266 +++----
 .../default/xui/zh/floater_device_settings.xml     |   6 +-
 .../skins/default/xui/zh/floater_env_settings.xml  | 108 +--
 .../newview/skins/default/xui/zh/floater_hud.xml   |  18 +-
 .../xui/zh/floater_instant_message_ad_hoc.xml      | 130 ++--
 .../xui/zh/floater_instant_message_group.xml       | 152 ++--
 .../skins/default/xui/zh/floater_lagmeter.xml      | 362 ++++-----
 .../skins/default/xui/zh/floater_landmark_ctrl.xml |  74 +-
 .../skins/default/xui/zh/floater_lsl_guide.xml     |  36 +-
 .../skins/default/xui/zh/floater_media_browser.xml |  90 +--
 .../skins/default/xui/zh/floater_mute_object.xml   |  50 +-
 .../skins/default/xui/zh/floater_my_friends.xml    |  36 +-
 .../skins/default/xui/zh/floater_post_process.xml  | 234 +++---
 .../default/xui/zh/floater_preview_classified.xml  |  12 +-
 .../skins/default/xui/zh/floater_preview_event.xml |  16 +-
 .../xui/zh/floater_preview_new_landmark.xml        |  20 +-
 .../skins/default/xui/zh/floater_preview_url.xml   |  16 +-
 .../skins/default/xui/zh/floater_region_info.xml   |   6 +-
 .../skins/default/xui/zh/floater_select_key.xml    |  28 +-
 .../default/xui/zh/floater_sim_release_message.xml |  34 +-
 .../skins/default/xui/zh/floater_url_entry.xml     |  54 +-
 .../skins/default/xui/zh/floater_voice_wizard.xml  |  88 +--
 .../default/xui/zh/floater_windlight_options.xml   | 654 ++++++++--------
 .../newview/skins/default/xui/zh/mime_types.xml    | 524 ++++++-------
 .../newview/skins/default/xui/zh/panel_audio.xml   |  60 +-
 .../skins/default/xui/zh/panel_audio_device.xml    |  88 +--
 .../newview/skins/default/xui/zh/panel_friends.xml |  46 +-
 .../newview/skins/default/xui/zh/panel_groups.xml  |  56 +-
 .../skins/default/xui/zh/panel_preferences_web.xml | 176 ++---
 .../default/xui/zh/panel_speaker_controls.xml      | 120 +--
 .../skins/default/xui/zh/panel_voice_controls.xml  |  16 +-
 .../skins/default/xui/zh/panel_voice_enable.xml    |  46 +-
 .../skins/default/xui/zh/panel_voice_options.xml   |  88 +--
 .../default/xui/zh/panel_voice_remote_expanded.xml |   8 +-
 77 files changed, 3514 insertions(+), 3514 deletions(-)

diff --git a/linden/indra/newview/skins/default/xui/de/floater_beacons.xml b/linden/indra/newview/skins/default/xui/de/floater_beacons.xml
index d1ec9d9..0992727 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_beacons.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_beacons.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="beacons" title="Beacons">
-	<panel name="beacons_panel">
-		<check_box label="Auf Berührung beschränkte Skriptobjekte" name="touch_only"/>
-		<check_box label="Skripting-Objekte" name="scripted"/>
-		<check_box label="Physische Objekte" name="physical"/>
-		<check_box label="Soundquellen" name="sounds"/>
-		<check_box label="Partikelquellen" name="particles"/>
-		<check_box label="Glanzlichter anzeigen" name="highlights"/>
-		<check_box label="Beacons anzeigen" name="beacons"/>
-		<text name="beacon_width_label">
-			Beacon-Breite:
-		</text>
-	</panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="Beacons">
+	<panel name="beacons_panel">
+		<check_box label="Auf Berührung beschränkte Skriptobjekte" name="touch_only"/>
+		<check_box label="Skripting-Objekte" name="scripted"/>
+		<check_box label="Physische Objekte" name="physical"/>
+		<check_box label="Soundquellen" name="sounds"/>
+		<check_box label="Partikelquellen" name="particles"/>
+		<check_box label="Glanzlichter anzeigen" name="highlights"/>
+		<check_box label="Beacons anzeigen" name="beacons"/>
+		<text name="beacon_width_label">
+			Beacon-Breite:
+		</text>
+	</panel>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml b/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
index 958e488..e698878 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false"
-     width="250" height="225"
-     name="beacons" title="Beacons"
-     rect_control="FloaterBeaconsRect" control_name="BeaconsEnabled">
-	<panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="200" name="beacons_panel">
-  	<check_box bottom_delta="-33" follows="left|top" left="0" name="touch_only" label="Scripted Objects with Touch Only" control_name="scripttouchbeacon" />
-    <check_box bottom_delta="-20" follows="left|top" left="0" name="scripted" label="Scripted Objects" control_name="scriptsbeacon" />
-    <check_box bottom_delta="-20" follows="left|top" left="0" name="physical" label="Physical Objects" control_name="physicalbeacon" />
-    <check_box bottom_delta="-20" follows="left|top" left="0" name="sounds" label="Sound Sources" control_name="soundsbeacon" />
-    <check_box bottom_delta="-20" follows="left|top" left="0" name="particles" label="Particle Sources" control_name="particlesbeacon" />
-    <check_box bottom_delta="-20" follows="left|top" left="0" name="highlights" label="Render Highlights" control_name="renderhighlights" />
-    <check_box bottom_delta="-20" follows="left|top" left="0" name="beacons" label="Render Beacons" control_name="renderbeacons" />
-  	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-  	     bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
-  	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="5"
-  	     mouse_opaque="true" name="beacon_width_label" v_pad="0" width="128">
-  		Beacon Width:
-  	</text>
-  	<slider bottom_delta="-20" can_edit_text="false" enabled="true" width="185" height="16" mouse_opaque="true"
-  	     decimal_digits="0" increment="1" initial_val="1" left="30" min_val="1.0" max_val="16.0"
-  	     name="beacon_width" show_text="true" value="1" control_name="DebugBeaconLineWidth"/>    
-	</panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false"
+     width="250" height="225"
+     name="beacons" title="Beacons"
+     rect_control="FloaterBeaconsRect" control_name="BeaconsEnabled">
+	<panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="200" name="beacons_panel">
+  	<check_box bottom_delta="-33" follows="left|top" left="0" name="touch_only" label="Scripted Objects with Touch Only" control_name="scripttouchbeacon" />
+    <check_box bottom_delta="-20" follows="left|top" left="0" name="scripted" label="Scripted Objects" control_name="scriptsbeacon" />
+    <check_box bottom_delta="-20" follows="left|top" left="0" name="physical" label="Physical Objects" control_name="physicalbeacon" />
+    <check_box bottom_delta="-20" follows="left|top" left="0" name="sounds" label="Sound Sources" control_name="soundsbeacon" />
+    <check_box bottom_delta="-20" follows="left|top" left="0" name="particles" label="Particle Sources" control_name="particlesbeacon" />
+    <check_box bottom_delta="-20" follows="left|top" left="0" name="highlights" label="Render Highlights" control_name="renderhighlights" />
+    <check_box bottom_delta="-20" follows="left|top" left="0" name="beacons" label="Render Beacons" control_name="renderbeacons" />
+  	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  	     bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
+  	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="5"
+  	     mouse_opaque="true" name="beacon_width_label" v_pad="0" width="128">
+  		Beacon Width:
+  	</text>
+  	<slider bottom_delta="-20" can_edit_text="false" enabled="true" width="185" height="16" mouse_opaque="true"
+  	     decimal_digits="0" increment="1" initial_val="1" left="30" min_val="1.0" max_val="16.0"
+  	     name="beacon_width" show_text="true" value="1" control_name="DebugBeaconLineWidth"/>    
+	</panel>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_beacons.xml b/linden/indra/newview/skins/default/xui/fr/floater_beacons.xml
index 06bcdee..76e05a2 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_beacons.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_beacons.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="beacons" title="Balises">
-	<panel name="beacons_panel">
-		<check_box label="Objets scriptés avec Toucher uniquement" name="touch_only"/>
-		<check_box label="Objets scriptés" name="scripted"/>
-		<check_box label="Objets physiques" name="physical"/>
-		<check_box label="Sources sonores" name="sounds"/>
-		<check_box label="Sources des particules" name="particles"/>
-		<check_box label="Montrer les surbrillances" name="highlights"/>
-		<check_box label="Montrer les balises" name="beacons"/>
-		<text name="beacon_width_label">
-			Largeur de la balise :
-		</text>
-	</panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="Balises">
+	<panel name="beacons_panel">
+		<check_box label="Objets scriptés avec Toucher uniquement" name="touch_only"/>
+		<check_box label="Objets scriptés" name="scripted"/>
+		<check_box label="Objets physiques" name="physical"/>
+		<check_box label="Sources sonores" name="sounds"/>
+		<check_box label="Sources des particules" name="particles"/>
+		<check_box label="Montrer les surbrillances" name="highlights"/>
+		<check_box label="Montrer les balises" name="beacons"/>
+		<text name="beacon_width_label">
+			Largeur de la balise :
+		</text>
+	</panel>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_voice_remote.xml b/linden/indra/newview/skins/default/xui/fr/panel_voice_remote.xml
index 96e3032..3c9776c 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_voice_remote.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_voice_remote.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="voice_remote" width="140">
-	<panel name="panel_bg_tab" width="138" />
-	<panel name="panel_voice_controls" width="140" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="voice_remote" width="140">
+	<panel name="panel_bg_tab" width="138" />
+	<panel name="panel_voice_controls" width="140" />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_beacons.xml b/linden/indra/newview/skins/default/xui/ja/floater_beacons.xml
index 49c8758..2065656 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_beacons.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_beacons.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="beacons" title="ビーコン（標識）">
-	<panel name="beacons_panel">
-		<check_box label="ﾀｯﾁｵﾝﾘｰのｽｸﾘﾌﾟﾄを含むｵﾌﾞｼﾞｪｸﾄ" name="touch_only"/>
-		<check_box label="スクリプト・オブジェクト" name="scripted"/>
-		<check_box label="物理的オブジェクト" name="physical"/>
-		<check_box label="音源" name="sounds"/>
-		<check_box label="パーティクル源" name="particles"/>
-		<check_box label="ハイライトのレンダリング" name="highlights"/>
-		<check_box label="ビーコン(標識)のレンダリング" name="beacons"/>
-		<text name="beacon_width_label">
-			ビーコン(標識)の幅
-		</text>
-	</panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="ビーコン（標識）">
+	<panel name="beacons_panel">
+		<check_box label="ﾀｯﾁｵﾝﾘｰのｽｸﾘﾌﾟﾄを含むｵﾌﾞｼﾞｪｸﾄ" name="touch_only"/>
+		<check_box label="スクリプト・オブジェクト" name="scripted"/>
+		<check_box label="物理的オブジェクト" name="physical"/>
+		<check_box label="音源" name="sounds"/>
+		<check_box label="パーティクル源" name="particles"/>
+		<check_box label="ハイライトのレンダリング" name="highlights"/>
+		<check_box label="ビーコン(標識)のレンダリング" name="beacons"/>
+		<text name="beacon_width_label">
+			ビーコン(標識)の幅
+		</text>
+	</panel>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_active_speakers.xml b/linden/indra/newview/skins/default/xui/pt/floater_active_speakers.xml
index 100e819..fc0222b 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_active_speakers.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="active_speakers" title="Active Speakers">
-	<panel name="active_speakers_panel">
-		<panel name="volume_container">
-			<button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
-		</panel>
-	</panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="active_speakers" title="Active Speakers">
+	<panel name="active_speakers_panel">
+		<panel name="volume_container">
+			<button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
+		</panel>
+	</panel>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_beacons.xml b/linden/indra/newview/skins/default/xui/pt/floater_beacons.xml
index 244a7db..4140b6c 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_beacons.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_beacons.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="beacons" title="Balizas">
-	<panel name="beacons_panel">
-		<check_box label="Objetos escriptados com toque único" name="touch_only"/>
-		<check_box label="Objetos escriptados" name="scripted"/>
-		<check_box label="Objetos físicos" name="physical"/>
-		<check_box label="Fontes de Som" name="sounds"/>
-		<check_box label="Fontes de Partículas" name="particles"/>
-		<check_box label="Renderização de Highlights" name="highlights"/>
-		<check_box label="Renderização de Balizas" name="beacons"/>
-		<text name="beacon_width_label">
-			Largura da Baliza
-		</text>
-	</panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="Balizas">
+	<panel name="beacons_panel">
+		<check_box label="Objetos escriptados com toque único" name="touch_only"/>
+		<check_box label="Objetos escriptados" name="scripted"/>
+		<check_box label="Objetos físicos" name="physical"/>
+		<check_box label="Fontes de Som" name="sounds"/>
+		<check_box label="Fontes de Partículas" name="particles"/>
+		<check_box label="Renderização de Highlights" name="highlights"/>
+		<check_box label="Renderização de Balizas" name="beacons"/>
+		<text name="beacon_width_label">
+			Largura da Baliza
+		</text>
+	</panel>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_camera.xml b/linden/indra/newview/skins/default/xui/pt/floater_camera.xml
index 435ba62..4dc6997 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_camera.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_camera.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move floater" title="">
-	<string name="rotate_tooltip">
-		Girar a Câmera ao redor do Foco
-	</string>
-	<string name="zoom_tooltip">
-		Aproximar a Câmera in direção ao Foco
-	</string>
-	<string name="move_tooltip">
-		Mover a Câmera Para Cima e Para Baixo, Para a Esquerda e Para a Direita
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="move floater" title="">
+	<string name="rotate_tooltip">
+		Girar a Câmera ao redor do Foco
+	</string>
+	<string name="zoom_tooltip">
+		Aproximar a Câmera in direção ao Foco
+	</string>
+	<string name="move_tooltip">
+		Mover a Câmera Para Cima e Para Baixo, Para a Esquerda e Para a Direita
+	</string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml b/linden/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
index a76d06e..5ab9a04 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="Editor de ciclo de dia">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Ciclo do dia" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				12:00 meia-noite
-			</text>
-			<text name="WL3am">
-				3:00 da manhã
-			</text>
-			<text name="WL6am">
-				6:00 da manhã
-			</text>
-			<text name="WL9amHash">
-				9:00 da manhã
-			</text>
-			<text name="WL12pmHash">
-				12:00 meio dia
-			</text>
-			<text name="WL3pm">
-				3:00 da tarde
-			</text>
-			<text name="WL6pm">
-				6:00 da tarde
-			</text>
-			<text name="WL9pm">
-				9:00 da noite
-			</text>
-			<text name="WL12am2">
-				12:00 meia noite
-			</text>
-			<button label="Add Key" label_selected="Adicionar chave" name="WLAddKey"/>
-			<button label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Configurações de Key Frame:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Tempo de chave:
-			</text>
-			<spinner label="Hora" name="WLCurKeyHour"/>
-			<spinner label="Minutos" name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Apresentação chave:
-			</text>
-			<combo_box label="Apresentação" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Snap:
-			</text>
-			<combo_box label="5 minutos" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Duração do Ciclo:
-			</text>
-			<spinner label="Hora" name="WLLengthOfDayHour"/>
-			<spinner label="Minuto" name="WLLengthOfDayMin"/>
-			<spinner label="Segundo" name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Preview:
-			</text>
-			<button label="Tocar" label_selected="Tocar" name="WLAnimSky"/>
-			<button label="Pare!" label_selected="Pare" name="WLStopAnimSky"/>
-			<button label="Usar o horário do Terreno" label_selected="Ir para o horário do Terreno" name="WLUseLindenTime"/>
-			<button label="Salvar o Dia teste" label_selected="Salvar o Dia teste" name="WLSaveDayCycle"/>
-			<button label="Carregar o Dia teste" label_selected="Carregar o Dia teste" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Day Cycle Floater" title="Editor de ciclo de dia">
+	<tab_container name="Day Cycle Tabs">
+		<panel label="Ciclo do dia" name="Day Cycle">
+			<button label="?" name="WLDayCycleHelp"/>
+			<text name="WL12am">
+				12:00 meia-noite
+			</text>
+			<text name="WL3am">
+				3:00 da manhã
+			</text>
+			<text name="WL6am">
+				6:00 da manhã
+			</text>
+			<text name="WL9amHash">
+				9:00 da manhã
+			</text>
+			<text name="WL12pmHash">
+				12:00 meio dia
+			</text>
+			<text name="WL3pm">
+				3:00 da tarde
+			</text>
+			<text name="WL6pm">
+				6:00 da tarde
+			</text>
+			<text name="WL9pm">
+				9:00 da noite
+			</text>
+			<text name="WL12am2">
+				12:00 meia noite
+			</text>
+			<button label="Add Key" label_selected="Adicionar chave" name="WLAddKey"/>
+			<button label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>
+			<text name="WLCurKeyFrameText">
+				Configurações de Key Frame:
+			</text>
+			<text name="WLCurKeyTimeText">
+				Tempo de chave:
+			</text>
+			<spinner label="Hora" name="WLCurKeyHour"/>
+			<spinner label="Minutos" name="WLCurKeyMin"/>
+			<text name="WLCurKeyTimeText2">
+				Apresentação chave:
+			</text>
+			<combo_box label="Apresentação" name="WLKeyPresets"/>
+			<text name="DayCycleText">
+				Snap:
+			</text>
+			<combo_box label="5 minutos" name="WLSnapOptions"/>
+			<text name="DayCycleText2">
+				Duração do Ciclo:
+			</text>
+			<spinner label="Hora" name="WLLengthOfDayHour"/>
+			<spinner label="Minuto" name="WLLengthOfDayMin"/>
+			<spinner label="Segundo" name="WLLengthOfDaySec"/>
+			<text name="DayCycleText3">
+				Preview:
+			</text>
+			<button label="Tocar" label_selected="Tocar" name="WLAnimSky"/>
+			<button label="Pare!" label_selected="Pare" name="WLStopAnimSky"/>
+			<button label="Usar o horário do Terreno" label_selected="Ir para o horário do Terreno" name="WLUseLindenTime"/>
+			<button label="Salvar o Dia teste" label_selected="Salvar o Dia teste" name="WLSaveDayCycle"/>
+			<button label="Carregar o Dia teste" label_selected="Carregar o Dia teste" name="WLLoadDayCycle"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/pt/floater_env_settings.xml
index afefae7..b1c85a3 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_env_settings.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="Editor do Ambiente">
-	<text name="EnvTimeText">
-		Hora do Dia
-	</text>
-	<text name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<text name="EnvCloudText">
-		Cobertura de Nuvens
-	</text>
-	<text name="EnvWaterColorText">
-		Cor da água
-	</text>
-	<color_swatch label="" name="EnvWaterColor" tool_tip="Clique para abrir o Editor de cores"/>
-	<text name="EnvWaterFogText">
-		Névoa da água
-	</text>
-	<button label="Usar hora da propriedade" name="EnvUseEstateTimeButton"/>
-	<button label="Céu Avançado" name="EnvAdvancedSkyButton"/>
-	<button label="Água Avançada" name="EnvAdvancedWaterButton"/>
-	<button label="?" name="EnvSettingsHelpButton"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="Editor do Ambiente">
+	<text name="EnvTimeText">
+		Hora do Dia
+	</text>
+	<text name="EnvTimeText2">
+		12:00 PM
+	</text>
+	<text name="EnvCloudText">
+		Cobertura de Nuvens
+	</text>
+	<text name="EnvWaterColorText">
+		Cor da água
+	</text>
+	<color_swatch label="" name="EnvWaterColor" tool_tip="Clique para abrir o Editor de cores"/>
+	<text name="EnvWaterFogText">
+		Névoa da água
+	</text>
+	<button label="Usar hora da propriedade" name="EnvUseEstateTimeButton"/>
+	<button label="Céu Avançado" name="EnvAdvancedSkyButton"/>
+	<button label="Água Avançada" name="EnvAdvancedWaterButton"/>
+	<button label="?" name="EnvSettingsHelpButton"/>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
index c395144..10ed033 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="Ajustes de Hardware">
-	<text name="Filtering:">
-		Filtragem:
-	</text>
-	<check_box label="Filtragem Anisotrópica (mais lento quando habilitada)" name="ani"/>
-	<text name="Antialiasing:">
-		Suavização:
-	</text>
-	<combo_box label="Suavização" name="fsaa" width="94">
-		<combo_item name="FSAADisabled">
-			Desabilitado
-		</combo_item>
-		<combo_item name="2x">
-			2x
-		</combo_item>
-		<combo_item name="4x">
-			4x
-		</combo_item>
-		<combo_item name="8x">
-			8x
-		</combo_item>
-		<combo_item name="16x">
-			16x
-		</combo_item>
-	</combo_box>
-	<spinner label="Gama:" name="gamma"/>
-	<text name="(brightness, lower is brighter)">
-		(brilho, quanto menor, mais brilho, 0=usar padrão)
-	</text>
-	<text name="Enable VBO:">
-		Habilitar VBO:
-	</text>
-	<check_box label="Habilitar Objetos com Armazenamento de Vértices" name="vbo" tool_tip="Habilitando-o em máquinas novas, ele oferece um ganho de performance. Contudo, as máquinas antigas tem freqüentemente implementações pobres de VBOs e você pode ter travamentos quando esta opção é habilitada."/>
-	<slider label="Memória de Textura (MB):" name="GrapicsCardTextureMemory" tool_tip="Quantidade de memória a se reservar para texturas. Usa por padrão, a  Memória da Placa de Vídeo. Sua redução pode aumentar a performance mas pode também deixar as texturas borradas."/>
-	<spinner label="Relação de Distância de &#10;Nevoeiro:" name="fog"/>
-	<button label="OK" label_selected="OK" name="OK"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Hardware Settings Floater" title="Ajustes de Hardware">
+	<text name="Filtering:">
+		Filtragem:
+	</text>
+	<check_box label="Filtragem Anisotrópica (mais lento quando habilitada)" name="ani"/>
+	<text name="Antialiasing:">
+		Suavização:
+	</text>
+	<combo_box label="Suavização" name="fsaa" width="94">
+		<combo_item name="FSAADisabled">
+			Desabilitado
+		</combo_item>
+		<combo_item name="2x">
+			2x
+		</combo_item>
+		<combo_item name="4x">
+			4x
+		</combo_item>
+		<combo_item name="8x">
+			8x
+		</combo_item>
+		<combo_item name="16x">
+			16x
+		</combo_item>
+	</combo_box>
+	<spinner label="Gama:" name="gamma"/>
+	<text name="(brightness, lower is brighter)">
+		(brilho, quanto menor, mais brilho, 0=usar padrão)
+	</text>
+	<text name="Enable VBO:">
+		Habilitar VBO:
+	</text>
+	<check_box label="Habilitar Objetos com Armazenamento de Vértices" name="vbo" tool_tip="Habilitando-o em máquinas novas, ele oferece um ganho de performance. Contudo, as máquinas antigas tem freqüentemente implementações pobres de VBOs e você pode ter travamentos quando esta opção é habilitada."/>
+	<slider label="Memória de Textura (MB):" name="GrapicsCardTextureMemory" tool_tip="Quantidade de memória a se reservar para texturas. Usa por padrão, a  Memória da Placa de Vídeo. Sua redução pode aumentar a performance mas pode também deixar as texturas borradas."/>
+	<spinner label="Relação de Distância de &#10;Nevoeiro:" name="fog"/>
+	<button label="OK" label_selected="OK" name="OK"/>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_hud.xml b/linden/indra/newview/skins/default/xui/pt/floater_hud.xml
index c758679..d31bced 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_hud.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_hud.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_hud" title="Tutorial"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_hud" title="Tutorial"/>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/pt/floater_instant_message_group.xml
index a393717..94af4d2 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_instant_message_group.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="(unknown)" name="im_floater" title="(unknown)">
-	<string name="title_string">
-		Mensagem Instantânea com [NAME]
-	</string>
-	<string name="typing_start_string">
-		[NAME] está digitando...
-	</string>
-	<string name="session_start_string">
-		Iniciando sessão com [NAME], por favor aguarde.
-	</string>
-	<string name="moderated_chat_label">
-		(Moderado: Vozes desligada por default)
-	</string>
-	<string name="default_text_label">
-		Clique aqui para mensagem instantânea.
-	</string>
-	<string name="muted_text_label">
-		Sua conversa de texto foi desabilitada por um Moderador do Grupo.
-	</string>
-	<layout_stack name="panels">
-		<layout_panel name="im_contents_panel">
-			<button label="Informação do Grupo" name="group_info_btn" width="130"/>
-			<button label="Entrar numa chamada" name="start_call_btn" left_delta="135" width="160"/>
-			<button label="Encerrar Chamada" name="end_call_btn" width="160" halign="center"/>
-			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Clique aqui para alternar a lista dos participantes ativos nesta sessão de IM ."/>
-			<button label="Enviar" name="send_btn"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(unknown)" name="im_floater" title="(unknown)">
+	<string name="title_string">
+		Mensagem Instantânea com [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] está digitando...
+	</string>
+	<string name="session_start_string">
+		Iniciando sessão com [NAME], por favor aguarde.
+	</string>
+	<string name="moderated_chat_label">
+		(Moderado: Vozes desligada por default)
+	</string>
+	<string name="default_text_label">
+		Clique aqui para mensagem instantânea.
+	</string>
+	<string name="muted_text_label">
+		Sua conversa de texto foi desabilitada por um Moderador do Grupo.
+	</string>
+	<layout_stack name="panels">
+		<layout_panel name="im_contents_panel">
+			<button label="Informação do Grupo" name="group_info_btn" width="130"/>
+			<button label="Entrar numa chamada" name="start_call_btn" left_delta="135" width="160"/>
+			<button label="Encerrar Chamada" name="end_call_btn" width="160" halign="center"/>
+			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Clique aqui para alternar a lista dos participantes ativos nesta sessão de IM ."/>
+			<button label="Enviar" name="send_btn"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
index 1e90862..65da72f 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
@@ -1,152 +1,152 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="Medidor de Atraso">
-	<button label="" label_selected="" name="client_lagmeter" tool_tip="Status de atraso no Cliente"/>
-	<text name="client">
-		Cliente:
-	</text>
-	<text name="client_text">
-		Normal
-	</text>
-	<button label="" label_selected="" name="network_lagmeter" tool_tip="Status de atraso na rede"/>
-	<text name="network">
-		Rede:
-	</text>
-	<text name="network_text">
-		Normal
-	</text>
-	<button label="" label_selected="" name="server_lagmeter" tool_tip="Status de atraso no servidor"/>
-	<text name="server">
-		Servidor:
-	</text>
-	<text name="server_text">
-		Normal
-	</text>
-	<button label="?" name="server_help"/>
-	<button label="&gt;&gt;" name="minimize"/>
-	<string name="max_title_msg">
-		Medidor de Atraso
-	</string>
-	<string name="max_width_px">
-		360
-	</string>
-	<string name="min_title_msg">
-		Atraso
-	</string>
-	<string name="min_width_px">
-		90
-	</string>
-	<string name="client_text_msg">
-		Cliente
-	</string>
-	<string name="client_frame_rate_critical_fps">
-		10
-	</string>
-	<string name="client_frame_rate_warning_fps">
-		15
-	</string>
-	<string name="client_frame_time_window_bg_msg">
-		Normal, janela por baixo
-	</string>
-	<string name="client_frame_time_critical_msg">
-		Taxa de quadros do Cliente abaixo de [CLIENT_FRAME_RATE_CRITICAL]
-	</string>
-	<string name="client_frame_time_warning_msg">
-		Taxa de quadros do Cliente entre [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
-	</string>
-	<string name="client_frame_time_normal_msg">
-		Normal
-	</string>
-	<string name="client_draw_distance_cause_msg">
-		Causa possível: Distância do desenho ajustada muito alta
-	</string>
-	<string name="client_texture_loading_cause_msg">
-		Causa possível: Carregamento de Imagens
-	</string>
-	<string name="client_texture_memory_cause_msg">
-		Causa possível: Muitas imagens na memória
-	</string>
-	<string name="client_complex_objects_cause_msg">
-		Causa possível: Muitos objetos complexos na cena
-	</string>
-	<string name="network_text_msg">
-		Rede
-	</string>
-	<string name="network_packet_loss_critical_pct">
-		10
-	</string>
-	<string name="network_packet_loss_warning_pct">
-		5
-	</string>
-	<string name="network_packet_loss_critical_msg">
-		Conexão está caindo para cerca de [NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
-	</string>
-	<string name="network_packet_loss_warning_msg">
-		Conexão está caindo [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
-	</string>
-	<string name="network_performance_normal_msg">
-		Normal
-	</string>
-	<string name="network_ping_critical_ms">
-		600
-	</string>
-	<string name="network_ping_warning_ms">
-		300
-	</string>
-	<string name="network_ping_critical_msg">
-		Tempo de conexão de ping é cerca de  [NETWORK_PING_CRITICAL] ms
-	</string>
-	<string name="network_ping_warning_msg">
-		Tempo de conexão de ping é [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
-	</string>
-	<string name="network_packet_loss_cause_msg">
-		Possível conexão ruim ou &apos;Largura de Banda&apos; escolhida muito alta.
-	</string>
-	<string name="network_ping_cause_msg">
-		Possível conexão ruim ou aplic. compartilhando arquivos.
-	</string>
-	<string name="server_text_msg">
-		Servidor
-	</string>
-	<string name="server_frame_rate_critical_fps">
-		20
-	</string>
-	<string name="server_frame_rate_warning_fps">
-		30
-	</string>
-	<string name="server_single_process_max_time_ms">
-		20
-	</string>
-	<string name="server_frame_time_critical_msg">
-		Taxa de quadros do simulador abaixo de  [SERVER_FRAME_RATE_CRITICAL]
-	</string>
-	<string name="server_frame_time_warning_msg">
-		Taxa de quadros do simulador entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
-	</string>
-	<string name="server_frame_time_normal_msg">
-		Normal
-	</string>
-	<string name="server_physics_cause_msg">
-		Causa possível: Muitos objetos físicos
-	</string>
-	<string name="server_scripts_cause_msg">
-		Causa possível: Muitos objetos com scripts
-	</string>
-	<string name="server_net_cause_msg">
-		Causa possível: Muito tráfego na rede
-	</string>
-	<string name="server_agent_cause_msg">
-		Causa possível: Muitas pessoas se movendo na região
-	</string>
-	<string name="server_images_cause_msg">
-		Causa possível: Muitos cálculos de imagem
-	</string>
-	<string name="server_generic_cause_msg">
-		Causa possível: Carga no simulador muito pesada
-	</string>
-	<string name="smaller_label">
-		&gt;&gt;
-	</string>
-	<string name="bigger_label">
-		&lt;&lt;
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_lagmeter" title="Medidor de Atraso">
+	<button label="" label_selected="" name="client_lagmeter" tool_tip="Status de atraso no Cliente"/>
+	<text name="client">
+		Cliente:
+	</text>
+	<text name="client_text">
+		Normal
+	</text>
+	<button label="" label_selected="" name="network_lagmeter" tool_tip="Status de atraso na rede"/>
+	<text name="network">
+		Rede:
+	</text>
+	<text name="network_text">
+		Normal
+	</text>
+	<button label="" label_selected="" name="server_lagmeter" tool_tip="Status de atraso no servidor"/>
+	<text name="server">
+		Servidor:
+	</text>
+	<text name="server_text">
+		Normal
+	</text>
+	<button label="?" name="server_help"/>
+	<button label="&gt;&gt;" name="minimize"/>
+	<string name="max_title_msg">
+		Medidor de Atraso
+	</string>
+	<string name="max_width_px">
+		360
+	</string>
+	<string name="min_title_msg">
+		Atraso
+	</string>
+	<string name="min_width_px">
+		90
+	</string>
+	<string name="client_text_msg">
+		Cliente
+	</string>
+	<string name="client_frame_rate_critical_fps">
+		10
+	</string>
+	<string name="client_frame_rate_warning_fps">
+		15
+	</string>
+	<string name="client_frame_time_window_bg_msg">
+		Normal, janela por baixo
+	</string>
+	<string name="client_frame_time_critical_msg">
+		Taxa de quadros do Cliente abaixo de [CLIENT_FRAME_RATE_CRITICAL]
+	</string>
+	<string name="client_frame_time_warning_msg">
+		Taxa de quadros do Cliente entre [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
+	</string>
+	<string name="client_frame_time_normal_msg">
+		Normal
+	</string>
+	<string name="client_draw_distance_cause_msg">
+		Causa possível: Distância do desenho ajustada muito alta
+	</string>
+	<string name="client_texture_loading_cause_msg">
+		Causa possível: Carregamento de Imagens
+	</string>
+	<string name="client_texture_memory_cause_msg">
+		Causa possível: Muitas imagens na memória
+	</string>
+	<string name="client_complex_objects_cause_msg">
+		Causa possível: Muitos objetos complexos na cena
+	</string>
+	<string name="network_text_msg">
+		Rede
+	</string>
+	<string name="network_packet_loss_critical_pct">
+		10
+	</string>
+	<string name="network_packet_loss_warning_pct">
+		5
+	</string>
+	<string name="network_packet_loss_critical_msg">
+		Conexão está caindo para cerca de [NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
+	</string>
+	<string name="network_packet_loss_warning_msg">
+		Conexão está caindo [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
+	</string>
+	<string name="network_performance_normal_msg">
+		Normal
+	</string>
+	<string name="network_ping_critical_ms">
+		600
+	</string>
+	<string name="network_ping_warning_ms">
+		300
+	</string>
+	<string name="network_ping_critical_msg">
+		Tempo de conexão de ping é cerca de  [NETWORK_PING_CRITICAL] ms
+	</string>
+	<string name="network_ping_warning_msg">
+		Tempo de conexão de ping é [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+	</string>
+	<string name="network_packet_loss_cause_msg">
+		Possível conexão ruim ou &apos;Largura de Banda&apos; escolhida muito alta.
+	</string>
+	<string name="network_ping_cause_msg">
+		Possível conexão ruim ou aplic. compartilhando arquivos.
+	</string>
+	<string name="server_text_msg">
+		Servidor
+	</string>
+	<string name="server_frame_rate_critical_fps">
+		20
+	</string>
+	<string name="server_frame_rate_warning_fps">
+		30
+	</string>
+	<string name="server_single_process_max_time_ms">
+		20
+	</string>
+	<string name="server_frame_time_critical_msg">
+		Taxa de quadros do simulador abaixo de  [SERVER_FRAME_RATE_CRITICAL]
+	</string>
+	<string name="server_frame_time_warning_msg">
+		Taxa de quadros do simulador entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
+	</string>
+	<string name="server_frame_time_normal_msg">
+		Normal
+	</string>
+	<string name="server_physics_cause_msg">
+		Causa possível: Muitos objetos físicos
+	</string>
+	<string name="server_scripts_cause_msg">
+		Causa possível: Muitos objetos com scripts
+	</string>
+	<string name="server_net_cause_msg">
+		Causa possível: Muito tráfego na rede
+	</string>
+	<string name="server_agent_cause_msg">
+		Causa possível: Muitas pessoas se movendo na região
+	</string>
+	<string name="server_images_cause_msg">
+		Causa possível: Muitos cálculos de imagem
+	</string>
+	<string name="server_generic_cause_msg">
+		Causa possível: Carga no simulador muito pesada
+	</string>
+	<string name="smaller_label">
+		&gt;&gt;
+	</string>
+	<string name="bigger_label">
+		&lt;&lt;
+	</string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_landmark_ctrl.xml b/linden/indra/newview/skins/default/xui/pt/floater_landmark_ctrl.xml
index c4a036d..20242eb 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_landmark_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_landmark_ctrl.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="landmarkpicker" title="Organize: Landmarks">
-	<check_box label="Mostrar Pastas" name="show_folders_check"/>
-	<button label="Novo" label_selected="Novo" name="New"/>
-	<button label="Renomear" label_selected="Renomear" name="Rename"/>
-	<button label="Nova Pasta" label_selected="Nova Pasta" name="NewFolder"/>
-	<button label="Editar" label_selected="Editar" name="Edit"/>
-	<button label="Apagar" label_selected="Apagar" name="Delete"/>
-	<button label="Fechar" label_selected="Fechar" name="Close"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="landmarkpicker" title="Organize: Landmarks">
+	<check_box label="Mostrar Pastas" name="show_folders_check"/>
+	<button label="Novo" label_selected="Novo" name="New"/>
+	<button label="Renomear" label_selected="Renomear" name="Rename"/>
+	<button label="Nova Pasta" label_selected="Nova Pasta" name="NewFolder"/>
+	<button label="Editar" label_selected="Editar" name="Edit"/>
+	<button label="Apagar" label_selected="Apagar" name="Delete"/>
+	<button label="Fechar" label_selected="Fechar" name="Close"/>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/pt/floater_media_browser.xml
index d684b75..0663b42 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_media_browser.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="Navegador de Mídia" width="570" min_width="477">
-	<layout_stack name="stack1" width="550">
-		<layout_panel name="nav_controls">
-			<button label="Para trás" name="back" width="75"/>
-			<button label="Para a frente" name="forward" width="90" left_delta="75" />
-			<button label="Recarregar" name="reload" left_delta="95" width="76"/>
-			<combo_box left_delta="80" name="address" width="240"/>
-			<button label="Ir" name="go" left_delta="245" width="35"  />
-		</layout_panel>
-		<layout_panel name="parcel_owner_controls">
-			<button label="Enviar a URL atual para o terreno" name="assign"/>
-		</layout_panel>
-		<layout_panel name="external_controls">
-			<button label="Abrir no meu Navegador de Web" name="open_browser" width="196"/>
-			<check_box label="Sempre abrir no meu Navegador de Web" name="open_always" left_delta="201" />
-			<button label="Fechar" name="close"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_about" title="Navegador de Mídia" width="570" min_width="477">
+	<layout_stack name="stack1" width="550">
+		<layout_panel name="nav_controls">
+			<button label="Para trás" name="back" width="75"/>
+			<button label="Para a frente" name="forward" width="90" left_delta="75" />
+			<button label="Recarregar" name="reload" left_delta="95" width="76"/>
+			<combo_box left_delta="80" name="address" width="240"/>
+			<button label="Ir" name="go" left_delta="245" width="35"  />
+		</layout_panel>
+		<layout_panel name="parcel_owner_controls">
+			<button label="Enviar a URL atual para o terreno" name="assign"/>
+		</layout_panel>
+		<layout_panel name="external_controls">
+			<button label="Abrir no meu Navegador de Web" name="open_browser" width="196"/>
+			<check_box label="Sempre abrir no meu Navegador de Web" name="open_always" left_delta="201" />
+			<button label="Fechar" name="close"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml b/linden/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
index 83f47fd..374592f 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="MemLeak" title="Simulação de Perda de Memória">
-	<spinner label="Velocidade da Perda (bytes por quadro):" name="leak_speed"/>
-	<spinner label="Máximo de Memória Perdida (MB):" name="max_leak"/>
-	<text name="total_leaked_label">
-		Memória perdida atualmente: [SIZE] KB
-	</text>
-	<button label="Iniciar" name="start_btn"/>
-	<button label="Parar" name="stop_btn"/>
-	<button label="Liberar" name="release_btn"/>
-	<button label="Fechar" name="close_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="MemLeak" title="Simulação de Perda de Memória">
+	<spinner label="Velocidade da Perda (bytes por quadro):" name="leak_speed"/>
+	<spinner label="Máximo de Memória Perdida (MB):" name="max_leak"/>
+	<text name="total_leaked_label">
+		Memória perdida atualmente: [SIZE] KB
+	</text>
+	<button label="Iniciar" name="start_btn"/>
+	<button label="Parar" name="stop_btn"/>
+	<button label="Liberar" name="release_btn"/>
+	<button label="Fechar" name="close_btn"/>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_mute_object.xml b/linden/indra/newview/skins/default/xui/pt/floater_mute_object.xml
index 506d518..32dd62c 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_mute_object.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_mute_object.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="mute by name" title="Emudecer objeto pelo nome">
-	<text name="message">
-		Emudecer pelo nome afeta apenas conversa de objeto e MI, não sons. Você deve digitar o nome exato do objeto.
-	</text>
-	<line_editor name="object_name">
-		Nome do objeto
-	</line_editor>
-	<button label="Ok" name="OK"/>
-	<button label="Cancelar" name="Cancel"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="mute by name" title="Emudecer objeto pelo nome">
+	<text name="message">
+		Emudecer pelo nome afeta apenas conversa de objeto e MI, não sons. Você deve digitar o nome exato do objeto.
+	</text>
+	<line_editor name="object_name">
+		Nome do objeto
+	</line_editor>
+	<button label="Ok" name="OK"/>
+	<button label="Cancelar" name="Cancel"/>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_preview_classified.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_classified.xml
index 83af494..6b64130 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_preview_classified.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_classified.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="classified_preview" title="Classificar Informação"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="classified_preview" title="Classificar Informação"/>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_preview_event.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_event.xml
index 60f8556..5265f3a 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_preview_event.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_event.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="event_preview" title="Informação de Evento (testemunhos)"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="event_preview" title="Informação de Evento (testemunhos)"/>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_preview_url.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_url.xml
index 16d9cc8..d043011 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_preview_url.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_url.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="url_preview" title="Informação local"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="url_preview" title="Informação local"/>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_region_info.xml b/linden/indra/newview/skins/default/xui/pt/floater_region_info.xml
index b16b1a4..fe228ab 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_region_info.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_region_info.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="regioninfo" title="Região/Propriedade"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="regioninfo" title="Região/Propriedade"/>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_sim_release_message.xml b/linden/indra/newview/skins/default/xui/pt/floater_sim_release_message.xml
index 2fc2473..2f6deba 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_sim_release_message.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_sim_release_message.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterreleasemessage" title="Entrando na região">
-	<button label="fechar" name="close_btn"/>
-	<string name="in-world_help_title">
-		Ajuda no mundo
-	</string>
-	<string name="additional_help_title">
-		Ajuda adicional
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterreleasemessage" title="Entrando na região">
+	<button label="fechar" name="close_btn"/>
+	<string name="in-world_help_title">
+		Ajuda no mundo
+	</string>
+	<string name="additional_help_title">
+		Ajuda adicional
+	</string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_url_entry.xml b/linden/indra/newview/skins/default/xui/pt/floater_url_entry.xml
index 5a18297..f896d8c 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_url_entry.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_url_entry.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="url_entry" title="">
-	<text name="media_label">
-		Media URL:
-	</text>
-	<button label="OK" name="ok_btn"/>
-	<button label="Cancelar" name="cancel_btn"/>
-	<button label="Limpar" name="clear_btn"/>
-	<text name="loading_label">
-		Carregando..
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="url_entry" title="">
+	<text name="media_label">
+		Media URL:
+	</text>
+	<button label="OK" name="ok_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+	<button label="Limpar" name="clear_btn"/>
+	<text name="loading_label">
+		Carregando..
+	</text>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_water.xml b/linden/indra/newview/skins/default/xui/pt/floater_water.xml
index d6f261f..007eb3f 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_water.xml
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="Editor de Água Avançado">
-	<text name="KeyFramePresetsText">
-		Pré-configurações da Água:
-	</text>
-	<button label="Novo" label_selected="Novo" name="WaterNewPreset"/>
-	<button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/>
-	<button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="Configurações" name="Settings">
-			<text name="BHText">
-				Cor da névoa da Água
-			</text>
-			<button label="?" name="WaterFogColorHelp"/>
-			<color_swatch label="" name="WaterFogColor" tool_tip="Clique para abrir o Capturador de Cor"/>
-			<text name="WaterFogDensText">
-				Expoente da Densidade de névoa
-			</text>
-			<button label="?" name="WaterFogDensityHelp"/>
-			<text name="WaterUnderWaterFogModText">
-				Modificador da névoa Subaquática
-			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp"/>
-			<text name="BDensText">
-				Escala da Marola de Reflexão
-			</text>
-			<button label="?" name="WaterNormalScaleHelp"/>
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
-			<text name="HDText">
-				Escala de Fresnel
-			</text>
-			<button label="?" name="WaterFresnelScaleHelp"/>
-			<text name="FresnelOffsetText">
-				Deslocamento de Fresnel
-			</text>
-			<button label="?" name="WaterFresnelOffsetHelp"/>
-			<text name="DensMultText">
-				Refratar a Escala para Cima
-			</text>
-			<button label="?" name="WaterScaleAboveHelp"/>
-			<text name="WaterScaleBelowText">
-				Refratar a Escala para Baixo
-			</text>
-			<button label="?" name="WaterScaleBelowHelp"/>
-			<text name="MaxAltText">
-				Multiplicador de Difusão
-			</text>
-			<button label="?" name="WaterBlurMultiplierHelp"/>
-		</panel>
-		<panel label="Imagem" name="Waves">
-			<text name="BHText">
-				Direção da Onda Maior
-			</text>
-			<button label="?" name="WaterWave1Help"/>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Direção da Onda Pequena
-			</text>
-			<button label="?" name="WaterWave2Help"/>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Mapa Normal
-			</text>
-			<button label="?" name="WaterNormalMapHelp"/>
-		</panel>
-	</tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Water Floater" title="Editor de Água Avançado">
+	<text name="KeyFramePresetsText">
+		Pré-configurações da Água:
+	</text>
+	<button label="Novo" label_selected="Novo" name="WaterNewPreset"/>
+	<button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/>
+	<button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/>
+	<tab_container name="Water Tabs">
+		<panel label="Configurações" name="Settings">
+			<text name="BHText">
+				Cor da névoa da Água
+			</text>
+			<button label="?" name="WaterFogColorHelp"/>
+			<color_swatch label="" name="WaterFogColor" tool_tip="Clique para abrir o Capturador de Cor"/>
+			<text name="WaterFogDensText">
+				Expoente da Densidade de névoa
+			</text>
+			<button label="?" name="WaterFogDensityHelp"/>
+			<text name="WaterUnderWaterFogModText">
+				Modificador da névoa Subaquática
+			</text>
+			<button label="?" name="WaterUnderWaterFogModHelp"/>
+			<text name="BDensText">
+				Escala da Marola de Reflexão
+			</text>
+			<button label="?" name="WaterNormalScaleHelp"/>
+			<text name="BHText2">
+				1
+			</text>
+			<text name="BHText3">
+				2
+			</text>
+			<text name="BHText4">
+				3
+			</text>
+			<text name="HDText">
+				Escala de Fresnel
+			</text>
+			<button label="?" name="WaterFresnelScaleHelp"/>
+			<text name="FresnelOffsetText">
+				Deslocamento de Fresnel
+			</text>
+			<button label="?" name="WaterFresnelOffsetHelp"/>
+			<text name="DensMultText">
+				Refratar a Escala para Cima
+			</text>
+			<button label="?" name="WaterScaleAboveHelp"/>
+			<text name="WaterScaleBelowText">
+				Refratar a Escala para Baixo
+			</text>
+			<button label="?" name="WaterScaleBelowHelp"/>
+			<text name="MaxAltText">
+				Multiplicador de Difusão
+			</text>
+			<button label="?" name="WaterBlurMultiplierHelp"/>
+		</panel>
+		<panel label="Imagem" name="Waves">
+			<text name="BHText">
+				Direção da Onda Maior
+			</text>
+			<button label="?" name="WaterWave1Help"/>
+			<text name="WaterWave1DirXText">
+				X
+			</text>
+			<text name="WaterWave1DirYText">
+				Y
+			</text>
+			<text name="BHText2">
+				Direção da Onda Pequena
+			</text>
+			<button label="?" name="WaterWave2Help"/>
+			<text name="WaterWave2DirXText">
+				X
+			</text>
+			<text name="WaterWave2DirYText">
+				Y
+			</text>
+			<text name="BHText3">
+				Mapa Normal
+			</text>
+			<button label="?" name="WaterNormalMapHelp"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
index ff22a87..f86775c 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
@@ -1,186 +1,186 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="Editor de Céu Avançado">
-	<text name="KeyFramePresetsText">
-		Pré-definições de Céu:
-	</text>
-	<button label="Novo" label_selected="Novo" name="WLNewPreset"/>
-	<button label="Salvar" label_selected="Salvar" name="WLSavePreset"/>
-	<button label="Deletar" label_selected="Deletar" name="WLDeletePreset"/>
-	<button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" name="WLDayCycleMenuButton" width="150" left_delta="95" />
-	<tab_container name="WindLight Tabs">
-		<panel label="Atmosfera" name="Atmosphere">
-			<text name="BHText">
-				Horizonte Azul
-			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Horizonte da Neblina
-			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				Densidade de Azul
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Densidade da Neblina
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				Multiplicador de Densidade
-			</text>
-			<button label="?" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				Multiplicador de Distância
-			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				Altitude Máxima
-			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="Iluminação" name="Lighting">
-			<text name="SLCText">
-				Cor do Sol/Lua
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Posição do Sol/Lua
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				Ambiente
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Ângulo Leste
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				Brilho do Sol
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="Foco" name="WLGlowB"/>
-			<slider label="Tamanho" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Gamma da Cena
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				Brilho da Estrela
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="Nuvens" name="Clouds">
-			<text name="WLCloudColorText">
-				Cor da Nuvem
-			</text>
-			<button label="?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Densidade/ XY da Nuvem
-			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Cobertura da Nuvem
-			</text>
-			<button label="?" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				Escala da Nuvem
-			</text>
-			<button label="?" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				Detalhe da Nuvem  (XY/Densidade)
-			</text>
-			<button label="?" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Rolagem X da Nuvem
-			</text>
-			<button label="?" name="WLCloudScrollXHelp"/>
-			<check_box label="Travar" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Rolagem Y da Nuvem
-			</text>
-			<button label="?" name="WLCloudScrollYHelp"/>
-			<check_box label="Travar" name="WLCloudLockY"/>
-			<check_box label="Desenhar Nuvens Clássicas" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="WindLight floater" title="Editor de Céu Avançado">
+	<text name="KeyFramePresetsText">
+		Pré-definições de Céu:
+	</text>
+	<button label="Novo" label_selected="Novo" name="WLNewPreset"/>
+	<button label="Salvar" label_selected="Salvar" name="WLSavePreset"/>
+	<button label="Deletar" label_selected="Deletar" name="WLDeletePreset"/>
+	<button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" name="WLDayCycleMenuButton" width="150" left_delta="95" />
+	<tab_container name="WindLight Tabs">
+		<panel label="Atmosfera" name="Atmosphere">
+			<text name="BHText">
+				Horizonte Azul
+			</text>
+			<button label="?" name="WLBlueHorizonHelp"/>
+			<text name="BHText2">
+				R
+			</text>
+			<text name="BHText3">
+				G
+			</text>
+			<text name="BHText4">
+				B
+			</text>
+			<text name="BHText5">
+				I
+			</text>
+			<text name="BDensText">
+				Horizonte da Neblina
+			</text>
+			<button label="?" name="WLHazeHorizonHelp"/>
+			<text name="BDensText2">
+				Densidade de Azul
+			</text>
+			<button label="?" name="WLBlueDensityHelp"/>
+			<text name="BHText6">
+				R
+			</text>
+			<text name="BHText7">
+				G
+			</text>
+			<text name="BHText8">
+				B
+			</text>
+			<text name="BHText9">
+				I
+			</text>
+			<text name="HDText">
+				Densidade da Neblina
+			</text>
+			<button label="?" name="WLHazeDensityHelp"/>
+			<text name="DensMultText">
+				Multiplicador de Densidade
+			</text>
+			<button label="?" name="WLDensityMultHelp"/>
+			<text name="WLDistanceMultText">
+				Multiplicador de Distância
+			</text>
+			<button label="?" name="WLDistanceMultHelp"/>
+			<text name="MaxAltText">
+				Altitude Máxima
+			</text>
+			<button label="?" name="WLMaxAltitudeHelp"/>
+		</panel>
+		<panel label="Iluminação" name="Lighting">
+			<text name="SLCText">
+				Cor do Sol/Lua
+			</text>
+			<button label="?" name="WLSunlightColorHelp"/>
+			<text name="BHText">
+				R
+			</text>
+			<text name="BHText2">
+				G
+			</text>
+			<text name="BHText3">
+				B
+			</text>
+			<text name="BHText4">
+				I
+			</text>
+			<text name="TODText">
+				Posição do Sol/Lua
+			</text>
+			<button label="?" name="WLTimeOfDayHelp"/>
+			<text name="WLAmbientText">
+				Ambiente
+			</text>
+			<button label="?" name="WLAmbientHelp"/>
+			<text name="BHText5">
+				R
+			</text>
+			<text name="BHText6">
+				G
+			</text>
+			<text name="BHText7">
+				B
+			</text>
+			<text name="BHText8">
+				I
+			</text>
+			<text name="WLEastAngleText">
+				Ângulo Leste
+			</text>
+			<button label="?" name="WLEastAngleHelp"/>
+			<text name="SunGlowText">
+				Brilho do Sol
+			</text>
+			<button label="?" name="WLSunGlowHelp"/>
+			<slider label="Foco" name="WLGlowB"/>
+			<slider label="Tamanho" name="WLGlowR"/>
+			<text name="SceneGammaText">
+				Gamma da Cena
+			</text>
+			<button label="?" name="WLSceneGammaHelp"/>
+			<text name="WLStarText">
+				Brilho da Estrela
+			</text>
+			<button label="?" name="WLStarBrightnessHelp"/>
+		</panel>
+		<panel label="Nuvens" name="Clouds">
+			<text name="WLCloudColorText">
+				Cor da Nuvem
+			</text>
+			<button label="?" name="WLCloudColorHelp"/>
+			<text name="BHText">
+				R
+			</text>
+			<text name="BHText2">
+				G
+			</text>
+			<text name="BHText3">
+				B
+			</text>
+			<text name="BHText4">
+				I
+			</text>
+			<text name="WLCloudColorText2">
+				Densidade/ XY da Nuvem
+			</text>
+			<button label="?" name="WLCloudDensityHelp"/>
+			<text name="BHText5">
+				X
+			</text>
+			<text name="BHText6">
+				Y
+			</text>
+			<text name="BHText7">
+				D
+			</text>
+			<text name="WLCloudCoverageText">
+				Cobertura da Nuvem
+			</text>
+			<button label="?" name="WLCloudCoverageHelp"/>
+			<text name="WLCloudScaleText">
+				Escala da Nuvem
+			</text>
+			<button label="?" name="WLCloudScaleHelp"/>
+			<text name="WLCloudDetailText">
+				Detalhe da Nuvem  (XY/Densidade)
+			</text>
+			<button label="?" name="WLCloudDetailHelp"/>
+			<text name="BHText8">
+				X
+			</text>
+			<text name="BHText9">
+				Y
+			</text>
+			<text name="BHText10">
+				D
+			</text>
+			<text name="WLCloudScrollXText">
+				Rolagem X da Nuvem
+			</text>
+			<button label="?" name="WLCloudScrollXHelp"/>
+			<check_box label="Travar" name="WLCloudLockX"/>
+			<text name="WLCloudScrollYText">
+				Rolagem Y da Nuvem
+			</text>
+			<button label="?" name="WLCloudScrollYHelp"/>
+			<check_box label="Travar" name="WLCloudLockY"/>
+			<check_box label="Desenhar Nuvens Clássicas" name="DrawClassicClouds"/>
+			<button label="?" name="WLClassicCloudsHelp"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/menu_login.xml b/linden/indra/newview/skins/default/xui/pt/menu_login.xml
index 3aeb748..f60946f 100644
--- a/linden/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu_bar name="Login Menu">
-	<menu label="Arquivo" name="File">
-		<menu_item_call label="Sair" name="Quit"/>
-	</menu>
-	<menu label="Editar" name="Edit">
-		<menu_item_call label="Preferências..." name="Preferences..."/>
-	</menu>
-	<menu label="Ajuda" name="Help">
-		<menu_item_call label="Ajuda do Second Life" name="Second Life Help"/>
-		<menu_item_call label="Sobre o Second Life..." name="About Second Life..."/>
-	</menu>
-</menu_bar>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu_bar name="Login Menu">
+	<menu label="Arquivo" name="File">
+		<menu_item_call label="Sair" name="Quit"/>
+	</menu>
+	<menu label="Editar" name="Edit">
+		<menu_item_call label="Preferências..." name="Preferences..."/>
+	</menu>
+	<menu label="Ajuda" name="Help">
+		<menu_item_call label="Ajuda do Second Life" name="Second Life Help"/>
+		<menu_item_call label="Sobre o Second Life..." name="About Second Life..."/>
+	</menu>
+</menu_bar>
diff --git a/linden/indra/newview/skins/default/xui/pt/menu_slurl.xml b/linden/indra/newview/skins/default/xui/pt/menu_slurl.xml
index e18e776..67a4b51 100644
--- a/linden/indra/newview/skins/default/xui/pt/menu_slurl.xml
+++ b/linden/indra/newview/skins/default/xui/pt/menu_slurl.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Popup">
-	<menu_item_call label="Sobre a URL" name="about_url"/>
-	<menu_item_call label="Teletransporte para a URL" name="teleport_to_url"/>
-	<menu_item_call label="Mostrar no Mapa" name="show_on_map"/>
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Popup">
+	<menu_item_call label="Sobre a URL" name="about_url"/>
+	<menu_item_call label="Teletransporte para a URL" name="teleport_to_url"/>
+	<menu_item_call label="Mostrar no Mapa" name="show_on_map"/>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/pt/mime_types.xml b/linden/indra/newview/skins/default/xui/pt/mime_types.xml
index 7b6225e..f9c0496 100644
--- a/linden/indra/newview/skins/default/xui/pt/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/pt/mime_types.xml
@@ -1,230 +1,230 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<mimetypes name="default">
-	<widgetset name="web">
-		<label name="web_label">
-			Conteúdo da Web
-		</label>
-		<tooltip name="web_tooltip">
-			Esta região possui Conteúdo da Web disponível.
-		</tooltip>
-		<playtip name="web_playtip">
-			Exibir Conteúdo da Web
-		</playtip>
-	</widgetset>
-	<widgetset name="movie">
-		<label name="movie_label">
-			Filme
-		</label>
-		<tooltip name="movie_tooltip">
-			Há um filme disponível para se assistir aqui
-		</tooltip>
-		<playtip name="movie_playtip">
-			Iniciar filme
-		</playtip>
-	</widgetset>
-	<widgetset name="none">
-		<label name="none_label">
-			Sem conteúdo disponível
-		</label>
-		<tooltip name="none_tooltip">
-			Não há mídia disponível aqui.
-		</tooltip>
-	</widgetset>
-	<widgetset name="image">
-		<label name="image_label">
-			Imagem
-		</label>
-		<tooltip name="image_tooltip">
-			Há uma imagem neste local
-		</tooltip>
-		<playtip name="image_playtip">
-			Ver a imagem disponível deste local.
-		</playtip>
-	</widgetset>
-	<widgetset name="audio">
-		<label name="audio_label">
-			Áudio
-		</label>
-		<tooltip name="audio_tooltip">
-			Há um áudio neste local
-		</tooltip>
-		<playtip name="audio_playtip">
-			Iniciar áudio disponível neste local
-		</playtip>
-	</widgetset>
-	<scheme name="rtsp">
-		<label name="rtsp_label">
-			Transmissão em tempo real
-		</label>
-	</scheme>
-	<mimetype name="blank">
-		<label name="blank_label">
-			- Nenhum -
-		</label>
-	</mimetype>
-	<mimetype name="none/none">
-		<label name="none/none_label">
-			- Nenhum - 
-		</label>
-	</mimetype>
-	<mimetype name="audio/*">
-		<label name="audio2_label">
-			Áudio
-		</label>
-	</mimetype>
-	<mimetype name="video/*">
-		<label name="video2_label">
-			Vídeo
-		</label>
-	</mimetype>
-	<mimetype name="image/*">
-		<label name="image2_label">
-			Imagem
-		</label>
-	</mimetype>
-	<mimetype name="video/vnd.secondlife.qt.legacy">
-		<label name="vnd.secondlife.qt.legacy_label">
-			Filme (QuickTime)
-		</label>
-	</mimetype>
-	<mimetype name="application/javascript">
-		<label name="application/javascript_label">
-			Javascript
-		</label>
-	</mimetype>
-	<mimetype name="application/ogg">
-		<label name="application/ogg_label">
-			Áudio/Vídeo Ogg
-		</label>
-	</mimetype>
-	<mimetype name="application/pdf">
-		<label name="application/pdf_label">
-			Documento PDF
-		</label>
-	</mimetype>
-	<mimetype name="application/postscript">
-		<label name="application/postscript_label">
-			Documento Postscript
-		</label>
-	</mimetype>
-	<mimetype name="application/rtf">
-		<label name="application/rtf_label">
-			Rich Text (RTF)
-		</label>
-	</mimetype>
-	<mimetype name="application/smil">
-		<label name="application/smil_label">
-			Synchronized Multimedia Integration Language (SMIL)
-		</label>
-	</mimetype>
-	<mimetype name="application/xhtml+xml">
-		<label name="application/xhtml+xml_label">
-			Página Web (XHTML)
-		</label>
-	</mimetype>
-	<mimetype name="application/x-director">
-		<label name="application/x-director_label">
-			Macromedia Director
-		</label>
-	</mimetype>
-	<mimetype name="application/x-shockwave-flash">
-		<label name="application/x-shockwave-flash_label">
-			Flash
-		</label>
-	</mimetype>
-	<mimetype name="audio/mid">
-		<label name="audio/mid_label">
-			Áudio (MIDI)
-		</label>
-	</mimetype>
-	<mimetype name="audio/mpeg">
-		<label name="audio/mpeg_label">
-			Áudio (MP3)
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-aiff">
-		<label name="audio/x-aiff_label">
-			Áudio (AIFF)
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-wav">
-		<label name="audio/x-wav_label">
-			Áudio (WAV)
-		</label>
-	</mimetype>
-	<mimetype name="image/bmp">
-		<label name="image/bmp_label">
-			Imagem (BMP)
-		</label>
-	</mimetype>
-	<mimetype name="image/gif">
-		<label name="image/gif_label">
-			Imagem (GIF)
-		</label>
-	</mimetype>
-	<mimetype name="image/jpeg">
-		<label name="image/jpeg_label">
-			Imagem (JPEG)
-		</label>
-	</mimetype>
-	<mimetype name="image/png">
-		<label name="image/png_label">
-			Imagem (PNG)
-		</label>
-	</mimetype>
-	<mimetype name="image/svg+xml">
-		<label name="image/svg+xml_label">
-			Imagem (SVG)
-		</label>
-	</mimetype>
-	<mimetype name="image/tiff">
-		<label name="image/tiff_label">
-			Imagem (TIFF)
-		</label>
-	</mimetype>
-	<mimetype name="text/html">
-		<label name="text/html_label">
-			Página Web
-		</label>
-	</mimetype>
-	<mimetype name="text/plain">
-		<label name="text/plain_label">
-			Texto
-		</label>
-	</mimetype>
-	<mimetype name="text/xml">
-		<label name="text/xml_label">
-			XML
-		</label>
-	</mimetype>
-	<mimetype name="video/mpeg">
-		<label name="video/mpeg_label">
-			Filme (MPEG)
-		</label>
-	</mimetype>
-	<mimetype name="video/mp4">
-		<label name="video/mp4_label">
-			Filme (MP4)
-		</label>
-	</mimetype>
-	<mimetype name="video/quicktime">
-		<label name="video/quicktime_label">
-			Filme (QuickTime)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-asf">
-		<label name="video/x-ms-asf_label">
-			Filme (Windows Media ASF)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-wmv">
-		<label name="video/x-ms-wmv_label">
-			Filme (Windows Media WMV)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-msvideo">
-		<label name="video/x-msvideo_label">
-			Filme (AVI)
-		</label>
-	</mimetype>
-</mimetypes>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<mimetypes name="default">
+	<widgetset name="web">
+		<label name="web_label">
+			Conteúdo da Web
+		</label>
+		<tooltip name="web_tooltip">
+			Esta região possui Conteúdo da Web disponível.
+		</tooltip>
+		<playtip name="web_playtip">
+			Exibir Conteúdo da Web
+		</playtip>
+	</widgetset>
+	<widgetset name="movie">
+		<label name="movie_label">
+			Filme
+		</label>
+		<tooltip name="movie_tooltip">
+			Há um filme disponível para se assistir aqui
+		</tooltip>
+		<playtip name="movie_playtip">
+			Iniciar filme
+		</playtip>
+	</widgetset>
+	<widgetset name="none">
+		<label name="none_label">
+			Sem conteúdo disponível
+		</label>
+		<tooltip name="none_tooltip">
+			Não há mídia disponível aqui.
+		</tooltip>
+	</widgetset>
+	<widgetset name="image">
+		<label name="image_label">
+			Imagem
+		</label>
+		<tooltip name="image_tooltip">
+			Há uma imagem neste local
+		</tooltip>
+		<playtip name="image_playtip">
+			Ver a imagem disponível deste local.
+		</playtip>
+	</widgetset>
+	<widgetset name="audio">
+		<label name="audio_label">
+			Áudio
+		</label>
+		<tooltip name="audio_tooltip">
+			Há um áudio neste local
+		</tooltip>
+		<playtip name="audio_playtip">
+			Iniciar áudio disponível neste local
+		</playtip>
+	</widgetset>
+	<scheme name="rtsp">
+		<label name="rtsp_label">
+			Transmissão em tempo real
+		</label>
+	</scheme>
+	<mimetype name="blank">
+		<label name="blank_label">
+			- Nenhum -
+		</label>
+	</mimetype>
+	<mimetype name="none/none">
+		<label name="none/none_label">
+			- Nenhum - 
+		</label>
+	</mimetype>
+	<mimetype name="audio/*">
+		<label name="audio2_label">
+			Áudio
+		</label>
+	</mimetype>
+	<mimetype name="video/*">
+		<label name="video2_label">
+			Vídeo
+		</label>
+	</mimetype>
+	<mimetype name="image/*">
+		<label name="image2_label">
+			Imagem
+		</label>
+	</mimetype>
+	<mimetype name="video/vnd.secondlife.qt.legacy">
+		<label name="vnd.secondlife.qt.legacy_label">
+			Filme (QuickTime)
+		</label>
+	</mimetype>
+	<mimetype name="application/javascript">
+		<label name="application/javascript_label">
+			Javascript
+		</label>
+	</mimetype>
+	<mimetype name="application/ogg">
+		<label name="application/ogg_label">
+			Áudio/Vídeo Ogg
+		</label>
+	</mimetype>
+	<mimetype name="application/pdf">
+		<label name="application/pdf_label">
+			Documento PDF
+		</label>
+	</mimetype>
+	<mimetype name="application/postscript">
+		<label name="application/postscript_label">
+			Documento Postscript
+		</label>
+	</mimetype>
+	<mimetype name="application/rtf">
+		<label name="application/rtf_label">
+			Rich Text (RTF)
+		</label>
+	</mimetype>
+	<mimetype name="application/smil">
+		<label name="application/smil_label">
+			Synchronized Multimedia Integration Language (SMIL)
+		</label>
+	</mimetype>
+	<mimetype name="application/xhtml+xml">
+		<label name="application/xhtml+xml_label">
+			Página Web (XHTML)
+		</label>
+	</mimetype>
+	<mimetype name="application/x-director">
+		<label name="application/x-director_label">
+			Macromedia Director
+		</label>
+	</mimetype>
+	<mimetype name="application/x-shockwave-flash">
+		<label name="application/x-shockwave-flash_label">
+			Flash
+		</label>
+	</mimetype>
+	<mimetype name="audio/mid">
+		<label name="audio/mid_label">
+			Áudio (MIDI)
+		</label>
+	</mimetype>
+	<mimetype name="audio/mpeg">
+		<label name="audio/mpeg_label">
+			Áudio (MP3)
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-aiff">
+		<label name="audio/x-aiff_label">
+			Áudio (AIFF)
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-wav">
+		<label name="audio/x-wav_label">
+			Áudio (WAV)
+		</label>
+	</mimetype>
+	<mimetype name="image/bmp">
+		<label name="image/bmp_label">
+			Imagem (BMP)
+		</label>
+	</mimetype>
+	<mimetype name="image/gif">
+		<label name="image/gif_label">
+			Imagem (GIF)
+		</label>
+	</mimetype>
+	<mimetype name="image/jpeg">
+		<label name="image/jpeg_label">
+			Imagem (JPEG)
+		</label>
+	</mimetype>
+	<mimetype name="image/png">
+		<label name="image/png_label">
+			Imagem (PNG)
+		</label>
+	</mimetype>
+	<mimetype name="image/svg+xml">
+		<label name="image/svg+xml_label">
+			Imagem (SVG)
+		</label>
+	</mimetype>
+	<mimetype name="image/tiff">
+		<label name="image/tiff_label">
+			Imagem (TIFF)
+		</label>
+	</mimetype>
+	<mimetype name="text/html">
+		<label name="text/html_label">
+			Página Web
+		</label>
+	</mimetype>
+	<mimetype name="text/plain">
+		<label name="text/plain_label">
+			Texto
+		</label>
+	</mimetype>
+	<mimetype name="text/xml">
+		<label name="text/xml_label">
+			XML
+		</label>
+	</mimetype>
+	<mimetype name="video/mpeg">
+		<label name="video/mpeg_label">
+			Filme (MPEG)
+		</label>
+	</mimetype>
+	<mimetype name="video/mp4">
+		<label name="video/mp4_label">
+			Filme (MP4)
+		</label>
+	</mimetype>
+	<mimetype name="video/quicktime">
+		<label name="video/quicktime_label">
+			Filme (QuickTime)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-asf">
+		<label name="video/x-ms-asf_label">
+			Filme (Windows Media ASF)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-wmv">
+		<label name="video/x-ms-wmv_label">
+			Filme (Windows Media WMV)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-msvideo">
+		<label name="video/x-msvideo_label">
+			Filme (AVI)
+		</label>
+	</mimetype>
+</mimetypes>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_audio_device.xml b/linden/indra/newview/skins/default/xui/pt/panel_audio_device.xml
index 9581413..3dae8cf 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_audio_device.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_audio_device.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="device_settings">
-	<text name="Audio Devices">
-		Dispositivos de Áudio
-	</text>
-	<text name="Input device (microphone):">
-		Dispositivo de entrada (microfone):
-	</text>
-	<text name="Input level:">
-		Nível de Entrada
-	</text>
-	<string name="default_text">
-		Padrão
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="device_settings">
+	<text name="Audio Devices">
+		Dispositivos de Áudio
+	</text>
+	<text name="Input device (microphone):">
+		Dispositivo de entrada (microfone):
+	</text>
+	<text name="Input level:">
+		Nível de Entrada
+	</text>
+	<string name="default_text">
+		Padrão
+	</string>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_friends.xml b/linden/indra/newview/skins/default/xui/pt/panel_friends.xml
index 9a69ec1..fe2f11a 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_friends.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="friends">
-	<string name="Multiple">
-		Multiplos amigos...
-	</string>
-	<scroll_list name="friend_list" tool_tip="Hold shift or control while clicking to select multiple friends">
-		<column name="icon_online_status" tool_tip="Status Online"/>
-		<column label="Name" name="friend_name" tool_tip="Nome"/>
-		<column name="icon_visible_online" tool_tip="Amigo pod ever quando você está online"/>
-		<column name="icon_visible_map" tool_tip="Amigo pode localizá-lo no mapa"/>
-		<column name="icon_edit_mine" tool_tip="Amigo pode editar, apagar ou pegar os seus objetos"/>
-		<column name="icon_edit_theirs" tool_tip="Você pode editar os objetos deste amigo"/>
-	</scroll_list>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="friends">
+	<string name="Multiple">
+		Multiplos amigos...
+	</string>
+	<scroll_list name="friend_list" tool_tip="Hold shift or control while clicking to select multiple friends">
+		<column name="icon_online_status" tool_tip="Status Online"/>
+		<column label="Name" name="friend_name" tool_tip="Nome"/>
+		<column name="icon_visible_online" tool_tip="Amigo pod ever quando você está online"/>
+		<column name="icon_visible_map" tool_tip="Amigo pode localizá-lo no mapa"/>
+		<column name="icon_edit_mine" tool_tip="Amigo pode editar, apagar ou pegar os seus objetos"/>
+		<column name="icon_edit_theirs" tool_tip="Você pode editar os objetos deste amigo"/>
+	</scroll_list>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/pt/panel_media_controls.xml
index 65a6077..5ee273f 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_media_controls.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="media_controls">
-	<icon label="" name="music_icon" tool_tip="Executar/pausar fluxo de música"/>
-	<button label="" name="music_play" tool_tip="Executar/pausar fluxo de música"/>
-	<button label="" name="music_pause" tool_tip="Pausar fluxo de música"/>
-	<button label="" name="music_stop" tool_tip="Parar o fluxo de música"/>
-	<icon label="" name="media_icon" tool_tip="Executar/pausar o fluxo de música"/>
-	<button label="" name="media_play" tool_tip="Executar/pausar o fluxo de música"/>
-	<button label="" name="media_pause" tool_tip="Pausar o fluxo de mídia"/>
-	<button label="" name="media_stop" tool_tip="Parar o fluxo de mídia"/>
-	<volume_slider name="volume_slider" tool_tip="Volume Mestre"/>
-	<button label="" name="mute_master" tool_tip="Emudecedor Mestre"/>
-	<button label="" name="expand" tool_tip="Ajustar níveis de volume individuais"/>
-	<string name="play_label">
-		Executar
-	</string>
-	<string name="stop_label">
-		Parar
-	</string>
-	<string name="pause_label">
-		Pausar
-	</string>
-	<string name="default_tooltip_label">
-		Nenhuma Mídia Especificada
-	</string>
-	<string name="media_hidden_label">
-		(URL escondida pelo dono do terreno)
-	</string>
-	<string name="media_icon_tooltip_web">
-		Esta localidade mostra conteúdo da World Wide Web. Clique no botão Play para mostrar conteúdo da web.
-	</string>
-	<string name="media_icon_tooltip_movie">
-		Esta localidade mostra conteúdo de Vídeo. Clique no botão Play para executar o vídeo.
-	</string>
-	<string name="media_play_tooltip">
-		Mostra conteúdo da Web nesta localidade.
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="media_controls">
+	<icon label="" name="music_icon" tool_tip="Executar/pausar fluxo de música"/>
+	<button label="" name="music_play" tool_tip="Executar/pausar fluxo de música"/>
+	<button label="" name="music_pause" tool_tip="Pausar fluxo de música"/>
+	<button label="" name="music_stop" tool_tip="Parar o fluxo de música"/>
+	<icon label="" name="media_icon" tool_tip="Executar/pausar o fluxo de música"/>
+	<button label="" name="media_play" tool_tip="Executar/pausar o fluxo de música"/>
+	<button label="" name="media_pause" tool_tip="Pausar o fluxo de mídia"/>
+	<button label="" name="media_stop" tool_tip="Parar o fluxo de mídia"/>
+	<volume_slider name="volume_slider" tool_tip="Volume Mestre"/>
+	<button label="" name="mute_master" tool_tip="Emudecedor Mestre"/>
+	<button label="" name="expand" tool_tip="Ajustar níveis de volume individuais"/>
+	<string name="play_label">
+		Executar
+	</string>
+	<string name="stop_label">
+		Parar
+	</string>
+	<string name="pause_label">
+		Pausar
+	</string>
+	<string name="default_tooltip_label">
+		Nenhuma Mídia Especificada
+	</string>
+	<string name="media_hidden_label">
+		(URL escondida pelo dono do terreno)
+	</string>
+	<string name="media_icon_tooltip_web">
+		Esta localidade mostra conteúdo da World Wide Web. Clique no botão Play para mostrar conteúdo da web.
+	</string>
+	<string name="media_icon_tooltip_movie">
+		Esta localidade mostra conteúdo de Vídeo. Clique no botão Play para executar o vídeo.
+	</string>
+	<string name="media_play_tooltip">
+		Mostra conteúdo da Web nesta localidade.
+	</string>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_media_remote_expanded.xml b/linden/indra/newview/skins/default/xui/pt/panel_media_remote_expanded.xml
index ed34f2a..109e54b 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_media_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_media_remote_expanded.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="media_remote">
-	<panel label="Áudio &amp; Vídeo" name="Volume Panel"/>
-	<string name="play_label">
-		Executar
-	</string>
-	<string name="stop_label">
-		Parar
-	</string>
-	<string name="pause_label">
-		Pausar
-	</string>
-	<string name="default_tooltip_label">
-		Nenhuma Mídia Especificada
-	</string>
-	<string name="media_hidden_label">
-		(URL escondida pelo dono do terreno)
-	</string>
-	<string name="media_icon_tooltip_web">
-		Esta localidade mostra conteúdo da World Wide Web. Clique no botão Executar para mostrar o conteúdo Web.
-	</string>
-	<string name="media_icon_tooltip_movie">
-		Esta localidade mostra conteúdo de Vídeo. Clique no botão Executar para executar o vídeo.
-	</string>
-	<string name="media_play_tooltip">
-		Mostra conteúdo Web nesta localidade.
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="media_remote">
+	<panel label="Áudio &amp; Vídeo" name="Volume Panel"/>
+	<string name="play_label">
+		Executar
+	</string>
+	<string name="stop_label">
+		Parar
+	</string>
+	<string name="pause_label">
+		Pausar
+	</string>
+	<string name="default_tooltip_label">
+		Nenhuma Mídia Especificada
+	</string>
+	<string name="media_hidden_label">
+		(URL escondida pelo dono do terreno)
+	</string>
+	<string name="media_icon_tooltip_web">
+		Esta localidade mostra conteúdo da World Wide Web. Clique no botão Executar para mostrar o conteúdo Web.
+	</string>
+	<string name="media_icon_tooltip_movie">
+		Esta localidade mostra conteúdo de Vídeo. Clique no botão Executar para executar o vídeo.
+	</string>
+	<string name="media_play_tooltip">
+		Mostra conteúdo Web nesta localidade.
+	</string>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_skins.xml
index 6564953..c3f2f51 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_skins.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Peles" name="Skins panel">
-	<text name="muting_text">
-		Selecione uma pele (necessita reiniciar):
-	</text>
-	<radio_group name="skin_selection">
-		<radio_item name="default">
-			Padrão
-		</radio_item>
-		<radio_item name="silver">
-			Prata
-		</radio_item>
-	</radio_group>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Peles" name="Skins panel">
+	<text name="muting_text">
+		Selecione uma pele (necessita reiniciar):
+	</text>
+	<radio_group name="skin_selection">
+		<radio_item name="default">
+			Padrão
+		</radio_item>
+		<radio_item name="silver">
+			Prata
+		</radio_item>
+	</radio_group>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_voice.xml
index 9a38bff..e9efc6f 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_voice.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Voice Chat" name="chat">
-	<button label="Configurações do dispositivo" name="device_settings_btn" width="180" />
-	<text_editor name="device_settings_text" height="48" bottom_delta="-45">
-		NOTA: Executar o Configurações do dispositivo vai desligá-lo temporariamente do Bate- papo de voz, e as mudanças que você fizer serão imediatamente aplicadas.
-	</text_editor>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Voice Chat" name="chat">
+	<button label="Configurações do dispositivo" name="device_settings_btn" width="180" />
+	<text_editor name="device_settings_text" height="48" bottom_delta="-45">
+		NOTA: Executar o Configurações do dispositivo vai desligá-lo temporariamente do Bate- papo de voz, e as mudanças que você fizer serão imediatamente aplicadas.
+	</text_editor>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_speaker_controls.xml b/linden/indra/newview/skins/default/xui/pt/panel_speaker_controls.xml
index 1967362..66d5ff4 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_speaker_controls.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="active_speakers_panel">
-	<string name="moderator_label">
-		(Moderador)
-	</string>
-	<layout_stack name="panels">
-		<layout_panel name="moderation_mode_panel">
-			<combo_box name="moderation_mode">
-				<combo_item name="OpenVoice">
-					Voz ativada por padrão
-				</combo_item>
-				<combo_item name="ModeratedVoice">
-					Voz desligada por padrão
-				</combo_item>
-			</combo_box>
-		</layout_panel>
-		<layout_panel name="moderate_chat_panel">
-			<scroll_list name="speakers_list">
-				<column label="Nome" name="speaker_name"/>
-			</scroll_list>
-			<panel name="speaker_controls">
-				<button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
-				<check_box label="Emudecer Texto" name="mute_text_btn"/>
-			</panel>
-		</layout_panel>
-		<layout_panel name="moderator_controls">
-			<text name="moderator_controls_label">
-				Controles do Moderador:
-			</text>
-			<check_box name="moderator_allow_voice">
-				Permitir conversa por voz
-			</check_box>
-			<check_box name="moderator_allow_text">
-				Permitir conversa por texto
-			</check_box>
-		</layout_panel>
-	</layout_stack>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="active_speakers_panel">
+	<string name="moderator_label">
+		(Moderador)
+	</string>
+	<layout_stack name="panels">
+		<layout_panel name="moderation_mode_panel">
+			<combo_box name="moderation_mode">
+				<combo_item name="OpenVoice">
+					Voz ativada por padrão
+				</combo_item>
+				<combo_item name="ModeratedVoice">
+					Voz desligada por padrão
+				</combo_item>
+			</combo_box>
+		</layout_panel>
+		<layout_panel name="moderate_chat_panel">
+			<scroll_list name="speakers_list">
+				<column label="Nome" name="speaker_name"/>
+			</scroll_list>
+			<panel name="speaker_controls">
+				<button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
+				<check_box label="Emudecer Texto" name="mute_text_btn"/>
+			</panel>
+		</layout_panel>
+		<layout_panel name="moderator_controls">
+			<text name="moderator_controls_label">
+				Controles do Moderador:
+			</text>
+			<check_box name="moderator_allow_voice">
+				Permitir conversa por voz
+			</check_box>
+			<check_box name="moderator_allow_text">
+				Permitir conversa por texto
+			</check_box>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_voice_controls.xml b/linden/indra/newview/skins/default/xui/pt/panel_voice_controls.xml
index 29ecfbf..9c602eb 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_voice_controls.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_voice_controls.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="voice_controls">
-	<button label="" name="speakers_btn" tool_tip="Mostra os residentes que estão usando bate-papo em voz em torno de ti."/>
-	<button label="Falar" name="push_to_talk" tool_tip="Segure o botão para falar"/>
-	<button label="" name="ptt_lock" tool_tip="Clique na fechadura para entrar no modo de falar"/>
-	<button label="" name="show_channel" tool_tip="Clique para mostrar o canal corrente de voz"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="voice_controls">
+	<button label="" name="speakers_btn" tool_tip="Mostra os residentes que estão usando bate-papo em voz em torno de ti."/>
+	<button label="Falar" name="push_to_talk" tool_tip="Segure o botão para falar"/>
+	<button label="" name="ptt_lock" tool_tip="Clique na fechadura para entrar no modo de falar"/>
+	<button label="" name="show_channel" tool_tip="Clique para mostrar o canal corrente de voz"/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_voice_enable.xml b/linden/indra/newview/skins/default/xui/pt/panel_voice_enable.xml
index b159ec7..8debaf0 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_voice_enable.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="content_panel">
-	<text_editor name="voice_intro_text1">
-		Bem-vindo ao Bate-Papo em voz do Second Life! O Bate-papo em Voz lhe permite falar com outros residentes. Este assistente irá guiá-lo através dos passos necessários para configurar o Bate-papo em voz. Utilizá-lo exige falantes e áudio, se quiser falar com outras pessoas, use um microfone ou headset estéreo com microfone.
-	</text_editor>
-	<text_editor name="voice_intro_text2">
-		Bate-papo em voz é ativado por padrão. Quer continuar usando a conversa em voz?
-	</text_editor>
-	<radio_group name="voice_enable">
-		<radio_item name="1">
-			Sim, continue com o Bate-papo em Voz.
-		</radio_item>
-		<radio_item name="0">
-			Não, desative o Bate-papo em Voz.
-		</radio_item>
-	</radio_group>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="content_panel">
+	<text_editor name="voice_intro_text1">
+		Bem-vindo ao Bate-Papo em voz do Second Life! O Bate-papo em Voz lhe permite falar com outros residentes. Este assistente irá guiá-lo através dos passos necessários para configurar o Bate-papo em voz. Utilizá-lo exige falantes e áudio, se quiser falar com outras pessoas, use um microfone ou headset estéreo com microfone.
+	</text_editor>
+	<text_editor name="voice_intro_text2">
+		Bate-papo em voz é ativado por padrão. Quer continuar usando a conversa em voz?
+	</text_editor>
+	<radio_group name="voice_enable">
+		<radio_item name="1">
+			Sim, continue com o Bate-papo em Voz.
+		</radio_item>
+		<radio_item name="0">
+			Não, desative o Bate-papo em Voz.
+		</radio_item>
+	</radio_group>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/pt/panel_voice_options.xml
index 31468b7..ef3b46b 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_voice_options.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_voice_options.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="content_panel">
-	<check_box label="Permitir somente amigos de iniciar chamadas de voz comigo." name="friends_only_check"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="content_panel">
+	<check_box label="Permitir somente amigos de iniciar chamadas de voz comigo." name="friends_only_check"/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/default/xui/pt/panel_voice_remote_expanded.xml
index feb407e..1cd8a44 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_voice_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_voice_remote_expanded.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="voice_remote">
-	<button label="" name="end_call_btn" tool_tip="Clique para deixar em espera"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="voice_remote">
+	<button label="" name="end_call_btn" tool_tip="Clique para deixar em espera"/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/strings.xml b/linden/indra/newview/skins/default/xui/pt/strings.xml
index bc0e1ea..0eacba6 100644
--- a/linden/indra/newview/skins/default/xui/pt/strings.xml
+++ b/linden/indra/newview/skins/default/xui/pt/strings.xml
@@ -1,421 +1,421 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- This file contains strings that used to be hardcoded in the source.
-     It is only for those strings which don&apos;t belong in a floater.
-     For example, the strings used in avatar chat bubbles, and strings 
-     that are returned from one component and may appear in many places-->
-<strings>
-	<string name="LoginInProgress">
-		Fazendo Login. [APP_NAME] pode parecer congelado. Por favor, aguarde.
-	</string>
-	<string name="LoginAuthenticating">
-		Autenticando
-	</string>
-	<string name="LoginMaintenance">
-		Executando manutenção da conta...
-	</string>
-	<string name="LoginAttempt">
-		Falha na tentativa anterior de login. Fazendo Login, tentativa [NUMBER]
-	</string>
-	<string name="LoginPrecaching">
-		Carregando mundo...
-	</string>
-	<string name="LoginInitializingBrowser">
-		Inicializando navegador embutido...
-	</string>
-	<string name="LoginInitializingMultimedia">
-		Inicializando multimídia...
-	</string>
-	<string name="LoginVerifyingCache">
-		Verificando arquivos no cache (pode levar 60-90 segundos)...
-	</string>
-	<string name="LoginProcessingResponse">
-		Processando Resposta...
-	</string>
-	<string name="LoginInitializingWorld">
-		Inicializando Mundo...
-	</string>
-	<string name="LoginDecodingImages">
-		Decodificando imagens...
-	</string>
-	<string name="LoginInitializingQuicktime">
-		Inicializando o QuickTime...
-	</string>
-	<string name="LoginQuicktimeNotFound">
-		O QuickTime não foi encontrado - incapaz de inicializar.
-	</string>
-	<string name="LoginQuicktimeOK">
-		O QuickTime foi inicializado com sucesso.
-	</string>
-	<string name="LoginWaitingForRegionHandshake">
-		Aguardando o handshake com a região...
-	</string>
-	<string name="LoginConnectingToRegion">
-		Conectando à região...
-	</string>
-	<string name="LoginDownloadingClothing">
-		Baixando roupas...
-	</string>
-	<string name="LoginFailedNoNetwork">
-		Erro de Rede: Não foi possível estabelecer uma conexão. Por favor, verifique sua conexão de rede.
-	</string>
-	<string name="AgentLostConnection">
-		Esta região pode estar passando por problemas. Por favor, verifique sua conexão com a internet.
-	</string>
-	<string name="TooltipPerson">
-		Pessoa
-	</string>
-	<string name="TooltipNoName">
-		(sem nome)
-	</string>
-	<string name="TooltipOwner">
-		Proprietário:
-	</string>
-	<string name="TooltipPublic">
-		Público
-	</string>
-	<string name="TooltipIsGroup">
-		(Grupo)
-	</string>
-	<string name="TooltipFlagScript">
-		Script
-	</string>
-	<string name="TooltipFlagPhysics">
-		Física
-	</string>
-	<string name="TooltipFlagTouch">
-		Toque
-	</string>
-	<string name="TooltipFlagL$">
-		L$
-	</string>
-	<string name="TooltipFlagDropInventory">
-		Largar Estoque
-	</string>
-	<string name="TooltipFlagPhantom">
-		Imaterial
-	</string>
-	<string name="TooltipFlagTemporary">
-		Temporário
-	</string>
-	<string name="TooltipFlagRightClickMenu">
-		(Clique com o botão direito para acessar o menu)
-	</string>
-	<string name="TooltipFreeToCopy">
-		Cópia Permitida
-	</string>
-	<string name="TooltipForSaleL$">
-		À venda: L$[AMOUNT]
-	</string>
-	<string name="TooltipForSaleMsg">
-		À venda: [MESSAGE]
-	</string>
-	<string name="TooltipFlagGroupBuild">
-		Construído por Grupo
-	</string>
-	<string name="TooltipFlagNoBuild">
-		Não é Permitido Construir
-	</string>
-	<string name="TooltipFlagNoEdit">
-		Construído por Grupo
-	</string>
-	<string name="TooltipFlagNotSafe">
-		Não é Seguro
-	</string>
-	<string name="TooltipFlagNoFly">
-		Não é Permitido Voar
-	</string>
-	<string name="TooltipFlagGroupScripts">
-		Scripts de Grupo
-	</string>
-	<string name="TooltipFlagNoScripts">
-		Não são Permitidos Scripts
-	</string>
-	<string name="TooltipLand">
-		Terreno:
-	</string>
-	<string name="TooltipMustSingleDrop">
-		Apenas um item único pode ser arrastado para este local
-	</string>
-	<string name="RetrievingData">
-		Buscando...
-	</string>
-	<string name="ReleaseNotes">
-		Notas de Distribuição
-	</string>
-	<string name="LoadingData">
-		Carregando...
-	</string>
-	<string name="AvatarNameNobody">
-		(ninguém)
-	</string>
-	<string name="AvatarNameWaiting">
-		(aguardando)
-	</string>
-	<string name="AvatarNameHippos">
-		(hippos)
-	</string>
-	<string name="GroupNameNone">
-		(nenhum)
-	</string>
-	<string name="AssetErrorNone">
-		Nenhum erro
-	</string>
-	<string name="AssetErrorRequestFailed">
-		Valor pedido falhou
-	</string>
-	<string name="AssetErrorNonexistentFile">
-		Valor pedido: arquivo inexistente
-	</string>
-	<string name="AssetErrorNotInDatabase">
-		Valor pedido: valor não encontrado na base de dados.
-	</string>
-	<string name="AssetErrorEOF">
-		Fim do arquivo
-	</string>
-	<string name="AssetErrorCannotOpenFile">
-		Não é possível abrir arquivo
-	</string>
-	<string name="AssetErrorFileNotFound">
-		Arquivo não encontrado
-	</string>
-	<string name="AssetErrorTCPTimeout">
-		Tempo de transferência de arquivo expirado
-	</string>
-	<string name="AssetErrorCircuitGone">
-		Circuito caiu (Circuit gone)
-	</string>
-	<string name="AssetErrorUnknownStatus">
-		Status desconhecido
-	</string>
-	<string name="AvatarEditingApparance">
-		(Editando Aparência)
-	</string>
-	<string name="AvatarAway">
-		Distante
-	</string>
-	<string name="AvatarBusy">
-		Ocupado
-	</string>
-	<string name="AvatarMuted">
-		Emudecido
-	</string>
-	<string name="anim_express_afraid">
-		Temeroso
-	</string>
-	<string name="anim_express_anger">
-		Bravo
-	</string>
-	<string name="anim_away">
-		Distante
-	</string>
-	<string name="anim_backflip">
-		Virar para trás
-	</string>
-	<string name="anim_express_laugh">
-		Rir segurando a barriga
-	</string>
-	<string name="anim_express_toothsmile">
-		Sorriso largo
-	</string>
-	<string name="anim_blowkiss">
-		Mandar beijo
-	</string>
-	<string name="anim_express_bored">
-		Entediado
-	</string>
-	<string name="anim_bow">
-		Saudar curvando
-	</string>
-	<string name="anim_clap">
-		Aplaudir
-	</string>
-	<string name="anim_courtbow">
-		Saudação formal
-	</string>
-	<string name="anim_express_cry">
-		Chorar
-	</string>
-	<string name="anim_dance1">
-		Dança 1
-	</string>
-	<string name="anim_dance2">
-		Dança 2
-	</string>
-	<string name="anim_dance3">
-		Dança 3
-	</string>
-	<string name="anim_dance4">
-		Dança 4
-	</string>
-	<string name="anim_dance5">
-		Dança 5
-	</string>
-	<string name="anim_dance6">
-		Dança 6
-	</string>
-	<string name="anim_dance7">
-		Dança 7
-	</string>
-	<string name="anim_dance8">
-		Dança 8
-	</string>
-	<string name="anim_express_disdain">
-		Desdém
-	</string>
-	<string name="anim_drink">
-		Beber
-	</string>
-	<string name="anim_express_embarrased">
-		Envergonhado
-	</string>
-	<string name="anim_angry_fingerwag">
-		Negar com o dedo.
-	</string>
-	<string name="anim_fist_pump">
-		Vibrar provocando
-	</string>
-	<string name="anim_yoga_float">
-		Levitar Yoga
-	</string>
-	<string name="anim_express_frown">
-		Careta
-	</string>
-	<string name="anim_impatient">
-		Impaciente
-	</string>
-	<string name="anim_jumpforjoy">
-		Pular de Alegria
-	</string>
-	<string name="anim_kissmybutt">
-		Beije meu Bumbum
-	</string>
-	<string name="anim_express_kiss">
-		Beijar
-	</string>
-	<string name="anim_laugh_short">
-		rir
-	</string>
-	<string name="anim_musclebeach">
-		Exibir músculos
-	</string>
-	<string name="anim_no_unhappy">
-		Não (descontente)
-	</string>
-	<string name="anim_no_head">
-		Não
-	</string>
-	<string name="anim_nyanya">
-		Nya-nya-nya
-	</string>
-	<string name="anim_punch_onetwo">
-		Um-Dois soco
-	</string>
-	<string name="anim_express_open_mouth">
-		Abrir a boca
-	</string>
-	<string name="anim_peace">
-		Paz
-	</string>
-	<string name="anim_point_you">
-		Apontar para o outro
-	</string>
-	<string name="anim_point_me">
-		Apontar para si
-	</string>
-	<string name="anim_punch_l">
-		Socar Esquerda
-	</string>
-	<string name="anim_punch_r">
-		Socar Direita
-	</string>
-	<string name="anim_rps_countdown">
-		RPS contar
-	</string>
-	<string name="anim_rps_paper">
-		RPS papel
-	</string>
-	<string name="anim_rps_rock">
-		RPS pedra
-	</string>
-	<string name="anim_rps_scissors">
-		RPS tesoura
-	</string>
-	<string name="anim_express_repulsed">
-		Repulsa
-	</string>
-	<string name="anim_kick_roundhouse_r">
-		Chute giratório
-	</string>
-	<string name="anim_express_sad">
-		Triste
-	</string>
-	<string name="anim_salute">
-		Saúde
-	</string>
-	<string name="anim_shout">
-		Gritar
-	</string>
-	<string name="anim_express_shrug">
-		Encolher ombros
-	</string>
-	<string name="anim_express_smile">
-		Sorrir
-	</string>
-	<string name="anim_smoke_idle">
-		Fumar à toa
-	</string>
-	<string name="anim_smoke_inhale">
-		Inalar Fumaça
-	</string>
-	<string name="anim_smoke_throw_down">
-		Expelir Fumaça
-	</string>
-	<string name="anim_express_surprise">
-		Surpresa
-	</string>
-	<string name="anim_sword_strike_r">
-		Golpe de Espada
-	</string>
-	<string name="anim_angry_tantrum">
-		Enraivecer
-	</string>
-	<string name="anim_express_tongue_out">
-		Mostrar a língua
-	</string>
-	<string name="anim_hello">
-		Onda
-	</string>
-	<string name="anim_whisper">
-		Sussurrar
-	</string>
-	<string name="anim_whistle">
-		Assobiar
-	</string>
-	<string name="anim_express_wink">
-		Piscar
-	</string>
-	<string name="anim_wink_hollywood">
-		Piscar (Hollywood)
-	</string>
-	<string name="anim_express_worry">
-		Preocupar-se
-	</string>
-	<string name="anim_yes_happy">
-		Sim (Feliz)
-	</string>
-	<string name="anim_yes_head">
-		Sim
-	</string>
-	<string name="texture_loading">
-		Carregando...
-	</string>
-	<string name="worldmap_offline">
-		Desconectado
-	</string>
-	<string name="whisper">
-		sussurra:
-	</string>
-	<string name="shout">
-		grita:
-	</string>
-</strings>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- This file contains strings that used to be hardcoded in the source.
+     It is only for those strings which don&apos;t belong in a floater.
+     For example, the strings used in avatar chat bubbles, and strings 
+     that are returned from one component and may appear in many places-->
+<strings>
+	<string name="LoginInProgress">
+		Fazendo Login. [APP_NAME] pode parecer congelado. Por favor, aguarde.
+	</string>
+	<string name="LoginAuthenticating">
+		Autenticando
+	</string>
+	<string name="LoginMaintenance">
+		Executando manutenção da conta...
+	</string>
+	<string name="LoginAttempt">
+		Falha na tentativa anterior de login. Fazendo Login, tentativa [NUMBER]
+	</string>
+	<string name="LoginPrecaching">
+		Carregando mundo...
+	</string>
+	<string name="LoginInitializingBrowser">
+		Inicializando navegador embutido...
+	</string>
+	<string name="LoginInitializingMultimedia">
+		Inicializando multimídia...
+	</string>
+	<string name="LoginVerifyingCache">
+		Verificando arquivos no cache (pode levar 60-90 segundos)...
+	</string>
+	<string name="LoginProcessingResponse">
+		Processando Resposta...
+	</string>
+	<string name="LoginInitializingWorld">
+		Inicializando Mundo...
+	</string>
+	<string name="LoginDecodingImages">
+		Decodificando imagens...
+	</string>
+	<string name="LoginInitializingQuicktime">
+		Inicializando o QuickTime...
+	</string>
+	<string name="LoginQuicktimeNotFound">
+		O QuickTime não foi encontrado - incapaz de inicializar.
+	</string>
+	<string name="LoginQuicktimeOK">
+		O QuickTime foi inicializado com sucesso.
+	</string>
+	<string name="LoginWaitingForRegionHandshake">
+		Aguardando o handshake com a região...
+	</string>
+	<string name="LoginConnectingToRegion">
+		Conectando à região...
+	</string>
+	<string name="LoginDownloadingClothing">
+		Baixando roupas...
+	</string>
+	<string name="LoginFailedNoNetwork">
+		Erro de Rede: Não foi possível estabelecer uma conexão. Por favor, verifique sua conexão de rede.
+	</string>
+	<string name="AgentLostConnection">
+		Esta região pode estar passando por problemas. Por favor, verifique sua conexão com a internet.
+	</string>
+	<string name="TooltipPerson">
+		Pessoa
+	</string>
+	<string name="TooltipNoName">
+		(sem nome)
+	</string>
+	<string name="TooltipOwner">
+		Proprietário:
+	</string>
+	<string name="TooltipPublic">
+		Público
+	</string>
+	<string name="TooltipIsGroup">
+		(Grupo)
+	</string>
+	<string name="TooltipFlagScript">
+		Script
+	</string>
+	<string name="TooltipFlagPhysics">
+		Física
+	</string>
+	<string name="TooltipFlagTouch">
+		Toque
+	</string>
+	<string name="TooltipFlagL$">
+		L$
+	</string>
+	<string name="TooltipFlagDropInventory">
+		Largar Estoque
+	</string>
+	<string name="TooltipFlagPhantom">
+		Imaterial
+	</string>
+	<string name="TooltipFlagTemporary">
+		Temporário
+	</string>
+	<string name="TooltipFlagRightClickMenu">
+		(Clique com o botão direito para acessar o menu)
+	</string>
+	<string name="TooltipFreeToCopy">
+		Cópia Permitida
+	</string>
+	<string name="TooltipForSaleL$">
+		À venda: L$[AMOUNT]
+	</string>
+	<string name="TooltipForSaleMsg">
+		À venda: [MESSAGE]
+	</string>
+	<string name="TooltipFlagGroupBuild">
+		Construído por Grupo
+	</string>
+	<string name="TooltipFlagNoBuild">
+		Não é Permitido Construir
+	</string>
+	<string name="TooltipFlagNoEdit">
+		Construído por Grupo
+	</string>
+	<string name="TooltipFlagNotSafe">
+		Não é Seguro
+	</string>
+	<string name="TooltipFlagNoFly">
+		Não é Permitido Voar
+	</string>
+	<string name="TooltipFlagGroupScripts">
+		Scripts de Grupo
+	</string>
+	<string name="TooltipFlagNoScripts">
+		Não são Permitidos Scripts
+	</string>
+	<string name="TooltipLand">
+		Terreno:
+	</string>
+	<string name="TooltipMustSingleDrop">
+		Apenas um item único pode ser arrastado para este local
+	</string>
+	<string name="RetrievingData">
+		Buscando...
+	</string>
+	<string name="ReleaseNotes">
+		Notas de Distribuição
+	</string>
+	<string name="LoadingData">
+		Carregando...
+	</string>
+	<string name="AvatarNameNobody">
+		(ninguém)
+	</string>
+	<string name="AvatarNameWaiting">
+		(aguardando)
+	</string>
+	<string name="AvatarNameHippos">
+		(hippos)
+	</string>
+	<string name="GroupNameNone">
+		(nenhum)
+	</string>
+	<string name="AssetErrorNone">
+		Nenhum erro
+	</string>
+	<string name="AssetErrorRequestFailed">
+		Valor pedido falhou
+	</string>
+	<string name="AssetErrorNonexistentFile">
+		Valor pedido: arquivo inexistente
+	</string>
+	<string name="AssetErrorNotInDatabase">
+		Valor pedido: valor não encontrado na base de dados.
+	</string>
+	<string name="AssetErrorEOF">
+		Fim do arquivo
+	</string>
+	<string name="AssetErrorCannotOpenFile">
+		Não é possível abrir arquivo
+	</string>
+	<string name="AssetErrorFileNotFound">
+		Arquivo não encontrado
+	</string>
+	<string name="AssetErrorTCPTimeout">
+		Tempo de transferência de arquivo expirado
+	</string>
+	<string name="AssetErrorCircuitGone">
+		Circuito caiu (Circuit gone)
+	</string>
+	<string name="AssetErrorUnknownStatus">
+		Status desconhecido
+	</string>
+	<string name="AvatarEditingApparance">
+		(Editando Aparência)
+	</string>
+	<string name="AvatarAway">
+		Distante
+	</string>
+	<string name="AvatarBusy">
+		Ocupado
+	</string>
+	<string name="AvatarMuted">
+		Emudecido
+	</string>
+	<string name="anim_express_afraid">
+		Temeroso
+	</string>
+	<string name="anim_express_anger">
+		Bravo
+	</string>
+	<string name="anim_away">
+		Distante
+	</string>
+	<string name="anim_backflip">
+		Virar para trás
+	</string>
+	<string name="anim_express_laugh">
+		Rir segurando a barriga
+	</string>
+	<string name="anim_express_toothsmile">
+		Sorriso largo
+	</string>
+	<string name="anim_blowkiss">
+		Mandar beijo
+	</string>
+	<string name="anim_express_bored">
+		Entediado
+	</string>
+	<string name="anim_bow">
+		Saudar curvando
+	</string>
+	<string name="anim_clap">
+		Aplaudir
+	</string>
+	<string name="anim_courtbow">
+		Saudação formal
+	</string>
+	<string name="anim_express_cry">
+		Chorar
+	</string>
+	<string name="anim_dance1">
+		Dança 1
+	</string>
+	<string name="anim_dance2">
+		Dança 2
+	</string>
+	<string name="anim_dance3">
+		Dança 3
+	</string>
+	<string name="anim_dance4">
+		Dança 4
+	</string>
+	<string name="anim_dance5">
+		Dança 5
+	</string>
+	<string name="anim_dance6">
+		Dança 6
+	</string>
+	<string name="anim_dance7">
+		Dança 7
+	</string>
+	<string name="anim_dance8">
+		Dança 8
+	</string>
+	<string name="anim_express_disdain">
+		Desdém
+	</string>
+	<string name="anim_drink">
+		Beber
+	</string>
+	<string name="anim_express_embarrased">
+		Envergonhado
+	</string>
+	<string name="anim_angry_fingerwag">
+		Negar com o dedo.
+	</string>
+	<string name="anim_fist_pump">
+		Vibrar provocando
+	</string>
+	<string name="anim_yoga_float">
+		Levitar Yoga
+	</string>
+	<string name="anim_express_frown">
+		Careta
+	</string>
+	<string name="anim_impatient">
+		Impaciente
+	</string>
+	<string name="anim_jumpforjoy">
+		Pular de Alegria
+	</string>
+	<string name="anim_kissmybutt">
+		Beije meu Bumbum
+	</string>
+	<string name="anim_express_kiss">
+		Beijar
+	</string>
+	<string name="anim_laugh_short">
+		rir
+	</string>
+	<string name="anim_musclebeach">
+		Exibir músculos
+	</string>
+	<string name="anim_no_unhappy">
+		Não (descontente)
+	</string>
+	<string name="anim_no_head">
+		Não
+	</string>
+	<string name="anim_nyanya">
+		Nya-nya-nya
+	</string>
+	<string name="anim_punch_onetwo">
+		Um-Dois soco
+	</string>
+	<string name="anim_express_open_mouth">
+		Abrir a boca
+	</string>
+	<string name="anim_peace">
+		Paz
+	</string>
+	<string name="anim_point_you">
+		Apontar para o outro
+	</string>
+	<string name="anim_point_me">
+		Apontar para si
+	</string>
+	<string name="anim_punch_l">
+		Socar Esquerda
+	</string>
+	<string name="anim_punch_r">
+		Socar Direita
+	</string>
+	<string name="anim_rps_countdown">
+		RPS contar
+	</string>
+	<string name="anim_rps_paper">
+		RPS papel
+	</string>
+	<string name="anim_rps_rock">
+		RPS pedra
+	</string>
+	<string name="anim_rps_scissors">
+		RPS tesoura
+	</string>
+	<string name="anim_express_repulsed">
+		Repulsa
+	</string>
+	<string name="anim_kick_roundhouse_r">
+		Chute giratório
+	</string>
+	<string name="anim_express_sad">
+		Triste
+	</string>
+	<string name="anim_salute">
+		Saúde
+	</string>
+	<string name="anim_shout">
+		Gritar
+	</string>
+	<string name="anim_express_shrug">
+		Encolher ombros
+	</string>
+	<string name="anim_express_smile">
+		Sorrir
+	</string>
+	<string name="anim_smoke_idle">
+		Fumar à toa
+	</string>
+	<string name="anim_smoke_inhale">
+		Inalar Fumaça
+	</string>
+	<string name="anim_smoke_throw_down">
+		Expelir Fumaça
+	</string>
+	<string name="anim_express_surprise">
+		Surpresa
+	</string>
+	<string name="anim_sword_strike_r">
+		Golpe de Espada
+	</string>
+	<string name="anim_angry_tantrum">
+		Enraivecer
+	</string>
+	<string name="anim_express_tongue_out">
+		Mostrar a língua
+	</string>
+	<string name="anim_hello">
+		Onda
+	</string>
+	<string name="anim_whisper">
+		Sussurrar
+	</string>
+	<string name="anim_whistle">
+		Assobiar
+	</string>
+	<string name="anim_express_wink">
+		Piscar
+	</string>
+	<string name="anim_wink_hollywood">
+		Piscar (Hollywood)
+	</string>
+	<string name="anim_express_worry">
+		Preocupar-se
+	</string>
+	<string name="anim_yes_happy">
+		Sim (Feliz)
+	</string>
+	<string name="anim_yes_head">
+		Sim
+	</string>
+	<string name="texture_loading">
+		Carregando...
+	</string>
+	<string name="worldmap_offline">
+		Desconectado
+	</string>
+	<string name="whisper">
+		sussurra:
+	</string>
+	<string name="shout">
+		grita:
+	</string>
+</strings>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_active_speakers.xml b/linden/indra/newview/skins/default/xui/zh/floater_active_speakers.xml
index 14ab2e4..32c2bda 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_active_speakers.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 name="active_speakers"
-	 title="活跃的说话人">
-	<panel
-		 name="active_speakers_panel">
-		<scroll_list
-			 name="speakers_list">
-			<column
-				 label="名字"
-				 name="speaker_name" />
-		</scroll_list>
-		<panel
-			 name="volume_container"
-			 right="-10">
-			<button
-				 label=""
-				 name="mute_btn"
-				 toggle="true"
-				 tool_tip="屏蔽该居民的语音" />
-		</panel>
-	</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 name="active_speakers"
+	 title="活跃的说话人">
+	<panel
+		 name="active_speakers_panel">
+		<scroll_list
+			 name="speakers_list">
+			<column
+				 label="名字"
+				 name="speaker_name" />
+		</scroll_list>
+		<panel
+			 name="volume_container"
+			 right="-10">
+			<button
+				 label=""
+				 name="mute_btn"
+				 toggle="true"
+				 tool_tip="屏蔽该居民的语音" />
+		</panel>
+	</panel>
 </floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml b/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml
index cff5808..6d30952 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="floater_chatterbox" title="交流">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater name="floater_chatterbox" title="交流">
 </multi_floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml b/linden/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
index 5c4791b..aa0e2a4 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
@@ -1,133 +1,133 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 min_height="180"
-	 min_width="400"
-	 name="Day Cycle Floater"
-	 title="日夜周期编辑器">
-	<tab_container
-		 name="Day Cycle Tabs"
-		 tab_position="top">
-		<panel
-			 label="日夜周期"
-			 name="Day Cycle">
-			<button
-				 label="?"
-				 name="WLDayCycleHelp" />
-			<text
-				 name="WL12am">
-				 上午12时
-			</text>
-			<text
-				 name="WL3am">
-				上午3时
-			</text>
-			<text
-				 name="WL6am">
-				上午6时
-			</text>
-			<text
-				 name="WL9amHash">
-				上午9时
-			</text>
-			<text
-				 name="WL12pmHash">
-				下午12时
-			</text>
-			<text
-				 name="WL3pm">
-				下午3时
-			</text>
-			<text
-				 name="WL6pm">
-				下午6时
-			</text>
-			<text
-				 name="WL9pm">
-				下午9时
-			</text>
-			<text
-				 name="WL12am2">
-				 上午12时
-			</text>
-			<button
-				 label="添加键"
-				 label_selected="Add Key"
-				 name="WLAddKey" />
-			<button
-				 label="删除键"
-				 label_selected="Delete Key"
-				 name="WLDeleteKey" />
-			<text
-				 name="WLCurKeyFrameText">
-				关键帧设定:
-			</text>
-			<text
-				 name="WLCurKeyTimeText">
-				键时间:
-			</text>
-			<spinner
-				 label="时"
-				 name="WLCurKeyHour" />
-			<spinner
-				 label="分"
-				 name="WLCurKeyMin" />
-			<text
-				 name="WLCurKeyTimeText2">
-				键预设:
-			</text>
-			<combo_box
-				 allow_text_entry="false"
-				 label="Preset"
-				 max_chars="20"
-				 name="WLKeyPresets" />
-			<view_border />
-			<text
-				 name="DayCycleText">
-				捕捉:
-			</text>
-			<combo_box
-				 allow_text_entry="false"
-				 label="5 min"
-				 max_chars="20"
-				 name="WLSnapOptions" />
-			<text
-				 name="DayCycleText2">
-				周期长度:
-			</text>
-			<spinner
-				 label="时"
-				 name="WLLengthOfDayHour" />
-			<spinner
-				 label="分"
-				 name="WLLengthOfDayMin" />
-			<spinner
-				 label="秒"
-				 name="WLLengthOfDaySec" />
-			<text
-				 name="DayCycleText3">
-				预览:
-			</text>
-			<button
-				 label="播放"
-				 label_selected="Play"
-				 name="WLAnimSky" />
-			<button
-				 label="停止!"
-				 label_selected="Stop"
-				 name="WLStopAnimSky" />
-			<button
-				 label="使用地产时间"
-				 label_selected="使用地产时间"
-				 name="WLUseLindenTime" />
-			<button
-				 label="保存测试日"
-				 label_selected="Save Test Day"
-				 name="WLSaveDayCycle" />
-			<button
-				 label="读取测试日"
-				 label_selected="Load Test Day"
-				 name="WLLoadDayCycle" />
-		</panel>
-	</tab_container>
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 min_height="180"
+	 min_width="400"
+	 name="Day Cycle Floater"
+	 title="日夜周期编辑器">
+	<tab_container
+		 name="Day Cycle Tabs"
+		 tab_position="top">
+		<panel
+			 label="日夜周期"
+			 name="Day Cycle">
+			<button
+				 label="?"
+				 name="WLDayCycleHelp" />
+			<text
+				 name="WL12am">
+				 上午12时
+			</text>
+			<text
+				 name="WL3am">
+				上午3时
+			</text>
+			<text
+				 name="WL6am">
+				上午6时
+			</text>
+			<text
+				 name="WL9amHash">
+				上午9时
+			</text>
+			<text
+				 name="WL12pmHash">
+				下午12时
+			</text>
+			<text
+				 name="WL3pm">
+				下午3时
+			</text>
+			<text
+				 name="WL6pm">
+				下午6时
+			</text>
+			<text
+				 name="WL9pm">
+				下午9时
+			</text>
+			<text
+				 name="WL12am2">
+				 上午12时
+			</text>
+			<button
+				 label="添加键"
+				 label_selected="Add Key"
+				 name="WLAddKey" />
+			<button
+				 label="删除键"
+				 label_selected="Delete Key"
+				 name="WLDeleteKey" />
+			<text
+				 name="WLCurKeyFrameText">
+				关键帧设定:
+			</text>
+			<text
+				 name="WLCurKeyTimeText">
+				键时间:
+			</text>
+			<spinner
+				 label="时"
+				 name="WLCurKeyHour" />
+			<spinner
+				 label="分"
+				 name="WLCurKeyMin" />
+			<text
+				 name="WLCurKeyTimeText2">
+				键预设:
+			</text>
+			<combo_box
+				 allow_text_entry="false"
+				 label="Preset"
+				 max_chars="20"
+				 name="WLKeyPresets" />
+			<view_border />
+			<text
+				 name="DayCycleText">
+				捕捉:
+			</text>
+			<combo_box
+				 allow_text_entry="false"
+				 label="5 min"
+				 max_chars="20"
+				 name="WLSnapOptions" />
+			<text
+				 name="DayCycleText2">
+				周期长度:
+			</text>
+			<spinner
+				 label="时"
+				 name="WLLengthOfDayHour" />
+			<spinner
+				 label="分"
+				 name="WLLengthOfDayMin" />
+			<spinner
+				 label="秒"
+				 name="WLLengthOfDaySec" />
+			<text
+				 name="DayCycleText3">
+				预览:
+			</text>
+			<button
+				 label="播放"
+				 label_selected="Play"
+				 name="WLAnimSky" />
+			<button
+				 label="停止!"
+				 label_selected="Stop"
+				 name="WLStopAnimSky" />
+			<button
+				 label="使用地产时间"
+				 label_selected="使用地产时间"
+				 name="WLUseLindenTime" />
+			<button
+				 label="保存测试日"
+				 label_selected="Save Test Day"
+				 name="WLSaveDayCycle" />
+			<button
+				 label="读取测试日"
+				 label_selected="Load Test Day"
+				 name="WLLoadDayCycle" />
+		</panel>
+	</tab_container>
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_device_settings.xml b/linden/indra/newview/skins/default/xui/zh/floater_device_settings.xml
index 61e1556..3b5b79d 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_device_settings.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_device_settings.xml
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_device_settings" title="语音聊天设备设置">
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_device_settings" title="语音聊天设备设置">
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/zh/floater_env_settings.xml
index b4cb27e..dceb9f9 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_env_settings.xml
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 min_height="150"
-	 min_width="600"
-	 name="Environment Editor Floater"
-	 title="Environment Editor">
-	<text
-		 name="EnvTimeText">
-		时间
-	</text>
-	<text
-		 name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<icon
-		 name="EnvDayCycle" />
-	<slider
-		 label=""
-		 name="EnvTimeSlider"
-		 value="0.0" />
-	<text
-		 name="EnvCloudText">
-		云层覆盖
-	</text>
-	<slider
-		 label=""
-		 name="EnvCloudSlider"
-		 value="0.7" />
-	<text
-		 name="EnvWaterColorText">
-		水色
-	</text>
-	<color_swatch
-		 label=""
-		 name="EnvWaterColor"
-		 tool_tip="Click to open Color Picker" />
-	<text
-		 name="EnvWaterFogText">
-		水雾
-	</text>
-	<button
-		 label="使用地产时间"
-		 name="EnvUseEstateTimeButton" />
-	<button
-		 label="高级天空选项"
-		 name="EnvAdvancedSkyButton" />
-	<button
-		 label="高级水面选项"
-		 name="EnvAdvancedWaterButton" />
-	<button
-		 label="?"
-		 name="EnvSettingsHelpButton" />
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 min_height="150"
+	 min_width="600"
+	 name="Environment Editor Floater"
+	 title="Environment Editor">
+	<text
+		 name="EnvTimeText">
+		时间
+	</text>
+	<text
+		 name="EnvTimeText2">
+		12:00 PM
+	</text>
+	<icon
+		 name="EnvDayCycle" />
+	<slider
+		 label=""
+		 name="EnvTimeSlider"
+		 value="0.0" />
+	<text
+		 name="EnvCloudText">
+		云层覆盖
+	</text>
+	<slider
+		 label=""
+		 name="EnvCloudSlider"
+		 value="0.7" />
+	<text
+		 name="EnvWaterColorText">
+		水色
+	</text>
+	<color_swatch
+		 label=""
+		 name="EnvWaterColor"
+		 tool_tip="Click to open Color Picker" />
+	<text
+		 name="EnvWaterFogText">
+		水雾
+	</text>
+	<button
+		 label="使用地产时间"
+		 name="EnvUseEstateTimeButton" />
+	<button
+		 label="高级天空选项"
+		 name="EnvAdvancedSkyButton" />
+	<button
+		 label="高级水面选项"
+		 name="EnvAdvancedWaterButton" />
+	<button
+		 label="?"
+		 name="EnvSettingsHelpButton" />
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_hud.xml b/linden/indra/newview/skins/default/xui/zh/floater_hud.xml
index d31798b..d9c52fc 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_hud.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_hud.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 name="floater_hud"
-	 title="教程">
-	<web_browser
-		 name="floater_hud_browser"
-		 start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3E%0D%0A%0D%0A读取中...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E" />
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 name="floater_hud"
+	 title="教程">
+	<web_browser
+		 name="floater_hud_browser"
+		 start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3E%0D%0A%0D%0A读取中...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E" />
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml
index 33c9612..45f6eff 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 default_tab_group="1"
-	 label="(unknown)"
-	 min_height="225"
-	 min_width="265"
-	 name="im_floater"
-	 title="(unknown)">
-	<string
-		 name="ringing">
-		正在加入语音聊天...
-	</string>
-	<string
-		 name="connected">
-		已连接，点击结束通话来挂断
-	</string>
-	<string
-		 name="hang_up">
-		离开了语音聊天
-	</string>
-	<string
-		 name="title_string">
-		与 [NAME] 的即时通信
-	</string>
-	<string
-		 name="typing_start_string">
-		[NAME] 正在输入...
-	</string>
-	<string
-		 name="session_start_string">
-		正在开始和 [NAME] 的会话，请稍候。
-	</string>
-	<string
-		 name="default_text_label">
-		点击这里开始即时聊天。
-	</string>
-	<layout_stack>
-		<layout_panel
-			 name="im_contents_panel">
-			<button
-				 label="呼叫"
-				 name="start_call_btn" />
-			<button
-				 label="结束呼叫"
-				 name="end_call_btn" />
-			<button
-				 name="toggle_active_speakers_btn"
-				 tool_tip="显示在该即时通信会话中活动的参与者。" />
-			<line_editor
-				 label="点击这里开始即时聊天。"
-				 name="chat_editor" />
-			<button
-				 label="发送"
-				 name="send_btn" />
-		</layout_panel>
-	</layout_stack>
-	<string
-		 name="live_help_dialog">
-		*** 欢迎来到帮助请求 *** 
-    请首先按 F1 参阅我们的第二人生帮助页面，或访问知识库 http://secondlife.com/knowledgebase/ 
-若你找不到所需的答案，请输入你的问题，然后等待可用的工作人员的回复。
-    -=-=- 反应时间不固定，特别在高峰时期 -=-=-
-	</string>
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 default_tab_group="1"
+	 label="(unknown)"
+	 min_height="225"
+	 min_width="265"
+	 name="im_floater"
+	 title="(unknown)">
+	<string
+		 name="ringing">
+		正在加入语音聊天...
+	</string>
+	<string
+		 name="connected">
+		已连接，点击结束通话来挂断
+	</string>
+	<string
+		 name="hang_up">
+		离开了语音聊天
+	</string>
+	<string
+		 name="title_string">
+		与 [NAME] 的即时通信
+	</string>
+	<string
+		 name="typing_start_string">
+		[NAME] 正在输入...
+	</string>
+	<string
+		 name="session_start_string">
+		正在开始和 [NAME] 的会话，请稍候。
+	</string>
+	<string
+		 name="default_text_label">
+		点击这里开始即时聊天。
+	</string>
+	<layout_stack>
+		<layout_panel
+			 name="im_contents_panel">
+			<button
+				 label="呼叫"
+				 name="start_call_btn" />
+			<button
+				 label="结束呼叫"
+				 name="end_call_btn" />
+			<button
+				 name="toggle_active_speakers_btn"
+				 tool_tip="显示在该即时通信会话中活动的参与者。" />
+			<line_editor
+				 label="点击这里开始即时聊天。"
+				 name="chat_editor" />
+			<button
+				 label="发送"
+				 name="send_btn" />
+		</layout_panel>
+	</layout_stack>
+	<string
+		 name="live_help_dialog">
+		*** 欢迎来到帮助请求 *** 
+    请首先按 F1 参阅我们的第二人生帮助页面，或访问知识库 http://secondlife.com/knowledgebase/ 
+若你找不到所需的答案，请输入你的问题，然后等待可用的工作人员的回复。
+    -=-=- 反应时间不固定，特别在高峰时期 -=-=-
+	</string>
+</floater>
+
 <!--Translated for Second Life 1.19.1 RC3 -->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml
index 4198c6d..2171bd1 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml
@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 label="(未知)"
-	 name="im_floater"
-	 title="(未知)">
-	<string
-		 name="ringing">
-		正在加入语音聊天...
-	</string>
-	<string
-		 name="connected">
-		已连接，点击结束通话来挂断
-	</string>
-	<string
-		 name="hang_up">
-		离开了语音聊天
-	</string>
-	<string
-		 name="live_help_dialog"
-		 wordwrap="false">
-		*** 欢迎来到帮助请求 *** 
-    	请首先按 F1 参阅我们的第二人生帮助页面，或访问知识库 http://secondlife.com/knowledgebase/ 
-		若你找不到所需的答案，请输入你的问题，然后等待可用的工作人员的回复。
-    	-=-=- 反应时间不固定，特别在高峰时期 -=-=-
-	</string>
-	<string
-		 name="title_string">
-		与 [NAME] 的即时通信
-	</string>
-	<string
-		 name="typing_start_string">
-		[NAME] 正在输入...
-	</string>
-	<string
-		 name="session_start_string">
-		正在开始和 [NAME] 的会话，请稍候。
-	</string>
-	<string
-		 name="moderated_chat_label">
-		(对话受管理，语音默认关闭)
-	</string>
-	<string
-		 name="default_text_label">
-		点击这里语音聊天。
-	</string>
-	<string
-		 name="muted_text_label">
-		您的文字聊天已被社团管理员禁用。
-	</string>
-	<layout_stack 
-		name="panels">
-		<layout_panel
-			 name="im_contents_panel">
-			<button
-				 label="社团信息"
-				 name="group_info_btn" />
-			<button
-				 image_overlay_alignment="left"
-				 label="加入通话"
-				 name="start_call_btn"
-				 width="90"/>
-			<button
-				 image_overlay_alignment="left"
-				 label="结束通话"
-				 name="end_call_btn"/>
-			<button
-				 label="&lt; &lt;"
-				 label_selected="&gt; &gt;"
-				 name="toggle_active_speakers_btn"
-				 tool_tip="显示在该即时通信会话中活动的参与者。"/>
-			<button
-				 label="发送"
-				 name="send_btn" />
-		</layout_panel>
-	</layout_stack>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 label="(未知)"
+	 name="im_floater"
+	 title="(未知)">
+	<string
+		 name="ringing">
+		正在加入语音聊天...
+	</string>
+	<string
+		 name="connected">
+		已连接，点击结束通话来挂断
+	</string>
+	<string
+		 name="hang_up">
+		离开了语音聊天
+	</string>
+	<string
+		 name="live_help_dialog"
+		 wordwrap="false">
+		*** 欢迎来到帮助请求 *** 
+    	请首先按 F1 参阅我们的第二人生帮助页面，或访问知识库 http://secondlife.com/knowledgebase/ 
+		若你找不到所需的答案，请输入你的问题，然后等待可用的工作人员的回复。
+    	-=-=- 反应时间不固定，特别在高峰时期 -=-=-
+	</string>
+	<string
+		 name="title_string">
+		与 [NAME] 的即时通信
+	</string>
+	<string
+		 name="typing_start_string">
+		[NAME] 正在输入...
+	</string>
+	<string
+		 name="session_start_string">
+		正在开始和 [NAME] 的会话，请稍候。
+	</string>
+	<string
+		 name="moderated_chat_label">
+		(对话受管理，语音默认关闭)
+	</string>
+	<string
+		 name="default_text_label">
+		点击这里语音聊天。
+	</string>
+	<string
+		 name="muted_text_label">
+		您的文字聊天已被社团管理员禁用。
+	</string>
+	<layout_stack 
+		name="panels">
+		<layout_panel
+			 name="im_contents_panel">
+			<button
+				 label="社团信息"
+				 name="group_info_btn" />
+			<button
+				 image_overlay_alignment="left"
+				 label="加入通话"
+				 name="start_call_btn"
+				 width="90"/>
+			<button
+				 image_overlay_alignment="left"
+				 label="结束通话"
+				 name="end_call_btn"/>
+			<button
+				 label="&lt; &lt;"
+				 label_selected="&gt; &gt;"
+				 name="toggle_active_speakers_btn"
+				 tool_tip="显示在该即时通信会话中活动的参与者。"/>
+			<button
+				 label="发送"
+				 name="send_btn" />
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
index f74922b..7ede265 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
@@ -1,182 +1,182 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 name="floater_lagmeter"
-	 title="延迟计量器">
-	<button
-		 label=""
-		 label_selected=""
-		 name="client_lagmeter"
-		 tool_tip="客户端延迟状况" />
-	<text
-		 name="client">
-		客户端:
-	</text>
-	<text
-		 name="client_text"
-		 right="-10">
-		正常
-	</text>
-	<text
-		 name="client_lag_cause"
-		 right="-32" />
-	<button
-		 label=""
-		 label_selected=""
-		 name="network_lagmeter"
-		 tool_tip="网络延迟状况" />
-	<text
-		 name="network">
-		网络:
-	</text>
-	<text
-		 name="network_text"
-		 right="-10">
-		正常
-	</text>
-	<button
-		 label=""
-		 label_selected=""
-		 name="server_lagmeter"
-		 tool_tip="服务器延迟状况" />
-	<text
-		 name="server">
-		服务器:
-	</text>
-	<text
-		 name="server_text"
-		 right="-10">
-		正常
-	</text>
-	<string
-		 name="max_title_msg">
-		延迟计量器
-	</string>
-
-	<string
-		 name="min_title_msg">
-		延迟
-	</string>
-
-	<string
-		 name="client_text_msg">
-		客户端
-	</string>
-	<string
-		 name="client_frame_time_window_bg_msg">
-		正常，窗口处于后台状态
-	</string>
-	<string
-		 name="client_frame_time_critical_msg">
-		客户端每秒帧数在 [CLIENT_FRAME_RATE_CRITICAL] 以下
-	</string>
-	<string
-		 name="client_frame_time_warning_msg">
-		客户端每秒帧数在 [CLIENT_FRAME_RATE_CRITICAL] 到 [CLIENT_FRAME_RATE_WARNING] 之间
-	</string>
-	<string
-		 name="client_frame_time_normal_msg">
-		正常
-	</string>
-	<string
-		 name="client_draw_distance_cause_msg">
-		可能原因：描绘距离设置过高
-	</string>
-	<string
-		 name="client_texture_loading_cause_msg">
-		可能原因：图像加载中
-	</string>
-	<string
-		 name="client_texture_memory_cause_msg">
-		可能原因：内存中图像过多
-	</string>
-	<string
-		 name="client_complex_objects_cause_msg">
-		可能原因：场景中复杂物体过多
-	</string>
-	<string
-		 name="network_text_msg">
-		网络
-	</string>
-	<string
-		 name="network_packet_loss_critical_msg">
-		网络连接正在丢弃 [NETWORK_PACKET_LOSS_CRITICAL]% 以上的数据包
-	</string>
-	<string
-		 name="network_packet_loss_warning_msg">
-		网络连接正在丢弃 [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% 的数据包
-	</string>
-	<string
-		 name="network_performance_normal_msg">
-		正常
-	</string>
-	<string
-		 name="network_ping_critical_ms">
-		600
-	</string>
-	<string
-		 name="network_ping_warning_ms">
-		300
-	</string>
-	<string
-		 name="network_ping_critical_msg">
-		连接响应时间大于 [NETWORK_PING_CRITICAL] 毫秒
-	</string>
-	<string
-		 name="network_ping_warning_msg">
-		连接响应时间介于 [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] 毫秒
-	</string>
-	<string
-		 name="network_packet_loss_cause_msg">
-		有可能是连接问题，或“带宽”设置过高。
-	</string>
-	<string
-		 name="network_ping_cause_msg">
-		有可能是连接问题，或正使用文件共享下载程序。
-	</string>
-	<string
-		 name="server_text_msg">
-		服务器
-	</string>
-	<string
-		 name="server_single_process_max_time_ms">
-		20
-	</string>
-	<string
-		 name="server_frame_time_critical_msg">
-		模拟器每秒帧数在 [SERVER_FRAME_RATE_CRITICAL] 以下
-	</string>
-	<string
-		 name="server_frame_time_warning_msg">
-		模拟器每秒帧数在 [SERVER_FRAME_RATE_CRITICAL] 和 [SERVER_FRAME_RATE_WARNING] 之间
-	</string>
-	<string
-		 name="server_frame_time_normal_msg">
-		正常
-	</string>
-	<string
-		 name="server_physics_cause_msg">
-		可能原因：物理物体过多
-	</string>
-	<string
-		 name="server_scripts_cause_msg">
-		可能原因：有脚本的物体过多
-	</string>
-	<string
-		 name="server_net_cause_msg">
-		可能原因：网络流量过大
-	</string>
-	<string
-		 name="server_agent_cause_msg">
-		可能原因：区域中移动的人太多
-	</string>
-	<string
-		 name="server_images_cause_msg">
-		可能原因：图像计算过多
-	</string>
-	<string
-		 name="server_generic_cause_msg">
-		可能原因：模拟器负载过大
-	</string>
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 name="floater_lagmeter"
+	 title="延迟计量器">
+	<button
+		 label=""
+		 label_selected=""
+		 name="client_lagmeter"
+		 tool_tip="客户端延迟状况" />
+	<text
+		 name="client">
+		客户端:
+	</text>
+	<text
+		 name="client_text"
+		 right="-10">
+		正常
+	</text>
+	<text
+		 name="client_lag_cause"
+		 right="-32" />
+	<button
+		 label=""
+		 label_selected=""
+		 name="network_lagmeter"
+		 tool_tip="网络延迟状况" />
+	<text
+		 name="network">
+		网络:
+	</text>
+	<text
+		 name="network_text"
+		 right="-10">
+		正常
+	</text>
+	<button
+		 label=""
+		 label_selected=""
+		 name="server_lagmeter"
+		 tool_tip="服务器延迟状况" />
+	<text
+		 name="server">
+		服务器:
+	</text>
+	<text
+		 name="server_text"
+		 right="-10">
+		正常
+	</text>
+	<string
+		 name="max_title_msg">
+		延迟计量器
+	</string>
+
+	<string
+		 name="min_title_msg">
+		延迟
+	</string>
+
+	<string
+		 name="client_text_msg">
+		客户端
+	</string>
+	<string
+		 name="client_frame_time_window_bg_msg">
+		正常，窗口处于后台状态
+	</string>
+	<string
+		 name="client_frame_time_critical_msg">
+		客户端每秒帧数在 [CLIENT_FRAME_RATE_CRITICAL] 以下
+	</string>
+	<string
+		 name="client_frame_time_warning_msg">
+		客户端每秒帧数在 [CLIENT_FRAME_RATE_CRITICAL] 到 [CLIENT_FRAME_RATE_WARNING] 之间
+	</string>
+	<string
+		 name="client_frame_time_normal_msg">
+		正常
+	</string>
+	<string
+		 name="client_draw_distance_cause_msg">
+		可能原因：描绘距离设置过高
+	</string>
+	<string
+		 name="client_texture_loading_cause_msg">
+		可能原因：图像加载中
+	</string>
+	<string
+		 name="client_texture_memory_cause_msg">
+		可能原因：内存中图像过多
+	</string>
+	<string
+		 name="client_complex_objects_cause_msg">
+		可能原因：场景中复杂物体过多
+	</string>
+	<string
+		 name="network_text_msg">
+		网络
+	</string>
+	<string
+		 name="network_packet_loss_critical_msg">
+		网络连接正在丢弃 [NETWORK_PACKET_LOSS_CRITICAL]% 以上的数据包
+	</string>
+	<string
+		 name="network_packet_loss_warning_msg">
+		网络连接正在丢弃 [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% 的数据包
+	</string>
+	<string
+		 name="network_performance_normal_msg">
+		正常
+	</string>
+	<string
+		 name="network_ping_critical_ms">
+		600
+	</string>
+	<string
+		 name="network_ping_warning_ms">
+		300
+	</string>
+	<string
+		 name="network_ping_critical_msg">
+		连接响应时间大于 [NETWORK_PING_CRITICAL] 毫秒
+	</string>
+	<string
+		 name="network_ping_warning_msg">
+		连接响应时间介于 [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] 毫秒
+	</string>
+	<string
+		 name="network_packet_loss_cause_msg">
+		有可能是连接问题，或“带宽”设置过高。
+	</string>
+	<string
+		 name="network_ping_cause_msg">
+		有可能是连接问题，或正使用文件共享下载程序。
+	</string>
+	<string
+		 name="server_text_msg">
+		服务器
+	</string>
+	<string
+		 name="server_single_process_max_time_ms">
+		20
+	</string>
+	<string
+		 name="server_frame_time_critical_msg">
+		模拟器每秒帧数在 [SERVER_FRAME_RATE_CRITICAL] 以下
+	</string>
+	<string
+		 name="server_frame_time_warning_msg">
+		模拟器每秒帧数在 [SERVER_FRAME_RATE_CRITICAL] 和 [SERVER_FRAME_RATE_WARNING] 之间
+	</string>
+	<string
+		 name="server_frame_time_normal_msg">
+		正常
+	</string>
+	<string
+		 name="server_physics_cause_msg">
+		可能原因：物理物体过多
+	</string>
+	<string
+		 name="server_scripts_cause_msg">
+		可能原因：有脚本的物体过多
+	</string>
+	<string
+		 name="server_net_cause_msg">
+		可能原因：网络流量过大
+	</string>
+	<string
+		 name="server_agent_cause_msg">
+		可能原因：区域中移动的人太多
+	</string>
+	<string
+		 name="server_images_cause_msg">
+		可能原因：图像计算过多
+	</string>
+	<string
+		 name="server_generic_cause_msg">
+		可能原因：模拟器负载过大
+	</string>
+</floater>
+
 <!--Translated for Second Life 1.19.1 RC3 -->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml b/linden/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml
index a090239..3c22b62 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 can_tear_off="true"
-	 min_height="310"
-	 min_width="241"
-	 name="landmarkpicker"
-	 title="整理: 地标">
-	<check_box
-		 initial_value="true"
-		 label="显示文件夹"
-		 name="show_folders_check" />
-	<button
-		 label="新建"
-		 label_selected="新建"
-		 name="New" />
-	<button
-		 label="重命名"
-		 label_selected="重命名"
-		 name="Rename" />
-	<button
-		 label="新建文件夹"
-		 label_selected="新建文件夹"
-		 name="NewFolder" />
-	<button
-		 label="编辑"
-		 label_selected="编辑"
-		 name="Edit" />
-	<button
-		 label="删除"
-		 label_selected="删除"
-		 name="Delete" />
-	<button
-		 label="关闭"
-		 label_selected="关闭"
-		 name="Close" />
-</floater>
- 
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 can_tear_off="true"
+	 min_height="310"
+	 min_width="241"
+	 name="landmarkpicker"
+	 title="整理: 地标">
+	<check_box
+		 initial_value="true"
+		 label="显示文件夹"
+		 name="show_folders_check" />
+	<button
+		 label="新建"
+		 label_selected="新建"
+		 name="New" />
+	<button
+		 label="重命名"
+		 label_selected="重命名"
+		 name="Rename" />
+	<button
+		 label="新建文件夹"
+		 label_selected="新建文件夹"
+		 name="NewFolder" />
+	<button
+		 label="编辑"
+		 label_selected="编辑"
+		 name="Edit" />
+	<button
+		 label="删除"
+		 label_selected="删除"
+		 name="Delete" />
+	<button
+		 label="关闭"
+		 label_selected="关闭"
+		 name="Close" />
+</floater>
+ 
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml b/linden/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
index 6ae47af..69fcf9a 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 name="script ed float"
-	 title="LSL Wiki">
-	<check_box
-		 label="跟随光标"
-		 name="lock_check" />
-	<combo_box
-		 label="锁定"
-		 name="history_combo" />
-	<button
-		 label="后退"
-		 name="back_btn" />
-	<button
-		 label="前进"
-		 name="fwd_btn" />
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 name="script ed float"
+	 title="LSL Wiki">
+	<check_box
+		 label="跟随光标"
+		 name="lock_check" />
+	<combo_box
+		 label="锁定"
+		 name="history_combo" />
+	<button
+		 label="后退"
+		 name="back_btn" />
+	<button
+		 label="前进"
+		 name="fwd_btn" />
+</floater>
+
 <!--Translated for Second Life 1.19.1 RC3 -->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml
index 5477f2b..d10c3e0 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 min_height="140"
-	 min_width="467"
-	 name="floater_about"
-	 title="媒体浏览器">
-	<layout_stack
-		 name="stack1"
-		 top="-20">
-		<layout_panel
-			 name="nav_controls">
-			<button
-				 label="后退"
-				 name="back" />
-			<button
-				 label="前进"
-				 name="forward" />
-			<button
-				 label="刷新"
-				 name="reload" />
-			<button
-				 label="转到"
-				 name="go" />
-		</layout_panel>
-		<layout_panel
-			 name="parcel_owner_controls">
-			<button
-				 label="当前URL设置为地块媒体地址"
-				 name="assign" />
-		</layout_panel>
-		<layout_panel
-			 name="external_controls">
-			<button
-				 label="在我的网页浏览器中打开"
-				 name="open_browser" />
-			<check_box
-				 label="总在我的浏览器中打开"
-				 name="open_always" />
-			<button
-				 label="关闭"
-				 name="close" />
-		</layout_panel>
-	</layout_stack>
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 min_height="140"
+	 min_width="467"
+	 name="floater_about"
+	 title="媒体浏览器">
+	<layout_stack
+		 name="stack1"
+		 top="-20">
+		<layout_panel
+			 name="nav_controls">
+			<button
+				 label="后退"
+				 name="back" />
+			<button
+				 label="前进"
+				 name="forward" />
+			<button
+				 label="刷新"
+				 name="reload" />
+			<button
+				 label="转到"
+				 name="go" />
+		</layout_panel>
+		<layout_panel
+			 name="parcel_owner_controls">
+			<button
+				 label="当前URL设置为地块媒体地址"
+				 name="assign" />
+		</layout_panel>
+		<layout_panel
+			 name="external_controls">
+			<button
+				 label="在我的网页浏览器中打开"
+				 name="open_browser" />
+			<check_box
+				 label="总在我的浏览器中打开"
+				 name="open_always" />
+			<button
+				 label="关闭"
+				 name="close" />
+		</layout_panel>
+	</layout_stack>
+</floater>
+
 <!--Translated for Second Life 1.19.1 RC3 -->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_mute_object.xml b/linden/indra/newview/skins/default/xui/zh/floater_mute_object.xml
index ebeb108..e3cc968 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_mute_object.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_mute_object.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 min_height="140"
-	 min_width="375"
-	 name="mute by name"
-	 title="按名称屏蔽物体">
-	<text
-		 name="message"
-		 right="380">
-		按名称屏蔽只影响物体的公开聊天和私聊，而不会影响到声音。
-你必须准确地输入物体的名称。
-	</text>
-	<line_editor
-		 name="object_name">
-		物体名称
-	</line_editor>
-	<button
-		 label="确定"
-		 name="OK" />
-	<button
-		 label="取消"
-		 name="Cancel" />
-</floater>
-
-<!--Translated for Second Life 1.19.1 RC3 -->
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 min_height="140"
+	 min_width="375"
+	 name="mute by name"
+	 title="按名称屏蔽物体">
+	<text
+		 name="message"
+		 right="380">
+		按名称屏蔽只影响物体的公开聊天和私聊，而不会影响到声音。
+你必须准确地输入物体的名称。
+	</text>
+	<line_editor
+		 name="object_name">
+		物体名称
+	</line_editor>
+	<button
+		 label="确定"
+		 name="OK" />
+	<button
+		 label="取消"
+		 name="Cancel" />
+</floater>
+
+<!--Translated for Second Life 1.19.1 RC3 -->
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_my_friends.xml b/linden/indra/newview/skins/default/xui/zh/floater_my_friends.xml
index 1dfaf55..e203131 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_my_friends.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_my_friends.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 name="floater_my_friends"
-	 title="联系人">
-	<tab_container
-		 name="friends_and_groups"
-		 tab_position="top"
-		 tab_width="80">
-		<panel
-			 filename="panel_friends.xml"
-			 label="好友"
-			 name="friends_panel" />
-		<panel
-			 filename="panel_groups.xml"
-			 label="社团"
-			 name="groups_panel" />
-	</tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 name="floater_my_friends"
+	 title="联系人">
+	<tab_container
+		 name="friends_and_groups"
+		 tab_position="top"
+		 tab_width="80">
+		<panel
+			 filename="panel_friends.xml"
+			 label="好友"
+			 name="friends_panel" />
+		<panel
+			 filename="panel_groups.xml"
+			 label="社团"
+			 name="groups_panel" />
+	</tab_container>
+</floater>
 <!--Translated for Second Life 1.19.0 (79185)-->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_post_process.xml b/linden/indra/newview/skins/default/xui/zh/floater_post_process.xml
index 34840c4..7cdfca7 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_post_process.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_post_process.xml
@@ -1,117 +1,117 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 min_height="400"
-	 min_width="300"
-	 name="Post-Process Floater"
-	 title="后期处理设定">
-	<tab_container
-		 name="Post-Process Tabs">
-		<panel
-			 label="颜色过滤器"
-			 name="wmiColorFilterPanel">
-			<check_box
-				 initial_value="false"
-				 label="启用"
-				 name="wmiColorFilterToggle" />
-			<text
-				 name="wmiColorFilterBrightnessText">
-				亮度
-			</text>
-			<text
-				 name="wmiColorFilterSaturationText">
-				饱和度
-			</text>
-			<text
-				 name="wmiColorFilterContrastText">
-				对比度
-			</text>
-			<text
-				 name="wmiColorFilterBaseText">
-				对比度基调
-			</text>
-			<slider
-				 label="R"
-				 name="wmiColorFilterBaseR"
-				 value="1.0" />
-			<slider
-				 label="G"
-				 name="wmiColorFilterBaseG"
-				 value="1.0" />
-			<slider
-				 label="B"
-				 name="wmiColorFilterBaseB"
-				 value="1.0" />
-			<slider
-				 label="I"
-				 name="wmiColorFilterBaseI"
-				 value="1.0" />
-		</panel>
-		<panel
-			 label="夜间视觉"
-			 name="wmiNightVisionPanel">
-			<check_box
-				 label="启用"
-				 name="wmiNightVisionToggle" />
-			<text
-				 name="wmiNightVisionBrightMultText">
-				光线放大倍数
-			</text>
-			<text
-				 name="wmiNightVisionNoiseSizeText">
-				噪点尺寸
-			</text>
-			<text
-				 name="wmiNightVisionNoiseStrengthText">
-				噪声强度
-			</text>
-		</panel>
-		<panel
-			 label="Bloom"
-			 name="wmiBloomPanel">
-			<check_box
-				 initial_value="false"
-				 label="Enable"
-				 name="wmiBloomToggle" />
-			<text
-				 name="wmiBloomExtractText">
-				明度提取
-			</text>
-			<slider
-				 label=""
-				 name="wmiBloomExtract"
-				 value="0.7" />
-			<text
-				 name="wmiBloomSizeText">
-				辉光尺寸
-			</text>
-			<slider
-				 label=""
-				 name="wmiBloomSize"
-				 value="1.0" />
-			<text
-				 name="wmiBloomStrengthText">
-				辉光强度
-			</text>
-			<slider
-				 label=""
-				 name="wmiBloomStrength"
-				 value="1.0" />
-		</panel>
-		<panel
-			 label="额外选项"
-			 name="Extras">
-			<button
-				 label="读取效果"
-				 label_selected="读取效果"
-				 name="PPLoadEffect" />
-			<button
-				 label="保存效果"
-				 label_selected="保存效果"
-				 name="PPSaveEffect" />
-			<line_editor
-				 label="效果名称"
-				 name="PPEffectNameEditor" />
-		</panel>
-	</tab_container>
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 min_height="400"
+	 min_width="300"
+	 name="Post-Process Floater"
+	 title="后期处理设定">
+	<tab_container
+		 name="Post-Process Tabs">
+		<panel
+			 label="颜色过滤器"
+			 name="wmiColorFilterPanel">
+			<check_box
+				 initial_value="false"
+				 label="启用"
+				 name="wmiColorFilterToggle" />
+			<text
+				 name="wmiColorFilterBrightnessText">
+				亮度
+			</text>
+			<text
+				 name="wmiColorFilterSaturationText">
+				饱和度
+			</text>
+			<text
+				 name="wmiColorFilterContrastText">
+				对比度
+			</text>
+			<text
+				 name="wmiColorFilterBaseText">
+				对比度基调
+			</text>
+			<slider
+				 label="R"
+				 name="wmiColorFilterBaseR"
+				 value="1.0" />
+			<slider
+				 label="G"
+				 name="wmiColorFilterBaseG"
+				 value="1.0" />
+			<slider
+				 label="B"
+				 name="wmiColorFilterBaseB"
+				 value="1.0" />
+			<slider
+				 label="I"
+				 name="wmiColorFilterBaseI"
+				 value="1.0" />
+		</panel>
+		<panel
+			 label="夜间视觉"
+			 name="wmiNightVisionPanel">
+			<check_box
+				 label="启用"
+				 name="wmiNightVisionToggle" />
+			<text
+				 name="wmiNightVisionBrightMultText">
+				光线放大倍数
+			</text>
+			<text
+				 name="wmiNightVisionNoiseSizeText">
+				噪点尺寸
+			</text>
+			<text
+				 name="wmiNightVisionNoiseStrengthText">
+				噪声强度
+			</text>
+		</panel>
+		<panel
+			 label="Bloom"
+			 name="wmiBloomPanel">
+			<check_box
+				 initial_value="false"
+				 label="Enable"
+				 name="wmiBloomToggle" />
+			<text
+				 name="wmiBloomExtractText">
+				明度提取
+			</text>
+			<slider
+				 label=""
+				 name="wmiBloomExtract"
+				 value="0.7" />
+			<text
+				 name="wmiBloomSizeText">
+				辉光尺寸
+			</text>
+			<slider
+				 label=""
+				 name="wmiBloomSize"
+				 value="1.0" />
+			<text
+				 name="wmiBloomStrengthText">
+				辉光强度
+			</text>
+			<slider
+				 label=""
+				 name="wmiBloomStrength"
+				 value="1.0" />
+		</panel>
+		<panel
+			 label="额外选项"
+			 name="Extras">
+			<button
+				 label="读取效果"
+				 label_selected="读取效果"
+				 name="PPLoadEffect" />
+			<button
+				 label="保存效果"
+				 label_selected="保存效果"
+				 name="PPSaveEffect" />
+			<line_editor
+				 label="效果名称"
+				 name="PPEffectNameEditor" />
+		</panel>
+	</tab_container>
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_classified.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_classified.xml
index 554323a..2a7f03d 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_classified.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_classified.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 name="classified_preview"
-	 title="分类广告信息">
-	<panel
-		 name="classified_details_panel" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 name="classified_preview"
+	 title="分类广告信息">
+	<panel
+		 name="classified_details_panel" />
 </floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_event.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_event.xml
index 18017a4..9ea9a14 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_event.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_event.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 name="event_preview"
-	 title="事件信息">
-	<panel
-		 name="event_details_panel" />
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 name="event_preview"
+	 title="事件信息">
+	<panel
+		 name="event_details_panel" />
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_new_landmark.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_new_landmark.xml
index 0820df9..019de9e 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_new_landmark.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_new_landmark.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Linden Land, Da Boom (155, 136, 35)"
-     title="  Linden Land, Da Boom (155, 136, 35)">
-	<button label="瞬间移动" label_selected="" name="Teleport btn" />
-	<button label="在地图中显示" label_selected="" name="Show on Map btn" />
-	<button label="放弃" label_selected="" name="Discard btn" />
-	<text type="string" length="1" name="desc txt">
-		描述:
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Linden Land, Da Boom (155, 136, 35)"
+     title="  Linden Land, Da Boom (155, 136, 35)">
+	<button label="瞬间移动" label_selected="" name="Teleport btn" />
+	<button label="在地图中显示" label_selected="" name="Show on Map btn" />
+	<button label="放弃" label_selected="" name="Discard btn" />
+	<text type="string" length="1" name="desc txt">
+		描述:
+	</text>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_url.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_url.xml
index 005a62f..a55c4a2 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_url.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_url.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 name="url_preview"
-	 title="地点信息">
-	<panel
-		 name="place_details_panel" />
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 name="url_preview"
+	 title="地点信息">
+	<panel
+		 name="place_details_panel" />
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_region_info.xml b/linden/indra/newview/skins/default/xui/zh/floater_region_info.xml
index ad777f5..834bbd4 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_region_info.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_region_info.xml
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="regioninfo" title="地区/地产" />
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="regioninfo" title="地区/地产" />
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_select_key.xml b/linden/indra/newview/skins/default/xui/zh/floater_select_key.xml
index 67d4dc4..598d926 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_select_key.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_select_key.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 name="modal container"
-	 title="">
-	<button
-		 label="取消"
-		 label_selected="取消"
-		 name="Cancel" />
-	<text
-		 name="Save item as:">
-		请按键选择
-	</text>
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 name="modal container"
+	 title="">
+	<button
+		 label="取消"
+		 label_selected="取消"
+		 name="Cancel" />
+	<text
+		 name="Save item as:">
+		请按键选择
+	</text>
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_sim_release_message.xml b/linden/indra/newview/skins/default/xui/zh/floater_sim_release_message.xml
index 6aeaac7..77a1348 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_sim_release_message.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_sim_release_message.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 name="floaterreleasemessage"
-	 title="正在进入地区">
-	<button
-		 label="关闭"
-		 name="close_btn"/>
-	<string
-		 name="in-world_help_title">
-		世界内帮助
-	</string>
-	<string
-		 name="additional_help_title">
-		附加帮助
-	</string>
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 name="floaterreleasemessage"
+	 title="正在进入地区">
+	<button
+		 label="关闭"
+		 name="close_btn"/>
+	<string
+		 name="in-world_help_title">
+		世界内帮助
+	</string>
+	<string
+		 name="additional_help_title">
+		附加帮助
+	</string>
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_url_entry.xml b/linden/indra/newview/skins/default/xui/zh/floater_url_entry.xml
index 4e3bcc4..7578fcd 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_url_entry.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_url_entry.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 name="url_entry"
-	 title="">
-	<text
-		 name="media_label">
-		媒体 URL:
-	</text>
-	<combo_box
-		 allow_text_entry="true"
-		 name="media_entry" />
-	<button
-		 label="确定"
-		 name="ok_btn" />
-	<button
-		 label="取消"
-		 name="cancel_btn" />
-	<button
-		 label="清除"
-		 name="clear_btn" />
-	<text
-		 name="loading_label"
-		 visible="false">
-		请稍候...
-	</text>
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 name="url_entry"
+	 title="">
+	<text
+		 name="media_label">
+		媒体 URL:
+	</text>
+	<combo_box
+		 allow_text_entry="true"
+		 name="media_entry" />
+	<button
+		 label="确定"
+		 name="ok_btn" />
+	<button
+		 label="取消"
+		 name="cancel_btn" />
+	<button
+		 label="清除"
+		 name="clear_btn" />
+	<text
+		 name="loading_label"
+		 visible="false">
+		请稍候...
+	</text>
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_voice_wizard.xml b/linden/indra/newview/skins/default/xui/zh/floater_voice_wizard.xml
index 6b6df68..0519842 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_voice_wizard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_voice_wizard.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 can_resize="false"
-	 can_minimize="true"
-	 name="floater_voice_wizard"
-	 title="语音设置">
-     <tab_container
-		 name="wizard_tabs"
-		 hide_tabs="true"
-		 top="-20"
-		 right="-2"
-		 tab_position="bottom">
-	<panel
-			 filename="panel_voice_enable.xml"
-			 right="0" />
-	<panel
-			 filename="panel_voice_options.xml"
-			 right="0" />
-	<panel
-			 name="device_settings"
-			 filename="panel_audio_device.xml"
-			 right="0" />
-     </tab_container>
-     <panel
-		 name="content_panel">
-       <!--<button
-			 label="Help"
-			 name="help_btn" />-->
-       <button
-			 label="返回"
-			 name="back_btn" />
-       <button
-			 label="继续"
-			 name="next_btn" />
-       <button
-			 label="完成"
-			 name="ok_btn" />
-       <button
-			 label="取消"
-			 name="cancel_btn" />
-     </panel>
-</floater>
-
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 can_resize="false"
+	 can_minimize="true"
+	 name="floater_voice_wizard"
+	 title="语音设置">
+     <tab_container
+		 name="wizard_tabs"
+		 hide_tabs="true"
+		 top="-20"
+		 right="-2"
+		 tab_position="bottom">
+	<panel
+			 filename="panel_voice_enable.xml"
+			 right="0" />
+	<panel
+			 filename="panel_voice_options.xml"
+			 right="0" />
+	<panel
+			 name="device_settings"
+			 filename="panel_audio_device.xml"
+			 right="0" />
+     </tab_container>
+     <panel
+		 name="content_panel">
+       <!--<button
+			 label="Help"
+			 name="help_btn" />-->
+       <button
+			 label="返回"
+			 name="back_btn" />
+       <button
+			 label="继续"
+			 name="next_btn" />
+       <button
+			 label="完成"
+			 name="ok_btn" />
+       <button
+			 label="取消"
+			 name="cancel_btn" />
+     </panel>
+</floater>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
index 69e3eb7..2385eb0 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
@@ -1,327 +1,327 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-	 min_height="180"
-	 min_width="400"
-	 name="WindLight floater"
-	 title="高级天空编辑器">
-	<text
-		 name="KeyFramePresetsText">
-		天空预设:
-	</text>
-
-	<button
-		 label="新建"
-		 label_selected="新建"
-		 name="WLNewPreset" />
-	<button
-		 label="保存"
-		 label_selected="保存"
-		 name="WLSavePreset" />
-	<button
-		 label="删除"
-		 label_selected="删除"
-		 name="WLDeletePreset" />
-	<button
-		 label="日夜循环编辑器"
-		 label_selected="日夜循环编辑器"
-		 name="WLDayCycleMenuButton" />
-	<tab_container
-		 name="WindLight Tabs"
-		 tab_position="top">
-		<panel
-			 label="大气"
-			 name="Atmosphere">
-			<text
-				 name="BHText">
-				蓝色地平
-			</text>
-			<button
-				 label="?"
-				 name="WLBlueHorizonHelp" />
-			<text
-				 name="BHText2" width="14">
-				红
-			</text>
-			<text
-				 name="BHText3" width="14">
-				绿
-			</text>
-			<text
-				 name="BHText4" width="14">
-				蓝
-			</text>
-			<text
-				 name="BHText5" width="14">
-				亮
-			</text>
-			<text
-				 name="BDensText">
-			云雾地平
-			</text>
-			<button
-				 label="?"
-				 name="WLHazeHorizonHelp" />
-			<text
-				 name="BDensText2">
-				蓝色浓度
-			</text>
-			<button
-				 label="?"
-				 name="WLBlueDensityHelp" />
-			<text
-				 name="BHText6" width="14">
-				红
-			</text>
-			<text
-				 name="BHText7" width="14">
-				绿
-			</text>
-			<text
-				 name="BHText8" width="14">
-				蓝
-			</text>
-			<text
-				 name="BHText9" width="14">
-				亮
-			</text>
-			<text
-				 name="HDText">
-				云雾浓度
-			</text>
-			<button
-				 label="?"
-				 name="WLHazeDensityHelp" />
-			<text
-				 name="DensMultText">
-				浓度乘数
-			</text>
-			<button
-				 label="?"
-				 name="WLDensityMultHelp" />
-			<slider
-				 label=""
-				 name="WLDensityMult"
-				 value="1.0" />
-			<text
-				 name="WLDistanceMultText">
-				距离乘数
-			</text>
-			<button
-				 label="?"
-				 name="WLDistanceMultHelp" />
-			<slider
-				 label=""
-				 name="WLDistanceMult"
-				 value="0.0" />
-			<text
-				 name="MaxAltText">
-					最大高度
-			</text>
-			<button
-				 label="?"
-				 name="WLMaxAltitudeHelp" />
-			<slider
-				 label=""
-				 name="WLMaxAltitude"
-				 value="4000" />
-		</panel>
-		<panel
-			 label="光照"
-			 name="Lighting">
-			<text
-				 name="SLCText">
-				日月颜色
-			</text>
-			<button
-				 label="?"
-				 name="WLSunlightColorHelp" />
-			<text
-				 name="BHText" width="14">
-				红
-			</text>
-			<text
-				 name="BHText2" width="14">
-				绿
-			</text>
-			<text
-				 name="BHText3" width="14">
-				蓝
-			</text>
-			<text
-				 name="BHText4" width="14">
-				亮
-			</text>
-			<text
-				 name="TODText">
-				日月位置
-			</text>
-			<text
-				 name="WLAmbientText">
-				环境
-			</text>
-			<button
-				 label="?"
-				 name="WLAmbientHelp" />
-			<text
-				 name="BHText5" width="14">
-				红
-			</text>
-			<text
-				 name="BHText6" width="14">
-				绿
-			</text>
-			<text
-				 name="BHText7" width="14">
-				蓝
-			</text>
-			<text
-				 name="BHText8" width="14">
-				亮
-			</text>
-			<text
-				 name="WLEastAngleText">
-				东向角度
-			</text>
-			<text
-				 name="SunGlowText">
-				太阳辉光
-			</text>
-			<slider
-				 label="聚焦"
-				 name="WLGlowB"
-				 value="1.0" />
-			<slider
-				 label="尺寸"
-				 name="WLGlowR"
-				 value="1.0" />
-			<text
-				 name="SceneGammaText">
-				场景γ
-			</text>
-			<button
-				 label="?"
-				 name="WLSceneGammaHelp" />
-			<slider
-				 label=""
-				 name="WLGamma"
-				 value="2.0" />
-			<text
-				 name="WLStarText">
-				星空亮度
-			</text>
-		</panel>
-		<panel
-			 label="云层"
-			 name="Clouds">
-			<text
-				 name="WLCloudColorText">
-				云层颜色
-			</text>
-			<button
-				 label="?"
-				 name="WLCloudColorHelp" />
-			<text
-				 name="BHText" width="14">
-				红
-			</text>
-			<text
-				 name="BHText2" width="14">
-				绿
-			</text>
-			<text
-				 name="BHText3" width="14">
-				蓝
-			</text>
-			<text
-				 name="BHText4" width="14">
-				亮
-			</text>
-			<text
-				 name="WLCloudColorText2">
-				云层 XY/密度
-			</text>
-			<text
-				 name="BHText5">
-				X
-			</text>
-			<text
-				 name="BHText6">
-				Y
-			</text>
-			<text
-				 name="BHText7">
-				D
-			</text>
-			<text
-				 name="WLCloudCoverageText">
-				云层覆盖
-			</text>
-			<text
-				 name="WLCloudScaleText">
-				云层尺寸
-			</text>
-			<text
-				 name="WLCloudDetailText">
-				云层细节 (XY/密度)
-			</text>
-			<button
-				 label="?"
-				 name="WLCloudDetailHelp" />
-			<text
-				 name="BHText8">
-				X
-			</text>
-			<text
-				 name="BHText9">
-				Y
-			</text>
-			<text
-				 name="BHText10">
-				D
-			</text>
-			<slider
-				 label=""
-				 name="WLCloudDetailX"
-				 value="0.5" />
-			<slider
-				 label=""
-				 name="WLCloudDetailY"
-				 value="0.5" />
-			<slider
-				 label=""
-				 name="WLCloudDetailDensity"
-				 value="1.0" />
-			<text
-				 name="WLCloudScrollXText">
-				卷动 X
-			</text>
-			<button
-				 label="?"
-				 name="WLCloudScrollXHelp" />
-			<check_box
-				 initial_value="false"
-				 label="Lock"
-				 name="WLCloudLockX" />
-			<slider
-				 label=""
-				 name="WLCloudScrollX"
-				 value="0.0" />
-			<text
-				 name="WLCloudScrollYText">
-				卷动 Y
-			</text>
-			<check_box
-				 initial_value="false"
-				 label="渲染旧云层"
-				 name="DrawClassicClouds" />
-			<button
-				 label="?"
-				 name="WLClassicCloudsHelp" />
-		</panel>
-	</tab_container>
-	<string
-		 name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality
-	</string>
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	 min_height="180"
+	 min_width="400"
+	 name="WindLight floater"
+	 title="高级天空编辑器">
+	<text
+		 name="KeyFramePresetsText">
+		天空预设:
+	</text>
+
+	<button
+		 label="新建"
+		 label_selected="新建"
+		 name="WLNewPreset" />
+	<button
+		 label="保存"
+		 label_selected="保存"
+		 name="WLSavePreset" />
+	<button
+		 label="删除"
+		 label_selected="删除"
+		 name="WLDeletePreset" />
+	<button
+		 label="日夜循环编辑器"
+		 label_selected="日夜循环编辑器"
+		 name="WLDayCycleMenuButton" />
+	<tab_container
+		 name="WindLight Tabs"
+		 tab_position="top">
+		<panel
+			 label="大气"
+			 name="Atmosphere">
+			<text
+				 name="BHText">
+				蓝色地平
+			</text>
+			<button
+				 label="?"
+				 name="WLBlueHorizonHelp" />
+			<text
+				 name="BHText2" width="14">
+				红
+			</text>
+			<text
+				 name="BHText3" width="14">
+				绿
+			</text>
+			<text
+				 name="BHText4" width="14">
+				蓝
+			</text>
+			<text
+				 name="BHText5" width="14">
+				亮
+			</text>
+			<text
+				 name="BDensText">
+			云雾地平
+			</text>
+			<button
+				 label="?"
+				 name="WLHazeHorizonHelp" />
+			<text
+				 name="BDensText2">
+				蓝色浓度
+			</text>
+			<button
+				 label="?"
+				 name="WLBlueDensityHelp" />
+			<text
+				 name="BHText6" width="14">
+				红
+			</text>
+			<text
+				 name="BHText7" width="14">
+				绿
+			</text>
+			<text
+				 name="BHText8" width="14">
+				蓝
+			</text>
+			<text
+				 name="BHText9" width="14">
+				亮
+			</text>
+			<text
+				 name="HDText">
+				云雾浓度
+			</text>
+			<button
+				 label="?"
+				 name="WLHazeDensityHelp" />
+			<text
+				 name="DensMultText">
+				浓度乘数
+			</text>
+			<button
+				 label="?"
+				 name="WLDensityMultHelp" />
+			<slider
+				 label=""
+				 name="WLDensityMult"
+				 value="1.0" />
+			<text
+				 name="WLDistanceMultText">
+				距离乘数
+			</text>
+			<button
+				 label="?"
+				 name="WLDistanceMultHelp" />
+			<slider
+				 label=""
+				 name="WLDistanceMult"
+				 value="0.0" />
+			<text
+				 name="MaxAltText">
+					最大高度
+			</text>
+			<button
+				 label="?"
+				 name="WLMaxAltitudeHelp" />
+			<slider
+				 label=""
+				 name="WLMaxAltitude"
+				 value="4000" />
+		</panel>
+		<panel
+			 label="光照"
+			 name="Lighting">
+			<text
+				 name="SLCText">
+				日月颜色
+			</text>
+			<button
+				 label="?"
+				 name="WLSunlightColorHelp" />
+			<text
+				 name="BHText" width="14">
+				红
+			</text>
+			<text
+				 name="BHText2" width="14">
+				绿
+			</text>
+			<text
+				 name="BHText3" width="14">
+				蓝
+			</text>
+			<text
+				 name="BHText4" width="14">
+				亮
+			</text>
+			<text
+				 name="TODText">
+				日月位置
+			</text>
+			<text
+				 name="WLAmbientText">
+				环境
+			</text>
+			<button
+				 label="?"
+				 name="WLAmbientHelp" />
+			<text
+				 name="BHText5" width="14">
+				红
+			</text>
+			<text
+				 name="BHText6" width="14">
+				绿
+			</text>
+			<text
+				 name="BHText7" width="14">
+				蓝
+			</text>
+			<text
+				 name="BHText8" width="14">
+				亮
+			</text>
+			<text
+				 name="WLEastAngleText">
+				东向角度
+			</text>
+			<text
+				 name="SunGlowText">
+				太阳辉光
+			</text>
+			<slider
+				 label="聚焦"
+				 name="WLGlowB"
+				 value="1.0" />
+			<slider
+				 label="尺寸"
+				 name="WLGlowR"
+				 value="1.0" />
+			<text
+				 name="SceneGammaText">
+				场景γ
+			</text>
+			<button
+				 label="?"
+				 name="WLSceneGammaHelp" />
+			<slider
+				 label=""
+				 name="WLGamma"
+				 value="2.0" />
+			<text
+				 name="WLStarText">
+				星空亮度
+			</text>
+		</panel>
+		<panel
+			 label="云层"
+			 name="Clouds">
+			<text
+				 name="WLCloudColorText">
+				云层颜色
+			</text>
+			<button
+				 label="?"
+				 name="WLCloudColorHelp" />
+			<text
+				 name="BHText" width="14">
+				红
+			</text>
+			<text
+				 name="BHText2" width="14">
+				绿
+			</text>
+			<text
+				 name="BHText3" width="14">
+				蓝
+			</text>
+			<text
+				 name="BHText4" width="14">
+				亮
+			</text>
+			<text
+				 name="WLCloudColorText2">
+				云层 XY/密度
+			</text>
+			<text
+				 name="BHText5">
+				X
+			</text>
+			<text
+				 name="BHText6">
+				Y
+			</text>
+			<text
+				 name="BHText7">
+				D
+			</text>
+			<text
+				 name="WLCloudCoverageText">
+				云层覆盖
+			</text>
+			<text
+				 name="WLCloudScaleText">
+				云层尺寸
+			</text>
+			<text
+				 name="WLCloudDetailText">
+				云层细节 (XY/密度)
+			</text>
+			<button
+				 label="?"
+				 name="WLCloudDetailHelp" />
+			<text
+				 name="BHText8">
+				X
+			</text>
+			<text
+				 name="BHText9">
+				Y
+			</text>
+			<text
+				 name="BHText10">
+				D
+			</text>
+			<slider
+				 label=""
+				 name="WLCloudDetailX"
+				 value="0.5" />
+			<slider
+				 label=""
+				 name="WLCloudDetailY"
+				 value="0.5" />
+			<slider
+				 label=""
+				 name="WLCloudDetailDensity"
+				 value="1.0" />
+			<text
+				 name="WLCloudScrollXText">
+				卷动 X
+			</text>
+			<button
+				 label="?"
+				 name="WLCloudScrollXHelp" />
+			<check_box
+				 initial_value="false"
+				 label="Lock"
+				 name="WLCloudLockX" />
+			<slider
+				 label=""
+				 name="WLCloudScrollX"
+				 value="0.0" />
+			<text
+				 name="WLCloudScrollYText">
+				卷动 Y
+			</text>
+			<check_box
+				 initial_value="false"
+				 label="渲染旧云层"
+				 name="DrawClassicClouds" />
+			<button
+				 label="?"
+				 name="WLClassicCloudsHelp" />
+		</panel>
+	</tab_container>
+	<string
+		 name="WLDefaultSkyNames">
+		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality
+	</string>
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/mime_types.xml b/linden/indra/newview/skins/default/xui/zh/mime_types.xml
index 089597d..fc5fae4 100644
--- a/linden/indra/newview/skins/default/xui/zh/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -1,262 +1,262 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<mimetypes name="default">
-	<defaultlabel>
-		(未知)
-	</defaultlabel>
-	<defaultwidget>
-		无
-	</defaultwidget>
-	<defaultimpl>
-		LLMediaImplLLMozLib
-	</defaultimpl>
-	<widgetset name="web">
-		<label name="web_label">
-			网页内容
-		</label>
-		<tooltip name="web_tooltip">
-			该区域有网页内容
-		</tooltip>
-		<playtip name="web_playtip">
-			显示网页内容
-		</playtip>
-	</widgetset>
-	<widgetset name="movie">
-		<label name="movie_label">
-			影片
-		</label>
-		<tooltip name="movie_tooltip">
-			这里可以播放影片
-		</tooltip>
-		<playtip name="movie_playtip">
-			播放影片
-		</playtip>
-	</widgetset>
-	<widgetset name="none">
-		<label name="none_label">
-			无内容
-		</label>
-		<tooltip name="none_tooltip">
-			这里没有媒体
-		</tooltip>
-		<playtip name="none_playtip" />
-	</widgetset>
-	<widgetset name="image">
-		<label name="image_label">
-			图像
-		</label>
-		<tooltip name="image_tooltip">
-			这里有图像
-		</tooltip>
-		<playtip name="image_playtip">
-			显示该位置的图像
-		</playtip>
-	</widgetset>
-	<widgetset name="audio">
-		<label name="audio_label">
-			音频
-		</label>
-			audio/*
-		<tooltip name="audio_tooltip">
-			这里可以播放音频
-		</tooltip>
-		<playtip name="audio_playtip">
-			播放该位置的音频
-		</playtip>
-	</widgetset>
-	<scheme name="rtsp">
-		<label name="rtsp_label">
-			实时流媒体 (RTSP)
-		</label>
-	</scheme>
-	<mimetype name="blank">
-		<label name="blank_label">
-			- 无 -
-		</label>
-	</mimetype>
-	<mimetype name="none/none">
-		<label name="none/none_label">
-			- 无 -
-		</label>
-	</mimetype>
-	<mimetype name="audio/*">
-		<label name="audio2_label">
-			音频
-		</label>
-	</mimetype>
-	<mimetype name="video/*">
-		<label name="video2_label">
-			视频
-		</label>
-	</mimetype>
-	<mimetype name="image/*">
-		<label name="image2_label">
-			图像
-		</label>
-	</mimetype>
-	<mimetype name="video/vnd.secondlife.qt.legacy">
-		<label name="vnd.secondlife.qt.legacy_label">
-			影片 (QuickTime)
-		</label>
-	</mimetype>
-	<mimetype name="application/javascript">
-		<label name="application/javascript_label">
-			Javascript
-		</label>
-	</mimetype>
-	<mimetype name="application/ogg">
-		<label name="application/ogg_label">
-			Ogg 音频/视频
-		</label>
-	</mimetype>
-	<mimetype name="application/pdf">
-		<label name="application/pdf_label">
-			PDF 文档
-		</label>
-	</mimetype>
-	<mimetype name="application/postscript">
-		<label name="application/postscript_label">
-			Postscript 文档
-		</label>
-	</mimetype>
-	<mimetype name="application/rtf">
-		<label name="application/rtf_label">
-			带格式化的文本 (RTF)
-		</label>
-		<widgettype>
-			image
-		</widgettype>
-	</mimetype>
-	<mimetype name="application/smil">
-		<label name="application/smil_label">
-		    同步多媒体集成语言 (SMIL)
-		</label>
-		<widgettype>
-			movie
-		</widgettype>
-	</mimetype>
-	<mimetype name="application/xhtml+xml">
-		<label name="application/xhtml+xml_label">
-			网页 (XHTML)
-		</label>
-	</mimetype>
-	<mimetype name="application/x-director">
-		<label name="application/x-director_label">
-			Macromedia Director
-		</label>
-		<widgettype>
-			image
-		</widgettype>
-	</mimetype>
-	<mimetype name="application/x-shockwave-flash">
-		<label name="application/x-shockwave-flash_label">
-			Flash
-		</label>
-	</mimetype>
-	<mimetype name="audio/mid">
-		<label name="audio/mid_label">
-			音频 (MIDI)
-		</label>
-	</mimetype>
-	<mimetype name="audio/mpeg">
-		<label name="audio/mpeg_label">
-			音频 (MP3)
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-aiff">
-		<label name="audio/x-aiff_label">
-			音频 (AIFF)
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-wav">
-		<label name="audio/x-wav_label">
-			音频 (WAV)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/bmp">
-		<label name="image/bmp_label">
-			图像 (BMP)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/gif">
-		<label name="image/gif_label">
-			图像 (GIF)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/jpeg">
-		<label name="image/jpeg_label">
-			图像 (JPEG)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/png">
-		<label name="image/png_label">
-			图像 (PNG)
-		</label>
-	</mimetype>
-	<mimetype name="image/svg+xml">
-		<label name="image/svg+xml_label">
-			图像 (SVG)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/tiff">
-		<label name="image/tiff_label">
-			图像 (TIFF)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="text/html">
-		<label name="text/html_label">
-			网页
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="text/plain">
-		<label name="text/plain_label">
-			文本
-		</label>
-	</mimetype>
-	<mimetype name="text/xml">
-		<label name="text/xml_label">
-			XML
-		</label>
-		<widgettype>
-			text
-		</widgettype>
-		<impl>
-			LLMediaImplLLMozLib
-		</impl>
-	</mimetype>
-	<mimetype menu="1" name="video/mpeg">
-		<label name="video/mpeg_label">
-			影片 (MPEG)
-		</label>
-	</mimetype>
-	<mimetype name="video/mp4">
-		<label name="video/mp4_label">
-			影片 (MP4)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="video/quicktime">
-		<label name="video/quicktime_label">
-			影片 (QuickTime)
-		</label>
-		<widgettype>
-			movie
-		</widgettype>
-		<impl>
-			LLMediaImplQuickTime
-		</impl>
-	</mimetype>
-	<mimetype name="video/x-ms-asf">
-		<label name="video/x-ms-asf_label">
-			影片 (Windows Media ASF)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-wmv">
-		<label name="video/x-ms-wmv_label">
-			影片 (Windows Media WMV)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="video/x-msvideo">
-		<label name="video/x-msvideo_label">
-			影片 (AVI)
-		</label>
-	</mimetype>
-</mimetypes>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+	<defaultlabel>
+		(未知)
+	</defaultlabel>
+	<defaultwidget>
+		无
+	</defaultwidget>
+	<defaultimpl>
+		LLMediaImplLLMozLib
+	</defaultimpl>
+	<widgetset name="web">
+		<label name="web_label">
+			网页内容
+		</label>
+		<tooltip name="web_tooltip">
+			该区域有网页内容
+		</tooltip>
+		<playtip name="web_playtip">
+			显示网页内容
+		</playtip>
+	</widgetset>
+	<widgetset name="movie">
+		<label name="movie_label">
+			影片
+		</label>
+		<tooltip name="movie_tooltip">
+			这里可以播放影片
+		</tooltip>
+		<playtip name="movie_playtip">
+			播放影片
+		</playtip>
+	</widgetset>
+	<widgetset name="none">
+		<label name="none_label">
+			无内容
+		</label>
+		<tooltip name="none_tooltip">
+			这里没有媒体
+		</tooltip>
+		<playtip name="none_playtip" />
+	</widgetset>
+	<widgetset name="image">
+		<label name="image_label">
+			图像
+		</label>
+		<tooltip name="image_tooltip">
+			这里有图像
+		</tooltip>
+		<playtip name="image_playtip">
+			显示该位置的图像
+		</playtip>
+	</widgetset>
+	<widgetset name="audio">
+		<label name="audio_label">
+			音频
+		</label>
+			audio/*
+		<tooltip name="audio_tooltip">
+			这里可以播放音频
+		</tooltip>
+		<playtip name="audio_playtip">
+			播放该位置的音频
+		</playtip>
+	</widgetset>
+	<scheme name="rtsp">
+		<label name="rtsp_label">
+			实时流媒体 (RTSP)
+		</label>
+	</scheme>
+	<mimetype name="blank">
+		<label name="blank_label">
+			- 无 -
+		</label>
+	</mimetype>
+	<mimetype name="none/none">
+		<label name="none/none_label">
+			- 无 -
+		</label>
+	</mimetype>
+	<mimetype name="audio/*">
+		<label name="audio2_label">
+			音频
+		</label>
+	</mimetype>
+	<mimetype name="video/*">
+		<label name="video2_label">
+			视频
+		</label>
+	</mimetype>
+	<mimetype name="image/*">
+		<label name="image2_label">
+			图像
+		</label>
+	</mimetype>
+	<mimetype name="video/vnd.secondlife.qt.legacy">
+		<label name="vnd.secondlife.qt.legacy_label">
+			影片 (QuickTime)
+		</label>
+	</mimetype>
+	<mimetype name="application/javascript">
+		<label name="application/javascript_label">
+			Javascript
+		</label>
+	</mimetype>
+	<mimetype name="application/ogg">
+		<label name="application/ogg_label">
+			Ogg 音频/视频
+		</label>
+	</mimetype>
+	<mimetype name="application/pdf">
+		<label name="application/pdf_label">
+			PDF 文档
+		</label>
+	</mimetype>
+	<mimetype name="application/postscript">
+		<label name="application/postscript_label">
+			Postscript 文档
+		</label>
+	</mimetype>
+	<mimetype name="application/rtf">
+		<label name="application/rtf_label">
+			带格式化的文本 (RTF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/smil">
+		<label name="application/smil_label">
+		    同步多媒体集成语言 (SMIL)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/xhtml+xml">
+		<label name="application/xhtml+xml_label">
+			网页 (XHTML)
+		</label>
+	</mimetype>
+	<mimetype name="application/x-director">
+		<label name="application/x-director_label">
+			Macromedia Director
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/x-shockwave-flash">
+		<label name="application/x-shockwave-flash_label">
+			Flash
+		</label>
+	</mimetype>
+	<mimetype name="audio/mid">
+		<label name="audio/mid_label">
+			音频 (MIDI)
+		</label>
+	</mimetype>
+	<mimetype name="audio/mpeg">
+		<label name="audio/mpeg_label">
+			音频 (MP3)
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-aiff">
+		<label name="audio/x-aiff_label">
+			音频 (AIFF)
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-wav">
+		<label name="audio/x-wav_label">
+			音频 (WAV)
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="image/bmp">
+		<label name="image/bmp_label">
+			图像 (BMP)
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="image/gif">
+		<label name="image/gif_label">
+			图像 (GIF)
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="image/jpeg">
+		<label name="image/jpeg_label">
+			图像 (JPEG)
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="image/png">
+		<label name="image/png_label">
+			图像 (PNG)
+		</label>
+	</mimetype>
+	<mimetype name="image/svg+xml">
+		<label name="image/svg+xml_label">
+			图像 (SVG)
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="image/tiff">
+		<label name="image/tiff_label">
+			图像 (TIFF)
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="text/html">
+		<label name="text/html_label">
+			网页
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="text/plain">
+		<label name="text/plain_label">
+			文本
+		</label>
+	</mimetype>
+	<mimetype name="text/xml">
+		<label name="text/xml_label">
+			XML
+		</label>
+		<widgettype>
+			text
+		</widgettype>
+		<impl>
+			LLMediaImplLLMozLib
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/mpeg">
+		<label name="video/mpeg_label">
+			影片 (MPEG)
+		</label>
+	</mimetype>
+	<mimetype name="video/mp4">
+		<label name="video/mp4_label">
+			影片 (MP4)
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="video/quicktime">
+		<label name="video/quicktime_label">
+			影片 (QuickTime)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			LLMediaImplQuickTime
+		</impl>
+	</mimetype>
+	<mimetype name="video/x-ms-asf">
+		<label name="video/x-ms-asf_label">
+			影片 (Windows Media ASF)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-wmv">
+		<label name="video/x-ms-wmv_label">
+			影片 (Windows Media WMV)
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="video/x-msvideo">
+		<label name="video/x-msvideo_label">
+			影片 (AVI)
+		</label>
+	</mimetype>
+</mimetypes>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_audio.xml b/linden/indra/newview/skins/default/xui/zh/panel_audio.xml
index f2ec305..a537046 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_audio.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_audio.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel 
-	 label="音量"
-     name="Media panel">
-	<check_box 
-	     label="静音" 
-		 name="disable audio" />
-
-	<slider name="System Volume" 
-	     label="总体" />
-	<slider name="Music Volume" 
-	     label="音乐" />
-	<slider 
-	     name="Media Volume" 
-	     label="媒体" />
-	<slider 
-	     name="Voice Volume" 
-	     label="语音" />
-
-	<slider 
-		 name="SFX Volume" 
-	     label="音效" />
-	<slider 
-		 name="Wind Volume" 
-	     label="环境"  />
-	<slider name="UI Volume"
-	     label="界面" />
-		 
-</panel>
-<!--Translated by Geneko Nemeth for Second Life 1.19.0 (79185)-->
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel 
+	 label="音量"
+     name="Media panel">
+	<check_box 
+	     label="静音" 
+		 name="disable audio" />
+
+	<slider name="System Volume" 
+	     label="总体" />
+	<slider name="Music Volume" 
+	     label="音乐" />
+	<slider 
+	     name="Media Volume" 
+	     label="媒体" />
+	<slider 
+	     name="Voice Volume" 
+	     label="语音" />
+
+	<slider 
+		 name="SFX Volume" 
+	     label="音效" />
+	<slider 
+		 name="Wind Volume" 
+	     label="环境"  />
+	<slider name="UI Volume"
+	     label="界面" />
+		 
+</panel>
+<!--Translated by Geneko Nemeth for Second Life 1.19.0 (79185)-->
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_audio_device.xml b/linden/indra/newview/skins/default/xui/zh/panel_audio_device.xml
index 457e63f..80d0789 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_audio_device.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_audio_device.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-	 name="device_settings">
-	<text
-		 name="Audio Devices">
-		音频设备
-	</text>
-
-		<text
-		 name="Input device (microphone):">
-			输入设备( 麦克风) :
-		</text>
-
-		<text
-		 name="Output device (speakers):">
-			输出设备 (扬声器):
-		</text>
-		<combo_box
-		 allow_text_entry="false"
-		 max_chars="128"
-		 name="voice_output_device" />
-		 
-	<text
-		 name="Input level:">
-		输入音量
-	</text>
-
-		<text_editor
-		 name="voice_intro_text1">调节滑块来控制你说的话的音量。  要测试输入音量的话，只要对着你的麦克风说话就可以了。</text_editor>
-
-	<volume_slider
-		 name="mic_volume_slider"
-		 tool_tip="用这个滑块调节音量。" />
-
-	<text
-		 name="wait_text">
-		请稍候
-	</text>
-	
-
-	<text
-		 name="default_text" >"默认"</text>
-
-	</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+	 name="device_settings">
+	<text
+		 name="Audio Devices">
+		音频设备
+	</text>
+
+		<text
+		 name="Input device (microphone):">
+			输入设备( 麦克风) :
+		</text>
+
+		<text
+		 name="Output device (speakers):">
+			输出设备 (扬声器):
+		</text>
+		<combo_box
+		 allow_text_entry="false"
+		 max_chars="128"
+		 name="voice_output_device" />
+		 
+	<text
+		 name="Input level:">
+		输入音量
+	</text>
+
+		<text_editor
+		 name="voice_intro_text1">调节滑块来控制你说的话的音量。  要测试输入音量的话，只要对着你的麦克风说话就可以了。</text_editor>
+
+	<volume_slider
+		 name="mic_volume_slider"
+		 tool_tip="用这个滑块调节音量。" />
+
+	<text
+		 name="wait_text">
+		请稍候
+	</text>
+	
+
+	<text
+		 name="default_text" >"默认"</text>
+
+	</panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_friends.xml b/linden/indra/newview/skins/default/xui/zh/panel_friends.xml
index 74d29a4..f6dcb40 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_friends.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="friends">
-	<scroll_list name="friend_list"
-	     tool_tip="点击时按住 shift 或 control 键来选择多个好友">
-		<column name="icon_online_status" tool_tip="在线状态" />
-		<column label="名字" name="friend_name" tool_tip="名称" />
-		<column name="icon_visible_online" tool_tip="好友可以看见你是否在线" />
-		<column name="icon_visible_map" tool_tip="好友可以在地图上找到你" />
-		<column name="icon_edit_mine" tool_tip="好友可以编辑你的物体" />
-		<column name="icon_edit_theirs" tool_tip="你可以编辑这位好友的物体" />
-	</scroll_list>
-	<button label="聊天/呼叫" name="im_btn" tool_tip="打开即时通信会话" />
-	<button label="档案" name="profile_btn"
-	     tool_tip="显示图片、社团和其他信息" />
-	<button label="瞬间移动..." name="offer_teleport_btn"
-	     tool_tip="邀请该好友瞬间移动到你的当前位置" />
-	<button label="付款..." name="pay_btn" tool_tip="给这位好友林登币 (L$)" />
-	<button label="移除..." name="remove_btn"
-	     tool_tip="将这个人从你的好友列表中去除" />
-	<button label="添加..." name="add_btn"
-	     tool_tip="邀请其他居民成为你的好友" />
-</panel>
-<!--Translated for Second Life 1.19.0 (79185)-->
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="friends">
+	<scroll_list name="friend_list"
+	     tool_tip="点击时按住 shift 或 control 键来选择多个好友">
+		<column name="icon_online_status" tool_tip="在线状态" />
+		<column label="名字" name="friend_name" tool_tip="名称" />
+		<column name="icon_visible_online" tool_tip="好友可以看见你是否在线" />
+		<column name="icon_visible_map" tool_tip="好友可以在地图上找到你" />
+		<column name="icon_edit_mine" tool_tip="好友可以编辑你的物体" />
+		<column name="icon_edit_theirs" tool_tip="你可以编辑这位好友的物体" />
+	</scroll_list>
+	<button label="聊天/呼叫" name="im_btn" tool_tip="打开即时通信会话" />
+	<button label="档案" name="profile_btn"
+	     tool_tip="显示图片、社团和其他信息" />
+	<button label="瞬间移动..." name="offer_teleport_btn"
+	     tool_tip="邀请该好友瞬间移动到你的当前位置" />
+	<button label="付款..." name="pay_btn" tool_tip="给这位好友林登币 (L$)" />
+	<button label="移除..." name="remove_btn"
+	     tool_tip="将这个人从你的好友列表中去除" />
+	<button label="添加..." name="add_btn"
+	     tool_tip="邀请其他居民成为你的好友" />
+</panel>
+<!--Translated for Second Life 1.19.0 (79185)-->
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_groups.xml b/linden/indra/newview/skins/default/xui/zh/panel_groups.xml
index 958f392..cb658cb 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_groups.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="groups">
-	<text name="groupdesc" >
-		您当前激活的社团以粗体表示。
-	</text>
-	<text name="groupcount" >
-		您现在属于 [COUNT] 个社团 (最大 [MAX] 个)。
-	</text>
-	<button
-		 label="聊天/呼叫"
-		 name="IM"
-		 tool_tip="打开即时通信会话" />
-	<button
-		 label="信息"
-		 name="Info" />
-	<button
-		 label="激活"
-		 name="Activate" />
-	<button
-		 label="离开"
-		 name="Leave" />
-	<button
-		 label="创建..."
-		 name="Create" />
-	<button
-		 label="搜索..."
-		 name="Search..." />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="groups">
+	<text name="groupdesc" >
+		您当前激活的社团以粗体表示。
+	</text>
+	<text name="groupcount" >
+		您现在属于 [COUNT] 个社团 (最大 [MAX] 个)。
+	</text>
+	<button
+		 label="聊天/呼叫"
+		 name="IM"
+		 tool_tip="打开即时通信会话" />
+	<button
+		 label="信息"
+		 name="Info" />
+	<button
+		 label="激活"
+		 name="Activate" />
+	<button
+		 label="离开"
+		 name="Leave" />
+	<button
+		 label="创建..."
+		 name="Create" />
+	<button
+		 label="搜索..."
+		 name="Search..." />
+</panel>
 <!--Translated for Second Life 1.19.0 (79185)-->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml
index c00c1e6..e965534 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Web" left="102" mouse_opaque="true"
-     name="web" width="517">
-	<text name="cache_size_label_l">
-		浏览器缓存:
-	</text>
-	<button 
-	     label="现在清除"
-	     name="clear_cache" />
-	<text type="string" name="cookie_label" >
-		Cookie:
-	</text>
-	<check_box label="从网站接受 cookie"
-             name="cookies_enabled" /> 
-	<button 
-	     label="现在清除" 
-	     name="clear_cookies" />
-	<text name="proxy_label">
-		代理服务器:
-	</text>
-	<check_box 
-		 label="启用网页代理服务器"
-         name="web_proxy_enabled" /> 
-	<text name="proxy_text_label">
-		地址:
-	</text>
-	<line_editor 
-		 name="web_proxy_editor"
-		 tool_tip="你想使用的代理服务器的名称或者 IP 地址" />
-	<spinner 
-			 label="端口号:"
-             name="web_proxy_port" />
-	<radio_group name="use_external_browser">
-		 <radio_item
-			 name="external"
-			 tool_tip="使用系统默认网络浏览器打开帮助、网页链接, 等等。\n若全屏显示则不推荐使用。">
-			使用外部浏览器(Firefox, Safari, Internet Explorer)
-		</radio_item>
-		<radio_item
-			 name="internal"
-			 tool_tip="使用内部浏览器打开帮助、网页链接, 等等。这个浏览器会在第二人生中打开一个新窗口。">
-			使用内建浏览器
-		</radio_item>
-	</radio_group>
-	<text>
-		浏览器主页:
-	</text>
-	<line_editor name="home_page" tool_tip="首次打开第二人生浏览器时的浏览页面" />
-	<text>
-		代理服务器配置:
-	</text>
-	<check_box label="内部浏览器使用代理服务器" name="proxy_enabled"
-	     tool_tip="请为因特网网络浏览器指定代理服务器配置。" />
-	<text>
-		代理服务器:
-	</text>
-	<line_editor name="proxy_address" tool_tip="请输入代理服务器的名称或IP地址" />
-	<text>
-		端口：
-	</text>
-	<line_editor name="proxy_port" />
-	<text>
-		袜子：
-	</text>
-	<radio_group name="socks_4_5">
-		<radio_item>
-			Socks v4
-		</radio_item>
-		<radio_item>
-			Socks v5
-		</radio_item>
-	</radio_group>
-	<text>
-		对以下内容不使用代理:
-	</text>
-	<line_editor name="proxy_exclusions"
-	     tool_tip="请输入不想使用代理服务器替换的名称或IP地址" />
-	<check_box label="在元件上显示网页 (实验性功能, 需要重启)"
-	     name="web_pages_on_prims_check" />
-	<text>
-		安全地址：
-（登陆察看）
-	</text>
-	<button label="添加" name="add_trusted" />
-	<line_editor name="trusted_site_entry" tool_tip="添加到安全名单中的网络地址" />
-	<button label="移除" name="rem_trusted" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+     height="408" hidden="false" label="Web" left="102" mouse_opaque="true"
+     name="web" width="517">
+	<text name="cache_size_label_l">
+		浏览器缓存:
+	</text>
+	<button 
+	     label="现在清除"
+	     name="clear_cache" />
+	<text type="string" name="cookie_label" >
+		Cookie:
+	</text>
+	<check_box label="从网站接受 cookie"
+             name="cookies_enabled" /> 
+	<button 
+	     label="现在清除" 
+	     name="clear_cookies" />
+	<text name="proxy_label">
+		代理服务器:
+	</text>
+	<check_box 
+		 label="启用网页代理服务器"
+         name="web_proxy_enabled" /> 
+	<text name="proxy_text_label">
+		地址:
+	</text>
+	<line_editor 
+		 name="web_proxy_editor"
+		 tool_tip="你想使用的代理服务器的名称或者 IP 地址" />
+	<spinner 
+			 label="端口号:"
+             name="web_proxy_port" />
+	<radio_group name="use_external_browser">
+		 <radio_item
+			 name="external"
+			 tool_tip="使用系统默认网络浏览器打开帮助、网页链接, 等等。\n若全屏显示则不推荐使用。">
+			使用外部浏览器(Firefox, Safari, Internet Explorer)
+		</radio_item>
+		<radio_item
+			 name="internal"
+			 tool_tip="使用内部浏览器打开帮助、网页链接, 等等。这个浏览器会在第二人生中打开一个新窗口。">
+			使用内建浏览器
+		</radio_item>
+	</radio_group>
+	<text>
+		浏览器主页:
+	</text>
+	<line_editor name="home_page" tool_tip="首次打开第二人生浏览器时的浏览页面" />
+	<text>
+		代理服务器配置:
+	</text>
+	<check_box label="内部浏览器使用代理服务器" name="proxy_enabled"
+	     tool_tip="请为因特网网络浏览器指定代理服务器配置。" />
+	<text>
+		代理服务器:
+	</text>
+	<line_editor name="proxy_address" tool_tip="请输入代理服务器的名称或IP地址" />
+	<text>
+		端口：
+	</text>
+	<line_editor name="proxy_port" />
+	<text>
+		袜子：
+	</text>
+	<radio_group name="socks_4_5">
+		<radio_item>
+			Socks v4
+		</radio_item>
+		<radio_item>
+			Socks v5
+		</radio_item>
+	</radio_group>
+	<text>
+		对以下内容不使用代理:
+	</text>
+	<line_editor name="proxy_exclusions"
+	     tool_tip="请输入不想使用代理服务器替换的名称或IP地址" />
+	<check_box label="在元件上显示网页 (实验性功能, 需要重启)"
+	     name="web_pages_on_prims_check" />
+	<text>
+		安全地址：
+（登陆察看）
+	</text>
+	<button label="添加" name="add_trusted" />
+	<line_editor name="trusted_site_entry" tool_tip="添加到安全名单中的网络地址" />
+	<button label="移除" name="rem_trusted" />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml b/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml
index a38236d..95b6a4e 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="active_speakers_panel">
-	<string
-		 name="moderator_label">(管理员)</string>
-	<layout_stack>
-		<layout_panel
-			 min_height="25"
-			 name="moderation_mode_panel"
-			 top_delta="0"
-			 visible="false">
-		     <combo_box
-				 name="moderation_mode">
-				<combo_item
-					 value="unmoderated">语音默认打开</combo_item>
-				<combo_item
-					 value="moderated">语音默认关闭</combo_item>
-		     </combo_box>
-		</layout_panel>
-
-		<layout_panel
-			 name="moderate_chat_panel">
-			<scroll_list
-				 name="speakers_list">
-				<column
-					 label="名字"
-					 name="speaker_name" />
-			</scroll_list>
-
-			<panel
-				 name="speaker_controls">
-				<text
-					 name="resident_name"
-					 valign="center">Rumplstiltskin Califragilistic</text>
-				<button
-					 label=""
-					 name="mute_btn"
-					 tool_tip="将该居民的语音音量设置为静音" />
-				<check_box
-					 name="mute_text_btn"
-					 label="屏蔽文字聊天" />
-			</panel>
-		</layout_panel>
-		<layout_panel
-			 name="moderator_controls"
-			 top_delta="0"
-			 visible="false">
-		     <text
-				 right="-5"
-				 name="moderator_controls_label">管理员控制:</text>
-		     <check_box
-				 name="moderator_allow_voice"
-				 right="-5">允许语音聊天</check_box>
-		     <check_box
-				 name="moderator_allow_text"
-				 right="-5">允许文字聊天</check_box>
-		</layout_panel>
-
-	</layout_stack>
-</panel>
-<!--Translated for Second Life 1.19.0 (79185)-->
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="active_speakers_panel">
+	<string
+		 name="moderator_label">(管理员)</string>
+	<layout_stack>
+		<layout_panel
+			 min_height="25"
+			 name="moderation_mode_panel"
+			 top_delta="0"
+			 visible="false">
+		     <combo_box
+				 name="moderation_mode">
+				<combo_item
+					 value="unmoderated">语音默认打开</combo_item>
+				<combo_item
+					 value="moderated">语音默认关闭</combo_item>
+		     </combo_box>
+		</layout_panel>
+
+		<layout_panel
+			 name="moderate_chat_panel">
+			<scroll_list
+				 name="speakers_list">
+				<column
+					 label="名字"
+					 name="speaker_name" />
+			</scroll_list>
+
+			<panel
+				 name="speaker_controls">
+				<text
+					 name="resident_name"
+					 valign="center">Rumplstiltskin Califragilistic</text>
+				<button
+					 label=""
+					 name="mute_btn"
+					 tool_tip="将该居民的语音音量设置为静音" />
+				<check_box
+					 name="mute_text_btn"
+					 label="屏蔽文字聊天" />
+			</panel>
+		</layout_panel>
+		<layout_panel
+			 name="moderator_controls"
+			 top_delta="0"
+			 visible="false">
+		     <text
+				 right="-5"
+				 name="moderator_controls_label">管理员控制:</text>
+		     <check_box
+				 name="moderator_allow_voice"
+				 right="-5">允许语音聊天</check_box>
+		     <check_box
+				 name="moderator_allow_text"
+				 right="-5">允许文字聊天</check_box>
+		</layout_panel>
+
+	</layout_stack>
+</panel>
+<!--Translated for Second Life 1.19.0 (79185)-->
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_voice_controls.xml b/linden/indra/newview/skins/default/xui/zh/panel_voice_controls.xml
index 4ff2f81..52e76ca 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_voice_controls.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_voice_controls.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="voice_controls">
-	<button label="" name="speakers_btn"
-	     tool_tip="显示你周围使用语音聊天的居民" />
-	<button label="交谈" name="push_to_talk" tool_tip="按住按钮来通话" />
-	<button label="" name="ptt_lock" tool_tip="点击锁来切换到通话模式" />
-	<button label="" name="show_channel" tool_tip="显示当前的语音频道" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="voice_controls">
+	<button label="" name="speakers_btn"
+	     tool_tip="显示你周围使用语音聊天的居民" />
+	<button label="交谈" name="push_to_talk" tool_tip="按住按钮来通话" />
+	<button label="" name="ptt_lock" tool_tip="点击锁来切换到通话模式" />
+	<button label="" name="show_channel" tool_tip="显示当前的语音频道" />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_voice_enable.xml b/linden/indra/newview/skins/default/xui/zh/panel_voice_enable.xml
index 84444e5..170f148 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_voice_enable.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="content_panel">
-
-	<text_editor name="voice_intro_text1" word_wrap="true">
-		欢迎使用 Second Life 语音聊天! 语音聊天让你可以与其他居民进行口头交流。该向导会帮助你完成设置语音聊天的各个步骤。请注意语音聊天需要带麦克风的立体声耳机；点击帮助按钮了解更多信息。
-	</text_editor>
-
-	<text_editor name="voice_intro_text2" word_wrap="true">
-		您现在想要启用语音聊天吗？
-	</text_editor>
-	<radio_group name="voice_enable">
-		<radio_item name="1">当然，启用语音聊天。</radio_item>
-		<radio_item name="0">不要就是不要，现在不启用语音聊天</radio_item>
-	</radio_group>
-
-		<text_editor
-		 name="voice_intro_text3"
-		 word_wrap="true">你可以在任何时候，在偏好设置的语音聊天选项卡中启用启用语音聊天。</text_editor>
-
-		<text_editor
-		 name="voice_intro_text4"
-		 word_wrap="true">点击继续按钮来设置语音聊天选项，或者点击完成继续使用 Second Life。</text_editor>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="content_panel">
+
+	<text_editor name="voice_intro_text1" word_wrap="true">
+		欢迎使用 Second Life 语音聊天! 语音聊天让你可以与其他居民进行口头交流。该向导会帮助你完成设置语音聊天的各个步骤。请注意语音聊天需要带麦克风的立体声耳机；点击帮助按钮了解更多信息。
+	</text_editor>
+
+	<text_editor name="voice_intro_text2" word_wrap="true">
+		您现在想要启用语音聊天吗？
+	</text_editor>
+	<radio_group name="voice_enable">
+		<radio_item name="1">当然，启用语音聊天。</radio_item>
+		<radio_item name="0">不要就是不要，现在不启用语音聊天</radio_item>
+	</radio_group>
+
+		<text_editor
+		 name="voice_intro_text3"
+		 word_wrap="true">你可以在任何时候，在偏好设置的语音聊天选项卡中启用启用语音聊天。</text_editor>
+
+		<text_editor
+		 name="voice_intro_text4"
+		 word_wrap="true">点击继续按钮来设置语音聊天选项，或者点击完成继续使用 Second Life。</text_editor>
+
 	</panel>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml
index 5115652..d44267f 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="content_panel">
-	<text_editor
-		 name="voice_intro_text1"
-		 word_wrap="true">
-		使用以下的选项设置你的语音聊天体验。
-	</text_editor>
-	<radio_group
-		 draw_border="false"
-		 name="ear_location" >
-		<radio_item
-			 name="0">
-			从摄像机的位置听语音聊天。
-		</radio_item>
-		<radio_item
-			 name="1" >
-			从化身的位置听语音聊天。
-		</radio_item>
-	</radio_group>
-	<check_box
-		 initial_value="false"
-		 label="只接受我的朋友列表上的人的语音呼叫"
-		 name="push_to_talk_check" />
-	<check_box
-		 initial_value="false"
-		 label="在查看器启动时，使用即按即说"
-		 name="push_to_talk_check" />
-	<check_box
-		 initial_value="false"
-		 label="以切换模式使用即按即说"
-		 name="push_to_talk_toggle_check" />
-	<text
-		 name="push_to_talk_label"
-		 word_wrap="true">
-		即按即说切换键:
-	</text>
-	<line_editor
-		 name="modifier_combo" />
-	<button
-		 label="设置按键"
-		 name="set_voice_hotkey_button" />
-	<button
-		 label="使用鼠标中键"
-		 name="set_voice_middlemouse_button" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="content_panel">
+	<text_editor
+		 name="voice_intro_text1"
+		 word_wrap="true">
+		使用以下的选项设置你的语音聊天体验。
+	</text_editor>
+	<radio_group
+		 draw_border="false"
+		 name="ear_location" >
+		<radio_item
+			 name="0">
+			从摄像机的位置听语音聊天。
+		</radio_item>
+		<radio_item
+			 name="1" >
+			从化身的位置听语音聊天。
+		</radio_item>
+	</radio_group>
+	<check_box
+		 initial_value="false"
+		 label="只接受我的朋友列表上的人的语音呼叫"
+		 name="push_to_talk_check" />
+	<check_box
+		 initial_value="false"
+		 label="在查看器启动时，使用即按即说"
+		 name="push_to_talk_check" />
+	<check_box
+		 initial_value="false"
+		 label="以切换模式使用即按即说"
+		 name="push_to_talk_toggle_check" />
+	<text
+		 name="push_to_talk_label"
+		 word_wrap="true">
+		即按即说切换键:
+	</text>
+	<line_editor
+		 name="modifier_combo" />
+	<button
+		 label="设置按键"
+		 name="set_voice_hotkey_button" />
+	<button
+		 label="使用鼠标中键"
+		 name="set_voice_middlemouse_button" />
 </panel>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/default/xui/zh/panel_voice_remote_expanded.xml
index 67695f7..409630b 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_voice_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_voice_remote_expanded.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="voice_remote">
-	<button label="" name="end_call_btn" tool_tip="结束通话" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="voice_remote">
+	<button label="" name="end_call_btn" tool_tip="结束通话" />
+</panel>
-- 
cgit v1.1