10 files changed, 48 insertions, 36 deletions

diff --git a/linden/indra/newview/skins/xui/de/floater_gesture.xml b/linden/indra/newview/skins/xui/de/floater_gesture.xml
index b815b7a..bdee3b8 100644
--- a/linden/indra/newview/skins/xui/de/floater_gesture.xml
+++ b/linden/indra/newview/skins/xui/de/floater_gesture.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="gestures" title="Aktive Gesten">
         <text name="help_label">
-                Doppelklicken Sie auf eine Geste, um Animationen und Sound abzuspielen.
+                Doppelklicken Sie auf eine Geste, um Animationen und Sound &#10;abzuspielen.
         </text>
         <scroll_list bottom_delta="-385" height="360" name="gesture_list">
                 <column label="Trigger" name="trigger" />
diff --git a/linden/indra/newview/skins/xui/de/floater_joystick.xml b/linden/indra/newview/skins/xui/de/floater_joystick.xml
index cabd7bd..837ac7d 100644
--- a/linden/indra/newview/skins/xui/de/floater_joystick.xml
+++ b/linden/indra/newview/skins/xui/de/floater_joystick.xml
@@ -10,11 +10,14 @@
         <spinner label="Rollwinkel" name="JoystickAxis3" />

         <spinner label="Zoom" name="JoystickAxis6" />

         <check_box label="Direkt-Zoom" name="ZoomDirect" />

-        <check_box label="3D-Cursor" name="Cursor3D" />

-        <check_box label="Automatisch ausrichten" name="AutoLeveling" />

+        <check_box label="3D-Cursor"  left="300" name="Cursor3D" />

+        <check_box label="Automatisch ausrichten" left="390" name="AutoLeveling" />

         <text name="Control Modes:">

                 Steuermodi:

         </text>

+        <check_box name="JoystickAvatarEnabled">Avatar</check_box>

+        <check_box name="JoystickBuildEnabled">Bauen</check_box>

+        <check_box name="JoystickFlycamEnabled">Flycam</check_box>

         <text name="XScale">

                 X-Skala

         </text>

diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
index 802eb0f..ff48982 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
@@ -17,13 +17,14 @@
         <text_editor name="FullScreenInfo" width="480">
                 Wenn deaktiviert, schaltet die Anzeige bei Anmeldung auf Vollbild um.
         </text_editor>
-        <text name="DisplayResLabel">
+        <text name="DisplayResLabel" width="100">
                 Anzeigeauflösung:
         </text>
-        <text name="AspectRatioLabel1" tool_tip="Breite/Höhe">
+        <combo_box name="fullscreen combo" left="115" />
+        <text name="AspectRatioLabel1" tool_tip="Breite/Höhe" width="100">
                 Aspektverhältnis:
         </text>
-        <combo_box name="aspect_ratio" tool_tip="Breite/Höhe">
+        <combo_box name="aspect_ratio" tool_tip="Breite/Höhe" left="115">
                 <combo_item type="string" length="1" name="4:3(StandardCRT)">
                         4:3 (Standard-CRT)
                 </combo_item>
@@ -37,7 +38,7 @@
                         16:9 (Widescreen)
                 </combo_item>
         </combo_box>
-        <check_box label="Aspektverhältnis automatisch erkennen" name="aspect_auto_detect" />
+        <check_box label="Verhältnis automatisch erkennen" name="aspect_auto_detect" left="275" />
         <text type="string" length="1" name="UI Size:">
                 UI-Größe:
         </text>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
index 5531090..c45ab77 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
@@ -156,72 +156,72 @@
              left_delta="23" mouse_opaque="true" name="ToolTetrahedron"
              scale_image="TRUE" tool_tip="Tetrahedron" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_cylinder.tga"
+             height="30" image_disabled="object_cylinder.tga"
              image_disabled_selected="object_cylinder_active.tga"
              image_selected="object_cylinder_active.tga"
              image_unselected="object_cylinder.tga" label="" label_selected=""
              left_delta="23" mouse_opaque="true" tool_tip="Cylinder" name="ToolCylinder" scale_image="TRUE"
              width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_hemi_cylinder.tga"
+             height="30" image_disabled="object_hemi_cylinder.tga"
              image_disabled_selected="object_hemi_cylinder_active.tga"
              image_selected="object_hemi_cylinder_active.tga"
              image_unselected="object_hemi_cylinder.tga" label="" label_selected=""
              left_delta="23" mouse_opaque="true" name="ToolHemiCylinder"
              scale_image="TRUE" tool_tip="Hemicylinder" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_cone.tga"
+             height="30" image_disabled="object_cone.tga"
              image_disabled_selected="object_cone_active.tga"
              image_selected="object_cone_active.tga" image_unselected="object_cone.tga"
              label="" label_selected="" left_delta="23" mouse_opaque="true"
              name="ToolCone" scale_image="TRUE" tool_tip="Cone" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_hemi_cone.tga"
+             height="30" image_disabled="object_hemi_cone.tga"
              image_disabled_selected="object_hemi_cone_active.tga"
              image_selected="object_hemi_cone_active.tga"
              image_unselected="object_hemi_cone.tga" label="" label_selected=""
              left_delta="23" mouse_opaque="true" name="ToolHemiCone" scale_image="TRUE"
       tool_tip="Hemicone" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_sphere.tga"
+             height="30" image_disabled="object_sphere.tga"
              image_disabled_selected="object_sphere_active.tga"
              image_selected="object_sphere_active.tga"
              image_unselected="object_sphere.tga" label="" label_selected=""
              left_delta="23" mouse_opaque="true" name="ToolSphere" scale_image="TRUE"
              width="30" tool_tip="Sphere" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_hemi_sphere.tga"
+             height="30" image_disabled="object_hemi_sphere.tga"
              image_disabled_selected="object_hemi_sphere_active.tga"
              image_selected="object_hemi_sphere_active.tga"
              image_unselected="object_hemi_sphere.tga" label="" label_selected=""
              left_delta="23" mouse_opaque="true" name="ToolHemiSphere"
              scale_image="TRUE" tool_tip="Hemisphere" width="30" />
         <button bottom_delta="-23" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_torus.tga"
+             height="30" image_disabled="object_torus.tga"
              image_disabled_selected="object_torus_active.tga"
              image_selected="object_torus_active.tga"
              image_unselected="object_torus.tga" label="" label_selected="" left="4"
              mouse_opaque="true" name="ToolTorus" scale_image="TRUE" tool_tip="Torus" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_tube.tga"
+             height="30" image_disabled="object_tube.tga"
              image_disabled_selected="object_tube_active.tga"
              image_selected="object_tube_active.tga" image_unselected="object_tube.tga"
              label="" label_selected="" left_delta="23" mouse_opaque="true"
              name="ToolTube" scale_image="TRUE" tool_tip="Tube" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_ring.tga"
+             height="30" image_disabled="object_ring.tga"
              image_disabled_selected="object_ring_active.tga"
              image_selected="object_ring_active.tga" image_unselected="object_ring.tga"
              label="" label_selected="" left_delta="23" mouse_opaque="true"
              name="ToolRing" scale_image="TRUE" tool_tip="Ring" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_tree.tga"
+             height="30" image_disabled="object_tree.tga"
              image_disabled_selected="object_tree_active.tga"
              image_selected="object_tree_active.tga" image_unselected="object_tree.tga"
              label="" label_selected="" left_delta="23" mouse_opaque="true"
              name="ToolTree" scale_image="TRUE" tool_tip="Tree" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_grass.tga"
+             height="30" image_disabled="object_grass.tga"
              image_disabled_selected="object_grass_active.tga"
              image_selected="object_grass_active.tga"
              image_unselected="object_grass.tga" label="" label_selected=""
diff --git a/linden/indra/newview/skins/xui/ja/floater_gesture.xml b/linden/indra/newview/skins/xui/ja/floater_gesture.xml
index 43757ee..66be1f7 100644
--- a/linden/indra/newview/skins/xui/ja/floater_gesture.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_gesture.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="gestures" title="アクティブ・ジェスチャー">
         <text name="help_label">
-                ジェスチャーをダブルクリックして、アニメーションとサウンドを再生。
+                ジェスチャーをダブルクリックして、&#10;アニメーションとサウンドを再生。
         </text>
-        <scroll_list name="gesture_list">
+        <scroll_list bottom_delta="-385" height="360" name="gesture_list">
                 <column label="トリガ" name="trigger" />
                 <column label="キー" name="shortcut" />
                 <column label="" name="key" />
diff --git a/linden/indra/newview/skins/xui/ja/floater_joystick.xml b/linden/indra/newview/skins/xui/ja/floater_joystick.xml
index ae4108e..517b9dd 100644
--- a/linden/indra/newview/skins/xui/ja/floater_joystick.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_joystick.xml
@@ -13,6 +13,9 @@
         <text name="Control Modes:">

                 制御モード:

         </text>

+        <check_box name="JoystickAvatarEnabled">アバター</check_box>

+        <check_box name="JoystickBuildEnabled">造る</check_box>

+        <check_box name="JoystickFlycamEnabled">フライ・カメラ</check_box>

         <text name="XScale">

                 Xスケール

         </text>

diff --git a/linden/indra/newview/skins/xui/ja/panel_group_invite.xml b/linden/indra/newview/skins/xui/ja/panel_group_invite.xml
index 3c334c0..f004d14 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_invite.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_group_invite.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="メンバーを招待" name="invite_panel">
-        <text>
-                複数の住人を選択して、グループに 
-招待できます。 [リストから
-人を選ぶ]をクリックしてください。
-        </text>
-        <text name="help_text">
-                あなたのグループに、一度に複数の人を招待することができます。［リストから人を選ぶ］をクリックしてください。
+        <text name="help_text" font="SansSerifSmall" height="72" bottom_delta="-96">
+                あなたのグループに、一度に複数の
+人を招待することができます。
+［リストから人を選ぶ］
+をクリックしてください。
         </text>
-        <button label="リストから人を選ぶ" name="add_button" tool_tip="" />
-        <name_list name="invitee_list"
+        <button label="リストから人を選ぶ" name="add_button" tool_tip="" bottom_delta="-10" />
+        <name_list name="invitee_list" height="156" bottom_delta="-160"
              tool_tip="複数の住人を選択するには、Ctrlキーを押しながら住人名をクリックします。" />
         <button label="リストから選択したものを削除" name="remove_button"
              tool_tip="上で選択した居住者を招待リストから削除します。" />
diff --git a/linden/indra/newview/skins/xui/ja/panel_place.xml b/linden/indra/newview/skins/xui/ja/panel_place.xml
index 6a48eb8..7339a05 100644
--- a/linden/indra/newview/skins/xui/ja/panel_place.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_place.xml
@@ -7,19 +7,21 @@
                 説明：
         </text>
         <text name="information_label">
-                情報:
+                情報：
         </text>
+        <text left="110" name="info_editor" width="327" />
         <text name="location_label">
                 ロケーション：
         </text>
+        <text left="110" name="location_editor" width="327" />
         <button label="テレポート" name="teleport_btn" />
         <button label="地図上に表示" name="map_btn" />
         <button label="賭ける..." name="auction_btn" />
         <text name="traffic_text">
-                交通量： [TRAFFIC]
+                交通量：[TRAFFIC]
         </text>
         <text name="area_text">
-                面積：［AREA］平方メートル
+                面積：[AREA]平方メートル
         </text>
         <text name="forsale_text">
                 L$[PRICE]で売り出し中。
diff --git a/linden/indra/newview/skins/xui/ja/panel_place_small.xml b/linden/indra/newview/skins/xui/ja/panel_place_small.xml
index 3457199..32e3520 100644
--- a/linden/indra/newview/skins/xui/ja/panel_place_small.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_place_small.xml
@@ -7,11 +7,13 @@
                 説明：
         </text>
         <text name="information_label">
-                情報:
+                情報：
         </text>
+        <text left="55" name="info_editor" width="367" font="SansSerifSmall" />
         <text name="location_label">
                 ロケーション：
         </text>
+        <text left="110" name="location_editor" width="327" />
         <button label="テレポート" name="teleport_btn" />
         <button label="地図上に表示" name="map_btn" />
         <button label="賭ける..." name="auction_btn" />
@@ -19,13 +21,13 @@
                 交通量：[TRAFFIC]
         </string>
         <string name="area_text">
-                面積：［AREA］平方ﾒｰﾄﾙ
+                面積：[AREA]平方ﾒｰﾄﾙ。
         </string>
         <string name="forsale_text">
-                L$[PRICE]で売出し中
+                L$[PRICE]で売出し中。
         </string>
         <string name="auction_text">
-                オークションID [ID]。
+                オークションID [ID]
         </string>
         <text name="server_update_text">
                 土地情報のご利用には、サーバーのアップデートが必要です。
diff --git a/linden/indra/newview/skins/xui/ko/floater_joystick.xml b/linden/indra/newview/skins/xui/ko/floater_joystick.xml
index 3907aab..e965738 100644
--- a/linden/indra/newview/skins/xui/ko/floater_joystick.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_joystick.xml
@@ -13,6 +13,9 @@
         <text name="Control Modes:">

                 조절 모드:

         </text>

+        <check_box name="JoystickAvatarEnabled">아바타</check_box>

+        <check_box name="JoystickBuildEnabled">만들기</check_box>

+        <check_box name="JoystickFlycamEnabled">플라이캠</check_box>

         <text name="XScale">

                 X 크기

         </text>