From caa3e5acd4ee321e46fb7cffa9edf381a6c894ff Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 12 Jan 2015 21:13:17 +0100
Subject: [PATCH] Fix the tools floater layout

---
 indra/newview/skins/default/xui/de/floater_tools.xml      | 3 ---
 indra/newview/skins/default/xui/en/floater_tools.xml      | 4 ++--
 indra/newview/skins/default/xui/fr/floater_tools.xml      | 4 ----
 indra/newview/skins/default/xui/it/floater_tools.xml      | 3 ---
 indra/newview/skins/default/xui/pt/floater_tools.xml      | 3 ---
 indra/newview/skins/default/xui/ru/floater_tools.xml      | 4 +---
 indra/newview/skins/default/xui/tr/floater_tools.xml      | 4 +---
 indra/newview/skins/default/xui/zh/floater_tools.xml      | 4 +---
 indra/newview/skins/starlight/xui/en/floater_tools.xml    | 4 +++-
 indra/newview/skins/starlightcui/xui/en/floater_tools.xml | 4 +++-
 indra/newview/skins/vintage/xui/en/floater_tools.xml      | 4 ++--
 11 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index b856288667..63aadea460 100755
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -91,9 +91,6 @@
 	<text name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für dieses Objekt">
 		þ: [COUNT]
 	</text>
-	<text label="Beide Seiten dehnen" name="checkbox uniform label">
-		Beide Seiten dehnen
-	</text>
 	<check_box name="checkbox uniform" label="Beide Seiten dehnen"/>
 	<check_box initial_value="true" label="Texturen dehnen" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="An Raster ausrichten" name="checkbox snap to grid"/>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index b5b8f1d379..56d683dfc0 100755
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -158,7 +158,7 @@
 	     parameter="Land" />
 	</button>
     <text
-     height="20"
+     height="30"
      word_wrap="true"
      use_ellipses="true"
      type="string"
@@ -364,7 +364,7 @@
      name="checkbox uniform"
      top="48"
      label_text.wrap="true"
-     label_text.width="100"
+     label_text.width="120"
      width="134" />
     <check_box
      control_name="ScaleStretchTextures"
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index b00fe146d5..fea710ef80 100755
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -76,10 +76,6 @@
 	<text name="RenderingCost" tool_tip="Affiche le coût du rendu calculé pour cet objet">
 		þ : [COUNT]
 	</text>
-	<check_box label="" name="checkbox uniform"/>
-	<text label="Étirer les deux côtés" name="checkbox uniform label">
-		Étirer les deux côtés
-	</text>
 	<check_box label="Étirer les deux côtés" name="checkbox uniform"/>
 	<check_box initial_value="true" label="Étirer les textures" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="Fixer" name="checkbox snap to grid"/>
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index 05e8c426f5..0a24895efd 100755
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -75,9 +75,6 @@
 	<text name="RenderingCost" tool_tip="Mostra il costo di rendering calcolato per questo oggetto">
 		þ: [COUNT]
 	</text>
-	<text label="Allunga entrambi i lati" name="checkbox uniform label">
-		Allunga entrambi i lati
-	</text>
 	<check_box label="Stendi ambedue lati" name="checkbox uniform"/>
 	<check_box initial_value="true" label="Ridimensiona le texture" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="Scatto" name="checkbox snap to grid"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index e45e977c0e..757964c3ce 100755
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -75,9 +75,6 @@
 	<text name="RenderingCost" tool_tip="Mostra o cálculo do custo de renderização do objeto">
 		þ: [COUNT]
 	</text>
-	<text label="Esticar ambos lados" name="checkbox uniform label">
-		Esticar ambos lados
-	</text>
 	<check_box label="Esticar ambos lados" name="checkbox uniform"/>
 	<check_box initial_value="true" label="Esticar texturas" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="Ajustar" name="checkbox snap to grid"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_tools.xml b/indra/newview/skins/default/xui/ru/floater_tools.xml
index 35921d147f..47546e6d04 100755
--- a/indra/newview/skins/default/xui/ru/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ru/floater_tools.xml
@@ -73,9 +73,7 @@
 	<check_box label="Редактировать объединенные" name="checkbox edit linked parts"/>
 	<button label="Объединить" name="link_btn"/>
 	<button label="Разъединить" name="unlink_btn"/>
-	<text label="Растяжка обеих сторон" name="checkbox uniform label">
-		Растяжка обеих сторон
-	</text>
+	<check_box label="Растяжка обеих сторон" name="checkbox uniform"/>
 	<check_box initial_value="true" label="Растягивать текстуры" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="Привязка" name="checkbox snap to grid"/>
 	<combo_box name="combobox grid mode" tool_tip="Выберите тип линейки сетки для размещения объекта">
diff --git a/indra/newview/skins/default/xui/tr/floater_tools.xml b/indra/newview/skins/default/xui/tr/floater_tools.xml
index 39a3569efa..3410300445 100755
--- a/indra/newview/skins/default/xui/tr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/tr/floater_tools.xml
@@ -73,9 +73,7 @@
 	<check_box label="Bağlantılıları düzenle" name="checkbox edit linked parts"/>
 	<button label="Bağla" name="link_btn"/>
 	<button label="Bağlantıyı Kopar" name="unlink_btn"/>
-	<text label="Her İki Tarafı Uzat" name="checkbox uniform label">
-		Her İki Tarafı Uzat
-	</text>
+	<check_box label="Her İki Tarafı Uzat" name="checkbox uniform"/>
 	<check_box initial_value="true" label="Dokuları Uzat" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="Yasla" name="checkbox snap to grid"/>
 	<combo_box name="combobox grid mode" tool_tip="Nesneyi konumlandırmak için ağ cetvelini seçin">
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index 7e6c972f40..ee9ba94fb8 100755
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -73,9 +73,7 @@
 	<check_box label="編輯聯結部分" name="checkbox edit linked parts"/>
 	<button label="聯結" name="link_btn"/>
 	<button label="取消聯結" name="unlink_btn"/>
-	<text label="同時伸展兩側" name="checkbox uniform label">
-		同時伸展兩側
-	</text>
+	<techeck_boxxt label="同時伸展兩側" name="checkbox uniform label"/>
 	<check_box initial_value="true" label="伸展材質" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="Snap" name="checkbox snap to grid"/>
 	<combo_box name="combobox grid mode" tool_tip="選擇物件定位參考的格線尺度類型">
diff --git a/indra/newview/skins/starlight/xui/en/floater_tools.xml b/indra/newview/skins/starlight/xui/en/floater_tools.xml
index 066adcb526..5cb23a2649 100644
--- a/indra/newview/skins/starlight/xui/en/floater_tools.xml
+++ b/indra/newview/skins/starlight/xui/en/floater_tools.xml
@@ -361,7 +361,9 @@
      left="143"
      name="checkbox uniform"
      top="48"
-     width="20" />
+     label_text.wrap="true"
+     label_text.width="120"
+     width="134" />
     <check_box
      control_name="ScaleStretchTextures"
      height="19"
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_tools.xml b/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
index e8affb8342..64c8a23c4d 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
@@ -361,7 +361,9 @@
      left="143"
      name="checkbox uniform"
      top="48"
-     width="20" />
+     label_text.wrap="true"
+     label_text.width="120"
+     width="134" />
     <check_box
      control_name="ScaleStretchTextures"
      height="19"
diff --git a/indra/newview/skins/vintage/xui/en/floater_tools.xml b/indra/newview/skins/vintage/xui/en/floater_tools.xml
index 6cefb1e2d9..49e76591c9 100755
--- a/indra/newview/skins/vintage/xui/en/floater_tools.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_tools.xml
@@ -158,7 +158,7 @@
 	     parameter="Land" />
 	</button>
     <text
-     height="20"
+     height="30"
      word_wrap="true"
      use_ellipses="true"
      type="string"
@@ -364,7 +364,7 @@
      name="checkbox uniform"
      top="48"
      label_text.wrap="true"
-     label_text.width="100"
+     label_text.width="120"
      width="134" />
     <check_box
      control_name="ScaleStretchTextures"