From 11856180aa40962a97cfcdb0d81e3d9cfeecf7c4 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sat, 2 Mar 2013 14:32:26 -0500
Subject: [PATCH] [Issue 662] Translations from upstream to ease the resulting
 load on translators.

---
 .../xui/es/panel_region_environment.xml       | 33 ++++++++
 .../default/xui/es/panel_region_estate.xml    | 47 ++++++-----
 .../default/xui/es/panel_region_terrain.xml   | 75 +++++++++++++-----
 .../default/xui/es/panel_region_texture.xml   | 57 --------------
 .../xui/fr/panel_region_environment.xml       | 33 ++++++++
 .../default/xui/fr/panel_region_estate.xml    | 50 ++++++------
 .../default/xui/fr/panel_region_terrain.xml   | 77 ++++++++++++++-----
 .../default/xui/fr/panel_region_texture.xml   | 69 -----------------
 .../xui/pt/panel_region_environment.xml       | 33 ++++++++
 .../default/xui/pt/panel_region_estate.xml    | 13 ++--
 .../default/xui/pt/panel_region_terrain.xml   | 69 +++++++++++++----
 .../default/xui/pt/panel_region_texture.xml   | 57 --------------
 12 files changed, 321 insertions(+), 292 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/es/panel_region_environment.xml
 delete mode 100644 indra/newview/skins/default/xui/es/panel_region_texture.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_region_environment.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/panel_region_texture.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_region_environment.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/panel_region_texture.xml

diff --git a/indra/newview/skins/default/xui/es/panel_region_environment.xml b/indra/newview/skins/default/xui/es/panel_region_environment.xml
new file mode 100644
index 000000000..ed5d3c20e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_region_environment.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Entorno" name="panel_env_info">
+	<text name="water_settings_title">
+		Selecciona la configuración de agua y cielo/ciclo del día que deseas que vean todos los visitantes de tu región. Más información
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item name="use_sl_default_settings">Usar los valores predeterminados de Second Life</radio_item>
+		<radio_item name="use_my_settings">Usar la configuración siguiente</radio_item>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="water_settings_title">
+			Configuración de agua
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_item name="item0">-Selecciona un valor predefinido-</combo_item>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			Cielo/Ciclo del día
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item name="my_sky_settings">Cielo invariable</radio_item>
+			<radio_item name="my_dayc_settings">Ciclo del día</radio_item>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_item name="item0">-Selecciona un valor predefinido-</combo_item>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_item name="item0">-Selecciona un valor predefinido-</combo_item>
+		</combo_box>
+	</panel>
+	<button label="Aplicar" name="apply_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml
index 08ff49b29..69926256f 100644
--- a/indra/newview/skins/default/xui/es/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml
@@ -1,69 +1,68 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Estado" name="Estate">
 	<text name="estate_help_text">
-		Los cambios de configuración en esta pestaña
-afectarán a todas las regiones en este estado.
+		En esta pestaña, los cambios en la configuración afectarán a todas las regiones del estado.
 	</text>
 	<text name="estate_text">
 		Estado:
 	</text>
 	<text name="estate_name">
-		(ninguno)
+		(desconocido)
 	</text>
 	<text name="owner_text">
-		Propietario:
+		Propietario del estado:
 	</text>
 	<text name="estate_owner">
 		(desconocido)
 	</text>
-	<check_box label="Usar Tiempo Global" name="use_global_time_check"/>
+	<check_box label="Usar el horario global" name="use_global_time_check"/>
 	<button label="?" name="use_global_time_help"/>
-	<check_box label="Sol Fijo" name="fixed_sun_check"/>
+	<check_box label="Fijar el Sol" name="fixed_sun_check"/>
 	<button label="?" name="fixed_sun_help"/>
 	<slider label="Fase" name="sun_hour_slider"/>
-	<check_box label="Permitir Acceso Público" name="externally_visible_check"/>
+	<check_box label="Permitir el acceso público" name="externally_visible_check"/>
 	<button label="?" name="externally_visible_help"/>
 	<text name="Only Allow">
-		Acceso Restringido para:
+		Permitir únicamente el acceso a los Residentes que:
 	</text>
-	<check_box label="Residentes con información de pago en Archivo" name="limit_payment" tool_tip="Prohibir residentes sin identificar"/>
-	<check_box label="Adultos con edad verificada" name="limit_age_verified" tool_tip="Prohibir residentes que no hayan verificado su edad. Ver support.secondlife.com para mayor información."/>
-	<check_box label="Permitir Chat de Voz" name="voice_chat_check"/>
+	<check_box label="Han aportado la información de pago." name="limit_payment" tool_tip="Para poder acceder a este estado los Residentes deben haber aportado información de pago en su cuenta. Para más información, ver support.secondlife.com."/>
+	<check_box label="Son mayores de 18 años" name="limit_age_verified" tool_tip="Para poder acceder a este estado, los Residentes deben ser mayores de 18 años. Para más información, consulta support.secondlife.com."/>
+	<check_box label="Permitir el chat de voz" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
-	<check_box label="Permitir Teleporte Directo" name="allow_direct_teleport"/>
+	<check_box label="Permitir el teleporte a cualquier punto" name="allow_direct_teleport"/>
 	<button label="?" name="allow_direct_teleport_help"/>
-	<text name="abuse_email_text">
-		Dirección de email par Reportes:
+	<text name="abuse_email_text" width="260">
+		Dirección de correo-e para infracciones:
 	</text>
 	<string name="email_unsupported">
-		Característica no soportada
+		Característica no disponible
 	</string>
 	<button label="?" name="abuse_email_address_help"/>
 	<button label="Aplicar" name="apply_btn"/>
-	<button label="Expulsar usuario del estado..." name="kick_user_from_estate_btn"/>
-	<button label="Enviar Mensaje al Estado..." name="message_estate_btn"/>
+	<button label="Expulsar a un Residente del estado..." name="kick_user_from_estate_btn"/>
+	<button label="Enviar un mensaje al estado..." name="message_estate_btn"/>
 	<text name="estate_manager_label">
-		Administradores del Estado:
+		Administradores del estado:
 	</text>
 	<button label="?" name="estate_manager_help"/>
 	<button label="Quitar..." name="remove_estate_manager_btn"/>
 	<button label="Añadir..." name="add_estate_manager_btn"/>
 	<text name="allow_resident_label">
-		Residentes Permitidos:
+		Residentes autorizados:
 	</text>
 	<button label="?" name="allow_resident_help"/>
 	<button label="Quitar..." name="remove_allowed_avatar_btn"/>
-	<button label="Add..." name="add_allowed_avatar_btn"/>
+	<button label="Añadir..." name="add_allowed_avatar_btn"/>
 	<text name="allow_group_label">
-		Grupos Permitidos:
+		Grupos autorizados:
 	</text>
 	<button label="?" name="allow_group_help"/>
 	<button label="Quitar..." name="remove_allowed_group_btn"/>
 	<button label="Añadir..." name="add_allowed_group_btn"/>
 	<text name="ban_resident_label">
-		Residentes Prohibidos:
+		Residentes con el acceso prohibido:
 	</text>
-	<button label="?" name="ban_resident_help"/>
+	<button label="?" name="ban_resident_help" right="476"/>
 	<button label="Quitar..." name="remove_banned_avatar_btn"/>
 	<button label="Añadir..." name="add_banned_avatar_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
index 8536e1d72..3b8734c90 100644
--- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Terreno" name="Terrain">
 	<text name="region_text_lbl">
 		Región:
@@ -6,22 +6,61 @@
 	<text name="region_text">
 		desconocida
 	</text>
-	<spinner label="Altura del Agua" name="water_height_spin"/>
-	<button label="?" name="water_height_help"/>
-	<spinner label="Límite de elevación del Terreno" label_width="120" name="terrain_raise_spin"/>
-	<button label="?" name="terrain_raise_help"/>
-	<spinner label="Límite de bajada del Terreno" label_width="120" name="terrain_lower_spin"/>
-	<button label="?" name="terrain_lower_help"/>
-	<check_box label="Usar Sol del Estado" name="use_estate_sun_check"/>
-	<button label="?" name="use_estate_sun_help"/>
-	<check_box label="Sol Fijo" name="fixed_sun_check"/>
-	<button label="?" name="fixed_sun_help"/>
-	<slider label="Fase" name="sun_hour_slider"/>
+	<spinner label="Nivel del agua" name="water_height_spin"/>
+	<spinner label="Límite de elevación
+del terreno" name="terrain_raise_spin"/>
+	<spinner bottom_delta="-34" label="Límite de bajada del
+terreno" name="terrain_lower_spin"/>
+	<text name="detail_texture_text">
+		Texturas del terreno
+	</text>
+	<text name="height_text_lbl">
+		1 (bajo)
+	</text>
+	<text name="height_text_lbl2">
+		2
+	</text>
+	<text name="height_text_lbl3">
+		3
+	</text>
+	<text name="height_text_lbl4">
+		4 (alto)
+	</text>
+	<text name="height_text_lbl5">
+		Intervalos de elevación de textura
+	</text>
+	<text name="height_text_lbl10">
+		Estos valores representan la gama
+de mezclas para las texturas anteriores.
+	</text>
+	<text name="height_text_lbl11">
+		El valor BAJA mide en metros
+la altura MÁXIMA de la textura n.º 1,
+y el valor ALTA es la altura
+MÍNIMA de la textura n.º 4.
+	</text>
+	<text name="height_text_lbl6">
+		Noroeste
+	</text>
+	<text name="height_text_lbl7">
+		Noreste
+	</text>
+	<spinner label="Bajo" name="height_start_spin_1"/>
+	<spinner label="Bajo" name="height_start_spin_3"/>
+	<spinner label="Alto" name="height_range_spin_1"/>
+	<spinner label="Alto" name="height_range_spin_3"/>
+	<text name="height_text_lbl8">
+		Suroeste
+	</text>
+	<text name="height_text_lbl9">
+		Sureste
+	</text>
+	<spinner label="Bajo" name="height_start_spin_0"/>
+	<spinner label="Bajo" name="height_start_spin_2"/>
+	<spinner label="Alto" name="height_range_spin_0"/>
+	<spinner label="Alto" name="height_range_spin_2"/>
+	<button label="Descargar el RAW del terreno..." name="download_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores" width="230"/>
+	<button label="Subir un RAW para el terreno..." name="upload_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores" width="230"/>
+	<button label="Predeterminar este terreno" name="bake_terrain_btn" tool_tip="Definir el terreno actual como punto medio para los límites de elevación/bajada" width="230"/>
 	<button label="Aplicar" name="apply_btn"/>
-	<button label="Descargar el RAW del terreno..." name="download_raw_btn" tool_tip="Disponible sólo para propietarios de estado, no para los administradores"/>
-	<button label="?" name="download_raw_help"/>
-	<button label="Subir un RAW de terreno..." name="upload_raw_btn" tool_tip="Disponible sólo para propietarios de estado, no para los administradores"/>
-	<button label="?" name="upload_raw_help"/>
-	<button label="Predeterminar Terreno" name="bake_terrain_btn" tool_tip="Definir el terreno actual como punto medio para los límites de elevación/bajada"/>
-	<button label="?" name="bake_terrain_help"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_texture.xml b/indra/newview/skins/default/xui/es/panel_region_texture.xml
deleted file mode 100644
index a72fb9f91..000000000
--- a/indra/newview/skins/default/xui/es/panel_region_texture.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Texturas del Terreno" name="Textures">
-	<text name="region_text_lbl">
-		Región:
-	</text>
-	<text name="region_text">
-		desconocida
-	</text>
-	<text name="detail_texture_text">
-		Texturas del Terreno
-	</text>
-	<text name="height_text_lbl">
-		1 (baja)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (Alta)
-	</text>
-	<text name="height_text_lbl5">
-		Rangos de elevación de la Textura
-	</text>
-	<text name="height_text_lbl6">
-		Suroeste
-	</text>
-	<text name="height_text_lbl7">
-		Noroeste
-	</text>
-	<text name="height_text_lbl8">
-		Sudeste
-	</text>
-	<text name="height_text_lbl9">
-		Noreste
-	</text>
-	<spinner label="Baja" name="height_start_spin_0"/>
-	<spinner label="Baja" name="height_start_spin_1"/>
-	<spinner label="Baja" name="height_start_spin_2"/>
-	<spinner label="Baja" name="height_start_spin_3"/>
-	<spinner label="Alta" name="height_range_spin_0"/>
-	<spinner label="Alta" name="height_range_spin_1"/>
-	<spinner label="Alta" name="height_range_spin_2"/>
-	<spinner label="Alta" name="height_range_spin_3"/>
-	<text name="height_text_lbl10">
-		Estos valores representan la gama de mezclas para las texturas superiores.
-	</text>
-	<text name="height_text_lbl11">
-		Medido en metros, el valor BAJA es la altura MÁXIMA de la textura #1,
-	</text>
-	<text name="height_text_lbl12">
-		y el valor ALTA es la altura MÍNIMA de la textura #4.
-	</text>
-	<button label="Aplicar" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_environment.xml b/indra/newview/skins/default/xui/fr/panel_region_environment.xml
new file mode 100644
index 000000000..33da189a6
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_region_environment.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Environnement" name="panel_env_info">
+	<text name="water_settings_title">
+		Sélectionnez les réglages d&apos;eau et de ciel/cycle du jour que vous souhaitez afficher pour tous les résidents visitant votre région. En savoir plus
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item name="use_sl_default_settings">Utiliser les réglages par défaut de Second Life</radio_item>
+		<radio_item name="use_my_settings">Utiliser les réglages suivants</radio_item>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="water_settings_title">
+			Réglage de l&apos;eau
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_item name="item0">-Effectuer une sélection-</combo_item>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			Ciel/Cycle du jour
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item name="my_sky_settings">Ciel fixe</radio_item>
+			<radio_item name="my_dayc_settings">Cycle du jour</radio_item>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_item name="item0">-Effectuer une sélection-</combo_item>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_item name="item0">-Effectuer une sélection-</combo_item>
+		</combo_box>
+	</panel>
+	<button label="Appliquer" name="apply_btn"/>
+	<button label="Annuler" name="cancel_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
index 277a79a23..0d1289b59 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
@@ -1,78 +1,76 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Domaine" name="Estate">
-	<text name="estate_help_text" bottom="-34">
-		Les changements apportés aux paramètres
-de cet onglet auront des répercussions sur
-toutes les régions du domaine.
+	<text bottom="-34" name="estate_help_text">
+		Les modifications des paramètres de cet onglet affecteront toutes les régions du domaine.
 	</text>
-	<text name="estate_text" bottom_delta="-34">
+	<text name="estate_text">
 		Domaine :
 	</text>
 	<text name="estate_name">
 		(inconnu)
 	</text>
 	<text name="owner_text">
-		Propriétaire :
+		Propriétaire :
 	</text>
 	<text name="estate_owner">
 		(inconnu)
 	</text>
 	<text name="Only Allow">
-		Limiter l'accès aux résidents qui:
+		Conditions d&apos;accès des résidents :
 	</text>
-	<check_box label="Ont enregistré leurs infos de paiement" name="limit_payment" tool_tip="Bannit les résidents non identifés."/>
-	<check_box label="Ont fait vérifier leur âge" name="limit_age_verified" tool_tip="Bannit les résidents dont l'âge n'a pas été vérifié. Pour plus d'infos, consultez la page support.secondlife.com."/>
+	<check_box label="Informations de paiement enregistrées" name="limit_payment" tool_tip="Pour pouvoir accéder à ce domaine, les résidents doivent avoir enregistré des informations de paiement. Consultez le support.secondlife.com pour plus d&apos;informations."/>
+	<check_box label="Avoir plus de 18 ans" name="limit_age_verified" tool_tip="Pour accéder à ce domaine, les résidents doivent avoir au moins 18 ans. Consultez le support.secondlife.com pour plus d&apos;informations."/>
 	<check_box label="Autoriser les chats vocaux" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<text name="abuse_email_text">
-		E-mail où signaler l'infraction:
+		E-mail où signaler l&apos;infraction :
 	</text>
 	<string name="email_unsupported">
 		Non pris en charge
 	</string>
 	<button label="?" name="abuse_email_address_help"/>
 	<text name="estate_manager_label">
-		Gérants du domaine:
+		Gérants du domaine :
 	</text>
 	<button label="?" name="estate_manager_help"/>
-	<button label="Ajouter" name="add_estate_manager_btn"/>
-	<button label="Supprimer" name="remove_estate_manager_btn"/>
+	<button label="Ajouter..." name="add_estate_manager_btn"/>
+	<button label="Supprimer..." name="remove_estate_manager_btn"/>
 	<check_box label="Utiliser le temps universel" name="use_global_time_check"/>
 	<button label="?" name="use_global_time_help"/>
 	<check_box label="Soleil fixe" name="fixed_sun_check"/>
 	<button label="?" name="fixed_sun_help"/>
 	<slider label="Phase" name="sun_hour_slider"/>
-	<check_box label="Autoriser l'accès public" name="externally_visible_check"/>
+	<check_box label="Autoriser l&apos;accès public" name="externally_visible_check"/>
 	<button label="?" name="externally_visible_help"/>
 	<check_box label="Vue sur le continent" name="mainland_visible_check"/>
 	<button label="?" name="mainland_visible_help"/>
 	<check_box label="Autoriser la téléportation directe" name="allow_direct_teleport"/>
 	<button label="?" name="allow_direct_teleport_help"/>
 	<text name="region_text_lbl">
-		Refuser l'accès selon les infos de paiement:
+		Refuser l&apos;accès selon les infos de paiement :
 	</text>
 	<check_box label="Refuser sans infos de paiement enregistrées" name="deny_anonymous"/>
 	<check_box label="Refuser avec infos de paiement enregistrées" name="deny_identified"/>
 	<check_box label="Refuser avec infos de paiement utilisées" name="deny_transacted"/>
 	<button label="Appliquer" name="apply_btn"/>
 	<text name="allow_resident_label">
-		Résidents autorisés:
+		Résidents autorisés :
 	</text>
 	<button label="?" name="allow_resident_help"/>
-	<button label="Ajouter" name="add_allowed_avatar_btn"/>
-	<button label="Supprimer" name="remove_allowed_avatar_btn"/>
+	<button label="Ajouter..." name="add_allowed_avatar_btn"/>
+	<button label="Supprimer..." name="remove_allowed_avatar_btn"/>
 	<text name="allow_group_label">
-		Groupes autorisés:
+		Groupes autorisés :
 	</text>
 	<button label="?" name="allow_group_help"/>
-	<button label="Ajouter" name="add_allowed_group_btn"/>
-	<button label="Supprimer" name="remove_allowed_group_btn"/>
+	<button label="Ajouter..." name="add_allowed_group_btn"/>
+	<button label="Supprimer..." name="remove_allowed_group_btn"/>
 	<text name="ban_resident_label">
-		Résidents bannis:
+		Résidents bannis :
 	</text>
 	<button label="?" name="ban_resident_help"/>
-	<button label="Ajouter" name="add_banned_avatar_btn"/>
-	<button label="Supprimer" name="remove_banned_avatar_btn"/>
-	<button label="Envoyer un message au domaine" name="message_estate_btn"/>
-	<button label="Éjecter le résident du domaine" name="kick_user_from_estate_btn"/>
+	<button label="Ajouter..." name="add_banned_avatar_btn"/>
+	<button label="Supprimer..." name="remove_banned_avatar_btn"/>
+	<button label="Message au domaine..." name="message_estate_btn"/>
+	<button label="Éjecter du domaine..." name="kick_user_from_estate_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
index a08860391..2fdab61e0 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
@@ -1,27 +1,66 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Terrain" name="Terrain">
 	<text name="region_text_lbl">
-		Région:
+		Région :
 	</text>
 	<text name="region_text">
 		(inconnue)
 	</text>
-	<spinner label="Niveau de l'eau" name="water_height_spin"/>
-	<button label="?" name="water_height_help"/>
-	<spinner label="Limite d'élévation du &#10;terrain" name="terrain_raise_spin"/>
-	<button label="?" name="terrain_raise_help"/>
-	<spinner label="Limite d'abaissement &#10;du terrain" name="terrain_lower_spin" bottom_delta="-34"/>
-	<button label="?" name="terrain_lower_help"/>
-	<check_box label="Utiliser le soleil du domaine" name="use_estate_sun_check"/>
-	<button label="?" name="use_estate_sun_help"/>
-	<check_box label="Soleil fixe" name="fixed_sun_check"/>
-	<button label="?" name="fixed_sun_help"/>
-	<slider label="Phase" name="sun_hour_slider"/>
+	<spinner label="Niveau de l&apos;eau" name="water_height_spin"/>
+	<spinner label="Limite d&apos;élévation du
+terrain" name="terrain_raise_spin"/>
+	<spinner bottom_delta="-34" label="Limite d&apos;abaissement
+du terrain" name="terrain_lower_spin"/>
+	<text name="detail_texture_text">
+		Textures du terrain
+	</text>
+	<text name="height_text_lbl">
+		1 (Bas)
+	</text>
+	<text name="height_text_lbl2">
+		2
+	</text>
+	<text name="height_text_lbl3">
+		3
+	</text>
+	<text name="height_text_lbl4">
+		4 (Haut)
+	</text>
+	<text name="height_text_lbl5">
+		Limites d&apos;élévation de texture
+	</text>
+	<text name="height_text_lbl10">
+		Ces valeurs représentent les limites
+de mélange pour les textures ci-dessus.
+	</text>
+	<text name="height_text_lbl11">
+		En mètres, la valeur BAS
+correspond à la hauteur MAXIMUM de la texture n°1
+et la valeur HAUT à la hauteur
+MINIMUM de la texture n°4.
+	</text>
+	<text name="height_text_lbl6">
+		Nord-ouest
+	</text>
+	<text name="height_text_lbl7">
+		Nord-est
+	</text>
+	<spinner label="Bas" name="height_start_spin_1"/>
+	<spinner label="Bas" name="height_start_spin_3"/>
+	<spinner label="Haut" name="height_range_spin_1"/>
+	<spinner label="Haut" name="height_range_spin_3"/>
+	<text name="height_text_lbl8">
+		Sud-ouest
+	</text>
+	<text name="height_text_lbl9">
+		Sud-est
+	</text>
+	<spinner label="Bas" name="height_start_spin_0"/>
+	<spinner label="Bas" name="height_start_spin_2"/>
+	<spinner label="Haut" name="height_range_spin_0"/>
+	<spinner label="Haut" name="height_range_spin_2"/>
+	<button label="Télécharger le terrain en RAW..." name="download_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
+	<button label="Charger un terrain en RAW..." name="upload_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
+	<button label="Figer le terrain" name="bake_terrain_btn" tool_tip="Définir le terrain actuel comme point central pour les limites d&apos;élévation/abaissement"/>
 	<button label="Appliquer" name="apply_btn"/>
-	<button label="Télécharger le terrain au format RAW" name="download_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
-	<button label="?" name="download_raw_help" left="246" />
-	<button label="Charger le terrain au format RAW" name="upload_raw_btn" tool_tip="Réservé aux propriétaires du domaine, pas aux gérants" width="230"/>
-	<button label="?" name="upload_raw_help" left="246" />
-	<button label="Figer le terrain" name="bake_terrain_btn" tool_tip="Définir le terrain actuel comme point central pour les limites d'élévation/abaissement"/>
-	<button label="?" name="bake_terrain_help"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_texture.xml b/indra/newview/skins/default/xui/fr/panel_region_texture.xml
deleted file mode 100644
index e5df6b1e1..000000000
--- a/indra/newview/skins/default/xui/fr/panel_region_texture.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Textures du sol" name="Textures">
-	<text name="region_text_lbl">
-		Région :
-	</text>
-	<text name="region_text">
-		(inconnue)
-	</text>
-	<text name="height_text_lbl">
-		1 (faible)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (élevé)
-	</text>
-	<text name="detail_texture_text">
-		Textures du terrain
-	</text>
-	<text name="height_text_lbl5">
-		Limites d&apos;élévation de texture
-	</text>
-	<text name="height_text_lbl6">
-		Sud-ouest
-	</text>
-	<text name="height_text_lbl7">
-		Nord-ouest
-	</text>
-	<text name="height_text_lbl8">
-		Sud-est
-	</text>
-	<text name="height_text_lbl9">
-		Nord-est
-	</text>
-	<text name="height_text_lbl10">
-		Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
-	</text>
-	<text name="height_text_lbl11">
-		En mètres, la valeur Bas correspond à la hauteur maximum de la texture n°1
-	</text>
-	<text name="height_text_lbl12">
-		et la valeur Haut correspond à la hauteur minimum de la texture n°4.
-	</text>
-	<text name="height_text_lbl13">
-		Nord-est
-	</text>
-	<spinner label="Bas" name="height_start_spin_0" />
-	<spinner label="Bas" name="height_start_spin_1" />
-	<spinner label="Bas" name="height_start_spin_2" />
-	<spinner label="Bas" name="height_start_spin_3" />
-	<spinner label="Haut" name="height_range_spin_0" />
-	<spinner label="Haut" name="height_range_spin_1" />
-	<spinner label="Haut" name="height_range_spin_2" />
-	<spinner label="Haut" name="height_range_spin_3" />
-	<text name="height_text_lbl14">
-		Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
-	</text>
-	<text name="height_text_lbl15">
-		En mètres, la valeur BASSE correspond à la hauteur MAXIMUM de la Texture #1,
-	</text>
-	<text name="height_text_lbl16">
-		et la valeur HAUTE correspond à la hauteur MINIMUM de la Texture #4.
-	</text>
-	<button label="Appliquer" name="apply_btn" />
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_environment.xml b/indra/newview/skins/default/xui/pt/panel_region_environment.xml
new file mode 100644
index 000000000..1fef45a2c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_region_environment.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Ambiente" name="panel_env_info">
+	<text name="water_settings_title">
+		Selecione as configurações de Água e céu / Ciclo dos dias que todos os visitantes à sua região verão.  Mais informações
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item name="use_sl_default_settings">Usar o padrão do Second Life</radio_item>
+		<radio_item name="use_my_settings">Usar as seguintes configurações</radio_item>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="water_settings_title">
+			Configuração de água
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_item name="item0">-Selecione uma pré-configuração-</combo_item>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			Ciclo céu / dia
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item name="my_sky_settings">Céu fixo</radio_item>
+			<radio_item name="my_dayc_settings">Ciclo dia</radio_item>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_item name="item0">-Selecione uma pré-configuração-</combo_item>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_item name="item0">-Selecione uma pré-configuração-</combo_item>
+		</combo_box>
+	</panel>
+	<button label="Aplicar" name="apply_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index f43402be1..135d1d951 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Propriedade" name="Estate">
 	<text name="estate_help_text">
-		Mudanças nas definições nesta guia irão afetar
-todas as regiões desta propriedade.
+		Mudar as opções desta guia afeta todas as regiões desta propriedade.
 	</text>
 	<text name="estate_text">
 		Propriedade:
@@ -11,7 +10,7 @@ todas as regiões desta propriedade.
 		(desconhecido)
 	</text>
 	<text name="owner_text">
-		Proprietário:
+		Proprietário do imóvel:
 	</text>
 	<text name="estate_owner">
 		(desconhecido)
@@ -24,10 +23,10 @@ todas as regiões desta propriedade.
 	<check_box label="Permitir acesso público" name="externally_visible_check"/>
 	<button label="?" name="externally_visible_help"/>
 	<text name="Only Allow">
-		Acesso restrito a Residentes...
+		Permitir acesso apenas para residentes que:
 	</text>
-	<check_box label="com info. de pagamento em arquivo" name="limit_payment" tool_tip="Banir residentes não identificados."/>
-	<check_box label="Adultos com idade verificada" name="limit_age_verified" tool_tip="Banir residentes que não tenham confirmado a sua idade. Ver support.secondlife.com para mais informações."/>
+	<check_box label="Dados de pagamento constam no registro." name="limit_payment" tool_tip="Propriedade de acesso restrito a residentes que já cadastraram seus dados de pagamento  Consulte o support.secondlife.com para saber mais."/>
+	<check_box label="Tem 18 anos ou mais" name="limit_age_verified" tool_tip="Os residentes devem ter 18 anos ou mais para acessar esta propriedade. Consulte o support.secondlife.com para obter mais informações."/>
 	<check_box label="Permitir conversa de voz" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Permitir Tele-transporte direto" name="allow_direct_teleport"/>
@@ -40,7 +39,7 @@ todas as regiões desta propriedade.
 	</string>
 	<button label="?" name="abuse_email_address_help"/>
 	<button label="Aplicar" name="apply_btn"/>
-	<button label="Chutar usuário da propriedade..." name="kick_user_from_estate_btn"/>
+	<button label="Expulsar da propriedade..." name="kick_user_from_estate_btn"/>
 	<button label="Enviar mensagem à Propriedade" name="message_estate_btn"/>
 	<text name="estate_manager_label">
 		Gerentes da propriedade:
diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
index b9b0e9d90..2ac32992c 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
@@ -7,21 +7,60 @@
 		nenhum
 	</text>
 	<spinner label="Altura da água" name="water_height_spin"/>
-	<button label="?" name="water_height_help"/>
-	<spinner label="Limite do aumento do &#10;terreno" name="terrain_raise_spin"/>
-	<button label="?" name="terrain_raise_help"/>
-	<spinner label="Limite mais baixo do &#10;terreno" name="terrain_lower_spin" bottom_delta="-34"/>
-	<button label="?" name="terrain_lower_help"/>
-	<check_box label="Usar o sol da propriedade" name="use_estate_sun_check"/>
-	<button label="?" name="use_estate_sun_help"/>
-	<check_box label="Sol fixo" name="fixed_sun_check"/>
-	<button label="?" name="fixed_sun_help"/>
-	<slider label="Fase" name="sun_hour_slider"/>
-	<button label="Aplicar" name="apply_btn"/>
+	<spinner label="Limite do aumento do
+terreno" name="terrain_raise_spin"/>
+	<spinner bottom_delta="-34" label="Limite mais baixo do
+terreno" name="terrain_lower_spin"/>
+	<text name="detail_texture_text">
+		Texturas de terreno
+	</text>
+	<text name="height_text_lbl">
+		1 (Baixo)
+	</text>
+	<text name="height_text_lbl2">
+		2
+	</text>
+	<text name="height_text_lbl3">
+		3
+	</text>
+	<text name="height_text_lbl4">
+		4 (Alto)
+	</text>
+	<text name="height_text_lbl5">
+		Intervalos de elevação de textura
+	</text>
+	<text name="height_text_lbl10">
+		Os valores representam o intervalo
+de mistura das texturas acima.
+	</text>
+	<text name="height_text_lbl11">
+		Em metros, o valor BAIXO
+é a altura MÁXIMA da Textura 1,
+e HIGH é a
+altura MÍNIMA da Textura 4.
+	</text>
+	<text name="height_text_lbl6">
+		Noroeste
+	</text>
+	<text name="height_text_lbl7">
+		Nordeste
+	</text>
+	<spinner label="Baixo" name="height_start_spin_1"/>
+	<spinner label="Baixo" name="height_start_spin_3"/>
+	<spinner label="Alto" name="height_range_spin_1"/>
+	<spinner label="Alto" name="height_range_spin_3"/>
+	<text name="height_text_lbl8">
+		Sudoeste
+	</text>
+	<text name="height_text_lbl9">
+		Sudeste
+	</text>
+	<spinner label="Baixo" name="height_start_spin_0"/>
+	<spinner label="Baixo" name="height_start_spin_2"/>
+	<spinner label="Alto" name="height_range_spin_0"/>
+	<spinner label="Alto" name="height_range_spin_2"/>
 	<button label="Download de terreno RAW..." name="download_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários."/>
-	<button label="?" name="download_raw_help"/>
 	<button label="Upload de terreno RAW..." name="upload_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários."/>
-	<button label="?" name="upload_raw_help"/>
-	<button width="170" label="Nivelar o terreno" name="bake_terrain_btn" tool_tip="Ajustar terreno atual como o ponto médio para os limites de aumento/decréscimo"/>
-	<button left="190" label="?" name="bake_terrain_help"/>
+	<button label="Nivelar o terreno" name="bake_terrain_btn" tool_tip="Ajustar terreno atual como o ponto médio para os limites de aumento/decréscimo" width="170"/>
+	<button label="Aplicar" name="apply_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_texture.xml b/indra/newview/skins/default/xui/pt/panel_region_texture.xml
deleted file mode 100644
index 4787b59a8..000000000
--- a/indra/newview/skins/default/xui/pt/panel_region_texture.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Texturas de Chão" name="Textures">
-	<text name="region_text_lbl">
-		Região:
-	</text>
-	<text name="region_text">
-		desconhecido
-	</text>
-	<text name="detail_texture_text" width="380">
-		Texturas de Terreno (requer 512x512, arquivos 24 bit .tga )
-	</text>
-	<text name="height_text_lbl">
-		1 (baixo)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (alto)
-	</text>
-	<text name="height_text_lbl5">
-		Escalas de Elevação de Terreno
-	</text>
-	<text name="height_text_lbl6">
-		Sudeste
-	</text>
-	<text name="height_text_lbl7">
-		Noroeste
-	</text>
-	<text name="height_text_lbl8">
-		Sudoeste
-	</text>
-	<text name="height_text_lbl9">
-		Noroeste
-	</text>
-	<spinner label="Baixo" name="height_start_spin_0" />
-	<spinner label="Baixo" name="height_start_spin_1" />
-	<spinner label="Baixo" name="height_start_spin_2" />
-	<spinner label="Baixo" name="height_start_spin_3" />
-	<spinner label="Alto" name="height_range_spin_0" />
-	<spinner label="Alto" name="height_range_spin_1" />
-	<spinner label="Alto" name="height_range_spin_2" />
-	<spinner label="Alto" name="height_range_spin_3" />
-	<text name="height_text_lbl10">
-		Estes valores respresentam o tipo de escala para as texturas acima.
-	</text>
-	<text name="height_text_lbl11">
-		Medido em metros, o valor Baixo é a altura máxima da Textura #1,
-	</text>
-	<text name="height_text_lbl12">
-		e o valor Alto é a altura Mínima da Textura #4.
-	</text>
-	<button label="Aplicar" name="apply_btn" />
-</panel>