Sync up with a number of SVN changes that snuck in via weird merges

4 files changed, 63 insertions, 62 deletions

diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml
index 8ce113514b..8e21f225ca 100755
--- a/indra/newview/skins/default/xui/pl/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml
@@ -3,6 +3,7 @@
   <check_box name="enable_joystick">
 		Aktywuj Joystick:
 	</check_box>
+	<text left="130" name="joystick_type" width="360"/>
   <spinner label="Kalibracja Osi X" left="20" width="170" label_width="130"  name="JoystickAxis1"/>
   <spinner label="Kalibracja Osi Y" left="210" width="170" label_width="130" name="JoystickAxis2" />
   <spinner label="Kalibracja Osi Z" left="400" width="170" label_width="130" name="JoystickAxis0" />
@@ -13,104 +14,104 @@
   <check_box label="Bezpośrednie" left="205" name="ZoomDirect" />
   <check_box label="Kursor 3D" left="340" name="Cursor3D" />
   <check_box label="Automatyczne" left="450" name="AutoLeveling" />
-  <text length="1" left="42" name="Control Modes:" type="string">
+  <text length="1" left="22" name="Control Modes:" type="string">
 		Kontroluj:
 	</text>
-  <check_box left="150" width="90" name="JoystickAvatarEnabled">
+  <check_box left="130" width="90" name="JoystickAvatarEnabled">
 		Awatara
 	</check_box>
-  <check_box left="249" width="90" name="JoystickBuildEnabled">
+  <check_box left="205" width="90" name="JoystickBuildEnabled">
 		Budowanie
 	</check_box>
-  <check_box left="340" width="90" name="JoystickFlycamEnabled">
+  <check_box left="282" width="90" name="JoystickFlycamEnabled">
 		Kamerę podczas latania
 	</check_box>
-  <text width="124" name="XScale">
+  <text width="104" name="XScale">
 		Skala X
 	</text>
-  <spinner left="153" name="AvatarAxisScale1" />
-  <spinner left="218" name="BuildAxisScale1" />
+  <spinner left="133" name="AvatarAxisScale1" />
+  <spinner left="208" name="BuildAxisScale1" />
   <spinner left="283" name="FlycamAxisScale1" />
-  <text width="124" name="YScale">
+  <text width="104" name="YScale">
 		Skala Y
 	</text>
-  <spinner left="153" name="AvatarAxisScale2" />
-  <spinner left="218" name="BuildAxisScale2" />
+  <spinner left="133" name="AvatarAxisScale2" />
+  <spinner left="208" name="BuildAxisScale2" />
   <spinner left="283" name="FlycamAxisScale2" />
-  <text width="124" name="ZScale">
+  <text width="104" name="ZScale">
 		Skala Z
 	</text>
-  <spinner left="153" name="AvatarAxisScale0" />
-  <spinner left="218" name="BuildAxisScale0" />
+  <spinner left="133" name="AvatarAxisScale0" />
+  <spinner left="208" name="BuildAxisScale0" />
   <spinner left="283" name="FlycamAxisScale0" />
-  <text width="124" name="PitchScale">
+  <text width="104" name="PitchScale">
 		Skala Wznoszenia
 	</text>
-  <spinner left="153" name="AvatarAxisScale4" />
-  <spinner left="218" name="BuildAxisScale4" />
+  <spinner left="133" name="AvatarAxisScale4" />
+  <spinner left="208" name="BuildAxisScale4" />
   <spinner left="283" name="FlycamAxisScale4" />
-  <text width="124" name="YawScale">
+  <text width="104" name="YawScale">
 		Skala Odchylania
 	</text>
-  <spinner left="153" name="AvatarAxisScale5" />
-  <spinner left="218" name="BuildAxisScale5" />
+  <spinner left="133" name="AvatarAxisScale5" />
+  <spinner left="208" name="BuildAxisScale5" />
   <spinner left="283" name="FlycamAxisScale5" />
-  <text width="124" name="RollScale">
+  <text width="104" name="RollScale">
 		Skala Obrotu
 	</text>
-  <spinner left="218" name="BuildAxisScale3" />
+  <spinner left="208" name="BuildAxisScale3" />
   <spinner left="283" name="FlycamAxisScale3" />
-  <text width="124" name="XDeadZone">
+  <text width="104" name="XDeadZone">
 		Tolerancja Osi X
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone1" />
-  <spinner left="218" name="BuildAxisDeadZone1" />
+  <spinner left="133" name="AvatarAxisDeadZone1" />
+  <spinner left="208" name="BuildAxisDeadZone1" />
   <spinner left="283" name="FlycamAxisDeadZone1" />
-  <text width="124" name="YDeadZone">
+  <text width="104" name="YDeadZone">
 		Tolerancja Osi Y
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone2" />
-  <spinner left="218" name="BuildAxisDeadZone2" />
+  <spinner left="133" name="AvatarAxisDeadZone2" />
+  <spinner left="208" name="BuildAxisDeadZone2" />
   <spinner left="283" name="FlycamAxisDeadZone2" />
-  <text width="124" name="ZDeadZone">
+  <text width="104" name="ZDeadZone">
 		Tolerancja Osi Z
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone0" />
-  <spinner left="218" name="BuildAxisDeadZone0" />
+  <spinner left="133" name="AvatarAxisDeadZone0" />
+  <spinner left="208" name="BuildAxisDeadZone0" />
   <spinner left="283" name="FlycamAxisDeadZone0" />
-  <text width="124" name="PitchDeadZone">
+  <text width="104" name="PitchDeadZone">
 		Tolerancja Wznoszenia
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone4" />
-  <spinner left="218" name="BuildAxisDeadZone4" />
+  <spinner left="133" name="AvatarAxisDeadZone4" />
+  <spinner left="208" name="BuildAxisDeadZone4" />
   <spinner left="283" name="FlycamAxisDeadZone4" />
-  <text width="124" name="YawDeadZone">
+  <text width="104" name="YawDeadZone">
 		Tolerancja Odchylania
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone5" />
-  <spinner left="218" name="BuildAxisDeadZone5" />
+  <spinner left="133" name="AvatarAxisDeadZone5" />
+  <spinner left="208" name="BuildAxisDeadZone5" />
   <spinner left="283" name="FlycamAxisDeadZone5" />
-  <text width="124" name="RollDeadZone">
+  <text width="104" name="RollDeadZone">
 		Tolerancja Obrotu
 	</text>
-  <spinner left="218" name="BuildAxisDeadZone3" />
+  <spinner left="208" name="BuildAxisDeadZone3" />
   <spinner left="283" name="FlycamAxisDeadZone3" />
-  <text width="124" name="Feathering">
+  <text width="104" name="Feathering">
 		Przenikanie
 	</text>
-  <slider left="145" label="" name="AvatarFeathering" />
-  <slider left="210" label="" name="BuildFeathering" />
+  <slider left="125" label="" name="AvatarFeathering" />
+  <slider left="200" label="" name="BuildFeathering" />
   <slider left="275" label="" name="FlycamFeathering" />
-  <text width="124" name="ZoomScale2">
+  <text width="104" name="ZoomScale2">
 		Skala Powiększania
 	</text>
   <spinner left="283" label="" name="FlycamAxisScale6" />
-  <text width="124" name="ZoomDeadZone">
+  <text width="104" name="ZoomDeadZone">
 		Tolerancja Powiększania
 	</text>
   <spinner left="283" label="" name="FlycamAxisDeadZone6" />
   <button left="366" label="Ustawienia Domyślne" name="SpaceNavigatorDefaults" />
-  <button label="OK" label_selected="OK" name="ok_btn" />
+  <button left="366" label="OK" label_selected="OK" name="ok_btn" />
   <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
   <string name="JoystickMonitor">
 		Monitor Joysticka
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
index c9dd20128d..0c8684a8cf 100755
--- a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
@@ -8,5 +8,5 @@
 	     tool_tip="Dźwięk będzie słyszalny tylko dla Ciebie." />
 	<button label="Odtwarzaj w Świecie" label_selected="Odtwarzaj w Świecie"
 	     name="Sound play btn"
-	     tool_tip="Dźwięk będzie słyszalny przez wszystkich." />
+	     tool_tip="Dźwięk będzie słyszalny przez wszystkich." width="130" left_delta="-136"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_telehub.xml b/indra/newview/skins/default/xui/pl/floater_telehub.xml
index b4cf098878..917ab95ecc 100755
--- a/indra/newview/skins/default/xui/pl/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/pl/floater_telehub.xml
@@ -12,8 +12,8 @@
 	<text name="help_text_not_connected">
 		Wybierz obiekt i kliknij Połącz z teleporterem
 	</text>
-	<button label="Połącz z teleporterem" name="connect_btn" width="122" />
-	<button label="Rozłącz" name="disconnect_btn" left="142" width="98"/>
+	<button label="Połącz z teleporterem" name="connect_btn" width="132" />
+	<button label="Rozłącz" name="disconnect_btn" left="152" width="88"/>
 	<text name="spawn_points_text" width="250">
 		Punkty Składowe (pozycje - nie obiekty!):
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index 380943f4ad..c896222646 100755
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Buduj">
 	<button label="" label_selected="" name="button focus" tool_tip="Zbliżenie"/>
 	<button label="" label_selected="" name="button move" tool_tip="Przesunięcie"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Edycja"/>
@@ -311,10 +311,10 @@
 				</combo_item>
 			</combo_box>
 			<text name="text cut">
-				Wykrój
+				Wykrój początek i koniec
 			</text>
-			<spinner label="B" name="cut begin"/>
-			<spinner label="E" name="cut end"/>
+			<spinner label="P" name="cut begin"/>
+			<spinner label="K" name="cut end"/>
 			<text name="text hollow">
 				Wydrążenie
 			</text>
@@ -343,8 +343,8 @@
 			<text name="text twist">
 				Skręcenie
 			</text>
-			<spinner label="B" name="Twist Begin"/>
-			<spinner label="E" name="Twist End"/>
+			<spinner label="P" name="Twist Begin"/>
+			<spinner label="K" name="Twist End"/>
 			<text name="scale_taper">
 				Zwężenie
 			</text>
@@ -367,8 +367,8 @@
 			<text name="advanced_slice">
 				Przetnij początek i koniec
 			</text>
-			<spinner label="B" name="Path Limit Begin"/>
-			<spinner label="E" name="Path Limit End"/>
+			<spinner label="P" name="Path Limit Begin"/>
+			<spinner label="K" name="Path Limit End"/>
 			<text name="text taper2">
 				Zwężenie
 			</text>
@@ -434,15 +434,15 @@
 		<panel label="Tekstura" name="Texture">
 			<texture_picker label="Tekstura" name="texture control" tool_tip="Kliknij by wybrać obraz"/>
 			<color_swatch label="Kolor" name="colorswatch" tool_tip="Kliknij by wybrać kolor"/>
-			<text name="color trans">
-				Przezroczystość %
+			<text name="color trans" left="170" width="99">
+				Przezroczystość%
 			</text>
-			<spinner name="ColorTrans"/>
-			<text name="glow label">
+			<spinner left="170" name="ColorTrans"/>
+			<text name="glow label" left="170">
 				Blask
 			</text>
-			<spinner name="glow"/>
-			<check_box label="Jaskrawość" name="checkbox fullbright"/>
+			<spinner left="170" name="glow"/>
+			<check_box label="Jaskrawość" name="checkbox fullbright" left="170"/>
 			<text name="tex gen">
 				Mapowanie
 			</text>
@@ -561,7 +561,7 @@
 				Dopasuj Teksturę Mediów
 (najpierw załaduj)
 			</text>
-			<button label="Dopasuj" label_selected="Dopasuj" name="button align"/>
+			<button label="Dopasuj" label_selected="Dopasuj" name="button align" left="160"/>
 		</panel>
 		<panel label="Treść" name="Contents">
 			<button label="Nowy Skrypt" label_selected="Nowy Skrypt..." name="button new script"/>