From 79f6883bdfaf910bad4c10fddd7c7f9597a76339 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 3 Mar 2013 14:48:03 -0500
Subject: [PATCH] [Issue 662] Translations retouch

Fixes overlaps and text running out of boundaries.
---
 .../default/xui/es/panel_region_environment.xml |  3 ++-
 .../default/xui/es/panel_region_terrain.xml     | 17 ++++++++++-------
 .../default/xui/fr/panel_region_environment.xml |  3 ++-
 .../default/xui/fr/panel_region_terrain.xml     | 17 ++++++++++-------
 .../default/xui/pt/panel_region_environment.xml |  3 ++-
 .../default/xui/pt/panel_region_terrain.xml     | 17 ++++++++++-------
 6 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/indra/newview/skins/default/xui/es/panel_region_environment.xml b/indra/newview/skins/default/xui/es/panel_region_environment.xml
index ed5d3c20e..b80397939 100644
--- a/indra/newview/skins/default/xui/es/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_environment.xml
@@ -1,7 +1,8 @@
 <?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
+		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>
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 3b8734c90..77a9ea551 100644
--- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
@@ -7,10 +7,10 @@
 		desconocida
 	</text>
 	<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"/>
+	<spinner label="Límite de elevación del terreno" name="terrain_raise_spin" label_width="150" width="210" left="220"/>
+	<button name="terrain_raise_help" left_delta="210"/>
+	<spinner label="Límite de bajada del terreno" name="terrain_lower_spin" label_width="150" width="210" left="220"/>
+	<button name="terrain_lower_help" left_delta="210"/>
 	<text name="detail_texture_text">
 		Texturas del terreno
 	</text>
@@ -59,8 +59,11 @@ MÍNIMA de la textura n.º 4.
 	<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="Descargar el RAW del terreno..." name="download_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores" width="180"/>
+	<button name="download_raw_help" left_delta="180"/>
+	<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="180" left_delta="-180" bottom_delta="-20"/>
+	<button name="upload_raw_help" left_delta="180"/>
+	<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="180" left_delta="50" bottom_delta="20"/>
+	<button name="bake_terrain_help" left_delta="180"/>
 	<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
index 33da189a6..3c108079e 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_environment.xml
@@ -1,7 +1,8 @@
 <?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
+		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>
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 2fdab61e0..77f553692 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
@@ -7,10 +7,10 @@
 		(inconnue)
 	</text>
 	<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"/>
+	<spinner label="Limite d&apos;élévation du terrain" name="terrain_raise_spin" label_width="160" width="220" left="220"/>
+	<button name="terrain_raise_help" left_delta="220"/>
+	<spinner label="Limite d&apos;abaissement du terrain" name="terrain_lower_spin" label_width="160" width="220" left="220"/>
+	<button name="terrain_lower_help" left_delta="220"/>
 	<text name="detail_texture_text">
 		Textures du terrain
 	</text>
@@ -59,8 +59,11 @@ MINIMUM de la texture n°4.
 	<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="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="180"/>
+	<button name="download_raw_help" left_delta="180"/>
+	<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="180" left_delta="-180" bottom_delta="-20"/>
+	<button name="upload_raw_help" left_delta="180"/>
+	<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" width="180" left_delta="50" bottom_delta="20"/>
+	<button name="bake_terrain_help" left_delta="180"/>
 	<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
index 1fef45a2c..073dad425 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_environment.xml
@@ -1,7 +1,8 @@
 <?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
+		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>
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 2ac32992c..290a6e446 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
@@ -7,10 +7,10 @@
 		nenhum
 	</text>
 	<spinner label="Altura da água" name="water_height_spin"/>
-	<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"/>
+	<spinner label="Limite do aumento do terreno" name="terrain_raise_spin" label_width="150" width="210" left="220"/>
+	<button name="terrain_raise_help" left_delta="210"/>
+	<spinner label="Limite mais baixo do terreno" name="terrain_lower_spin" label_width="150" width="210" left="220"/>
+	<button name="terrain_lower_help" left_delta="210"/>
 	<text name="detail_texture_text">
 		Texturas de terreno
 	</text>
@@ -59,8 +59,11 @@ altura MÍNIMA da Textura 4.
 	<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="Upload de terreno RAW..." name="upload_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários."/>
-	<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="Download de terreno RAW..." name="download_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários." width="180"/>
+	<button name="download_raw_help" left_delta="180"/>
+	<button label="Upload de terreno RAW..." name="upload_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários." width="180" left_delta="-180" bottom_delta="-20"/>
+	<button name="upload_raw_help" left_delta="180"/>
+	<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="180" left_delta="50" bottom_delta="20"/>
+	<button name="bake_terrain_help" left_delta="180"/>
 	<button label="Aplicar" name="apply_btn"/>
 </panel>