From 52913616ffb1bc16e1f095098d8d70defe99f955 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 13 Apr 2010 14:16:09 -0700
Subject: VWR-17955 en_xui_change; remove old override

---
 indra/newview/skins/default/xui/en/floater_perm_prefs.xml | 2 +-
 indra/newview/skins/default/xui/fr/floater_perm_prefs.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
index 4909b8988f..ff454e3ebf 100644
--- a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
@@ -44,7 +44,7 @@
          left_delta="0"
          name="NextOwnerLabel"
          top_pad="5"
-         width="150">
+         width="200">
             Next owner can:
         </text>
         <check_box
diff --git a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
index fd569a7f95..36bec80561 100644
--- a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
@@ -4,7 +4,7 @@
 		<button label="?" label_selected="?" name="help"/>
 		<check_box label="Partager avec le groupe" name="share_with_group"/>
 		<check_box label="Autoriser tout le monde à copier" name="everyone_copy"/>
-		<text name="NextOwnerLabel" width="260">
+		<text name="NextOwnerLabel">
 			Le prochain propriétaire pourra :
 		</text>
 		<check_box label="Modifier" name="next_owner_modify"/>
-- 
cgit v1.2.3


From 3a1a43bfa685285e017d74a5156fd23e883aee8d Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 13 Apr 2010 14:33:01 -0700
Subject: VWR-18599 en_xui_change

---
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index eb2112c586..3ef16d2dec 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -342,7 +342,7 @@
      layout="topleft"
      left="30"
      height="20"
-     width="120"
+     width="170"
      top_pad="20">
      Show IMs in:
     </text>
@@ -351,9 +351,9 @@
      follows="left|top"
      layout="topleft"
      top_delta="0" 
-     left="120" 
+     left="170" 
   	 height="20"
-	   width="100"
+	   width="130"
      text_color="White_25"
 	  >
       (requires restart)
-- 
cgit v1.2.3


From 5e34a91ce65bbd74834ae012552b3ebe8592fe9a Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 14 Apr 2010 12:17:47 +0300
Subject: Fixed  normal bug EXT-4301 (PDD: Dial-in to a PSTN bridge shows
 "(???) (???)" for the name.)

* Implementation notes:
** special item is cloned from VCP to be used in LLAvatarList to reflect an Avaline caller.
** LLAvatarList extended to create instances of Avaline Caller
** Participant list now determines type of adding session participant (Avatar/Avaline Caller) and selects a way item will be created in avatar list

* Implementation behavior:
** The problem is when Avaline caller ends a call it is removed from Voice Client session but
   still exists in LLSpeakerMgr. Server does not send such information.
   HUCK was implemented to notify subscribers that Avaline callers are not anymore in the voice call.
** For now Avaline Caller is removed from the LLSpeakerMgr List when it is removed from the Voice Client session.
   This happens in two cases: if Avaline Caller ends call itself or if Resident ends group call.

** If Resident joins group call where Avaline caller already exists that caller will appear in Resident's viewer (VCP & Group IM window)
** The callers are displayed as "AvaLine Caller 1", "AvaLine Caller 2" etc.

* Known issues:
** LLNonAvatarCaller should be removed from VCP (for avaline p2p calls). Updated Avatar & Participant Lists can be used instead of it.
    Separate ticket will be opened to refactor this code.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b0bf51c214..813f59ff89 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -148,6 +148,8 @@
 	<!-- Group name: text shown for LLUUID::null -->
 	<string name="GroupNameNone">(none)</string>
 
+	<string name="AvalineCaller">Avaline Caller [ORDER]</string>
+
 	<!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
 	<string name="AssetErrorNone">No error</string>
 	<string name="AssetErrorRequestFailed">Asset request: failed</string>
-- 
cgit v1.2.3


From f4a03a397575b1b4a54bfe289a155acd6c831441 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 14 Apr 2010 12:56:11 +0300
Subject: =?UTF-8?q?Fixed=20normal=20bug=20EXT-6730=20([TRUNCATION]=20Prefe?=
 =?UTF-8?q?rencias=20>=20Configurar=20>=20Otros=20dispositivos=20>=20CONFI?=
 =?UTF-8?q?GURACI=C3=93N=20DEL=20JOYSTICK.=20\"Zona=20muerta=20izq./de\")?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. In EN locale increased size of all TextBoxes where string was truncated. Made these TextBoxes large enough to contain strings of all locales. Moved controls next to these TextBoxes to the right and increased floater width to accommodate its content.

2. Deleted in ES, IT, NL, PL, FR explicitly overriden 'left' and 'width' attributes that was changed in EN locale.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/200/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/floater_joystick.xml      | 154 ++++++++++-----------
 .../skins/default/xui/es/floater_joystick.xml      |  10 +-
 .../skins/default/xui/fr/floater_joystick.xml      |  10 +-
 .../skins/default/xui/it/floater_joystick.xml      |  18 +--
 .../skins/default/xui/nl/floater_joystick.xml      |   2 +-
 .../skins/default/xui/pl/floater_joystick.xml      | 124 ++++++++---------
 .../skins/default/xui/pt/floater_joystick.xml      |  16 +--
 7 files changed, 167 insertions(+), 167 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml
index b8156a174d..6e1bb8fcd0 100644
--- a/indra/newview/skins/default/xui/en/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/en/floater_joystick.xml
@@ -6,7 +6,7 @@
  name="Joystick"
  help_topic="joystick"
  title="JOYSTICK CONFIGURATION"
- width="550">
+ width="569">
     <floater.string
      name="NoDevice">
         no device detected
@@ -148,7 +148,7 @@
      halign="right"
      height="10"
      layout="topleft"
-     left="12"
+     left="37"
      mouse_opaque="false"
      name="Control Modes:"
      top="110"
@@ -161,7 +161,7 @@
      halign="center"
      label="Avatar"
      layout="topleft"
-     left="125"
+     left="150"
      name="JoystickAvatarEnabled"
      width="60" />
     <check_box
@@ -170,7 +170,7 @@
      halign="center"
      label="Build"
      layout="topleft"
-     left="194"
+     left="219"
      name="JoystickBuildEnabled"
      width="60" />
     <check_box
@@ -179,14 +179,14 @@
      halign="center"
      label="Flycam"
      layout="topleft"
-     left="262"
+     left="289"
      name="JoystickFlycamEnabled"
      width="60" />
     <stat_view
      height="250"
      label="Joystick Monitor"
      layout="topleft"
-     left="340"
+     left="359"
      name="axis_view"
      show_label="true"
      top="142"
@@ -250,9 +250,9 @@
      bottom="144"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="XScale"
-     width="94">
+     width="140">
         X Scale
     </text>
     <spinner
@@ -261,7 +261,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      max_val="50"
      min_val="-50"
      name="AvatarAxisScale1"
@@ -272,7 +272,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      max_val="1024"
      min_val="-1024"
      name="BuildAxisScale1"
@@ -283,7 +283,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      max_val="1024"
      min_val="-1024"
      name="FlycamAxisScale1"
@@ -294,9 +294,9 @@
      bottom="164"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="YScale"
-     width="94">
+     width="140">
         Y Scale
     </text>
     <spinner
@@ -305,7 +305,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      max_val="50"
      min_val="-50"
      name="AvatarAxisScale2"
@@ -316,7 +316,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      max_val="1024"
      min_val="-1024"
      name="BuildAxisScale2"
@@ -327,7 +327,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      max_val="1024"
      min_val="-1024"
      name="FlycamAxisScale2"
@@ -338,9 +338,9 @@
      bottom="184"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="ZScale"
-     width="94">
+     width="140">
         Z Scale
     </text>
     <spinner
@@ -349,7 +349,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      max_val="50"
      min_val="-50"
      name="AvatarAxisScale0"
@@ -360,7 +360,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      max_val="1024"
      min_val="-1024"
      name="BuildAxisScale0"
@@ -371,7 +371,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      max_val="1024"
      min_val="-1024"
      name="FlycamAxisScale0"
@@ -382,9 +382,9 @@
      bottom="204"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="PitchScale"
-     width="94">
+     width="140">
         Pitch Scale
     </text>
     <spinner
@@ -393,7 +393,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      max_val="1024"
      min_val="-1024"
      name="AvatarAxisScale4"
@@ -404,7 +404,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      max_val="1024"
      min_val="-1024"
      name="BuildAxisScale4"
@@ -415,7 +415,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      max_val="1024"
      min_val="-1024"
      name="FlycamAxisScale4"
@@ -426,9 +426,9 @@
      bottom="224"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="YawScale"
-     width="94">
+     width="140">
         Yaw Scale
     </text>
     <spinner
@@ -437,7 +437,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      max_val="1024"
      min_val="-1024"
      name="AvatarAxisScale5"
@@ -448,7 +448,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      max_val="1024"
      min_val="-1024"
      name="BuildAxisScale5"
@@ -459,7 +459,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      max_val="1024"
      min_val="-1024"
      name="FlycamAxisScale5"
@@ -470,9 +470,9 @@
      bottom="244"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="RollScale"
-     width="94">
+     width="140">
         Roll Scale
     </text>
     <spinner
@@ -481,7 +481,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      max_val="1024"
      min_val="-1024"
      name="BuildAxisScale3"
@@ -492,7 +492,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      max_val="1024"
      min_val="-1024"
      name="FlycamAxisScale3"
@@ -503,9 +503,9 @@
      bottom="274"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="XDeadZone"
-     width="94">
+     width="140">
         X Dead Zone
     </text>
     <spinner
@@ -515,7 +515,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      name="AvatarAxisDeadZone1"
      width="56" />
     <spinner
@@ -525,7 +525,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      name="BuildAxisDeadZone1"
      width="56" />
     <spinner
@@ -535,7 +535,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      name="FlycamAxisDeadZone1"
      width="56" />
     <text
@@ -544,9 +544,9 @@
      bottom="294"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="YDeadZone"
-     width="94">
+     width="140">
         Y Dead Zone
     </text>
     <spinner
@@ -556,7 +556,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      name="AvatarAxisDeadZone2"
      width="56" />
     <spinner
@@ -566,7 +566,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      name="BuildAxisDeadZone2"
      width="56" />
     <spinner
@@ -576,7 +576,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      name="FlycamAxisDeadZone2"
      width="56" />
     <text
@@ -585,9 +585,9 @@
      bottom="314"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="ZDeadZone"
-     width="94">
+     width="140">
         Z Dead Zone
     </text>
     <spinner
@@ -597,7 +597,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      name="AvatarAxisDeadZone0"
      width="56" />
     <spinner
@@ -607,7 +607,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      name="BuildAxisDeadZone0"
      width="56" />
     <spinner
@@ -617,7 +617,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      name="FlycamAxisDeadZone0"
      width="56" />
     <text
@@ -626,9 +626,9 @@
      bottom="334"
      halign="right"
      layout="topleft"
-     left="20"
+     left="2"
      name="PitchDeadZone"
-     width="94">
+     width="140">
         Pitch Dead Zone
     </text>
     <spinner
@@ -638,7 +638,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      name="AvatarAxisDeadZone4"
      width="56" />
     <spinner
@@ -648,7 +648,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      name="BuildAxisDeadZone4"
      width="56" />
     <spinner
@@ -658,7 +658,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      name="FlycamAxisDeadZone4"
      width="56" />
     <text
@@ -667,9 +667,9 @@
      bottom="354"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="YawDeadZone"
-     width="94">
+     width="140">
         Yaw Dead Zone
     </text>
     <spinner
@@ -679,7 +679,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      name="AvatarAxisDeadZone5"
      width="56" />
     <spinner
@@ -689,7 +689,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      name="BuildAxisDeadZone5"
      width="56" />
     <spinner
@@ -699,7 +699,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      name="FlycamAxisDeadZone5"
      width="56" />
     <text
@@ -708,9 +708,9 @@
      bottom="374"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="RollDeadZone"
-     width="94">
+     width="140">
         Roll Dead Zone
     </text>
     <spinner
@@ -720,7 +720,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      name="BuildAxisDeadZone3"
      width="56" />
     <spinner
@@ -730,7 +730,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      name="FlycamAxisDeadZone3"
      width="56" />
     <text
@@ -739,9 +739,9 @@
      bottom="402"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="Feathering"
-     width="94">
+     width="140">
         Feathering
     </text>
     <slider
@@ -752,7 +752,7 @@
      increment="1"
      initial_value="0.7"
      layout="topleft"
-     left="116"
+     left="141"
      max_val="32"
      min_val="1"
      name="AvatarFeathering"
@@ -795,9 +795,9 @@
      bottom="430"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="ZoomScale2"
-     width="94">
+     width="140">
         Zoom Scale
     </text>
     <spinner
@@ -806,7 +806,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      max_val="1024"
      min_val="-1024"
      name="FlycamAxisScale6"
@@ -817,9 +817,9 @@
      bottom="450"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="ZoomDeadZone"
-     width="96">
+     width="140">
         Zoom Dead Zone
     </text>
     <spinner
@@ -829,7 +829,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      name="FlycamAxisDeadZone6"
      width="56" />
     <button
@@ -837,10 +837,10 @@
      height="22"
      label="SpaceNavigator Defaults"
      layout="topleft"
-     left="340"
+     left="359"
      name="SpaceNavigatorDefaults"
      top="429"
-     width="184" />
+     width="200" />
     <button
      follows="right|bottom"
      height="20"
@@ -850,7 +850,7 @@
      left_delta="0"
      name="ok_btn"
      top_pad="9"
-     width="90" />
+     width="98" />
     <button
      follows="right|bottom"
      height="20"
@@ -860,5 +860,5 @@
      left_pad="4"
      name="cancel_btn"
      top_delta="0"
-     width="90" />
+     width="98" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_joystick.xml b/indra/newview/skins/default/xui/es/floater_joystick.xml
index dbd2e4f04e..2c1804bd90 100644
--- a/indra/newview/skins/default/xui/es/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/es/floater_joystick.xml
@@ -16,7 +16,7 @@
 		Modos de control:
 	</text>
 	<check_box label="Avatar" name="JoystickAvatarEnabled"/>
-	<check_box label="Construir" left="192" name="JoystickBuildEnabled"/>
+	<check_box label="Construir" name="JoystickBuildEnabled"/>
 	<check_box label="Flycam" name="JoystickFlycamEnabled"/>
 	<text name="XScale">
 		Escala: X
@@ -27,7 +27,7 @@
 	<text name="ZScale">
 		Escala: Z
 	</text>
-	<text left="3" name="PitchScale" width="115">
+	<text name="PitchScale">
 		Escala: arriba/abajo
 	</text>
 	<text name="YawScale">
@@ -45,10 +45,10 @@
 	<text name="ZDeadZone">
 		Zona muerta Z
 	</text>
-	<text left="3" name="PitchDeadZone" width="115">
+	<text name="PitchDeadZone">
 		Zona muerta arri./aba.
 	</text>
-	<text left="3" name="YawDeadZone" width="115">
+	<text name="YawDeadZone">
 		Zona muerta izq./der.
 	</text>
 	<text name="RollDeadZone">
@@ -63,7 +63,7 @@
 	<text name="ZoomDeadZone">
 		Zona muerta zoom
 	</text>
-	<button font="SansSerifSmall" label="Por defecto del SpaceNavigator" left="330" name="SpaceNavigatorDefaults" width="210"/>
+	<button font="SansSerifSmall" label="Por defecto del SpaceNavigator" name="SpaceNavigatorDefaults"/>
 	<button label="OK" label_selected="OK" left="330" name="ok_btn"/>
 	<button label="Cancelar" label_selected="Cancelar" left_delta="120" name="cancel_btn"/>
 	<stat_view label="Monitor del joystick" name="axis_view">
diff --git a/indra/newview/skins/default/xui/fr/floater_joystick.xml b/indra/newview/skins/default/xui/fr/floater_joystick.xml
index e00f9564e8..02ac21bf82 100644
--- a/indra/newview/skins/default/xui/fr/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/fr/floater_joystick.xml
@@ -26,7 +26,7 @@
 	<text name="ZScale">
 		Échelle des Z
 	</text>
-	<text left="9" name="PitchScale" width="104">
+	<text name="PitchScale">
 		Échelle du tangage
 	</text>
 	<text name="YawScale">
@@ -44,13 +44,13 @@
 	<text name="ZDeadZone">
 		Zone neutre Z
 	</text>
-	<text left="4" name="PitchDeadZone" width="116">
+	<text name="PitchDeadZone">
 		Zone neutre tangage
 	</text>
-	<text name="YawDeadZone" left="10" width="104">
+	<text name="YawDeadZone">
 		Zone neutre lacet
 	</text>
-	<text name="RollDeadZone" left="10" width="104">
+	<text name="RollDeadZone">
 		Zone neutre roulis
 	</text>
 	<text name="Feathering">
@@ -59,7 +59,7 @@
 	<text name="ZoomScale2">
 		Échelle du zoom
 	</text>
-	<text left="6" name="ZoomDeadZone" width="120">
+	<text name="ZoomDeadZone">
 		Zone neutre du zoom
 	</text>
 	<button label="Options par défaut du joystick" name="SpaceNavigatorDefaults"/>
diff --git a/indra/newview/skins/default/xui/it/floater_joystick.xml b/indra/newview/skins/default/xui/it/floater_joystick.xml
index 3eff0cfceb..3d60ded7ab 100644
--- a/indra/newview/skins/default/xui/it/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/it/floater_joystick.xml
@@ -16,7 +16,7 @@
 		Modalità di controllo:
 	</text>
 	<check_box label="Avatar" name="JoystickAvatarEnabled"/>
-	<check_box label="Costruire" left="192" name="JoystickBuildEnabled"/>
+	<check_box label="Costruire" name="JoystickBuildEnabled"/>
 	<check_box label="Camera dall&apos;alto" name="JoystickFlycamEnabled"/>
 	<text name="XScale">
 		Regolazione X
@@ -27,13 +27,13 @@
 	<text name="ZScale">
 		Regolazione Z
 	</text>
-	<text left="3" name="PitchScale" width="112">
+	<text name="PitchScale">
 		Regolazione: Pitch
 	</text>
-	<text left="3" name="YawScale" width="112">
+	<text name="YawScale">
 		Regolazione: Yaw
 	</text>
-	<text left="3" name="RollScale" width="112">
+	<text name="RollScale">
 		Regolazione: Roll
 	</text>
 	<text name="XDeadZone">
@@ -45,22 +45,22 @@
 	<text name="ZDeadZone">
 		Angolo morto Z
 	</text>
-	<text left="3" name="PitchDeadZone" width="112">
+	<text name="PitchDeadZone">
 		Angolo morto: Pitch
 	</text>
-	<text left="3" name="YawDeadZone" width="112">
+	<text name="YawDeadZone">
 		Angolo morto: Yaw
 	</text>
-	<text left="3" name="RollDeadZone" width="112">
+	<text name="RollDeadZone">
 		Angolo morto: Roll
 	</text>
 	<text name="Feathering">
 		Smussamento
 	</text>
-	<text left="6" name="ZoomScale2" width="135">
+	<text  name="ZoomScale2">
 		Regolazione dello zoom
 	</text>
-	<text left="6" name="ZoomDeadZone" width="135">
+	<text name="ZoomDeadZone" width="140">
 		Angolo morto dello zoom
 	</text>
 	<button label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults"/>
diff --git a/indra/newview/skins/default/xui/nl/floater_joystick.xml b/indra/newview/skins/default/xui/nl/floater_joystick.xml
index 505e3cd719..1d590dc1f3 100644
--- a/indra/newview/skins/default/xui/nl/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/nl/floater_joystick.xml
@@ -45,7 +45,7 @@
 	<text name="ZDeadZone">
 		Z dode zone
 	</text>
-	<text name="PitchDeadZone" left="4" width="110">
+	<text name="PitchDeadZone">
 		Stampen dode zone
 	</text>
 	<text name="YawDeadZone">
diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml
index 78742c39d1..2b1e362b98 100644
--- a/indra/newview/skins/default/xui/pl/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml
@@ -1,108 +1,108 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Joystick" title="KONFIGURACJA JOYSTICKA" width="590">
+<floater name="Joystick" title="KONFIGURACJA JOYSTICKA">
 	<check_box label="Aktywuj Joystick:" name="enable_joystick"/>
 	<text left="130" name="joystick_type" width="360"/>
 	<spinner label="Kalibracja Osi X" label_width="130" left="20" name="JoystickAxis1" width="170"/>
 	<spinner label="Kalibracja Osi Y" label_width="130" left="210" name="JoystickAxis2" width="170"/>
-	<spinner label="Kalibracja Osi Z" label_width="130" left="400" name="JoystickAxis0" width="170"/>
+	<spinner label="Kalibracja Osi Z" label_width="100" left="400" name="JoystickAxis0" width="140"/>
 	<spinner label="Kalibracja wznoszenia" label_width="130" left="20" name="JoystickAxis4" width="170"/>
 	<spinner label="Kalibracja wychylania" label_width="130" left="210" name="JoystickAxis5" width="170"/>
-	<spinner label="Kalibracja obrotu" label_width="130" left="400" name="JoystickAxis3" width="170"/>
+	<spinner label="Kalibracja obrotu" label_width="100" left="400" name="JoystickAxis3" width="140"/>
 	<spinner label="Kalibracja powiększania" label_width="130" name="JoystickAxis6" width="170"/>
 	<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 left="22" name="Control Modes:">
+	<text name="Control Modes:">
 		Kontroluj:
 	</text>
-	<check_box label="Awatara" left="130" name="JoystickAvatarEnabled" width="90"/>
-	<check_box label="Budowanie" left="205" name="JoystickBuildEnabled" width="90"/>
-	<check_box label="Kamerę podczas latania" left="282" name="JoystickFlycamEnabled" width="90"/>
-	<text name="XScale" width="104">
+	<check_box label="Awatara" name="JoystickAvatarEnabled" width="90"/>
+	<check_box label="Budowanie" name="JoystickBuildEnabled" width="90"/>
+	<check_box label="Kamerę podczas latania" left="300" name="JoystickFlycamEnabled" width="90"/>
+	<text name="XScale">
 		Skala X
 	</text>
-	<spinner left="133" name="AvatarAxisScale1"/>
-	<spinner left="208" name="BuildAxisScale1"/>
-	<spinner left="283" name="FlycamAxisScale1"/>
-	<text name="YScale" width="104">
+	<spinner name="AvatarAxisScale1"/>
+	<spinner name="BuildAxisScale1"/>
+	<spinner left="300" name="FlycamAxisScale1"/>
+	<text name="YScale">
 		Skala Y
 	</text>
-	<spinner left="133" name="AvatarAxisScale2"/>
-	<spinner left="208" name="BuildAxisScale2"/>
-	<spinner left="283" name="FlycamAxisScale2"/>
-	<text name="ZScale" width="104">
+	<spinner name="AvatarAxisScale2"/>
+	<spinner name="BuildAxisScale2"/>
+	<spinner left="300" name="FlycamAxisScale2"/>
+	<text name="ZScale">
 		Skala Z
 	</text>
-	<spinner left="133" name="AvatarAxisScale0"/>
-	<spinner left="208" name="BuildAxisScale0"/>
-	<spinner left="283" name="FlycamAxisScale0"/>
-	<text name="PitchScale" width="104">
+	<spinner name="AvatarAxisScale0"/>
+	<spinner name="BuildAxisScale0"/>
+	<spinner left="300" name="FlycamAxisScale0"/>
+	<text name="PitchScale">
 		Skala wznoszenia
 	</text>
-	<spinner left="133" name="AvatarAxisScale4"/>
-	<spinner left="208" name="BuildAxisScale4"/>
-	<spinner left="283" name="FlycamAxisScale4"/>
-	<text name="YawScale" width="104">
+	<spinner name="AvatarAxisScale4"/>
+	<spinner name="BuildAxisScale4"/>
+	<spinner left="300" name="FlycamAxisScale4"/>
+	<text name="YawScale">
 		Skala odchylania
 	</text>
-	<spinner left="133" name="AvatarAxisScale5"/>
-	<spinner left="208" name="BuildAxisScale5"/>
-	<spinner left="283" name="FlycamAxisScale5"/>
-	<text name="RollScale" width="104">
+	<spinner name="AvatarAxisScale5"/>
+	<spinner name="BuildAxisScale5"/>
+	<spinner left="300" name="FlycamAxisScale5"/>
+	<text name="RollScale">
 		Skala obrotu
 	</text>
-	<spinner left="208" name="BuildAxisScale3"/>
-	<spinner left="283" name="FlycamAxisScale3"/>
-	<text name="XDeadZone" width="104">
+	<spinner name="BuildAxisScale3"/>
+	<spinner left="300" name="FlycamAxisScale3"/>
+	<text name="XDeadZone">
 		Tolerancja osi X
 	</text>
-	<spinner left="133" name="AvatarAxisDeadZone1"/>
-	<spinner left="208" name="BuildAxisDeadZone1"/>
-	<spinner left="283" name="FlycamAxisDeadZone1"/>
-	<text name="YDeadZone" width="104">
+	<spinner name="AvatarAxisDeadZone1"/>
+	<spinner name="BuildAxisDeadZone1"/>
+	<spinner left="300" name="FlycamAxisDeadZone1"/>
+	<text name="YDeadZone">
 		Tolerancja osi Y
 	</text>
-	<spinner left="133" name="AvatarAxisDeadZone2"/>
-	<spinner left="208" name="BuildAxisDeadZone2"/>
-	<spinner left="283" name="FlycamAxisDeadZone2"/>
-	<text name="ZDeadZone" width="104">
+	<spinner name="AvatarAxisDeadZone2"/>
+	<spinner name="BuildAxisDeadZone2"/>
+	<spinner left="300" name="FlycamAxisDeadZone2"/>
+	<text name="ZDeadZone">
 		Tolerancja osi Z
 	</text>
-	<spinner left="133" name="AvatarAxisDeadZone0"/>
-	<spinner left="208" name="BuildAxisDeadZone0"/>
-	<spinner left="283" name="FlycamAxisDeadZone0"/>
-	<text name="PitchDeadZone" width="104">
+	<spinner name="AvatarAxisDeadZone0"/>
+	<spinner name="BuildAxisDeadZone0"/>
+	<spinner left="300" name="FlycamAxisDeadZone0"/>
+	<text name="PitchDeadZone">
 		Tolerancja wznoszenia
 	</text>
-	<spinner left="133" name="AvatarAxisDeadZone4"/>
-	<spinner left="208" name="BuildAxisDeadZone4"/>
-	<spinner left="283" name="FlycamAxisDeadZone4"/>
-	<text name="YawDeadZone" width="104">
+	<spinner name="AvatarAxisDeadZone4"/>
+	<spinner name="BuildAxisDeadZone4"/>
+	<spinner left="300" name="FlycamAxisDeadZone4"/>
+	<text name="YawDeadZone">
 		Tolerancja odchylania
 	</text>
-	<spinner left="133" name="AvatarAxisDeadZone5"/>
-	<spinner left="208" name="BuildAxisDeadZone5"/>
-	<spinner left="283" name="FlycamAxisDeadZone5"/>
-	<text name="RollDeadZone" width="104">
+	<spinner name="AvatarAxisDeadZone5"/>
+	<spinner name="BuildAxisDeadZone5"/>
+	<spinner left="300" name="FlycamAxisDeadZone5"/>
+	<text name="RollDeadZone">
 		Tolerancja obrotu
 	</text>
-	<spinner left="208" name="BuildAxisDeadZone3"/>
-	<spinner left="283" name="FlycamAxisDeadZone3"/>
-	<text name="Feathering" width="104">
+	<spinner name="BuildAxisDeadZone3"/>
+	<spinner left="300" name="FlycamAxisDeadZone3"/>
+	<text name="Feathering">
 		Przenikanie
 	</text>
-	<slider label="" left="125" name="AvatarFeathering"/>
-	<slider label="" left="200" name="BuildFeathering"/>
-	<slider label="" left="275" name="FlycamFeathering"/>
-	<text name="ZoomScale2" width="104">
+	<slider label="" name="AvatarFeathering"/>
+	<slider label="" name="BuildFeathering"/>
+	<slider label="" left_delta="81" name="FlycamFeathering"/>
+	<text name="ZoomScale2">
 		Skala powiększania
 	</text>
-	<spinner label="" left="283" name="FlycamAxisScale6"/>
-	<text name="ZoomDeadZone" width="104">
+	<spinner label="" left="300" name="FlycamAxisScale6"/>
+	<text name="ZoomDeadZone">
 		Tolerancja powiększania
 	</text>
-	<spinner label="" left="283" name="FlycamAxisDeadZone6"/>
-	<button label="Ustawienia domyślne" left="366" name="SpaceNavigatorDefaults"/>
+	<spinner label="" left="300" name="FlycamAxisDeadZone6"/>
+	<button label="Ustawienia domyślne" name="SpaceNavigatorDefaults"/>
 	<button label="OK" label_selected="OK" left="366" name="ok_btn"/>
 	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
 	<stat_view label="Monitor Joysticka" name="axis_view">
diff --git a/indra/newview/skins/default/xui/pt/floater_joystick.xml b/indra/newview/skins/default/xui/pt/floater_joystick.xml
index ecc4fcc9e9..98d8c0e319 100644
--- a/indra/newview/skins/default/xui/pt/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pt/floater_joystick.xml
@@ -16,7 +16,7 @@
 		Modos de Controle:
 	</text>
 	<check_box label="Avatar" name="JoystickAvatarEnabled"/>
-	<check_box label="Construir" left="192" name="JoystickBuildEnabled"/>
+	<check_box label="Construir" name="JoystickBuildEnabled"/>
 	<check_box label="Camera aérea" name="JoystickFlycamEnabled"/>
 	<text name="XScale">
 		Escala X
@@ -27,13 +27,13 @@
 	<text name="ZScale">
 		Escala Z
 	</text>
-	<text left="3" name="PitchScale" width="115">
+	<text name="PitchScale">
 		Escala de Elevação
 	</text>
-	<text left="3" name="YawScale" width="115">
+	<text name="YawScale">
 		Escala da Guinada
 	</text>
-	<text left="3" name="RollScale" width="115">
+	<text name="RollScale">
 		Escala de Rolagem
 	</text>
 	<text name="XDeadZone">
@@ -45,13 +45,13 @@
 	<text name="ZDeadZone">
 		Zona Morta Z
 	</text>
-	<text left="3" name="PitchDeadZone" width="115">
+	<text name="PitchDeadZone">
 		Zona Morta: Elevação
 	</text>
-	<text left="3" name="YawDeadZone" width="115">
+	<text name="YawDeadZone">
 		Zona Morta: Guinada
 	</text>
-	<text left="3" name="RollDeadZone" width="115">
+	<text name="RollDeadZone">
 		Zona Morta: Rolagem
 	</text>
 	<text name="Feathering">
@@ -60,7 +60,7 @@
 	<text name="ZoomScale2">
 		Escala de Zoom
 	</text>
-	<text left="4" name="ZoomDeadZone" width="110">
+	<text name="ZoomDeadZone">
 		Zona Morta de Zoom
 	</text>
 	<button font="SansSerifSmall" label="Padrões do SpaceNavigator" name="SpaceNavigatorDefaults"/>
-- 
cgit v1.2.3


From 079963c9295243c731916127e39bfa39ae9690ca Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 14 Apr 2010 13:18:40 +0300
Subject: Fixed normal bug EXT-6302 (TP requests need to display destination
 region maturity) Added:  - parsing of region information from "lure" binary
 bucket  - displaying destination region maturity by teleport offer Reviewed
 by Mike Antipov at https://codereview.productengine.com/secondlife/r/229/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9ee4e13f3c..6c9564c8cf 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5165,7 +5165,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th
    type="offer">
 [NAME_SLURL] has offered to teleport you to their location:
 
-[MESSAGE]
+[MESSAGE], ([MATURITY])
     <form name="form">
       <button
        index="0"
-- 
cgit v1.2.3


From c1662e55838b6bde176a862847f67359ce0af3b4 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 14 Apr 2010 16:17:17 +0300
Subject: Fixed EXT-6591(normal) - Place profile accordions should be
 single-instance Made accordion single expansion - added single_expansion
 attribute

Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/232/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_place_profile.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index a43b244fa0..9725e9952a 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -321,6 +321,7 @@
              follows="all"
              height="223"
              layout="topleft"
+             single_expansion="true"
              left="0"
              name="advanced_info_accordion"
              top_pad="10"
-- 
cgit v1.2.3


From 255ca59f7438a1528dff04e5facec2229bd9e10a Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 14 Apr 2010 16:18:33 +0300
Subject: Fixed EXT-6604(normal) - Nav bar search field text not vertically
 aligned Increased search field height to match location input height.

Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/231/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_navigation_bar.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 7ec1ca2e2e..96c76576c0 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -119,7 +119,7 @@
 	     commit_on_focus_lost="false"
 	     follows="right|top"
 	     halign="right"
-	     height="22"
+	     height="23"
 	     label="Search"
 	     layout="topleft"
 	     right="-10"
-- 
cgit v1.2.3


From c7fa24ea86ca2a02b4797328cbb9f2c03d8c6ee2 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Wed, 14 Apr 2010 11:12:03 -0700
Subject: IT JA linguistic

---
 indra/newview/skins/default/xui/it/panel_side_tray.xml         | 10 +++++-----
 indra/newview/skins/default/xui/ja/panel_preferences_sound.xml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/it/panel_side_tray.xml b/indra/newview/skins/default/xui/it/panel_side_tray.xml
index 846dcb69f0..e0143088a5 100644
--- a/indra/newview/skins/default/xui/it/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/it/panel_side_tray.xml
@@ -6,24 +6,24 @@
 	<sidetray_tab description="Casa." name="sidebar_home" tab_title="Home">
 		<panel label="casa" name="panel_home"/>
 	</sidetray_tab>
-	<sidetray_tab description="Modifica il tuo profilo pubblico e i preferiti." name="sidebar_me" tab_title="My Profile">
+	<sidetray_tab description="Modifica il tuo profilo pubblico e i preferiti." name="sidebar_me" tab_title="Il mio profilo">
 		<panel_container name="panel_container">
 			<panel label="Io" name="panel_me"/>
 		</panel_container>
 	</sidetray_tab>
-	<sidetray_tab description="Trova amici, contatti e persone nelle vicinanze." name="sidebar_people" tab_title="People">
+	<sidetray_tab description="Trova amici, contatti e persone nelle vicinanze." name="sidebar_people" tab_title="Persone">
 		<panel_container name="panel_container">
 			<panel label="Profilo del gruppo" name="panel_group_info_sidetray"/>
 			<panel label="Residenti e oggetti bloccati" name="panel_block_list_sidetray"/>
 		</panel_container>
 	</sidetray_tab>
-	<sidetray_tab description="Trova luoghi dove andare e luoghi già visitati." label="Luoghi" name="sidebar_places" tab_title="Places">
+	<sidetray_tab description="Trova luoghi dove andare e luoghi già visitati." label="Luoghi" name="sidebar_places" tab_title="Luoghi">
 		<panel label="Luoghi" name="panel_places"/>
 	</sidetray_tab>
-	<sidetray_tab description="Sfoglia il tuo inventario." name="sidebar_inventory" tab_title="My Inventory">
+	<sidetray_tab description="Sfoglia il tuo inventario." name="sidebar_inventory" tab_title="Il mio inventario">
 		<panel label="Modifica inventario" name="sidepanel_inventory"/>
 	</sidetray_tab>
-	<sidetray_tab description="Cambia il tuo aspetto ed il tuo look attuale." name="sidebar_appearance" tab_title="My Appearance">
+	<sidetray_tab description="Cambia il tuo aspetto ed il tuo look attuale." name="sidebar_appearance" tab_title="Il mio aspetto">
 		<panel label="Modifica aspetto fisico" name="sidepanel_appearance"/>
 	</sidetray_tab>
 </side_tray>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
index fe830d864f..abbd29286b 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -12,7 +12,7 @@
 	<slider label="ボイスチャット" name="Voice Volume"/>
 	<check_box label="有効" name="enable_voice_check"/>
 	<check_box label="メディアを自動再生する" name="media_auto_play_btn" tool_tip="ここにチェックを入れてメディアの自動再生を許可します" value="true"/>
-	<check_box label="他のアバターに取り付けられたメディアを再生します" name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします。" value="true"/>
+	<check_box label="他のアバターに取り付けられたメディアを再生する" name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします" value="true"/>
 	<text name="voice_chat_settings">
 		ボイスチャットの設定
 	</text>
-- 
cgit v1.2.3


From e7bbdb039bd478c0baf60b0563a0455d11eccf48 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Wed, 14 Apr 2010 17:22:28 -0700
Subject: VWR-18603 en_xui_change for ES (longest); JA linguistic

---
 indra/newview/skins/default/xui/en/floater_world_map.xml       |  2 +-
 .../newview/skins/default/xui/ja/panel_prim_media_controls.xml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 291f8f6f51..233ab2c1b2 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -496,7 +496,7 @@
      top_delta="-1"
      name="DoSearch"
      tool_tip="Search for region"
-     width="58">
+     width="62">
 		<button.commit_callback
 		function="WMap.Location" />
     </button>
diff --git a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
index 1fe6ad25ed..a9897c7ae4 100644
--- a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
@@ -13,10 +13,10 @@
 	</layout_stack>
 	<layout_stack name="media_controls">
 		<layout_panel name="back">
-			<button name="back_btn" tool_tip="Navigate back"/>
+			<button name="back_btn" tool_tip="前へ"/>
 		</layout_panel>
 		<layout_panel name="fwd">
-			<button name="fwd_btn" tool_tip="Navigate forward"/>
+			<button name="fwd_btn" tool_tip="次へ"/>
 		</layout_panel>
 		<layout_panel name="home">
 			<button name="home_btn" tool_tip="ホームページ"/>
@@ -51,10 +51,10 @@
 			<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="ムービー再生進行"/>
 		</layout_panel>
 		<layout_panel name="skip_back">
-			<button name="skip_back_btn" tool_tip="Step back"/>
+			<button name="skip_back_btn" tool_tip="前にステップ"/>
 		</layout_panel>
 		<layout_panel name="skip_forward">
-			<button name="skip_forward_btn" tool_tip="Step forward"/>
+			<button name="skip_forward_btn" tool_tip="次にステップ"/>
 		</layout_panel>
 		<layout_panel name="media_volume">
 			<button name="media_mute_button" tool_tip="ミュート"/>
@@ -64,7 +64,7 @@
 			<button name="zoom_frame_btn" tool_tip="メディアにズームイン"/>
 		</layout_panel>
 		<layout_panel name="close">
-			<button name="close_btn" tool_tip="Zoom Back"/>
+			<button name="close_btn" tool_tip="ズームバック"/>
 		</layout_panel>
 		<layout_panel name="new_window">
 			<button name="new_window_btn" tool_tip="URL をブラウザで開く"/>
-- 
cgit v1.2.3


From c4e287c909ca3c1eb7364964f225dd2d901fdf2c Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Wed, 14 Apr 2010 18:02:27 -0700
Subject: VWR-18615 missing translation

---
 indra/newview/skins/default/xui/es/panel_region_general.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml
index 9ee7bef493..67800b2c6f 100644
--- a/indra/newview/skins/default/xui/es/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_general.xml
@@ -32,7 +32,7 @@
 	</text>
 	<icons_combo_box label="&apos;Mature&apos;" name="access_combo">
 		<icons_combo_box.item label="&apos;Adult&apos;" name="Adult" value="42"/>
-		<icons_combo_box.item label="&apos;Mature&apos;" name="Mature" value="21"/>
+		<icons_combo_box.item label="Moderado" name="Mature" value="21"/>
 		<icons_combo_box.item label="&apos;PG&apos;" name="PG" value="13"/>
 	</icons_combo_box>
 	<button label="Aplicar" name="apply_btn"/>
-- 
cgit v1.2.3