From d5165b2712e86475151a4413af1e081cf27338cb Mon Sep 17 00:00:00 2001
From: Logue <logue@hotmail.co.jp>
Date: Sat, 10 Jun 2023 20:07:43 +0900
Subject: [PATCH] =?UTF-8?q?Translate=20Alchemy=20dependencies.=E3=80=80(Ex?=
 =?UTF-8?q?isting=20official=20UI=20files=20are=20mostly=20untouched)=20De?=
 =?UTF-8?q?lete=20files=20not=20related=20to=20translation.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skins/default/xui/ja/accordion_drag.xml   |    8 -
 .../skins/default/xui/ja/accordion_parent.xml |    8 -
 .../skins/default/xui/ja/alert_button.xml     |   15 -
 .../skins/default/xui/ja/alert_check_box.xml  |    7 -
 .../skins/default/xui/ja/alert_icon.xml       |    8 -
 .../default/xui/ja/favorites_bar_button.xml   |   27 -
 .../skins/default/xui/ja/floater_about.xml    |   48 +-
 .../skins/default/xui/ja/floater_ao.xml       |   38 +-
 .../default/xui/ja/floater_asset_recovery.xml |  122 +-
 .../default/xui/ja/floater_build_options.xml  |    1 +
 .../default/xui/ja/floater_chat_alerts.xml    |  255 +-
 .../xui/ja/floater_combobox_ok_cancel.xml     |   53 +-
 .../default/xui/ja/floater_directory.xml      |  329 +--
 .../xui/ja/floater_edit_hover_height.xml      |    1 +
 .../skins/default/xui/ja/floater_event.xml    |    5 +-
 .../default/xui/ja/floater_explore_sounds.xml |   80 +-
 .../skins/default/xui/ja/floater_fbc_web.xml  |    2 -
 .../default/xui/ja/floater_generic_text.xml   |   52 -
 .../default/xui/ja/floater_grid_status.xml    |   17 -
 .../default/xui/ja/floater_group_profile.xml  |   45 +-
 .../default/xui/ja/floater_hex_editor.xml     |   22 +-
 .../xui/ja/floater_legacy_sys_well.xml        |   43 +-
 .../xui/ja/floater_lightbox_settings.xml      | 2455 ++---------------
 .../xui/ja/floater_live_material_editor.xml   |   43 +-
 .../skins/default/xui/ja/floater_map.xml      |    8 +
 .../xui/ja/floater_material_editor.xml        |  139 +-
 .../xui/ja/floater_message_builder.xml        |   80 +-
 .../default/xui/ja/floater_message_log.xml    |  239 +-
 .../xui/ja/floater_message_rewriter.xml       |   79 +-
 .../default/xui/ja/floater_music_ticker.xml   |   27 +-
 .../default/xui/ja/floater_my_web_profile.xml |    9 -
 .../xui/ja/floater_new_local_inventory.xml    |  162 +-
 .../xui/ja/floater_particle_editor.xml        |  967 +------
 .../default/xui/ja/floater_profile_legacy.xml |   31 +-
 .../default/xui/ja/floater_progress_view.xml  |   78 +-
 .../default/xui/ja/floater_quick_settings.xml |   24 +-
 .../default/xui/ja/floater_region_tracker.xml |  101 +-
 .../default/xui/ja/floater_rlv_behaviours.xml |  136 +-
 .../default/xui/ja/floater_rlv_console.xml    |   84 +-
 .../default/xui/ja/floater_rlv_locks.xml      |   27 +-
 .../default/xui/ja/floater_rlv_strings.xml    |   80 +-
 .../skins/default/xui/ja/floater_script.xml   |   15 -
 .../xui/ja/floater_script_debug_panel.xml     |    2 -
 .../xui/ja/floater_script_ed_prefs.xml        |   11 +
 .../default/xui/ja/floater_search_replace.xml |  125 +-
 .../default/xui/ja/floater_side_bar_tab.xml   |   10 -
 .../default/xui/ja/floater_test_layout.xml    |   91 -
 .../default/xui/ja/floater_test_list_view.xml |   12 -
 .../xui/ja/floater_test_navigation_bar.xml    |   20 -
 .../default/xui/ja/floater_test_textbox.xml   |  240 --
 .../default/xui/ja/floater_test_toolbar.xml   |   62 -
 .../default/xui/ja/floater_test_widgets.xml   |  445 ---
 .../skins/default/xui/ja/floater_tools.xml    |    2 +
 .../default/xui/ja/floater_ui_preview.xml     |    1 +
 .../default/xui/ja/floater_url_entry.xml      |    2 +-
 .../default/xui/ja/floater_web_profile.xml    |    6 -
 .../default/xui/ja/floater_world_map.xml      |   32 +-
 .../skins/default/xui/ja/inspect_toast.xml    |   19 -
 .../default/xui/ja/inspector_info_ctrl.xml    |    9 -
 .../skins/default/xui/ja/main_view.xml        |  169 --
 .../default/xui/ja/menu_copy_color_picker.xml |   41 +-
 .../default/xui/ja/menu_inspect_options.xml   |  109 +-
 .../xui/ja/menu_message_log_filter.xml        |   59 +-
 .../skins/default/xui/ja/menu_mini_map.xml    |   24 +-
 .../skins/default/xui/ja/menu_object.xml      |   17 +
 .../xui/ja/menu_people_nearby_view.xml        |    3 +
 .../default/xui/ja/menu_profile_legacy.xml    |  156 +-
 .../skins/default/xui/ja/menu_viewer.xml      |   93 +-
 .../xui/ja/notification_visibility.xml        |    6 -
 .../skins/default/xui/ja/notifications.xml    |  340 ++-
 .../newview/skins/default/xui/ja/panel_ao.xml |  452 +--
 .../skins/default/xui/ja/panel_ao_mini.xml    |   62 +-
 .../default/xui/ja/panel_ao_pulldown.xml      |   16 -
 .../xui/ja/panel_blocked_list_item.xml        |   71 -
 .../skins/default/xui/ja/panel_chat_item.xml  |   30 -
 .../default/xui/ja/panel_chat_separator.xml   |    8 -
 .../skins/default/xui/ja/panel_edit_pick.xml  |  265 +-
 .../skins/default/xui/ja/panel_event_info.xml |  505 +---
 .../skins/default/xui/ja/panel_favorites.xml  |   22 -
 .../default/xui/ja/panel_generic_tip.xml      |   23 -
 .../default/xui/ja/panel_gltf_material.xml    |  426 +--
 .../skins/default/xui/ja/panel_hint.xml       |   31 -
 .../skins/default/xui/ja/panel_hint_image.xml |   49 -
 .../skins/default/xui/ja/panel_hud.xml        |   10 -
 .../skins/default/xui/ja/panel_login.xml      |   46 +-
 .../default/xui/ja/panel_login_first.xml      |   54 -
 .../default/xui/ja/panel_music_ticker.xml     |  125 +-
 .../skins/default/xui/ja/panel_pick_info.xml  |  216 +-
 .../default/xui/ja/panel_pick_list_item.xml   |   81 -
 .../xui/ja/panel_preferences_advanced.xml     |    1 +
 .../xui/ja/panel_preferences_chat_cmd.xml     |  351 +--
 .../xui/ja/panel_preferences_chat_general.xml |  671 +----
 .../xui/ja/panel_preferences_interface.xml    |  259 +-
 .../xui/ja/panel_preferences_move_general.xml |  262 +-
 .../xui/ja/panel_preferences_move_mlook.xml   |  168 +-
 .../xui/ja/panel_preferences_privacy.xml      |   11 +
 .../xui/ja/panel_preferences_sound.xml        |    2 +-
 .../xui/ja/panel_profile_legacy_firstlife.xml |   48 +-
 .../panel_profile_legacy_group_list_item.xml  |   81 -
 .../xui/ja/panel_profile_legacy_groups.xml    |   41 +-
 .../xui/ja/panel_profile_legacy_interests.xml |  283 +-
 .../xui/ja/panel_profile_legacy_notes.xml     |   37 +-
 .../xui/ja/panel_profile_legacy_picks.xml     |  171 +-
 .../ja/panel_profile_legacy_secondlife.xml    |  326 +--
 .../xui/ja/panel_profile_legacy_sidetray.xml  |  352 +--
 .../default/xui/ja/panel_quick_settings.xml   |  239 +-
 .../xui/ja/panel_quick_settings_pulldown.xml  |   16 -
 .../xui/ja/panel_radar_alert_toast.xml        |   38 +-
 .../skins/default/xui/ja/panel_rlv_locks.xml  |   59 +-
 .../xui/ja/panel_script_ed_preproc.xml        |  338 +--
 .../xui/ja/panel_search_classifieds.xml       |  126 +-
 .../default/xui/ja/panel_search_events.xml    |  225 +-
 .../default/xui/ja/panel_search_groups.xml    |  110 +-
 .../default/xui/ja/panel_search_landsales.xml |  206 +-
 .../default/xui/ja/panel_search_people.xml    |   38 +-
 .../default/xui/ja/panel_search_places.xml    |  119 +-
 .../skins/default/xui/ja/panel_search_web.xml |  136 -
 .../skins/default/xui/ja/panel_toast.xml      |   79 +-
 .../default/xui/ja/panel_toolbar_view.xml     |  188 --
 .../default/xui/ja/panel_topinfo_bar.xml      |  110 -
 .../skins/default/xui/ja/rlva_strings.xml     |  478 ++--
 .../newview/skins/default/xui/ja/strings.xml  |   71 +-
 122 files changed, 2375 insertions(+), 13833 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/ja/accordion_drag.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/accordion_parent.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/alert_button.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/alert_check_box.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/alert_icon.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/favorites_bar_button.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_fbc_web.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_generic_text.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_grid_status.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_my_web_profile.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_script.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_side_bar_tab.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_test_layout.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_test_list_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_test_navigation_bar.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_test_textbox.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_test_toolbar.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_test_widgets.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_web_profile.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/inspect_toast.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/inspector_info_ctrl.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/main_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/notification_visibility.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_ao_pulldown.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_blocked_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_chat_item.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_chat_separator.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_favorites.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_generic_tip.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_hint.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_hint_image.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_hud.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_login_first.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_pick_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_profile_legacy_group_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_quick_settings_pulldown.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_search_web.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_toolbar_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_topinfo_bar.xml

diff --git a/indra/newview/skins/default/xui/ja/accordion_drag.xml b/indra/newview/skins/default/xui/ja/accordion_drag.xml
deleted file mode 100644
index e8a705e7449..00000000000
--- a/indra/newview/skins/default/xui/ja/accordion_drag.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel  border_thickness="2" visible ="true" name="splitter_drag"
-  width="100"
-  height="5"
-  left="50"
-  top="50"
-  follows="left|bottom|right" background_visible="true" label="splitter_drag" title="" translate="false">
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/accordion_parent.xml b/indra/newview/skins/default/xui/ja/accordion_parent.xml
deleted file mode 100644
index e17a0dd351d..00000000000
--- a/indra/newview/skins/default/xui/ja/accordion_parent.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-  <panel  border_thickness="0" name="splitter_parent"
-    background_visible="true"
-       label="splitter_parent"
-       title=""
-       translate="false"
-    >
-  </panel>
diff --git a/indra/newview/skins/default/xui/ja/alert_button.xml b/indra/newview/skins/default/xui/ja/alert_button.xml
deleted file mode 100644
index a60e9afab11..00000000000
--- a/indra/newview/skins/default/xui/ja/alert_button.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-
-<button
-  name="Alert Button"
-  label_shadow="true"
-  auto_resize="false"
-  image_overlay_alignment="center"
-  use_ellipses="false"
-  pad_right="10"
-  pad_left="10"
-  is_toggle="false"
-  scale_image="true"
-  commit_on_return="true"
-  font="SansSerifSmall"
-  follows="bottom"/>
diff --git a/indra/newview/skins/default/xui/ja/alert_check_box.xml b/indra/newview/skins/default/xui/ja/alert_check_box.xml
deleted file mode 100644
index 5535a5dc2ae..00000000000
--- a/indra/newview/skins/default/xui/ja/alert_check_box.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<check_box
-  label_text.text_color="LabelTextColor"
-  label_text.text_readonly_color="LabelDisabledColor"
-  font="SansSerif"
-  follows="left|top"
-  name="check"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/alert_icon.xml b/indra/newview/skins/default/xui/ja/alert_icon.xml
deleted file mode 100644
index b0886fce061..00000000000
--- a/indra/newview/skins/default/xui/ja/alert_icon.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<icon color="1.0 1.0 1.0 1.0"
-      tab_stop="false"
-      mouse_opaque="false"
-      name="icon"
-      image_name="notify_caution_icon.tga" 
-      follows="left|top">
-</icon>
diff --git a/indra/newview/skins/default/xui/ja/favorites_bar_button.xml b/indra/newview/skins/default/xui/ja/favorites_bar_button.xml
deleted file mode 100644
index e7dd62eb642..00000000000
--- a/indra/newview/skins/default/xui/ja/favorites_bar_button.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- *NOTE: mantipov: top & height should be synchronized with <favorites_bar> in the panel_navigation_bar.xml-->
-<!-- All buttons in the Favorites bar will be created from this one -->
-<button
- follows="left|bottom"
- halign="center"
- height="15"
- image_disabled="transparent.j2c"
- image_disabled_selected="transparent.j2c"
- image_selected="transparent.j2c"
- image_unselected="transparent.j2c"
- image_pressed="Favorite_Link_Over"
- image_hover_selected="Favorite_Link_Over"
- image_hover_unselected="Favorite_Link_Over"
- hover_glow_amount="0.15"
- label_shadow="false"
- layout="topleft"
- left="0"
- name="favorites_bar_btn"
- pad_bottom="1"
- pad_left="11"
- pad_right="9"
- scale_image="true"
- tab_stop="false"
- bottom="0"
- use_ellipses="true"
- width="140" />
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index aac914b7146..22da7a41f7b 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -2,16 +2,46 @@
 <floater name="floater_about" title="[CAPITALIZED_APP_NAME]について">
   <tab_container name="about_tab">
     <panel label="情報" name="support_panel">
-      <!-- 正確には「クリップボードへコピー」字数制限のためコピーに変更 -->
-      <button label="コピー" name="copy_btn" />
-      <button label="更新の確認" name="update_btn" />
+      <icon name="viewer_logo" />
+      <icon name="discord_icon" tooltip="[APP_NAME]のDiscord"/>
+      <icon name="mastodon_icon" tooltip="[APP_NAME]のマストドン" />
+      <button tool_tip="更新がダウンロードできるかを確認します。" name="update_btn" label="更新を確認" />
+      <button name="copy_btn" label="情報をコピー" />
+      <text_editor name="support_editor"/>
     </panel>
     <panel label="クレジット" name="credits_panel">
-      <text name="linden_intro">Second Life は Lindens によって開発され、以下のオープンソースの貢献があります:</text>
-      <text_editor name="contrib_names">Dummy Nameは実行時間に置き換えられます。</text_editor>
+      <accordion name="credits_accordion">
+        <!-- Credits -->
+        <accordion_tab name="alchemy_credits_tab" title="Alchemy">
+          <panel name="alchemy_credits_panel">
+            <text name="alchemy_intro">Alchemy は、Alchemy Development Groupによって提供されています:</text>
+            <text_editor name="alchemy_names">Rye Cogtail
+Luminous Luminos
+Unexpectedly Dismantled
+Cinder Roxley
+Inusaito Kanya
+Zanibar Darkstone
+Doug Falta</text_editor>
+            <text name="alchemy_thanks_intro">スペシャルサンクス:</text>
+            <text_editor name="alchemy_supporter_names">実行時に置き換えられるダミー名</text_editor>
+          </panel>
+        </accordion_tab>
+        <accordion_tab name="sl_credits_tab" title="Second Life">
+          <panel name="sl_credits_panel">
+            <text name="linden_intro">Second Life は Lindens によって開発され、
+以下のオープンソースの貢献があります:</text>
+            <text_editor name="contrib_names">実行時に置き換えられるダミー名</text_editor>
+          </panel>
+        </accordion_tab>
+      </accordion>
     </panel>
+    <!-- Licences -->
     <panel label="ライセンス" name="licenses_panel">
-      <text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+      <text_editor name="licenses_editor">このライブラリはフリーソフトウェアです。Free Software Foundationによって公開されているGNU Lesser General Public Licenseの条件に基づいて、再配布したり変更したりすることができます。このディストリビューションのライセンスのバージョンは2.1でdoc/LGPL-licence.txtにあります。(オンラインでは、https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt を参照してください。)
+
+このライブラリは役立つことを期待して配布されていますが、いかなる保証もありません。商品性や特定目的への適合性についての暗黙の保証もありません。詳細については、GNU劣等一般公衆利用許諾書を参照してください。
+
+3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
 APR Copyright (C) 2011 The Apache Software Foundation
 Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
 cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
@@ -33,15 +63,13 @@ xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
 xxHash Copyright (C) 2012-2020 Yann Collet.
 zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
-Second Life ビューアでは Havok (TM) Physics が使用されています。
-(c)Copyright 1999-2010 Havok.com Inc. (and its Licensors).
-無断複写・複製・転載を禁じます。詳細については www.havok.com をご参照ください。
+Second Life ビューアでは Havok (TM) Physics が使用されています。(c)Copyright 1999-2010 Havok.com Inc. (and its Licensors).無断複写・複製・転載を禁じます。詳細については www.havok.com をご参照ください。
 
 このソフトウェアには、NVIDIA Corporationによるソースコードが含まれます。
 
 無断複写・複製・転載を禁じます。詳細については licenses.txt をご参照ください。
 
-ボイスチャットのオーディオコーディング:Polycom(R) Siren14(TM) (ITU-T Rec.G.722.1 Annex C)</text_editor>
+ボイスチャットのオーディオコーディング:Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)</text_editor>
     </panel>
   </tab_container>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_ao.xml b/indra/newview/skins/default/xui/ja/floater_ao.xml
index dca10029fd7..841a67a659a 100644
--- a/indra/newview/skins/default/xui/ja/floater_ao.xml
+++ b/indra/newview/skins/default/xui/ja/floater_ao.xml
@@ -1,32 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- positioning="centered"
- legacy_header_height="18"
- can_resize="true"
- can_dock="false"
- can_close="true"
- height="352"
- min_height="352"
- min_width="200"
- layout="topleft"
- name="ao"
- save_rect="true"
- save_visibility="true"
- single_instance="true"
- reuse_instance="false"
- save_dock_state="false"
- title="Animation Overrider"
- width="200">
-  <floater.string name="ao_no_sets_loaded">No Sets Loaded</floater.string>
-  <floater.string name="ao_no_animations_loaded">No Animations Loaded</floater.string>
-  <panel
-   name="animation_overrider_outer_panel"
-   filename="panel_ao.xml"
-   left="0"
-   top="16"
-   width="200"
-   height="334"
-   follows="all"
-   layout="topleft">
-  </panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ao" title="アニメーションオーバーライダー" width="200">
+  <floater.string name="ao_no_sets_loaded">セットは読み込まれていません。</floater.string>
+  <floater.string name="ao_no_animations_loaded">アニメーションは読み込まれていません。</floater.string>
+  <panel name="animation_overrider_outer_panel" filename="panel_ao.xml" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_asset_recovery.xml b/indra/newview/skins/default/xui/ja/floater_asset_recovery.xml
index 45ed375a223..af40190034a 100644
--- a/indra/newview/skins/default/xui/ja/floater_asset_recovery.xml
+++ b/indra/newview/skins/default/xui/ja/floater_asset_recovery.xml
@@ -1,111 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- can_close="false"
- can_minimize="false"
- can_resize="false"
- height="266"
- positioning="centered"
- name="asset_recovery"
- single_instance="true"
- title="ASSET RECOVERY"
- width="350">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="asset_recovery" title="アセット復元">
 
-  <text
-   follows="top|left|right"
-   font.style="BOLD"
-   height="75"
-   layout="topleft"
-   left="10"
-   length="1"
-   name="txt2"
-   top="0"
-   type="string"
-   word_wrap="true"
-   width="330">
-      [APP_NAME] has detected recoverable items that may have been left over from a recent viewer crash.
-  
-Recovered items will be placed in the 'Lost and Found' inventory folder.
+  <text name="txt2">[APP_NAME]は、最近のビューアのクラッシュで残った可能性のある復元可能なアイテムを検出しました。
+
+回収されたアイテムは「遺失物」インベントリフォルダーに置かれます。
   </text>
 
-  <scroll_list
-   draw_border="false"
-   draw_heading="true"
-   draw_stripes="true"
-   follows="all"
-   height="150"
-   layout="topleft"
-   left="8"
-   multi_select="false"
-   name="item_list"
-   top_pad="5"
-   width="334">
-    <scroll_list.columns
-     label=""
-     name="item_check"
-     width="20" />
-    <scroll_list.columns
-     label="Item Name"
-     name="item_name"
-     width="170" />
-    <scroll_list.columns
-     label="Item Type"
-     name="item_type"
-     width="70" />
+  <scroll_list name="item_list">
+    <scroll_list.columns label="" name="item_check" />
+    <scroll_list.columns label="アイテム名" name="item_name" />
+    <scroll_list.columns label="アイテム種別" name="item_type" />
   </scroll_list>
-  <panel
-   background_visible="false"
-   follows="left|right|bottom"
-    height="25"
-   label="bottom_panel"
-   layout="topleft"
-   left="6"
-   name="bottom_panel"
-   top_pad="4" >
-    <icon
-     follows="left|right"
-     height="25"
-     image_name="Toolbar_Left_Off"
-     left="0"
-     name="dummy_icon1"
-     top="1"
-     width="30" />
-    <button
-     height="25"
-     image_color="Green"
-     image_hover_unselected="Toolbar_Middle_Over"
-     image_selected="Toolbar_Middle_Selected"
-     image_unselected="Toolbar_Middle_Off"
-     label="Recover"
-     label_color="White"
-     left_pad="1"
-     name="recover_btn"
-     top="1"
-     width="120" />
-    <icon
-     follows="left|right"
-     height="25"
-     image_name="Toolbar_Middle_Off"
-     left_pad="1"
-     name="dummy_icon2"
-     top="1"
-     width="34" />    
-    <button
-     height="25"
-     image_hover_unselected="Toolbar_Middle_Over"
-     image_selected="Toolbar_Middle_Selected"
-     image_unselected="Toolbar_Middle_Off"
-     label="Cancel"
-     left_pad="1"
-     name="cancel_btn"
-     top="1"
-     width="120" />
-    <icon
-     height="25"
-     follows="left|right"
-     image_name="Toolbar_Right_Off"
-     left_pad="1"
-     name="dummy_icon3"
-     top="1"
-     width="30" />          
-  </panel> 
+  <panel label="ボトムパネル" name="bottom_panel">
+    <icon name="dummy_icon1" />
+    <button label="復元" name="recover_btn" />
+    <icon name="dummy_icon2" />
+    <button label="キャンセル" name="cancel_btn" />
+    <icon name="dummy_icon3" />
+  </panel>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml
index d6e51f08564..9aed53f41e1 100644
--- a/indra/newview/skins/default/xui/ja/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_build_options.xml
@@ -13,6 +13,7 @@
   </combo_box>
   <spinner label="単位(メートル)" name="GridResolution" />
   <spinner label="範囲(メートル)" name="GridDrawSize" />
+  <spinner label="角度(度)" name="RotationStep" tool_tip="回転ツールによるすべての回転は、この単位の倍数に制限されます。[デフォルト:1.0]"/>
   <check_box label="より細かい単位でスナップフィット" name="GridSubUnit" />
   <check_box label="横断面を表示" name="GridCrossSection" />
   <text name="grid_opacity_label" tool_tip="グリッドの不透明度">不透明度:</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_chat_alerts.xml b/indra/newview/skins/default/xui/ja/floater_chat_alerts.xml
index 7a66fec2bea..0cb1e17becc 100644
--- a/indra/newview/skins/default/xui/ja/floater_chat_alerts.xml
+++ b/indra/newview/skins/default/xui/ja/floater_chat_alerts.xml
@@ -1,239 +1,34 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- border="false"
- can_close="true"
- can_minimize="true"
- can_resize="false"
- height="370"
- name="floater_chat_alerts"
- positioning="centered"
- title="Chat Keyword Alerts"
- width="490">
-  <sound_drop_target
-   bottom="-5"
-   layout="topleft"
-   left="5"
-   name="sound_drop_target"
-   right="-5"
-   top="5" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_chat_alerts" title="チャットキーワードのアラート">
+  <sound_drop_target name="sound_drop_target" />
 
-  <check_box
-   control_name="ChatAlerts"
-   follows="left|top"
-   height="16"
-   label="Enable alerts"
-   layout="topleft"
-   left="20"
-   name="alerts_check"
-   top="10"
-   width="150" />
+  <check_box label="アラートを有効化" name="alerts_check" />
 
-  <scroll_list
-   draw_heading="true"
-   follows="all"
-   height="150"
-   layout="topleft"
-   left="20"
-   name="alerts_list"
-   top_pad="5"
-   width="450">
-      <scroll_list.columns
-       label="Keyword"
-       name="alert_keyword" />
+  <scroll_list draw_heading="true" name="alerts_list">
+    <scroll_list.columns label="キーワード" name="alert_keyword" />
   </scroll_list>
-  <button
-   follows="left|bottom"
-   height="22"
-   label="New"
-   layout="topleft"
-   left="20"
-   name="alerts_new_btn"
-   top_pad="5"
-   width="90" />
-  <button
-   follows="left|bottom"
-   height="22"
-   label="Delete"
-   layout="topleft"
-   left_pad="5"
-   name="alerts_delete_btn"
-   top_delta="0"
-   width="90" />
+  <button label="新規" name="alerts_new_btn" />
+  <button label="削除" name="alerts_delete_btn" />
 
-  <view_border
-   bevel_style="none"
-   border_thickness="1"
-   follows="left|bottom"
-   height="0"
-   layout="topleft"
-   left="20"
-   name="divisor"
-   top_pad="10"
-   width="450" />
+  <view_border name="divisor" />
 
-  <text
-   follows="left|bottom"
-   height="10"
-   layout="topleft"
-   left="20"
-   name="alerts_keyword_label"
-   text_readonly_color="LabelDisabledColor"
-   top_pad="15"
-   type="string"
-   width="100">
-    Keyword :
-  </text>
-  <line_editor
-   follows="left|bottom"
-   height="23"
-   layout="topleft"
-   left_pad="5"
-   name="alerts_keyword"
-   top_delta="-5"
-   width="225" />
-  <check_box
-   follows="left|bottom"
-   height="16"
-   layout="topleft"
-   label="Case-sensitive"
-   left_pad="10"
-   name="alerts_keyword_case"
-   top_delta="3"
-   width="100" />
+  <text name="alerts_keyword_label">キーワード:</text>
+  <line_editor name="alerts_keyword" />
+  <check_box label="大文字と小文字を区別" name="alerts_keyword_case" />
 
-  <text
-   follows="top|bottom"
-   height="10"
-   layout="topleft"
-   left="20"
-   name="alerts_color_label"
-   text_readonly_color="LabelDisabledColor"
-   top_pad="12"
-   type="string"
-   width="100"
-  >
-    Highlight Color :
-  </text>
-  <color_swatch
-   can_apply_immediately="true"
-   color="Red"
-   follows="left|bottom"
-   height="24"
-   label_height="0"
-   layout="topleft"
-   left_pad="6"
-   name="alerts_highlight_color"
-   top_delta="-5"
-   width="44" >
-  </color_swatch>
+  <text name="alerts_color_label">ハイライトカラー:</text>
+  <color_swatch name="alerts_highlight_color" />
 
-  <text
-   follows="left|bottom"
-   height="10"
-   layout="topleft"
-   left="20"
-   name="alerts_sound_label"
-   text_readonly_color="LabelDisabledColor"
-   top_pad="10"
-   type="string"
-   width="100"
-  >
-    Play sound :
-  </text>
-  <line_editor
-   enabled="false"
-   follows="bottom|left|right"
-   halign="center"
-   height="23"
-   label="Drag and drop inventory item here"
-   layout="topleft"
-   left_pad="5"
-   max_length_bytes="90"
-   name="alerts_sound_name"
-   tab_stop="false"
-   text_color="EmphasisColor"
-   text_pad_left="25"
-   text_pad_right="23"
-   text_tentative_color="EmphasisColor"
-   top_delta="-5"
-   width="300" />
-  <icon
-   enabled="false"
-   follows="bottom|left"
-   height="15"
-   layout="topleft"
-   left_delta="5"
-   mouse_opaque="true"
-   name="alerts_sound_icon"
-   visible="false"
-   top_delta="3"
-   width="15" />
-  <button
-   follows="bottom|right"
-   height="13"
-   image_unselected="Icon_Close_Toast"
-   image_selected="Icon_Close_Toast"
-   layout="topleft"
-   left_delta="275"
-   name="alerts_sound_clear_btn"
-   top_delta="2"
-   visible="false"
-   width="13" />
+  <text name="alerts_sound_label">再生するサウンド:</text>
+  <line_editor label="イベントリ内のアイテムをここにドラッグ・アンド・ドロップ" name="alerts_sound_name" />
+  <icon name="alerts_sound_icon" />
+  <button name="alerts_sound_clear_btn" />
 
-  <text
-   follows="top|bottom"
-   height="10"
-   layout="topleft"
-   left="20"
-   name="alerts_trigger_label"
-   text_readonly_color="LabelDisabledColor"
-   top_pad="12"
-   type="string"
-   width="100">
-    Trigger on :
-  </text>
-  <check_box
-   follows="left|bottom"
-   height="16"
-   label="Chat"
-   layout="topleft"
-   left_pad="5"
-   name="alerts_trigger_chat"
-   width="50"
-   top_delta="0" />
-  <check_box
-   follows="left|bottom"
-   height="16"
-   label="IMs"
-   layout="topleft"
-   left_pad="15"
-   name="alerts_trigger_im"
-   width="50"
-   top_delta="0" />
-  <check_box
-   follows="left|bottom"
-   height="16"
-   label="Groups"
-   layout="topleft"
-   left_pad="15"
-   name="alerts_trigger_group"
-   width="50"
-   top_delta="0" />
+  <text name="alerts_trigger_label">トリガー:</text>
+  <check_box label="チャット" name="alerts_trigger_chat" />
+  <check_box label="IM" name="alerts_trigger_im" />
+  <check_box label="グループ" name="alerts_trigger_group" />
 
-  <button
-   height="22"
-   follows="left|bottom"
-   name="alerts_save_btn"
-   label="Save Entry"
-   left="20"
-   top_pad="10"
-   width="90" />
-  <button
-   height="22"
-   follows="left|bottom"
-   name="alerts_revert_btn"
-   label="Revert Entry"
-   left_pad="10"
-   top_delta="0"
-   width="90" />
-</floater>
+  <button name="alerts_save_btn" label="エントリを保存" />
+  <button name="alerts_revert_btn" label="エントリを復元" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_combobox_ok_cancel.xml b/indra/newview/skins/default/xui/ja/floater_combobox_ok_cancel.xml
index 63eaffde18f..216a3a181c1 100644
--- a/indra/newview/skins/default/xui/ja/floater_combobox_ok_cancel.xml
+++ b/indra/newview/skins/default/xui/ja/floater_combobox_ok_cancel.xml
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<floater
- legacy_header_height="18"
- height="130"
- min_height="130"
- width="270"
- min_width="270"
- layout="topleft"
- name="floater_combo"
- title="floater_combo"
- help_topic="floater_combo"
- can_resize="false"
- can_minimize="false">
-    <text
-     follows="top|left|right"
-     height="10"
-     layout="topleft"
-     left="20"
-     name="combo_text"
-     top="30"
-     width="200">
-     Select an option:
-    </text>
-    <combo_box
-     follows="top|left"
-     layout="topleft"
-     left="20"
-     name="combo_options"
-     top_delta="20"
-     width="230"/>
-    <button
-     follows="top|left"
-     height="23"
-     label="OK"
-     layout="topleft"
-     top_delta="40"
-     left="20"
-     name="combo_ok"
-     width="90"/>
-    <button
-     follows="top|left"
-     height="23"
-     label="Cancel"
-     layout="topleft"
-     left_pad="50"
-     name="combo_cancel"
-     width="90"/>
-</floater>
+<floater name="floater_combo" title="フローターのコンボ">
+  <text name="combo_text">オプションを選択:</text>
+  <combo_box name="combo_options" />
+  <button label="OK" name="combo_ok" />
+  <button label="キャンセル" name="combo_cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_directory.xml b/indra/newview/skins/default/xui/ja/floater_directory.xml
index 3c6d0cb7fee..dcd1b6e9694 100644
--- a/indra/newview/skins/default/xui/ja/floater_directory.xml
+++ b/indra/newview/skins/default/xui/ja/floater_directory.xml
@@ -1,291 +1,40 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- single_instance="true"
- can_resize="true"
- height="590"
- min_height="135"
- min_width="430"
- layout="topleft"
- name="search"
- save_rect="true"
- title="SEARCH"
- width="602">
-  <floater.string
-   name="not_found">
-&apos;[TEXT]&apos; not found
-  </floater.string>
-  <floater.string
-   name="no_results">
-No results
-  </floater.string>
-  <floater.string
-   name="result_spillover">
-Over [TOTAL] results Showing [VISIBLE_BEGIN]/[VISIBLE_END]
-  </floater.string>
-  <floater.string
-   name="result_count">
-[TOTAL] results.
-  </floater.string>
-  <floater.string
-   name="searching">
-Searching...
-  </floater.string>
-  <floater.string
-   name="all_categories">
-All Categories
-  </floater.string>
-  <floater.string
-   name="search_banned">
-Some terms in your search query were excluded due to content restrictions as clarified in the Community Standards.
-  </floater.string>
-  <floater.string
-   name="search_short">
-Your search terms were too short so no search was performed.
-  </floater.string>
-  <floater.string
-   name="search_disabled">
-Directory search is disabled in this region.
-  </floater.string>
-  <floater.string
-   name="search_no_date_offset">
-Your search terms were missing the date offset.
-  </floater.string>
-  <floater.string
-   name="search_no_catgory">
-Your search terms were missing a category.
-  </floater.string>
-  <floater.string
-   name="search_no_query">
-Your search terms were missing a query string.
-  </floater.string>
-  <tab_container
-   border="true"
-   follows="all"
-   top="16"
-   left="0"
-   height="573"
-   width="602"
-   name="search_tabs"
-   tab_min_width="70"
-   tab_position="top">
-    <panel
-     border="false"
-     label="People"
-     filename="panel_search_people.xml"
-     class="panel_search_people"
-     name="panel_search_people"
-     follows="left|top|right"
-     layout="topleft"
-     left="0"
-     top="0"
-     bottom="-16" />
-    <panel
-     border="false"
-     label="Groups"
-     filename="panel_search_groups.xml"
-     class="panel_search_groups"
-     name="panel_search_groups"
-     follows="left|top|right"
-     layout="topleft"
-     left="0"
-     top="0"
-     bottom="-1" />
-    <panel
-     border="false"
-     label="Places"
-     filename="panel_search_places.xml"
-     class="panel_search_places"
-     name="panel_search_places"
-     follows="left|top|right"
-     layout="topleft"
-     left="0"
-     top="0"
-     bottom="-1" />
-    <panel
-     border="false"
-     label="Land"
-     filename="panel_search_landsales.xml"
-     class="panel_search_landsales"
-     name="panel_search_landsales"
-     follows="left|top|right"
-     layout="topleft"
-     left="0"
-     top="0"
-     bottom="-1" />
-    <panel
-     border="false"
-     label="Events"
-     filename="panel_search_events.xml"
-     class="panel_search_events"
-     name="panel_search_events"
-     follows="left|top|right"
-     layout="topleft"
-     left="0"
-     top="0"
-     bottom="-1" />
-    <panel
-     border="false"
-     label="Classifieds"
-     filename="panel_search_classifieds.xml"
-     class="panel_search_classifieds"
-     name="panel_search_classifieds"
-     follows="left|top|right"
-     layout="topleft"
-     left="0"
-     top="0"
-     bottom="-1" />
-    <panel
-     border="false"
-     label="AltaVista"
-     filename="panel_search_web.xml"
-     class="panel_search_web"
-     name="panel_search_web"
-     follows="all"
-     layout="topleft"
-     left="0"
-     top="0"
-     bottom="-1" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="search" title="検索">
+  <floater.string name="not_found">「[TEXT]」は見つかりませんでした。</floater.string>
+  <floater.string name="no_results">結果なし</floater.string>
+  <floater.string name="result_spillover">[TOTAL]件以上ヒットしました。[VISIBLE_BEGIN]~[VISIBLE_END]件を表示しています。</floater.string>
+  <floater.string name="result_count">[TOTAL]件ヒットしました。</floater.string>
+  <floater.string name="searching">検索しています…</floater.string>
+  <floater.string name="all_categories">すべてのカテゴリ</floater.string>
+  <floater.string name="search_banned">コミュニティ標準で明確にされているコンテンツ制限により、検索クエリ内の一部の用語が除外されました。</floater.string>
+  <floater.string name="search_short">検索語句が短すぎるため、検索は実行されませんでした。</floater.string>
+  <floater.string name="search_disabled">このリージョンでは、ディレクトリ検索が無効になっています。</floater.string>
+  <floater.string name="search_no_date_offset">検索語句に日付オフセットがありませんでした。</floater.string>
+  <floater.string name="search_no_catgory">検索語句にカテゴリがありませんでした。</floater.string>
+  <floater.string name="search_no_query">検索語句にクエリ文字列がありませんでした。</floater.string>
+  <tab_container name="search_tabs">
+    <panel label="人物" name="panel_search_people" />
+    <panel label="グループ" />
+    <panel label="場所" />
+    <panel label="ランド" />
+    <panel label="イベント" />
+    <panel label="クラシファイド広告" />
+    <panel label="AltaVista" />
   </tab_container>
- <layout_stack
-  follows="all"
-  animate="false"
-  top="86"
-  height="480"
-  left="0"
-  right="-1"
-  drag_handle_gap="2"
-  drag_handle_first_indent="1"
-  drag_handle_second_indent="1"
-  layout="topleft"
-  name="results_stack"
-  orientation="horizontal"
-  show_drag_handle="true">
-   <layout_panel
-    border="true"
-    auto_resize="true"
-    user_resize="true"
-    layout="topleft"
-    top="0"
-    left="0"
-    width="300"
-    bottom="-1"
-    min_height="10"
-    name="results_lp">
-     <scroll_list
-      layout="topleft"
-      top="1"
-      left="2"
-      width="300"
-      bottom="-1"
-      column_padding="0"
-      draw_heading="true"
-      follows="left|right|top|bottom"
-      multi_select="true"
-      name="results"
-      search_column="0" />
-   </layout_panel>
-   <layout_panel
-    border="true"
-    auto_resize="true"
-    user_resize="true"
-    layout="topleft"
-    top="0"
-    bottom="-1"
-    left="405"
-    width="313"
-    min_height="10"
-    name="detail_lp">
-     <panel
-      follows="all"
-      name="detail_avatar"
-      top="0"
-      bottom="-1"
-      left="0"
-      width="313"
-      class="panel_profile_legacy_sidetray"
-      filename="panel_profile_legacy_sidetray.xml" />
-     <panel
-      follows="all"
-      name="detail_group"
-      top="0"
-      bottom="-1"
-      left="0"
-      width="313"
-      class="panel_group_info_sidetray"
-      filename="panel_group_info_sidetray.xml" />
-     <panel
-      follows="all"
-      name="detail_place"
-      top="0"
-      bottom="-1"
-      left="0"
-      width="313"
-      class="panel_places"
-      filename="panel_places.xml" />
-     <panel
-      follows="all"
-      name="detail_event"
-      top="0"
-      bottom="-1"
-      left="0"
-      width="313"
-      class="panel_event_info"
-     filename="panel_event_info.xml" />
-     <panel
-      follows="all"
-      name="detail_classified"
-      top="0"
-      bottom="-1"
-      left="0"
-      width="313"
-      class="panel_classified_info"
-      filename="panel_classified_info.xml" />
-   </layout_panel>
- </layout_stack>
- <text
-  follows="bottom|left"
-  height="16"
-  layout="topleft"
-  left="4"
-  name="results_status"
-  top_pad="3"
-  value="[TOTAL] results"
-  width="205" />
- <button
-  follows="bottom|left"
-  height="16"
-  width="16"
-  image_unselected="Arrow_Left"
-  image_disabled="Arrow_Left_Off"
-  image_disabled_selected="Arrow_Left_Off"
-  image_selected="Arrow_Left"
-  image_pressed="Arrow_Left"
-  image_top_pad="0"
-  layout="topleft"
-  left_pad="5"
-  name="PageDn"
-  top_delta="0" />
- <button
-  follows="bottom|left"
-  height="16"
-  width="16"
-  image_unselected="Arrow_Right"
-  image_disabled="Arrow_Right_Off"
-  image_disabled_selected="Arrow_Right_Off"
-  image_selected="Arrow_Right"
-  image_pressed="Arrow_Right"
-  image_top_pad="0"
-  layout="topleft"
-  left_pad="5"
-  name="PageUp"
-  top_delta="0" />
- <loading_indicator
-  follows="bottom|right"
-  height="16"
-  layout="topleft"
-  right="-4"
-  name="loading"
-  top_delta="0"
-  width="16" />
-</floater>
+  <layout_stack name="results_stack">
+    <layout_panel name="results_lp">
+      <scroll_list name="results" />
+    </layout_panel>
+    <layout_panel name="detail_lp">
+      <panel name="detail_avatar" />
+      <panel name="detail_group" />
+      <panel name="detail_place" />
+      <panel name="detail_event" />
+      <panel name="detail_classified" />
+    </layout_panel>
+  </layout_stack>
+  <text name="results_status" value="[TOTAL]件" />
+  <button name="PageDn" />
+  <button name="PageUp" />
+  <loading_indicator name="loading" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml
index 32c3f4d9cf9..600dedd85f7 100644
--- a/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="HoverHeight" title="ホバー高さの設定">
   <slider label="高さ" name="HoverHeightSlider" />
+  <check_box label="カメラ位置を固定" name="BindCameraCheck" />
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml
index b4b3e2c09d2..918bd1232ac 100644
--- a/indra/newview/skins/default/xui/ja/floater_event.xml
+++ b/indra/newview/skins/default/xui/ja/floater_event.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater label="イベント" name="Event" title="イベントの情報">
-  <floater.string name="loading_text">読み込んでいます…</floater.string>
-  <floater.string name="done_text">完了</floater.string>
-  <web_browser name="browser" />
-  <text name="status_text" />
+  <panel name="event_panel" />
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_explore_sounds.xml b/indra/newview/skins/default/xui/ja/floater_explore_sounds.xml
index 9b3655a4b3e..f8285a1bcd0 100644
--- a/indra/newview/skins/default/xui/ja/floater_explore_sounds.xml
+++ b/indra/newview/skins/default/xui/ja/floater_explore_sounds.xml
@@ -1,55 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- can_close="true"
- can_minimize="true"
- positioning="centered"
- can_resize="true"
- height="300"
- width="550"
- min_width="550"
- min_height="170"
- name="sound_explorer"
- title="Sounds"
- save_rect="true"
- save_visibility="true"
- single_instance="true"
- reuse_instance="false">
-	<floater.string name="Playing">
-		Playing
-	</floater.string>
-	<floater.string name="NotPlaying">
-		[TIME] min ago
-	</floater.string>
-	<floater.string name="Type_UI">
-		UI
-	</floater.string>
-	<floater.string name="Type_Avatar">
-		Avatar
-	</floater.string>
-	<floater.string name="Type_llTriggerSound">
-		llTriggerSound
-	</floater.string>
-	<floater.string name="Type_llLoopSound">
-		llLoopSound
-	</floater.string>
-	<floater.string name="Type_llPlaySound">
-		llPlaySound
-	</floater.string>
-	<check_box follows="top|left" bottom_delta="20" left="5" width="64" name="avatars_chk" label="Avatars" />
-	<check_box follows="top|left" bottom_delta="0" left_delta="64" width="64" name="objects_chk" label="Objects" initial_value="true" />
-	<check_box follows="top|left" bottom_delta="0" left_delta="64" width="160" name="collision_chk" label="Default Collision Sounds" />
-	<check_box follows="top|left" bottom_delta="0" left_delta="160" width="110" name="repeated_asset_chk" label="Repeated Asset" />
-	<check_box follows="top|left" bottom_delta="0" left_delta="110" width="80" name="pause_chk" label="Pause Log" initial_value="false"/>
-	<scroll_list column_padding="0" draw_heading="true" follows="all" left="10" multi_select="true" name="sound_list" search_column="0" top="40" right="-10" bottom="-60">
-		<columns dynamicwidth="false" width="80" label="Playing" name="playing" />
-		<columns dynamicwidth="false" width="100" label="Type" name="type" />
-		<columns dynamicwidth="true" label="Owner" name="owner" />
-		<columns dynamicwidth="false" width="0" label="Sound" name="sound" />
-	</scroll_list>
-	<button bottom_delta="25" follows="left|bottom" height="20" label="Play Locally" name="play_locally_btn" left="10" width="95" enabled="false"/>
-	<button bottom_delta="0" follows="left|bottom" height="20" label="Stop Locally" name="stop_locally_btn" left_delta="100" width="95" enabled="false"/>
-	<button bottom_delta="0" follows="left|bottom" height="20" label="Look At" name="look_at_btn" left_delta="100" width="95" enabled="false"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="sound_explorer" title="サウンド">
+  <floater.string name="Playing">再生中</floater.string>
+  <floater.string name="NotPlaying">[TIME]分前</floater.string>
+  <floater.string name="Type_UI">UI</floater.string>
+  <floater.string name="Type_Avatar">アバター</floater.string>
+  <floater.string name="Type_llTriggerSound">llTriggerSound関数</floater.string>
+  <floater.string name="Type_llLoopSound">llLoopSound関数</floater.string>
+  <floater.string name="Type_llPlaySound">llPlaySound関数</floater.string>
+  <check_box name="avatars_chk" label="アバター" />
+  <check_box name="objects_chk" label="オブジェクト" />
+  <check_box name="collision_chk" label="デフォルトのぶつかり音" />
+  <check_box name="repeated_asset_chk" label="繰り返しアセット" />
+  <check_box name="pause_chk" label="一時停止ログ" />
+  <scroll_list name="sound_list">
+    <columns label="再生中" name="playing" />
+    <columns label="種別" name="type" />
+    <columns label="所有者" name="owner" />
+    <columns label="サウンド" name="sound" />
+  </scroll_list>
+  <button label="ローカルで再生" name="play_locally_btn" />
+  <button label="ローカルで停止" name="stop_locally_btn" />
+  <button label="見る" name="look_at_btn" />
 
-	<button bottom_delta="0" follows="left|bottom" height="20" label="Stop" name="stop_btn" right="-10" width="95" enabled="false"/>
-	<button bottom_delta="0" follows="left|bottom" height="20" label="Blacklist" name="bl_btn" right="-110" width="95" enabled="false" visible="false"/>
-</floater>
+  <button label="停止" name="stop_btn" />
+  <button label="ブラックリスト" name="bl_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_fbc_web.xml b/indra/newview/skins/default/xui/ja/floater_fbc_web.xml
deleted file mode 100644
index ab29b442ccd..00000000000
--- a/indra/newview/skins/default/xui/ja/floater_fbc_web.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_fbc_web" filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_generic_text.xml b/indra/newview/skins/default/xui/ja/floater_generic_text.xml
deleted file mode 100644
index c0f6ed0b045..00000000000
--- a/indra/newview/skins/default/xui/ja/floater_generic_text.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true"
- single_instance="false"
- can_drag_on_left="false"
- can_minimize="true"
- can_resize="true"
- height="258"
- width="258"
- min_width="214"
- min_height="100"
- name="floater_generic_text"
- title="INFO">
-  <text_editor
-   type="string"
-   length="1"
-   enabled="false"
-   follows="left|top|right|bottom"
-   font="SansSerif"
-   height="200"
-   layout="topleft"
-   top="4"
-   bottom="-32"
-   left="4"
-   right="-4"
-   max_length="65536"
-   name="payload"
-   word_wrap="true">
-It doesn't matter what comes, fresh goes better in life, with Mentos fresh and full of Life! Nothing gets to you, stayin' fresh, stayin' cool, with Mentos fresh and full of life! Fresh goes better! Mentos freshness! Fresh goes better with Mentos, fresh and full of life! Mentos! The Freshmaker!
-  </text_editor>
-  <button
-   follows="right|bottom"
-   label="Copy"
-   name="copy_btn"
-   left="49"
-   top_pad="2"
-   height="26"
-   width="100">
-    <button.commit_callback
-     function="GenericText.Copy" />
-  </button>
-  <button
-   follows="right|bottom"
-   label="Close"
-   name="close_btn"
-   left_pad="4"
-   top_delta="0"
-   height="26"
-   width="100">
-    <button.commit_callback
-     function="GenericText.Close" />
-  </button>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_grid_status.xml b/indra/newview/skins/default/xui/ja/floater_grid_status.xml
deleted file mode 100644
index bf782042824..00000000000
--- a/indra/newview/skins/default/xui/ja/floater_grid_status.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-  positioning="cascading"
-  legacy_header_height="18"
-  can_resize="true"
-  height="775"
-  layout="topleft"
-  min_height="485"
-  min_width="485"
-  name="floater_grid_status"
-  help_topic="floater_grid_status"
-  save_rect="true"
-  save_visibility="true"
-  title=""
-  width="780"
-  tab_stop="true"
-  filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_group_profile.xml b/indra/newview/skins/default/xui/ja/floater_group_profile.xml
index d7a874afc91..e94aa878360 100644
--- a/indra/newview/skins/default/xui/ja/floater_group_profile.xml
+++ b/indra/newview/skins/default/xui/ja/floater_group_profile.xml
@@ -1,39 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-  positioning="cascading"
-  can_close="true"
-  can_resize="true"
-  height="580"
-  min_height="350"
-  min_width="260"
-  layout="topleft"
-  name="floater_group_profile"
-  save_rect="true"
-  title="GROUP"
-  width="370">
-	<floater.string name="title_create_group">
-		CREATE NEW GROUP...
-	</floater.string>
-  <panel
-    class="panel_group_info_sidetray"
-    name="panel_group_info_sidetray"
-    filename="panel_group_info_sidetray.xml"
-    visible="true"
-    background_visible="false"
-    follows="all"
-    layout="topleft"
-    left="0"
-    top="0"
-    width="373"
-    height="577"/>
-  <panel
-    class="panel_group_creation_sidetray"
-    name="panel_group_creation_sidetray"
-    filename="panel_group_creation_sidetray.xml"
-    visible="false"
-    background_visible="false"
-    follows="all"
-    layout="topleft"
-    top="0"
-    width="369"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_group_profile" title="グループ">
+  <floater.string name="title_create_group">新しいグループを作成</floater.string>
+  <panel name="panel_group_info_sidetray" />
+  <panel name="panel_group_creation_sidetray" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_hex_editor.xml b/indra/newview/skins/default/xui/ja/floater_hex_editor.xml
index 549856900e3..1e771d93d5a 100644
--- a/indra/newview/skins/default/xui/ja/floater_hex_editor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hex_editor.xml
@@ -1,14 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="197" width="580" min_width="580" min_height="128"  
-     name="asset_hex_editor" title="Hex Editor" save_rect="true" positioning="cascading">
-  <hex_editor name="hex" follows="left|top|right|bottom" left="5" top="5" width="570" height="170" visible="true"/>
-  <slider can_edit_text="false" top_pad="0" control_name="column_count"
-			decimal_digits="3" follows="left|bottom" height="16" increment="1"
-			label="Columns" left="10" max_val="48" min_val="8"
-			mouse_opaque="true" name="column_count" show_text="false" value="16"
-			width="100" />
-  <text name="status_text" follows="left|bottom" width="300" left="120" top_delta="0" height="20">[STATUS]</text>
-	<button name="upload_btn" follows="right|bottom" right="-120" width="100" top_delta="-5" label="[UPLOAD]" enabled="false"/>
-	<button name="save_btn" follows="right|bottom" right="-10" width="100" top_delta="0" label="Save" enabled="false"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="asset_hex_editor" title="HEXエディタ">
+  <hex_editor name="hex" />
+  <slider label="行数" name="column_count" />
+  <text name="status_text">[STATUS]</text>
+  <button name="upload_btn" label="[UPLOAD]" />
+  <button name="save_btn" label="保存" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_legacy_sys_well.xml b/indra/newview/skins/default/xui/ja/floater_legacy_sys_well.xml
index dad3d813cde..43b467cf994 100644
--- a/indra/newview/skins/default/xui/ja/floater_legacy_sys_well.xml
+++ b/indra/newview/skins/default/xui/ja/floater_legacy_sys_well.xml
@@ -1,40 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
- legacy_header_height="18"
- bevel_style="in"
- layout="topleft"
- name="legacy_sys_well_window"
- help_topic="notification_chiclet"
- save_rect="true"
- title="NOTIFICATIONS"
- width="320"
- min_width="320"
- height="23"
- can_minimize="false"
- can_tear_off="false"
- can_resize="true"
- can_drag_on_left="false"
- can_dock="true"
- save_dock_state="true"
- save_visibility="true"
- single_instance="true"
->
-    <string
-     name="title_im_well_window">
-        CONVERSATIONS
-    </string>
-	<string
-     name="title_notification_well_window">
-		NOTIFICATIONS
-	</string>
+<floater name="legacy_sys_well_window" title="通知">
+  <string name="title_im_well_window">会話</string>
+  <string name="title_notification_well_window">通知</string>
 
-    <flat_list_view
-	    color="FloaterDefaultBackgroundColor"
-	    follows="all"
-	    layout="topleft"
-	    name="notification_list"
-	    left="1"
-	    top="20"
-	    height="0"
-	    width="318"/>
-</floater>
+  <flat_list_view name="notification_list" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_lightbox_settings.xml b/indra/newview/skins/default/xui/ja/floater_lightbox_settings.xml
index 6559c50139b..f2c5e2620e2 100644
--- a/indra/newview/skins/default/xui/ja/floater_lightbox_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lightbox_settings.xml
@@ -1,2177 +1,278 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- width="365"
- height="340"
- layout="topleft"
- min_height="340"
- min_width="365"
- name="floater_lightbox_settings"
- positioning="cascading"
- title="LIGHTBOX WORK IN PROGRESS" 
- save_rect="true"
- can_resize="false"
- can_resize_height="false">
-  <tab_container 
-		top_pad="0" 
-		enabled="true" 
-		follows="left|top" 
-		height="340" 
-		mouse_opaque="false" 
-		name="lightbox_tab_container" 
-		tab_position="top"
-		tab_stop="false" 
-		tab_min_width="70"
-		width="363">
-			<!--Image Panel-->
-			<panel
-				label="Image"
-				class="colortone_settings"
-				layout="topleft"
-				name="colortone_settings"
-				can_resize="false">
-				<!--LUT Control-->
-				<text
-					follows="left|top"
-					height="15"
-					left="10"
-					top_pad="8"
-					width="60"
-					layout="topleft"
-					tool_tip="What Colorgrading LUT (Look Up Texture) to be used to colorgrade the image. Custom LUTs require the full filename!"
-					value="Active LUT:" />
-				<!--TODO: Make more flexible?-->
-				<combo_box
-					allow_text_entry="true"
-					tool_tip="What Colorgrading LUT (Look Up Texture) to be used to colorgrade the image. Custom LUTs require the full filename!"
-					control_name="RenderColorGradeLUT"
-					follows="left|top"
-					layout="topleft"
-					right="-4"
-					max_chars="200"
-					name="colorlut_combo"
-					top_pad="-21"
-					width="265">
-					<combo_box.item
-						label="None"
-						name="lut_none"
-						value="" />
-					<combo_box.item
-						label="Neutral"
-						name="lut_neutral"
-						value="NeutralLUT.png" />
-					<combo_box.item
-						label="CrossProcess - Warm"
-						name="lut_xprocess_warm"
-						value="CrossWarm.png" />
-					<combo_box.item
-						label="CrossProcess - Cool"
-						name="lut_xprocess_cool"
-						value="CrossCool.png" />
-					<combo_box.item
-						label="Acid Trip"
-						name="lut_acidTrip"
-						value="AcidTrip.png" />
-					<combo_box.item
-						label="Battleblue"
-						name="lut_battleblue"
-						value="Battleblue.png" />
-					<combo_box.item
-						label="Crunchy"
-						name="lut_crunchy"
-						value="Crunchy.png" />
-					<combo_box.item
-						label="Dreary"
-						name="lut_dreary"
-						value="Dreary.png" />
-					<combo_box.item
-						label="Fall Painty"
-						name="lut_fallPainty"
-						value="FallPainty.png" />
-					<combo_box.item
-						label="Harshness"
-						name="lut_harshness"
-						value="Harshness.png" />
-					<combo_box.item
-						label="Nuked"
-						name="lut_nuked"
-						value="Nuked.png" />
-					<combo_box.item
-						label="OG Boy"
-						name="lut_ogBoy"
-						value="OGBoy.png" />
-					<combo_box.item
-						label="Old Photo"
-						name="lut_oldPhoto"
-						value="OldPhoto.png" />
-					<combo_box.item
-						label="Pastel Dreams"
-						name="lut_pastelDreams"
-						value="PastelDreams.png" />
-					<combo_box.item
-						label="Purple Haze"
-						name="lut_purpleHaze"
-						value="PurpleHaze.png" />
-					<combo_box.item
-						label="Sickly Blue"
-						name="lut_sicklyBlue"
-						value="SicklyBlue.png" />
-					<combo_box.item
-						label="Sinner 1"
-						name="lut_sinner1"
-						value="Sinner.png" />
-					<combo_box.item
-						label="Sinner 2"
-						name="lut_sinner2"
-						value="Sinner2.png" />
-					<combo_box.item
-						label="Tealness"
-						name="lut_tealness"
-						value="Tealness.png" />
-					<combo_box.item
-						label="Toonland"
-						name="lut_toonland"
-						value="Toonland.png" />
-					<combo_box.item
-						label="Warm"
-						name="lut_warm"
-						value="Warm.png" />
-					<combo_box.item
-						label="A E S T H E T I C S  1"
-						name="lut_AST1"
-						value="AESTHETICS_1.png" />
-					<combo_box.item
-						label="A E S T H E T I C S  2"
-						name="lut_AST2"
-						value="AESTHETICS_2.png" />
-					<combo_box.item
-						label="A E S T H E T I C S  3"
-						name="lut_AST3"
-						value="AESTHETICS_3.png" />
-					<combo_box.item
-						label="A E S T H E T I C S  4"
-						name="lut_AST4"
-						value="AESTHETICS_4.png" />
-					<combo_box.item
-						label="A E S T H E T I C S  5"
-						name="lut_AST5"
-						value="AESTHETICS_5.png" />
-				</combo_box>
-				<!--Sharpen Controls-->
-				<text
-					follows="left|top"
-					height="15"
-					left="10"
-					top_pad="5"
-					width="50"
-					layout="topleft"
-					tool_tip="Which Sharpen method to use."
-					value="Sharpen:"/>
-				<combo_box
-					allow_text_entry="false"
-					tool_tip="Which Sharpen method to use."
-					control_name="RenderSharpenMethod"
-					follows="left|top"
-					height="16"
-					layout="topleft"
-					left_delta="70"
-					max_chars="128"
-					name="sharpenmethod_combo"
-					top_pad="-16"
-					width="80">
-					<combo_box.item
-						label="None"
-						name="sharp_none"
-						value="0" />
-					<combo_box.item
-						label="CAS"
-						name="sharp_cas"
-						value="1" />
-					<combo_box.item
-						label="DLS"
-						name="sharp_DLS"
-						value="2" />
-					</combo_box>
-				<slider
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					left_delta="80"
-					right="-75"
-					name="sharp_strength_slider"
-					show_text="false" />
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="1"
-					follows="top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					width="55"
-					increment=".1"
-					name="sharp_strength_spinner" />
-				<text
-					name="sharp_dynamic_text"
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="10"
-					width="50"
-					layout="topleft"
-					value="Contrast:" />
-				<slider
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					left_delta="80"
-					right="-75"
-					show_text="false"
-					name="sharp_dynamic_slider" />
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="1"
-					follows="top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					width="55"
-					increment=".1"
-					name="sharp_dynamic_spinner" />
-				<button
-					name="sharpen_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="42"
-					left_delta="55"
-					top_pad="-36"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-					function="LightBox.ResetGroupDefault"
-					parameter="sharpen" />
-				</button>
-				<!--Tonemapper Control-->
-				<text
-					follows="left|top"
-					height="15"
-					left="10"
-					top_pad="6"
-					width="70"
-					layout="topleft"
-					tool_tip="Which algorithm should translate HDR values to SDR Colorspace"
-					value="Tonemapper:" />
-				<combo_box
-					allow_text_entry="false"
-					tool_tip="Which algorithm should translate HDR values to SDR Colorspace"
-					control_name="RenderToneMapType"
-					follows="left|top"
-					height="16"
-					layout="topleft"
-					left_delta="70"
-					max_chars="128"
-					name="tonemap_type_combo"
-					top_pad="-16"
-					width="80">
-					<combo_box.item
-						label="ACES"
-						name="toneACES"
-						value="1" />
-					<combo_box.item
-						label="Uchimura"
-						name="toneUchimura"
-						value="2" />
-					<combo_box.item
-						label="AMD Tonemapper"
-						name="toneAMD"
-						value="3" />
-					<combo_box.item
-						label="Uncharted"
-						name="toneUncharted"
-						value="4" />
-				</combo_box>
-				<button
-					name="exposure_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="20"
-					right="-2"
-					top_pad="-18"
-					label="Reset Tonemapper Sliders"
-					halign="left"
-					width="155"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="right">
-					<button.commit_callback
-						function="LightBox.ResetGroupDefault"
-						parameter="tonemap" />
-				</button>
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="4"
-					width="100"
-					layout="topleft"
-					tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
-					value="Exposure:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="4.0"
-					min_val="0.5"
-					left_delta="100"
-					right="-55"
-					name="exposure_slider"
-					tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
-					control_name="RenderExposure"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-1"
-					decimal_digits="1"
-					follows="top|right"
-					layout="topleft"
-					max_val="4.0"
-					min_val="0.5"
-					width="55"
-					increment=".1"
-					name="exposure_spinner"
-					tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
-					control_name="RenderExposure"/>
-				<text
-					visible="false"
-					name="tonemapper_dynamic_text1"
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="10"
-					width="100"
-					layout="topleft"
-					value="TonemapD1:" />
-				<slider
-					visible="false"
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					left_delta="100"
-					right="-55"
-					show_text="false"
-					name="tonemapper_dynamic_slider1" />
-				<spinner
-					visible="false"
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-1"
-					decimal_digits="2"
-					follows="top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					width="55"
-					increment=".1"
-					name="tonemapper_dynamic_spinner1" />
-				<text
-					visible="false"
-					name="tonemapper_dynamic_text2"
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="10"
-					width="100"
-					layout="topleft"
-					value="TonemapD2:" />
-				<slider
-					visible="false"
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					left_delta="100"
-					right="-55"
-					show_text="false"
-					name="tonemapper_dynamic_slider2" />
-				<spinner
-					visible="false"
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-1"
-					decimal_digits="2"
-					follows="top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					width="55"
-					increment=".1"
-					name="tonemapper_dynamic_spinner2" />
-				<text
-					visible="false"
-					name="tonemapper_dynamic_text3"
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="10"
-					width="100"
-					layout="topleft"
-					value="TonemapD3:" />
-				<slider
-					visible="false"
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					left_delta="100"
-					right="-55"
-					show_text="false"
-					name="tonemapper_dynamic_slider3" />
-				<spinner
-					visible="false"
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-1"
-					decimal_digits="2"
-					follows="top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					width="55"
-					increment=".1"
-					name="tonemapper_dynamic_spinner3" />
-				<text
-					visible="false"
-					name="tonemapper_dynamic_text4"
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="10"
-					width="100"
-					layout="topleft"
-					value="TonemapD4:" />
-				<slider
-					visible="false"
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					left_delta="100"
-					right="-55"
-					show_text="false"
-					name="tonemapper_dynamic_slider4" />
-				<spinner
-					visible="false"
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-1"
-					decimal_digits="2"
-					follows="top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					width="55"
-					increment=".1"
-					name="tonemapper_dynamic_spinner4" />
-				<text
-					visible="false"
-					name="tonemapper_dynamic_text5"
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="10"
-					width="100"
-					layout="topleft"
-					value="TonemapD5:" />
-				<slider
-					visible="false"
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					left_delta="100"
-					right="-55"
-					show_text="false"
-					name="tonemapper_dynamic_slider5" />
-				<spinner
-					visible="false"
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-1"
-					decimal_digits="2"
-					follows="top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					width="55"
-					increment=".1"
-					name="tonemapper_dynamic_spinner5" />
-				<text
-					visible="false"
-					name="tonemapper_dynamic_text6"
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="10"
-					width="100"
-					layout="topleft"
-					value="TonemapD6:" />
-				<slider
-					visible="false"
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					left_delta="100"
-					right="-55"
-					show_text="false"
-					name="tonemapper_dynamic_slider6" />
-				<spinner
-					visible="false"
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-1"
-					decimal_digits="2"
-					follows="top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					width="55"
-					increment=".1"
-					name="tonemapper_dynamic_spinner6" />
-				<text
-					visible="false"
-					name="tonemapper_dynamic_text7"
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="10"
-					width="100"
-					layout="topleft"
-					value="TonemapD7:" />
-				<slider
-					visible="false"
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					left_delta="100"
-					right="-55"
-					show_text="false"
-					name="tonemapper_dynamic_slider7" />
-				<spinner
-					visible="false"
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-1"
-					decimal_digits="2"
-					follows="top|right"
-					layout="topleft"
-					max_val="1.0"
-					min_val="0.0"
-					width="55"
-					increment=".1"
-					name="tonemapper_dynamic_spinner7" />	
-			</panel>
-			<!--Rendering Panel-->
-			<panel
-				label="Rendering"
-				class="render_settings"
-				layout="topleft"
-				name="render_settings">
-				<!--Anti-Aliasing-->
-				<text
-					follows="left|top"
-					height="15"
-					left="10"
-					top_pad="4"
-					width="75"
-					layout="topleft"
-					tool_tip="Controls Anti-Aliasing Quality"
-					value="Anti-Aliasing:" />
-				<check_box
-					follows="left|top"
-					height="15"
-					left="115"
-					top_pad="-14"
-					width="80"
-					layout="topleft"
-					label="Use SMAA"
-					tool_tip="Toggles using Subpixel Morphological AA instead of Fast Approximate AA. SMAA in most situations results in a less blurry image vs FXAA"
-					control_name="AlchemyRenderSMAA"/>
-				<combo_box
-					follows="top|left"
-					layout="topleft"
-					height="16"
-					width="150"
-					right="-2"
-					top_pad="-16"
-					max_chars="128"
-					allow_text_entry="false"
-					tool_tip="Controls Anti-Aliasing Quality"
-					control_name="RenderFSAASamples"
-					name="smaa_combo">
-					<combo_box.item
-						label="Disable"
-						name="smaa_off"
-						value="0" />
-					<combo_box.item
-						label="Low (x2)"
-						name="smaa_2"
-						value="2" />
-					<combo_box.item
-						label="Medium (x4)"
-						name="smaa_4"
-						value="4" />
-					<combo_box.item
-						label="High (x8)"
-						name="smaa_8"
-						value="8" />
-					<combo_box.item
-						label="Ultra (x16)"
-						name="smaa_16"
-						value="16" />
-				</combo_box>
-				<!--Anisotropic Filtering-->
-				<text
-					follows="left|top"
-					height="15"
-					left="10"
-					top_pad="4"
-					width="120"
-					layout="topleft"
-					tool_tip="Controls Anisotropic Filtering Quality"
-					value="Anisotropic Filtering:" />
-				<combo_box
-					allow_text_entry="false"
-					tool_tip="Controls Anisotropic Filtering Quality"
-					control_name="RenderAnisotropicLevel"
-					follows="left|top"
-					height="16"
-					layout="topleft"
-					right="-2"
-					max_chars="128"
-					name="anisotropicfilter_combo"
-					top_pad="-16"
-					width="150">
-					<combo_box.item
-						label="Disable"
-						name="anisotropicfilter_off"
-						value="0" />
-					<combo_box.item
-						label="Low (x2)"
-						name="anisotropicfilter_2"
-						value="2" />
-					<combo_box.item
-						label="Medium (x4)"
-						name="anisotropicfilter_4"
-						value="4" />
-					<combo_box.item
-						label="High (x8)"
-						name="anisotropicfilter_8"
-						value="8" />
-					<combo_box.item
-						label="Ultra (x16)"
-						name="anisotropicfilter_16"
-						value="16" />
-				</combo_box>
-				<!--Resolution Scale-->
-				<!--TODO: Disable if AA is also disabled. This option causes broken rendering otherwise! Bug maybe?-->
-				<text
-					follows="left|top"
-					height="15"
-					left="10"
-					top_pad="4"
-					width="90"
-					layout="topleft"
-					tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale. Sharpening interacts poorly with this setting, disable it for best results."
-					value="Resolution Scale:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="2"
-					min_val=".5"
-					left="120"
-					right="-55"
-					name="resMult_slider"
-					tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale. Sharpening interacts poorly with this setting, disable it for best results."
-					control_name="RenderResolutionMultiplier"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-2"
-					decimal_digits="1"
-					follows="top|right"
-					layout="topleft"
-					max_val="3"
-					min_val=".5"
-					width="55"
-					increment=".1"
-					name="resMult_spinner"
-					tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale. Sharpening interacts poorly with this setting, disable it for best results."
-					control_name="RenderResolutionMultiplier"/>
-				<!--Draw Distance-->
-				<text
-					follows="left|top"
-					height="15"
-					left="10"
-					top_pad="8"
-					width="90"
-					layout="topleft"
-					value="Draw Distance:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment="32"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="1024"
-					min_val="32"
-					left="120"
-					right="-55"
-					name="draw_dist_slider_bar"
-					control_name="RenderFarClip"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-2"
-					decimal_digits="0"
-					follows="top|right"
-					layout="topleft"
-					max_val="1024"
-					min_val="32"
-					width="55"
-					increment="32"
-					name="draw_dist_spinner"
-					control_name="RenderFarClip"/>
-				<!--Object LOD-->
-				<text
-					follows="left|top"
-					height="15"
-					left="10"
-					top_pad="8"
-					width="90"
-					layout="topleft"
-					value="Object LOD:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="4.0"
-					min_val="1.0"
-					left="120"
-					right="-55"
-					name="lod_slider_bar"
-					control_name="RenderVolumeLODFactor"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-2"
-					decimal_digits="1"
-					follows="top|right"
-					layout="topleft"
-					max_val="4.0"
-					min_val="1.0"
-					width="55"
-					increment=".1"
-					name="lod_spinner"
-					control_name="RenderVolumeLODFactor"/>
-				<!--Max Particles-->
-				<text
-					follows="left|top"
-					height="15"
-					left="10"
-					top_pad="8"
-					width="90"
-					layout="topleft"
-					value="Max Particles:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment="256"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="8192"
-					min_val="0"
-					left="120"
-					right="-55"
-					name="max_particles_slider_bar"
-					control_name="RenderMaxPartCount"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-2"
-					decimal_digits="0"
-					follows="top|right"
-					layout="topleft"
-					max_val="8192"
-					min_val="0"
-					width="55"
-					increment="256"
-					name="max_particles_spinner"
-					control_name="RenderMaxPartCount"/>
-				<!--Max Non-Impostors-->
-				<text
-					follows="left|top"
-					height="15"
-					left="10"
-					top_pad="8"
-					width="90"
-					layout="topleft"
-					value="Max Avatars:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment="1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="65"
-					min_val="0"
-					left="120"
-					right="-55"
-					name="max_avatar_slider_bar"
-					control_name="RenderAvatarMaxNonImpostors"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-2"
-					decimal_digits="0"
-					follows="top|right"
-					layout="topleft"
-					max_val="65"
-					min_val="0"
-					width="55"
-					increment="1"
-					name="max_avatar_spinner"
-					control_name="RenderAvatarMaxNonImpostors"/>
-			</panel>
-			<!--Shadows/SSAO Panel-->
-			<panel
-				label="Shadows"
-				class="shadow_settings"
-				layout="topleft"
-				name="shadow_settings">
-				<!--TODO: Display a warning message and disable this panel if Advanced Lighting Model is disabled?-->
-				<!--Shadow Detail-->
-				<!--TODO: Disable sliders if set to None?-->
-				<text
-					follows="left|top"
-					height="15"
-					left="10"
-					top_pad="4"
-					width="60"
-					layout="topleft"
-					tool_tip="Controls which kind of shadows are allowed. Reloads renderer!"
-					value="Shadows: " />
-				<combo_box
-					allow_text_entry="false"
-					tool_tip="Controls which kind of shadows are allowed. Reloads renderer!"
-					control_name="RenderShadowDetail"
-					follows="left|top"
-					height="16"
-					layout="topleft"
-					left="70"
-					max_chars="128"
-					name="shadowtype_combo"
-					top_pad="-16"
-					width="140">
-					<combo_box.item
-						label="None"
-						name="shadowtype_none"
-						value="0" />
-					<combo_box.item
-						label="Sun/Moon"
-						name="shadowtype_sunmoon"
-						value="1" />
-					<combo_box.item
-						label="Sun/Moon + Projectors"
-						name="shadowtype_proj"
-						value="2" />
-				</combo_box>
-				<!--Shadow Resolution-->
-				<!--TODO: While this option is exceptionally powerful, this option as-is is extremely dangerous! Login-crash dangerous on anything lower than a 1080Ti. Either needs to be limited via reported VRAM and/or GPU String, or this value needs to be flagged as temporary!-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="4"
-					width="110"
-					layout="topleft"
-					tool_tip="Multiplier for shadowmap resolution. Use number input to override safe limits. High multipliers may overload and crash GPU drivers, especially on VRAM-limited systems!"
-					value="Shadow Resolution: " />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="2"
-					min_val=".5"
-					left="140"
-					right="-75"
-					name="shadowres_slider"
-					tool_tip="Multiplier for shadowmap resolution. Use number input to override safe limits. High multipliers may overload and crash GPU drivers, especially on VRAM-limited systems!"
-					control_name="RenderShadowResolutionScale"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="1"
-					follows="top|right"
-					layout="topleft"
-					max_val="4"
-					min_val=".5"
-					width="55"
-					increment=".1"
-					name="shadowres_spinner"
-					tool_tip="Multiplier for shadowmap resolution. Use number input to override safe limits. High multipliers may overload and crash GPU drivers, especially on VRAM-limited systems!"
-					control_name="RenderShadowResolutionScale"/>
-				<button
-					name="shadowRes_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderShadowResolutionScale" />
-				</button>
-				<!--Shadow Bias-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="110"
-					layout="topleft"
-					tool_tip="Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors."
-					value="Shadow Bias:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".001"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="0"
-					min_val="-0.01"
-					left="140"
-					right="-75"
-					name="shadow_bias_slider"
-					tool_tip="Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors."
-					control_name="RenderShadowBias"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="3"
-					follows="top|right"
-					layout="topleft"
-					max_val="0"
-					min_val="-0.01"
-					width="55"
-					increment=".001"
-					name="shadow_bias_spinner"
-					tool_tip="Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors."
-					control_name="RenderShadowBias"/>
-				<button
-					name="shadowBias_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderShadowBias" />
-				</button>
-				<!--Shadow Offset-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="110"
-					layout="topleft"
-					tool_tip="Used to reduce shadow errors by offsetting the entire shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source."
-					value="Shadow Offset:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".001"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="0.05"
-					min_val="0"
-					left="140"
-					right="-75"
-					name="shadow_offset_slider"
-					tool_tip="Used to reduce shadow errors by offsetting the entire shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source."
-					control_name="RenderShadowOffset"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="3"
-					follows="top|right"
-					layout="topleft"
-					max_val="0.05"
-					min_val="0.0"
-					width="55"
-					increment=".001"
-					name="shadow_offset_spinner"
-					tool_tip="Used to reduce shadow errors by offsetting the entire shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source."
-					control_name="RenderShadowOffset"/>
-				<button
-					name="shadowOffset_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderShadowOffset" />
-				</button>
-				<!--Projector Bias-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="110"
-					layout="topleft"
-					tool_tip="Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors."
-					value="Spot Shadow Bias:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".001"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="0"
-					min_val="-0.01"
-					left="140"
-					right="-75"
-					name="shadow_spotbias_slider"
-					tool_tip="Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors."
-					control_name="RenderSpotShadowBias"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="3"
-					follows="top|right"
-					layout="topleft"
-					max_val="0"
-					min_val="-0.01"
-					width="55"
-					increment=".001"
-					name="shadow_spotbias_spinner"
-					tool_tip="Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors."
-					control_name="RenderSpotShadowBias"/>
-				<button
-					name="spotBias_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderSpotShadowBias" />
-				</button>
-				<!--Projector Offset-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="110"
-					layout="topleft"
-					tool_tip="Used to reduce shadow errors by offsetting the entire projector shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source."
-					value="Spot Shadow Offset:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".001"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="0.15"
-					min_val="0"
-					left="140"
-					right="-75"
-					name="shadow_spotoffset_slider"
-					tool_tip="Used to reduce shadow errors by offsetting the entire projector shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source."
-					control_name="RenderSpotShadowOffset"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="3"
-					follows="top|right"
-					layout="topleft"
-					max_val="0.15"
-					min_val="0.0"
-					width="55"
-					increment=".001"
-					name="shadow_spotoffset_spinner"
-					tool_tip="Used to reduce shadow errors by offsetting the entire projector shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source."
-					control_name="RenderSpotShadowOffset"/>
-				<button
-					name="spotOffset_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderSpotShadowOffset" />
-				</button>
-				<!--Shadow/SSAO Blur-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="110"
-					layout="topleft"
-					tool_tip="Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
-					value="Shadow Blur:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="5.0"
-					min_val="0"
-					left="140"
-					right="-75"
-					name="shadow_blur_slider"
-					tool_tip="Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
-					control_name="RenderShadowBlurSize"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="1"
-					follows="top|right"
-					layout="topleft"
-					max_val="5.0"
-					min_val="0.0"
-					width="55"
-					increment=".1"
-					name="shadow_blur_spinner"
-					tool_tip="Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
-					control_name="RenderShadowBlurSize"/>
-				<button
-					name="blur_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderShadowBlurSize" />
-				</button>
-				<!--Blur Distance-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="110"
-					layout="topleft"
-					tool_tip="Controls how far away from the camera should blurring occur. Larger values reduce blur near the camera. Try using this for shadow sharpening if you encounter SSAO noise when lowering Shadow Blur!"
-					value="Blur Distance:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="3.0"
-					min_val="0"
-					left="140"
-					right="-75"
-					name="shadow_blurdist_slider"
-					tool_tip="Controls how far away from the camera should blurring occur. Larger values reduce blur near the camera. Try using this for shadow sharpening if you encounter SSAO noise when lowering Shadow Blur!"
-					control_name="RenderShadowBlurDistFactor"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="1"
-					follows="top|right"
-					layout="topleft"
-					max_val="3.0"
-					min_val="0.0"
-					width="55"
-					increment=".1"
-					name="shadow_blurdist_spinner"
-					tool_tip="Controls how far away from the camera should blurring occur. Larger values reduce blur near the camera. Try using this for shadow sharpening if you encounter SSAO noise when lowering Shadow Blur!"
-					control_name="RenderShadowBlurDistFactor"/>
-				<button
-					name="blurdist_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderShadowBlurDistFactor" />
-				</button>
-				<!--SSAO Settings-->
-				<view_border
-					bevel_style="none"
-					height="0"
-					layout="topleft"
-					left="0"
-					name="ssao_divider"
-					top_pad="7"
-					width="350"/>
-				<!--SSAO Toggle-->
-				<!--TODO: Disable Sliders if not enabled?-->
-				<check_box
-					follows="left|top"
-					height="15"
-					left="8"
-					top_pad="8"
-					width="80"
-					layout="topleft"
-					label="Use Screen Space Ambient Occlusion"
-					tool_tip="Toggles SSAO (Also toggles Shadow Smoothing!)"
-					control_name="RenderDeferredSSAO"/>
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="4"
-					width="110"
-					layout="topleft"
-					tool_tip="Controls the value of the SSAO HSV transform."
-					value="SSAO Value:" />
-				<slider
-					top_pad="-18"
-					height="20"
-					increment=".01"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="1"
-					min_val="0"
-					left="140"
-					right="-75"
-					show_text="false"
-					name="ssao_value_slider"
-					tool_tip="Controls the value of the SSAO HSV transform.."
-					control_name="RenderSSAOEffectValue" />
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="3"
-					follows="top|right"
-					layout="topleft"
-					max_val="1"
-					min_val="0"
-					width="55"
-					increment=".01"
-					name="ssao_value_spinner"
-					tool_tip="Controls the value of the SSAO HSV transform."
-					control_name="RenderSSAOEffectValue"/>
-				<button
-					name="ssaoVal_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderSSAOEffectValue" />
-				</button>
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="4"
-					width="110"
-					layout="topleft"
-					tool_tip="Controls the saturation of the SSAO HSV transform."
-					value="SSAO Saturation:" />
-				<slider
-					top_pad="-18"
-					height="20"
-					increment=".01"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="1"
-					min_val="0"
-					left="140"
-					right="-75"
-					show_text="false"
-					name="ssao_sat_slider"
-					tool_tip="Controls the saturation of the SSAO HSV transform."
-					control_name="RenderSSAOEffectSat" />
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="3"
-					follows="top|right"
-					layout="topleft"
-					max_val="1"
-					min_val="0"
-					width="55"
-					increment=".01"
-					name="ssao_strength_spinner"
-					tool_tip="Controls the saturation of the SSAO HSV transform."
-					control_name="RenderSSAOEffectSat"/>
-				<button
-					name="ssaoStrength_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderSSAOEffectSat" />
-				</button>
-				<!--SSAO Factor-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="110"
-					layout="topleft"
-					tool_tip="Occlusion sensitivity factor, larger = more."
-					value="SSAO Factor:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="10"
-					min_val="0"
-					left="140"
-					right="-75"
-					name="ssao_factor_slider"
-					tool_tip="Occlusion sensitivity factor, larger = more."
-					control_name="RenderSSAOFactor"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="3"
-					follows="top|right"
-					layout="topleft"
-					max_val="10"
-					min_val="0"
-					width="55"
-					increment=".1"
-					name="ssao_factor_spinner"
-					tool_tip="Occlusion sensitivity factor, larger = more."
-					control_name="RenderSSAOFactor"/>
-				<button
-					name="ssaoFactor_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderSSAOFactor" />
-				</button>
-				<!--SSAO Scale-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="110"
-					layout="topleft"
-					tool_tip="Determines distance from surface to check for occlusion. Higher = Wider occlusion NOTE: Large values may produce artifacts."
-					value="SSAO Scale:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment="10"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="5000"
-					min_val="0"
-					left="140"
-					right="-75"
-					name="ssao_scale_slider"
-					tool_tip="Determines distance from surface to check for occlusion. Higher = Wider occlusion NOTE: Large values may produce artifacts."
-					control_name="RenderSSAOScale"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="0"
-					follows="top|right"
-					layout="topleft"
-					max_val="5000"
-					min_val="0"
-					width="55"
-					increment="50"
-					name="ssao_scale_spinner"
-					tool_tip="Determines distance from surface to check for occlusion. Higher = Wider occlusion NOTE: Large values may produce artifacts."
-					control_name="RenderSSAOScale"/>
-				<button
-					name="ssaoScale_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderSSAOScale" />
-				</button>
-				<!--SSAO Max Scale-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="110"
-					layout="topleft"
-					tool_tip="Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
-					value="SSAO Max Scale:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment="10"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="1000"
-					min_val="0"
-					left="140"
-					right="-75"
-					name="ssao_maxScale_slider"
-					tool_tip="Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
-					control_name="RenderSSAOMaxScale"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="0"
-					follows="top|right"
-					layout="topleft"
-					max_val="1000"
-					min_val="0"
-					width="55"
-					increment="50"
-					name="ssao_maxScale_spinner"
-					tool_tip="Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
-					control_name="RenderSSAOMaxScale"/>
-				<button
-					name="ssaoMaxScale_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderSSAOMaxScale" />
-				</button>
-			</panel>
-			<!--Glow Panel-->
-			<panel
-				label="Glow"
-				class="glow_settings"
-				layout="topleft"
-				name="glow_settings">
-				<!--Glow Toggle-->
-				<check_box
-					follows="left|top"
-					height="15"
-					left="8"
-					top_pad="4"
-					width="80"
-					layout="topleft"
-					label="Use Glow Shader"
-					tool_tip="Toggles glow (Reloads Renderer!)"
-					control_name="RenderGlow"/>
-				<!--Glow Iterations-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="4"
-					width="60"
-					layout="topleft"
-					tool_tip="How many passes of the glow shader to use. More passes makes it overall stronger, softer, wider, and slower to render."
-					value="Iterations:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment="1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="10"
-					min_val="1"
-					left="90"
-					right="-75"
-					name="glow_iteration_slider"
-					tool_tip="How many passes of the glow shader to use. More passes makes it overall stronger, softer, wider, and slower to render."
-					control_name="RenderGlowIterations"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="0"
-					follows="top|right"
-					layout="topleft"
-					max_val="10"
-					min_val="1"
-					width="55"
-					increment="1"
-					name="glow_iteration_spinner"
-					tool_tip="How many passes of the glow shader to use. More passes makes it overall stronger, softer, wider, and slower to render."
-					control_name="RenderGlowIterations"/>
-				<button
-					name="glowIteration_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderGlowIterations" />
-				</button>
-				<!--Glow Resolution-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="60"
-					layout="topleft"
-					tool_tip="Overall resolution of glow. Higher values allow for wider glow. Use in conjunction with other glow settings for best effect."
-					value="Resolution:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment="1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="10"
-					min_val="0"
-					left="90"
-					right="-75"
-					name="glow_resPow_slider"
-					tool_tip="Overall resolution of glow. Higher values allow for wider glow. Use in conjunction with other glow settings for best effect."
-					control_name="RenderGlowResolutionPow"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="0"
-					follows="top|right"
-					layout="topleft"
-					max_val="10"
-					min_val="0"
-					width="55"
-					increment="1"
-					name="glow_resPow_spinner"
-					tool_tip="Overall resolution of glow. Higher values allow for wider glow. Use in conjunction with other glow settings for best effect."
-					control_name="RenderGlowResolutionPow"/>
-				<button
-					name="glowRes_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderGlowResolutionPow" />
-				</button>
-				<!--Glow Strength-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="60"
-					layout="topleft"
-					tool_tip="Overall strength of the glow shader."
-					value="Strength:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment="0.005"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="1"
-					min_val="0"
-					left="90"
-					right="-75"
-					name="glow_strength_slider"
-					tool_tip="Overall strength of the glow shader."
-					control_name="RenderGlowStrength"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="3"
-					follows="top|right"
-					layout="topleft"
-					max_val="2"
-					min_val="0"
-					width="55"
-					increment="0.005"
-					name="glow_strength_spinner"
-					tool_tip="Overall strength of the glow shader."
-					control_name="RenderGlowStrength"/>
-				<button
-					name="glowStrength_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderGlowStrength" />
-				</button>
-				<!--Glow Softness-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="60"
-					layout="topleft"
-					tool_tip="Softness or width of glow, eventually gets pixelated at higher sizes."
-					value="Softness:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".05"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="10"
-					min_val="0"
-					left="90"
-					right="-75"
-					name="glow_width_slider"
-					tool_tip="Softness or width of glow, eventually gets pixelated at higher sizes."
-					control_name="RenderGlowWidth"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="2"
-					follows="top|right"
-					layout="topleft"
-					max_val="10"
-					min_val="0"
-					width="55"
-					increment=".05"
-					name="glow_width_spinner"
-					tool_tip="Softness or width of glow, eventually gets pixelated at higher sizes."
-					control_name="RenderGlowWidth"/>
-				<button
-					name="glowWidth_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="RenderGlowWidth" />
-				</button>
-			</panel>
-			<!--DOF Panel-->
-			<panel
-				label="DoF"
-				class="dof_settings"
-				layout="topleft"
-				name="dof_settings">
-				<!--DOF Toggle-->
-				<!--TODO: Disable sliders if disabled?-->
-				<check_box
-					follows="left|top"
-					height="15"
-					left="8"
-					top_pad="4"
-					width="80"
-					layout="topleft"
-					label="Depth of Field"
-					tool_tip="Toggles Depth of Field"
-					control_name="RenderDepthOfField"/>
-				<check_box
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="4"
-					width="80"
-					layout="topleft"
-					label="Follow Mouse"
-					tool_tip="Allows DoF's focus point to follow mouse cursor"
-					control_name="RenderFocusPointFollowsPointer"/>
-				<check_box
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="4"
-					width="80"
-					layout="topleft"
-					label="Lock Focus (alt+shift+X)"
-					tool_tip="Locks the current focus point for DoF"
-					control_name="RenderFocusPointLocked"/>
-				<!--DOF Resolution-->
-				<!--TODO: Ensure this setting is temporary? Large CoC @ Full Res has caused Login-Crashes on other viewers, even on high end GPUs!-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="4"
-					width="80"
-					layout="topleft"
-					tool_tip="What fraction of screen resolution should be used for rendering Depth of Field. NOTE: Viewer may become unresponsive if DoF becomes intense when Full Resolution is used."
-					value="DoF Resolution: " />
-				<combo_box
-					allow_text_entry="false"
-					tool_tip="What fraction of screen resolution should be used for rendering Depth of Field. NOTE: Viewer may become unresponsive if DoF becomes intense when Full Resolution is used."
-					control_name="CameraDoFResScale"
-					follows="left|top"
-					height="16"
-					layout="topleft"
-					left="120"
-					max_chars="128"
-					name="dof_res_combo"
-					top_pad="-16"
-					width="70">
-					<combo_box.item
-						label="Quarter"
-						name="dof_quarterres"
-						value="0.25" />
-					<combo_box.item
-						label="Half"
-						name="dof_halfres"
-						value="0.5" />
-					<combo_box.item
-						label="Full"
-						name="dof_fullres"
-						value="1.0" />
-				</combo_box>
-				<!--DOF FoV-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="4"
-					width="70"
-					layout="topleft"
-					tool_tip="Vertical FoV for DoF calculations"
-					value="Field of View:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment="1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="175"
-					min_val="10"
-					left="130"
-					right="-75"
-					name="dof_fov_slider"
-					tool_tip="Vertical FoV for DoF calculations"
-					control_name="CameraFieldOfView"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="0"
-					follows="top|right"
-					layout="topleft"
-					max_val="175"
-					min_val="10"
-					width="55"
-					increment="1"
-					name="dof_fov_spinner"
-					tool_tip="Vertical FoV for DoF calculations"
-					control_name="CameraFieldOfView"/>
-				<button
-					name="dofFOV_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="CameraFieldOfView" />
-				</button>
-				<!--Aperture-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="65"
-					layout="topleft"
-					tool_tip="Simulated camera aperture f-value. Smaller f-stops result in a narrower focal range. Larger increases focal range."
-					value="Aperture (f):" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="256"
-					min_val="0.5"
-					left="130"
-					right="-75"
-					name="dof_fstop_slider"
-					tool_tip="Simulated camera aperture f-value. Smaller f-stops result in a narrower focal range. Larger increases focal range."
-					control_name="CameraFNumber"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="1"
-					follows="top|right"
-					layout="topleft"
-					max_val="256"
-					min_val="0.5"
-					width="55"
-					increment=".1"
-					name="dof_fstop_spinner"
-					tool_tip="Simulated camera aperture f-value. Smaller f-stops result in a narrower focal range. Larger increases focal range."
-					control_name="CameraFNumber"/>
-				<button
-					name="dofFNumber_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="CameraFNumber" />
-				</button>
-				<!--Focal Length-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="100"
-					layout="topleft"
-					tool_tip="Focal length of simulated camera."
-					value="Focal Length (mm):" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment="5"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="600"
-					min_val="10"
-					left="130"
-					right="-75"
-					name="dof_length_slider"
-					tool_tip="Focal length of simulated camera."
-					control_name="CameraFocalLength"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="0"
-					follows="top|right"
-					layout="topleft"
-					max_val="600"
-					min_val="10"
-					width="55"
-					increment="5"
-					name="dof_length_spinner"
-					tool_tip="Focal length of simulated camera."
-					control_name="CameraFocalLength"/>
-				<button
-					name="dofFocal_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="CameraFocalLength" />
-				</button>
-				<!--Circle of Confusion-->
-				<!--TODO: This can get dangerous on low-end machines! See DoF Resolution-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="80"
-					layout="topleft"
-					tool_tip="Circle of Confusion, blur intensity of out objects out of focus. This limits the amount of blur applied. High values produce softer out of focus objects, but can cause the viewer or system to become unresponsive"
-					value="CoC Maximum:" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".5"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="40"
-					min_val="0"
-					left="130"
-					right="-75"
-					name="dof_coc_slider"
-					tool_tip="Circle of Confusion, blur intensity of out objects out of focus. This limits the amount of blur applied. High values produce softer out of focus objects, but can cause the viewer or system to become unresponsive"
-					control_name="CameraMaxCoF"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="1"
-					follows="top|right"
-					layout="topleft"
-					max_val="40"
-					min_val="0"
-					width="55"
-					increment=".5"
-					name="dof_coc_spinner"
-					tool_tip="Circle of Confusion, blur intensity of out objects out of focus. This limits the amount of blur applied. High values produce softer out of focus objects, but can cause the viewer or system to become unresponsive"
-					control_name="CameraMaxCoF"/>
-				<button
-					name="dofCOF_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="CameraMaxCoF" />
-				</button>
-				<!--Focus Transition Time-->
-				<text
-					follows="left|top"
-					height="15"
-					left="30"
-					top_pad="3"
-					width="100"
-					layout="topleft"
-					tool_tip="Time it takes for the camera to transition to a new focal point."
-					value="Transition Time (s):" />
-				<slider_bar
-					top_pad="-18"
-					height="20"
-					increment=".1"
-					follows="left|top|right"
-					layout="topleft"
-					max_val="2"
-					min_val="0"
-					left="130"
-					right="-75"
-					name="dof_focaltime_slider"
-					tool_tip="Time it takes for the camera to transition to a new focal point."
-					control_name="CameraFocusTransitionTime"/>
-				<spinner
-					top_pad="-20"
-					height="15"
-					label_width="0"
-					right="-20"
-					decimal_digits="1"
-					follows="top|right"
-					layout="topleft"
-					max_val="2"
-					min_val="0"
-					width="55"
-					increment=".1"
-					name="dof_focaltime_spinner"
-					tool_tip="Time it takes for the camera to transition to a new focal point."
-					control_name="CameraFocusTransitionTime"/>
-				<button
-					name="dofTime_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="22"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetControlDefault"
-						parameter="CameraFocusTransitionTime" />
-				</button>
-			</panel>
-	</tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_lightbox_settings" title="作業中のライトボックス">
+  <tab_container name="lightbox_tab_container">
+    <!--Image Panel-->
+    <panel label="画像" name="colortone_settings">
+      <!--LUT Control-->
+      <text follows="left|top" height="15" left="10" top_pad="8" width="60" layout="topleft" tool_tip="画像に対するカラーグレーディングLUT(ルックアップテクスチャ)を指定します。 カスタムLUTには完全なファイル名が必要です!" value="有効なLUT:" />
+      <!--TODO: Make more flexible?-->
+      <combo_box tool_tip="画像に対するカラーグレーディングLUT(ルックアップテクスチャ)を指定します。 カスタムLUTには完全なファイル名が必要です!" name="colorlut_combo">
+        <combo_box.item label="なし" name="lut_none" value="" />
+        <combo_box.item label="自然" name="lut_neutral" value="NeutralLUT.png" />
+        <combo_box.item label="クロスプロセス─暖色" name="lut_xprocess_warm" value="CrossWarm.png" />
+        <combo_box.item label="クロスプロセス─寒色" name="lut_xprocess_cool" value="CrossCool.png" />
+        <combo_box.item label="アシッド・トリップ" name="lut_acidTrip" value="AcidTrip.png" />
+        <combo_box.item label="バトルブルー" name="lut_battleblue" value="Battleblue.png" />
+        <combo_box.item label="サクサク" name="lut_crunchy" value="Crunchy.png" />
+        <combo_box.item label="荒涼な" name="lut_dreary" value="Dreary.png" />
+        <combo_box.item label="秋景色" name="lut_fallPainty" value="FallPainty.png" />
+        <combo_box.item label="荒々しい" name="lut_harshness" value="Harshness.png" />
+        <combo_box.item label="被爆" name="lut_nuked" value="Nuked.png" />
+        <combo_box.item label="OGボーイ" name="lut_ogBoy" value="OGBoy.png" />
+        <combo_box.item label="古い写真" name="lut_oldPhoto" value="OldPhoto.png" />
+        <combo_box.item label="パステル・ドリーム" name="lut_pastelDreams" value="PastelDreams.png" />
+        <combo_box.item label="紫の霞" name="lut_purpleHaze" value="PurpleHaze.png" />
+        <combo_box.item label="病的に青い" name="lut_sicklyBlue" value="SicklyBlue.png" />
+        <combo_box.item label="罪人1" name="lut_sinner1" value="Sinner.png" />
+        <combo_box.item label="罪人2" name="lut_sinner2" value="Sinner2.png" />
+        <combo_box.item label="ティールネス" name="lut_tealness" value="Tealness.png" />
+        <combo_box.item label="トゥーンランド" name="lut_toonland" value="Toonland.png" />
+        <combo_box.item label="暖色" name="lut_warm" value="Warm.png" />
+        <combo_box.item label="美術1" name="lut_AST1" value="AESTHETICS_1.png" />
+        <combo_box.item label="美術2" name="lut_AST2" value="AESTHETICS_2.png" />
+        <combo_box.item label="美術3" name="lut_AST3" value="AESTHETICS_3.png" />
+        <combo_box.item label="美術4" name="lut_AST4" value="AESTHETICS_4.png" />
+        <combo_box.item label="美術5" name="lut_AST5" value="AESTHETICS_5.png" />
+      </combo_box>
+      <!--Sharpen Controls-->
+      <text follows="left|top" height="15" left="10" top_pad="5" width="50" layout="topleft" tool_tip="使用する先鋭化方法を指定します。" value="先鋭化:" />
+      <combo_box allow_text_entry="false" tool_tip="使用する先鋭化方法を指定します。" name="sharpenmethod_combo">
+        <combo_box.item label="なし" name="sharp_none" value="0" />
+        <combo_box.item label="CAS" name="sharp_cas" value="1" />
+        <combo_box.item label="DLS" name="sharp_DLS" value="2" />
+      </combo_box>
+      <slider name="sharp_strength_slider" />
+      <spinner name="sharp_strength_spinner" />
+      <text name="sharp_dynamic_text" value="コントラスト:" />
+      <slider name="sharp_dynamic_slider" />
+      <spinner name="sharp_dynamic_spinner" />
+      <button name="sharpen_default_btn" />
+      <!--Tonemapper Control-->
+      <text follows="left|top" height="15" left="10" top_pad="6" width="70" layout="topleft" tool_tip="HDR値をSDRの色空間に変換するアルゴリズムを指定します。" value="トーンマッパー:" />
+      <combo_box tool_tip="HDR値をSDRの色空間に変換するアルゴリズムを指定します。" name="tonemap_type_combo">
+        <combo_box.item label="ACES" name="toneACES" value="1" />
+        <combo_box.item label="内村" name="toneUchimura" value="2" />
+        <combo_box.item label="AMDトーンマッパー" name="toneAMD" value="3" />
+        <combo_box.item label="アンチャーテッド" name="toneUncharted" value="4" />
+      </combo_box>
+      <button name="exposure_default_btn" label="トーンマップスライダーをリセット" />
+      <text follows="left|top" height="15" left="30" top_pad="4" width="100" layout="topleft" tool_tip="トーンマッパーを介して画像全体の明るさを調整します。" value="露光:" />
+      <slider_bar name="exposure_slider" tool_tip="トーンマッパーを介して画像全体の明るさを調整します。" />
+      <spinner name="exposure_spinner" tool_tip="トーンマッパーを介して画像全体の明るさを調整します。" />
+      <text name="tonemapper_dynamic_text1" value="トーンマップD1:" />
+      <slider name="tonemapper_dynamic_slider1" />
+      <spinner name="tonemapper_dynamic_spinner1" />
+      <text name="tonemapper_dynamic_text2" value="トーンマップD2:" />
+      <slider name="tonemapper_dynamic_slider2" />
+      <spinner name="tonemapper_dynamic_spinner2" />
+      <text name="tonemapper_dynamic_text3" value="トーンマップD3:" />
+      <slider name="tonemapper_dynamic_slider3" />
+      <spinner name="tonemapper_dynamic_spinner3" />
+      <text name="tonemapper_dynamic_text4" value="トーンマップD4:" />
+      <slider name="tonemapper_dynamic_slider4" />
+      <spinner name="tonemapper_dynamic_spinner4" />
+      <text name="tonemapper_dynamic_text5" value="トーンマップD5:" />
+      <slider name="tonemapper_dynamic_slider5" />
+      <spinner name="tonemapper_dynamic_spinner5" />
+      <text name="tonemapper_dynamic_text6" value="トーンマップD6:" />
+      <slider name="tonemapper_dynamic_slider6" />
+      <spinner name="tonemapper_dynamic_spinner6" />
+      <text name="tonemapper_dynamic_text7" value="トーンマップD7:" />
+      <slider name="tonemapper_dynamic_slider7" />
+      <spinner name="tonemapper_dynamic_spinner7" />
+    </panel>
+    <!--Rendering
+    Panel-->
+    <panel label="レンダリング" name="render_settings">
+      <!--Anti-Aliasing-->
+      <text follows="left|top" height="15" left="10" top_pad="8" width="90" layout="topleft" tool_tip="アンチエイリアスの品質を操作します。" value="アンチエイリアス:" />
+      <check_box label="SMAAを使用" tool_tip="高速近似アンチエイリアス(FXAA)の代わりにサブピクセル形態学的アンチエイリアス(SMAA)を使用します。 ほとんどの状況でSMAAを使用すると、FXAAと比較して画像のぼやけが少なくなります。" control_name="AlchemyRenderSMAA" />
+      <combo_box tool_tip="アンチエイリアスの品質を選択します。" control_name="RenderFSAASamples" name="smaa_combo">
+        <combo_box.item label="無効" name="smaa_off" value="0" />
+        <combo_box.item label="低(✕2)" name="smaa_2" value="2" />
+        <combo_box.item label="中(✕4)" name="smaa_4" value="4" />
+        <combo_box.item label="高(✕8)" name="smaa_8" value="8" />
+        <combo_box.item label="ウルトラ(✕16)" name="smaa_16" value="16" />
+      </combo_box>
+      <!--Anisotropic Filtering-->
+      <text follows="left|top" height="15" left="10" top_pad="8" width="90" layout="topleft" tool_tip="異方性フィルタリングの品質を制御します。" value="異方性フィルタリング:" />
+      <combo_box allow_text_entry="false" tool_tip="異方性フィルタリングの品質を制御します。" name="anisotropicfilter_combo">
+        <combo_box.item label="無効" name="anisotropicfilter_off" value="0" />
+        <combo_box.item label="低(✕2)" name="anisotropicfilter_2" value="2" />
+        <combo_box.item label="中(✕4)" name="anisotropicfilter_4" value="4" />
+        <combo_box.item label="高(✕8)" name="anisotropicfilter_8" value="8" />
+        <combo_box.item label="ウルトラ(✕16)" name="anisotropicfilter_16" value="16" />
+      </combo_box>
+      <!--Resolution Scale-->
+      <!--TODO: Disable if AA is also disabled. This option causes broken rendering otherwise! Bug maybe?-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="110" layout="topleft" tool_tip="(デフォルト:1.0)[危険]内部レンダリング解像度スケール。画像の先鋭化はこの設定とあまり相互作用しないため、最良の結果を得るには無効にしてください。" value="解像度スケール:" />
+      <slider_bar name="resMult_slider" tool_tip="(デフォルト:1.0)[危険]内部レンダリング解像度スケール。画像の先鋭化はこの設定とあまり相互作用しないため、最良の結果を得るには無効にしてください。" />
+      <spinner name="resMult_spinner" tool_tip="(デフォルト:1.0)[危険]内部レンダリング解像度スケール。画像の先鋭化はこの設定とあまり相互作用しないため、最良の結果を得るには無効にしてください。" control_name="RenderResolutionMultiplier" />
+      <!--Draw Distance-->
+      <text follows="left|top" height="15" left="10" top_pad="8" width="90" layout="topleft" value="描画距離:" />
+      <slider_bar name="draw_dist_slider_bar" />
+      <spinner name="draw_dist_spinner" />
+      <!--Object LOD-->
+      <text follows="left|top" height="15" left="10" top_pad="8" width="90" layout="topleft" value="オブジェクトのLOD:" />
+      <slider_bar name="lod_slider_bar" />
+      <spinner name="lod_spinner" control_name="RenderVolumeLODFactor" />
+      <!--Max Particles-->
+      <text follows="left|top" height="15" left="10" top_pad="8" width="90" layout="topleft" value="最大パーティクル数:" />
+      <slider_bar name="max_particles_slider_bar" />
+      <spinner name="max_particles_spinner" />
+      <!--Max Non-Impostors-->
+      <text follows="left|top" height="15" left="10" top_pad="8" width="90" layout="topleft" value="最大アバター数:" />
+      <slider_bar name="max_avatar_slider_bar" />
+      <spinner name="max_avatar_spinner" />
+    </panel>
+    <!--Shadows/SSAO
+    Panel-->
+    <panel label="å½±" name="shadow_settings">
+      <!--TODO: Display a warning message and disable this panel if Advanced Lighting Model is disabled?-->
+      <!--Shadow Detail-->
+      <!--TODO: Disable sliders if set to None?-->
+      <text follows="left|top" height="15" left="10" top_pad="4" width="60" layout="topleft" tool_tip="どの種類の影を許可するかを制御します。レンダラーはリロードされます!" value="影: " />
+      <combo_box tool_tip="どの種類の影を許可するかを制御します。レンダラーはリロードされます!" name="shadowtype_combo">
+        <combo_box.item label="なし" name="shadowtype_none" value="0" />
+        <combo_box.item label="太陽/月" name="shadowtype_sunmoon" value="1" />
+        <combo_box.item label="太陽/月+プロジェクター" name="shadowtype_proj" value="2" />
+      </combo_box>
+      <!--Shadow Resolution-->
+      <!--TODO: While this option is exceptionally powerful, this option as-is is extremely dangerous!
+      Login-crash dangerous on anything lower than a 1080Ti. Either needs to be limited via reported
+      VRAM and/or GPU String, or this value needs to be flagged as temporary!-->
+      <text follows="left|top" height="15" left="30" top_pad="4" width="110" layout="topleft" tool_tip="シャドウマップ解像度の乗数。安全制限を無効にするには、数値入力を使用します。特にVRAMが制限されたシステムでは、高い乗数を使用するとGPUドライバーが過負荷になり、クラッシュする可能性があります!" value="影の解像度: " />
+      <slider_bar name="shadowres_slider" tool_tip="シャドウマップ解像度の乗数。安全制限を無効にするには、数値入力を使用します。特にVRAMが制限されたシステムでは、高い乗数を使用するとGPUドライバーが過負荷になり、クラッシュする可能性があります!" />
+      <spinner name="shadowres_spinner" tool_tip="シャドウマップ解像度の乗数。安全制限を無効にするには、数値入力を使用します。特にVRAMが制限されたシステムでは、高い乗数を使用するとGPUドライバーが過負荷になり、クラッシュする可能性があります!" control_name="RenderShadowResolutionScale" />
+      <button name="shadowRes_default_btn" />
+
+      <!--Shadow Bias-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="110" layout="topleft" tool_tip="影の原点に近すぎる面を無視することで、セルフシャドウイングエラーを減らします。 値を小さくすると、より多くのシャドウエラーが発生しますが、より細かく正確な影が可能になります。" value="影のバイアス:" />
+      <slider_bar name="shadow_bias_slider" tool_tip="影の原点に近すぎる面を無視することで、セルフシャドウイングエラーを減らします。 値を小さくすると、より多くのシャドウエラーが発生しますが、より細かく正確な影が可能になります。" />
+      <spinner name="shadow_bias_spinner" tool_tip="影の原点に近すぎる面を無視することで、セルフシャドウイングエラーを減らします。 値を小さくすると、より多くのシャドウエラーが発生しますが、より細かく正確な影が可能になります。" />
+      <button name="shadowBias_default_btn" />
+      <!--Shadow Offset-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="110" layout="topleft" tool_tip="シャドウマップ全体をオフセットすることでシャドウエラーを減らすために使用されます。値を小さくすると、より正確な影が得られ、光源から極端な角度でシャドウエラーが発生する可能性がありますが、薄いオブジェクトからの光のにじみが少なくなります。" value="影オフセット:" />
+      <slider_bar name="shadow_offset_slider" tool_tip="シャドウマップ全体をオフセットすることでシャドウエラーを減らすために使用されます。値を小さくすると、より正確な影が得られ、光源から極端な角度でシャドウエラーが発生する可能性がありますが、薄いオブジェクトからの光のにじみが少なくなります。" />
+      <spinner name="shadow_offset_spinner" tool_tip="Used to reduce shadow errors by offsetting the entire shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source." />
+      <button name="shadowOffset_default_btn" />
+      <!--Projector Bias-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="110" layout="topleft" tool_tip="影の原点に近すぎる面を無視することで、セルフシャドウイングエラーを減らします。値を小さくすると、より多くのシャドウエラーが発生しますが、より細かく正確な影が可能になります。" value="スポット影バイアス:" />
+      <slider_bar name="shadow_spotbias_slider" tool_tip="影の原点に近すぎる面を無視することで、セルフシャドウイングエラーを減らします。値を小さくすると、より多くのシャドウエラーが発生しますが、より細かく正確な影が可能になります。" />
+      <spinner name="shadow_spotbias_spinner" tool_tip="影の原点に近すぎる面を無視することで、セルフシャドウイングエラーを減らします。値を小さくすると、より多くのシャドウエラーが発生しますが、より細かく正確な影が可能になります。" />
+      <button name="spotBias_default_btn" />
+      <!--Projector Offset-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="110" layout="topleft" tool_tip="プロジェクターのシャドウマップ全体をオフセットすることでシャドウエラーを減らすために使用されます。値を小さくすると、より正確な影が得られ、光源から極端な角度でシャドウエラーが発生する可能性がありますが、薄いオブジェクトからの光のにじみが少なくなります。" value="影スポットオフセット:" />
+      <slider_bar name="shadow_spotoffset_slider" tool_tip="プロジェクターのシャドウマップ全体をオフセットすることでシャドウエラーを減らすために使用されます。値を小さくすると、より正確な影が得られ、光源から極端な角度でシャドウエラーが発生する可能性がありますが、薄いオブジェクトからの光のにじみが少なくなります。" />
+      <spinner name="shadow_spotoffset_spinner" tool_tip="プロジェクターのシャドウマップ全体をオフセットすることでシャドウエラーを減らすために使用されます。値を小さくすると、より正確な影が得られ、光源から極端な角度でシャドウエラーが発生する可能性がありますが、薄いオブジェクトからの光のにじみが少なくなります。" />
+      <button name="spotOffset_default_btn" />
+      <!--Shadow/SSAO Blur-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="110" layout="topleft" tool_tip="影とSSAOのブラーの両方を制御します。 値が低いと、SSAOノイズが目立つ場合があります。" value="影のブラー:" />
+      <slider_bar name="shadow_blur_slider" tool_tip="影とSSAOのブラーの両方を制御します。 値が低いと、SSAOノイズが目立つ場合があります。" />
+      <spinner name="shadow_blur_spinner" tool_tip="影とSSAOのブラーの両方を制御します。 値が低いと、SSAOノイズが目立つ場合があります。" />
+      <button name="blur_default_btn" />
+
+      <!--Blur Distance-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="110" layout="topleft" tool_tip="ブラーを発生させるカメラからの距離を制御します。値を大きくすると、カメラ付近のブラーが軽減されます。影ブラーを下げたときにSSAOノイズが発生した場合は、これを影の鮮明化に使用してみてください!" value="ブラー距離:" />
+      <slider_bar name="shadow_blurdist_slider" tool_tip="ブラーを発生させるカメラからの距離を制御します。値を大きくすると、カメラ付近のブラーが軽減されます。影ブラーを下げたときにSSAOノイズが発生した場合は、これを影の鮮明化に使用してみてください!" />
+      <spinner name="shadow_blurdist_spinner" tool_tip="ブラーを発生させるカメラからの距離を制御します。値を大きくすると、カメラ付近のブラーが軽減されます。影ブラーを下げたときにSSAOノイズが発生した場合は、これを影の鮮明化に使用してみてください。" />
+      <button name="blurdist_default_btn" />
+      <!--SSAO Settings-->
+      <view_border name="ssao_divider" />
+      <!--SSAO Toggle-->
+      <!--TODO: Disable Sliders if not enabled?-->
+      <check_box follows="left|top" height="15" left="8" top_pad="8" width="80" layout="topleft" label="スクリーンスペースアンビエントオクルージョンを使用する" tool_tip="SSAOの切り替え(影もなめらかになります!)" control_name="RenderDeferredSSAO" />
+      <text follows="left|top" height="15" left="30" top_pad="4" width="110" layout="topleft" tool_tip="SSAOのHSV変換の値を制御します。" value="SSAO値:" />
+      <slider name="ssao_value_slider" tool_tip="SSAOのHSV変換の値を制御します。" />
+      <spinner name="ssao_value_spinner" tool_tip="SSAOのHSV変換の値を制御します。" />
+      <button name="ssaoVal_default_btn" />
+      <text follows="left|top" height="15" left="30" top_pad="4" width="110" layout="topleft" tool_tip="SSAOのHSV変換の彩度を制御します。" value="SSAOの彩度:" />
+      <slider name="ssao_sat_slider" tool_tip="SSAOのHSV変換の彩度を制御します。" />
+      <spinner name="ssao_strength_spinner" tool_tip="SSAOのHSV変換の彩度を制御します。" />
+      <button name="ssaoStrength_default_btn" />
+      <!--SSAO Factor-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="110" layout="topleft" tool_tip="オクルージョン感度係数。大きい=多く" value="SSAOファクター:" />
+      <slider_bar name="ssao_factor_slider" tool_tip="オクルージョン感度係数。大きい=多く" />
+      <spinner name="ssao_factor_spinner" tool_tip="オクルージョン感度係数。大きい=多く" />
+      <button name="ssaoFactor_default_btn" />
+      <!--SSAO Scale-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="110" layout="topleft" tool_tip="オクルージョンをチェックするサーフェスからの距離を決定します。高い=オクルージョンが広い 注:値を大きくすると、アーティファクトが生じる可能性があります。" value="SSAOスケール:" />
+      <slider_bar name="ssao_scale_slider" tool_tip="オクルージョンをチェックするサーフェスからの距離を決定します。高い=オクルージョンが広い 注:値を大きくすると、アーティファクトが生じる可能性があります。" />
+      <spinner name="ssao_scale_spinner" tool_tip="オクルージョンをチェックするサーフェスからの距離を決定します。高い=オクルージョンが広い 注:値を大きくすると、アーティファクトが生じる可能性があります。" />
+      <button name="ssaoScale_default_btn" />
+
+      <!--SSAO Max Scale-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="110" layout="topleft" tool_tip="オクルージョンに使用する最大画面半径を決定します。注:値を大きくすると、アーティファクトが発生する可能性があります。" value="SSAOの最大値:" />
+      <slider_bar name="ssao_maxScale_slider" tool_tip="オクルージョンに使用する最大画面半径を決定します。注:値を大きくすると、アーティファクトが発生する可能性があります。" />
+      <spinner name="ssao_maxScale_spinner" tool_tip="オクルージョンに使用する最大画面半径を決定します。注:値を大きくすると、アーティファクトが発生する可能性があります。" />
+      <button name="ssaoMaxScale_default_btn" />
+    </panel>
+    <!--Glow Panel-->
+    <panel label="グロー" name="glow_settings">
+      <!--Glow Toggle-->
+      <check_box follows="left|top" height="15" left="8" top_pad="4" width="80" layout="topleft" label="グローシェーダーの使用" tool_tip="グロー切り替え(レンダラーがリロードされます!)" control_name="RenderGlow" />
+      <!--Glow Iterations-->
+      <text follows="left|top" height="15" left="30" top_pad="4" width="60" layout="topleft" tool_tip="使用するグローシェーダのパスの数。パスが増えると、全体的に強くなり、柔らかくなり、幅が広くなり、レンダリングが遅くなります。" value="反復数:" />
+      <slider_bar name="glow_iteration_slider" tool_tip="使用するグローシェーダのパスの数。パスが増えると、全体的に強くなり、柔らかくなり、幅が広くなり、レンダリングが遅くなります。" />
+      <spinner name="glow_iteration_spinner" tool_tip="使用するグローシェーダのパスの数。パスが増えると、全体的に強くなり、柔らかくなり、幅が広くなり、レンダリングが遅くなります。" />
+      <button name="glowIteration_default_btn" />
+      <!--Glow Resolution-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="60" layout="topleft" tool_tip="グローの全体的な解像度。値を高くするとより広範囲のグローが可能になります。最高の効果を得るには、他のグロー設定と組み合わせて使用します。" value="解像度:" />
+      <slider_bar name="glow_resPow_slider" tool_tip="グローの全体的な解像度。値を高くするとより広範囲のグローが可能になります。最高の効果を得るには、他のグロー設定と組み合わせて使用します。" />
+      <spinner name="glow_resPow_spinner" tool_tip="グローの全体的な解像度。値を高くするとより広範囲のグローが可能になります。最高の効果を得るには、他のグロー設定と組み合わせて使用します。" />
+      <button name="glowRes_default_btn" />
+      <!--Glow Strength-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="60" layout="topleft" tool_tip="グローシェーダーの全体的な強さ。" value="強度:" />
+      <slider_bar name="glow_strength_slider" tool_tip="グローシェーダーの全体的な強さ。" />
+      <spinner name="glow_strength_spinner" tool_tip="グローシェーダーの全体的な強さ。" />
+      <button name="glowStrength_default_btn" />
+      <!--Glow Softness-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="60" layout="topleft" tool_tip="グローの柔らかさまたは幅。サイズが大きくなると最終的にピクセル化されます。" value="柔らかさ:" />
+      <slider_bar name="glow_width_slider" tool_tip="グローの柔らかさまたは幅。サイズが大きくなると最終的にピクセル化されます。" />
+      <spinner name="glow_width_spinner" tool_tip="グローの柔らかさまたは幅。サイズが大きくなると最終的にピクセル化されます。" />
+      <button name="glowWidth_default_btn" />
+    </panel>
+    <!--DOF Panel-->
+    <panel label="DoF" class="dof_settings" layout="topleft" name="dof_settings">
+      <!--DOF Toggle-->
+      <!--TODO: Disable sliders if disabled?-->
+      <check_box follows="left|top" height="15" left="8" top_pad="4" width="80" layout="topleft" label="被写体深度" tool_tip="被写体深度の切り替え" control_name="RenderDepthOfField" />
+      <check_box follows="left|top" height="15" left="30" top_pad="4" width="80" layout="topleft" label="マウスに追従" tool_tip="DoFのフォーカス ポイントがマウスカーソルに追従できるようにします。" control_name="RenderFocusPointFollowsPointer" />
+      <check_box follows="left|top" height="15" left="30" top_pad="4" width="80" layout="topleft" label="フォーカスをロック(Alt+Shift+X)" tool_tip="DoFの現在のフォーカスポイントをロックします。" control_name="RenderFocusPointLocked" />
+      <!--DOF Resolution-->
+      <!--TODO: Ensure this setting is temporary? Large CoC @ Full Res has caused Login-Crashes on other viewers, even on high end GPUs!-->
+      <text follows="left|top" height="15" left="30" top_pad="4" width="80" layout="topleft" tool_tip="被写界深度のレンダリングに使用する画面解像度の割合。注:フル解像度の使用時にDoFが激しくなると、ビューアが応答しなくなる可能性があります。" value="DoF解像度: " />
+      <combo_box tool_tip="被写界深度のレンダリングに使用する画面解像度の割合。注:フル解像度の使用時にDoFが激しくなると、ビューアが応答しなくなる可能性があります。" name="dof_res_combo">
+        <combo_box.item label="1/4" name="dof_quarterres" value="0.25" />
+        <combo_box.item label="1/2" name="dof_halfres" value="0.5" />
+        <combo_box.item label="完全" name="dof_fullres" value="1.0" />
+      </combo_box>
+      <!--DOF FoV-->
+      <text follows="left|top" height="15" left="30" top_pad="4" width="70" layout="topleft" tool_tip="DoF計算のための垂直視野" value="視野:" />
+      <slider_bar name="dof_fov_slider" tool_tip="DoF計算のための垂直視野" />
+      <spinner name="dof_fov_spinner" tool_tip="DoF計算のための垂直視野" />
+      <button name="dofFOV_default_btn" />
+      <!--Aperture-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="65" layout="topleft" tool_tip="シミュレートされたカメラの絞りf値。fストップが小さいほど、焦点範囲が狭くなります。大きくすると焦点範囲が広がります。" value="絞り(f):" />
+      <slider_bar name="dof_fstop_slider" tool_tip="シミュレートされたカメラの絞りf値。fストップが小さいほど、焦点範囲が狭くなります。大きくすると焦点範囲が広がります。" />
+      <spinner name="dof_fstop_spinner" tool_tip="シミュレートされたカメラの絞りf値。fストップが小さいほど、焦点範囲が狭くなります。大きくすると焦点範囲が広がります。" />
+      <button name="dofFNumber_default_btn" follows="top|right" />
+      <!--Focal Length-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="100" layout="topleft" tool_tip="シミュレートされたカメラの焦点距離。" value="焦点距離(㎜):" />
+      <slider_bar name="dof_length_slider" tool_tip="シミュレートされたカメラの焦点距離。" />
+      <spinner name="dof_length_spinner" tool_tip="シミュレートされたカメラの焦点距離。" />
+      <button name="dofFocal_default_btn" />
+      <!--Circle of Confusion-->
+      <!--TODO: This can get dangerous on low-end machines! See DoF Resolution-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="80" layout="topleft" tool_tip="錯乱円。焦点が合っていないオブジェクトのぼかし強度。これにより、適用されるブラーの量が制限されます。値を高くすると、焦点の合っていないオブジェクトが柔らかくなりますが、ビューアまたはシステムが応答しなくなる可能性があります。" value="最大錯乱円:" />
+      <slider_bar name="dof_coc_slider" tool_tip="錯乱円。焦点が合っていないオブジェクトのぼかし強度。これにより、適用されるブラーの量が制限されます。値を高くすると、焦点の合っていないオブジェクトが柔らかくなりますが、ビューアまたはシステムが応答しなくなる可能性があります。" />
+      <spinner name="dof_coc_spinner" tool_tip="錯乱円。焦点が合っていないオブジェクトのぼかし強度。これにより、適用されるブラーの量が制限されます。値を高くすると、焦点の合っていないオブジェクトが柔らかくなりますが、ビューアまたはシステムが応答しなくなる可能性があります。" />
+      <button name="dofCOF_default_btn" />
+      <!--Focus Transition Time-->
+      <text follows="left|top" height="15" left="30" top_pad="3" width="100" layout="topleft" tool_tip="カメラが新しい焦点に移動するまでにかかる時間。" value="遷移時間(秒):" />
+      <slider_bar name="dof_focaltime_slider" tool_tip="カメラが新しい焦点に移動するまでにかかる時間。" />
+      <spinner name="dof_focaltime_spinner" tool_tip="カメラが新しい焦点に移動するまでにかかる時間。" />
+      <button name="dofTime_default_btn" />
+    </panel>
+  </tab_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_live_material_editor.xml b/indra/newview/skins/default/xui/ja/floater_live_material_editor.xml
index 5b7dab6a527..f23eae28db0 100644
--- a/indra/newview/skins/default/xui/ja/floater_live_material_editor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_live_material_editor.xml
@@ -1,39 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- default_tab_group="1"
- height="790"
- width="256"
- min_height="500"
- min_width="256"
- layout="topleft"
- name="material editor"
- help_topic="material_editor"
- single_instance="true"
- title="Editing Material">
-  <scroll_container
-   name="materials_scroll"
-   top="18"
-   left="4"
-   height="768"
-   width="250"
-   follows="all"
-   layout="topleft"
-   color="DkGray2"
-   opaque="true"
-   tab_stop="true"
-   border="false"
-   reserve_scroll_corner="false">
-    <panel
-     name="panel_material"
-     filename="panel_gltf_material.xml"
-     layout="topleft"
-     follows="left|top|right"
-     border="false"
-     top="0"
-     left="0"
-     height="768"
-     width="236" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="material editor" title="マテリアルの編集">
+  <scroll_container name="materials_scroll">
+    <panel name="panel_material" />
   </scroll_container>
-</floater>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml
index f70d10470d7..f23a6642e80 100644
--- a/indra/newview/skins/default/xui/ja/floater_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_map.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Map" title="ミニマップ">
+  <!-- RLVa shows the anonymized name on the regular tooltip when @shownames=n restricted (rather than show the avatar inspector) -->
+  <floater.string name="ToolTipMsg">[PARCEL_NAME_MSG][PARCEL_SALE_PRICE_MSG][PARCEL_SALE_AREA_MSG][PARCEL_OWNER_MSG][REGION_NAME_MSG][TOOL_TIP_HINT_MSG]</floater.string>
+  <floater.string name="ParcelNameMsg">[PARCEL_NAME]</floater.string>
+  <floater.string name="ParcelSalePriceMsg">価格:L$ [PRICE](L$ [PRICE_PER_SQM]/㎡)</floater.string>
+  <floater.string name="ParcelSaleAreaMsg">エリア:[AREA]㎡</floater.string>
+  <floater.string name="ParcelOwnerMsg">所有者:[PARCEL_OWNER]</floater.string>
+  <floater.string name="RegionNameMsg">リージョン:[REGION_NAME]</floater.string>
   <floater.string name="ToolTipMsg">[REGION](ダブルクリックでマップを表示。Shift+ドラッグで水平・垂直移動)</floater.string>
   <floater.string name="AltToolTipMsg">[REGION](ダブルクリックでテレポート。Shift+ドラッグで水平・垂直移動)</floater.string>
   <floater.string name="mini_map_caption">ミニマップ</floater.string>
+  <net_map name="Net Map" />
   <text label="北" name="floater_map_north" text="北">北</text>
   <text label="東" name="floater_map_east" text="東">東</text>
   <text label="西" name="floater_map_west" text="西">西</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_material_editor.xml b/indra/newview/skins/default/xui/ja/floater_material_editor.xml
index a6a401f43ec..d5182722780 100644
--- a/indra/newview/skins/default/xui/ja/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_material_editor.xml
@@ -1,123 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- default_tab_group="1"
- height="891"
- width="256"
- min_height="500"
- min_width="256"
- layout="topleft"
- name="material editor"
- help_topic="material_editor"
- title="[MATERIAL_NAME]">
-  <string name="no_upload_fee_string">no upload fee</string>
-  <string name="upload_fee_string">L$[FEE] upload fee</string>
-  <string name="material_selection_title">Material selection</string>
-  <string name="material_selection_text">Select material:</string>
-  <string name="material_batch_import_text">--- Bulk Upload All ---</string>
-  <string name="material_override_title">Editing Material</string>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="material editor" title="[MATERIAL_NAME]">
+  <string name="no_upload_fee_string">アップロード費用なし</string>
+  <string name="upload_fee_string">アップロード費用L$ [FEE]</string>
+  <string name="material_selection_title">マテリアルの選択</string>
+  <string name="material_selection_text">マテリアル選択:</string>
+  <string name="material_batch_import_text">─一括アップロード─</string>
+  <string name="material_override_title">マテリアル編集</string>
 
-  <scroll_container
-   name="materials_scroll"
-   top="18"
-   left="4"
-   height="768"
-   width="250"
-   follows="all"
-   layout="topleft"
-   color="DkGray2"
-   opaque="true"
-   tab_stop="true"
-   reserve_scroll_corner="false">
-    <panel
-     name="panel_material"
-     filename="panel_gltf_material.xml"
-     layout="topleft"
-     follows="left|top|right"
-     border="false"
-     top="0"
-     left="0"
-     height="768"
-     width="236" />
+  <scroll_container name="materials_scroll">
+    <panel name="panel_material" />
   </scroll_container>
 
-  <panel
-         follows="right|bottom"
-         width="246"
-         height="97"
-         layout="bottomright"
-         top_pad="0"
-         left="5"
-         name="button_panel"
-         >
-    <text
-               type="string"
-               name="unsaved_changes"
-               font.style="BOLD"
-               text_color="DrYellow"
-               length="1"
-               follows="left|top"
-               height="10"
-               width="200"
-               layout="topleft"
-               left="10"
-               top="0"
-           >
-      Unsaved changes
-    </text>
-    <button
-               follows="left|top"
-               height="25"
-               label="Save"
-               enabled="false"
-               layout="topleft"
-               name="save"
-               top_pad="7"
-               left="0"
-               width="120" />
-    <button
-               follows="left|top"
-               height="25"
-               label="Save As..."
-               enabled="false"
-               layout="topleft"
-               name="save_as"
-               top_delta="0"
-               left_pad="6"
-               width="120" />
-    <text
-               type="string"
-               font.style="BOLD"
-               length="1"
-               follows="left|top"
-               height="10"
-               width="220"
-               layout="topleft"
-               left="10"
-               top_pad="5"
-               name="total_upload_fee"
-           >
-      Total upload fee: L$ [FEE]
-    </text>
-    
-    <view_border
-        bevel_style="none"
-        height="0"
-        layout="topleft"
-        left="0"
-        name="button_border"
-        top_pad="7"
-        width="246"/>
-    
-    <button
-               follows="left|top"
-               height="25"
-               label="Cancel"
-               layout="topleft"
-               name="cancel"
-               top_pad="7"
-               left="61"
-               width="121" />
+  <panel name="button_panel">
+    <text name="unsaved_changes">保存されていない変更があります</text>
+    <button label="保存" name="save" />
+    <button label="別名で保存…" name="save_as" />
+    <text name="total_upload_fee">アップロード費用の総額:L$ [FEE]</text>
+
+    <view_border name="button_border" />
+
+    <button label="キャンセル" name="cancel" />
   </panel>
-</floater>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_message_builder.xml b/indra/newview/skins/default/xui/ja/floater_message_builder.xml
index 461d6c92bbf..69d1b0730f1 100644
--- a/indra/newview/skins/default/xui/ja/floater_message_builder.xml
+++ b/indra/newview/skins/default/xui/ja/floater_message_builder.xml
@@ -1,66 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- single_instance="true"
- name="Message Builder"
- title="MESSAGE BUILDER"
- width="400"
- min_width="400"
- height="600"
- min_height="600"
- can_close="true"
- can_resize="true"
- can_minimize="true"
- save_rect="true">
-        <scroll_list
-         column_padding="0"
-         draw_heading="false"
-         follows="left|top|right"
-         left="10"
-         top="25"
-         name="net_list"
-         search_column="0"
-         right="-10"
-         bottom="140">
-            <scroll_list.columns dynamicwidth="true" name="text" label="text" />
-            <scroll_list.columns name="state" label="state" width="35" />
-        </scroll_list>
-        <combo_box
-         name="untrusted_message_combo"
-         allow_text_entry="false"
-         follows="left|top"
-         left="10"
-         top="150"
-         right="190"
-         bottom="170"
-         tool_tip="No trust">
-        </combo_box>
-        <combo_box
-         name="trusted_message_combo"
-         allow_text_entry="false"
-         follows="left|top"
-         left="200"
-         top="150"
-         right="380"
-         bottom="170"
-         tool_tip="Trust">
-        </combo_box>
-        <text_editor
-         parse_urls="false"
-         name="message_edit"
-         follows="left|top|right|bottom"
-         left="10"
-         top="180"
-         bottom="560"
-         right="390"
-         max_length="65535">
-        </text_editor>
-        <button
-         name="send_btn"
-         follows="right|bottom"
-         left="310"
-         top="570"
-         right="390"
-         bottom="590"
-         label="Send"
-         tool_tip="Send (Ctrl+Enter)"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Message Builder" title="メッセージビルダー">
+  <scroll_list name="net_list">
+    <scroll_list.columns name="text" label="テキスト" />
+    <scroll_list.columns name="state" label="ステート" />
+  </scroll_list>
+  <combo_box name="untrusted_message_combo" tool_tip="信頼しない">
+  </combo_box>
+  <combo_box name="trusted_message_combo" tool_tip="信頼する">
+  </combo_box>
+  <text_editor name="message_edit">
+  </text_editor>
+  <button name="send_btn" label="送信" tool_tip="送信(Ctrl+Enter)" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_message_log.xml b/indra/newview/skins/default/xui/ja/floater_message_log.xml
index c856039fd0d..73a3a7d3d71 100644
--- a/indra/newview/skins/default/xui/ja/floater_message_log.xml
+++ b/indra/newview/skins/default/xui/ja/floater_message_log.xml
@@ -1,217 +1,48 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- single_instance="true"
- name="Message Log"
- title="MESSAGE LOG"
- width="400"
- min_width="400"
- height="600"
- min_height="200"
- can_close="true"
- can_resize="true"
- can_minimize="true"
- save_rect="true">
-    <floater.string
-     name="filter_status">
-        Showing [MESSAGES] of [TOTAL] messages...
-    </floater.string>
-    <floater.string
-     name="no_filter_status">
-        Showing [TOTAL] messages...
-    </floater.string>
-  <layout_stack
-   clip="false"
-   follows="all"
-   layout="topleft"
-   left="2"
-   right="-2"
-   top="16"
-   height="550"
-   mouse_opaque="false"
-   name="a_stack"
-   orientation="vertical"
-   drag_handle_gap="6"
-   drag_handle_first_indent="10"
-   drag_handle_second_indent="10"
-   show_drag_handle="true" >
-    <layout_panel
-     follows="all"
-     auto_resize="true"
-     user_resize="true"
-     layout="topleft"
-     left="1"
-     right="-1"
-     min_height="20"
-     height="100"
-     name="net_panel" >
-      <scroll_list
-       column_padding="0"
-       draw_heading="false"
-       follows="all"
-       left="10"
-       top="4"
-       name="net_list"
-       search_column="0"
-       right="-10"
-       height="100">
-        <scroll_list.columns dynamicwidth="true" name="text" label="text" />
-        <scroll_list.columns name="icon0" label="icon0" width="12" />
-        <scroll_list.columns name="icon1" label="icon1" width="12" />
-        <scroll_list.columns name="icon2" label="icon2" width="12" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Message Log" title="メッセージログ">
+  <floater.string name="filter_status">全[TOTAL]件のメッセージの内[MESSAGES]件を表示しています…</floater.string>
+  <floater.string name="no_filter_status">[TOTAL]件のメッセージを表示しています…</floater.string>
+  <layout_stack name="a_stack">
+    <layout_panel name="net_panel">
+      <scroll_list name="net_list">
+        <scroll_list.columns name="text" label="テキスト" />
+        <scroll_list.columns name="icon0" label="アイコン0" />
+        <scroll_list.columns name="icon1" label="アイコン1" />
+        <scroll_list.columns name="icon2" label="アイコン2" />
       </scroll_list>
     </layout_panel>
-    <layout_panel
-     follows="all"
-     auto_resize="true"
-     user_resize="true"
-     layout="topleft"
-     min_height="98"
-     height="226"
-     top="100"
-     name="message_panel">
-      <menu_button
-       follows="left|top"
-       left="10"
-       top="4"
-       height="20"
-       width="20"
-       image_hover_unselected="Toolbar_Middle_Over"
-       image_overlay="OptionsMenu_Off"
-       image_selected="Toolbar_Middle_Selected"
-       image_unselected="Toolbar_Middle_Off"
-       menu_filename="menu_message_log_filter.xml"
-       menu_position="bottomleft"
-       tool_tip="Filter selection"
-       layout="topleft"
-       name="filter_choice_btn" />
-      <line_editor
-       name="filter_edit"
-       follows="left|top|right"
-       left_pad="2"
-       top_delta="0"
-       right="340"
-       height="20"
-       max_length="65535" />
-      <button
-       name="filter_apply_btn"
-       follows="top|right"
-       left_pad="2"
-       top_delta="0"
-       width="20"
-       height="20"
-       label="✔"/>
-      <button
-       name="clear_log_btn"
-       follows="top|right"
-       left_pad="2"
-       top_delta="0"
-       width="20"
-       height="20"
-       label="C"/>
-      <scroll_list
-       column_padding="0"
-       draw_heading="true"
-       follows="all"
-       left="10"
-       right="-10"
-       top_pad="4"
-       height="180"
-       name="message_log"
-       search_column="0"
-       sort_column="-1"
-       bottom="-1">
-        <scroll_list.columns name="sequence" label="Seq" width="48"/>
-        <scroll_list.columns name="protocol" label="Protocol" width="48"/>
-        <scroll_list.columns name="verb" label="Verb" width="56"/>
-        <scroll_list.columns name="net" label="Host" width="120"/>
-        <scroll_list.columns name="name" label="Type"/>
+    <layout_panel name="message_panel">
+      <menu_button name="filter_choice_btn" />
+      <line_editor name="filter_edit" />
+      <button name="filter_apply_btn" label="✔" />
+      <button name="clear_log_btn" label="ï¼£" />
+      <scroll_list name="message_log">
+        <scroll_list.columns name="sequence" label="#" width="48" />
+        <scroll_list.columns name="protocol" label="プロトコル" width="48" />
+        <scroll_list.columns name="verb" label="å‹•è©ž" width="56" />
+        <scroll_list.columns name="net" label="ホスト" width="120" />
+        <scroll_list.columns name="name" label="種類" />
       </scroll_list>
-      <text
-       name="log_status_text"
-       follows="bottom|left|right"
-       left="10"
-       top_pad="2"
-       right="-10"
-       height="20">
+      <text name="log_status_text">
       </text>
     </layout_panel>
-    <layout_panel
-     follows="all"
-     auto_resize="true"
-     layout="topleft"
-     min_height="98"
-     height="246"
-     top_pad="1"
-     name="net_info_panel">
+    <layout_panel name="net_info_panel">
       <!-- Only visible in IPANE_NET / IPANE_TEMPLATE_LOG modes -->
-      <text_editor
-       parse_urls="true"
-       name="net_info"
-       follows="all"
-       left="10"
-       top="0"
-       bottom="-1"
-       right="-10"
-       enabled="false"
-       visible="true">
+      <text_editor name="net_info">
       </text_editor>
       <!-- Only visible in IPANE_HTTP_LOG mode -->
-      <layout_stack
-       name="conv_stack"
-       follows="all"
-       left="10"
-       right="-10"
-       top="0"
-       bottom="-1">
-        <layout_panel
-         follows="all">
-          <text_editor
-           parse_urls="true"
-           name="conv_request"
-           follows="all"
-           enabled="false"
-           visible="true"
-           max_length="65535" />
+      <layout_stack name="conv_stack">
+        <layout_panel>
+          <text_editor name="conv_request" />
         </layout_panel>
-        <layout_panel
-         follows="all">
-          <text_editor
-           parse_urls="true"
-           name="conv_response"
-           follows="all"
-           enabled="false"
-           visible="true"
-           max_length="65535" />
+        <layout_panel>
+          <text_editor name="conv_response" />
         </layout_panel>
       </layout_stack>
     </layout_panel>
   </layout_stack>
-    <check_box
-     name="wrap_net_info"
-     follows="left|bottom"
-     left="10"
-     top="570"
-     bottom="590"
-     label="Wrap Info Text"
-     enabled="true"
-     initial_value="true"/>
-    <!-- Format the message body to be more readable, but not exactly what was sent? -->
-    <check_box
-     name="beautify_messages"
-     follows="left|bottom"
-     left="115"
-     top="570"
-     bottom="590"
-     label="Beautify Messages"
-     enabled="true"
-     initial_value="false"/>
-    <button
-     name="msg_builder_send_btn"
-     follows="right|bottom"
-     left="245"
-     top="570"
-     right="390"
-     bottom="590"
-     label="Send to Message Builder"
-     enabled="false"/>
-</floater>
+  <check_box name="wrap_net_info" label="情報テキストを折り返す" />
+  <!-- Format the message body to be more readable, but not exactly what was sent? -->
+  <check_box name="beautify_messages" label="メッセージをきれいにする" />
+  <button name="msg_builder_send_btn" label="メッセージビルダーに送信" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_message_rewriter.xml b/indra/newview/skins/default/xui/ja/floater_message_rewriter.xml
index 28cf12dc639..770525a6c98 100644
--- a/indra/newview/skins/default/xui/ja/floater_message_rewriter.xml
+++ b/indra/newview/skins/default/xui/ja/floater_message_rewriter.xml
@@ -1,67 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- single_instance="true"
- name="message_rewriter"
- title="MESSAGE REWRITER"
- width="400"
- min_width="400"
- height="500"
- min_height="500"
- can_close="true"
- can_resize="true"
- can_minimize="true"
- save_rect="true">
-	<scroll_list
-     column_padding="0"
-     draw_heading="true"
-     follows="left|top|right"
-     left="4"
-     top="4"
-     right="-4"
-     bottom="350"
-     name="rule_list"
-     search_column="0">
-		<column name="icon_enabled" label="Enabled" width="24" />
-		<column dynamicwidth="true" name="RuleName" label="Rule Name" />
-		<column name="direction" label="In / Out" width="64" />
-	</scroll_list>
-	<text
-     bg_visible="false"
-     top_pad="8"
-     follows="left|top"
-     font="SansSerifSmall"
-     height="14"
-     left="4"
-     name="message_type_lable"
-     width="80">
-	Message Type:
-	</text>
-	<combo_box
-     allow_text_entry="false"
-     top_delta="-2"
-     follows="left|top"
-     height="20"
-     left_pad="0"
-     max_chars="100"
-     mouse_opaque="true"
-     name="message_type"
-     width="150" />
-	<text_editor
-     name="rule_editor"
-     follows="left|top|right|bottom"
-     left="4"
-     top_pad="4"
-     height="92"
-     right="-4"
-     enabled="true"
-     max_length="65535" />
-	<button
-     name="save_rules"
-     follows="right|bottom"
-     width="120"
-     height="20"
-     right="-4"
-     bottom="-4"
-     label="Save Rules"
-     enabled="true"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="message_rewriter" title="メッセージリライタ">
+  <scroll_list name="rule_list">
+    <column name="icon_enabled" label="有効" />
+    <column name="RuleName" label="ルール名" />
+    <column name="direction" label="入/出" />
+  </scroll_list>
+  <text name="message_type_lable">メッセージ種別:</text>
+  <combo_box name="message_type" />
+  <text_editor name="rule_editor" />
+  <button name="save_rules" label="ルールを保存" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_music_ticker.xml b/indra/newview/skins/default/xui/ja/floater_music_ticker.xml
index 99daa03b410..455513bceb9 100644
--- a/indra/newview/skins/default/xui/ja/floater_music_ticker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_music_ticker.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- width="320"
- height="39"
- layout="topleft"
- min_width="300"
- min_height="39"
- name="floater_music_ticker"
- positioning="cascading"
- title=""
- can_minimize="false"
- header_height="0"
- can_resize="true"
- can_resize_height="false"
- show_title="false"
- save_rect="true"
- chrome="true">
-  <panel
-   class="music_ticker"
-   name="music_ticker"
-   filename="panel_music_ticker.xml"
-   layout="topleft"
-   follows="all"
-   width="296"
-   top="0"
-   mouse_opaque="false"/>
+<floater width="340" name="floater_music_ticker" title="">
+  <panel name="music_ticker" />
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_my_web_profile.xml b/indra/newview/skins/default/xui/ja/floater_my_web_profile.xml
deleted file mode 100644
index df46fc198f2..00000000000
--- a/indra/newview/skins/default/xui/ja/floater_my_web_profile.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_my_web_profile"
-         help_topic="web_profile"
-         width="780"
-         height="775"
-         save_rect="true"
-         single_instance="true"
-         reuse_instance="false"
-         filename="floater_web_content.xml"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_new_local_inventory.xml b/indra/newview/skins/default/xui/ja/floater_new_local_inventory.xml
index dfc9c306611..caf532468f8 100644
--- a/indra/newview/skins/default/xui/ja/floater_new_local_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/floater_new_local_inventory.xml
@@ -1,145 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater 
-	layout="topleft"
-	can_close="true"
-	can_drag_on_left="false"
-	can_minimize="true"
-    can_resize="false" 
-	height="130" 
-	width="350"
-    name="new_inventory_item"
-    title="Create Local Inventory Asset">
-	<text
-		top="5" 
-		follows="left|top"
-	    h_pad="0" 
-		halign="left"
-		height="10" 
-		left="10"
-	    name="LabelItemNameTitle" 
-		v_pad="0" 
-		width="78" value="Name:" />
-	<line_editor
-		top_delta="0"
-		enabled="true" 
-		follows="left|top|right" 
-		font="SansSerifSmall"
-		height="16"
-		is_unicode="false"
-		left="88" 
-		max_length="63"
-		mouse_opaque="true"
-		name="name_line" 
-		width="252" />
-	<text 
-		top_delta="20" 
-		follows="left|top"
-	    h_pad="0" 
-		halign="left" 
-		height="10" 
-		left="10"
-		name="LabelItemDescTitle" 
-		v_pad="0"
-		width="78"
-		value="Description:" />
-	<line_editor
-		top_delta="0"
-		enabled="true" 
-		follows="left|top|right" 
-		height="16"
-	    is_unicode="false" 
-		left="88" 
-		max_length="127" 
-		mouse_opaque="true"
-	    name="desc_line"
-		width="252" />
-	<text
-		top_delta="20"
-		follows="left|top"
-		h_pad="0" 
-		halign="left" 
-		height="16" 
-		left="10"
-		name="LabelAssetTitle"
-		v_pad="0"
-		width="78"
-		value="Asset:" />
-	<line_editor
-		top_delta="0"
-	    enabled="true"
-		follows="left|top|right"
-		height="16"
-		is_unicode="false"
-		left="88" 
-		max_length="127"
-		mouse_opaque="true"
-		name="asset_id_line" 
-		width="252" />
-	<text
-		top_delta="20"
-		follows="left|top"
-	    h_pad="0" 
-		halign="left" 
-		height="16" 
-		left="10"
-		name="LabelCreatorTitle" 
-		v_pad="0" 
-		width="78"
-		value="Creator:" />
-	<line_editor
-		top_delta="0"
-		enabled="true" 
-		follows="left|top|right" 
-		height="16"
-		is_unicode="false"
-		left="88" 
-		max_length="127"
-		name="creator_id_line"
-		width="252" />
-	<text
-		top_delta="20"
-		follows="left|top"
-	    h_pad="0" 
-		halign="left" 
-		height="16" 
-		left="10"
-	    name="LabelOwnerTitle" 
-		v_pad="0" 
-		width="78"
-		value="Owner" />
-	<line_editor
-		top_delta="0"
-		enabled="true" 
-		follows="left|top|right"
-		height="16"
-	     is_unicode="false" 
-		left="88"
-		max_length="127"
-		name="owner_id_line"
-		width="252" />
-	<combo_box 
-		top_delta="20"
-		allow_text_entry="false" 
-		follows="left|top"
-		height="18"
-	    left="8"
-		max_chars="20"
-		name="type_combo"
-		width="100">
-	</combo_box>
-	<check_box
-		top_delta="0"
-		height="16"
-		initial_value="true"
-		label="Open immediately"
-		left="113"
-		name="chk_open"
-		width="120" />
-	<button 
-		top_delta="0"
-		height="20" 
-		label="OK" 
-		left="240"
-		name="ok_btn" 
-		width="100" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="new_inventory_item" title="ローカルインベントリのアセット作成">
+  <text name="LabelItemNameTitle" value="名前:" />
+  <line_editor name="name_line" />
+  <text name="LabelItemDescTitle" value="説明:" />
+  <line_editor name="desc_line" />
+  <text name="LabelAssetTitle" value="アセット:" />
+  <line_editor name="asset_id_line" />
+  <text name="LabelCreatorTitle" value="制作者:" />
+  <line_editor name="creator_id_line" />
+  <text name="LabelOwnerTitle" value="所有者" />
+  <line_editor name="owner_id_line" />
+  <combo_box name="type_combo">
+  </combo_box>
+  <check_box label="直ちに開く" name="chk_open" />
+  <button label="OK" name="ok_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_particle_editor.xml b/indra/newview/skins/default/xui/ja/floater_particle_editor.xml
index a98be45472d..88d926dc4b6 100644
--- a/indra/newview/skins/default/xui/ja/floater_particle_editor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_particle_editor.xml
@@ -1,876 +1,115 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- can_resize="true"
- height="357"
- min_height="359"
- min_width="480"
- name="particle_editor_floater"
- save_rect="true"
- save_visibility="false"
- single_instance="false"
- title="PARTICLE EDITOR"
- width="480">
-  <layout_stack
-   follows="all"
-   animate="false"
-   top="0"
-   height="357"
-   left="0"
-   right="-1"
-   drag_handle_gap="0"
-   drag_handle_first_indent="1"
-   drag_handle_second_indent="1"
-   layout="topleft"
-   name="master_stack"
-   orientation="horizontal"
-   show_drag_handle="true">
-    <layout_panel
-     bg_alpha_color="PanelDefaultBackgroundColor"
-     bg_opaque_color="PanelDefaultBackgroundColor"
-     background_visible="true"
-     background_opaque="true"
-     name="layout_master"
-     follows="all"
-     layout="topleft"
-     auto_resize="false"
-     user_resize="false"
-     height="357"
-     width="300">
-      <accordion
-       left="0"
-       top="0"
-       single_expansion="false"
-       follows="all"
-       layout="topleft"
-       name="accordion_master"
-       height="357"
-       width="300">
-        <accordion_tab
-         expanded="true"
-         layout="topleft"
-         height="152"
-         name="burst_tab"
-         title="Burst/Age"
-         fit_panel="true">
-          <panel
-           follows="all"
-           height="152"
-           left="0"
-           name="burst_panel"
-           top="0"
-        	  right="-1">
-            <slider
-             follows="left|top"
-             decimal_digits="2"
-             initial_value="0.3"
-             increment="0.1"
-             name="burst_rate"
-             label="Rate:"
-             label_width="50"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="0"
-             height="16"
-             max_val="1000"
-             top="0">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="0"
-             initial_value="5"
-             increment="1"
-             name="burst_count"
-             label="Count:"
-             label_width="50"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="1"
-             height="16"
-             max_val="1000"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="0"
-             increment="0.001"
-             name="burst_radius"
-             label="Radius:"
-             label_width="50"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="0"
-             max_val="50"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="0.5"
-             increment="0.001"
-             name="burst_speed_max"
-             label="Speed Max:"
-             label_width="70"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="0"
-             max_val="100"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="0.5"
-             increment="0.001"
-             name="burst_speed_min"
-             label="Speed Min:"
-             label_width="70"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="0"
-             max_val="100"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="0"
-             increment="0.001"
-             name="source_max_age"
-             label="Source Max Age:"
-             label_width="100"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="0"
-             max_val="1000"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="5"
-             increment="0.001"
-             name="particle_max_age"
-             label="Particle Max Age:"
-             label_width="100"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="0"
-             max_val="30"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="particle_editor_floater" title="パーティクルエディタ">
+  <layout_stack name="master_stack">
+    <layout_panel name="layout_master">
+      <accordion name="accordion_master">
+        <accordion_tab name="burst_tab" title="バースト/寿命" fit_panel="true">
+          <panel name="burst_panel">
+            <slider name="burst_rate" label="頻度:" />
+            <slider name="burst_count" label="回数:" />
+            <slider name="burst_radius" label="半径:" />
+            <slider name="burst_speed_max" label="最高速度:" />
+            <slider name="burst_speed_min" label="最低速度:" />
+            <slider name="source_max_age" label="ソースの最大寿命:" />
+            <slider name="particle_max_age" label="パーティクルの最大寿命:" />
           </panel>
         </accordion_tab>
-        <accordion_tab
-         expanded="false"
-         layout="topleft"
-         height="140"
-         name="angle_tab"
-         title="Scale/Angle"
-         fit_panel="true">
-          <panel
-           follows="all"
-           height="140"
-           left="0"
-           name="angle_panel"
-           top="0"
-        	  width="313">
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="0.5"
-             increment="0.001"
-             name="scale_start_x"
-             label="Scale Start X:"
-             label_width="72"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="0.03125"
-             max_val="4"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="0.5"
-             increment="0.001"
-             name="scale_start_y"
-             label="Scale Start Y:"
-             label_width="72"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="0.03125"
-             max_val="4"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="0.5"
-             increment="0.001"
-             name="scale_end_x"
-             label="Scale End Y:"
-             label_width="70"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="0.03125"
-             max_val="4"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-              function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="0.5"
-             increment="0.001"
-             name="scale_end_y"
-             label="Scale End Y:"
-             label_width="70"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="0.03125"
-             max_val="4"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="0"
-             increment="0.001"
-             name="angle_begin"
-             label="Angle Begin:"
-             label_width="70"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="-3.14"
-             max_val="3.14"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="0"
-             increment="0.001"
-             name="angle_end"
-             label="Angle End:"
-             label_width="70"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="-3.14"
-             max_val="3.14"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
+        <accordion_tab name="angle_tab" title="スケール/角度">
+          <panel name="angle_panel">
+            <slider name="scale_start_x" label="開始スケールX:" />
+            <slider name="scale_start_y" label="開始スケールY:" />
+            <slider name="scale_end_x" label="終了スケールX:" />
+            <slider name="scale_end_y" label="終了スケールY:" />
+            <slider name="angle_begin" label="開始角度:" />
+            <slider name="angle_end" label="終了角度:" />
           </panel>
         </accordion_tab>
-        <accordion_tab
-         expanded="false"
-         layout="topleft"
-         height="100"
-         name="alpha_tab"
-         title="Alpha/Glow"
-         fit_panel="true">
-          <panel
-           follows="all"
-           height="100"
-           left="0"
-           name="alpha_panel"
-           top="0"
-        	  width="313">
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="1"
-             increment="0.001"
-             name="start_alpha"
-             label="Start Alpha:"
-             label_width="70"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="0"
-             max_val="1"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="1"
-             increment="0.001"
-             name="end_alpha"
-             label="End Alpha:"
-             label_width="70"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="0"
-             max_val="1"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="0"
-             increment="0.001"
-             name="start_glow"
-             label="Start Glow:"
-             label_width="70"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="0"
-             max_val="1"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="3"
-             initial_value="0"
-             increment="0.001"
-             name="end_glow"
-             label="End Glow:"
-             label_width="70"
-             can_edit_text="true"
-             left="0"
-             width="275"
-             min_val="0"
-             max_val="1"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
+        <accordion_tab name="alpha_tab" title="アルファ/グロー">
+          <panel name="alpha_panel">
+            <slider name="start_alpha" label="開始アルファ:" />
+            <slider name="end_alpha" label="終了アルファ:" />
+            <slider name="start_glow" label="開始グロー:" />
+            <slider name="end_glow" label="終了グロー:" />
           </panel>
         </accordion_tab>
-        <accordion_tab
-         expanded="false"
-         layout="topleft"
-         height="100"
-         name="omega_tab"
-         title="Acelleration/Omega"
-         fit_panel="true">
-          <panel
-           follows="all"
-           height="100"
-           left="0"
-           name="omega_panel"
-           top="0"
-        	  width="313">
-            <text
-             name="Acceleration_Label"
-             follows="left|top"
-             height="16"
-             left="0"
-             top="0"
-             width="76">
-            Acceleration:
-            </text>
-            <slider
-             follows="left|top"
-             decimal_digits="2"
-             initial_value="0"
-             increment="0.01"
-             name="acceleration_x"
-             label="X:"
-             label_width="10"
-             can_edit_text="true"
-             left="0"
-             width="90"
-             min_val="-100"
-             max_val="100"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="2"
-             initial_value="0"
-             increment="0.01"
-             name="acceleration_y"
-             can_edit_text="true"
-             label="Y:"
-             label_width="10"
-             left_pad="2"
-             width="90"
-             min_val="-100"
-             max_val="100"
-             height="16"
-             top_delta="0">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="2"
-             initial_value="0"
-             increment="0.01"
-             name="acceleration_z"
-             can_edit_text="true"
-             label="Z:"
-             label_width="10"
-             left_pad="2"
-             width="90"
-             min_val="-100"
-             max_val="100"
-             height="16"
-             top_delta="0">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <text
-             name="Omega_Label"
-             follows="left|top"
-             height="16"
-             left="0"
-             top_pad="4"
-             width="76">
-            Omega:
-            </text>
-            <slider
-             follows="left|top"
-             decimal_digits="2"
-             initial_value="0"
-             increment="0.01"
-             name="omega_x"
-             label="X:"
-             label_width="10"
-             can_edit_text="true"
-             left="0"
-             width="90"
-             min_val="-100"
-             max_val="100"
-             height="16"
-             top_pad="2">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="2"
-             initial_value="0"
-             increment="0.01"
-             name="omega_y"
-             label="Y:"
-             label_width="10"
-             can_edit_text="true"
-             left_pad="2"
-             width="90"
-             min_val="-100"
-             max_val="100"
-             height="16"
-             top_delta="0">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
-            <slider
-             follows="left|top"
-             decimal_digits="2"
-             initial_value="0"
-             increment="0.01"
-             name="omega_z"
-             label="Z:"
-             label_width="10"
-             can_edit_text="true"
-             left_pad="2"
-             width="90"
-             min_val="-100"
-             max_val="100"
-             height="16"
-             top_delta="0">
-              <slider.commit_callback
-               function="Particle.Edit" />
-            </slider>
+        <accordion_tab name="omega_tab" title="加速度/オメガ">
+          <panel name="omega_panel">
+            <text name="Acceleration_Label">加速度:</text>
+            <slider name="acceleration_x" label="X:" />
+            <slider name="acceleration_y" label="Y:" />
+            <slider name="acceleration_z" label="Z:" />
+
+            <text name="Omega_Label">オメガ:</text>
+            <slider name="omega_x" label="X:" />
+            <slider name="omega_y" label="Y:" />
+            <slider name="omega_z" label="Z:" />
           </panel>
         </accordion_tab>
-        <accordion_tab
-         expanded="true"
-         layout="topleft"
-         height="100"
-         name="color_tab"
-         title="Color/Texture"
-         fit_panel="true">
-          <panel
-           follows="all"
-           height="100"
-           left="0"
-           name="color_panel"
-           top="0"
-        	  width="313">
-            <texture_picker
-             follows="left|top"
-             height="70"
-             width="62"
-             left="0"
-             can_apply_immediately="true"
-             name="texture_picker"
-             label="Texture"
-             top="4">
-              <texture_picker.commit_callback
-               function="Particle.Edit" />
-            </texture_picker>
-            <color_swatch
-             follows="left|top"
-             height="70"
-             width="62"
-             label="Start Color"
-             left_pad="5"
-             can_apply_immediately="true"
-             name="start_color_selector"
-             top_delta="0">
-              <color_swatch.commit_callback
-               function="Particle.Edit" />
-            </color_swatch>
-            <color_swatch
-             follows="left|top"
-             height="70"
-             width="62"
-             label="End Color"
-             left_pad="5"
-             name="end_color_selector"
-             can_apply_immediately="true"
-             top_delta="0">
-              <color_swatch.commit_callback
-               function="Particle.Edit" />
-            </color_swatch>
-            <combo_box
-             name="blend_func_src_combo"
-             follows="left|top"
-            	height="22"
-            	left_pad="4"
-            	top_delta="0"
-            	width="74">
-              <combo_box.commit_callback
-               function="Particle.Edit" />
-             	<combo_box.item
-               label="Blend One"
-               name="blend_one"
-             		value="blend_one" />
-             	<combo_box.item
-             		label="Blend Zero"
-             		name="blend_zero"
-             		value="blend_zero" />
-             	<combo_box.item
-             		label="Blend Dest Color"
-             		name="blend_dest_color"
-             		value="blend_dest_color" />
-             	<combo_box.item
-             		label="Blend Src Color"
-             		name="blend_src_color"
-             		value="blend_src_color" />
-             	<combo_box.item
-             		label="Blend 1 - Dest Color"
-             		name="blend_one_minus_dest_color"
-             		value="blend_one_minus_dest_color" />
-             	<combo_box.item
-             		label="Blend 1 - Src Color"
-             		name="blend_one_minus_src_color"
-             		value="blend_one_minus_src_color" />
-             	<combo_box.item
-             		label="Blend Src Alpha"
-             		name="blend_src_alpha"
-             		value="blend_src_alpha" />
-             	<combo_box.item
-             		label="Blend 1 - Src Alpha"
-             		name="blend_one_minus_src_alpha"
-             		value="blend_one_minus_src_alpha" />
+        <accordion_tab name="color_tab" title="色/テスクチャ">
+          <panel name="color_panel">
+            <texture_picker name="texture_picker" label="テスクチャ" />
+            <color_swatch label="開始色" name="start_color_selector" />
+            <color_swatch label="終了色" name="end_color_selector" />
+
+            <combo_box name="blend_func_src_combo">
+              <combo_box.commit_callback function="Particle.Edit" />
+              <combo_box.item label="ブレンド1" name="blend_one" value="blend_one" />
+              <combo_box.item label="ブレンド0" name="blend_zero" value="blend_zero" />
+              <combo_box.item label="終了色にブレンド" name="blend_dest_color" value="blend_dest_color" />
+              <combo_box.item label="開始色にブレンド" name="blend_src_color" value="blend_src_color" />
+              <combo_box.item label="ブレンド1─終了色" name="blend_one_minus_dest_color" value="blend_one_minus_dest_color" />
+              <combo_box.item label="ブレンド1─開始色" name="blend_one_minus_src_color" value="blend_one_minus_src_color" />
+              <combo_box.item label="開始色アルファ" name="blend_src_alpha" value="blend_src_alpha" />
+              <combo_box.item label="ブレンド1─開始色アルファ" name="blend_one_minus_src_alpha" value="blend_one_minus_src_alpha" />
             </combo_box>
-            <combo_box
-             name="blend_func_dest_combo"
-             follows="left|top"
-             height="22"
-             left_delta="0"
-             top_pad="4"
-             width="74">
-              <combo_box.commit_callback
-               function="Particle.Edit" />
-             	<combo_box.item
-             		label="Blend One"
-             		name="blend_one"
-             		value="blend_one" />
-             	<combo_box.item
-             		label="Blend Zero"
-             		name="blend_zero"
-             		value="blend_zero" />
-             	<combo_box.item
-             		label="Blend Dest Color"
-             		name="blend_dest_color"
-             		value="blend_dest_color" />
-             	<combo_box.item
-             		label="Blend Src Color"
-             		name="blend_src_color"
-             		value="blend_src_color" />
-             	<combo_box.item
-             		label="Blend 1 - Dest Color"
-             		name="blend_one_minus_dest_color"
-             		value="blend_one_minus_dest_color" />
-             	<combo_box.item
-             		label="Blend 1 - Src Color"
-             		name="blend_one_minus_src_color"
-             		value="blend_one_minus_src_color" />
-             	<combo_box.item
-             		label="Blend Src Alpha"
-             		name="blend_src_alpha"
-             		value="blend_src_alpha" />
-             	<combo_box.item
-             		label="Blend 1 - Src Alpha"
-             		name="blend_one_minus_src_alpha"
-             		value="blend_one_minus_src_alpha" />
-             </combo_box>
-            </panel>
-          </accordion_tab>
-        </accordion>
-      </layout_panel>
-      <layout_panel
-       layout="topleft"
-      	follows="all"
-      	height="258"
-      	left_pad="0"
-      	name="checkbox_panel"
-      	width="120">
-      <text
-       name="Pattern_Label"
-	      follows="left|top"
-      	height="16"
-      	left="0"
-      	top="0"
-      	width="100">
-      Pattern:
-      </text>
-      <combo_box
-      	follows="left|right|top"
-      	name="pattern_type_combo"
-      	top_pad="2"
-      	left_delta="0"
-       right="-2">
-        <combo_box.commit_callback
-         function="Particle.Edit" />
-        <combo_box.item
-         label="Explode"
-         name="explode"
-         value="explode" />
-        <combo_box.item
-         label="Angle"
-         name="angle"
-         value="angle" />
-       	<combo_box.item
-      		 label="Angle Cone"
-      	 	name="angle_cone"
-       		value="angle_cone" />
-       	<combo_box.item
-      		 label="Angle Cone Empty"
-      	 	name="angle_cone_empty"
-       		value="angle_cone_empty" />
-      	 <combo_box.item
-      		 label="Drop"
-      	 	name="drop"
-       		value="drop" />
+            <combo_box name="blend_func_dest_combo">
+              <combo_box.commit_callback function="Particle.Edit" />
+              <combo_box.item label="ブレンド1" name="blend_one" value="blend_one" />
+              <combo_box.item label="ブレンド0" name="blend_zero" value="blend_zero" />
+              <combo_box.item label="終了色にブレンド" name="blend_dest_color" value="blend_dest_color" />
+              <combo_box.item label="開始色にブレンド" name="blend_src_color" value="blend_src_color" />
+              <combo_box.item label="ブレンド1─終了色" name="blend_one_minus_dest_color" value="blend_one_minus_dest_color" />
+              <combo_box.item label="ブレンド1─開始色" name="blend_one_minus_src_color" value="blend_one_minus_src_color" />
+              <combo_box.item label="開始色アルファ" name="blend_src_alpha" value="blend_src_alpha" />
+              <combo_box.item label="ブレンド1─開始色アルファ" name="blend_one_minus_src_alpha" value="blend_one_minus_src_alpha" />
+            </combo_box>
+          </panel>
+        </accordion_tab>
+      </accordion>
+    </layout_panel>
+    <layout_panel name="checkbox_panel">
+      <text name="Pattern_Label">パターン:</text>
+      <combo_box name="pattern_type_combo">
+        <combo_box.commit_callback function="Particle.Edit" />
+        <combo_box.item label="爆散" name="explode" value="explode" />
+        <combo_box.item label="角度" name="angle" value="angle" />
+        <combo_box.item label="角錐" name="angle_cone" value="angle_cone" />
+        <combo_box.item label="空の角錐" name="angle_cone_empty" value="angle_cone_empty" />
+        <combo_box.item label="ドロップ" name="drop" value="drop" />
       </combo_box>
-      <check_box
-      	follows="left|top"
-      	height="16"
-      	name="bounce_checkbox"
-      	label="Bounce"
-      	left="0"
-      	top_pad="4"
-      	width="80">
-        <check_box.commit_callback
-         function="Particle.Edit" />
-      </check_box>
-      <check_box
-      	follows="left|top"
-      	height="16"
-      	name="emissive_checkbox"
-      	label="Emissive"
-      	top_pad="4"
-       left="0"
-      	width="80">
-        <check_box.commit_callback
-         function="Particle.Edit" />
-      </check_box>
-      <check_box
-      	follows="left|top"
-      	height="16"
-      	name="wind_checkbox"
-      	label="Wind"
-      	top_pad="4"
-       left="0"
-      	width="80">
-        <check_box.commit_callback
-         function="Particle.Edit" />
-      </check_box>
-      <check_box
-      	follows="left|top"
-      	height="16"
-      	name="ribbon_checkbox"
-      	label="Ribbon"
-      	top_pad="4"
-       left="0"
-      	width="80">
-        <check_box.commit_callback
-         function="Particle.Edit" />
-      </check_box>
-      <check_box
-      	follows="left|top"
-      	height="16"
-      	name="follow_source_checkbox"
-      	label="Follow Source"
-      	top_pad="4"
-       left="0"
-      	width="120">
-        <check_box.commit_callback
-         function="Particle.Edit" />
-      </check_box>
-      <check_box
-      	follows="left|top"
-      	height="16"
-      	name="follow_velocity_checkbox"
-      	label="Follow Velocity"
-      	top_pad="4"
-      	width="120">
-        <check_box.commit_callback
-         function="Particle.Edit" />
-      </check_box>
-      <check_box
-      	follows="left|top"
-      	height="16"
-      	name="interpolate_color_checkbox"
-      	label="Interpolate Color"
-      	top_pad="4"
-      	width="120">
-        <check_box.commit_callback
-         function="Particle.Edit" />
-      </check_box>
-      <check_box
-    	  follows="left|top"
-      	height="16"
-      	name="interpolate_scale_checkbox"
-      	label="Interpolate Scale"
-      	top_pad="4"
-      	width="120">
-        <check_box.commit_callback
-         function="Particle.Edit" />
-      </check_box>
-      <check_box
-      	follows="left|top"
-      	height="16"
-      	name="target_position_checkbox"
-      	label="Target Position"
-      	top_pad="4"
-      	width="120">
-        <check_box.commit_callback
-         function="Particle.Edit" />
-      </check_box>
-      <check_box
-      	follows="left|top"
-      	height="16"
-      	name="target_linear_checkbox"
-      	label="Target Linear"
-      	top_pad="4"
-      	width="120">
-        <check_box.commit_callback
-         function="Particle.Edit" />
-      </check_box>
-      <line_editor
-       follows="left|right|top"
-       left="0"
-       name="target_key_input"
-       height="20"
-       right="-48">
-        <line_editor.commit_callback
-         function="Particle.Edit" />
-      </line_editor>
-      <button
-       follows="right|top"
-       image_overlay="StopReload_Over"
-       left_pad="4"
-       name="clear_target_button"
-       tool_tip="Clear target object or avatar"
-       width="20"
-       height="20" />
-      <button
-       follows="right|top"
-       image_overlay="Inv_Object"
-       left_pad="2"
-       name="pick_target_button"
-       tool_tip="Click here to select the particle target object or avatar."
-       width="20"
-       height="20" />
-      <button
-       follows="left|top"
-      	height="24"
-      	name="copy_button"
-      	label="Copy"
-      	tool_tip="Copies the particle system's parameter as LSL script to the clipboard."
-      	top_pad="7"
-       left="2"
-      	width="85" />
-      <button
-      	follows="left|top"
-      	height="24"
-      	name="inject_button"
-      	label="Inject"
-      	tool_tip="Inject this particle system into the selected object."
-      	left_pad="4"
-       width="85" />
+      <check_box name="bounce_checkbox" label="跳ねる" />
+      <check_box name="emissive_checkbox" label="放射性" top_pad="4" />
+
+      <check_box name="wind_checkbox" label="風" />
+
+      <check_box name="ribbon_checkbox" label="リボン" />
+
+      <check_box name="follow_source_checkbox" label="ソースに従う" />
+
+      <check_box name="follow_velocity_checkbox" label="速度に従う" />
+
+      <check_box name="interpolate_color_checkbox" label="色を補間" />
+
+      <check_box name="interpolate_scale_checkbox" label="スケールを補間" />
+
+      <check_box name="target_position_checkbox" label="目標位置" />
+      <check_box name="target_linear_checkbox" label="線形の目標" />
+
+      <line_editor name="target_key_input" />
+      <button name="clear_target_button" tool_tip="目標のオブジェクトまたはアバターをクリアします。" />
+      <button name="pick_target_button" tool_tip="ここをクリックして、パーティクルの目標オブジェクトまたはアバターを選択します。" />
+      <button name="copy_button" label="コピー" tool_tip="パーティクルシステムのパラメータをLSLスクリプトとしてクリップボードにコピーします。" />
+      <button name="inject_button" label="注入" tool_tip="このパーティクルシステムを選択したオブジェクトに注入します。" />
     </layout_panel>
   </layout_stack>
-</floater>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_profile_legacy.xml b/indra/newview/skins/default/xui/ja/floater_profile_legacy.xml
index 2a896d10796..0ef7e4fd681 100644
--- a/indra/newview/skins/default/xui/ja/floater_profile_legacy.xml
+++ b/indra/newview/skins/default/xui/ja/floater_profile_legacy.xml
@@ -1,27 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-  positioning="cascading"
-  can_close="true"
-  can_resize="true"
-  height="580"
-  min_height="350"
-  min_width="260"
-  layout="topleft"
-  name="floater_profile_legacy"
-  save_rect="true"
-  title="PROFILE"
-  width="370">
-    <panel
-      class="panel_profile_legacy_sidetray"
-      name="panel_profile_legacy_sidetray"
-      filename="panel_profile_legacy_sidetray.xml"
-      label="Profile"
-      font="SansSerifBold"
-      follows="all"
-      layout="topleft"
-      min_height="350"
-      left="1"
-      right="-1"
-      top="0"
-      bottom="-8"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_profile_legacy" title="プロフィール">
+  <panel name="panel_profile_legacy_sidetray" label="プロフィール" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_progress_view.xml b/indra/newview/skins/default/xui/ja/floater_progress_view.xml
index ddbb235e268..114a2a0112c 100644
--- a/indra/newview/skins/default/xui/ja/floater_progress_view.xml
+++ b/indra/newview/skins/default/xui/ja/floater_progress_view.xml
@@ -1,68 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- positioning="centered"
- header_height="0"
- height="90"
- layout="topleft"
- name="progress_view"
- chrome="false"
- can_resize="false"
- can_close="false"
- can_minimize="false"
- single_instance="true"
- width="420">
-  <floater.string
-   name="loc_fmt">
-Teleporting to [REGION]...
-  </floater.string>
-  <floater.string
-   name="teleporting">
-Teleporting...
-  </floater.string>
-  <text
-   height="26"
-   use_ellipses="true"
-   type="string"
-   text_color="LabelTextColor"
-   font="SansSerifHugeBold"
-   length="1"
-   follows="top|left"
-   layout="topleft"
-   name="location"
-   top="6"
-   left="6"
-   right="-6"
-   value="[APP_NAME]" />
-  <text
-   height="20"
-   use_ellipses="true"
-   font="SanSerifHuge"
-   type="string"
-   length="1"
-   follows="top|right"
-   layout="topleft"
-   name="progress_text"
-   top_pad="10"
-   left="6"
-   width="334" />
-  <button
-   height="24"
-   label="Cancel"
-   left_pad="4"
-   name="cancel_btn"
-   top_delta="-4"
-   width="70">
-    <button.commit_callback
-     function="cancel" />
-  </button>
-  <progress_bar
-   height="16"
-   follows="top|left"
-   layout="topleft"
-   name="progress_bar"
-   top_pad="4"
-   left="6"
-   right="-6"
-   tool_tip="progress bar" 
-   color_bar="EmphasisColor"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="progress_view">
+  <floater.string name="loc_fmt">[REGION]にテレポートしています…</floater.string>
+  <floater.string name="teleporting">テレポートしています…</floater.string>
+  <text value="[APP_NAME]" />
+  <text name="progress_text" />
+  <button label="キャンセル" name="cancel_btn" />
+
+  <progress_bar name="progress_bar" tool_tip="プログレスバー" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_quick_settings.xml b/indra/newview/skins/default/xui/ja/floater_quick_settings.xml
index 35f23a23023..fd9217e5d24 100644
--- a/indra/newview/skins/default/xui/ja/floater_quick_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_quick_settings.xml
@@ -1,20 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- width="300"
- height="159"
- layout="topleft"
- min_height="159"
- min_width="300"
- name="floater_quick_settings"
- positioning="cascading"
- title="QUICK SETTINGS"
- save_rect="true"
- can_resize="true"
- can_resize_height="false">
-  <panel
-   name="quick_settings"
-   class="quick_settings"
-   filename="panel_quick_settings.xml"
-   layout="topleft"
-   follows="all" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_quick_settings" title="簡易設定">
+  <panel name="quick_settings" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_region_tracker.xml b/indra/newview/skins/default/xui/ja/floater_region_tracker.xml
index a9602f33b86..8b93c0fbbfa 100644
--- a/indra/newview/skins/default/xui/ja/floater_region_tracker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_tracker.xml
@@ -1,90 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- name="region_tracker"
- title="REGION TRACKER"
- help_topic="floater_region_tracker"
- single_instance="true"
- reuse_instance="true"
- layout="topleft"
- height="250"
- width="408"
- min_height="150"
- min_width="30"
- can_resize="true">
- <text
-  follows="left|top" 
-  height="31" 
-  left="5" 
-  top="0" 
-  right="-8"
-  layout="topleft" 
-  valign="center"
-  font="SansSerifBig" 
-  name="region_label_text" 
-  value="Add regions from the World Map" />
-  <button
-   right="-76"
-   top_pad="-29"
-   halign="center" 
-   height="31" 
-   layout="topleft" 
-   follows="top|right"
-   width="31" 
-   mouse_opaque="true" 
-   name="refresh"
-   image_overlay="Refresh_Off" />
-  <button
-   left_pad="5"
-   halign="center" 
-   height="31" 
-   layout="topleft" 
-   follows="top|right"
-   width="31" 
-   mouse_opaque="true" 
-   name="remove"
-   image_overlay="TrashItem_Off" />
-  <button
-   left_pad="5"
-   halign="center" 
-   height="31" 
-   layout="topleft" 
-   follows="top|right"
-   width="31" 
-   mouse_opaque="true" 
-   name="open_map"
-   image_overlay="Command_Map_Icon" />
-  <scroll_list
-   name="region_list"
-   tool_tip="Double click an entry to open it on the world map."
-   height="210"
-   width="400"
-   layout="topleft"
-   follows="all" 
-   top_pad="5"
-   left="5"
-   multi_select="true"
-   draw_heading="true"
-   column_padding="0"
-   search_column="0"
-   sort_column="0">
-   <scroll_list.columns
-    name="region_label"
-    label="Label"
-    dynamicwidth="true"
-    width="100" />
-   <scroll_list.columns 
-    name="region_maturity_icon"
-    dynamicwidth="true"
-    width="26" />
-   <scroll_list.columns 
-    name="region_name"
-    label="Region"
-    dynamicwidth="true"
-    width="130" />
-   <scroll_list.columns 
-    name="region_agent_count"	
-    label="Count"	
-    dynamicwidth="true" 
-    width="30" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="region_tracker" title="リージョントラッカー">
+  <text name="region_label_text" value="ワールドマップからリージョンを追加" />
+  <button name="refresh" />
+  <button name="remove" />
+  <button name="open_map" />
+  <scroll_list name="region_list" tool_tip="エントリをダブルクリックして、ワールドマップ上で開きます。">
+    <scroll_list.columns name="region_label" label="ラベル" />
+    <scroll_list.columns name="region_maturity_icon" />
+    <scroll_list.columns name="region_name" label="リージョン" />
+    <scroll_list.columns name="region_agent_count" label="カウント" />
   </scroll_list>
- </floater>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_rlv_behaviours.xml b/indra/newview/skins/default/xui/ja/floater_rlv_behaviours.xml
index 61c81caa5e9..d643719a03c 100644
--- a/indra/newview/skins/default/xui/ja/floater_rlv_behaviours.xml
+++ b/indra/newview/skins/default/xui/ja/floater_rlv_behaviours.xml
@@ -1,123 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-  open_positioning="cascading"
-  can_close="true"
-  can_minimize="true"
-  can_resize="true"
-  height="300"
-  min_height="300"
-  min_width="450"
-  name="rlv_behaviours"
-  save_rect="true"
-  save_visibility="false"
-  single_instance="true"
-  title="ACTIVE RLV RESTRICTIONS"
-  width="450">
-  <tab_container
-    follows="all"
-    layout="topleft"
-    left="8"
-    name="behaviour_tab"
-    height="266"
-    right="-8"
-    tab_height="23"
-    tab_min_width="120"
-    tab_position="top"
-    top="0" >
-    <panel
-      follows="all"  height="265"
-      label="RESTRICTIONS"
-      layout="topleft"
-      name="behaviour_panel"
-      top="0">
-      <scroll_list
-	     draw_border="false"
-	     draw_heading="true"
-	     draw_stripes="true"
-	     follows="all"
-	     height="266"
-	     layout="topleft"
-	     multi_select="false"
-	     name="behaviour_list"
-		 sort_column="0"
-	     tool_tip="List of current RLVa restrictions."
-	     top_pad="0" >
-        <scroll_list.columns label="Restriction" name="behaviour" width="80" />
-        <scroll_list.columns label="Object Name" name="issuer" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="rlv_behaviours" title="有効なRLV制限">
+  <tab_container name="behaviour_tab">
+    <panel label="制限" name="behaviour_panel">
+      <scroll_list name="behaviour_list" tool_tip="現在のRLVaの制限一覧">
+        <scroll_list.columns label="制限" name="behaviour" />
+        <scroll_list.columns label="オブジェクト名" name="issuer" />
       </scroll_list>
     </panel>
-    <panel
-      follows="all"  height="265"
-      label="EXCEPTIONS"
-      layout="topleft"
-      name="exception_panel"
-      top="0"> 
-      <scroll_list
-	     draw_border="false"
-	     draw_heading="true"
-	     draw_stripes="true"
-	     follows="all"
-	     height="266"
-	     layout="topleft"
-	     multi_select="false"
-	     name="exception_list"
-		 sort_column="0"
-	     tool_tip="List of current RLVa exceptions."
-	     top_pad="0" >
-        <scroll_list.columns label="Exception" name="behaviour" width="80" />
-        <scroll_list.columns label="Source" name="option" width="105" />
-        <scroll_list.columns label="Object Name" name="issuer" />
+    <panel label="例外" name="exception_panel">
+      <scroll_list name="exception_list" sort_column="0" tool_tip="現在のRLVaの例外一覧" top_pad="0">
+        <scroll_list.columns label="例外" name="behaviour" />
+        <scroll_list.columns label="ソース" name="option" />
+        <scroll_list.columns label="オブジェクト名" name="issuer" />
       </scroll_list>
     </panel>
-    <panel
-      follows="all"  height="265"
-      label="MODIFIERS"
-      layout="topleft"
-      name="modifier_panel"
-      top="0">
-      <scroll_list
-       draw_border="false"
-       draw_heading="true"
-       draw_stripes="true"
-       follows="all"
-       height="266"
-       layout="topleft"
-       multi_select="false"
-       name="modifier_list"
-       sort_column="0"
-       tool_tip="List of current RLVa modifiers."
-       top_pad="0" >
-        <scroll_list.columns label="Modifier" name="modifier" width="105" />
-        <scroll_list.columns label="Value" name="value" width="105" />
-        <scroll_list.columns label="Primary Object" name="primary" />
+    <panel label="モディファイア" name="modifier_panel">
+      <scroll_list name="modifier_list" tool_tip="現在のRLVaのモディファイア一覧">
+        <scroll_list.columns label="モディファイア" name="modifier" />
+        <scroll_list.columns label="値" name="value" />
+        <scroll_list.columns label="優先オブジェクト" name="primary" />
       </scroll_list>
     </panel>
   </tab_container>
-  <panel
-   background_visible="false"
-   follows="left|right|bottom"
-   height="25"
-   label="bottom_panel"
-   layout="topleft"
-   name="bottom_panel"
-   top_pad="0">
-    <button
-     image_hover_unselected="Toolbar_Left_Over"
-     image_overlay="Copy"
-     image_overlay_alignment="left"
-     image_selected="Toolbar_Left_Selected"
-     image_unselected="Toolbar_Left_Off"
-     label="Copy to Clipboard"
-     left="0"
-     name="copy_btn"
-     top="1"
-     width="150" />
-    <icon
-     follows="left|right"
-     image_name="Toolbar_Right_Off"
-     left_pad="1"
-     name="dummy_icon"
-     top="1"
-     right="-1" />
+  <panel label="ボトムパネル" name="bottom_panel">
+    <button label="クリップボードにコピー" name="copy_btn" />
+    <icon name="dummy_icon" />
   </panel>
-</floater>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_rlv_console.xml b/indra/newview/skins/default/xui/ja/floater_rlv_console.xml
index 928d50cb414..d7b99ee07c0 100644
--- a/indra/newview/skins/default/xui/ja/floater_rlv_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_rlv_console.xml
@@ -1,73 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- can_resize="true"
- height="400"
- layout="topleft"
- min_height="300"
- min_width="300"
- name="rlv_console"
- title="RLVa console"
- width="600"
- >
-    <layout_stack
-     animate="false"
-     bottom="-1"
-     default_tab_group="2"
-     follows="all"
-     left="5"
-     layout="topleft"
-     mouse_opaque="false"
-     name="main_stack"
-     right="-5"
-     orientation="vertical"
-     tab_group="1"
-     top="1"
-     >
-        <layout_panel
-         name="body_panel"
-         height="235">
-            <text_editor
-             follows="all"
-             left="1"
-			 right="-1"
-			 top="0"
-             length="1"
-             font="Monospace"
-             bottom="-1"
-             ignore_tab="false"
-             layout="topleft"
-             max_length="65536"
-             name="console_output"
-             read_only="true"
-             track_end="true"
-             type="string"
-             word_wrap="true"
-            >
-            </text_editor>
-        </layout_panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="rlv_console" title="RLVaコンソール">
+  <layout_stack name="main_stack">
+    <layout_panel name="body_panel">
+      <text_editor name="console_output">
+      </text_editor>
+    </layout_panel>
 
-        <layout_panel
-         height="26"
-         auto_resize="false"
-         name="input_panel">
-            <chat_editor
-             layout="topleft"
-             expand_lines_count="5"
-             follows="left|right|bottom"
-             font="SansSerifSmall"
-             height="20"
-             is_expandable="true"
-             text_tentative_color="TextFgTentativeColor"
-             name="console_input"
-             max_length="1023"
-             spellcheck="true"
-             tab_group="3"
-             bottom_delta="20"
-             left="1"
-			 top="1"
-			 right="-1"
-             wrap="true"
-            />
-        </layout_panel>
-    </layout_stack>
-</floater>
+    <layout_panel name="input_panel">
+      <chat_editor name="console_input" />
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_rlv_locks.xml b/indra/newview/skins/default/xui/ja/floater_rlv_locks.xml
index d6665bcef2a..c3413b02191 100644
--- a/indra/newview/skins/default/xui/ja/floater_rlv_locks.xml
+++ b/indra/newview/skins/default/xui/ja/floater_rlv_locks.xml
@@ -1,25 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-  can_close="true"
-  can_minimize="true"
-  can_resize="true"
-  height="200"
-  min_height="200"
-  min_width="500"
-  name="rlvLocks"
-  save_rect="true"
-  save_visibility="false"
-  single_instance="true"
-  positioning="cascading"
-  reuse_instance="true"
-  title="ACTIVE RLV LOCKS"
-  width="500">
-  <panel
-    class="panel_rlvLocks"
-    filename="panel_rlv_locks.xml"
-    layout="topleft"
-    left="9" 
-    name="panel_rlvLocks"
-    right="-8"
-    top="0" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="rlvLocks" title="有効なRLVロック">
+  <panel filename="panel_rlv_locks.xml" />
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_rlv_strings.xml b/indra/newview/skins/default/xui/ja/floater_rlv_strings.xml
index 2b31f99fb4e..8cfb71d5dbb 100644
--- a/indra/newview/skins/default/xui/ja/floater_rlv_strings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_rlv_strings.xml
@@ -1,70 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- can_minimize="false"
- height="215"
- layout="topleft"
- legacy_header_height="18"
- name="rlva_strings"
- title="RLVa Strings"
- width="340">
-    <combo_box
-     allow_text_entry="false"
-     follows="top|left"
-     height="22"
-     layout="topleft"
-     left="12"
-     max_chars="255"
-     name="string_list"
-     top="25"
-     width="316" />
-    <text_editor
-     enabled="false"
-     height="60"
-     layout="topleft"
-     left_delta="0"
-     name="string_descr"
-     top_pad="5"
-     width="317"
-     word_wrap="true" />
-    <text_editor
-     enabled="true"
-     height="60"
-     layout="topleft"
-     left_delta="0"
-     name="string_value"
-     top_pad="5"
-     width="316"
-     word_wrap="true" />
-    <panel
-      follows="top|left"
-      height="25"
-      layout="topleft"
-      left="10"
-      name="bottom_panel"
-      top="180"
-      right="-8">
-      <button
-	follows="top|left"
-	image_hover_unselected="Toolbar_Left_Over"
-	image_overlay="Refresh_Off"
-	image_overlay_alignment="left"
-	image_selected="Toolbar_Left_Selected"
-	image_unselected="Toolbar_Left_Off"
-	label="Reset to default"
-	layout="topleft"
-	left="0"
-	name="default_btn"
-	top="1"
-	width="140" >
-	<button.commit_callback
-	  function="ClickDefault" />
-      </button>
-      <icon
-	follows="left|right"
-	image_name="Toolbar_Right_Off"
-	left_pad="1"
-	name="dummy_icon"
-	top="1"
-	right="-1" />
-    </panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="rlva_strings" title="RLVa文章">
+  <combo_box name="string_list" />
+  <text_editor name="string_descr" />
+  <text_editor name="string_value" />
+  <panel name="bottom_panel">
+    <button label="デフォルトに戻す" name="default_btn" />
+    <icon name="dummy_icon" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_script.xml b/indra/newview/skins/default/xui/ja/floater_script.xml
deleted file mode 100644
index bd4edb81c85..00000000000
--- a/indra/newview/skins/default/xui/ja/floater_script.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- background_visible="true"
- height="250"
- layout="topleft"
- name="script_floater"
- can_dock="true"
- can_minimize="true"
- visible="false" 
- width="350"
- can_resize="false"
- min_width="350"
- min_height="200">
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
deleted file mode 100644
index cf859bb6294..00000000000
--- a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script" short_title="[ALL SCRIPTS]" title="[ALL SCRIPTS]" />
diff --git a/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml
index 69953bf07f2..711797ae557 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml
@@ -21,4 +21,15 @@ default
     llSay(PUBLIC_CHANNEL, greeting);
   }
 }</script_editor>
+  <text name="prefs_label">スクリプトエディタのオプション:</text>
+  <check_box label="LSLプリプロセッサを有効化" tool_tip="チェックすると、LSLプリプロセッサが有効になります。" name="preproc_checkbox" />
+  <check_box label="スクリプト最適化" tool_tip="チェックすると、LSLプリプロセッサはスクリプトによって使用されるスペースを最適化します。" name="preprocoptimizer_checkbox" />
+  <check_box label="switch()ステートメント" tool_tip="チェックすると、LSLプリプロセッサはスクリプトフロー制御にswitch()ステートメントの使用を許可します。" name="preprocswitch_checkbox" />
+  <check_box label="怠けリスト" tool_tip="チェックすると、LSLプリプロセッサはリスト処理に構文拡張の使用を許可します。" name="preproclazy_checkbox" />
+  <check_box label="ローカルディスクから#includes" tool_tip="チェックすると、LSLプリプロセッサにより、#includeステートメントによるローカルディスク上のファイルの参照が許可されます。" name="preprocinclude_checkbox" />
+  <text name="lslpreprocinclude_textbox">プリプロセッサのインクルードパス:</text>
+  <line_editor name="preprocinclude_location" />
+  <button label="…" label_selected="ブラウズ" name="SetPreprocInclude" />
+
+  <button name="close_btn" label="OK" />
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_search_replace.xml b/indra/newview/skins/default/xui/ja/floater_search_replace.xml
index 51ed65f6449..f267e9ae23d 100644
--- a/indra/newview/skins/default/xui/ja/floater_search_replace.xml
+++ b/indra/newview/skins/default/xui/ja/floater_search_replace.xml
@@ -1,111 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- default_tab_group="1"
- height="110"
- layout="topleft"
- name="search replace"
- help_topic="search_replace"
- title="SEARCH / REPLACE"
- width="300">
-    <check_box
-     control_name="LSLFindCaseInsensitivity"
-     height="16"
-     label="Case Insensitive"
-     layout="topleft"
-     left="55"
-     name="case_text"
-     top="61"
-     width="120" />
-    <check_box
-     control_name="LSLFindDirection"
-     height="16"
-     label="Search Up"
-     layout="topleft"
-     left_pad="0"
-     name="find_previous"
-     top="61"
-     width="120" />
-    <panel
-     background_visible="false"
-     follows="left|right|bottom"
-     height="25"
-     label="bottom_panel"
-     layout="topleft"
-     left="6"
-     name="bottom_panel"
-     top_pad="2" >
-        <button
-         image_hover_unselected="Toolbar_Left_Over"
-         image_selected="Toolbar_Left_Selected"
-         image_unselected="Toolbar_Left_Off"
-         label="Search"
-         left="0"
-         name="search_btn"
-         top="1"
-         width="95" />
-        <button
-         image_hover_unselected="Toolbar_Middle_Over"
-         image_selected="Toolbar_Middle_Selected"
-         image_unselected="Toolbar_Middle_Off"
-         label="Replace"
-         left_pad="1"
-         name="replace_btn"
-         top="1"
-         width="95" />
-        <button
-         image_hover_unselected="Toolbar_Right_Over"
-         image_selected="Toolbar_Right_Selected"
-         image_unselected="Toolbar_Right_Off"
-         label="Replace All"
-         left_pad="1"
-         name="replace_all_btn"
-         top="1"
-         width="95" />
-    </panel> 
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="5"
-     name="txt"
-     top="21"
-     width="45">
-        Search
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="0"
-     name="txt2"
-     top_pad="5"
-     width="45">
-        Replace
-    </text>
-    <line_editor
-     border_style="line"
-     border_thickness="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="55"
-     name="search_text"
-     tab_group="1"
-     top="21"
-     width="240" />
-    <line_editor
-     border_style="line"
-     border_thickness="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="0"
-     name="replace_text"
-     top_pad="5"
-     width="240" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="search replace" title="検索と置換">
+  <check_box label="大文字小文字を区別しない" name="case_text" />
+  <check_box label="上に検索" name="find_previous" />
+  <panel label="ボトムパネル">
+    <button label="検索" name="search_btn" />
+    <button label="置換え" name="replace_btn" />
+    <button label="全て置換え" name="replace_all_btn" />
+  </panel>
+  <text name="txt">検索</text>
+  <text name="txt2">置換え</text>
+  <line_editor name="search_text" />
+  <line_editor name="replace_text" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_side_bar_tab.xml b/indra/newview/skins/default/xui/ja/floater_side_bar_tab.xml
deleted file mode 100644
index 9f14e9ae0ac..00000000000
--- a/indra/newview/skins/default/xui/ja/floater_side_bar_tab.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<floater
- can_close="false"
- can_resize="true"
- min_width="333"
- min_height="440"
- save_rect="true"
- save_visibility="true"
- >
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_layout.xml b/indra/newview/skins/default/xui/ja/floater_test_layout.xml
deleted file mode 100644
index 94f7e0b7980..00000000000
--- a/indra/newview/skins/default/xui/ja/floater_test_layout.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- height="500"
- layout="topleft"
- name="floater_test_layout"
- help_topic="floater_test_layout"
- translate="false"
- width="500">
-    <text
-     type="string"
-     length="1"
-     height="16"
-     layout="topleft"
-     left="10"
-     top="84"
-     width="200">
-        bottom 400 left 10
-    </text>
-    <text
-     type="string"
-     length="1"
-     height="16"
-     layout="topleft"
-     left_delta="0"
-     top_pad="4"
-     width="200">
-        Bottom delta -20
-    </text>
-    <text
-     type="string"
-     length="1"
-     height="16"
-     layout="topleft"
-     left_delta="0"
-     top_pad="64"
-     width="200">
-        bottom 300 left 10, should delta_bottom
-    </text>
-    <text
-     type="string"
-     length="1"
-     height="16"
-     layout="topleft"
-     left_pad="40"
-     top_delta="0"
-     width="200">
-        bottom 300 left 250, should delta_left
-    </text>
-    <text
-     type="string"
-     length="1"
-     height="16"
-     layout="topleft"
-     left="10"
-     top="204"
-     width="200">
-        bottom 280 left 10, should absolute position
-    </text>
-    <text
-     type="string"
-     length="1"
-     height="16"
-     layout="topleft"
-     left_pad="40"
-     top_delta="-2"
-     width="200">
-        bottom 282 left 250, should delta_left and delta_bottom
-    </text>
-    <text
-     type="string"
-     length="1"
-     height="16"
-     layout="topleft"
-     left="10"
-     top="234"
-     width="200">
-        bottom 250 left 10, should absolute position
-    </text>
-    <text
-     type="string"
-     length="1"
-     height="16"
-     layout="topleft"
-     left="250"
-     top="244"
-     width="200">
-        bottom 240 left 250, should absolute position
-    </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_list_view.xml b/indra/newview/skins/default/xui/ja/floater_test_list_view.xml
deleted file mode 100644
index 32ccc31dfd4..00000000000
--- a/indra/newview/skins/default/xui/ja/floater_test_list_view.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- height="400"
- layout="topleft"
- name="floater_test_list_view"
- help_topic="floater_test_list_view"
- translate="false"
- width="400">
- <!-- intentionally empty -->
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_navigation_bar.xml b/indra/newview/skins/default/xui/ja/floater_test_navigation_bar.xml
deleted file mode 100644
index f4a50ecc962..00000000000
--- a/indra/newview/skins/default/xui/ja/floater_test_navigation_bar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- height="200"
- layout="topleft"
- name="floater_test_navigation_bar"
- help_topic="floater_test_navigation_bar"
- translate="false"
- width="900">
-  <panel
-    name="navigation_bar"
-    filename="panel_navigation_bar.xml"
-    left="10"
-    right="-10" 
-    top="30"
-    height="100"
-    border="true"
-      />           
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_textbox.xml b/indra/newview/skins/default/xui/ja/floater_test_textbox.xml
deleted file mode 100644
index 1d31fbd6dc0..00000000000
--- a/indra/newview/skins/default/xui/ja/floater_test_textbox.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- height="600"
- layout="topleft"
- name="floater_test_textbox"
- help_topic="floater_test_textbox"
- translate="false"
- width="800">
- <text
-    clip_partial="true"
-    top_pad="10"
-    left="10"
-    width="267"
-    height="28"
-    layout="topleft"
-    follows="right|left"
-    text_color="white"
-    use_ellipses="true"
-    word_wrap="true"
-    mouse_opaque="false"
-    name="title" >
-    This text has word_wrap set true, use_ellipses set true, and clip_partial set true, so it should wrap around, spilling over to the last line, then clip the last partial line and show ellipses to indicate there is more text
-  </text>
-
-  <text
-   font="SansSerif"
-   font.style="BOLD"
-   height="10"
-   layout="topleft"
-   left_delta="0"
-   top_pad="10"
-   width="300">
-    SansSerif BOLD
-  </text>
-  <text
-   font="SansSerif"
-   font.style="BOLD|UNDERLINE"
-   height="10"
-   layout="topleft"
-   left_delta="0"
-   top_pad="10"
-   width="300">
-    SansSerif BOLD UNDERLINE
-  </text>
-  <text
- bottom="390"
- left="10"
- name="right_aligned_text"
- width="300"
- halign="right"
- top_pad="10">
-    Right aligned text
-  </text>
-  <text
- bottom="390"
- left="10"
- name="centered_text"
- width="300"
- halign="center"
- top_pad="10">
-    Centered text
-  </text>
-  <text
- left="10"
- name="left_aligned_text"
- width="300"
- halign="left"
- top_pad="10">
-    Left aligned text
-  </text>
-  <text
- left="10"
- name="v_pad_text"
- height="40"
- width="300"
- halign="left"
- top_pad="10"
- v_pad="10">
-    v_pad = 10, height = 40
-  </text>
-  <text
- left="10"
- name="v_pad_text"
- height="40"
- width="300"
- halign="left"
- top_pad="10"
- h_pad="30">
-    h_pad = 30, height = 40
-  </text>
-  <text
- top_pad="10"
- left="10"
- right="-10"
- height="20"
- follows="top|left"
- font.name="SansSerifSmall"
- name="test_text10"
- tool_tip="text">
-    SansSerifSmall
-    The 华文细黑 brown fox ヒラキjumped over the lazy dog.
-  </text>
-  <text
-   top_pad="10"
-   left="10"
-   right="-10"
-   height="25"
-   follows="top|left"
-   font.name="SansSerifMedium"
-   name="test_text11"
-   tool_tip="text">
-    SansSerif
-    The 华文细黑 brown fox ヒラキjumped over the lazy dog.
-  </text>
-  <text
-   top_pad="10"
-   left="10"
-   right="-10"
-   follows="top|left"
-   height="26"
-   font.name="SansSerifLarge"
-   name="test_text12"
-   tool_tip="text">
-    SansSerifLarge
-    The 华文细黑 brown fox ヒラキjumped over the lazy dog.
-  </text>
-  <text
-   top_pad="10"
-   left="10"
-   height="35"
-   right="-10"
-   follows="top|left"
-   font.name="SansSerifHuge"
-   name="test_text13"
-   tool_tip="text">
-    SansSerifHuge
-    The 华文细黑 brown fox ヒラキjumped over the lazy dog.
-  </text>
-  
-<!-- next column -->
-  <text_editor
- height="50"
- follows="top|left|bottom"
- left="400"
- name="test_text_editor"
- tool_tip="text editor"
- top="25"
- width="200">
-    Text Editor
-  </text_editor>
-  <text_editor
- height="50"
- follows="top|left|bottom"
- left_delta="0"
- name="long_text_editor"
- tool_tip="text editor"
- top_pad="10"
- width="200">
-Text Editor
-with multiple
-lines of text
-and hence a
-scroll bar
-  </text_editor>
-  <text_editor
- height="50"
- follows="top|left|bottom"
- left_delta="0"
- max_length="65536" 
- name="blob_text_editor"
- tool_tip="text editor"
- top_pad="10"
- width="200"
- word_wrap="true">
-Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others.
-  </text_editor>
-    <text_editor
- height="50"
- follows="top|left|bottom"
- font="Monospace"
- left_delta="0"
- name="monospace_text_editor"
- tool_tip="text editor"
- top_pad="10"
- width="200">
-Text Editor
-with multiple
-lines of text
-and hence a
-scroll bar gjyrrr
-  </text_editor>
-    <text_editor
-      border_visible="true"
-      height="50"
-      follows="top|left|bottom"
-      font="Monospace"
- left_delta="0"
- name="monospace_text_editor"
- tool_tip="text editor"
- top_pad="10"
- width="200">
-Text Editor
-with multiple
-lines of text
-and hence a
-scroll bar gjyrrr
-  </text_editor>
-    <text_editor
- height="50"
- follows="top|left|bottom"
- font="SansSerif"
- left_delta="0"
- name="sansserif_text_editor"
- tool_tip="text editor"
- top_pad="10"
- width="200">
-Text Editor
-with multiple
-lines of text
-and hence a
-scroll bar gjyrrr
-  </text_editor>
-
-  <text
-   height="40"
-   follows="top|left|bottom"
-   layout="topleft"
-   name="test_text_box"
-   tool_tip="text box"
-   top_pad="5"
-   width="200">
-Text box
-with
-multiple lines
-and too many lines
-to actually fit
-  </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_toolbar.xml b/indra/newview/skins/default/xui/ja/floater_test_toolbar.xml
deleted file mode 100644
index 067c1fed824..00000000000
--- a/indra/newview/skins/default/xui/ja/floater_test_toolbar.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- height="500"
- layout="topleft"
- name="floater_test_toolbar"
- translate="false"
- width="500">
-  <toolbar name="test_toolbar_top"
-           button_display_mode="icons_with_text"
-           follows="left|right|top"
-           height="50"
-           width="500"
-           left="0"
-           top="20"
-           min_button_width="0"
-           max_button_width="100"
-           side="top">
-    <command name="avatar"/>
-    <command name="build"/>
-    <command name="chat"/>
-  </toolbar>
-  <toolbar name="test_toolbar_left"
-           button_display_mode="icons_with_text"
-           follows="left|bottom|top"
-           height="380"
-           width="200"
-           left="0"
-           top="70"
-           min_button_width="100"           
-           side="left">
-    <command name="avatar"/>
-    <command name="build"/>
-    <command name="chat"/>
-  </toolbar>
-  <toolbar name="test_toolbar_right"
-           button_display_mode="icons_with_text"
-           follows="right|bottom|top"
-           height="380"
-           width="200"
-           right="500"
-           top="70"
-           side="right">
-    <command name="avatar"/>
-    <command name="build"/>
-    <command name="chat"/>
-  </toolbar>
-  <toolbar name="test_toolbar_bottom"
-           button_display_mode="icons_with_text"
-           follows="left|right|bottom"
-           height="50"
-           width="500"
-           left="0"
-           bottom="500"
-           min_button_width="100"
-           side="bottom">
-    <command name="avatar"/>
-    <command name="build"/>
-    <command name="chat"/>
-  </toolbar>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_widgets.xml b/indra/newview/skins/default/xui/ja/floater_test_widgets.xml
deleted file mode 100644
index 10854f5a499..00000000000
--- a/indra/newview/skins/default/xui/ja/floater_test_widgets.xml
+++ /dev/null
@@ -1,445 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- Sample "floater" window with examples of common widgets.
-
-    Notes:
-    XML UI (XUI) files use spaces for indentation, not tabs.
-    All position values are in pixels.
-    For now, each widget must contain attribute layout="topleft".
-    0,0 is the top-left corner of the floater.
-    Each widget must have a unique name attribute.
-    If a widget is aligned with the one before it, use relative positioning:
-      top_pad
-      top_delta
-      left_pad
-      left_delta
-    Otherwise specify location with left and top attributes.
--->
-<floater
- legacy_header_height="18"
- can_dock="true"
- can_resize="true"
- title="TEST FLOATER"
- height="500"
- min_width="850"
- min_height="500"
- layout="topleft"
- name="floater_test_widgets"
- help_topic="floater_test_widgets"
- translate="false"
- width="850">
-
-  <!-- Strings are used by C++ code for localization.  They are not visible
-       unless the C++ code uses them to fill in another widget. -->
-  <floater.string
-   name="sample_string"
-   value="Sample String" />
-  <floater.string
-   name="other_string"
-   value="Other String" />
-
-  <!-- Floaters can contain drop-down menus.
-       The menu_bar widget contains the inividual menus.
-       The width is automatically computed to fit the labels. -->
-  <menu_bar
-   height="18"
-   layout="topleft"
-   follows="top|left"
-   tool_tip="menu"
-   left="2"
-   name="test_menu_bar"
-   top="16">
-    <menu
-     label="Menu"
-     layout="topleft"
-     tear_off="true"
-     name="Menu"
-     width="128">
-      <!-- menu_item_call will trigger a function call in the C++ code -->
-      <menu_item_call
-       label="Menu Item 1"
-       layout="topleft"
-       name="test_menu_item_1" />
-      <!-- menu_item_separator is a horizontal line used to separate sections
-           of a menu.  In general, menus should be divided into chunks of
-           no more than 7 items separated by menu_item_separators. -->
-      <menu_item_separator/>
-      <menu_item_call
-       label="Menu Item 2"
-       layout="topleft"
-       name="test_menu_item_2" />
-    </menu>
-  </menu_bar>
-
-  <!-- "text" is one or more read-only lines of text.
-       It can be made clickable but this requires C++ code
-       support.  URLs are not automatically underlined. -->
-  <text
-   bottom="55"
-   layout="topleft"
-   follows="top|left"
-   left="10"
-   height="16">
-    For widget list see http://wiki.secondlife.com/wiki/XUI_Reference
-  </text>
-
-  <!-- First column -->
-
-  <button
-   follows="top|left"
-   label="Button"
-   layout="topleft"
-   left_delta="0"
-   name="test_button"
-   tool_tip="button"
-   top="80"
-   width="100" />
-  <!-- "flyout_button" is a button that can spawn a menu -->
-  <flyout_button
-   follows="top|left"
-   label="Flyout"
-   layout="topleft"
-   left_delta="0"
-   name="fly_btn"
-   top_pad="15"
-   tool_tip="flyout button"
-   width="100">
-    <flyout_button.item
-     label="Item 1"
-     value="shout" />
-    <flyout_button.item
-     label="Item 2"
-     value="say" />
-    <flyout_button.item
-     label="Item 3"
-     value="whisper" />
-  </flyout_button>
-  <check_box
-   bottom_delta="35"
-   height="10"
-   label="Checkbox"
-   layout="topleft"
-   tool_tip="checkbox"
-   name="test_checkbox" />
-  <check_box
-   top_pad="5"
-   enabled="false" 
-   label="Checkbox Disabled"
-   tool_tip="checkbox disabled"
-   name="test_checkbox_disabled" />
-  <!-- "combo_box" is a pop-menu of items.  Optionally the box itself can
-       contain a general purpose line input editor, allowing the user to
-       provide input that is not a list item. -->
-  <combo_box
-   bottom_delta="35"
-   follows="top|left"
-   width="150"
-   label="Combobox"
-   layout="topleft"
-   tool_tip="combo box"
-   name="test_combo_box">
-    <combo_box.item
-     name="item1"
-     label="Combobox Item 1" />
-    <combo_box.item
-     name="item2"
-     label="Combobox Item 2" />
-  </combo_box>
-  <!-- "icon" is a read-only image.  The image_name must match an entry
-        in textures.xml.  We support TGA and PNG for UI images. -->
-  <icon
-   height="16"
-   image_name="icon_avatar_online.tga"
-   layout="topleft"
-   left_delta="0"
-   tool_tip="icon"
-   name="test_icon"
-   top_pad="40"
-   width="16" />
-  <!-- "line_editor" allows a single line of editable text input.
-        The contents of this XML node are used as the initial value for
-        the text. -->
-  <line_editor
-   height="20"
-   follows="top|left"
-   layout="topleft"
-   left_delta="0"
-   name="test_line_editor"
-   top_pad="20"
-   tool_tip="line editor"
-   width="200">
-    Line Editor Sample Text
-  </line_editor>
-  <!-- "filter_editor" is a specialized line_editor that shows read-only
-       help text until the user clicks in the widget. -->
-  <filter_editor
-   follows="left|top"
-   height="20"
-   label="Type here to search"
-   layout="topleft"
-   left_delta="0"
-   name="search editor"
-   tool_tip="search editor"
-   top_pad="30"
-   width="200" />
-  <!-- "progress_bar" percent completed gets set in C++ code -->
-  <progress_bar
-   height="16"
-   follows="top|left"
-   layout="topleft"
-   left_delta="0"
-   name="test_progress_bar"
-   top_pad="30"
-   tool_tip="progress bar"
-   width="200" />
-  <!-- "stat_view" is a container for statistics graphs.  It is only used
-       for debugging/diagnostic displays. -->
-  <stat_view
-   height="250"
-   label="Statistics View"
-   layout="topleft"
-   left_delta="0"
-   name="axis_view"
-   show_label="true"
-   top_pad="30"
-   tool_tip="stat view"
-   width="200">
-    <stat_bar
-     width="100"
-     bar_max="100"
-     bottom_delta="30"
-     label="Test Stat"
-     layout="topleft"
-     stat="stat"
-     bar_min="20"
-     name="test_stat_bar" />
-  </stat_view>
-
-  <!-- New column -->
-
-  <!-- "radio_group" is a set of mutually exclusive choices, like the buttons
-       on a car radio that allow a single radio station to be chosen. -->
-  <radio_group
-   height="40"
-   layout="topleft"
-   left_pad="90"
-   name="size_radio_group"
-   tool_tip="radio group"
-   top="80"
-   width="200">
-    <radio_item
-     bottom="20"
-     label="Radio 1"
-     layout="topleft"
-     name="small_radio_item" />
-    <radio_item
-     label="Radio 2"
-     layout="topleft"
-     name="large_radio_item" />
-  </radio_group>
-  <!-- "scroll_list" is a scrolling list of columnar data. -->
-  <scroll_list
-   bottom_delta="100"
-   follows="top|left"
-   height="80"
-   draw_heading="true"
-   tool_tip="scroll list"
-   layout="topleft">
-    <scroll_list.columns
-     dynamic_width="true"
-     name="first_column"
-     label="Column A"/>
-    <scroll_list.columns
-     dynamic_width="true"
-     name="second_column"
-     label="Column B"/>
-    <row>
-      <column column="first_column">short text</column>
-      <column column="second_column">more short text</column>
-    </row>
-    <row>
-      <column column="first_column">this is some longer text</column>
-      <column column="second_column">and here is some more long text</column>
-    </row>
-  </scroll_list>
-  <!-- "slider" is a horizontal input widget for numerical data. -->
-  <slider
-   bottom_delta="45"
-   follows="top|left"
-   layout="topleft"
-   min_val="0"
-   max_val="100"
-   initial_value="20"
-   label="Slider"
-   name="test_slider"
-   tool_tip="slider"
-   width="200" />
-  <!-- "spinner" is a numerical input widget with an up and down arrow to
-       change the value. -->
-  <spinner
-    height="10"
-   bottom_delta="35"
-   follows="top|left"
-   label="Spinner"
-   layout="topleft"
-   label_width="45"
-   name="test_spinner"
-   tool_tip="spinner"/>
-  <text
-   bottom_delta="50"
-   follows="top|left"
-   font.name="SansSerifSmall"
-   font.style = "UNDERLINE"
-   layout="topleft"
-   name="test_text"
-   tool_tip="text">
-    Text (underlined)
-  </text>
-  <text
-   top_pad="10"
-   follows="top|left"
-   layout="topleft"
-   width="60"
-   use_ellipses="true"
-   name="test_text"
-   tool_tip="text">
-    Truncated text here
-  </text>
-  <!-- "text_editor" is a multi-line text input widget, similar to
-       textarea in HTML. -->
-  <text_editor
-   height="40"
-   follows="top|left|bottom"
-   layout="topleft"
-   left_delta="0"
-   name="test_text_editor"
-   tool_tip="text editor"
-   top_pad="25"
-   width="200">
-    Text Editor
-  </text_editor>
-  <text
-   height="40"
-   follows="top|left|bottom"
-   layout="topleft"
-   name="test_text_box"
-   tool_tip="text box"
-   top_pad="5"
-   width="200">
-      Text box
-with
-multiple lines
-and too
-many
-line to actually fit
-  </text>
-  <!-- And a third column -->
-
-  <!-- "tab_container" is a holder for multiple panels of UI widgets.
-       Tabs can appear at the top, bottom, or left of the container. -->
-  <tab_container
-   follows="all"
-   height="400"
-   layout="topleft"
-   left="525"
-   name="group_tab_container"
-   tab_position="top"
-   tool_tip="tab container"
-   top="80"
-   width="300">
-    <!-- "panel" is a container for widgets.  It is automatically resized to
-         fit the parent tab_container. -->
-    <panel
-	 border="true"
-     label="Tab 1 - Color"
-     layout="topleft"
-     name="panel2">
-      <!-- "color_swatch" displays a color and spawns a color picker when
-           clicked. -->
-      <color_swatch
-       can_apply_immediately="true"
-       color="0.3 0.6 0.9 1"
-       follows="left|top"
-       height="90"
-       layout="topleft"
-       left="10"
-       label="Color Swatch 1"
-       name="swatch1"
-       tool_tip="Color Swatch: Click to open Color Picker"
-       top="10"
-       width="80" />
-      <color_swatch
-       can_apply_immediately="true"
-       color="1 0 1 1"
-       follows="left|top"
-       height="90"
-       label="Color Swatch 2"
-       layout="topleft"
-       left_pad="10"
-       name="swatch2"
-       tool_tip="Color Swatch: Click to open Color Picker"
-       top_delta="0"
-       width="80" />
-      <text
-       top_pad="10"
-       left="10"
-       width="250" 
-       follows="top|left"
-       font.name="Monospace"
-       name="test_text10"
-       tool_tip="text">
-        Monospace Button Flyout Checkbox
-      </text>
-      <text
-       top_pad="10"
-       left="10"
-       width="250" 
-       follows="top|left"
-       font.name="SansSerifSmall"
-       name="test_text10"
-       tool_tip="text">
-        SansSerifSmall.  Русский 中文 (简体)
-      </text>
-      <text
-       top_pad="10"
-       left="10"
-       width="250"
-       follows="top|left"
-       font.name="SansSerif"
-       name="test_text11"
-       tool_tip="text">
-        SansSerif.  Русский 中文 (简体)
-      </text>
-      <text
-       top_pad="10"
-       left="10"
-       width="250" 
-       follows="top|left"
-       font.name="SansSerifLarge"
-       name="test_text12"
-       tool_tip="text">
-        SansSerifLarge.  Русский 中文 (简体)
-      </text>
-      <text
-       top_pad="10"
-       left="10"
-       width="250"
-       follows="top|left"
-       font.name="SansSerifHuge"
-       name="test_text13"
-       tool_tip="text">
-        SansSerifHuge.  Русский 中文 (简体)
-      </text>
-    </panel>
-    <!-- panels can also refer to other floaters or panels -->
-    <panel
-	  border="true"
-     filename="floater_test_checkbox.xml"
-     height="225"
-     label="Tab 2 - Checkbox"
-     layout="topleft"
-     left_delta="0"
-     name="tab2"
-     top_delta="159"
-     width="250" />
-  </tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 92cbdf93820..e58221dcdb4 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -43,6 +43,8 @@
   <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" />
+  <check_box label="ルートの軸を編集する" name="checkbox actual root" />
+  <check_box label="選択のアウトラインを表示する" name="checkbox selection" />
   <combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラの種類を選択">
     <combo_box.item label="ワールド" name="World" />
     <combo_box.item label="ローカル" name="Local" />
diff --git a/indra/newview/skins/default/xui/ja/floater_ui_preview.xml b/indra/newview/skins/default/xui/ja/floater_ui_preview.xml
index ea135a149d1..af57ae183f6 100644
--- a/indra/newview/skins/default/xui/ja/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_ui_preview.xml
@@ -19,6 +19,7 @@
     <button label="表示" name="display_floater_2" tool_tip="選択したXMLファイルで定義されたXUIフロータを表示します。" />
     <button enabled="false" label="非表示" name="close_displayed_floater_2" tool_tip="現在表示されているフローターが存在する場合は、それを閉じます。" />
     <button label="スキーマをエクスポート" name="export_schema" />
+    <button label="リフレッシュ" name="refresh_btn" />
     <check_box label="四角形を表示" name="show_rectangles" />
     <scroll_list name="name_list">
       <scroll_list.columns label="タイトル" name="title_column" />
diff --git a/indra/newview/skins/default/xui/ja/floater_url_entry.xml b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
index 8beaa2eaefd..42eff283180 100644
--- a/indra/newview/skins/default/xui/ja/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
@@ -5,5 +5,5 @@
   <button label="OK" name="ok_btn" />
   <button label="キャンセル" name="cancel_btn" />
   <button label="クリア" name="clear_btn" />
-  <text name="loading_label">読み込んでいます…	</text>
+  <text name="loading_label">読み込んでいます…</text>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_web_profile.xml b/indra/newview/skins/default/xui/ja/floater_web_profile.xml
deleted file mode 100644
index d0225f78a9b..00000000000
--- a/indra/newview/skins/default/xui/ja/floater_web_profile.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_web_profile"
-         help_topic="web_profile"
-         width="780"
-         height="775"
-         filename="floater_web_content.xml"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml
index 02e8ae352a7..840696a37ad 100644
--- a/indra/newview/skins/default/xui/ja/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml
@@ -4,21 +4,18 @@
   <string name="expand_icon" value="map_ui_expand_icon.png" />
   <string name="collapse_tooltip" value="マップ操作パネルを隠す" />
   <string name="expand_tooltip" value="マップ操作を表示" />
-  <layout_stack name="floater_map_stack">
+  <layout_stack name="control_stack">
     <layout_panel name="map_lp">
-      <panel filename="panel_world_map.xml" name="objects_mapview" />
-      <panel name="expand_btn_panel" tool_tip="マップ操作パネルを隠す">
-        <icon name="expand_collapse_icon" tool_tip="マップ操作パネルを隠す" />
-      </panel>
+      <panel name="objects_mapview" />
     </layout_panel>
-    <layout_panel name="controls_lp">
+    <layout_panel name="control_lp">
       <panel name="layout_panel_1">
-        <text name="events_label">凡例</text>
+        <text name="legends_label">凡例</text>
       </panel>
       <panel name="layout_panel_2">
         <button name="Show My Location" tool_tip="現在、自分のアバターがいる場所をマップの中心にする。" />
         <text name="me_label">自分</text>
-        <check_box control_name="MapShowPeople" name="people_chk" />
+        <check_box name="people_chk" />
         <icon name="person" />
         <text name="person_label">人物</text>
         <check_box name="infohub_chk" />
@@ -26,14 +23,13 @@
         <text name="infohub_label">情報ハブ</text>
         <check_box name="land_for_sale_chk" />
         <icon name="landforsale" />
-        <text name="land_sale_label">販売中の土地</text>
+        <text name="land_sale_label">販売中</text>
         <icon name="square2" />
-        <text name="auction_label">オークション中の土地</text>
+        <text name="auction_label">オークション中</text>
         <icon name="square2" />
         <text name="by_owner_label">所有者で</text>
 
         <button name="Go Home" tool_tip="自分のホームの場所にテレポート" />
-
         <text name="Home_label">ホーム</text>
         <text name="events_label">イベント:</text>
 
@@ -48,9 +44,9 @@
         <check_box name="events_adult_chk" />
         <icon name="events_adult_icon" />
         <text name="events_adult_label">Adult</text>
+        <check_box name="AlchemyMapShowAgentCount" label="エージェント数"/>
       </panel>
 
-
       <panel name="layout_panel_3">
         <text name="find_on_map_label">マップから探す</text>
       </panel>
@@ -59,29 +55,31 @@
         <icon name="friends_icon" />
         <combo_box label="オンラインのフレンド" name="friend combo" tool_tip="マップにフレンドを表示する。">
           <combo_box.item label="オンラインのフレンド" name="item1" value="None" />
-          <combo_box.commit_callback function="WMap.AvatarCombo" />
         </combo_box>
         <icon name="landmark_icon" />
         <combo_box label="ランドマーク" name="landmark combo" tool_tip="マップにランドマークを表示する。">
           <combo_box.item label="ランドマーク" name="item1" value="None" />
-          <combo_box.commit_callback function="WMap.Landmark" />
         </combo_box>
         <icon name="location_icon" />
-        <search_editor label="リージョン(地域)名で" tool_tip="リージョン(地域)名を入力してください" />
+        <search_editor label="リージョン(地域)名で" name="location" tool_tip="リージョン(地域)名を入力してください。" />
+
         <button label="探す" name="DoSearch" tool_tip="リージョン(地域)を検索する。" />
+
         <button name="Clear" tool_tip="追跡ラインをクリアしてマップをリセットする。" />
+
         <scroll_list name="search_results">
           <scroll_list.columns label="" name="icon" />
           <scroll_list.columns label="" name="sim_name" />
-          <scroll_list.commit_callback function="WMap.SearchResult" />
         </scroll_list>
-        <text name="events_label">場所:</text>
+        <text name="locations_label">場所:</text>
         <spinner name="teleport_coordinate_x" />
         <spinner name="teleport_coordinate_y" />
         <spinner name="teleport_coordinate_z" />
         <button label="テレポート" name="Teleport" tool_tip="選択した場所にテレポートする。" />
+
         <button label="SLurlをコピー" layout="topleft" name="copy_slurl" tool_tip="現在の場所をWebで使えるSLurlにしてコピーする。" />
         <button label="選択を表示" name="Show Destination" tool_tip="選択した場所をマップの中心にする。" />
+        <button label="リージョンをトラック" name="track_region" tool_tip="このリージョンをリージョントラッカーに追加します。" />
       </panel>
       <panel name="layout_panel_5">
         <text name="zoom_label">縮尺</text>
diff --git a/indra/newview/skins/default/xui/ja/inspect_toast.xml b/indra/newview/skins/default/xui/ja/inspect_toast.xml
deleted file mode 100644
index 0221397a8ca..00000000000
--- a/indra/newview/skins/default/xui/ja/inspect_toast.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater
- legacy_header_height="25"
- bevel_style="in"
- bg_opaque_image="Inspector_Background"
- can_close="false"
- can_minimize="false"
- height="148"
- layout="topleft"
- name="inspect_toast"
- single_instance="true"
- sound_flags="0"
- visible="true"
- width="228">
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/inspector_info_ctrl.xml b/indra/newview/skins/default/xui/ja/inspector_info_ctrl.xml
deleted file mode 100644
index a7ecc39ed85..00000000000
--- a/indra/newview/skins/default/xui/ja/inspector_info_ctrl.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<button
- chrome="true"
- image_selected="Info_Over"
- image_unselected="Info_Over"
- image_pressed="Info_Over"
- height="12"
- name="inspector_info_ctrl"
- width="12" />
- 
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/main_view.xml b/indra/newview/skins/default/xui/ja/main_view.xml
deleted file mode 100644
index bab37c62589..00000000000
--- a/indra/newview/skins/default/xui/ja/main_view.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="left|right|top|bottom"
- height="768"
- layout="topleft"
- left="0"
- mouse_opaque="false"
- tab_stop="false" 
- name="main_view"
- width="1024">
-  <layout_stack border_size="0"
-                follows="all"
-                mouse_opaque="false"
-                height="768"
-                name="menu_stack"
-                orientation="vertical"
-                top="0">
-    <!-- Menu, nav bar and status bar need common focus_root-->
-    <layout_panel mouse_opaque="true"
-              follows="left|right|top"
-              name="status_bar_container"
-              focus_root="true"
-              height="19"
-              left="0"
-              top="0"
-              width="1024"
-              auto_resize="false"
-              visible="true">
-      <view mouse_opaque="false"
-            follows="top|left|right"
-            name="menu_bar_holder"
-            tab_group="1"
-            left="0"
-            top="0"
-            width="1024"
-            height="19"/>
-      <view mouse_opaque="false"
-            follows="top|left|right"
-            name="nav_bar_container"
-            tab_group="3"
-            left="0"
-            top="19"
-            width="1024"
-            height="34"
-            visible="false"/>
-    </layout_panel>
-    <layout_panel auto_resize="true"  
-                  follows="all"
-                  height="500"
-                  layout="topleft"
-                  mouse_opaque="false"
-                  tab_stop="false" 
-                  name="world_panel"
-                  width="1024">
-      <view top="0"
-            follows="all"
-            height="500"
-            left="0"
-            mouse_opaque="false"
-            name="world_view_rect"
-            width="1024"/>
-      <panel follows="left|top|right"
-             height="19"
-             left="0"
-             mouse_opaque="false"
-             name="topinfo_bar_container"
-             tab_stop="false"
-             top="0"
-             visible="false"
-             width="1024"/>
-      <panel top="0"
-             left="0"
-             follows="all"
-             height="500"
-             layout="topleft"
-             mouse_opaque="false"
-             name="login_panel_holder"
-             width="1024"/>
-      <debug_view follows="all"
-                  left="0"
-                  top="0"
-                  mouse_opaque="false"
-                  height="500"
-                  name="DebugView"
-                  width="1024"/>
-      <floater_view follows="all"
-                    height="500"
-                    left="0"
-                    mouse_opaque="false"
-                    name="Floater View"
-                    tab_group="-1"
-                    tab_stop="false"
-                    top="0"
-                    width="1024"/>
-      <panel name="toolbar_view_holder"
-             follows="all"
-             layout="topleft"
-             height="500"
-             width="1024"
-             top="0"
-             left="0"
-             mouse_opaque="false"
-             tab_stop="false"/>
-    </layout_panel>
-  </layout_stack>
- 
-  <panel top="0"
-        follows="all"
-        mouse_opaque="false"
-        left="0"
-        name="snapshot_floater_view_holder" 
-        width="1024"
-        height="798">
-    <snapshot_floater_view enabled="false"
-                           follows="all"
-                           height="768"
-                           left="0"
-                           mouse_opaque="false"
-                           name="Snapshot Floater View"
-                           tab_stop="false"
-                           top="0"
-                           visible="false"
-                           width="1024"/>
-  </panel>
-  <panel top="0"
-         follows="all"
-         height="768"
-         mouse_opaque="false"
-         name="popup_holder"
-         class="popup_holder"
-         width="1024">
-    <icon follows="right|bottom"
-          image_name="Resize_Corner"
-          right="-1"
-          name="resize_corner"
-          width="11"
-          bottom="-1"
-          height="11" />
-  </panel>
-  <view top="0"
-        left="0"
-        width="1024"
-        height="768"
-        name="hint_holder"
-        mouse_opaque="false"
-        follows="all"/>
-  <panel top="0"
-         follows="all"
-         height="768"
-         mouse_opaque="true"
-         name="progress_view"
-         filename="panel_progress.xml"
-         class="progress_view"
-         width="1024"
-         visible="false"/>
-  <menu_holder top="0"
-               follows="all"
-               height="768"
-               mouse_opaque="false"
-               name="Menu Holder"
-               width="1024"/>
-  <tooltip_view top="0"
-                follows="all"
-                height="768"
-                mouse_opaque="false"
-                name="tooltip view"
-                tab_group="-2"
-                width="1024"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_color_picker.xml b/indra/newview/skins/default/xui/ja/menu_copy_color_picker.xml
index 62809c8e338..5c7fefd80dc 100644
--- a/indra/newview/skins/default/xui/ja/menu_copy_color_picker.xml
+++ b/indra/newview/skins/default/xui/ja/menu_copy_color_picker.xml
@@ -1,34 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
- layout="topleft"
- name="Copy Color Picker Menu">
-    <menu_item_call
-     label="Copy LSL Vector"
-     layout="topleft"
-     name="params_copy_lsl"
-     visible="true">
-       <on_click function="ColorPicker.menuDoToSelected" parameter="color_copy_lsl" />
-    </menu_item_call>
-    <menu_item_call
-     label="Copy Hex"
-     layout="topleft"
-     name="params_copy_hex"
-     visible="true">
-       <on_click function="ColorPicker.menuDoToSelected" parameter="color_copy_hex" />
-    </menu_item_call>
-    <menu_item_call
-     label="Copy Float Vector4"
-     layout="topleft"
-     name="params_copy_vec4"
-     visible="true">
-       <on_click function="ColorPicker.menuDoToSelected" parameter="color_copy_vec4" />
-    </menu_item_call>
-    <menu_item_call
-     label="Copy RGB Vector4"
-     layout="topleft"
-     name="params_copy_vec4u"
-     visible="true">
-       <on_click function="ColorPicker.menuDoToSelected" parameter="color_copy_vec4u" />
-    </menu_item_call>
-</toggleable_menu>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Color Picker Menu">
+  <menu_item_call label="LSLベクターをコピー" name="params_copy_lsl" />
+  <menu_item_call label="HEXをコピー" name="params_copy_hex" />
+  <menu_item_call label="浮動ベクトル4をコピー" name="params_copy_vec4" />
+  <menu_item_call label="RGBベクトル4をコピー" name="params_copy_vec4u" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_options.xml b/indra/newview/skins/default/xui/ja/menu_inspect_options.xml
index e8da0dd7c3a..552dffc885f 100644
--- a/indra/newview/skins/default/xui/ja/menu_inspect_options.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_options.xml
@@ -1,94 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
- name="menu_group_plus">
-	<menu_item_check
-	 label="Description"
-	 name="description">
-		<menu_item_check.on_check
-		 function="Inspect.EnableColumn"
-		 parameter="description"/>
-		<menu_item_check.on_click
-		 function="Inspect.ToggleColumn"
-		 parameter="description"/>
-	</menu_item_check>
-	<menu_item_check
-	 label="Owner Name"
-	 name="owner_name">
-		<menu_item_check.on_check
-		 function="Inspect.EnableColumn"
-		 parameter="owner_name"/>
-		<menu_item_check.on_click
-		 function="Inspect.ToggleColumn"
-		 parameter="owner_name"/>
-	</menu_item_check>
-	<menu_item_check
-	 label="Creator Name"
-	 name="creator_name">
-		<menu_item_check.on_check
-		 function="Inspect.EnableColumn"
-		 parameter="creator_name"/>
-		<menu_item_check.on_click
-		 function="Inspect.ToggleColumn"
-		 parameter="creator_name"/>
-	</menu_item_check>
-	<menu_item_check
-	 label="Faces"
-	 name="facecount">
-		<menu_item_check.on_check
-		 function="Inspect.EnableColumn"
-		 parameter="facecount"/>
-		<menu_item_check.on_click
-		 function="Inspect.ToggleColumn"
-		 parameter="facecount"/>
-	</menu_item_check>
-	<menu_item_check
-	 label="Vertices"
-	 name="vertexcount">
-		<menu_item_check.on_check
-		 function="Inspect.EnableColumn"
-		 parameter="vertexcount"/>
-		<menu_item_check.on_click
-		 function="Inspect.ToggleColumn"
-		 parameter="vertexcount"/>
-	</menu_item_check>
-	<menu_item_check
-	 label="Triangles"
-	 name="trianglecount">
-		<menu_item_check.on_check
-		 function="Inspect.EnableColumn"
-		 parameter="trianglecount"/>
-		<menu_item_check.on_click
-		 function="Inspect.ToggleColumn"
-		 parameter="trianglecount"/>
-	</menu_item_check>
-	<menu_item_check
-	 label="TMem"
-	 name="tramcount">
-		<menu_item_check.on_check
-		 function="Inspect.EnableColumn"
-		 parameter="tramcount"/>
-		<menu_item_check.on_click
-		 function="Inspect.ToggleColumn"
-		 parameter="tramcount"/>
-	</menu_item_check>
-	<menu_item_check
-	 label="VRAM"
-	 name="vramcount">
-		<menu_item_check.on_check
-		 function="Inspect.EnableColumn"
-		 parameter="vramcount"/>
-		<menu_item_check.on_click
-		 function="Inspect.ToggleColumn"
-		 parameter="vramcount"/>
-	</menu_item_check>
-	<menu_item_check
-	 label="Creation Date"
-	 name="creation_date">
-		<menu_item_check.on_check
-		 function="Inspect.EnableColumn"
-		 parameter="creation_date"/>
-		<menu_item_check.on_click
-		 function="Inspect.ToggleColumn"
-		 parameter="creation_date"/>
-	</menu_item_check>
-</toggleable_menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+  <menu_item_check label="説明" name="description" />
+  <menu_item_check label="所有者名" name="owner_name" />
+  <menu_item_check label="制作者名" name="creator_name" />
+
+  <menu_item_check label="面の数" name="facecount" />
+  <menu_item_check label="頂点の数" name="vertexcount" />
+
+  <menu_item_check label="三角形の数" name="trianglecount" />
+
+  <menu_item_check label="TMem" name="tramcount" />
+  <menu_item_check label="VRAM" name="vramcount" />
+  <menu_item_check label="作成日" name="creation_date" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_message_log_filter.xml b/indra/newview/skins/default/xui/ja/menu_message_log_filter.xml
index 542082e2ef5..81492ec01a1 100644
--- a/indra/newview/skins/default/xui/ja/menu_message_log_filter.xml
+++ b/indra/newview/skins/default/xui/ja/menu_message_log_filter.xml
@@ -1,50 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
- height="201"
- layout="topleft"
- mouse_opaque="false"
- name="messagelog_filter_menu"
- width="120">
-    <menu_item_call 
-     name="no_filter" 
-     label="No Filter">
-        <menu_item_call.on_click 
-         function="MessageLog.Filter.Action"
-         userdata=""/>
-        </menu_item_call>
-	<menu_item_call 
-     name="less_spam" 
-     label="Fewer spammy messages">
-        <menu_item_call.on_click 
-         function="MessageLog.Filter.Action"
-         userdata="!StartPingCheck !CompletePingCheck !PacketAck !SimulatorViewerTimeMessage !SimStats !AgentUpdate !AgentAnimation !AvatarAnimation !ViewerEffect !CoarseLocationUpdate !LayerData !CameraConstraint !ObjectUpdateCached !RequestMultipleObjects !ObjectUpdate !ObjectUpdateCompressed !ImprovedTerseObjectUpdate !KillObject !ImagePacket !SendXferPacket !ConfirmXferPacket !TransferPacket"/>
-        </menu_item_call>
-  <menu_item_call
-      name="less_spam_no_sound"
-      label="Fewer spammy messages (minus sound crap)">
-    <menu_item_call.on_click
-      function="MessageLog.Filter.Action"
-      userdata="!StartPingCheck !CompletePingCheck !PacketAck !SimulatorViewerTimeMessage !SimStats !AgentUpdate !AgentAnimation !AvatarAnimation !ViewerEffect !CoarseLocationUpdate !LayerData !CameraConstraint !ObjectUpdateCached !RequestMultipleObjects !ObjectUpdate !ObjectUpdateCompressed !ImprovedTerseObjectUpdate !KillObject !ImagePacket !SendXferPacket !ConfirmXferPacket !TransferPacket !SoundTrigger !AttachedSound !PreloadSound"/>
-  </menu_item_call>
-	<menu_item_call 
-     name="less_spam_no_sound" 
-     label="Fewer spammy messages (minus sound and map crap)">
-        <menu_item_call.on_click 
-         function="MessageLog.Filter.Action"
-         userdata="!StartPingCheck !CompletePingCheck !PacketAck !SimulatorViewerTimeMessage !SimStats !AgentUpdate !AgentAnimation !AvatarAnimation !ViewerEffect !CoarseLocationUpdate !LayerData !CameraConstraint !ObjectUpdateCached !RequestMultipleObjects !ObjectUpdate !ObjectUpdateCompressed !ImprovedTerseObjectUpdate !KillObject !ImagePacket !SendXferPacket !ConfirmXferPacket !TransferPacket !SoundTrigger !AttachedSound !PreloadSound !FindAgent !MapBlockRequest"/>
-        </menu_item_call>
-	<menu_item_call 
-     name="obj_update" 
-     label="Object updates">
-        <menu_item_call.on_click 
-         function="MessageLog.Filter.Action"
-         userdata="ObjectUpdateCached ObjectUpdate ObjectUpdateCompressed ImprovedTerseObjectUpdate KillObject RequestMultipleObjects"/>
-        </menu_item_call>
-	<menu_item_call 
-     name="abnormal" 
-     label="Abnormal">
-        <menu_item_call.on_click 
-         function="MessageLog.Filter.Action"
-         userdata="Invalid TestMessage AddCircuitCode NeighborList AvatarTextureUpdate SimulatorMapUpdate SimulatorSetMap SubscribeLoad UnsubscribeLoad SimulatorReady SimulatorPresentAtLocation SimulatorLoad SimulatorShutdownRequest RegionPresenceRequestByRegionID RegionPresenceRequestByHandle RegionPresenceResponse UpdateSimulator LogDwellTime FeatureDisabled LogFailedMoneyTransaction UserReportInternal SetSimStatusInDatabase SetSimPresenceInDatabase OpenCircuit CloseCircuit DirFindQueryBackend DirPlacesQueryBackend DirClassifiedQueryBackend DirLandQueryBackend DirPopularQueryBackend GroupNoticeAdd DataHomeLocationRequest DataHomeLocationReply DerezContainer ObjectCategory ObjectExportSelected StateSave ReportAutosaveCrash AgentAlertMessage NearestLandingRegionRequest NearestLandingRegionReply NearestLandingRegionUpdated TeleportLandingStatusChanged ConfirmEnableSimulator KickUserAck SystemKickUser AvatarPropertiesRequestBackend UpdateParcel RemoveParcel MergeParcel LogParcelChanges CheckParcelSales ParcelSales StartAuction ConfirmAuctionStart CompleteAuction CancelAuction CheckParcelAuctions ParcelAuctions ChatPass EdgeDataPacket SimStatus ChildAgentUpdate ChildAgentAlive ChildAgentPositionUpdate ChildAgentDying ChildAgentUnknown AtomicPassObject KillChildAgents ScriptSensorRequest ScriptSensorReply DataServerLogout RequestInventoryAsset InventoryAssetResponse TransferInventory TransferInventoryAck EventLocationRequest EventLocationReply MoneyTransferBackend RoutedMoneyBalanceReply SetStartLocation NetTest SetCPURatio SimCrashed NameValuePair RemoveNameValuePair UpdateAttachment RemoveAttachment EmailMessageRequest EmailMessageReply InternalScriptMail ScriptDataRequest ScriptDataReply InviteGroupResponse TallyVotes LiveHelpGroupRequest LiveHelpGroupReply GroupDataUpdate LogTextMessage CreateTrustedCircuit ParcelRename SystemMessage RpcChannelRequest RpcChannelReply RpcScriptRequestInbound RpcScriptRequestInboundForward RpcScriptReplyInbound ScriptMailRegistration Error"/>
-        </menu_item_call>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="messagelog_filter_menu">
+  <menu_item_call name="no_filter" label="フィルタ無し" />
+  <menu_item_call name="less_spam" label="スパムメッセージを減らす" />
+  <menu_item_call name="less_spam_no_sound" label="スパムメッセージを減らす(-くだらない音)" />
+
+  <menu_item_call name="less_spam_no_sound" label="スパムメッセージを減らす(ーくだらないマップと音)" />
+  <menu_item_call name="obj_update" label="オブジェクトの更新" />
+
+  <menu_item_call name="abnormal" label="アブノーマル" />
 </toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
index 77a2e60cdad..de381fae7f6 100644
--- a/indra/newview/skins/default/xui/ja/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
@@ -4,8 +4,30 @@
   <menu_item_call label="ズーム(中)" name="Zoom Medium" />
   <menu_item_call label="ズーム(遠)" name="Zoom Far" />
   <menu_item_call label="ズーム(デフォルト)" name="Zoom Default" />
+  <menu_item_separator />
+  <menu_item_check label="北を上に" name="North at top"/>
+  <menu_item_check label="カメラの向きを上に" name="Camera at top"/>
+  <menu_item_separator />
+  <menu_item_check label="オートセンターマップ" name="Auto-center map"/>
+  <menu_item_separator />
+  <menu_item_check label="マップタイルを使用" name="Use Map Tile"/>
+  <menu_item_check label="オブジェクトをレンダリング" name="Render Objects"/>
+  <menu_item_check label="ガイドラインを表示" name="Show Guide Line"/>
+  <menu_item_check label="チャット範囲を表示" name="Show Chat Rings"/>
+  <menu_item_separator />
+  <menu_item_check label="区画の境界" name="Parcel Boundries"/>
+  <menu_item_check label="販売中の区画" name="Parcels For Sale"/>
+
+  <menu_item_check label="区画アクセス" name="Parcel Access"/>
+
+  <menu_item_separator />
+  <menu_item_call label="マップの再センター" name="Re-center map"/>
+  <menu_item_call label="追跡をやめる" name="Stop Tracking" />
+  <menu_item_separator />
+  <menu_item_call label="この土地について" name="About Land"/>
+  <!--
   <menu_item_check label="マップを回転" name="Rotate Map" />
   <menu_item_check label="中央へ自動移動" name="Auto Center" />
-  <menu_item_call label="追跡をやめる" name="Stop Tracking" />
+  -->
   <menu_item_call label="ワールドマップ" name="World Map" />
 </menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
index f7e64e015a0..3336bc97771 100644
--- a/indra/newview/skins/default/xui/ja/menu_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object.xml
@@ -3,6 +3,23 @@
   <menu_item_call label="触る" name="Object Touch" />
   <menu_item_call label="編集…" name="Edit..." />
   <menu_item_call label="制作" name="Build" />
+  <context_menu label="ツール" name="Tools">
+    <menu_item_call label="テスクチャをリフレッシュ" name="RefreshTextures"/>
+    <menu_item_call label="パーティクルを編集" name="Menu Object Edit Particles"/>
+    <menu_item_call label="リージョンオブジェクトを表示" name="show_in_linksets"/>
+    <menu_item_call label="文字で表示" name="show_in_characters"/>
+    <menu_item_separator  />
+    <menu_item_call label="スクリプトの再コンパイル(Mono)" name="Mono"/>
+    <menu_item_call label="スクリプトの再コンパイル(LSL)" name="LSL"/>
+    <menu_item_call label="スクリプトをリセット" name="Reset Scripts"/>
+    <menu_item_call label="スクリプトを実行状態にする" name="Set Scripts to Running"/>
+    <menu_item_call label="スクリプトを非実行状態にする" name="Set Scripts to Not Running"/>
+    <menu_item_call label="スクリプトの削除" name="Delete Scripts"/>
+    <menu_item_separator />
+    <menu_item_call label="爆発" name="Explode"/>
+    <menu_item_call label="破壊" name="Destroy"/>
+    <menu_item_call label="強制的に削除" name="Force Delete"/>
+  </context_menu>
   <menu_item_call label="開く" name="Open" />
   <menu_item_call label="ここに座る" name="Object Sit" />
   <menu_item_call label="立ち上がる" name="Object Stand Up" />
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
index 7b56f1daf8f..5362bd9a14f 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
@@ -7,4 +7,7 @@
   <menu_item_check label="人物のアイコン表示" name="view_icons" />
   <menu_item_check label="マップを表示" name="view_map" />
   <menu_item_check label="ユーザー名を非表示" name="view_usernames" />
+  <menu_item_separator  />
+  <menu_item_check name ="radar_alerts" label="レーダーアラートを表示"/>
+  <menu_item_check name ="radar_alerts_chat" label="ログアラートをチャットに記載"/>
 </toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_legacy.xml b/indra/newview/skins/default/xui/ja/menu_profile_legacy.xml
index eb84af1aee0..8f3da8d2f16 100644
--- a/indra/newview/skins/default/xui/ja/menu_profile_legacy.xml
+++ b/indra/newview/skins/default/xui/ja/menu_profile_legacy.xml
@@ -1,135 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu 
-     name="menu_profile_legacy"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false">
-  <menu_item_call
-   label="Open Webprofile..."
-   name="webprofile">
-     <menu_item_call.on_click
-      function="Profile.Action"
-      parameter="webprofile"/>
-  </menu_item_call>
-  <menu_item_separator/>
-  <!--<menu
-	label="Upload profile image"
-	layout="topleft"
-	name="upload_image_menu">
-	  <menu_item_call
-       label="Second Life..."
-       name="upload_second_life">
-		<menu_item_call.on_click
-		 function="Profile.Action"
-		 parameter="upload_sl"/>
-		<menu_item_call.on_enable
-		 function="Profile.Enable"
-		 parameter="can_upload_pic" />
-	  </menu_item_call>
-	  <menu_item_call
-       label="First Life..."
-       name="upload_first_life">
-        <menu_item_call.on_click
-	     function="Profile.Action"
-	     parameter="upload_fl"/>
-        <menu_item_call.on_enable
-		 function="Profile.Enable"
-		 parameter="can_upload_pic" />
-	  </menu_item_call>
-  </menu>-->
-  <menu_item_call
-   label="Share..."
-   name="share">
-     <menu_item_call.on_click
-      function="Profile.Action"
-      parameter="share"/>
-     <menu_item_call.on_enable
-      function="Profile.Enable"
-      parameter="can_share" />
-  </menu_item_call>
-  <menu_item_call
-   label="Call Avatar..."
-   name="call">
-     <menu_item_call.on_click
-      function="Profile.Action"
-      parameter="call"/>
-     <menu_item_call.on_enable
-      function="Profile.Enable"
-      parameter="can_has_telefono" />
-  </menu_item_call>
-  <menu_item_call
-   label="Offer teleport..."
-   name="teleport">
-     <menu_item_call.on_click
-      function="Profile.Action"
-      parameter="teleport"/>
-     <menu_item_call.on_enable
-      function="Profile.Enable"
-      parameter="can_has_teleport" />
-  </menu_item_call>
-  <menu_item_call
-   label="Request teleport..."
-   name="request_teleport">
-     <menu_item_call.on_click
-      function="Profile.Action"
-      parameter="req_teleport"/>
-     <menu_item_call.on_enable
-      function="Profile.Enable"
-      parameter="can_has_teleport" />
-  </menu_item_call>
-  <menu_item_call
-   label="Show on map..."
-   name="map">
-     <menu_item_call.on_click
-      function="Profile.Action"
-      parameter="map"/>
-     <menu_item_call.on_enable
-      function="Profile.Enable"
-      parameter="can_has_map" />
-  </menu_item_call>
-  <menu_item_call
-   label="Pay..."
-   name="pay">
-     <menu_item_call.on_click
-      function="Profile.Action"
-      parameter="pay"/>
-     <menu_item_call.on_enable
-      function="Profile.Enable"
-      parameter="can_has_pay" />
-  </menu_item_call>
-  <menu_item_call
-   label="Report Abuse..."
-   name="report_abuse">
-     <menu_item_call.on_click
-      function="Profile.Action"
-      parameter="report_abuse"/>
-     <menu_item_call.on_enable
-      function="Profile.Enable"
-      parameter="can_drama" />
-  </menu_item_call>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_profile_legacy">
+  <menu_item_call label="Webプロフィールを開く…" name="webprofile" />
   <menu_item_separator />
-  <menu_item_call
-   label="Copy Name"
-   name="Copy Name">
-	<menu_item_call.on_click
-	 function="Avatar.CopyData"
-	 parameter="account_name"/>
-	<menu_item_call.on_enable
-	 function="RLV.CanShowName" />
-  </menu_item_call>
-  <menu_item_call
-   label="Copy SLurl"
-   name="Copy SLurl">
-	<menu_item_call.on_click
-	 function="Avatar.CopyData"
-	 parameter="slurl"/>
-	<menu_item_call.on_enable
-	 function="RLV.CanShowName" />
-  </menu_item_call>
-  <menu_item_call
-   label="Copy ID"
-   name="Copy ID">
-	<menu_item_call.on_click
-	 function="Avatar.CopyData"
-	 parameter="id"/>
-  </menu_item_call>
-</toggleable_menu>
+  <!--
+  <menu label="プロフィール画像をアップロード" name="upload_image_menu">
+    <menu_item_call label="セカンドライフ…" name="upload_second_life" />
+    <menu_item_call label="ファーストライフ…" name="upload_first_life" />
+  </menu>
+  -->
+  <menu_item_call label="共有…" name="share" />
+
+  <menu_item_call label="アバターにコール…" name="call" />
+  <menu_item_call label="テレポートのオファー…" name="teleport" />
+  <menu_item_call label="テレポートをリクエスト…" name="request_teleport" />
+  <menu_item_call label="マップ上に表示…" name="map" />
+  <menu_item_call label="支払う…" name="pay" />
+  <menu_item_call label="嫌がらせの報告…" name="report_abuse" />
+  <menu_item_separator />
+  <menu_item_call label="名前をコピー" name="Copy Name" />
+  <menu_item_call label="SLurlをコピー" name="Copy SLurl" />
+  <menu_item_call label="IDをコピー" name="Copy ID" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 5227c0d5838..c9779a154af 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -7,6 +7,9 @@
     <menu_item_call label="場所…" name="Places" />
     <menu_item_call label="ピック…" name="Picks" />
     <menu_item_call label="体験…" name="Experiences" />
+    <menu_item_separator/>
+    <menu_item_check label="ミュージック・ティッカー…" name="music_ticker_check"/>
+    <menu_item_separator/>
     <menu_item_call label="カメラコントロール…" name="Camera Controls" />
 
     <menu_item_separator />
@@ -25,8 +28,9 @@
 
     <menu_item_call label="初期設定…" name="Preferences" />
     <menu_item_call label="ツールバーのボタン…" name="Toolbars" />
+    <menu_item_call label="シネマティックモード" name="CinematicMode" />
     <menu_item_call label="全てのコントロールを隠す" name="Hide UI" shortcut="control|shift|U" />
-    <menu_item_check label="HUDを表示" name="Show HUD Attachments" shortcut="alt|shift|H" />
+    <menu_item_check label="HUDを表示" name="Show HUD Attachments" shortcut="alt|shift|H" />
 
     <menu_item_separator />
 
@@ -73,6 +77,8 @@
     <menu_item_separator />
     <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
     <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
+    <menu_item_call label="自分を変形しない" name="Undeform Me"/>
+    <menu_item_call label="ビューアのエフェクトをクリア" name="Clear Viewer Effects"/>
     <menu_item_call label="スクリプトを装着…" name="MyScripts" />
     <menu_item_separator />
     <menu_item_call label="アバターに関するヘルプ…" name="Help with avatars" />
@@ -82,24 +88,36 @@
     <menu_item_check label="近隣のチャット…" name="Nearby Chat" />
     <menu_item_check label="ボイスチャット" name="Speak" />
     <menu_item_check name="Conversation Log..." label="会話ログ…" />
-    <menu_item_separator />
-    <menu label="ボイスモーフィング" name="VoiceMorphing" />
+    <menu_item_check label="チャットのアラート…" name="Chat Alerts"/>
     <menu_item_check label="ジェスチャー…" name="Gestures" />
-    <menu_item_separator />
+
+    <menu_item_separator/>
+    <menu_item_check label="å–‹ã‚‹" name="Speak" />
+    <menu label="ボイスモーフィング" name="VoiceMorphing">
+      <menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing"/>
+      <menu_item_separator/>
+      <menu_item_check label="プレビュー" name="Preview"/>
+      <menu_item_call label="購読…" name="Subscribe"/>
+      <menu_item_call label="プレミアム特典…" name="PremiumPerk"/>
+    </menu>
+    <menu_item_separator/>
     <menu_item_check label="フレンド" name="My Friends" />
     <menu_item_check label="グループ" name="My Groups" />
-    <menu_item_check label="近くにいる人物" name="Active Speakers" />
+    <menu_item_check label="近くの人物" name="Active Speakers" />
     <menu_item_check label="ブロックリスト" name="Block List" />
     <menu_item_separator />
-    <menu_item_check label="着信拒否" name="Do Not Disturb" />
-
+    <menu_item_check name="Do Not Disturb" label="着信拒否" />
   </menu>
   <menu label="ワールド" name="World">
+    <menu_item_call label="アニメーションを再同期" name="Resync Animations" />
+    <menu_item_check label="サウンドエクスプローラー" name="Sound Explorer" />
+    <menu_item_separator />
     <menu_item_call label="現在地をランドマーク" name="Create Landmark Here" />
     <menu_item_call label="行き先…" name="Destinations" />
     <menu_item_check label="ワールドマップ" name="World Map" />
     <menu_item_check label="ミニマップ" name="Mini-Map" />
     <menu_item_call label="イベント" name="Events" />
+    <menu_item_check label="リージョン(地域)トラッカー…" name="Region Tracker"/>
     <menu_item_check label="検索…" name="Search" />
     <menu_item_separator />
     <menu_item_call label="ホームにテレポート" name="Teleport Home" />
@@ -126,6 +144,7 @@
       <menu_item_check label="座標" name="Coordinates" />
       <menu_item_check label="区画のプロパティ" name="Parcel Properties" />
       <menu_item_separator />
+      <menu_item_check label="被写界深度フォーカスロック" name="lock_focus_point" />
       <menu_item_check label="拡張メニュー" name="Show Advanced Menu" />
     </menu>
     <menu_item_check label="グラフィック性能の最適化…" name="Performance" />
@@ -139,6 +158,7 @@
     <menu label="環境" name="Environment">
       <menu_item_check label="夜明け" name="Sunrise" />
       <menu_item_check label="正午" name="Noon" />
+      <menu_item_check label="正午(レガシー)" name="legacy noon" />
       <menu_item_check label="夕方" name="Sunset" />
       <menu_item_check label="深夜" name="Midnight" />
       <menu_item_check label="共有された環境を使用" name="Use Shared Environment" />
@@ -208,6 +228,7 @@
       <menu_item_call label="スクリプトのリセット" name="Reset Scripts" />
       <menu_item_call label="スクリプトを実行中にする" name="Set Scripts to Running" />
       <menu_item_call label="スクリプトを実行停止にする" name="Set Scripts to Not Running" />
+      <menu_item_call label="スクリプトを削除" name="Delete Scripts"/>
     </menu>
 
     <menu label="経路探索" name="Pathfinding">
@@ -227,6 +248,7 @@
 
       <menu_item_check label="自分のオブジェクトだけを選択する" name="Select Only My Objects" />
       <menu_item_check label="動的オブジェクトだけを選択する" name="Select Only Movable Objects" />
+      <menu_item_check label="非表示のオブジェクトを選択する" name="Select Invisible Objects" />
       <menu_item_check label="範囲内を選択する" name="Select By Surrounding" />
 
       <menu_item_separator />
@@ -234,10 +256,16 @@
       <menu_item_check label="選択のアウトラインを表示" name="Show Selection Outlines" />
       <menu_item_check label="隠れた位置の選択も表示する" name="Show Hidden Selection" />
       <menu_item_check label="選択した光の効果範囲を表示する" name="Show Light Radius for Selection" />
+      <menu_item_check label="反射プローブのボリュームを表示" name="Show Reflection Probe Volumes" />
       <menu_item_check label="選択ビームを表示する" name="Show Selection Beam" />
+      <menu_item_check label="ハイライトを透過" name="Highlight Transparent" />
 
       <menu_item_separator />
 
+      <menu_item_check label="ポストプロセッシングを無効化" name="No Post" />
+
+      <menu_item_separator/>
+
       <menu_item_check label="グリッド吸着" name="Snap to Grid" />
       <menu_item_call label="オブジェクトのXY軸をグリッドに吸着" name="Snap Object XY to Grid" />
       <menu_item_call label="選択をグリッドに使用する" name="Use Selection for Grid" />
@@ -277,8 +305,43 @@
     <menu_item_call label="衝突・プッシュ&打撃" name="Bumps, Pushes &amp;amp; Hits" />
     <menu_item_call label="[APP_NAME]について" name="About Second Life" />
   </menu>
+
+  <menu label="RLVa" name="RLVa Main">
+    <menu label="Debug" name="デバッグ">
+      <menu_item_check label="トップレベルのRLVaメニューを表示" name="Show Top-level RLVa Menu" />
+      <menu_item_separator/>
+      <menu_item_check label="デバッグメッセージを表示" name="Show Debug Messages" />
+      <menu_item_check label="未設定または重複メッセージを隠す" name="Hide Unset or Duplicate Messages" />
+      <menu_item_check label="アサーションの失敗を表示" name="Show Assertion Failures" />
+      <menu_item_separator/>
+      <menu_item_check label="ロックされたレイヤーを隠す" name="Hide Locked Layers" />
+      <menu_item_check label="ロックされた装着物を隠す" name="Hide Locked Attachments" />
+      <menu_item_separator/>
+      <menu_item_check label="古いネーミングを有効化" name="Enable Legacy Naming" />
+      <menu_item_check label="共有された衣装を有効化" name="Enable Shared Wear" />
+      <menu_item_check label="着用中の共有されたアイテム名をリネーム" name="Rename Shared Items on Wear" />
+      <menu_item_separator/>
+      <menu_item_check label="ロック…" name="Locks">
+      </menu_item_check>
+    </menu>
+    <menu_item_separator/>
+    <menu_item_check label="OOCチャットを許可" name="Allow OOC Chat" />
+    <menu_item_check label="フィルタリングされたチャットを表示" name="Show Filtered Chat" />
+    <menu_item_check label="リダイレクトされたチャット入力を表示" name="Show Redirected Chat Typing" />
+    <menu_item_check label="リダイレクトされた長文チャット分割" name="Split Long Redirected Chat" />
+    <menu_item_separator />
+    <menu_item_check label="一時的な装着物を許可" name="Allow Temporary Attachments" />
+    <menu_item_check label="#RLVへの譲渡を禁止" name="Forbid Give to #RLV" />
+    <menu_item_check label="衣類の交換をアンロック" name="Wear Replaces Unlocked" />
+    <menu_item_separator />
+    <menu_item_check label="コンソール…" name="Console" />
+    <menu_item_check label="制限…" name="Restrictions" />
+    <menu_item_check label="文章…" name="Strings" />
+  </menu>
+
   <menu label="æ‹¡å¼µ" name="Advanced">
     <menu_item_call label="テクスチャをリベークする" name="Rebake Texture" />
+    <menu_item_call label="装着物をリフレッシュ" name="Refresh Attachments" />
     <menu_item_call label="UIサイズをデフォルトにする" name="Set UI Size to Default" />
     <menu_item_call label="ウィンドウサイズ設定…" name="Set Window Size..." />
 
@@ -286,6 +349,8 @@
 
     <menu_item_check label="オブジェクトの選択距離の制限" name="Limit Select Distance" />
     <menu_item_check label="カメラの距離移動を制限しない" name="Disable Camera Distance" />
+    <menu_item_check label="最小ズーム距離を無効化" name="Disable Minimum Zoom Distance" />
+    <menu_item_check label="SIMのカメラの衝突面を無効化" name="Disable Sim Camera Collision Plane"/>
 
     <menu_item_separator />
 
@@ -344,6 +409,7 @@
       <menu_item_check label="FRInfoのテスト" name="Test FRInfo" />
       <menu_item_check label="フレキシブルオブジェクト" name="Flexible Objects" />
     </menu>
+    <menu label="RLVa" name="RLVa Embedded" />
     <menu_item_check label="プラグイン読み取りスレッドを使用" name="Use Plugin Read Thread" />
     <menu_item_call label="グループキャッシュのクリア" name="ClearGroupCache" />
     <menu_item_check label="マウスの平滑化" name="Mouse Smoothing" />
@@ -375,7 +441,7 @@
     <!--Shortcuts-->
 
     <menu_item_separator />
-
+    <menu_item_check label="RestrainedLove API" name="RLV API" />
     <menu_item_call label="デバッグ設定を表示" name="Debug Settings" />
     <menu_item_check label="開発メニューを表示" name="Debug Mode" />
   </menu>
@@ -490,6 +556,7 @@
       <menu_item_check label="パイプラインをデバッグ" name="Debug Pipeline" />
       <menu_item_check label="自動アルファマスク(遅延)" name="Automatic Alpha Masks (deferred)" />
       <menu_item_check label="自動アルファマスク(遅延なし)" name="Automatic Alpha Masks (non-deferred)" />
+      <menu_item_check label="自動アルファマスク(RMSE)" name="Automatic Alpha Masks (RMSE)" />
       <menu_item_check label="アニメーションテクスチャ" name="Animation Textures" />
       <menu_item_check label="テクスチャを無効にする" name="Disable Textures" />
       <menu_item_check label="アンビエントを無効にする" name="Disable Ambient" />
@@ -501,6 +568,10 @@
       <menu_item_check label="マウスオーバーで強調表示する" name="Hover Glow Objects" />
       <menu_item_separator />
 
+      <menu_item_check label="シェーダーキャッシュを有効化" name="Enable Shader Cache" />
+      <menu_item_call label="シェーダーキャッシュをクリア" name="Shader Cache Clear" />
+      <menu_item_separator />
+
       <menu_item_call label="キャッシュを直ちにクリア" name="Cache Clear" />
 
     </menu>
@@ -508,6 +579,12 @@
     <menu label="ネットワーク" name="Network">
       <menu_item_check label="エージェントを一時停止する" name="AgentPause" />
 
+      <menu_item_separator/>
+
+      <menu_item_call label="メッセージログ…" name="Message Log" />
+      <menu_item_call label="メッセージビルダー…" name="Message Builder"/>
+      <menu_item_call label="メッセージ書き換え…" name="Message Rewriter"/>
+
       <menu_item_separator />
 
       <menu_item_call label="メッセージログを有効にする" name="Enable Message Log" />
diff --git a/indra/newview/skins/default/xui/ja/notification_visibility.xml b/indra/newview/skins/default/xui/ja/notification_visibility.xml
deleted file mode 100644
index db292100d7b..00000000000
--- a/indra/newview/skins/default/xui/ja/notification_visibility.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" ?>
-<notification_visibility>
-  <hide tag="custom_skin"/>
-	<show/> 
-</notification_visibility>
-
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 0a90831bd56..658e7688dfd 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -2020,7 +2020,7 @@ https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83
     <tag>fail</tag>
   </notification>
 
-  <notification name="DisplayNameUpdate">[OLD_NAME] ([SLID]) は、[NEW_NAME]に変更されました。
+  <notification name="DisplayNameUpdate">[OLD_NAME]([SLID])は、[NEW_NAME]に変更されました。
     <tag>fail</tag>
   </notification>
 
@@ -2033,7 +2033,7 @@ https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83
     </form>
   </notification>
 
-  <notification name="TooManyTeleportOffers">[OFFERS]回にわたってテレポートを送ろうとしましたが、限度数[LIMIT]を超えてしましました。
+  <notification name="TooManyTeleportOffers">[OFFERS]回にわたってテレポートのオファーを送ろうとしましたが、限度回数[LIMIT]を超えしまっています。
     <tag>group</tag>
     <tag>fail</tag>
     <usetemplate name="okbutton" yestext="OK" />
@@ -2411,7 +2411,7 @@ https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83
     <usetemplate name="okbutton" yestext="OK" />
   </notification>
 
-  <notification name="PublishClassified">注意:クラシファイド広告の掲載料金の払い戻しはできません。L$ [AMOUNT]で、このクラシファイド広告を今すぐ公開しますか?
+  <notification name="PublishClassified">注意:クラシファイド広告の掲載料金の払い戻しはできません。このクラシファイド広告をL$ [AMOUNT]で、今すぐ公開しますか?
     <tag>confirm</tag>
     <tag>funds</tag>
     <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK" />
@@ -2792,7 +2792,7 @@ Webページにリンクすると、他人がこの場所に簡単にアクセ
 
   <notification name="WLRegionApplyFail">申し訳ございませんが、設定をリージョンに適用できませんでした。理由:[FAIL_REASON]</notification>
 
-  <notification name="WLLocalTextureDayBlock">ローカルテクスチャは、フィールド[FIELD]内のトラック[TRACK]、フレーム#[FRAMENO] ([FRAME]%) で使用されています。
+  <notification name="WLLocalTextureDayBlock">ローカルテクスチャは、フィールド[FIELD]内のトラック[TRACK]、フレーム#[FRAMENO]([FRAME]%)で使用されています。
 ローカルテクスチャを使った設定は保存されない可能性があります。</notification>
 
   <notification name="WLLocalTextureFixedBlock">ローカルテクスチャは、フィールド[FIELD]で使用されています。
@@ -5310,10 +5310,340 @@ UDP:3478, 3479, 5060, 5062, 6250, 12000-32000
     <usetemplate ignoretext="リグメッシュがHUDポイントにアタッチされている場合に警告します。" name="okignore" yestext="OK"/>
   </notification>
 
-  <notification name="EnableAutoFPSWarning" type="alertmodal">自動FPSを有効にしようとしています。保存されていないグラフィック設定はすべて失われます。
+  <notification name="EnableAutoFPSWarning">自動FPSを有効にしようとしています。保存されていないグラフィック設定はすべて失われます。
 
 まずそれらを保存しますか?
     <tag>confirm</tag>
     <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
   </notification>
+
+  <!-- ALCHEMY BELOW THIS LINE -->
+  <notification name="ChatCommandCalc">計算結果:[EXPRESSION]=[RESULT]</notification>
+
+  <notification name="ChatCommandCalcFailed">計算に失敗しました。</notification>
+
+  <notification name="ChatCommandDiceRoll">サイコロ振り:[RESULT]</notification>
+
+  <notification name="DumpArchetypeSuccess">外観は、[FILE_PATH]に正常に保存されました。</notification>
+
+  <notification name="InvalidGrid">
+    <tag>fail</tag>
+    <tag>opensim</tag>
+「[GRID]」は有効なグリッド識別子ではありません。
+  </notification>
+  <notification name="MalformedGridInfo">
+    <tag>fail</tag>
+    <tag>opensim</tag>
+[GRID]は、不正な形式のグリッド情報が提供されました。
+
+サポートにお問い合わせください。
+  </notification>
+  <notification name="CannotRemoveConnectedGrid">
+[GRID]に接続している間は削除できません。
+    <tag>fail</tag>
+    <tag>opensim</tag>
+  </notification>
+  <notification name="ConfirmRemoveGrid">
+[GRID]をグリッド リストから削除してもよろしいですか?  
+    <tag>opensim</tag>
+    <tag>confirm</tag>
+    <usetemplate ignoretext="グリッド削除時の確認" name="okcancelignore" notext="キャンセル" yestext="OK" />
+  </notification>
+  <notification name="RemoveGridFailure">
+[GRID] をリストから削除できませんでした。
+    <tag>fail</tag>
+    <tag>opensim</tag>
+  </notification>
+  <notification name="CantAddGrid">
+[GRID] のグリッド情報を取得できませんでした。
+エラー:[STATUS] [REASON]
+    <tag>fail</tag>
+    <tag>opensim</tag>
+  </notification>
+  <notification name="AddGridSuccess">
+グリッドリストに[GRID]が追加されました。  
+    <form name="form">
+      <ignore name="ignore" text="グリッドリストにグリッドを追加"/>
+    </form>
+    <tag>fail</tag>
+    <tag>opensim</tag>
+  </notification>
+
+  <notification name="SecondLifePasswordTooLong">
+[CURRENT_GRID]サインアッププロセスのバグにより、パスワードは16文字を超えており、ログインできるように切り詰められています。
+  </notification>
+
+  <notification name="ConfirmRemoveSkin">
+[SKIN]を削除してもよろしいですか? これにより、ハードディスクから完全に消去されます。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="Confirm removing skins" name="okcancelignore" notext="キャンセル" yestext="OK" />
+  </notification>
+  <notification name="RemoveSkinSuccess">
+[SKIN]の削除に成功しました。
+    <tag>fail</tag>
+  </notification>
+  <notification name="RemoveSkinFailure">
+[SKIN]の削除に失敗しました。
+    <tag>fail</tag>
+  </notification>
+  <notification name="AddSkinNoManifest">
+[PACKAGE]にはマニフェストが含まれていないか、読み込むことができません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="AddSkinCantParseManifest">
+[PACKAGE]は無効なマニフェストです。
+    <tag>fail</tag>
+  </notification>
+  <notification name="AddSkinUnpackFailed">
+スキンパッケージの解凍に失敗しました。詳細についてはログを参照してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="AddSkinSuccess">
+[PACKAGE]の追加に成功しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification icon="alert.tga" name="RegionTrackerAdd" type="alert">
+リージョン(地域)「[REGION]」にどのラベルを使用しますか?
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="label" type="text">[LABEL]</input>
+      <button default="true" index="0" name="OK" text="OK"/>
+      <button index="1" name="Cancel" text="キャンセル"/>
+    </form>
+  </notification>
+
+  <notification name="RadarAlertEnter">
+[REGION]に[AGENT]が入りました。
+    <tag>radar</tag>
+  </notification>
+  <notification name="RadarAlertLeave">
+[REGION]から[AGENT]が去りました。
+    <tag>radar</tag>
+  </notification>
+
+  <notification name="AutoAcceptedInventory">
+[NAME]が渡してきた[ITEM]は、自動的に受け入れられ、インベントリに配置されました。
+  </notification>
+
+  <notification name="NewAOSet">
+新しいAOセットの名前を指定します。
+(名前には、「:」または「|」を除く任意のASCII文字を含めることができます。)
+    <form name="form">
+      <input name="message" type="text" default="true">新しいAOセット</input>
+      <button default="true" index="0" name="OK" text="OK"/>
+      <button index="1" name="Cancel" text="キャンセル"/>
+    </form>
+  </notification>
+
+  <notification name="NewAOCantContainNonASCII">
+「[AO_SET_NAME]」という名前のAOセットを作成することができませんでした。
+名前には、「:」または「|」を除く任意のASCII文字を含めることができます。
+    <usetemplate name="okbutton" yestext="OK"/>
+  </notification>
+
+  <notification name="RenameAOMustBeASCII">
+AOセット「[AO_SET_NAME]」をリネームすることができませんでした。
+名前には、「:」または「|」を除く任意のASCII文字を含めることができます。
+    <usetemplate name="okbutton" yestext="OK"/>
+  </notification>
+
+  <notification name="RemoveAOSet">
+リストからAOセット「[AO_SET_NAME]」を削除してもよろしいですか?
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="削除"/>
+  </notification>
+
+  <notification name="AOForeignItemsFound">
+アニメーションオーバーライダーは、構成に属さない項目を少なくとも1つ見つけました。
+移動されたアイテムがないか、「遺失物」フォルダーを確認してください。</notification>
+
+  <notification name="AOImportSetAlreadyExists">
+この名前のアニメーションセットはすでに存在します。
+  </notification>
+
+  <notification name="AOImportPermissionDenied">
+ノートカードを読み取るための十分な権限がありません。
+  </notification>
+
+  <notification name="AOImportCreateSetFailed">
+インポートセット作成中にエラーが発生しました。
+  </notification>
+
+  <notification name="AOImportDownloadFailed">
+ノートカードをダウンロードできませんでした。
+  </notification>
+
+  <notification name="AOImportNoText">
+ノートカードが空であるか、読み取り不能です。
+  </notification>
+
+  <notification name="AOImportNoFolder">
+アニメーションを読み取るフォルダーが見つかりませんでした。
+  </notification>
+
+  <notification name="AOImportNoStatePrefix">
+ノートカードの[LINE]行目には有効な[ステート接頭辞がありません。
+  </notification>
+
+  <notification name="AOImportNoValidDelimiter">
+ノートカードの[LINE]行目には有効な]デリミタがありません。
+  </notification>
+
+  <notification name="AOImportStateNameNotFound">
+ステート名[NAME]が見つかりません。
+  </notification>
+
+  <notification name="AOImportAnimationNotFound">
+アニメーション[NAME]が見つかりませんでした。インポートしたノートカードと同じフォルダーに存在することを確認してください。
+  </notification>
+
+  <notification name="AOImportInvalid">
+ノートカードには使用可能なデータが含まれていませんでした。インポートを中止します。
+  </notification>
+
+  <notification name="AOImportRetryCreateSet">
+アニメーションセット[NAME]のインポートフォルダを作成できませんでした。再試行しています…。
+  </notification>
+
+  <notification name="AOImportAbortCreateSet">
+アニメーションセット[NAME]のインポートフォルダを作成できませんでした。中断します。
+  </notification>
+
+  <notification name="AOImportLinkFailed">
+アニメーション「[NAME]」のアニメーションリンクの作成に失敗しました!
+  </notification>
+
+  <notification name="ParticleSaveChanges">
+閉じる前にパーティクルスクリプトを注入しますか?
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="注入しない" yestext="注入する" />
+  </notification>
+
+  <notification name="ParticleScriptFindFolderFailed">
+インベントリー内に新しいスクリプト用のフォルダーが見つかりませんでした。
+  </notification>
+
+  <notification name="ParticleScriptCreationFailed">
+このパーティクルシステム用の新しいスクリプトを作成できませんでした。
+  </notification>
+
+  <notification name="ParticleScriptNotFound">
+このパーティクルシステム用に新しく作成されたスクリプトが見つかりませんでした。
+  </notification>
+
+  <notification name="ParticleScriptInjected">
+パーティクルスクリプトが正常に挿入されました。
+  </notification>
+
+  <notification name="ParticleScriptFailed">
+オブジェクトへのスクリプトの挿入に失敗しました。
+  </notification>
+
+  <notification name="ParticleScriptCopiedToClipboard">
+このパーティクルシステムを作成するLSLスクリプトがクリップボードにコピーされました。それを新しいスクリプトに貼り付けて使用できるようになります。
+    <form name="form">
+      <ignore name="ignore" text="パーティクルスクリプトがクリップボードにコピーされた" />
+    </form>
+  </notification>
+
+  <notification name="RevokedMapRights">
+[NAME]さんの地図上の位置を検索する権限が取り消されました。
+  </notification>
+  <notification name="GrantedMapRights">
+[NAME]さんから、地図上で自分の位置を見つける許可が与えられました。
+  </notification>
+
+  <notification label="Warn on insecure login" name="InsecureLogin">
+[GRID]はログイン用の安全な接続を提供しません。
+ログイン情報は平文で送信されるため、スヌーピングに対して脆弱になる可能性があります。
+
+このまま続けてもよろしいですか?
+    <tag>confirm</tag>
+    <usetemplate ignoretext="非セキュアなログイン接続を試みようとした" name="okcancelignore" notext="キャンセル" yestext="OK"/>
+  </notification>
+
+  <notification name="ShapeImportGenericFail">
+[FILENAME]のインポート時に問題が発生しました。詳細につきましてはログをご確認ください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="ShapeImportVersionFail">
+シェイプのインポートに失敗しました。[FILENAME] はアバターのGenepoolファイルですか?
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SnapshotDetected">
+	[NAME]はスナップショットを撮影しました!٩(ˊᗜˋ*)و
+  </notification>
+
+  <notification name="AlwaysRunEnabled">
+常時走行が有効になりました。
+  </notification>
+  <notification name="AlwaysRunDisabled">
+常時走行が無効になりました。
+  </notification>
+
+  <notification name="CinematicConfirmHideUI" label="">
+シネマティックモードでは、ほとんどのUI、ホバー テキスト、音声ドット、HUDが非表示になります。
+元に戻すには、[SHORTCUT]を押します。
+    <unique/>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelignore" yestext="OK" notext="キャンセル" ignoretext="シネマティックモードを有効にする前の確認"/>
+  </notification>
+
+  <notification name="AlchemyUnpoweredWizard">
+ごめんなさい、デイブ、残念ながらそれはできません
+  </notification>
+
+  <notification name="AlchemyExplosions">
+発破で~す!
+  </notification>
+
+  <notification name="AlchemyDestroyObject">
+オブジェクトを取り消し不能に破壊します。それが必要なかったことを願っています。
+  </notification>
+
+  <notification icon="notify" name="AskForDisplayPreferencesReset">
+グラフィックカードが変更されたようです。
+
+前回:[LAST_GPU]
+今回:[THIS_GPU]
+
+グラフィック設定をリセットしますか?
+    <usetemplate name="yesnocancelbuttons" yestext="リセットする" notext="このままにする" canceltext="リセットしない"/>
+  </notification>
+
+  <notification name="UpdateDownloadRequest">
+新しいバージョンが検出されました。
+次のアップデートを含む[VIEWER_VER]を今すぐダウンロードしてインストールしますか?
+
+[VIEWER_UPDATES]
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="あとで" yestext="OK"/>
+  </notification>
+
+  <notification name="UpdateDownloaded">
+[VIEWER_VER]がダウンロードされました。
+次のアップデートのために[VIEWER_VER]を今すぐインストールしますか?
+
+[VIEWER_UPDATES]
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="あとで" yestext="OK"/>
+  </notification>
+
+  <notification name="UpdateInstalledRestart">
+ビューアは以下のバージョンに更新されました:
+[VIEWER_VER]⇨[VIEWER_UPDATES] 
+
+再起動しますか?
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="あとで" yestext="OK"/>
+  </notification>
+  <notification name="UpdateInstalledRestartToast">
+ビューアは以下のバージョンに更新されました:
+[VIEWER_VER]⇨[VIEWER_UPDATES] 
+
+再起動しますか?
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="あとで" yestext="OK"/>
+  </notification>
 </notifications>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_ao.xml b/indra/newview/skins/default/xui/ja/panel_ao.xml
index 7f585bcad5e..63e76493514 100644
--- a/indra/newview/skins/default/xui/ja/panel_ao.xml
+++ b/indra/newview/skins/default/xui/ja/panel_ao.xml
@@ -1,423 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<panel
- name="animation_overrider_outer_panel"
- left="0"
- top="0"
- width="200"
- height="334"
- follows="all"
- visible="true"
- layout="topleft">
-<!-- Main Panel -->
-  <panel
-   name="animation_overrider_panel"
-   left="10"
-   top="4"
-   width="180"
-   height="320"
-   follows="all"
-   visible="true"
-   layout="topleft">
-    <check_box
-     name="ao_enable"
-     label="Enable AO"
-     tool_tip="Enable or disable the Animation Overrider"
-     control_name="AlchemyAOEnable"
-     left="0"
-     top="4"
-     width="20"
-     height="20"
-     follows="left|top"
-     layout="topleft" />
-    <combo_box
-     name="ao_set_selection_combo"
-     tool_tip="Select animation set to edit."
-     left="0"
-     top_pad="2"
-     right="-24"
-     height="20"
-     allow_text_entry="true"
-     max_chars="256"
-     follows="left|right|top"
-     layout="topleft">
-      <combo_box.commit_callback
-       function="AO.SelectSet" />
-    </combo_box>
-    <button
-     name="ao_activate"
-     tool_tip="Activate this animation set now."
-     left_pad="4"
-     width="20"
-     height="20"
-     follows="right|top"
-     layout="topleft">
-      <button.commit_callback
-       function="AO.ActivateSet" />
-    </button>
-    <icon
-     left_delta="4"
-     top_delta="4"
-     width="12"
-     height="12"
-     image_name="Activate_Checkmark"
-     follows="right|top"
-     layout="topleft" />
-    <check_box
-     name="ao_default"
-     label="Default"
-     tool_tip="Make this animation set the default set that plays when you log in."
-     left="0"
-     top_pad="8"
-     width="20"
-     height="20"
-     follows="left|top"
-     layout="topleft">
-      <check_box.commit_callback
-       function="AO.SetDefault" />
-    </check_box>
-    <button
-     name="ao_add"
-     tool_tip="Create a new animation set."
-     top_delta="0"
-     right="-24"
-     width="20"
-     height="20"
-     image_overlay="AddItem_Press"
-     follows="right|top"
-     layout="topleft">
-      <button.commit_callback
-       function="AO.AddSet" />
-    </button>
-    <button
-     name="ao_remove"
-     tool_tip="Remove this animation set."
-     left_pad="4"
-     width="20"
-     height="20"
-     image_overlay="TrashItem_Press"
-     follows="right|top"
-     layout="topleft">
-      <button.commit_callback
-       function="AO.RemoveSet" />
-    </button>
-    <check_box
-     name="ao_sit_override"
-     label="Override Sits"
-     tool_tip="Check this if you want sit animation overrides."
-     left="0"
-     top_pad="4"
-     width="100"
-     height="16"
-     follows="left|top"
-     layout="topleft">
-      <check_box.commit_callback
-       function="AO.SetSitOverride" />
-    </check_box>
-    <check_box
-     name="ao_smart"
-     label="Be smart"
-     tool_tip="Smart mode tries to determine if the sit override would clash with the object's own animation and disables the overrider temporarily."
-     left_pad="4"
-     right="-1"
-     height="16"
-     follows="left|top"
-     layout="topleft">
-      <check_box.commit_callback
-       function="AO.SetSmart" />
-    </check_box>
-    <check_box
-     name="ao_disable_stands_in_mouselook"
-     label="Disable Stands in Mouselook"
-     tool_tip="If you need to preserve your custom stand animation in mouselook, check this box."
-     left="0"
-     top_pad="4"
-     width="100"
-     height="16"
-     follows="left|top"
-     layout="topleft">
-      <check_box.commit_callback
-       function="AO.DisableStandsML" />
-    </check_box>
-    <combo_box
-     name="ao_state_selection_combo"
-     tool_tip="Select animation state to edit."
-     left="0"
-     top_pad="4"
-     right="-1"
-     height="20"
-     follows="left|right|top"
-     layout="topleft">
-      <combo_box.commit_callback
-       function="AO.SelectState" />
-    </combo_box>
-    <scroll_list
-     name="ao_state_animation_list"
-     top_pad="4"
-     right="-24"
-     height="98"
-     multi_select="true"
-     follows="all"
-     layout="topleft">
-      <scroll_list.columns
-       name="icon"
-       dynamic_width="false"
-       width="20" />
-      <scroll_list.columns
-       name="animation_name"
-       dynamic_width="true" />
-      <scroll_list.commit_callback
-       function="AO.SelectAnim" />
+<panel name="animation_overrider_outer_panel">
+  <!-- Main Panel -->
+  <panel name="animation_overrider_panel">
+    <check_box name="ao_enable" label="AOを有効化" tool_tip="アニメーションオーバーライドを有効化したり無効化したりできます。" />
+    <combo_box name="ao_set_selection_combo" tool_tip="編集したいアニメーションを選択してください。" />
+    <button name="ao_activate" tool_tip="このアニメーションを今すぐ有効化します。" />
+    <check_box name="ao_default" label="デフォルト" tool_tip="このアニメーションセットを、ログイン時に再生されるデフォルトのセットにします。" />
+    <button name="ao_add" tool_tip="新しいアニメーションセットを追加します。" />
+    <button name="ao_remove" tool_tip="このアニメーションセットを削除します。" />
+    <check_box name="ao_sit_override" label="座るアニメをオーバーライド" tool_tip="座るアニメーションをオーバーライドする場合は、これをチェックします。" />
+    <check_box name="ao_smart" label="スマートモード" tool_tip="スマートモードは、座るオーバーライドが、オブジェクト自体のアニメーションと衝突するかどうかを判断し、オーバーライダーを一時的に無効にします。" />
+    <check_box name="ao_disable_stands_in_mouselook" label="立ったときにマウスルックを無効化する" tool_tip="カスタムスタンドアニメーションをマウスルックで保持する必要がある場合は、このボックスをオンにします。" />
+    <combo_box name="ao_state_selection_combo" tool_tip="編集するアニメーションの状態を選択します。" />
+    <scroll_list name="ao_state_animation_list">
+      <scroll_list.columns name="icon" />
+      <scroll_list.columns name="animation_name" />
     </scroll_list>
-    <panel
-     name="ao_animation_move_trash_panel"
-     left_pad="4"
-     right="-1"
-     height="98"
-     follows="right|top|bottom"
-     layout="topleft">
-      <button
-       name="ao_move_up"
-       tool_tip="Move the selected animation up in the list."
-       left="0"
-       top="0"
-       width="20"
-       height="32"
-       image_overlay="Arrow_Up"
-       follows="left|top"
-       layout="topleft">
-        <button.commit_callback
-         function="AO.MoveAnimUp" />
-      </button>
-      <button
-       name="ao_move_down"
-       tool_tip="Move the selected animation down in the list."
-       top_pad="4"
-       width="20"
-       height="32"
-       image_overlay="Arrow_Down"
-       follows="left|top"
-       layout="topleft">
-        <button.commit_callback
-         function="AO.MoveAnimDown" />
-      </button>
-      <button
-       name="ao_trash"
-       tool_tip="Remove the selected animation from the list."
-       left_delta="0"
-       bottom="-1"
-       width="20"
-       height="20"
-       image_overlay="TrashItem_Press"
-       follows="left|bottom"
-       layout="topleft">
-        <button.commit_callback
-         function="AO.RemoveAnim" />
-      </button>
+    <panel name="ao_animation_move_trash_panel">
+      <button name="ao_move_up" tool_tip="選択したアニメーションをリストの上に移動します。" />
+      <button name="ao_move_down" tool_tip="選択したアニメーションをリストの下に移動します。" />
+      <button name="ao_trash" tool_tip="選択したアニメーションをリストから削除します。" />
     </panel>
-    <check_box
-     name="ao_cycle"
-     label="Cycle"
-     tool_tip="Play a different animation from the list every time the animation state is called."
-     left="0"
-     top_pad="4"
-     width="55"
-     height="16"
-     follows="left|bottom"
-     layout="topleft">
-      <check_box.commit_callback
-       function="AO.SetCycle" />
-    </check_box>
-    <check_box
-     name="ao_randomize"
-     label="Randomize order"
-     tool_tip="Randomize order of animations in cycle mode."
-     left_pad="4"
-     width="100"
-     height="16"
-     follows="left|bottom"
-     layout="topleft">
-      <check_box.commit_callback
-       function="AO.SetRandomize" />
-    </check_box>
-    <text
-     name="ao_cycle_time_seconds_label"
-     value="Cycle time (seconds):"
-     left="0"
-     top_pad="4"
-     width="120"
-     follows="left|right|bottom"
-     layout="topleft" />
-    <spinner
-     name="ao_cycle_time"
-     tool_tip="Time before switching to the next animation in the list. Set this to 0 to disable automatic animation cycling."
-     top_delta="-6"
-     left_pad="8"
-     height="16"
-     right="-1"
-     decimal_digits="0"
-     initial_value="0"
-     min_val="0"
-     max_val="999"
-     increment="1"
-     follows="right|bottom"
-     layout="topleft">
-      <spinner.commit_callback
-       function="AO.SetCycleTime" />
-    </spinner>
-    <button
-     name="ao_reload"
-     label="Reload"
-     tool_tip="Reload animation overrider configuration."
-     left="0"
-     top_pad="8"
-     right="-1"
-     height="20"
-     follows="left|right|bottom"
-     layout="topleft">
-      <button.commit_callback
-       function="AO.Reload" />
-    </button>
-    <layout_stack
-     name="next_previous_buttons_stack"
-     left="0"
-     top_pad="4"
-     right="-1"
-     height="20"
-     orientation="horizontal"
-     follows="left|right|bottom"
-     layout="topleft">
-      <layout_panel
-       name="next_previous_buttons_stack_left"
-       width="90"
-       height="20"
-       user_resize="false"
-       follows="all"
-       layout="topleft">
-        <button
-         name="ao_previous"
-         image_overlay="BackArrow_Off"
-         tool_tip="Switch to previous animation of the current state."
-         left="0"
-         top="0"
-         width="90"
-         height="20"
-         follows="all"
-         layout="topleft">
-          <button.commit_callback
-           function="AO.PrevAnim" />
-        </button>
+    <check_box name="ao_cycle" label="サイクル" tool_tip="アニメーション状態が呼び出されるたびに、リストから異なるアニメーションを再生します。" />
+    <check_box name="ao_randomize" label="順序をランダム化" tool_tip="サイクルモードでアニメーションの順序をランダム化します。" />
+    <text name="ao_cycle_time_seconds_label" value="サイクル時間(秒):" />
+    <spinner name="ao_cycle_time" tool_tip="リスト内の次のアニメーションに切り替わるまでの時間を指定します。自動アニメーション循環を無効にするには、これを0に設定します。" />
+    <button name="ao_reload" label="リロード" tool_tip="アニメーションオーバーライド設定をリロードします。" />
+    <layout_stack name="next_previous_buttons_stack">
+      <layout_panel name="next_previous_buttons_stack_left">
+        <button name="ao_previous" tool_tip="現在の状態の前のアニメーションに切り替えます。" />
       </layout_panel>
-      <layout_panel
-       name="next_previous_buttons_stack_right"
-       width="90"
-       height="20"
-       user_resize="false"
-       follows="all"
-       layout="topleft">
-		<button
-         name="ao_next"
-         image_overlay="ForwardArrow_Off"
-         tool_tip="Switch to next animation of the current state."
-         left="2"
-         top="0"
-         width="90"
-         height="20"
-         follows="all"
-         layout="topleft">
-          <button.commit_callback
-           function="AO.NextAnim" />
-        </button>
+      <layout_panel name="next_previous_buttons_stack_right">
+        <button name="ao_next" tool_tip="現在の状態の次のアニメーションに切り替えます。" />
       </layout_panel>
     </layout_stack>
   </panel>
-<!-- Cute Reload Cover Panel -->
-  <panel
-   name="ao_reload_cover"
-   left="0"
-   top="0"
-   width="200"
-   height="325"
-   follows="all"
-   visible="false"
-   bg_alpha_color="Black_50"
-   bg_opaque_color="Black_50"
-   background_visible="true"
-   background_opaque="true"
-   mouse_opaque="true"
-   layout="topleft">
-    <panel
-     name="ao_reload_text_panel"
-     left="30"
-     top="110"
-     right="-30"
-     bottom="-110"
-     bg_alpha_color="Black_50"
-     bg_opaque_color="Black_50"
-     background_visible="true"
-     background_opaque="true"
-     follows="left|right|top">
-      <view_border
-       name="ao_reload_view_border"
-       left="0"
-       top="0"
-       right="-1"
-       bottom="-1"
-       follows="all" />
-      <text
-       name="reload_label"
-       left_delta="0"
-       top_delta="16"
-       halign="center"
-       valign="center"
-       follows="all">
-       Reloading Config
-      </text>
-      <text
-       name="wait_label"
-       v_pad="-4"
-       bottom="-16"
-       halign="center"
-       valign="center"
-       follows="all">
-       Please Wait
-      </text>
-      <layout_stack
-       name="ao_reload_indicator_layout_stack"
-       left="0"
-       top="31"
-       right="-1"
-       height="32"
-       orientation="horizontal"
-       follows="top|left|right">
-        <layout_panel
-         name="ao_reload_indicator_left_layout_panel"
-         width="160"
-         height="32"
-         auto_resize="true"
-         user_resize="false">
+  <!-- Cute Reload Cover Panel -->
+  <panel name="ao_reload_cover">
+    <panel name="ao_reload_text_panel">
+      <view_border name="ao_reload_view_border" />
+      <text name="reload_label">設定のリロード中</text>
+      <text name="wait_label">しばらくお待ち下さい</text>
+      <layout_stack name="ao_reload_indicator_layout_stack">
+        <layout_panel name="ao_reload_indicator_left_layout_panel">
         </layout_panel>
-        <layout_panel
-         name="ao_reload_indicator_layout_panel"
-         width="32"
-         height="32"
-         auto_resize="false"
-         user_resize="false">
-        <loading_indicator
-         left="0"
-         top="0"
-         width="32"
-         height="32"
-         follows="right|top"
-         name="ao_reload_indicator" />
+        <layout_panel name="ao_reload_indicator_layout_panel">
+          <loading_indicator name="ao_reload_indicator" />
         </layout_panel>
-        <layout_panel
-         name="ao_reload_indicator_right_layout_panel"
-         width="160"
-         height="32"
-         auto_resize="true"
-         user_resize="false">
+        <layout_panel name="ao_reload_indicator_right_layout_panel">
         </layout_panel>
       </layout_stack>
     </panel>
   </panel>
-</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_ao_mini.xml b/indra/newview/skins/default/xui/ja/panel_ao_mini.xml
index 24a8d4bf847..c4215f3785a 100644
--- a/indra/newview/skins/default/xui/ja/panel_ao_mini.xml
+++ b/indra/newview/skins/default/xui/ja/panel_ao_mini.xml
@@ -1,59 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<panel
- name="ao_mini"
- class="ao_mini"
- left="0"
- top="0"
- width="120"
- height="70"
- follows="all"
- visible="true"
- layout="topleft">
-  <combo_box
-   height="23"
-   layout="topleft"
-   left="3"
-   right="-28"
-   top="1"
-   name="set_list" />
-  <button
-   follows="top|right"
-   height="23"
-   image_overlay="Edit_Wrench"
-   label=""
-   layout="topleft"
-   left_pad="2"
-   name="ao_wrench"
-   tool_tip="Open the main AO controls"
-   top="1"
-   width="23">
-    <button.commit_callback
-     function="AO.OpenFloater" />
-  </button>
-  <button
-   name="ao_prev"
-   image_overlay="BackArrow_Off"
-   tool_tip="Switch to next animation of the current state."
-   left="2"
-   top_pad="2"
-   width="57"
-   height="20"
-   follows="all"
-   layout="topleft">
-    <button.commit_callback
-     function="AO.PrevAnim" />
-  </button>
-  <button
-   name="ao_next"
-   image_overlay="ForwardArrow_Off"
-   tool_tip="Switch to next animation of the current state."
-   left_pad="2"
-   top_delta="0"
-   width="57"
-   height="20"
-   follows="all"
-   layout="topleft">
-    <button.commit_callback
-     function="AO.NextAnim" />
-  </button>
+<panel name="ao_mini">
+   <combo_box name="set_list" />
+   <button label="" name="ao_wrench" tool_tip="メインAOコントロールを表示" />
+   <button name="ao_prev" tool_tip="現在の状態の前のアニメーションに切り替えます。" />
+   <button name="ao_next" tool_tip="現在の状態の次のアニメーションに切り替えます。" />
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_ao_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_ao_pulldown.xml
deleted file mode 100644
index c510946fb4e..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_ao_pulldown.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- bg_opaque_image="Volume_Background"
- bg_alpha_image="Volume_Background"
- background_opaque="true"
- background_visible="true"
- layout="topleft"
- width="120"
- height="70"
- name="ao_pulldown">
-  <panel
-   name="ao_mini"
-   class="ao_mini"
-   filename="panel_ao_mini.xml"
-   layout="topleft" />
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_blocked_list_item.xml b/indra/newview/skins/default/xui/ja/panel_blocked_list_item.xml
deleted file mode 100644
index 752321b949f..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_blocked_list_item.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="top|right|left"
- height="23"
- layout="topleft"
- left="0"
- name="blocked_list_item"
- top="0"
- width="380">
-    <icon
-     height="24"
-     follows="top|right|left"
-     image_name="ListItem_Select"
-     layout="topleft"
-     left="0"
-     name="selected_icon"
-     top="0"
-     visible="false"
-     width="380" />
-    <icon
-     follows="top|right|left"
-     height="24"
-     image_name="ListItem_Over"
-     layout="topleft"
-     left="0"
-     name="hovered_icon"
-     top="0"
-     visible="false"
-     width="380" />
-    <avatar_icon
-     default_icon_name="Generic_Person"
-     follows="top|left"
-     height="20"
-     layout="topleft"
-     left="5"
-     mouse_opaque="true"
-     top="2"
-     visible="false"
-     width="20" />
-    <group_icon
-     default_icon_name="Generic_Group"
-     follows="top|left"
-     height="20"
-     layout="topleft"
-     left="5"
-     mouse_opaque="true"
-     top="2"
-     visible="false"
-     width="20" />
-    <icon
-     follows="top|left"
-     height="16"
-     image_name="Inv_Object"
-     layout="topleft"
-     left="7"
-     name="object_icon"
-     top="4"
-     visible="false"
-     width="16" />
-    <text
-     follows="left|right"
-     font="SansSerifSmall"
-     height="15"
-     layout="topleft"
-     left_pad="5"
-     name="item_name"
-     parse_urls="false"
-     top="6"
-     use_ellipses="true"
-     width="180" />
-</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_chat_item.xml b/indra/newview/skins/default/xui/ja/panel_chat_item.xml
deleted file mode 100644
index cd3ce595d9f..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_chat_item.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- All our XML is utf-8 encoded. -->
-<panel
-  name="instant_message"
-  width="300"
-  height="180"
-  follows="all">
-     <avatar_icon
-        follows="left|top"
-        height="18"
-        image_name="Generic_Person"
-        layout="topleft"
-        left="3"
-        mouse_opaque="true"
-        name="avatar_icon"
-        top="3"
-        width="18" />
-	<text_chat
-      top="3"
-      left="30"
-      right="-10"
-      height="120"
-      text_color="white"
-      word_wrap="true"
-      mouse_opaque="true"
-      parse_highlights="true"
-      valign="top"
-      name="msg_text">
-	</text_chat>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_chat_separator.xml b/indra/newview/skins/default/xui/ja/panel_chat_separator.xml
deleted file mode 100644
index 357dbc07ccf..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_chat_separator.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- bg_alpha_color="black"
- follows="left|right|top"
- height="0"
- layout="topleft"
- name="chat_separator_panel" />
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
index af800fa2746..4e13c66cc9d 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
@@ -1,237 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- bevel_style="in"
- follows="left|top|right|bottom"
- height="569"
- label="Edit Pick"
- layout="topleft"
- left="0"
- min_height="350"
- name="panel_edit_pick"
- help_topic="profile_edit_pick"
- top="0"
- width="333">
- <panel.string
-  name="location_notice">
-    (will update after save)
- </panel.string>
-  <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     name="back_btn"
-     left="10"
-     tab_stop="false"
-     top="2"
-     width="30"
-     use_draw_context_alpha="false" />
-   <text
-     type="string"
-     length="1"
-     follows="top"
-     font="SansSerifHugeBold"
-     height="26"
-     layout="topleft"
-     left_pad="4"
-     name="title"
-     text_color="LtGray"
-     top="2"
-     width="250">
-        Edit Pick
-    </text>
-   <scroll_container
-     color="PanelDefaultBackgroundColor"
-     follows="all"
-     height="502"
-     layout="topleft"
-     left="8"
-     top_pad="10"
-     name="profile_scroll"
-     opaque="true"
-     width="312">
-    <panel
-     name="scroll_content_panel"
-     follows="left|top|right"
-     min_height="300"
-     layout="topleft"
-     top="0"
-     background_visible="false"
-     height="500"
-     left="0"
-     width="285">
-    <texture_picker
-     fallback_image="default_land_picture.j2c"
-     follows="left|top|right"
-     height="197"
-     width="272"
-     layout="topleft"
-     no_commit_on_selection="true"
-     top="10"
-     left="11"
-     name="pick_snapshot" />
-          <icon
-           height="197"
-           image_name="spacer24.tga"
-           layout="topleft"
-           name="edit_icon"
-           label=""
-           tool_tip="Click to select an image"
-           top="10"
-           left="11"
-           width="286" />
-        <text
-         type="string"
-         length="1"
-         follows="left|top|right"
-         height="15"
-         font="SansSerifSmall"
-         font.style="BOLD"
-         layout="topleft"
-         left="10"
-         top="215"
-         name="Name:"
-         text_color="white"
-         width="280">
-            Title:
-        </text>
-        <line_editor
-         follows="left|top|right"
-         font="SansSerif"
-         height="20"
-         layout="topleft"
-         left="10"
-         top_pad="2"
-         max_length_bytes="63"
-         name="pick_name"
-         width="273" />
-        <text
-         type="string"
-         length="1"
-         follows="left|top|right"
-         height="15"
-         font="SansSerifSmall"
-         font.style="BOLD"
-         layout="topleft"
-         left="10"
-         top_pad="20"
-         name="description_label"
-         text_color="white"
-         width="280">
-            Description:
-        </text>
-        <text_editor
-         follows="left|top|right"
-         height="100"
-         width="273"
-         hide_scrollbar="false"
-         layout="topleft"
-         left="10"
-         top_pad="2"
-         max_length="1023"
-         name="pick_desc"
-         spellcheck="true"
-         word_wrap="true" />
-        <text
-         type="string"
-         length="1"
-         font="SansSerifSmall"
-         font.style="BOLD"
-         follows="left|top|right"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="location_label"
-         text_color="white"
-         top_pad="20"
-         width="280">
-            Location:
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top|right"
-         height="50"
-         layout="topleft"
-         left="10"
-         name="pick_location"
-         top_pad="2"
-         width="280"
-         word_wrap="true">
-            loading...
-        </text>
-        <button
-         follows="left|top"
-         height="23"
-         label="Set to Current Location"
-         layout="topleft"
-         left="8"
-         top_pad="0"
-         name="set_to_curr_location_btn"
-         width="200" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="ピックを編集" name="panel_edit_pick">
+  <panel.string name="location_notice">(will update after save) </panel.string>
+  <button name="back_btn" />
+  <text name="title">ピンクの編集</text>
+  <scroll_container name="profile_scroll">
+    <panel name="scroll_content_panel">
+      <texture_picker name="pick_snapshot" />
+      <icon name="edit_icon" label="" tool_tip="画像を選択します。" />
+      <text name="Name:">タイトル:</text>
+      <line_editor name="pick_name" />
+      <text name="description_label">説明:</text>
+      <text_editor name="pick_desc" />
+      <text name="location_label">場所:</text>
+      <text name="pick_location" word_wrap="true">読み込んでいます…</text>
+      <button label="現在地をセット" name="set_to_curr_location_btn" />
     </panel>
-    </scroll_container>
-    <panel
-     follows="left|right|bottom"
-     height="23"
-     label="bottom_panel"
-     layout="topleft"
-     left="8"
-     name="bottom_panel"
-     top_pad="5"
-     width="315">
-     
-     	 <layout_stack
-		  follows="bottom|left|right"
-		  height="23"
-		  layout="topleft"
-		  name="layout_stack1"
-		  left="0"
-		  orientation="horizontal"
-		  top_pad="0"
-		  width="313">
-		  	 
-		  	 <layout_panel
-			  follows="bottom|left|right"
-			  height="23"
-			  layout="topleft"
-			  left="0"
-			  name="layout_panel1"
-		      auto_resize="true"
-			  width="150">
-		        <button
-		         follows="bottom|left|right"
-		         height="23"
-		         label="Save Pick"
-		         layout="topleft"
-		         name="save_changes_btn"
-		         top="0"
-		         left="1"
-		         width="149" />
-			  </layout_panel>
-			  
-			 <layout_panel
-			  follows="bottom|left|right"
-			  height="23"
-			  layout="topleft"
-			  left_pad="4"
-			  name="layout_panel2"
-		      auto_resize="true"
-			  width="146">
-		        <button
-		         follows="bottom|left|right"
-		         height="23"
-		         label="Cancel"
-		         layout="topleft"
-		         name="cancel_btn"
-		         top="0"
-		         left="1"
-		        width="145" />
-			  </layout_panel>
-	</layout_stack>
-		  
-    </panel>
-</panel>
+  </scroll_container>
+  <panel label="ボトムパネル" name="bottom_panel">
+    <layout_stack name="layout_stack1">
+      <layout_panel name="layout_panel1">
+        <button label="ピックを保存" name="save_changes_btn" />
+      </layout_panel>
+
+      <layout_panel name="layout_panel2">
+        <button label="キャンセル" name="cancel_btn" />
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_event_info.xml b/indra/newview/skins/default/xui/ja/panel_event_info.xml
index b065f493c12..3d99c0ce82e 100644
--- a/indra/newview/skins/default/xui/ja/panel_event_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_event_info.xml
@@ -1,456 +1,61 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- follows="all"
- height="570"
- layout="topleft"
- left="0"
- min_height="350"
- name="event_info"
- class="event_info"
- top="20"
- width="333">
-  <panel.string name="free">
-   FREE
-  </panel.string>
-  <panel.string name="hours">
-   hours
-  </panel.string>
-  <panel.string name="minutes">
-   minutes
-  </panel.string>
-  <panel.string name="type_mature">
-   Moderate
-  </panel.string>
-  <panel.string name="type_pg">
-  General Content
-  </panel.string>
-  <panel.string name="reminder">
-   Remind
-  </panel.string>
-  <panel.string name="no_reminder">
-   Don't remind
-  </panel.string>
-  <button
-   follows="top|left"
-   height="24"
-   image_hover_unselected="BackButton_Over"
-   image_pressed="BackButton_Press"
-   image_unselected="BackButton_Off"
-   layout="topleft"
-   name="back_btn"
-   left="10"
-   tab_stop="false"
-   top="2"
-   width="30"
-   use_draw_context_alpha="false" />
-  <text
-   follows="top|left|right"
-   font="SansSerifHugeBold"
-   height="26"
-   layout="topleft"
-   left_pad="4"
-   name="title"
-   text_color="LtGray"
-   top="0"
-   value="Event Info"
-   use_ellipses="true"
-   width="275" />
-  <scroll_container
-   color="PanelDefaultBackgroundColor"
-   opaque="true"
-   follows="all"
-   height="502"
-   layout="topleft"
-   left="10"
-   top_pad="10"
-   name="profile_scroll"
-   reserve_scroll_corner="false"
-   width="312">
-    <panel
-     name="scroll_content_panel"
-     follows="left|top"
-     min_height="300"
-     layout="topleft"
-     top="0"
-     background_visible="false"
-     height="610"
-     left="0"
-     width="285">
-     <panel
-     name="snapshot_panel"
-     layout="topleft"
-     follows="left|top|right"
-     height="197"
-     left="10"
-     top="10"
-     width="275">
-      <texture_picker
-       fallback_image="default_land_picture.j2c"
-       enabled="false"
-       follows="left|top|right"
-       height="197"
-       layout="topleft"
-       left="0"
-       name="snapshot"
-       top="0"
-       width="275" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="event_info">
+  <panel.string name="free">ç„¡æ–™</panel.string>
+  <panel.string name="hours">時間</panel.string>
+  <panel.string name="minutes">分</panel.string>
+  <panel.string name="type_mature">Moderate</panel.string>
+  <panel.string name="type_pg">General Content</panel.string>
+  <panel.string name="reminder">リマインド</panel.string>
+  <panel.string name="no_reminder">リマインドしない</panel.string>
+  <button name="back_btn" />
+  <text name="title" />
+  <scroll_container name="profile_scroll">
+    <panel name="scroll_content_panel">
+      <panel name="snapshot_panel">
+        <texture_picker name="snapshot" />
+      </panel>
+      <text_editor name="name" value="[name]" />
+      <text name="event_location_label" value="場所:" />
+      <text_editor name="location" value="[loading...]" />
+      <text name="content_type_label" value="コンテンツタイプ:" />
+      <icon name="content_type_moderate" />
+      <icon name="content_type_general" />
+      <text_editor name="content_type" value="[content type]" />
+      <text name="time_label" value="時間:" />
+      <text_editor name="time" value="[time]" />
+      <text name="duration_label" value="期間:" />
+      <text_editor name="duration" value="[duration]時間" />
+      <layout_stack name="descr_stack">
+        <layout_panel name="host_layout_panel">
+          <text name="host_label" value="ホスト:" />
+          <text_editor name="host" value="secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect" />
+        </layout_panel>
+        <layout_panel name="category_panel">
+          <text name="category_label" value="カテゴリ:" />
+          <text name="category" value="[category]" />
+        </layout_panel>
+        <layout_panel name="cover_panel">
+          <text name="cover_label" value="カバー:" />
+          <text name="cover" value="L$ [cover]" width="150" />
+        </layout_panel>
+        <layout_panel name="descr_layout_panel">
+          <text name="desc_label" value="説明:" />
+          <text_editor name="desc" value="[description]" />
+        </layout_panel>
+      </layout_stack>
     </panel>
-    <text_editor
-     allow_scroll="false"
-     bg_visible="false"
-     follows="left|top|right"
-     h_pad="0"
-     height="35"
-     width="290"
-     layout="topleft"
-     font="SansSerifBig"
-     font.style="BOLD"
-     left="10"
-     top_pad="10"
-     name="name"
-     read_only="true"
-     text_color="white"
-     v_pad="0"
-     value="[name]"
-     use_ellipses="true" />
-    <text
-     follows="left|top"
-     font.style="BOLD"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="event_location_label"
-     text_color="white"
-     top_pad="5"
-     value="Location:"
-     width="250" />
-    <text_editor
-     parse_urls="true"
-     allow_scroll="false"
-     bg_visible="false"
-     follows="left|top"
-     h_pad="0"
-     height="30"
-     layout="topleft"
-     left="10"
-     name="location"
-     read_only="true"
-     top_pad="5"
-     width="290"
-     word_wrap="true"
-     v_pad="0"
-     value="[loading...]" />
-    <text
-     follows="left|top"
-     font.style="BOLD"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="content_type_label"
-     text_color="white"
-     top_pad="10"
-     value="Content Type:"
-     width="140" />
-    <icon
-     follows="top|left"
-     height="16"
-     image_name="Parcel_M_Light"
-     layout="topleft"
-     left_pad="0"
-     name="content_type_moderate"
-     top_pad="-11"
-     width="18" />
-    <icon
-     follows="top|left"
-     height="16"
-     image_name="Parcel_PG_Light"
-     layout="topleft"
-     left_delta="0"
-     name="content_type_general"
-     top_delta="0"
-     width="18" />
-    <text_editor
-     allow_scroll="false"
-     bg_visible="false"
-     follows="left|top|right"
-     h_pad="0"
-     height="18"
-     layout="topleft"
-     left_pad="2"
-     name="content_type"
-     read_only="true"
-     width="130"
-     top_delta="1"
-     v_pad="0"
-     value="[content type]" />
-    <text
-     follows="left|top"
-     font.style="BOLD"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="time_label"
-     text_color="white"
-     top_pad="0"
-     value="Time:"
-     width="140" />
-    <text_editor
-     allow_scroll="false"
-     bg_visible="false"
-     follows="left|top|right"
-     h_pad="0"
-     height="18"
-     layout="topleft"
-     left_pad="0"
-     name="time"
-     read_only="true"
-     width="150"
-     top_pad="-10"
-     v_pad="0"
-     value="[time]" />
-    <text
-     follows="left|top"
-     font.style="BOLD"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="duration_label"
-     text_color="white"
-     top_pad="0"
-     value="Duration:"
-     width="140" />
-    <text_editor
-     allow_scroll="false"
-     bg_visible="false"
-     follows="left|top"
-     h_pad="0"
-     halign="left"
-     height="16"
-     layout="topleft"
-     left_pad="0"
-     name="duration"
-     read_only="true"
-     top_pad="-10"
-     v_pad="0"
-     value="[duration] hours"
-     width="150" />
-    <layout_stack
-     animate="false"
-     name="descr_stack"
-     layout="topleft"
-     follows="all"
-     orientation="vertical"
-     left="10"
-     top_pad="5"
-     width="290"
-     height="215">
-      <layout_panel
-       auto_resize="false"
-       name="host_layout_panel"
-       layout="topleft"
-       follows="all"
-       left="0"
-       top="0"
-       width="290"
-       height="16">
-       <text
-        follows="left|top"
-        font.style="BOLD"
-        height="10"
-        layout="topleft"
-        left="0"
-        name="host_label"
-        text_color="white"
-        top_pad="0"
-        value="Host:"
-        width="140" />
-       <text_editor
-        allow_scroll="false"
-        bg_visible="false"
-        follows="left|top"
-        h_pad="0"
-        halign="left"
-        height="16"
-        layout="topleft"
-        left_pad="0"
-        parse_urls="true"
-        name="host"
-        read_only="true"
-        top_pad="-10"
-        v_pad="0"
-        value="secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect"
-        width="150" />
+  </scroll_container>
+  <panel name="buttons">
+    <layout_stack name="layout_stack1">
+      <layout_panel name="layout_panel1">
+        <button label="テレポート" name="teleport_btn" />
       </layout_panel>
-      <layout_panel
-       auto_resize="false"
-       name="category_panel"
-       layout="topleft"
-       follows="all"
-       left="0"
-       top="0"
-       width="290"
-       height="16">
-        <text
-         follows="left|top"
-         font.style="BOLD"
-         height="10"
-         layout="topleft"
-         left="0"
-         name="category_label"
-         text_color="white"
-         top="0"
-         value="Category:"
-         width="140" />
-        <text
-         height="16"
-         layout="topleft"
-         follows="top|left"
-         left_pad="0"
-         name="category"
-         top_pad="-10"
-         value="[category]"
-         width="150" />
+      <layout_panel name="show_on_map_btn_lp">
+        <button label="マップ" name="show_on_map_btn" />
       </layout_panel>
-      <layout_panel
-       auto_resize="false"
-       name="cover_panel"
-       layout="topleft"
-       follows="all"
-       left="0"
-       top="0"
-       width="290"
-       height="16">
-        <text
-         follows="left|top"
-         font.style="BOLD"
-         height="10"
-         layout="topleft"
-         left="0"
-         name="cover_label"
-         text_color="white"
-         top="0"
-         value="Cover:"
-         width="140" />
-        <text
-         height="16"
-         layout="topleft"
-         follows="top|left"
-         left_pad="0"
-         name="cover"
-         top_pad="-10"
-         value="L$[cover]"
-       width="150" />
-      </layout_panel>
-      <layout_panel
-       name="descr_layout_panel"
-       layout="topleft"
-       follows="all"
-       left="0"
-       top="0"
-       width="290"
-       height="215">
-        <text
-         auto_resize="false"
-         follows="left|top"
-         font.style="BOLD"
-         height="10"
-         layout="topleft"
-         left="0"
-         name="desc_label"
-         text_color="white"
-         top="0"
-         value="Description:"
-         width="250" />
-        <text_editor
-         parse_urls="true"
-         allow_scroll="true"
-         bg_visible="false"
-         follows="all"
-         h_pad="0"
-         height="200"
-         layout="topleft"
-         left="0"
-         max_length="1023"
-         name="desc"
-         read_only="true"
-         top_pad="7"
-         width="280"
-         v_pad="0"
-         value="[description]"
-         word_wrap="true" />
+      <layout_panel name="remind_btn_lp">
+        <button label="リマインド" name="remind_btn" />
       </layout_panel>
     </layout_stack>
   </panel>
-</scroll_container>
-<panel
- follows="left|right|bottom"
- height="35"
- layout="topleft"
- top_pad="5"
- left="9"
- name="buttons">
-  <layout_stack
-   follows="bottom|left|right"
-   height="23"
-   layout="topleft"
-   name="layout_stack1"
-   left="0"
-   orientation="horizontal"
-   top_pad="0"
-   width="309">
-    <layout_panel
-     follows="bottom|left|right"
-     height="23"
-     layout="bottomleft"
-     left="0"
-     name="layout_panel1"
-     auto_resize="true"
-     width="101">
-      <button
-       follows="bottom|left|right"
-       height="23"
-       label="Teleport"
-       layout="topleft"
-       left="0"
-       name="teleport_btn"
-       top="0"
-       width="101" />
-    </layout_panel>
-    <layout_panel
-     follows="bottom|left|right"
-     height="23"
-     layout="bottomleft"
-     left_pad="3"
-     name="show_on_map_btn_lp"
-     auto_resize="true"
-     width="100">
-      <button
-       follows="bottom|left|right"
-       height="23"
-       label="Map"
-       layout="topleft"
-       name="show_on_map_btn"
-       top="0"
-       width="100" />
-    </layout_panel>
-    <layout_panel
-     follows="bottom|left|right"
-     height="23"
-     layout="bottomleft"
-     left_pad="3"
-     name="remind_btn_lp"
-     auto_resize="true"
-     width="101">
-      <button
-       follows="bottom|left|right"
-       height="23"
-       label="Remind"
-       layout="topleft"
-       name="remind_btn"
-       top="0"
-       width="101" />
-    </layout_panel>
-  </layout_stack>
- </panel>
-</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_favorites.xml b/indra/newview/skins/default/xui/ja/panel_favorites.xml
deleted file mode 100644
index 1e8ea34ad28..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_favorites.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-   name="Favorites"
-   layout="topleft" 
-   left="0"
-   border="false"
-   background_visible="true"
-   bg_alpha_color="DkGray"
-   follows="all">
-    <places_inventory_panel
-      allow_multi_select="true"
-      border="false"
-      top="1"
-      left="3"
-      bottom="0"
-      follows="all"
-      right="-3"
-      mouse_opaque="true"
-      name="favorites_list"
-      folder_view.use_ellipses="true"
-      start_folder.name="Favorites"/>        
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_generic_tip.xml b/indra/newview/skins/default/xui/ja/panel_generic_tip.xml
deleted file mode 100644
index eea92895f58..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_generic_tip.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- height="40"
- layout="topleft"
- left="0"
- name="panel_generic_tip"
- top="0"
- width="305">
-    <text
-     follows="all"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left="10"
-     max_length="350"
-     name="message"
-     text_color="white"
-     top="10"
-     use_ellipses="true"
-     value=""
-     width="285"
-     wrap="true" />
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_gltf_material.xml b/indra/newview/skins/default/xui/ja/panel_gltf_material.xml
index 6975525b3de..51568bdb54e 100644
--- a/indra/newview/skins/default/xui/ja/panel_gltf_material.xml
+++ b/indra/newview/skins/default/xui/ja/panel_gltf_material.xml
@@ -1,392 +1,44 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- layout="topleft"
- follows="left|top|right"
- border="false"
- name="panel_gltf_material"
- top="0"
- left="0"
- height="768"
- width="247">
-  <check_box
-    follows="left|top"
-    layout="topleft"
-    label="Double Sided"
-    left="10"
-    top="0"
-    name="double sided"
-    height="25"
-    width="120" />
-  <panel
-    border="true"
-    follows="left|top"
-    width="246"
-    height="196"
-    layout="topleft"
-    left="1"
-    mouse_opaque="false"
-    name="base_color_texture_pnl"
-    top_pad="5"
-         >
-    <text
-      type="string"
-      font.style="BOLD"
-      length="1"
-      follows="left|top"
-      height="10"
-      layout="topleft"
-      left="10"
-      top="5"
-      width="128"
-      name="base_color_lbl">
-      Base Color:
-    </text>
-    <texture_picker
-      can_apply_immediately="true"
-      default_image_name="Default"
-      fallback_image="materials_ui_x_24.png"
-      allow_no_texture="true"
-      follows="left|top"
-      top_pad="8"
-      height="151"
-      layout="topleft"
-      left="10"
-      name="base_color_texture"
-      tool_tip="Base Color map.  Alpha channel is optional and used for transparency."
-      width="128" />
-    <text
-      type="string"
-      font.style="BOLD"
-      length="1"
-      follows="left|top"
-      height="10"
-      width="128"
-      layout="topleft"
-      left="10"
-      top_pad="-17"
-      name="base_color_upload_fee">
-      No upload fee
-    </text>
-    <text
-      type="string"
-      length="1"
-      follows="left|top"
-      height="10"
-      layout="topleft"
-      left_pad="5"
-      top="8"
-      name="base_color_tint_lbl">
-      Tint
-    </text>
-    <color_swatch
-      can_apply_immediately="true"
-      follows="left|top"
-      height="40"
-      label_height="0"
-      layout="topleft"
-      left_delta="0"
-      top_pad="5"
-      name="base color"
-      width="40" />
-    <text
-      type="string"
-      length="1"
-      follows="left|top"
-      height="10"
-      layout="topleft"
-      left_delta="0"
-      top_pad="5"
-      width="96"
-      name="base_color_transparency_lbl">
-      Transparency
-    </text>
-    <spinner
-      decimal_digits="3"
-      follows="left|top"
-      height="19"
-      increment="0.01"
-      initial_value="1"
-      layout="topleft"
-      left_delta="0"
-      top_pad="5"
-      min_val="0"
-      max_val="1"
-      name="transparency"
-      width="64"/>
-    <text
-      type="string"
-      length="1"
-      follows="left|top"
-      height="10"
-      layout="topleft"
-      left_delta="0"
-      text_readonly_color="LabelDisabledColor"
-      top_pad="5"
-      width="90"
-      name="alpha_mode_lbl">
-      Alpha mode
-    </text>
-    <combo_box
-     height="23"
-     layout="topleft"
-     left_delta="0"
-     name="alpha mode"
-     top_pad="4"
-     width="89">
-      <combo_box.item
-       label="Opaque"
-       name="None"
-       value="OPAQUE" />
-      <combo_box.item
-       label="Blend"
-       name="Alpha blending"
-       value="BLEND" />
-      <combo_box.item
-       label="Mask"
-       name="Alpha masking"
-       value="MASK" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_gltf_material">
+  <check_box label="両面" name="double sided" />
+  <panel name="base_color_texture_pnl">
+    <text name="base_color_lbl">基準色:</text>
+    <texture_picker name="base_color_texture" tool_tip="基準色のマップ。アルファチャネルはオプションで透明度で使用されます。" />
+    <text name="base_color_upload_fee">アップロード料金なし</text>
+    <text name="base_color_tint_lbl">色彩</text>
+    <color_swatch name="base color" />
+    <text name="base_color_transparency_lbl">透明度</text>
+    <spinner name="transparency" />
+    <text name="alpha_mode_lbl">アルファモード</text>
+    <combo_box name="alpha mode">
+      <combo_box.item label="不透明" name="None" value="OPAQUE" />
+      <combo_box.item label="ブレンド" name="Alpha blending" value="BLEND" />
+      <combo_box.item label="マスク" name="Alpha masking" value="MASK" />
     </combo_box>
-    <text
-      type="string"
-      length="1"
-      follows="left|top"
-      height="10"
-      layout="topleft"
-      left_delta="0"
-      top_pad="5"
-      width="96"
-      name="alpha_cutoff_lbl">
-      Alpha Cutoff
-    </text>
-    <spinner
-      decimal_digits="3"
-      follows="left|top"
-      height="19"
-      increment="0.01"
-      initial_value="1"
-      layout="topleft"
-      left_delta="0"
-      top_pad="5"
-      min_val="0"
-      max_val="1"
-      name="alpha cutoff"
-      width="64"/>
+    <text name="alpha_cutoff_lbl">アルファのカットオフ</text>
+    <spinner name="alpha cutoff" />
   </panel>
-  <panel
-    border="true"
-    follows="left|top"
-    width="246"
-    height="175"
-    layout="topleft"
-    left="1"
-    mouse_opaque="false"
-    name="metallic_texture_pnl"
-    top_pad="5">
-    <text
-      type="string"
-      font.style="BOLD"
-      length="1"
-      follows="left|top"
-      height="10"
-      layout="topleft"
-      left="10"
-      top="5"
-      name="metallic_roughness_lbl">
-      Metallic-Roughness:
-    </text>
-    <texture_picker
-      can_apply_immediately="true"
-      default_image_name="Default"
-      fallback_image="materials_ui_x_24.png"
-      allow_no_texture="true"
-      follows="left|top"
-      width="128"
-      height="151"
-      layout="topleft"
-      left="10"
-      name="metallic_roughness_texture"
-      tool_tip="GLTF metallic-roughness map with optional occlusion.  Red channel is occlusion, green channel is roughness, blue channel is metalness."
-      top_pad="8"/>
-    <text
-      type="string"
-      font.style="BOLD"
-      length="1"
-      follows="left|top"
-      height="10"
-      width="128"
-      layout="topleft"
-      left="10"
-      top_pad="-17"
-      name="metallic_upload_fee">
-      No upload fee
-    </text>
-    <text
-      type="string"
-      length="1"
-      follows="left|top"
-      height="10"
-      layout="topleft"
-      left_pad="5"
-      top="8"
-      name="metallic_factor_lbl">
-      Metallic Factor
-    </text>
-    <spinner
-      decimal_digits="3"
-      follows="left|top"
-      height="19"
-      increment="0.01"
-      initial_value="0"
-      layout="topleft"
-      left_delta="0"
-      top_pad="5"
-      min_val="0"
-      max_val="1"
-      name="metalness factor"
-      width="64"/>
-    <text
-      type="string"
-      length="1"
-      follows="left|top"
-      height="10"
-      layout="topleft"
-      left_delta="0"
-      top_pad="5"
-      width="96"
-      name="roughness_factor_lbl">
-      Roughness Factor
-    </text>
-    <spinner
-      decimal_digits="3"
-      follows="left|top"
-      height="19"
-      increment="0.01"
-      initial_value="0"
-      layout="topleft"
-      left_delta="0"
-      top_pad="5"
-      min_val="0"
-      max_val="1"
-      name="roughness factor"
-      width="64"/>
+  <panel name="metallic_texture_pnl">
+    <text name="metallic_roughness_lbl">金属的な粗さ:</text>
+    <texture_picker name="metallic_roughness_texture" tool_tip="オプションのオクルージョンを備えたGLTFによる金属的粗さマップを指定します。赤のチャネルはオクルージョン、緑のチャネルは粗さ、青のチャネルは金属度です。" />
+    <text name="metallic_upload_fee">アップロード費用なし</text>
+    <text name="metallic_factor_lbl">金属的ファクター</text>
+    <spinner name="metalness factor" />
+    <text name="roughness_factor_lbl">
+      粗さファクター
+    </text>
+    <spinner name="roughness factor" />
   </panel>
-  <panel
-    border="true"
-    follows="left|top"
-    width="246"
-    height="175"
-    layout="topleft"
-    left="1"
-    mouse_opaque="false"
-    name="emissive_texture_pnl"
-    top_pad="5">
-    <text
-      type="string"
-      font.style="BOLD"
-      length="1"
-      follows="left|top"
-      height="10"
-      layout="topleft"
-      left="10"
-      top="5"
-      width="64"
-      name="emissive_lbl">
-      Emissive:
-    </text>
-    <texture_picker
-      can_apply_immediately="true"
-      default_image_name="Default"
-      fallback_image="materials_ui_x_24.png"
-      allow_no_texture="true"
-      follows="left|top"
-      top_pad="8"
-      height="151"
-      layout="topleft"
-      left="10"
-      name="emissive_texture"
-      width="128" />
-    <text
-      type="string"
-      font.style="BOLD"
-      length="1"
-      follows="left|top"
-      height="10"
-      width="128"
-      layout="topleft"
-      left="10"
-      top_pad="-17"
-      name="emissive_upload_fee">
-      No upload fee
-    </text>
-    <text
-      type="string"
-      length="1"
-      follows="left|top"
-      height="10"
-      layout="topleft"
-      left_pad="5"
-      top="8"
-      name="emissive_tint_lbl">
-      Tint
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     follows="left|top"
-     height="40"
-     label_height="0"
-     layout="topleft"
-     left_delta="0"
-     top_pad="5"
-     name="emissive color"
-     width="40" />
+  <panel name="emissive_texture_pnl">
+    <text name="emissive_lbl">放射性:</text>
+    <texture_picker name="emissive_texture" />
+    <text name="emissive_upload_fee">アップロード費用なし</text>
+    <text name="emissive_tint_lbl">色彩</text>
+    <color_swatch name="emissive color" />
   </panel>
-  <panel
-    border="true"
-    follows="left|top"
-    width="246"
-    height="175"
-    layout="topleft"
-    left="1"
-    mouse_opaque="false"
-    top_pad="5"
-    name="normal_texture_pnl">
-    <text
-      type="string"
-      font.style="BOLD"
-      length="1"
-      follows="left|top"
-      height="10"
-      layout="topleft"
-      left="10"
-      top="5"
-      width="64"
-      name="normal_lbl">
-      Normal:
-    </text>
-    <texture_picker
-      can_apply_immediately="true"
-      default_image_name="Default"
-      fallback_image="materials_ui_x_24.png"
-      allow_no_texture="true"
-      follows="left|top"
-      top_pad="8"
-      height="151"
-      layout="topleft"
-      left="10"
-      name="normal_texture"
-      width="128" />
-    <text
-      type="string"
-      font.style="BOLD"
-      length="1"
-      follows="left|top"
-      height="10"
-      width="128"
-      layout="topleft"
-      left="10"
-      top_pad="-17"
-      name="normal_upload_fee">
-      No upload fee
-    </text>
+  <panel name="normal_texture_pnl">
+    <text name="normal_lbl">普通のテスクチャ:</text>
+    <texture_picker name="normal_texture" />
+    <text name="normal_upload_fee">アップロード費用なし</text>
   </panel>
-</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_hint.xml b/indra/newview/skins/default/xui/ja/panel_hint.xml
deleted file mode 100644
index f7434f03307..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_hint.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- width="205"
- height="34">
-  <text name="hint_title"
-        font="SansSerifMedium" 
-        left="8"
-        right="180"
-        top="8"
-        bottom="20"
-        follows="left|right|top"
-        text_color="Black"
-        wrap="false"/>
-  <text name="hint_text"
-        left="8"
-        right="197"
-        top="26"
-        bottom="26"
-        follows="left|right|bottom" 
-        text_color="Black"
-        wrap="true"/>
-  <button right="197" 
-          top="8"
-          width="16" 
-          height="16"
-          name="close" 
-          follows="right|top" 
-          image_color="DkGray" 
-          image_unselected="Icon_Close_Foreground"
-          image_selected="Icon_Close_Press"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_hint_image.xml b/indra/newview/skins/default/xui/ja/panel_hint_image.xml
deleted file mode 100644
index df05d50dc52..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_hint_image.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- width="305"
- height="40"
- layout="topleft">
-  <text name="hint_title"
-        font="SansSerifMedium" 
-        left="8"
-        right="290"
-        top="8"
-        bottom="20"
-        follows="left|right|top"
-        text_color="Black"
-        wrap="false"/>
-  <layout_stack left="0"
-                top="25"
-                width="305"
-                height="0"
-                follows="left|top|right"
-                orientation="horizontal">
-    <layout_panel auto_resize="true" width="100"/>
-    <layout_panel auto_resize="true" width="0">
-      <icon name="hint_image"
-       top="0"
-       left="0"
-       height="0"
-       width="0"
-       follows="all"/>
-    </layout_panel>
-      <layout_panel auto_resize="true" width="100"/>
-    </layout_stack>
-  <text name="hint_text"
-        left="8"
-        right="297"
-        top="30"
-        bottom="30"
-        follows="left|right|bottom" 
-        text_color="Black"
-        wrap="true"/>
-  <button right="297" 
-          top="8"
-          width="16" 
-          height="16"
-          name="close" 
-          follows="right|top" 
-          image_color="DkGray" 
-          image_unselected="Icon_Close_Foreground"
-          image_selected="Icon_Close_Press"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_hud.xml b/indra/newview/skins/default/xui/ja/panel_hud.xml
deleted file mode 100644
index 3e9614a9b7d..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_hud.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="left|right|top|bottom"
- height="728"
- layout="topleft"
- left="0"
- mouse_opaque="false"
- name="hud"
- top="778"
- width="1024" />
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index a1af2cbf857..59578d0053c 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -1,28 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_login" focus_root="true">
-  <panel.string name="forgot_password_url">https://secondlife.com/my/account/request.php?lang=ja-JP</panel.string>
-  <panel.string name="sign_up_url">https://join.secondlife.com/?lang=ja</panel.string>
-  <layout_stack name="ui_stack">
-    <layout_panel name="ui_elastic_pad_left" />
-    <layout_panel name="ui_container">
-      <icon name="sl_logo_small" />
-      <combo_box label="Username" tool_tip="登録時に自分で選んだユーザー名(例:bobsmith12、Steller Sunshineなど)" name="username_combo">
-        <combo_box.combo_editor />
-      </combo_box>
-      <line_editor name="password_edit" label="パスワード" />
-      <combo_box label="お気に入りの場所" name="start_location_combo">
+<panel name="panel_login">
+  <!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
+  <web_browser name="login_html" start_url="" />
+  <layout_stack name="login_widgets">
+    <layout_panel name="login">
+      <text name="log_in_text">ログイン</text>
+      <text name="username_text">ユーザ名:</text>
+      <combo_box tool_tip="登録時に自分で選んだユーザー名(例:bobsmith12、Steller Sunshineなど)" name="username_combo" />
+      <text name="password_text">パスワード:</text>
+      <!-- STEAM-14: Turn off commit_on_focus_lost so if user presses Enter
+           with focus in this line_editor, we can use commit action to
+           initiate login -->
+      <line_editor name="password_edit" />
+    </layout_panel>
+    <layout_panel name="start_location_panel">
+      <text name="start_location_text">開始位置:</text>
+      <combo_box name="start_location_combo">
         <combo_box.combo_editor />
         <combo_box.item label="最後にいた場所" name="MyLastLocation" value="last" />
         <combo_box.item label="ホーム" name="MyHome" value="home" />
       </combo_box>
+    </layout_panel>
+    <layout_panel name="grid_panel">
+      <text name="grid_login_text">ログイン先のグリッド:</text>
+      <combo_box name="server_combo" />
+    </layout_panel>
+    <layout_panel name="links_login_panel">
+      <text name="sign_up_text">アカウントを作成</text>
+      <text name="forgot_password_text">ユーザ名かパスワードを忘れましたか?</text>
       <button label="ログイン" name="connect_btn" />
-      <text name="sign_up_text">サインアップ</text>
-      <check_box label="名前を記録" name="remember_name" tool_tip="すでに記憶されているユーザーは、「私」>「初期設定」>「詳細設定」>「記憶されたユーザー名」から削除できます。" />
-      <check_box label="パスワードを記録" name="remember_password" />
-      <combo_box label="Select grid" name="server_combo" />
-      <text name="forgot_password_text">パスワードに関するヘルプ</text>
+      <check_box label="ユーザ名を保存" name="remember_name" />
+      <check_box label="パスワードを保存" name="remember_password" />
     </layout_panel>
-    <layout_panel name="ui_elastic_pad_right" />
   </layout_stack>
-  <web_browser name="login_html" />
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_login_first.xml b/indra/newview/skins/default/xui/ja/panel_login_first.xml
deleted file mode 100644
index e878b2524a2..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_login_first.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_login">
-  <panel.string name="forgot_password_url">https://secondlife.com/my/account/request.php?lang=ja-JP</panel.string>
-  <panel.string name="sign_up_url">https://join.secondlife.com/?lang=ja</panel.string>
-  <layout_stack name="logo_stack">
-    <layout_panel name="page_top" />
-    <!-- start of logo stack -->
-    <layout_panel name="parent_panel">
-      <layout_stack name="logo_stack">
-        <layout_panel name="logo_left" />
-        <layout_panel name="logo_container">
-          <icon name="sl_logo" />
-        </layout_panel>
-        <layout_panel auto_resize="true" />
-      </layout_stack>
-    </layout_panel>
-    <!-- end of logo stack -->
-    <!-- start of widget stack -->
-    <layout_panel name="parent_panel2">
-      <layout_stack name="widget_stack">
-        <layout_panel name="widget_left" />
-        <layout_panel name="widget_container">
-          <combo_box label="ユーザ名" tool_tip="登録時に自分で選んだユーザー名(例:bobsmith12、Steller Sunshineなど)" name="username_combo">
-            <combo_box.combo_editor />
-            <combo_box.combo_button />
-            <combo_box.drop_down_button />
-          </combo_box>
-          <line_editor name="password_edit" label="パスワード" />
-          <button label="ログイン" name="connect_btn" />
-          <text name="sign_up_text" valign="center">サインアップ</text>
-          <check_box label="ユーザ名を記憶" name="remember_name" tool_tip="すでに記憶されているユーザーは、「私」>「初期設定」>「詳細設定」>「記憶されたユーザー名」から削除できます。" />
-          <check_box label="パスワード記憶" name="remember_password" />
-          <text name="forgot_password_text">
-            パスワードを忘れましたか?
-          </text>
-        </layout_panel>
-        <layout_panel name="widget_right" />
-      </layout_stack>
-    </layout_panel>
-    <!-- end of widget stack -->
-    <!-- start of images stack -->
-    <layout_panel name="parent_panel3">
-      <layout_stack name="images_stack">
-        <layout_panel name="images_left" />
-        <layout_panel name="images_container">
-          <icon name="image_left" />
-        </layout_panel>
-        <layout_panel name="images_right" />
-      </layout_stack>
-    </layout_panel>
-    <!-- end of images stack -->
-    <layout_panel name="page_bottom" />
-  </layout_stack>
-</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_music_ticker.xml b/indra/newview/skins/default/xui/ja/panel_music_ticker.xml
index 4c380ec932d..c81d4d5a3ee 100644
--- a/indra/newview/skins/default/xui/ja/panel_music_ticker.xml
+++ b/indra/newview/skins/default/xui/ja/panel_music_ticker.xml
@@ -1,113 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- layout="topleft"
- follows="top|right|left"
- width="300"
- height="38"
- name="music_ticker">
-    <string name="paused">
-        (not playing)
-    </string>
-    <string name="loading">
-        (loading...)
-    </string>
-    <icon
-     top="19"
-     color="AlAshGrey"
-     follows="left|top|right" 
-     height="1"
-     layout="topleft"
-     image_name="white.tga"
-     left="0"
-     mouse_opaque="false"
-     name="ticker_background"
-     width="244" />
-    <locate
-     top="0"
-     bottom="-1"
-     left="244"
-     name="visualizer_box"
-     width="60"
-     follows="top|right"
-     use_bounding_rect="true"
-     layout="topleft"/>
-    <icon
-     top="0"
-     bottom="-1"
-     color="AlAshGrey"
-     follows="top|right"
-     layout="topleft"
-     image_name="Ticker_Grid"
-     left="244"
-     mouse_opaque="false"
-     name="visualizer_grid"
-     width="60" />
-    <text
-     text_color="AlBlue"
-     bg_visible="false"
-     border_visible="false"
-     layout="topleft"
-     top="0"
-     follows="top|left"
-     font="SansSerifBold"
-     h_pad="0"
-     halign="left"
-     height="16"
-     left="4"
-     mouse_opaque="false"
-     name="artist_label"
-     v_pad="0"
-     width="50">
-        Artist:
-    </text>
-    <text
-     bg_visible="false" 
-     border_visible="false"
-     layout="topleft"
-     top="0" 
-     follows="top|left|right"
-     font="SansSerifBold" 
-     h_pad="0" 
-     halign="left" 
-     height="16" 
-     left="50"
-     mouse_opaque="false" 
-     name="artist_text" 
-     v_pad="0" 
-     width="193">
-    </text>
-    <text 
-     text_color="AlBlue" 
-     bg_visible="false"
-     border_visible="false" 
-     layout="topleft"
-     top="19" 
-     follows="top|left"
-     font="SansSerifBold"
-     h_pad="0" 
-     halign="left" 
-     height="16" 
-     left="4"
-     mouse_opaque="false"
-     name="title_label" 
-     v_pad="0" 
-     width="50">
-        Title:
-    </text>
-    <text 
-     bg_visible="false" 
-     border_visible="false" 
-     layout="topleft"
-     top="19"
-     follows="top|left|right"
-     font="SansSerifBold"
-     h_pad="0"
-     halign="left"
-     height="16"
-     left="50"
-     mouse_opaque="false"
-     name="title_text"
-     v_pad="0"
-     width="193">
-    </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel width="320" name="music_ticker">
+  <string name="paused">(何も再生されていません)</string>
+  <string name="loading">(読み込んでいます…)</string>
+  <icon name="ticker_background" width="284" />
+  <locate left="284" name="visualizer_box" width="60" />
+  <icon left="284" name="visualizer_grid" width="60" />
+  <text name="artist_label" width="85">アーティスト:</text>
+  <text left="85" name="artist_text" width="200" />
+  <text left="27" name="title_label" width="60">タイトル:</text>
+  <text left="85" name="title_text" width="200" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_pick_info.xml b/indra/newview/skins/default/xui/ja/panel_pick_info.xml
index 06ac5450355..c145bc4a9b0 100644
--- a/indra/newview/skins/default/xui/ja/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_pick_info.xml
@@ -1,190 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- follows="all"
- height="570"
- layout="topleft"
- left="0"
- min_height="350"
- name="panel_pick_info"
- help_topic="profile_pick_info"
- top="0"
- width="333">
-    <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     name="back_btn"
-     left="10"
-     tab_stop="false"
-     top="2"
-     width="30"
-     use_draw_context_alpha="false" />
-    <text
-     follows="top|left|right"
-     font="SansSerifHugeBold"
-     height="26"
-     layout="topleft"
-     left_pad="4"
-     name="title"
-     text_color="LtGray"
-     top="2"
-     value="Pick Info"
-     use_ellipses="true"
-     width="275" />
-    <scroll_container
-     color="PanelDefaultBackgroundColor"
-     opaque="true"
-     follows="all"
-     height="503"
-     layout="topleft"
-     left="8"
-     top_pad="10"
-     name="profile_scroll"
-     width="312">
-    <panel
-     name="scroll_content_panel"
-     follows="left|top|right"
-     min_height="300"
-     layout="topleft"
-     top="0"
-     background_visible="false"
-     height="400"
-     left="0"
-     width="285">
-        <texture_picker
-         fallback_image="default_land_picture.j2c"
-         enabled="false"
-         follows="left|top|right"
-         height="197"
-         layout="topleft"
-         left="11"
-         name="pick_snapshot"
-         top="10"
-         width="272" />
-        <text_editor
-         allow_scroll="false"
-         bg_visible="false"
-         follows="left|top|right"
-         h_pad="0"
-         height="35"
-         width="280"
-         layout="topleft"
-         font="SansSerifBig"
-         font.style="BOLD"
-         left="10"
-         top_pad="10"
-         name="pick_name"
-         read_only="true"
-         text_color="white"
-         v_pad="0"
-         value="[name]"
-         use_ellipses="true" />
-        <text_editor
-         allow_scroll="false"
-         bg_visible="false"
-         follows="left|top|right"
-         h_pad="0"
-         height="25"
-         layout="topleft"
-         left="10"
-         name="pick_location"
-         read_only="true"
-         width="280"
-         word_wrap="true"
-         v_pad="0"
-         value="[loading...]" />
-        <text_editor
-         bg_readonly_color="DkGray2"
-         follows="all"
-         height="100"
-         width="280"
-         parse_urls="true"	
-         layout="topleft"
-         left="10"
-         top_pad="2"
-         max_length="1023"
-         name="pick_desc"
-         read_only="true"
-         text_readonly_color="white"
-         value="[description]"
-         wrap="true" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_pick_info">
+  <button name="back_btn" />
+  <text name="title" value="ピック情報" />
+  <scroll_container name="profile_scroll">
+    <panel name="scroll_content_panel">
+      <texture_picker name="pick_snapshot" />
+      <text_editor name="pick_name" value="[name]" />
+      <text_editor name="pick_location" value="(読み込んでいます…)" />
+      <text_editor name="pick_desc" value="[description]" />
     </panel>
-    </scroll_container>
-    <panel
-     follows="left|right|bottom"
-     height="23"
-     layout="topleft"
-     top_pad="5"
-     left="8"
-     name="buttons">
-       
-       <layout_stack
-		  follows="bottom|left|right"
-		  height="23"
-		  layout="topleft"
-		  name="layout_stack1"
-		  left="0"
-		  orientation="horizontal"
-		  top_pad="0"
-		  width="312">
-		  
-		  <layout_panel
-			  follows="bottom|left|right"
-			  height="23"
-			  layout="bottomleft"
-			  left="0"
-			  name="layout_panel1"
-		      auto_resize="true"
-			  width="101">
-			  <button
-			  	 follows="bottom|left|right"
-		         height="23"
-		         label="Teleport"
-		         layout="topleft"
-		         name="teleport_btn"
-		         top="0"
-		         width="101" />
-		  </layout_panel>
-		  
-		  <layout_panel
-			  follows="bottom|left|right"
-			  height="23"
-			  layout="bottomleft"
-			  left_pad="3"
-			  name="show_on_map_btn_lp"
-		      auto_resize="true"
-			  width="100">
-			  <button
-		         follows="bottom|left|right"
-		         height="23"
-		         label="Map"
-		         layout="topleft"
-		         name="show_on_map_btn"
-		         top_pad="0"
-		         width="100" />
-		  </layout_panel>	  
-		  
-		  <layout_panel
-			  follows="bottom|left|right"
-			  height="23"
-			  layout="bottomleft"
-			  left_pad="3"
-			  name="edit_btn_lp"
-		      auto_resize="true"
-			  width="101">
-			  <button
-		         follows="bottom|left|right"
-		         height="23"
-		         label="Edit"
-		         layout="topleft"
-		         name="edit_btn"
-		         top_pad="0"
-		         width="101" />
-		  </layout_panel>
-	   </layout_stack>
-    </panel>
-</panel>
+  </scroll_container>
+  <panel name="buttons">
+    <layout_stack name="layout_stack1">
+      <layout_panel name="layout_panel1">
+        <button label="テレポート" name="teleport_btn" />
+      </layout_panel>
+
+      <layout_panel name="show_on_map_btn_lp">
+        <button label="マップ" name="show_on_map_btn" />
+      </layout_panel>
+
+      <layout_panel name="edit_btn_lp">
+        <button label="編集" name="edit_btn" />
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_pick_list_item.xml b/indra/newview/skins/default/xui/ja/panel_pick_list_item.xml
deleted file mode 100644
index 5dbca3d75a3..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_pick_list_item.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- bevel_style="none"
- follows="top|left|right"
- height="85"
- layout="topleft"
- left="0"
- name="picture_item"
- top="0"
- width="313">
-    <icon
-     follows="all"
-     height="85"
-     image_name="ListItem_Over"
-     right="-2"
-     mouse_opaque="false"
-     name="hovered_icon"
-     top="1"
-     scale_image="true"
-     visible="false"
-     width="308" />
-    <icon
-     follows="all"
-     height="85"
-     image_name="ListItem_Select"
-     right="-2"
-     mouse_opaque="false"
-     name="selected_icon"
-     top="1"
-     scale_image="true"
-     visible="false"
-     width="308" />
-    <texture_picker
-     allow_no_texture="true"
-     fallback_image="default_land_picture.j2c"
-     enabled="false"
-     follows="left|top"
-     height="80"
-     layout="topleft"
-     left="10"
-     mouse_opaque="false"
-     name="picture"
-     tab_stop="false"
-     top="10"
-     top_pad="10"
-     width="90" />
-    <text
-     follows="top|left|right"
-     font="SansSerifSmall"
-     height="15"
-     layout="topleft"
-     left="110"
-     name="picture_name"
-     parse_urls="false"
-     text_color="white"
-     top="9"
-     use_ellipses="true"
-     width="193" />
-    <expandable_text
-     follows="top|left|right"
-     font="SansSerifSmall"
-     height="55"
-     layout="topleft"
-     left="103"
-     name="picture_descr"
-     textbox.max_length="1024"
-     textbox.show_context_menu="false" 
-     top_pad="0"
-     width="178"
-     word_wrap="true" />
-         <button
-     follows="right"
-     height="20"
-     image_overlay="ForwardArrow_Off"
-     layout="topleft"
-     left_pad="5"
-     right="-8"
-     name="info_chevron"
-     top_delta="24"
-     width="20" />
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
index 888140630f0..3133270c0d3 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -16,6 +16,7 @@
     <radio_item label="別々のウィンドウ" name="1" />
   </radio_group>
   <check_box label="複数のビューアを許可" name="allow_multiple_viewer_check" />
+  <check_box label="ゲームモードを有効化" name="enable_game_mode_check" />
   <check_box label="ログイン時にグリッド選択を表示" name="show_grid_selection_check" />
   <check_box label="拡張メニューを表示" name="show_advanced_menu_check" />
   <check_box label="開発メニューを表示" name="show_develop_menu_check" />
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat_cmd.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat_cmd.xml
index bf7e3cfd4a4..0cc0dd16f6e 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat_cmd.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat_cmd.xml
@@ -1,305 +1,48 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-    height="408"
-    layout="topleft"
-    name="commands_settings"
-    top="0"
-    left="13"
-    width="517">
-    <check_box
-    top_pad="15"
-    follows="left|top"
-    height="16"
-    label="Enable chat bar commands"
-    left="5"
-    name="chat_cmd_toggle"
-    width="200"
-    control_name="AlchemyChatCommandEnable"/>
-    <!--dd-->
-    <text
-    top_pad="5"
-    left="8"
-    follows="left|top"
-    height="18"
-    name="AlchemyChatCommandDrawDistance_txt"
-    width="240">
-    Change Draw Dist (usage: cmd meters)
-    </text>
-    <line_editor
-    top_pad="0"
-    left_delta="0"
-    follows="left|top"
-    height="20"
-    max_length_chars="256"
-    text_pad_left="5"
-    name="AlchemyChatCommandDrawDistance"
-    control_name="AlchemyChatCommandDrawDistance"
-    enabled_control="AlchemyChatCommandEnable"
-    width="240"/>
-    <!--gth-->
-    <text
-    top_pad="5"
-    left_delta="0"
-    follows="left|top"
-    height="18"
-    name="AlchemyChatCommandHeight_txt"
-    width="240">
-    Teleport to height (0-8192)
-    </text>
-    <line_editor
-    top_pad="0"
-    follows="left|top"
-    height="20"
-    max_length_chars="256"
-    text_pad_left="5"
-    name="AlchemyChatCommandHeight"
-    control_name="AlchemyChatCommandHeight"
-    enabled_control="AlchemyChatCommandEnable"
-    width="240"/>
-    <!--flr-->
-    <text
-    top_pad="5"
-    follows="left|top"
-    height="18"
-    name="AlchemyChatCommandGround_txt"
-    width="240">
-    Teleport to ground
-    </text>
-    <line_editor
-    top_pad="0"
-    follows="left|top"
-    height="20"
-    max_length_chars="256"
-    text_pad_left="5"
-    name="AlchemyChatCommandGround"
-    control_name="AlchemyChatCommandGround"
-    enabled_control="AlchemyChatCommandEnable"
-    width="240"/>
-    <!--pos-->
-    <text
-    top_pad="5"
-    follows="left|top"
-    height="18"
-    name="AlchemyChatCommandPos_txt"
-    width="240">
-    Teleport to position (usage: cmd x y z)
-    </text>
-    <line_editor
-    top_pad="0"
-    follows="left|top"
-    height="20"
-    max_length_chars="256"
-    text_pad_left="5"
-    name="AlchemyChatCommandPos"
-    control_name="AlchemyChatCommandPos"
-    enabled_control="AlchemyChatCommandEnable"
-    width="240"/>
-    <!--mapto-->
-    <text
-    top_pad="5"
-    follows="left|top"
-    height="18"
-    name="AlchemyChatCommandMapto_txt"
-    width="240">
-    Teleport to region
-    </text>
-    <line_editor
-    top_pad="0"
-    follows="left|top"
-    height="20"
-    max_length_chars="256"
-    text_pad_left="5"
-    name="AlchemyChatCommandMapto"
-    control_name="AlchemyChatCommandMapto"
-    enabled_control="AlchemyChatCommandEnable"
-    width="240"/>
-    <!--clr-->
-    <text
-    top_pad="5"
-    follows="left|top"
-    height="18"
-    name="AlchemyChatCommandClearNearby_txt"
-    width="240">
-    Clear contents of nearby chat
-    </text>
-    <line_editor
-    top_pad="0"
-    follows="left|top"
-    height="20"
-    max_length_chars="256"
-    text_pad_left="5"
-    name="AlchemyChatCommandClearNearby"
-    control_name="AlchemyChatCommandClearNearby"
-    enabled_control="AlchemyChatCommandEnable"
-    width="240"/>
-    <!--Hover-->
-    <text
-        top_pad="5"
-        follows="left|top"
-        height="18"
-        name="hover_txt"
-        width="240">
-        Hover Height
-    </text>
-    <line_editor
-        top_pad="0"
-        follows="left|top"
-        height="20"
-        max_length_chars="256"
-        text_pad_left="5"
-        name="AlchemyChatCommandHoverHeight"
-        control_name="AlchemyChatCommandHoverHeight"
-        enabled_control="AlchemyChatCommandEnable"
-        width="240"/>
-    <!--AO-->
-    <text
-        top_pad="5"
-        follows="left|top"
-        height="18"
-        name="ao_txt"
-        width="240">
-        Animation Override
-    </text>
-    <line_editor
-        top_pad="0"
-        follows="left|top"
-        height="20"
-        max_length_chars="256"
-        text_pad_left="5"
-        name="AlchemyChatCommandAnimationOverride"
-        control_name="AlchemyChatCommandAnimationOverride"
-        enabled_control="AlchemyChatCommandEnable"
-        width="240"/>
-    <!--home-->
-    <text
-        top="-25"
-        follows="left|top"
-        left_delta="255"
-        height="18"
-        name="AlchemyChatCommandHome_txt"
-        width="240">
-        Teleport Home
-    </text>
-    <line_editor
-        top_pad="0"
-        follows="left|top"
-        height="20"
-        max_length_chars="256"
-        text_pad_left="5"
-        name="AlchemyChatCommandHome"
-        control_name="AlchemyChatCommandHome"
-        enabled_control="AlchemyChatCommandEnable"
-        width="240"/>
-    <!--sethome-->
-    <text
-        top_pad="5"
-        follows="left|top"
-        height="18"
-        name="AlchemyChatCommandSetHome_txt"
-        width="240">
-        Set Home Location
-    </text>
-    <line_editor
-        top_pad="0"
-        follows="left|top"
-        height="20"
-        max_length_chars="256"
-        text_pad_left="5"
-        name="AlchemyChatCommandSetHome"
-        control_name="AlchemyChatCommandSetHome"
-        enabled_control="AlchemyChatCommandEnable"
-        width="240"/>
-    <!--tp2cam-->
-    <text
-        top_pad="5"
-        follows="left|top"
-        height="18"
-        name="AlchemyChatCommandTeleportToCam_txt"
-        width="240">
-        Teleport to Cam
-    </text>
-    <line_editor
-        top_pad="0"
-        follows="left|top"
-        height="20"
-        max_length_chars="256"
-        text_pad_left="5"
-        name="AlchemyChatCommandTeleportToCam"
-        control_name="AlchemyChatCommandTeleportToCam"
-        enabled_control="AlchemyChatCommandEnable"
-        width="240"/>
-        <!--Calculatooor-->
-    <text
-        top_pad="5"
-        follows="left|top"
-        height="18"
-        name="calc_txt"
-        width="240">
-        Calculator
-    </text>
-    <line_editor
-        top_pad="0"
-        follows="left|top"
-        height="20"
-        max_length_chars="256"
-        text_pad_left="5"
-        name="AlchemyChatCommandCalc"
-        control_name="AlchemyChatCommandCalc"
-        enabled_control="AlchemyChatCommandEnable"
-        width="240"/>
-    <!--Resync Anims-->
-    <text
-        top_pad="5"
-        follows="left|top"
-        height="18"
-        name="calc_txt"
-        width="240">
-        Resync Animations
-    </text>
-    <line_editor
-        top_pad="0"
-        follows="left|top"
-        height="20"
-        max_length_chars="256"
-        text_pad_left="5"
-        name="AlchemyChatCommandResyncAnim"
-        control_name="AlchemyChatCommandResyncAnim"
-        enabled_control="AlchemyChatCommandEnable"
-        width="240"/>
-    <!--rezplat-->
-    <text
-        top_pad="5"
-        follows="left|top"
-        height="18"
-        name="AlchemyChatCommandRezPlat_txt"
-        width="240">
-        Rez a platform (usage: cmd size)
-    </text>
-    <line_editor
-        top_pad="0"
-        follows="left|top"
-        height="20"
-        max_length_chars="256"
-        text_pad_left="5"
-        name="AlchemyChatCommandRezPlat"
-        control_name="AlchemyChatCommandRezPlat"
-        enabled_control="AlchemyChatCommandEnable"
-        width="240"/>
-    <slider
-        can_edit_text="true"
-        top_pad="5"
-        name="AlchemyChatCommandRezPlatSize"
-        control_name="AlchemyChatCommandRezPlatSize"
-        enabled_control="AlchemyChatCommandEnable"
-        decimal_digits="0"
-        follows="left|top"
-        height="18"
-        increment="1"
-        label="Width"
-        label_width="35"
-        max_val="64"
-        min_val="1"
-        show_text="true"
-        width="240"
-        tool_tip="Default size of rezzed platform when size is not provided with command"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="commands_settings">
+  <check_box label="チャットバーコマンドを有効化" name="chat_cmd_toggle" />
+  <!--dd-->
+  <text name="AlchemyChatCommandDrawDistance_txt">描画距離を変更(使用方法:cmd meters)</text>
+  <line_editor name="AlchemyChatCommandDrawDistance" />
+  <!--gth-->
+  <text name="AlchemyChatCommandHeight_txt">テレポートする高さ(0~8192)</text>
+  <line_editor name="AlchemyChatCommandHeight" />
+  <!--flr-->
+  <text name="AlchemyChatCommandGround_txt">地面にテレポート</text>
+  <line_editor name="AlchemyChatCommandGround" />
+  <!--pos-->
+  <text name="AlchemyChatCommandPos_txt">座標にテレポート(使用方法:cmd x y z)</text>
+  <line_editor name="AlchemyChatCommandPos" />
+  <!--mapto-->
+  <text name="AlchemyChatCommandMapto_txt">リージョンにテレポート</text>
+  <line_editor name="AlchemyChatCommandMapto" />
+  <!--clr-->
+  <text name="AlchemyChatCommandClearNearby_txt">近隣チャットのコンテンツをクリア</text>
+  <line_editor name="AlchemyChatCommandClearNearby" />
+  <!--Hover-->
+  <text name="hover_txt" width="240">ホバー高さ</text>
+  <line_editor name="AlchemyChatCommandHoverHeight" />
+  <!--AO-->
+  <text name="ao_txt">アニメーションオーバーライド</text>
+  <line_editor name="AlchemyChatCommandAnimationOverride" />
+  <!--home-->
+  <text name="AlchemyChatCommandHome_txt">ホームにテレポート</text>
+  <line_editor name="AlchemyChatCommandHome" />
+  <!--sethome-->
+  <text name="AlchemyChatCommandSetHome_txt">現在地をホームにする</text>
+  <line_editor name="AlchemyChatCommandSetHome" />
+  <!--tp2cam-->
+  <text name="AlchemyChatCommandTeleportToCam_txt">カメラの位置にテレポート</text>
+  <line_editor name="AlchemyChatCommandTeleportToCam" />
+  <!--Calculatooor-->
+  <text name="calc_txt">計算機</text>
+  <line_editor name="AlchemyChatCommandCalc" />
+  <!--Resync
+  Anims-->
+  <text name="calc_txt">アニメーションを再同期</text>
+  <line_editor name="AlchemyChatCommandResyncAnim" />
+  <!--rezplat-->
+  <text name="AlchemyChatCommandRezPlat_txt">プラットフォームにRez(使用法:cmd size)</text>
+  <line_editor name="AlchemyChatCommandRezPlat" />
+  <slider name="AlchemyChatCommandRezPlatSize" label="幅" tool_tip="コマンドでサイズが指定されていない場合のRezされたプラットフォームのデフォルトのサイズを指定します。" />
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat_general.xml
index b2a4d27ded3..18d2eb80520 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat_general.xml
@@ -1,614 +1,111 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-    border="false"
-    height="408"
-    label="Text Chat"
-    layout="topleft"
-    left="102"
-    name="chat"
-    top="1"
-    width="517">
-  <panel
-      border="false"
-      height="60"
-      layout="topleft"
-      follows="left|top"
-      name="general_chat_settings" 
-      top="10"
-      left="13"
-      width="517">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="テキストチャット" name="chat">
+  <panel name="general_chat_settings">
 
-    <check_box
-        control_name="ChatAutocompleteGestures"
-        height="16"
-        initial_value="true"
-        label="Auto-complete gestures in nearby chat"
-        layout="topleft"
-        top="0"
-        name="auto_complete_gestures"
-        width="330">
-    </check_box>
+    <check_box label="近隣チャットでゼスチャーをオートコンプリート" name="auto_complete_gestures" />
 
-    <check_box
-        control_name="PlayTypingAnim"
-        height="16"
-        initial_value="true"
-        label="Play typing animation when chatting"
-        layout="topleft"
-        top_pad="4"
-        name="play_typing_animation"
-        width="330">
-    </check_box>
-    <check_box
-        enabled="false"
-        height="16"
-        label="Email me IMs when I'm offline ([EMAIL])"
-        layout="topleft"
-        name="send_im_to_email"
-        top_pad="4"
-        width="330">
-    </check_box>
-		<text
-		 font="SansSerifSmall"
-		 follows="left|top"
-		 height="18"
-		 layout="topleft"
-		 left_delta="5"
-		 length="1"
-		 name="email_settings"
-		 skip_link_underline="true"
-		 top_delta="0"
-		 type="string"
-		 width="400">
-		 [https://accounts.secondlife.com/change_email Open email notification settings for offline IMs]
-		</text>
+    <check_box label="チャット時にタイピングアニメーションを再生" name="play_typing_animation" />
+    <check_box label="オフライン時にIMが送られてきたときにメールを送る([EMAIL])" name="send_im_to_email" />
+    <text name="email_settings">[https://accounts.secondlife.com/change_email?lang=ja オフライン時のIMのメール送信先の設定]</text>
 
-    <text
-        layout="topleft"
-        left="345"
-        height="12"
-        name="font_size"
-        width="120"
-        top="0">
-      Font size:
-    </text>
+    <text name="font_size">フォントサイズ:</text>
 
-    <combo_box
-        control_name="ChatFontSize"
-        height="23"
-        layout="topleft"
-        left="341"
-        name="chat_font_size"
-        top_pad="5"
-        width="100">
-      <item
-          label="Monospace"
-          name="Monospace"
-          value="-1"/>
-      <item
-          label="Small"
-          name="Small"
-          value="0"/>
-      <item
-          label="Medium"
-          name="Medium"
-          value="1"/>
-      <item
-          label="Large"
-          name="Large"
-          value="2"/>
-      <item
-          label="Huge"
-          name="Huge"
-          value="3"/>
+    <combo_box name="chat_font_size">
+      <item label="等幅" name="Monospace" value="-1" />
+      <item label="小" name="Small" value="0" />
+      <item label="中" name="Medium" value="1" />
+      <item label="大" name="Large" value="2" />
+      <item label="特大" name="Huge" value="3" />
     </combo_box>
-
-    <check_box
-        control_name="UseChatBubbles"
-        height="16"
-        label="Bubble Chat"
-        layout="topleft"
-        top_pad="4"
-        left_delta="0"
-        name="bubble_text_chat"
-        width="330">
-    </check_box>
-      
+    <check_box label="吹き出しチャット" name="bubble_text_chat" />
   </panel>
 
-  <panel
-      border="false"
-      height="165"
-      layout="topleft"
-      follows="left|top"
-      name="im_notification_settings" 	
-      left="13"
-      width="517">
-
-    <text
-        layout="topleft"
-        height="12"
-        name="friend_ims"
-        width="145"
-        left="0"
-        top_pad="13">
-      Friend IMs:
-    </text>
-    <combo_box
-        control_name="NotificationFriendIMOptions"
-        height="23"
-        layout="topleft"
-        left_pad="5"
-        top_delta="-6"
-        name="FriendIMOptions"
-        width="223">
-      <item
-          label="Open Conversations window"
-          name="OpenConversationsWindow"
-          value="openconversations"/>      
-      <item
-          label="Pop up the message"
-          name="PopUpMessage"
-          value="toast"/>
-      <item
-          label="Flash toolbar button"
-          name="FlashToolbarButton"
-          value="flash"/>
-      <item
-          label="No action"
-          name="NoAction"
-          value="noaction"/>
+  <panel name="im_notification_settings">
+    <text name="friend_ims">フレンドのIM:</text>
+    <combo_box control_name="NotificationFriendIMOptions" name="FriendIMOptions">
+      <item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ" name="PopUpMessage" value="toast" />
+      <item label="ツールバーのボタンをフラッシュ" name="FlashToolbarButton" value="flash" />
+      <item label="アクションなし" name="NoAction" value="noaction" />
     </combo_box>
-    <check_box
-        control_name="PlaySoundFriendIM"
-        height="23"
-        label="Play sound"
-        layout="topleft"
-        name="play_sound_friend_im"
-        left_pad="7"
-        top_delta="-3"
-        width="28">
+    <check_box label="サウンド再生" name="play_sound_friend_im">
     </check_box>
-    <text
-        layout="topleft"
-        height="12"
-        name="non_friend_ims"
-        width="145"
-        left="0"
-        top_pad="11">
-      Non-friend IMs:
-    </text>
-    <combo_box
-        control_name="NotificationNonFriendIMOptions"
-        height="23"
-        layout="topleft"
-        left_pad="5"
-        top_delta="-6"
-        name="NonFriendIMOptions"
-        width="223">
-      <item
-          label="Open Conversations window"
-          name="OpenConversationsWindow"
-          value="openconversations"/>
-      <item
-          label="Pop up the message"
-          name="PopUpMessage"
-          value="toast"/>
-      <item
-          label="Flash toolbar button"
-          name="FlashToolbarButton"
-          value="flash"/>
-      <item
-          label="No action"
-          name="NoAction"
-          value="noaction"/>
+    <text name="non_friend_ims">フレンドでない人からのIM:</text>
+    <combo_box name="NonFriendIMOptions">
+      <item label="会話フィン道を開く" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ" name="PopUpMessage" value="toast" />
+      <item label="ツールバーのボタンをフラッシュ" name="FlashToolbarButton" value="flash" />
+      <item label="アクションなし" name="NoAction" value="noaction" />
     </combo_box>
-    <check_box
-        control_name="PlaySoundNonFriendIM"
-        height="23"
-        label="Play sound"
-        layout="topleft"
-        name="play_sound_non_friend_im"
-        left_pad="7"
-        top_delta="-3"
-        width="28">
-    </check_box>
-    <text
-        layout="topleft"
-        left="0"
-        height="13"
-        name="conference_ims"
-        width="145"
-        top_pad="11">
-      Conference IMs:
-    </text>
-    <combo_box
-        control_name="NotificationConferenceIMOptions"
-        height="23"
-        layout="topleft"
-        left_pad="5"
-        top_delta="-6"
-        name="ConferenceIMOptions"
-        width="223">
-      <item
-          label="Open Conversations window"
-          name="OpenConversationsWindow"
-          value="openconversations"/>
-      <item
-          label="Pop up the message"
-          name="PopUpMessage"
-          value="toast"/>
-      <item
-          label="Flash toolbar button"
-          name="FlashToolbarButton"
-          value="flash"/>
-      <item
-          label="No action"
-          name="NoAction"
-          value="noaction"/>
+    <check_box label="サウンド再生" name="play_sound_non_friend_im" />
+    <text name="conference_ims">会話IM:</text>
+    <combo_box name="ConferenceIMOptions">
+      <item label="会話フィン道を開く" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ" name="PopUpMessage" value="toast" />
+      <item label="ツールバーのボタンをフラッシュ" name="FlashToolbarButton" value="flash" />
+      <item label="アクションなし" name="NoAction" value="noaction" />
     </combo_box>
-    <check_box
-        control_name="PlaySoundConferenceIM"
-        height="23"
-        label="Play sound"
-        layout="topleft"
-        name="play_sound_conference_im"
-        left_pad="7"
-        top_delta="-3"
-        width="28">
-    </check_box>
-    <text
-        layout="topleft"
-        left="0"
-        height="13"
-        name="group_chat"
-        width="145"
-        top_pad="11">
-      Group chat:
-    </text>
-    <combo_box
-        control_name="NotificationGroupChatOptions"
-        height="23"
-        layout="topleft"
-        left_pad="5"
-        top_delta="-6"
-        name="GroupChatOptions"
-        width="223">
-      <item
-          label="Open Conversations window"
-          name="OpenConversationsWindow"
-          value="openconversations"/>
-      <item
-          label="Pop up the message"
-          name="PopUpMessage"
-          value="toast"/>
-      <item
-          label="Flash toolbar button"
-          name="FlashToolbarButton"
-          value="flash"/>
-      <item
-          label="No action"
-          name="NoAction"
-          value="noaction"/>
+    <check_box label="サウンド再生" name="play_sound_conference_im" />
+    <text name="group_chat">グループチャット:</text>
+    <combo_box name="GroupChatOptions">
+      <item label="会話フィン道を開く" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ" name="PopUpMessage" value="toast" />
+      <item label="ツールバーのボタンをフラッシュ" name="FlashToolbarButton" value="flash" />
+      <item label="アクションなし" name="NoAction" value="noaction" />
     </combo_box>
-    <check_box
-        control_name="PlaySoundGroupChatIM"
-        height="23"
-        label="Play sound"
-        layout="topleft"
-        name="play_sound_group_chat_im"
-        left_pad="7"
-        top_delta="-3"
-        width="28">
-    </check_box>
-    <text
-        layout="topleft"
-        left="0"
-        height="12"
-        name="nearby_chat"
-        width="145"
-        top_pad="11">
-      Nearby chat:
-    </text>
-    <combo_box
-        control_name="NotificationNearbyChatOptions"
-        height="23"
-        layout="topleft"
-        left_pad="5"
-        top_delta="-6"
-        name="NearbyChatOptions"
-        width="223">
-      <item
-          label="Open Conversations window"
-          name="OpenConversationsWindow"
-          value="openconversations"/>
-      <item
-          label="Pop up the message"
-          name="PopUpMessage"
-          value="toast"/>
-      <item
-          label="Flash toolbar button"
-          name="FlashToolBarButton"
-          value="flash"/>
-      <item
-          label="No action"
-          name="NoAction"
-          value="noaction"/>
+    <check_box label="サウンド再生" name="play_sound_group_chat_im" />
+    <text name="nearby_chat">近隣チャット:</text>
+    <combo_box name="NearbyChatOptions">
+      <item label="会話フィン道を開く" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ" name="PopUpMessage" value="toast" />
+      <item label="ツールバーのボタンをフラッシュ" name="FlashToolbarButton" value="flash" />
+      <item label="アクションなし" name="NoAction" value="noaction" />
     </combo_box>
-    <check_box
-        control_name="PlaySoundNearbyChatIM"
-        height="23"
-        label="Play sound"
-        layout="topleft"
-        name="play_sound_nearby_chat_im"
-        left_pad="7"
-        top_delta="-3"
-        width="28">
+    <check_box label="サウンド再生" name="play_sound_nearby_chat_im">
     </check_box>
-    <text
-        layout="topleft"
-        left="0"
-        height="12"
-        name="object_ims"
-        width="145"
-        top_pad="11">
-      Object IMs:
-    </text>
-    <combo_box
-        control_name="NotificationObjectIMOptions"
-        height="23"
-        layout="topleft"
-        left_pad="5"
-        top_delta="-6"
-        name="ObjectIMOptions"
-        width="223">
-      <item
-          label="Open Conversations window"
-          name="OpenConversationsWindow"
-          value="openconversations"/>
-      <item
-          label="Pop up the message"
-          name="PopUpMessage"
-          value="toast"/>
-      <item
-          label="Flash toolbar button"
-          name="FlashToolBarButton"
-          value="flash"/>
-      <item
-          label="No action"
-          name="NoAction"
-          value="noaction"/>
+    <text name="object_ims">オブジェクトのIM:</text>
+    <combo_box name="ObjectIMOptions">
+      <item label="会話フィン道を開く" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ" name="PopUpMessage" value="toast" />
+      <item label="ツールバーのボタンをフラッシュ" name="FlashToolbarButton" value="flash" />
+      <item label="アクションなし" name="NoAction" value="noaction" />
     </combo_box>
-    <check_box
-        control_name="PlaySoundObjectIM"
-        height="23"
-        label="Play sound"
-        layout="topleft"
-        name="play_sound_object_im"
-        left_pad="7"
-        top_delta="-3"
-        width="28">
-    </check_box>
-    <text
-        layout="topleft"
-        left="0"
-        height="13"
-        name="notifications_alert"
-        width="500"
-        top_pad="9"
-        visible="true"
-        text_color="DrYellow">
-      To temporarily stop all notifications, use Communicate &gt; Do Not Disturb.
-    </text>
-
+    <check_box label="サウンド再生" name="play_sound_object_im" />
+    <text name="notifications_alert">すべての通知を一時的に停止するには、「コミュニケーション」>「着信拒否」を選択します。</text>
   </panel>
 
-  <panel
-      border="false"
-      height="50"
-      layout="topleft"
-      follows="left|top"
-      name="play_sound_settings"  	
-      left="13"
-      top_pad="10"
-      width="517">
+  <panel name="play_sound_settings">
 
-    <text
-        layout="topleft"
-        left="0"
-        name="play_sound"
-        width="100"
-        top_pad="8"
-        visible="true">
-      Play sound:
-    </text>
-    <check_box
-        control_name="PlaySoundNewConversation"
-        height="16"
-        label="New conversation"
-        layout="topleft"
-        left_pad="15"
-        top_pad="-10"
-        name="new_conversation"
-        width="150" />
-    <check_box
-        control_name="PlaySoundIncomingVoiceCall"
-        height="16"
-        label="Incoming voice call"
-        layout="topleft"
-        top_pad="6"
-        name="incoming_voice_call"
-        width="150" />
-    <check_box
-        control_name="PlaySoundTeleportOffer"
-        height="16"
-        label="Teleport offer"
-        layout="topleft"
-        left_pad="35"
-        top_pad="-38"
-        name="teleport_offer"
-        width="150" />
-    <check_box
-        control_name="PlaySoundInventoryOffer"
-        height="16"
-        label="Inventory offer"
-        layout="topleft"
-        top_pad="6"
-        name="inventory_offer"
-        width="150" />
-    <view_border
-        bevel_style="none"
-        height="0"
-        layout="topleft"
-        left="0"
-        name="cost_text_border"
-        top_pad="7"
-        width="492"/>
+    <text name="play_sound">再生するサウンド:</text>
+    <check_box label="新しい会話" name="new_conversation" />
+    <check_box label="音声通話の着信" name="incoming_voice_call" />
+    <check_box label="テレポートのオファー" name="teleport_offer" />
+    <check_box label="インベントリのオファー" name="inventory_offer" />
+    <view_border name="cost_text_border" />
   </panel>
 
-  <panel
-      height="50"
-      layout="topleft"
-      follows="left|top"
-      name="log_settings" 	
-      left="13"
-      top_pad="10"
-      width="505">
+  <panel name="log_settings">
 
-    <text
-        name="logging_label"
-        layout="topleft"
-        left="0"
-        text_color="White"
-        height="12"
-        top="5"
-        width="55">
-        Save:
-    </text>
+    <text name="logging_label">保存:</text>
 
-    <combo_box
-        enabled="false"
-        control_name="KeepConversationLogTranscripts"
-        height="23"
-        layout="topleft"
-        left_pad="5"
-        name="conversation_log_combo"
-        top="0"
-        width="165">
-        <item
-            name="log_and_transcripts"
-            label="Log and transcripts"
-            value="2"/>
-        <item
-            name="log_only"
-            label="Log only"
-            value="1"/>
-        <item
-            name="no_log_or_transcript"
-            label="No log or transcripts"
-            value="0"/>
+    <combo_box name="conversation_log_combo">
+      <item label="ログとテキストチャット" name="log_and_transcripts" value="2" />
+      <item label="ログのみ" name="log_only" value="1" />
+      <item label="ログかテキストチャットなし" name="no_log_or_transcript" value="0" />
     </combo_box>
 
-    <button
-        enabled="false"
-        height="23"
-        label="Clear log..."
-        layout="topleft"
-        left_pad="5"
-        top="0"
-        name="clear_log"
-        width="110">
-        <commit_callback
-            function="Pref.ClearLog" />
-    </button>
-  
-    <button
-        enabled="false"
-        height="23"
-        label="Delete transcripts..."
-        layout="topleft"
-        left_pad="5"
-        top="0"
-        name="delete_transcripts"
-        width="147">
-        <button.commit_callback
-            function="Pref.DeleteTranscripts" />
-    </button>
-  
-    <text
-        name="log_location_label"
-        layout="topleft"
-        left="0"
-        text_color="White"
-        height="12"
-        top_pad="15"
-        width="55">
-        Location:
-    </text>
-  
-    <line_editor
-        control_name="InstantMessageLogPath"
-        border_style="line"
-        border_thickness="1"
-        font="SansSerif"
-        height="23"
-        layout="topleft"
-        left_pad="55"
-        max_length_bytes="4096"
-        name="log_path_string"
-        top_delta="-5"
-        width="185">
-    </line_editor>
-  
-    <button
-        enabled="false"
-        follows="left|top"
-        height="23"
-        label="Browse..."
-        label_selected="Browse"
-        layout="topleft"
-        left_pad="5"
-        name="log_path_button"
-        top_delta="0"
-        width="112">
-      <commit_callback function="Pref.LogPath" />
-    </button>
+    <button label="ログをクリア…" name="clear_log" />
+
+    <button label="テキストチャットを削除…" name="delete_transcripts" />
+
+    <text name="log_location_label">場所:</text>
+
+    <line_editor name="log_path_string" />
 
+    <button label="ブラウズ…" label_selected="ブラウズ" name="log_path_button" />
   </panel>
-  
-  <button
-      height="23"
-      label="Translation..."
-      layout="topleft"
-      follows="left|top"
-      left="9"
-      name="ok_btn"
-      top="-29"
-      width="170">
-    <commit_callback
-        function="Pref.TranslationSettings" />
-  </button>
-  <button
-      height="23"
-      layout="topleft"
-      follows="left|top"
-      top_pad="-23"
-      left_pad="5"
-      name="autoreplace_showgui"
-      commit_callback.function="Pref.AutoReplace"
-      label="Auto-Replace..."
-      width="150">
-  </button>
-  <button
-      height="23"
-      layout="topleft"
-      follows="left|top"
-      top_pad="-23"
-      left_pad="5"
-      name="spellcheck_showgui"
-      commit_callback.function="Pref.SpellChecker"
-      label="Spell Checking..."
-      width="150">
-  </button>
 
-</panel>
+  <button label="翻訳…" name="ok_btn" />
+  <button name="autoreplace_showgui" label="自動置換…" />
+  <button name="spellcheck_showgui" label="スペルチェック…." />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_interface.xml b/indra/newview/skins/default/xui/ja/panel_preferences_interface.xml
index 536fac97545..ee3464683ce 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_interface.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_interface.xml
@@ -1,235 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="true"
- follows="left|top|right|bottom"
- height="408"
- label="Interface"
- layout="topleft"
- left="102"
- name="Interface panel"
- top="1"
- width="517">
-  <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="30"
-     name="Network:"
-     mouse_opaque="false"
-     top="10"
-     width="300">
-    Floating Text:
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="10"
-   layout="topleft"
-   left="50"
-   name="Maximum bandwidth"
-   mouse_opaque="false"
-   top_pad="10"
-   width="200">
-    Fade Distance
-  </text>
-  <slider
-   can_edit_text="true"
-   control_name="AlchemyHudTextFadeDistance"
-   decimal_digits="2"
-   follows="left|top"
-   height="15"
-   increment="0.05"
-   initial_value="4.0"
-   layout="topleft"
-   left_delta="150"
-   max_val="128"
-   min_val="1"
-   name="text_draw_distance"
-   top_delta="0"
-   width="180" />
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="10"
-   layout="topleft"
-   left_pad="6"
-   mouse_opaque="false"
-   name="text_box2"
-   top_delta="1"
-   width="200">
-    m
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="10"
-   layout="topleft"
-   left="50"
-   name="Maximum bandwidth"
-   mouse_opaque="false"
-   top_pad="10"
-   width="200">
-    Fade Range
-  </text>
-  <slider
-   can_edit_text="true"
-   control_name="AlchemyHudTextFadeRange"
-   decimal_digits="2"
-   follows="left|top"
-   height="15"
-   increment="0.05"
-   initial_value="8.0"
-   layout="topleft"
-   left_delta="150"
-   max_val="64"
-   min_val="1"
-   name="text_draw_distance"
-   top_delta="0"
-   width="180" />
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="10"
-   layout="topleft"
-   left_pad="6"
-   mouse_opaque="false"
-   name="text_box2"
-   top_delta="1"
-   width="200">
-    m
-  </text>
-  <check_box
-    control_name="AlchemyCinematicModeHideHoverText"
-    height="16"
-    initial_value="true"
-    label="Hide in Cinematic Mode"
-    layout="topleft"
-    left="45"
-    name="HideHoverTextInCinematicMode"
-    top_pad="7"
-    width="256">
-    <check_box.commit_callback
-      function="Pref.RenderOptionUpdate" />
-  </check_box>
-  <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="30"
-     name="InventoryText"
-     mouse_opaque="false"
-     top_pad="7"
-     width="300">
-    Inventory:
-  </text>
-  <check_box
-    control_name="DoubleClickAttachmentAdd"
-    height="16"
-    initial_value="true"
-    label="Double-click to add Attachments"
-    layout="topleft"
-    left="45"
-    name="DoubleClickAttachmentAddCheck"
-    top_pad="7"
-    width="256"/>
-  <check_box
-    control_name="DoubleClickWearableAdd"
-    height="16"
-    initial_value="true"
-    label="Double-click to add Wearables"
-    layout="topleft"
-    left="45"
-    name="DoubleClickWearableAddCheck"
-    top_pad="4"
-    width="256"/>
-  <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="30"
-     name="SecurityText"
-     mouse_opaque="false"
-     top_pad="5"
-     width="300">
-    Security:
-  </text>
-      <check_box
-       follows="left|top"
-       height="16"
-       label="Block left-click sitting on Objects"
-       left="45"
-       top_pad="7"
-       name="AlchemyDisableClickToSit"
-       width="275"
-       control_name="AlchemyDisableClickToSit"/>
-      <check_box
-       follows="left|top"
-       height="16"
-       label="Allow scripts to show map UI (llMapDestination)"
-       left="45"
-       top_pad="4"
-       name="ScriptsCanShowUI"
-       width="275"
-       control_name="ScriptsCanShowUI"/>
-      <text
-       type="string"
-       length="1"
-       follows="left|top"
-       height="16"
-       layout="topleft"
-       left="49"
-       name="inworld_typing_rg_label"
-       top_pad="5"
-       width="300"
-       value="Revoke object permissions when:" />
-      <radio_group
-       control_name="AlchemyRevokeObjectPerms"
-       height="20"
-       layout="topleft"
-       name="revoke_perms_radio"
-       width="340">
-        <radio_item
-         top_pad="0"
-         left_delta="15"
-         height="16"
-         label="Never"
-         layout="topleft"
-         name="None"
-         value="0"
-         width="90" />
-        <radio_item
-         left_pad="1"
-         height="16"
-         label="Sitting"
-         layout="topleft"
-         name="Sitting"
-         value="1"
-         width="90" />
-        <radio_item
-         left_pad="1"
-         height="16"
-         label="Standing"
-         layout="topleft"
-         name="Standing"
-         value="2"
-         width="90" />
-        <radio_item
-         left_pad="1"
-         height="16"
-         label="Both"
-         layout="topleft"
-         name="Both"
-         value="3"
-         width="90" />
-    </radio_group>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="インターフェース" name="Interface panel">
+  <text name="Network:">フローティングテキスト:</text>
+  <text name="Maximum bandwidth">フェード距離</text>
+  <slider name="text_draw_distance" />
+  <text name="text_box2">m</text>
+  <text name="Maximum bandwidth">フェード範囲</text>
+  <slider name="text_draw_distance" />
+  <text name="text_box2">m</text>
+  <check_box label="シネマティックモードでは隠す" name="HideHoverTextInCinematicMode" />
+  <text name="InventoryText">インベントリ:</text>
+  <check_box label="ダブルクリックで装着物を追加" name="DoubleClickAttachmentAddCheck" />
+  <check_box label="ダブルクリックで衣装を追加" name="DoubleClickWearableAddCheck" />
+  <text name="SecurityText">セキュリティ:</text>
+  <check_box label="左クリックでオブジェクトに座るのをブロック" name="AlchemyDisableClickToSit" />
+  <check_box label="マップのUIを開いたときにスクリプト実行を許可(llMapDestination関数)" name="ScriptsCanShowUI" />
+  <text name="inworld_typing_rg_label" value="以下の場合、オブジェクトの権限を取り消す:" />
+  <radio_group name="revoke_perms_radio">
+    <radio_item label="しない" name="None" value="0" />
+    <radio_item label="座る時" name="Sitting" value="1" />
+    <radio_item label="立つ時" name="Standing" value="2" />
+    <radio_item label="両方" name="Both" />
+  </radio_group>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move_general.xml
index 3d775e3a42d..21ff242f83b 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_move_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_move_general.xml
@@ -1,238 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="true"
- follows="left|top|right|bottom"
- height="435"
- label="Move"
- layout="topleft"
- left="102"
- name="move_panel"
- top="1"
- width="517">
-  <icon
-     follows="left|top"
-     height="18"
-     image_name="Cam_FreeCam_Off"
-     layout="topleft"
-     name="camera_icon"
-     mouse_opaque="false"
-     visible="true"
-     width="18"
-     left="30"
-     top="10"/>
-  <slider
-   can_edit_text="true"
-   control_name="CameraAngle"
-   decimal_digits="2"
-   follows="left|top"
-   height="16"
-   increment="0.025"
-   initial_value="1.57"
-   layout="topleft"
-   label_width="100"
-   label="View angle"
-   left_pad="30"
-   max_val="2.97"
-   min_val="0.17"
-   name="camera_fov"
-   show_text="false"
-   width="240" />
-  <slider
-   can_edit_text="true"
-   control_name="CameraOffsetScale"
-   decimal_digits="2"
-   follows="left|top"
-   height="16"
-   increment="0.025"
-   initial_value="1"
-   layout="topleft"
-   label="Distance"
-   left_delta="0"
-   label_width="100"
-   max_val="3"
-   min_val="0.5"
-   name="camera_offset_scale"
-   show_text="false"
-   width="240"
-   top_pad="5"/>
-  <text
-  follows="left|top"
-  type="string"
-  length="1"
-  height="10"
-  left="80"
-  name="heading2"
-  width="270"
-  top_pad="5">
-    Automatic position for:
-  </text>
-  <check_box
-     control_name="EditCameraMovement"
-     height="20"
-     follows="left|top"
-     label="Build/Edit"
-     layout="topleft"
-     left_delta="30"
-     name="edit_camera_movement"
-     tool_tip="Use automatic camera positioning when entering and exiting edit mode"
-     width="280"
-     top_pad="5" />
-  <check_box
-   control_name="AppearanceCameraMovement"
-   follows="left|top"
-   height="16"
-   label="Appearance"
-   layout="topleft"
-   name="appearance_camera_movement"
-   tool_tip="Use automatic camera positioning while in edit mode"
-   width="242" />
-  <icon
-	 follows="left|top"
-	 height="18"
-	 image_name="Move_Walk_Off"
-   layout="topleft"
-	 name="avatar_icon"
-	 mouse_opaque="false"
-	 visible="true"
-	 width="18"
-   top_pad="10"
-   left="30" />
-  <text
-   follows="left|top"
-   type="string"
-   length="1"
-   height="10"
-   layout="topleft"
-   left="78"
-   name="keyboard_lbl"
-   width="270"
-   top_delta="2">
-    Keyboard:
-  </text>
-  <check_box
-   control_name="ArrowKeysAlwaysMove"
-   follows="left|top"
-   height="20"
-   label="Arrow keys always move me"
-   layout="topleft"
-   left_delta="5"
-   name="arrow_keys_move_avatar_check"
-   width="237"
-   top_pad="5"/>
-  <check_box
-   control_name="AlchemyMotionResetsCamera"
-   follows="left|top"
-   height="20"
-   label="Moving resets the camera position"
-   layout="topleft"
-   left_delta="0"
-   name="motion_reset_camera_check"
-   width="237"
-   top_pad="0"/>
-  <check_box
-   control_name="AllowTapTapHoldRun"
-   follows="left|top"
-   height="20"
-   label="Tap-tap-hold to run"
-   layout="topleft"
-   left_delta="0"
-   name="tap_tap_hold_to_run"
-   width="237"
-   top_pad="0"/>
-  <check_box
-   control_name="AutomaticFly"
-   follows="left|top"
-   height="20"
-   label="Hold jump or crouch key to start or stop flying"
-   layout="topleft"
-   left_delta="0"
-   name="automatic_fly"
-   width="237"
-   top_pad="0"/>
-  <check_box
-   control_name="AlchemyMoonWalk"
-   follows="left|top"
-   height="20"
-   label="Enable Moon Walk"
-   tool_tip="Disables turning around when walking backwards. This is only visible to you"
-   layout="topleft"
-   left_delta="0"
-   name="moon_walk"
-   width="237"
-   top_pad="0"/>
-  <text
-   follows="left|top"
-   type="string"
-   length="1"
-   height="10"
-   layout="topleft"
-   left="86"
-   name="single_click_action_lbl"
-   width="150"
-   top_pad="20">
-    Single click on land:
-  </text>
-  <combo_box
-   height="23"
-   layout="topleft"
-   left_pad="10"
-   top_delta="-6"
-   name="single_click_action_combo"
-   width="200">
-    <combo_box.item
-     label="No action"
-     name="0"
-     value="0"/>
-    <combo_box.item
-     label="Move to clicked point"
-     name="1"
-     value="1"/>
-    <combo_box.commit_callback
-     function="Pref.ClickActionChange"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="移動" name="move_panel">
+  <icon name="camera_icon" />
+  <slider label="表示角" name="camera_fov" />
+  <slider label="距離" name="camera_offset_scale" />
+  <text name="heading2">Automatic position for:</text>
+  <check_box label="制作/編集" name="edit_camera_movement" tool_tip="編集モードの開始時と終了時に自動カメラ位置を使用する。" />
+  <check_box label="外観" name="appearance_camera_movement" tool_tip="編集モードで自動カメラ位置調整を使用する。" />
+  <icon name="avatar_icon" />
+  <text name="keyboard_lbl">キーボード:</text>
+  <check_box label="Arrow keys always move me" name="arrow_keys_move_avatar_check" />
+  <check_box label="方向キー押下時は、常に移動するようにする" name="arrow_keys_move_avatar_check" />
+  <check_box label="移動キー2度押し+長押しで走る" name="tap_tap_hold_to_run" />
+  <check_box label="ジャンプまたはしゃがみキーを押し続けると、飛行を開始または停止します。" name="automatic_fly" />
+  <check_box label="Enable Moon Walk" tool_tip="Disables turning around when walking backwards. This is only visible to you" name="moon_walk" />
+  <text name="single_click_action_lbl">土地をシングルクリック:</text>
+  <combo_box name="single_click_action_combo">
+    <combo_box.item label="動作なし" name="0" value="0" />
+    <combo_box.item label="クリックされた地点に移動" name="1" value="1" />
   </combo_box>
-  <text
-   follows="left|top"
-   type="string"
-   length="1"
-   height="10"
-   layout="topleft"
-   left="86"
-   name="double_click_action_lbl"
-   width="150"
-   top_pad="12">
-    Double click on land:
-  </text>
-  <combo_box
-   height="23"
-   layout="topleft"
-   left_pad="10"
-   top_delta="-6"
-   name="double_click_action_combo"
-   width="200">
-    <combo_box.item
-     label="No action"
-     name="0"
-     value="0"/>
-    <combo_box.item
-     label="Move to clicked point"
-     name="1"
-     value="1"/>
-    <combo_box.item
-     label="Teleport to clicked point"
-     name="2"
-     value="2"/>
-    <combo_box.commit_callback
-     function="Pref.ClickActionChange"/>
+  <text name="double_click_action_lbl">土地をダブルクリック:</text>
+  <combo_box name="double_click_action_combo">
+    <combo_box.item label="動作なし" name="0" value="0" />
+    <combo_box.item label="クリックされた地点に移動" name="1" value="1" />
+    <combo_box.item label="クリックされた地点にテレポート" name="2" value="2" />
   </combo_box>
-  <button
-   height="23"
-   label="Other Devices"
-   left="30"
-   name="joystick_setup_button"
-   top="30"
-   width="155">
-    <button.commit_callback
-     function="Floater.Show"
-     parameter="pref_joystick" />
-  </button>
-</panel>
+  <button label="その他のデバイス" name="joystick_setup_button" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move_mlook.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move_mlook.xml
index d0c9b47e668..29e92c99633 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_move_mlook.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_move_mlook.xml
@@ -1,153 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="true"
- follows="left|top|right|bottom"
- height="435"
- label="Move"
- layout="topleft"
- left="102"
- name="move_panel"
- top="1"
- width="517">
-  <text
-   follows="left|top"
-   type="string"
-   length="1"
-   height="10"
-   layout="topleft"
-   left="78"
-   name="mouse_lbl"
-   width="270"
-   top_pad="15">
-    Mouse:
-  </text>
-  <check_box
-   control_name="FirstPersonAvatarVisible"
-   follows="left|top"
-   height="20"
-   label="Show me in Mouselook"
-   layout="topleft"
-   left_delta="5"
-   name="first_person_avatar_visible"
-   top_pad="5"
-   width="256" />
-  <check_box
-   control_name="AlchemyRealisticMouselook"
-   follows="left|top"
-   height="16"
-   label="Realistic mouselook"
-   layout="topleft"
-   left_delta="0"
-   name="AlchemyRealisticMouselook"
-   tool_tip="Make the camera follow avatar body movements and animations while in mouselook"
-   top_pad="5"
-   width="256" />
-  <check_box
-   control_name="AlchemyDisableMouseSteering"
-   follows="left|top"
-   height="20"
-   label="Disable mouse steering"
-   layout="topleft"
-   left_delta="0"
-   name="disable_mouse_steering"
-   tool_tip="Mouse steering resets your camera and avatar position to face away from the camera when you click your avatar."
-   top_pad="0"
-   width="256" />
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="15"
-   layout="topleft"
-   left_delta="3"
-   name=" Mouse Sensitivity"
-   top_pad="10"
-   width="160"
-   wrap="true">
-    Mouselook mouse sensitivity:
-  </text>
-  <slider
-   control_name="MouseSensitivity"
-   follows="left|top"
-   height="15"
-   initial_value="2"
-   layout="topleft"
-   show_text="false"
-   left_pad="0"
-   max_val="15"
-   name="mouse_sensitivity"
-   top_delta="-1"
-   width="115" />
-  <check_box
-   control_name="InvertMouse"
-   height="16"
-   label="Invert"
-   layout="topleft"
-   left_pad="2"
-   name="invert_mouse"
-   top_delta="0"
-   width="128" />
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="15"
-   layout="topleft"
-   left="75"
-   name="Combat Features"
-   top_pad="10"
-   width="160"
-   wrap="true">
-    Combat Features:
-  </text>
-  <check_box
-   control_name="AlchemyMouselookIFF"
-   follows="left|top"
-   height="20"
-   label="Show User In Crosshairs"
-   layout="topleft"
-   left_delta="5"
-   name="alchemy_mlook_iff"
-   tool_tip="Shows user's name and distance in mouselook's crosshairs."
-   top_pad="0"
-   width="256" />
-  <check_box
-   control_name="AlchemyMouselookIFFMarkers"
-   follows="left|top"
-   height="20"
-   label="Show arrows for offscreen users"
-   layout="topleft"
-   left_delta="0"
-   name="alchemy_mlook_iff_markers"
-   tool_tip="Shows arrows on the sides of the screen for users not currently visible."
-   top_pad="0"
-   width="256" />
-  <slider
-   control_name="AlchemyMouselookIFFRange"
-   follows="left|top"
-   height="15"
-   layout="topleft"
-   show_text="false"
-   left_pad="-70"
-   max_val="512"
-   min_val="16"
-   increment="16"
-   name="iff_range_slider"
-   top_delta="3"
-   width="115" />
-  <spinner
-   top_pad="-18"
-   height="20"
-   label=""
-   label_width="0"
-   left="385"
-   decimal_digits="0"
-   follows="top|right"
-   layout="topleft"
-   max_val="512"
-   min_val="16"
-   width="50"
-   increment="16"
-   name="iff_range_spinner"
-   control_name="AlchemyMouselookIFFRange"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="移動" name="move_panel">
+  <text name="mouse_lbl">マウス:</text>
+  <check_box label="マウスルック時に自分の体を表示" name="first_person_avatar_visible" />
+  <check_box label="リアルなマウスルック" name="AlchemyRealisticMouselook" tool_tip="マウスルック時にアバターの体の動きとアニメーションがカメラに反映されるされようにします。" />
+  <check_box label="マウスステアリングを無効化" name="disable_mouse_steering" tool_tip="アバターをクリックしたときに、カメラとアバターの位置がカメラから離れるようにリセットされるのを抑制します。" />
+  <text name=" Mouse Sensitivity">マウスルック時のマウスの敏感度:</text>
+  <slider name="mouse_sensitivity" />
+  <check_box name="invert_mouse" />
+  <text name="Combat Features">戦闘時の機能:</text>
+  <check_box label="照準にユーザーを表示する" name="alchemy_mlook_iff" tool_tip="マウスルック時の照準にユーザーの名前と距離を表示します。" />
+  <check_box label="画面外のユーザーに矢印を表示" name="alchemy_mlook_iff_markers" tool_tip="画面外のユーザーのいる方角の画面端に矢印を表示します。" />
+  <slider name="iff_range_slider" />
+  <spinner label="" name="iff_range_spinner" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
index d5aeeb81b35..acbbeee1345 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット設定" name="im">
+
   <panel.string name="log_in_to_change">ログインして変更</panel.string>
+
+  <text name="privacy_text">プライバシー</text>
+  <check_box label="ターゲットへの選択ビームを他から表示されないようにする" name="privatepointat" tool_tip="オブジェクトを触ったり編集したときに表示される選択ビームを表示しないようにします。" />
+  <check_box label="編集時の渦巻き効果を表示しないようにする" name="privatepointat" tool_tip="オブジェクトを編集するときに、渦巻き状のパーティクルが表示されないようにします。" />
+  <check_box label="スナップショット撮影時のアニメーションとサウンドを再生しない" name="quiet_snapshots" />
   <button label="履歴を消去" name="clear_cache" tool_tip="ログイン画像、最後にいた場所、テレポート履歴、Web、テクスチャキャッシュを削除します" />
   <text name="cache_size_label_l">(位置、画像、Web、検索履歴)</text>
   <check_box label="プロフィールを検索結果に表示する" name="online_searchresults" />
@@ -13,8 +19,13 @@
   <check_box label="IMログをコンピューターに保存する" name="log_instant_messages" />
   <check_box label="チャットログでラインごとに時間を入れる" name="show_timestamps_check_im" />
   <check_box label="ログファイル名に日付を入れる。" name="logfile_name_datestamp" />
+  <text name="mylookat">自分の視線:</text>
+  <check_box label="自分の視線を他に知らせない" name="privatelookat" tool_tip="カメラのフォーカスポイントが他の人に表示されないようにする。" />
+  <check_box label="アバターの頭からの視線の距離を制限する" name="privatelookat" tool_tip="目や頭の動きなどの外観上の変化は許可しますが、設定された距離を超えると特定のものを指しません。"/>
+  <slider label="最大距離" />
   <text name="log_path_desc">ログの保存場所:</text>
   <button label="参照" label_selected="参照" name="log_path_button" />
   <button label="ブロックリスト" name="block_list" />
+  <button label="履歴をクリア" tool_tip="検索とテレポートの履歴、Web およびテクスチャのキャッシュをクリアします。" name="clear_cache"/>
   <text name="block_list_label">(あなたがブロックした住人/オブジェクト)</text>
 </panel>
\ No newline at end of file
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 2d9a01d2d72..5b6814cca19 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -48,6 +48,6 @@
   <check_box label="喋るときにアバターの口を動かす" name="enable_lip_sync" />
   <check_box label="ボイスチャットをトグルモードにする" name="push_to_talk_toggle_check" tool_tip="トグルモードでは、トリガーキーを押すことでマイクのオン/オフを切り替えます。そうでない場合は、トリガーキーを押している間だけマイクがオンになります。" />
   <check_box name="gesture_audio_play_btn" tool_tip="ジェスチャーからのサウンドを聞くにはこれを選択" label="ゼスチャーのサウンドを再生" />
-  <button label=入出力機器の設定" name="device_settings_btn" />
+  <button label="入出力機器の設定" name="device_settings_btn" />
   <panel name="device_settings_panel" />
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_legacy_firstlife.xml b/indra/newview/skins/default/xui/ja/panel_profile_legacy_firstlife.xml
index 88654c8540e..6a013e7e684 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_legacy_firstlife.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_legacy_firstlife.xml
@@ -1,43 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- label="First Life"
- height="360"
- width="304"
- name="avatar_firstlife_tab">
-  <panel
-   name="avatar_info_top"
-   follows="top|left|right"
-   top="0"
-   left="0"
-   height="129"
-   width="304"
-   layout="topleft">
-    <texture_picker
-     default_image_name="Generic_Person_Large"
-     fallback_image="Generic_Person_Large"
-     follows="left|top"
-     height="143"
-     label=""
-     layout="topleft"
-     left="5"
-     name="fl_profile_pic"
-     no_commit_on_selection="true"
-     tool_tip="Click to choose a picture"
-     top="6"
-     width="120" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="ファーストライフ" name="avatar_firstlife_tab">
+  <panel name="avatar_info_top">
+    <texture_picker label="" name="fl_profile_pic" tool_tip="クリックして画像を選択" />
   </panel>
-  <text_editor
-   type="string"
-   follows="all"
-   left="3"
-   height="200"
-   layout="topleft"
-   max_length="253"
-   name="fl_about"
-   top="134"
-   right="-4"
-   bg_readonly_color="DkGray2"
-   text_readonly_color="White"
-   commit_on_focus_lost="true"
-   word_wrap="true" />
-</panel>
+  <text_editor name="fl_about" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_legacy_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_profile_legacy_group_list_item.xml
deleted file mode 100644
index ed0b4a8825e..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_profile_legacy_group_list_item.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- bevel_style="none"
- follows="top|left|right"
- height="85"
- layout="topleft"
- left="0"
- name="panel_group_item"
- top="0"
- width="313">
-  <icon
-   follows="all"
-   height="85"
-   image_name="ListItem_Over"
-   right="-2"
-   mouse_opaque="false"
-   name="hovered_icon"
-   top="1"
-   scale_image="true"
-   visible="false"
-   width="308"/>
-  <icon
-   follows="all"
-   height="85"
-   image_name="ListItem_Select"
-   right="-2"
-   mouse_opaque="false"
-   name="selected_icon"
-   top="1"
-   scale_image="true"
-   visible="false"
-   width="308"/>
-  <texture_picker
-   allow_no_texture="true"
-   fallback_image="Generic_Group_Large"
-   enabled="false"
-   follows="left|top"
-   height="80"
-   layout="topleft"
-   left="10"
-   mouse_opaque="false"
-   name="picture"
-   tab_stop="false"
-   top="10"
-   top_pad="10"
-   width="90" />
-  <text
-   follows="top|left|right"
-   font="SansSerifSmall"
-   height="15"
-   layout="topleft"
-   left="110"
-   name="name"
-   text_color="white"
-   top="9"
-   use_ellipses="true"
-   width="193"
-   word_wrap="false" />
-  <expandable_text
-   follows="top|left|right"
-   font="SansSerifSmall"
-   height="55"
-   layout="topleft"
-   left="103"
-   name="description"
-   textbox.max_length="1024"
-   textbox.show_context_menu="false"
-   textbox.word_wrap="true"
-   top_pad="0"
-   width="178" />
-  <button
-   follows="right"
-   height="20"
-   image_overlay="ForwardArrow_Off"
-   layout="topleft"
-   left_pad="5"
-   right="-8"
-   name="info_chevron"
-   top_delta="24"
-   width="20" />
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_legacy_groups.xml b/indra/newview/skins/default/xui/ja/panel_profile_legacy_groups.xml
index b09eaa02455..93ee38ac11a 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_legacy_groups.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_legacy_groups.xml
@@ -1,36 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- bg_opaque_color="PanelDefaultBackgroundColor"
- background_visible="true"
- background_opaque="true"
- follows="all"
- height="360"
- label="Groups"
- layout="topleft"
- left="0"
- name="panel_profile_groups"
- top_pad="0"
- width="304">
- <text
-  type="string"
-  follows="all"
-  height="35"
-  layout="topleft"
-  left="6"
-  right="-6"
-  name="groups_panel_text"
-  wrap="true"
-  top="10">
- No Groups
- </text>
- <flat_list_view
-  color="PanelDefaultBackgroundColor"
-  follows="all"
-  layout="topleft"
-  left="0"
-  right="-1"
-  name="groups_detail_list"
-  opaque="true"
-  top="0"
-  height="360" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_profile_groups">
+  <text name="groups_panel_text">グループなし</text>
+  <flat_list_view name="groups_detail_list" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_legacy_interests.xml b/indra/newview/skins/default/xui/ja/panel_profile_legacy_interests.xml
index a99e004b599..02f281b8ba4 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_legacy_interests.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_legacy_interests.xml
@@ -1,254 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- label="Interests"
- height="360"
- width="304"
- name="avatar_interests_tab">
-  <text
-   font="SansSerifSmall"
-   text_color="White_50"
-   width="190"
-   follows="top|left|right"
-   layout="topleft"
-   mouse_opaque="false"
-   type="string"
-   height="16"
-   length="1"
-   left="3"
-   name="i_want_label"
-   top="2">
-   I want to:
-  </text>
-  <check_box
-   height="16"
-   initial_value="false"
-   label="Build"
-   layout="topleft"
-   top_pad="4"
-   left="25"
-   name="wanna_build"
-   width="140">
-    <check_box.commit_callback
-     function="Profile.CommitInterest" />
-  </check_box>
-  <check_box
-   height="16"
-   initial_value="false"
-   label="Explore"
-   layout="topleft"
-   top_delta="0"
-   left_pad="4"
-   name="wanna_explore"
-   width="140">
-    <check_box.commit_callback
-     function="Profile.CommitInterest" />
-  </check_box>
-  <check_box
-   height="16"
-   initial_value="false"
-   label="Meet"
-   layout="topleft"
-   top_pad="4"
-   left="25"
-   name="wanna_yiff"
-   width="140">
-    <check_box.commit_callback
-     function="Profile.CommitInterest" />
-  </check_box>
-  <check_box
-   height="16"
-   initial_value="false"
-   label="Be Hired"
-   layout="topleft"
-   top_delta="0"
-   left_pad="4"
-   name="wanna_work"
-   width="140">
-    <check_box.commit_callback
-     function="Profile.CommitInterest" />
-  </check_box>
-  <check_box
-   height="16"
-   initial_value="false"
-   label="Group"
-   layout="topleft"
-   top_pad="4"
-   left="25"
-   name="wanna_group"
-   width="140">
-    <check_box.commit_callback
-     function="Profile.CommitInterest" />
-  </check_box>
-  <check_box
-   height="16"
-   initial_value="false"
-   label="Buy"
-   layout="topleft"
-   top_delta="0"
-   left_pad="4"
-   name="wanna_buy"
-   width="140">
-    <check_box.commit_callback
-     function="Profile.CommitInterest" />
-  </check_box>
-  <check_box
-   height="16"
-   initial_value="false"
-   label="Sell"
-   layout="topleft"
-   top_pad="4"
-   left="25"
-   name="wanna_sell"
-   width="140">
-    <check_box.commit_callback
-     function="Profile.CommitInterest" />
-  </check_box>
-  <check_box
-   height="16"
-   initial_value="false"
-   label="Hire"
-   layout="topleft"
-   top_delta="0"
-   left_pad="4"
-   name="wanna_hire"
-   width="140">
-    <check_box.commit_callback
-     function="Profile.CommitInterest" />
-  </check_box>
-  <line_editor
-   top_pad="4"
-   follows="left|top|right"
-   height="20"
-   left="25"
-   text_pad_left="5"
-   name="wanna_something"
-   right="-40">
-    <line_editor.commit_callback
-     function="Profile.CommitInterest" />
-  </line_editor>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="関心" name="avatar_interests_tab">
+  <text name="i_want_label">欲しい物:</text>
+  <check_box name="wanna_build" />
 
-  <text
-   font="SansSerifSmall"
-   text_color="White_50"
-   width="190"
-   follows="top|left|right"
-   layout="topleft"
-   mouse_opaque="false"
-   type="string"
-   height="16"
-   length="1"
-   left="3"
-   name="skills_label"
-   top_pad="8">
-   Skills:
-  </text>
-  <check_box
-   height="16"
-   initial_value="false"
-   label="Textures"
-   layout="topleft"
-   top_pad="4"
-   left="25"
-   name="can_texture"
-   width="140">
-    <check_box.commit_callback
-     function="Profile.CommitInterest" />
-  </check_box>
-  <check_box
-   height="16"
-   initial_value="false"
-   label="Architecture"
-   layout="topleft"
-   top_delta="0"
-   left_pad="4"
-   name="can_architect"
-   width="140">
-    <check_box.commit_callback
-     function="Profile.CommitInterest" />
-  </check_box>
-  <check_box
-   height="16"
-   initial_value="false"
-   label="Modeling"
-   layout="topleft"
-   top_pad="4"
-   left="25"
-   name="can_model"
-   width="140">
-    <check_box.commit_callback
-     function="Profile.CommitInterest" />
-  </check_box>
-  <check_box
-   height="16"
-   initial_value="false"
-   label="Event Planning"
-   layout="topleft"
-   top_delta="0"
-   left_pad="4"
-   name="can_event"
-   width="140">
-    <check_box.commit_callback
-     function="Profile.CommitInterest" />
-  </check_box>
-  <check_box
-   height="16"
-   initial_value="false"
-   label="Scripting"
-   layout="topleft"
-   top_pad="4"
-   left="25"
-   name="can_script"
-   width="140">
-    <check_box.commit_callback
-     function="Profile.CommitInterest" />
-  </check_box>
-  <check_box
-   height="16"
-   initial_value="false"
-   label="Custom Characters"
-   layout="topleft"
-   top_delta="0"
-   left_pad="4"
-   name="can_characters"
-   width="140">
-    <check_box.commit_callback
-     function="Profile.CommitInterest" />
-  </check_box>
-  <line_editor
-   top_pad="4"
-   follows="left|top|right"
-   height="20"
-   left="25"
-   text_pad_left="5"
-   name="can_something"
-   right="-40">
-    <line_editor.commit_callback
-     function="Profile.CommitInterest" />
-  </line_editor>
-  <text
-   top_pad="8"
-   font="SansSerifSmall"
-   text_color="White_50"
-   width="190"
-   follows="top|left|right"
-   layout="topleft"
-   mouse_opaque="false"
-   type="string"
-   height="16"
-   length="1"
-   left="3"
-   name="language_label" >
-   Languages:
-  </text>
-  <line_editor
-   top_pad="4"
-   follows="left|top|right"
-   height="20"
-   left="25"
-   text_pad_left="5"
-   name="languages"
-   right="-40">
-    <line_editor.commit_callback
-     function="Profile.CommitInterest" />
-  </line_editor>
-</panel>
+  <check_box label="探検" name="wanna_explore" />
+
+  <check_box label="出会い" name="wanna_yiff" />
+  <check_box label="求職" name="wanna_work" />
+  <check_box label="グループ" name="wanna_group" />
+  <check_box label="買う" name="wanna_buy" />
+
+  <check_box label="売る" name="wanna_sell" />
+  <check_box label="雇用" name="wanna_hire" />
+  <line_editor name="wanna_something" right="-40" />
+
+
+  <text name="skills_label">スキル:</text>
+  <check_box label="テスクチャ" name="can_texture" />
+  <check_box label="建築" name="can_architect" />
+  <check_box label="モデリング" name="can_model" />
+  <check_box label="イベント企画" name="can_event" />
+  <check_box label="スクリプティング" name="can_script" />
+
+  <check_box label="カスタムキャラクター" name="can_characters" />
+  <line_editor name="can_something" />
+
+  <text name="language_label">言語:</text>
+  <line_editor name="languages" />
+
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_legacy_notes.xml b/indra/newview/skins/default/xui/ja/panel_profile_legacy_notes.xml
index 55b80437ec0..3e64594be05 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_legacy_notes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_legacy_notes.xml
@@ -1,36 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- label="Notes"
- height="360"
- width="304"
- name="avatar_notes_tab">
-  <text
-   font="SansSerifSmall"
-   text_color="White_50"
-   width="190"
-   follows="top|left|right"
-   layout="topleft"
-   mouse_opaque="false"
-   type="string"
-   height="16"
-   length="1"
-   left="3"
-   name="notes_label"
-   top="2">
-   Private notes:
-  </text>
-  <text_editor
-   type="string"
-   follows="all"
-   left="3"
-   height="320"
-   layout="topleft"
-   max_length="1022"
-   name="notes"
-   top_pad="4"
-   right="-4"
-   bg_readonly_color="DkGray2"
-   text_readonly_color="White"
-   commit_on_focus_lost="true"
-   word_wrap="true" />
+<panel label="ノート" name="avatar_notes_tab">
+  <text name="notes_label">プライベートノート:</text>
+  <text_editor name="notes" />
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_legacy_picks.xml b/indra/newview/skins/default/xui/ja/panel_profile_legacy_picks.xml
index 3cd7d825d78..b6d07677510 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_legacy_picks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_legacy_picks.xml
@@ -1,150 +1,25 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- bg_opaque_color="PanelDefaultBackgroundColor"
- background_visible="true"
- background_opaque="true"
- follows="all"
- height="360"
- label="Picks"
- layout="topleft"
- left="0"
- name="panel_profile_picks"
- top="0"
- width="304">
- <text
-  type="string"
-  follows="all"
-  height="35"
-  layout="topleft"
-  left="6"
-  right="-6"
-  name="picks_panel_text"
-  wrap="true"
-  top="10">
- No Picks
- </text>
- <accordion
-  fit_parent="true" 
-  follows="all"
-  height="332"
-  layout="topleft"
-  left="0"
-  right="-1"
-  name="accordion"
-  top="0"
-  single_expansion="true">
-   <accordion_tab
-    layout="topleft"
-    height="101"
-    min_height="150"
-    name="tab_picks"
-    title="Picks"
-    visible="true">
-     <flat_list_view
-      color="PanelDefaultBackgroundColor"
-      follows="all"
-      layout="topleft"
-      left="0"
-      name="picks_list"
-      opaque="true"
-      top="0"
-      width="313" />
-   </accordion_tab>
-   <accordion_tab
-    layout="topleft"
-    height="101"
-    name="tab_classifieds"
-    title="Classifieds"
-    visible="true">
-     <flat_list_view
-      color="PanelDefaultBackgroundColor"
-      follows="all"
-      layout="topleft"
-      left="0"
-      name="classifieds_list"
-      opaque="true"
-      top="0"
-      width="313" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="ピック" name="panel_profile_picks">
+  <text name="picks_panel_text">ピックなし</text>
+  <accordion name="accordion">
+    <accordion_tab name="tab_picks" title="ピック">
+      <flat_list_view name="picks_list" />
+    </accordion_tab>
+    <accordion_tab name="tab_classifieds" title="クラシファイド広告">
+      <flat_list_view name="classifieds_list" />
     </accordion_tab>
   </accordion>
-  <panel
-   bg_opaque_color="PanelDefaultBackgroundColor"
-   background_visible="true"
-   background_opaque="true"
-   follows="bottom|left|right"
-   layout="topleft"
-   left="0"
-   height="30"
-   name="buttons_cucks"
-   top_pad="0"
-   width="304">
-    <layout_stack
-     follows="bottom|left|right"
-     height="28"
-     layout="topleft"
-     left="2"
-     name="buttons_cucks_ls"
-     orientation="horizontal"
-     top="0"
-     width="304">
-		  <layout_panel
-       follows="bottom|left|right"
-       height="28"
-       layout="topleft"
-       left="0"
-       name="info_btn_lp"
-       auto_resize="true"
-       top="0"
-       width="95">
-        <button
-         enabled="false"
-         follows="top|left|right"
-         height="23"
-         label="Info"
-         layout="topleft"
-         name="info_btn"
-         tab_stop="false"
-         tool_tip="Show pick information"
-         width="95" />
-		  </layout_panel>
-		  <layout_panel
-       follows="bottom|left|right"
-       height="28"
-       layout="bottomleft"
-       left_pad="2"
-       name="teleport_btn_lp"
-       auto_resize="true"
-       width="117">
-        <button
-         enabled="false"
-         follows="top|left|right"
-         height="23"
-         label="Teleport"
-         layout="topleft"
-         name="teleport_btn"
-         tab_stop="false"
-         tool_tip="Teleport to the corresponding area"
-         width="117" />
-		  </layout_panel>
-		  <layout_panel
-       follows="bottom|left|right"
-       height="28"
-       layout="bottomleft"
-       name="show_on_map_btn_lp"
-       auto_resize="true"
-       left_pad="2"
-       width="90">
-        <button
-         enabled="false"
-         follows="top|left|right"
-         height="23"
-         label="Map"
-         layout="topleft"
-         name="show_on_map_btn"
-         tab_stop="false"
-         tool_tip="Show the corresponding area on the World Map"
-         width="88" />
-		  </layout_panel>
-	  </layout_stack>
-	</panel>
-</panel>
+  <panel name="buttons_cucks">
+    <layout_stack name="buttons_cucks_ls">
+      <layout_panel name="info_btn_lp">
+        <button name="info_btn" tool_tip="ピック情報を表示" />
+      </layout_panel>
+      <layout_panel name="teleport_btn_lp">
+        <button label="テレポート" name="teleport_btn" tool_tip="対応するエリアにテレポートします。" />
+      </layout_panel>
+      <layout_panel name="show_on_map_btn_lp">
+        <button label="マップ" name="show_on_map_btn" tool_tip="ワールドマップ上に対応するエリアを表示します。" />
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_legacy_secondlife.xml b/indra/newview/skins/default/xui/ja/panel_profile_legacy_secondlife.xml
index 47b9c097e63..27dcae8ad53 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_legacy_secondlife.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_legacy_secondlife.xml
@@ -1,307 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="all"
- label="Second Life"
- height="360"
- width="304"
- class="panel_avatar_secondlife"
- name="avatar_secondlife_tab">
-  <layout_stack
-    follows="all"
-    animate="false"
-    top="0"
-    height="360"
-    left="0"
-    width="304"
-    layout="topleft"
-    orientation="vertical"
-    show_drag_handle="false">
-    <layout_panel
-     name="avatar_info_top"
-     follows="top|left|right"
-     top="0"
-     left="0"
-     height="125"
-     right="-1"
-     auto_resize="false"
-     layout="topleft">
-      <texture_picker
-       default_image_name="Generic_Person_Large"
-       fallback_image="Generic_Person_Large"
-       follows="left|top"
-       height="143"
-       label=""
-       layout="topleft"
-       left="5"
-       name="sl_profile_pic"
-       no_commit_on_selection="true"
-       tool_tip="Click to choose a picture"
-       top="0"
-       width="120" />
-      <text
-       font="SansSerifSmall"
-       text_color="White_50"
-       width="87"
-       follows="top|left"
-       layout="topleft"
-       mouse_opaque="false"
-       type="string"
-       height="16"
-       length="1"
-       left="129"
-       name="rezday_label"
-       top_delta="0">
-        Born:
-      </text>
-      <icon
-       height="16"
-       width="16"
-       visible="false"
-       image_name="Cake"
-       tool_tip="Happy rezday"
-       mouse_opaque="true"
-       name="cake"
-       left_pad="2" />
-      <text
-       font="SansSerifSmall"
-       text_color="ProfileOnlineIndicatorColor"
-       width="57"
-       follows="right|top"
-       layout="topleft"
-       mouse_opaque="false"
-       type="string"
-       height="16"
-       length="1"
-       right="-15"
-       name="online"
-       top_delta="0" >
-        Online
-      </text>
-      <icon
-       follows="right|top"
-       height="14"
-       visible="false"
-       image_name="AccountLevel_Internal"
-       layout="topleft"
-       right="-1"
-       top_delta="0"
-       mouse_opaque="false"
-       name="account_type_internal"
-       width="14" />
-      <icon
-       follows="right|top"
-       height="14"
-       visible="false"
-       image_name="AccountLevel_Premium"
-       layout="topleft"
-       right="-1"
-       top_delta="0"
-       mouse_opaque="false"
-       name="account_type_premium"
-       width="14" />
-      <icon
-       follows="right|top"
-       height="14"
-       visible="false"
-       image_name="AccountLevel_Plus"
-       layout="topleft"
-       right="-1"
-       top_delta="0"
-       mouse_opaque="false"
-       name="account_type_plus"
-       width="14" />
-      <text
-       font="SansSerifSmall"
-       text_color="White_50"
-       width="175"
-       follows="top|left|right"
-       layout="topleft"
-       mouse_opaque="false"
-       type="string"
-       height="16"
-       length="1"
-       left="129"
-       name="rezday"
-       top_pad="0" >
-        (Unknown)
-      </text>
-      <text
-       font="SansSerifSmall"
-       text_color="White_50"
-       width="175"
-       follows="top|left|right"
-       layout="topleft"
-       mouse_opaque="false"
-       type="string"
-       height="48"
-       length="1"
-       left_delta="0"
-       name="account_info"
-       top_pad="2" />
-      <text
-       font="SansSerifSmall"
-       text_color="White_50"
-       width="175"
-       follows="top|left|right"
-       layout="topleft"
-       mouse_opaque="false"
-       type="string"
-       height="16"
-       length="1"
-       left_delta="0"
-       name="partner_label"
-       top_pad="2">
-        Partner:
-      </text>
-      <text
-       font="SansSerifSmall"
-       text_color="White_50"
-       width="175"
-       follows="top|left|right"
-       layout="topleft"
-       mouse_opaque="false"
-       type="string"
-       height="16"
-       length="1"
-       left_delta="0"
-       name="partner_info"
-       top_pad="2">
-        secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect
-      </text>
+<panel label="セカンドライフ" name="avatar_secondlife_tab">
+  <layout_stack >
+    <layout_panel name="avatar_info_top">
+      <texture_picker name="sl_profile_pic" tool_tip="プロフィール画像を選択してください。" />
+      <text name="rezday_label">誕生日:</text>
+      <icon tool_tip="ハッピー・Rezデー" name="cake" />
+      <text name="online">オンライン</text>
+      <icon name="account_type_internal" />
+      <icon name="account_type_premium" />
+      <icon name="account_type_plus" />
+      <text name="rezday">(不明)</text>
+      <text name="account_info" />
+      <text name="partner_label">パートナー:</text>
+      <text name="partner_info">secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect</text>
     </layout_panel>
-    <layout_panel
-      name="avatar_desc"
-      follows="top|left|right"
-      top_pad="1"
-      left="0"
-      height="125"
-      width="304"
-      auto_resize="true"
-      layout="topleft">
-      <text_editor
-       type="string"
-       follows="all"
-       left="3"
-       layout="topleft"
-       max_length="512"
-       name="sl_about"
-       top="0"
-       bottom="-20"
-       right="-4"
-       bg_readonly_color="DkGray2"
-       text_readonly_color="White"
-       commit_on_focus_lost="true"
-       word_wrap="true" />
-      <text
-       font="SansSerifSmall"
-       text_color="White_50"
-       follows="bottom|left|right"
-       layout="topleft"
-       mouse_opaque="false"
-       type="string"
-       height="16"
-       length="1"
-       left="3"
-       right="-4"
-       name="www"
-       top_pad="2" />
-      <line_editor
-        top_delta="-2"
-        follows="left|bottom|right"
-        layout="topleft"
-        height="20"
-        max_length_chars="254"
-        left="2"
-        right="-4"
-        text_pad_left="5"
-        tool_tip="Website link"
-        name="www_edit">
-        <line_editor.commit_callback
-          function="Profile.CommitProperties" />
-      </line_editor>
+    <layout_panel name="avatar_desc">
+      <text_editor name="sl_about" />
+      <text name="www" />
+      <line_editor name="www_edit"/>
+
     </layout_panel>
-    <layout_panel
-      visible="true"
-      name="avatar_perm"
-      follows="top|left|right"
-      top_pad="1"
-      left="0"
-      height="74"
-      width="304"
-      auto_resize="false"
-      layout="topleft">
-      <text
-       font="SansSerifSmall"
-       text_color="White_50"
-       width="190"
-       follows="top|left"
-       layout="topleft"
-       mouse_opaque="false"
-       type="string"
-       height="16"
-       length="1"
-       left="3"
-       name="permissions_label"
-       top_pad="2">
-        Allow this avatar to:
-      </text>
-      <check_box
-       height="16"
-       initial_value="false"
-       label="See when I am online"
-       layout="topleft"
-       top_pad="4"
-       left="5"
-       name="allow_show_online"
-       width="150">
-        <check_box.commit_callback
-         function="Profile.CommitRights" />
-      </check_box>
-      <check_box
-       height="16"
-       initial_value="false"
-       label="Find me on the world map"
-       layout="topleft"
-       top_pad="2"
-       name="allow_mapping"
-       width="150">
-        <check_box.commit_callback
-         function="Profile.CommitRights" />
-      </check_box>
-      <check_box
-       height="16"
-       initial_value="false"
-       label="Edit, delete, or take my objects"
-       layout="topleft"
-       top_pad="2"
-       name="allow_object_perms"
-       width="150">
-        <check_box.commit_callback
-         function="Profile.CommitModifyObjectRights" />
-      </check_box>
+    <layout_panel name="avatar_perm">
+      <text name="permissions_label">このアバターに許可すること:</text>
+      <check_box label="自分のオンライン状況" name="allow_show_online" />
+      <check_box label="ワールドマップから自分を見つける" name="allow_mapping" />
+      <check_box label="自分のオブジェクトの編集、削除、取得" name="allow_object_perms" />
     </layout_panel>
-    <layout_panel
-      visible="false"
-      name="avatar_in_search"
-      follows="top|left|right"
-      top_pad="1"
-      left="0"
-      height="18"
-      width="304"
-      auto_resize="false"
-      layout="topleft">
-      <check_box
-       height="16"
-       initial_value="true"
-       label="Show in search"
-       layout="topleft"
-       top_pad="0"
-       left="5"
-       name="allow_publish"
-       width="150">
-        <check_box.commit_callback
-         function="Profile.CommitProperties" />
-      </check_box>
+    <layout_panel name="avatar_in_search">
+      <check_box label="検索結果に表示" name="allow_publish" />
     </layout_panel>
   </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_legacy_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_profile_legacy_sidetray.xml
index 2caeb18ac41..2e4722f8696 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_legacy_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_legacy_sidetray.xml
@@ -1,329 +1,57 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- bg_opaque_color="PanelDefaultBackgroundColor"
- background_opaque="true"
- background_visible="true"
- follows="all"
- height="570"
- label="Profile"
- layout="topleft"
- min_height="350"
- left="0"
- top="20"
- name="Avatar Profile"
- width="313">
-  <panel.string
-   name="account_info_fmt">
-[ACCOUNT_TYPE]
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="プロフィール" name="Avatar Profile">
+  <panel.string name="account_info_fmt">[ACCOUNT_TYPE]
 [PAYMENT_INFO]
-[AGE_VERIFIED]
-  </panel.string>
-  <panel.string
-   name="age_verified">
-Age Verified
-  </panel.string>
-  <panel.string
-   name="rezday_fmt">
-[REZDAY] ([AGE])
-  </panel.string>
-  <panel.string
-   name="add_friend">
-Add Friend
-  </panel.string>
-  <panel.string
-   name="remove_friend">
-Remove Friend
-  </panel.string>
-  <panel
-   name="avatar_info_top"
-   bg_opaque_color="PanelDefaultBackgroundColor"
-   background_visible="true"
-   background_opaque="true"
-   follows="top|left|right"
-   top="0"
-   left="0"
-   height="29"
-   width="313"
-   layout="topleft">
-    <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     name="back"
-     left="7"
-     tab_stop="false"
-     top="2"
-     width="30"
-     use_draw_context_alpha="false" />
-    <text_editor
-     allow_scroll="false"
-     bg_visible="false"
-     read_only="true"
-     layout="topleft"
-     name="avatar_name"
-     v_pad="0"
-     value="(Loading...)"
-     font="SansSerifHugeBold"
-     h_pad="0"
-     height="26"
-     left_pad="8"
-     text_color="LtGray"
-     top="1"
-     use_ellipses="true"
-     width="268"
-     follows="top|left|right"
-     word_wrap="false"
-     mouse_opaque="false"/>
-    <loading_indicator
-     height="25"
-     follows="top|right"
-     layout="topleft"
-     left_pad="-32"
-     name="progress_indicator"
-     top_delta="1"
-     width="25" />
+[AGE_VERIFIED]</panel.string>
+  <panel.string name="age_verified">年齢確認済み</panel.string>
+  <panel.string name="rezday_fmt">[REZDAY]([AGE])</panel.string>
+  <panel.string name="add_friend">フレンドに追加</panel.string>
+  <panel.string name="remove_friend">フレンドから削除</panel.string>
+  <panel name="avatar_info_top">
+    <button name="back" />
+    <text_editor name="avatar_name" value="(読み込んでいます…)" />
+    <loading_indicator name="progress_indicator" />
   </panel>
-  <layout_stack
-   name="layout"
-   bg_opaque_color="PanelDefaultBackgroundColor"
-   background_visible="true"
-   background_opaque="true"
-   orientation="vertical"
-   follows="all"
-   left="6"
-   top_pad="0"
-   height="506"
-   width="302"
-   border_size="0">
-    <layout_panel
-     bg_opaque_color="PanelDefaultBackgroundColor"
-     background_visible="true"
-     background_opaque="true"
-     name="avatar_accordions"
-     follows="all"
-     layout="topleft"
-     auto_resize="true"
-     user_resize="true"
-     height="513"
-     width="313">
-      <accordion
-       left="0"
-       top="0"
-       single_expansion="true"
-       fit_parent="true"
-       follows="all"
-       layout="topleft"
-       name="avatar_accordion"
-       height="513"
-       width="313">
-        <accordion_tab
-         expanded="true"
-         layout="topleft"
-         name="avatar_secondlife_tab"
-         title="Second Life"
-         fit_panel="true">
-          <panel
-           border="false"
-           filename="panel_profile_legacy_secondlife.xml"
-           layout="topleft"
-           left="0"
-           follows="all"
-           name="avatar_secondlife_tab_panel"
-           top="0" />
+  <layout_stack name="layout">
+    <layout_panel name="avatar_accordions">
+      <accordion name="avatar_accordion">
+        <accordion_tab name="avatar_secondlife_tab" title="セカンドライフ">
+          <panel name="avatar_secondlife_tab_panel" />
         </accordion_tab>
-        <accordion_tab
-         expanded="false"
-         layout="topleft"
-         name="avatar_groups_tab"
-         title="Groups"
-         fit_panel="true">
-          <panel
-           border="false"
-           class="panel_profile_legacy_groups"
-           filename="panel_profile_legacy_groups.xml"
-           follows="all"
-           layout="topleft"
-           left="0"
-           name="avatar_groups_tab_panel"
-           top="0" />
+        <accordion_tab name="avatar_groups_tab" title="グループ">
+          <panel name="avatar_groups_tab_panel" />
         </accordion_tab>
-        <accordion_tab
-         expanded="false"
-         layout="topleft"
-         name="avatar_interest_tab"
-         title="Interests"
-         fit_panel="false">
-          <panel
-           border="false"
-           filename="panel_profile_legacy_interests.xml"
-           follows="left|top|right"
-           layout="topleft"
-           left="0"
-           name="avatar_interest_tab_panel"
-           top="0" />
+        <accordion_tab name="avatar_interest_tab" title="関心">
+          <panel name="avatar_interest_tab_panel" />
         </accordion_tab>
-        <accordion_tab
-         expanded="false"
-         layout="topleft"
-         name="avatar_picks_tab"
-         title="Picks"
-         fit_panel="true">
-          <panel
-           border="false"
-           class="panel_profile_legacy_picks"
-           filename="panel_profile_legacy_picks.xml"
-           follows="all"
-           layout="topleft"
-           left="0"
-           name="avatar_picks_tab_panel"
-           top="0" />
+        <accordion_tab name="avatar_picks_tab" title="ピック">
+          <panel name="avatar_picks_tab_panel" />
         </accordion_tab>
-        <accordion_tab
-         expanded="false"
-         layout="topleft"
-         name="avatar_firstlife_tab"
-         title="First Life"
-         fit_panel="true">
-          <panel
-           border="false"
-           filename="panel_profile_legacy_firstlife.xml"
-           follows="left|top|right"
-           layout="topleft"
-           left="0"
-           name="avatar_firstlife_tab_panel"
-           top="0" />
+        <accordion_tab name="avatar_firstlife_tab" title="ファーストライフ">
+          <panel name="avatar_firstlife_tab_panel" />
         </accordion_tab>
-        <accordion_tab
-         expanded="false"
-         layout="topleft"
-         name="avatar_notes_tab"
-         title="Notes"
-         fit_panel="true">
-          <panel
-           border="false"
-           filename="panel_profile_legacy_notes.xml"
-           follows="all"
-           layout="topleft"
-           left="0"
-           name="avatar_notes_tab_panel"
-           top="0" />
+        <accordion_tab name="avatar_notes_tab" title="ノート">
+          <panel name="avatar_notes_tab_panel" />
         </accordion_tab>
       </accordion>
     </layout_panel>
   </layout_stack>
 
-  <layout_stack
-   follows="bottom|left|right"
-   height="25"
-   layout="topleft"
-   name="button_row_ls"
-   left="6"
-   orientation="horizontal"
-   top_pad="5"
-   width="299">
-    <layout_panel
-     follows="bottom|left|right"
-     height="23"
-     layout="bottomleft"
-     left="0"
-     name="btn_chat_lp"
-     auto_resize="true"
-     width="91">
-      <button
-       follows="bottom|left|right"
-       left="1"
-       height="23"
-       name="btn_chat"
-       label="Chat"
-       layout="topleft"
-       tool_tip="Send an instant message"
-       top="0"
-       width="90">
-        <button.commit_callback
-         function="Profile.Action"
-         parameter="chat" />
-      </button>
+  <layout_stack name="button_row_ls">
+    <layout_panel name="btn_chat_lp">
+      <button name="btn_chat" label="チャット" tool_tip="インスタントメッセージを送ります。" />
+
     </layout_panel>
-    <layout_panel
-     follows="bottom|left|right"
-     height="23"
-     layout="bottomleft"
-     left_pad="3"
-     name="btn_friend_lp"
-     auto_resize="true"
-     width="91">
-      <button
-       follows="bottom|left|right"
-       left="1"
-       height="23"
-       name="btn_friend"
-       label="Add Friend"
-       layout="topleft"
-       top="0"
-       width="90">
-        <button.commit_callback
-         function="Profile.Action"
-         parameter="friend" />
-      </button>
+    <layout_panel name="btn_friend_lp">
+      <button name="btn_friend" label="フレンドに追加" />
+
     </layout_panel>
-    <layout_panel
-     follows="bottom|left|right"
-     height="23"
-     layout="bottomleft"
-     left_pad="3"
-     name="btn_block_lp"
-     auto_resize="true"
-     width="91">
-      <button
-       follows="bottom|left|right"
-       left="1"
-       height="23"
-       name="btn_block"
-       label="Block"
-       layout="topleft"
-       tool_tip="Block this avatar"
-       top="0"
-       width="90">
-        <button.commit_callback
-         function="Profile.Action"
-         parameter="block" />
-      </button>
+    <layout_panel name="btn_block_lp">
+      <button name="btn_block" label="ブロック" tool_tip="このアバターをブロック" />
     </layout_panel>
-    <layout_panel
-     follows="bottom|left|right"
-     height="23"
-     layout="bottomleft"
-     left_pad="3"
-     name="btn_menu_lp"
-     auto_resize="false"
-     width="30">
-    <menu_button
-     follows="bottom|left|right"
-     height="23"
-     image_hover_unselected="Toolbar_Middle_Over"
-     image_overlay="OptionsMenu_Off"
-     image_selected="Toolbar_Middle_Selected"
-     image_unselected="Toolbar_Middle_Off"
-     menu_filename="menu_profile_legacy.xml"
-     menu_position="bottomleft"
-     tool_tip="Actions on this avatar"
-     layout="topleft"
-     left="1"
-     top="0"
-     name="btn_menu"
-     width="30" />
+    <layout_panel name="btn_menu_lp">
+      <menu_button tool_tip="このアバターへのアクション" name="btn_menu" />
     </layout_panel>
   </layout_stack>
-  <drop_target
-   top="0"
-   bottom="-1"
-   left="0"
-   right="-1"
-   layout="topleft"
-   follows="all"
-   name="drop_target"
-   mouse_opaque="false" />
-</panel>
+  <drop_target name="drop_target" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_quick_settings.xml b/indra/newview/skins/default/xui/ja/panel_quick_settings.xml
index 25ce115f436..45b4f3ca18d 100644
--- a/indra/newview/skins/default/xui/ja/panel_quick_settings.xml
+++ b/indra/newview/skins/default/xui/ja/panel_quick_settings.xml
@@ -1,218 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- class="quick_settings"
- layout="topleft"
- width="300"
- height="209"
- name="quick_settings">
-  <text
-   follows="left|top"
-   height="15"
-   left="10"
-   top_pad="2"
-   width="120"
-   layout="topleft"
-   value="Draw Distance:"/>
-  <slider_bar
-   top_pad="-16"
-   height="20"
-   increment="32"
-   initial_value="96"
-   follows="left|top|right"
-   layout="topleft"
-   max_val="512"
-   min_val="64"
-   left="93"
-   right="-68"
-   name="draw_dist_slider_bar"
-   control_name="RenderFarClip"/>
-  <spinner
-   top_pad="-21"
-   height="20"
-   label=""
-   label_width="0"
-   right="-8"
-   decimal_digits="0"
-   follows="top|right"
-   layout="topleft"
-   max_val="512"
-   min_val="64"
-   width="55"
-   increment="32"
-   name="draw_dist_spinner"
-   control_name="RenderFarClip"/>
-  <text
-   follows="left|top"
-   height="15"
-   left="10"
-   top_pad="3"
-   width="120"
-   layout="topleft"
-   value="Level of Detail:"/>
-  <slider_bar
-   top_pad="-16"
-   height="20"
-   increment="0.1"
-   initial_value="96"
-   follows="left|top|right"
-   layout="topleft"
-   max_val="4.0"
-   min_val="1.0"
-   left="93"
-   right="-68"
-   name="lod_slider_bar"
-   control_name="RenderVolumeLODFactor"/>
-  <spinner
-   top_pad="-21"
-   height="20"
-   label_width="0"
-   right="-8"
-   decimal_digits="2"
-   follows="top|right"
-   layout="topleft"
-   max_val="4.0"
-   min_val="1.0"
-   width="55"
-   increment="0.1"
-   name="lod_spinner"
-   control_name="RenderVolumeLODFactor"/>
-  <text
-   follows="left|top"
-   height="15"
-   left="10"
-   top_pad="3"
-   width="120"
-   layout="topleft"
-   value="Max Particles:"/>
-  <slider_bar
-   top_pad="-16"
-   height="20"
-   increment="6"
-   initial_value="96"
-   follows="left|top|right"
-   layout="topleft"
-   max_val="8192"
-   min_val="0"
-   left="93"
-   right="-68"
-   name="max_particles_slider_bar"
-   control_name="RenderMaxPartCount"/>
-  <spinner
-   top_pad="-21"
-   height="20"
-   label_width="0"
-   right="-8"
-   decimal_digits="0"
-   follows="top|right"
-   layout="topleft"
-   max_val="8192"
-   min_val="0"
-   width="55"
-   increment="12"
-   name="max_particles_spinner"
-   control_name="RenderMaxPartCount"/>
-  <text
-   follows="left|top"
-   height="15"
-   left="10"
-   top_pad="3"
-   width="120"
-   layout="topleft"
-   value="Max Avatars:"/>
-  <slider_bar
-   top_pad="-16"
-   height="20"
-   increment="1"
-   initial_value="96"
-   follows="left|top|right"
-   layout="topleft"
-   max_val="65"
-   min_val="1"
-   left="93"
-   right="-68"
-   name="max_avatar_slider_bar"
-   control_name="RenderAvatarMaxNonImpostors"/>
-  <spinner
-   top_pad="-21"
-   height="20"
-   label_width="0"
-   right="-8"
-   decimal_digits="0"
-   follows="top|right"
-   layout="topleft"
-   max_val="65"
-   min_val="1"
-   width="55"
-   increment="1"
-   name="max_avatar_spinner"
-   control_name="RenderAvatarMaxNonImpostors" />
-  <text
-   follows="left|top"
-   height="15"
-   left="10"
-   top_pad="3"
-   width="120"
-   layout="topleft"
-   value="Max Bandwidth:" />
-  <slider_bar
-   top_pad="-16"
-   height="20"
-   increment="64"
-   initial_value="100"
-   follows="left|top|right"
-   layout="topleft"
-   max_val="6000"
-   min_val="100"
-   left="93"
-   right="-68"
-   name="bandwith_slider_bar"
-   control_name="ThrottleBandwidthKBPS" />
-  <spinner
-   top_pad="-21"
-   height="20"
-   label_width="0"
-   right="-8"
-   decimal_digits="0"
-   follows="top|right"
-   layout="topleft"
-   max_val="6000"
-   min_val="100"
-   width="55"
-   increment="100"
-   name="bandwith_spinner"
-   control_name="ThrottleBandwidthKBPS"/>
-  <text
-   follows="left|top"
-   height="15"
-   left="10"
-   top_pad="3"
-   width="120"
-   layout="topleft"
-   value="Hover Height:" />
-  <slider_bar
-   enabled="false"
-   top_pad="-16"
-   height="20"
-   left="93"
-   right="-68"
-   follows="left|top|right"
-   layout="topleft"
-   increment="0.001"
-   initial_value="0.0"
-   name="hover_slider_bar"/>
-  <spinner
-   enabled="false"
-   top_pad="-21"
-   height="20"
-   label_width="0"
-   right="-8"
-   decimal_digits="3"
-   follows="top|right"
-   layout="topleft"
-   max_val="2.0"
-   min_val="-2.0"
-   width="55"
-   increment="0.001"
-   name="hover_spinner"
-   control_name="AvatarHoverOffsetZ"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="quick_settings">
+  <text follows="left|top" height="15" left="10" top_pad="2" width="120" layout="topleft" value="描画距離:" />
+  <slider_bar name="draw_dist_slider_bar" />
+  <spinner label="" name="draw_dist_spinner" />
+  <text follows="left|top" height="15" left="10" top_pad="3" width="120" layout="topleft" value="詳細レベル:" />
+  <slider_bar name="lod_slider_bar" />
+  <spinner name="lod_spinner" />
+  <text follows="left|top" height="15" left="10" top_pad="3" width="120" layout="topleft" value="最大パーティクル数:" />
+  <slider_bar name="max_particles_slider_bar" />
+  <spinner name="max_particles_spinner" />
+  <text follows="left|top" height="15" left="10" top_pad="3" width="120" layout="topleft" value="最大アバター数:" />
+  <slider_bar name="max_avatar_slider_bar" />
+  <spinner name="max_avatar_spinner" />
+  <text follows="left|top" height="15" left="10" top_pad="3" width="120" layout="topleft" value="最大帯域幅:" />
+  <slider_bar name="bandwith_slider_bar" />
+  <spinner name="bandwith_spinner" />
+  <text follows="left|top" height="15" left="10" top_pad="3" width="120" layout="topleft" value="ホバー高さ:" />
+  <slider_bar name="hover_slider_bar" />
+  <spinner name="hover_spinner" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_quick_settings_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_quick_settings_pulldown.xml
deleted file mode 100644
index 91da126ebd7..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_quick_settings_pulldown.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- bg_opaque_image="Volume_Background"
- bg_alpha_image="Volume_Background"
- background_opaque="true"
- background_visible="true"
- layout="topleft"
- width="300"
- height="140"
- name="quick_settings_pulldown">
-  <panel
-   name="quick_settings"
-   class="quick_settings"
-   filename="panel_quick_settings.xml"
-   layout="topleft"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_radar_alert_toast.xml b/indra/newview/skins/default/xui/ja/panel_radar_alert_toast.xml
index 60f87bbb3f7..0cc8bf5253a 100644
--- a/indra/newview/skins/default/xui/ja/panel_radar_alert_toast.xml
+++ b/indra/newview/skins/default/xui/ja/panel_radar_alert_toast.xml
@@ -1,35 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="false"
- height="40"
- label="radar_alert"
- layout="topleft"
- left="0"
- name="radar_alert"
- top="0"
- width="220">
-  <icon
-   follows="top|left"
-   height="18"
-   image_name="Command_MiniMap_Icon"
-   layout="topleft"
-   left="3"
-   mouse_opaque="false"
-   name="radar_icon"
-   top="10"
-   width="18" />
-  <text
-   font="SansSerifSmall"
-   follows="all"
-   height="13"
-   layout="topleft"
-   left_pad="5"
-   name="message"
-   text_color="White"
-   top="15"
-   use_ellipses="true"
-   value=""
-   width="189"
-   word_wrap="true"
-   max_length="350" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="レーダーアラート" name="radar_alert">
+  <icon name="radar_icon" />
+  <text name="message" />
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_rlv_locks.xml b/indra/newview/skins/default/xui/ja/panel_rlv_locks.xml
index 80373af1f4a..d235cbc16d5 100644
--- a/indra/newview/skins/default/xui/ja/panel_rlv_locks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_rlv_locks.xml
@@ -1,52 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-  follows="all"
-  height="200"
-  label="ACTIVE RLV LOCKS"
-  layout="topleft"
-  name="panel_rlvLocks"
-  top="0"
-  width="500">
-  <scroll_list
-    draw_border="false"
-    draw_heading="true"
-    draw_stripes="true"
-    follows="all"
-    height="167"
-    layout="topleft"
-    multi_select="false"
-    name="lock_list"
-    top_pad="0" >
-    <scroll_list.columns label="Lock Type" name="lock_type" width="100" />
-    <scroll_list.columns label="Method" name="lock_addrem" width="60" />
-    <scroll_list.columns label="Target Object / Point" name="lock_target" />
-    <scroll_list.columns label="Lock Origin" name="lock_origin" width="150" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="有効なRLVロック" name="panel_rlvLocks">
+  <scroll_list name="lock_list">
+    <scroll_list.columns label="ロック種別" name="lock_type"/>
+    <scroll_list.columns label="手段" name="lock_addrem" />
+    <scroll_list.columns label="目標オブジェクト/ポイント" name="lock_target" />
+    <scroll_list.columns label="ロック元" name="lock_origin" />
   </scroll_list>
-  <panel
-    background_visible="false"
-    follows="left|right|bottom"
-    height="25"
-    label="bottom_panel"
-    layout="topleft"
-    name="bottom_panel"
-    top_pad="0" >
-    <button
-      image_hover_unselected="Toolbar_Left_Over"
-      image_overlay="Refresh_Off"
-      image_overlay_alignment="left"
-      image_selected="Toolbar_Left_Selected"
-      image_unselected="Toolbar_Left_Off"
-      label="Refresh"
-      left="0"
-      name="refresh_btn"
-      top="1"
-      width="90" />
-    <icon
-      follows="left|right"
-      image_name="Toolbar_Right_Off"
-      left_pad="1"
-      name="dummy_icon"
-      top="1"
-      right="-1"/>
+  <panel name="bottom_panel">
+    <button label="リフレッシュ" name="refresh_btn" />
+    <icon name="dummy_icon" />
   </panel>
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_script_ed_preproc.xml b/indra/newview/skins/default/xui/ja/panel_script_ed_preproc.xml
index 0306a4afa08..7f4c6a9f14b 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_ed_preproc.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_ed_preproc.xml
@@ -1,295 +1,51 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-  bevel_style="none"
-  border_style="line"
-  follows="left|top|right|bottom"
- height="522"
-  layout="topleft"
-  left="0"
-  name="script panel"
-  width="497">
-  <panel.string
-    name="loading">
-    Loading...
-  </panel.string>
-  <panel.string
-    name="can_not_view">
-    You can not view or edit this script, since it has been set as &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
-  </panel.string>
-  <panel.string
-    name="public_objects_can_not_run">
-    Public Objects cannot run scripts
-  </panel.string>
-  <panel.string
-    name="script_running">
-    Running
-  </panel.string>
-  <panel.string
-    name="Title">
-    Script: [NAME]
-  </panel.string>
-  <menu_bar
-    bg_visible="false"
-    follows="left|top"
-    height="18"
-    layout="topleft"
-    left="0"
-    mouse_opaque="false"
-    name="script_menu"
-    width="476">
-    <menu
-      top="0"
-      height="62"
-      label="File"
-      layout="topleft"
-      left="0"
-      mouse_opaque="false"
-      name="File"
-      width="138">
-      <menu_item_call
-        label="Save"
-        layout="topleft"
-        name="Save"
-        shortcut="control|S" />
-      <menu_item_separator
-        layout="topleft" />
-      <menu_item_call
-        label="Revert All Changes"
-        layout="topleft"
-        name="Revert All Changes" />
-      <menu_item_separator
-        layout="topleft" />
-      <menu_item_call
-        label="Load from file..."
-        layout="topleft"
-        name="LoadFromFile" />
-      <menu_item_call
-        label="Save to file..."
-        layout="topleft"
-        name="SaveToFile" />
-          <menu_item_separator
-           layout="topleft" />
-          <menu_item_call
-           label="Script Preferences..."
-           layout="topleft"
-           name="Colors">
-            <menu_item_call.on_click
-             function="Floater.Toggle"
-             parameter="script_colors"/>
-          </menu_item_call>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="script panel">
+  <panel.string name="loading">読み込んでいます… </panel.string>
+  <panel.string name="can_not_view">このスクリプトは「コピーなし」に設定されているため、表示または編集できません。
+オブジェクト内のスクリプトを表示または編集するには、完全な権限が必要です。</panel.string>
+  <panel.string name="public_objects_can_not_run">パブリックオブジェクトはスクリプトを実行できません。</panel.string>
+  <panel.string name="script_running">動作中</panel.string>
+  <panel.string name="Title">スクリプト名:[NAME]</panel.string>
+  <menu_bar name="script_menu">
+    <menu label="ファイル" name="File">
+      <menu_item_call label="保存" name="Save" />
+      <menu_item_separator />
+      <menu_item_call label="全ての変更を復帰" name="Revert All Changes" />
+      <menu_item_separator />
+      <menu_item_call label="ファイルから読み込む…" name="LoadFromFile" />
+      <menu_item_call label="ファイルに保存…" name="SaveToFile" />
+      <menu_item_separator />
+      <menu_item_call label="スクリプトの初期設定…" name="Colors" />
     </menu>
-    <menu
-      top="0"
-      height="198"
-      label="Edit"
-      layout="topleft"
-      mouse_opaque="false"
-      name="Edit"
-      width="139">
-      <menu_item_call
-        enabled="false"
-        label="Undo"
-        layout="topleft"
-        name="Undo"
-        shortcut="control|Z" />
-      <menu_item_call
-        enabled="false"
-        label="Redo"
-        layout="topleft"
-        name="Redo"
-        shortcut="control|Y" />
-      <menu_item_separator
-        layout="topleft" />
-      <menu_item_call
-        enabled="false"
-        label="Cut"
-        layout="topleft"
-        name="Cut"
-        shortcut="control|X" />
-      <menu_item_call
-        enabled="false"
-        label="Copy"
-        layout="topleft"
-        name="Copy"
-        shortcut="control|C" />
-      <menu_item_call
-        enabled="false"
-        label="Paste"
-        layout="topleft"
-        name="Paste"
-        shortcut="control|V" />
-      <menu_item_call
-        enabled="false"
-        label="Delete"
-        layout="topleft"
-        name="Delete"
-        shortcut="Del" />
-      <menu_item_call
-        label="Select All"
-        layout="topleft"
-        name="Select All"
-        shortcut="control|A" />
-      <menu_item_call
-        enabled="false"
-        label="Deselect"
-        layout="topleft"
-        name="Deselect" />
-      <menu_item_separator
-        layout="topleft"
-        name="separator3" />
-      <menu_item_call
-        label="Search / Replace..."
-        layout="topleft"
-             name="Search / Replace..."
-             shortcut="control|F" />
-            <menu_item_call
-             label="Go to line..."
-             layout="topleft"
-             name="Go to line..."
-             shortcut="control|G" />
+    <menu label="編集" name="Edit">
+      <menu_item_call label="取り消し" name="Undo" />
+      <menu_item_call label="やり直し" name="Redo" />
+      <menu_item_separator />
+      <menu_item_call label="カット" name="Cut" />
+      <menu_item_call label="コピー" name="Copy" />
+      <menu_item_call label="ペースト" name="Paste" />
+      <menu_item_call label="削除" name="Delete" />
+      <menu_item_call label="すべてを選択" name="Select All" />
+      <menu_item_call label="選択解除" name="Deselect" />
+      <menu_item_separator name="separator3" />
+      <menu_item_call label="検索/置換…" name="Search / Replace..." />
+      <menu_item_call label="指定行に移動…" name="Go to line..." />
     </menu>
-    <menu
-      top="0"
-      height="34"
-      label="LSL Reference"
-      layout="topleft"
-      mouse_opaque="false"
-      name="Help"
-      width="112">
-      <menu_item_call
-        label="Keyword Help..."
-        layout="topleft"
-             name="Keyword Help..."
-             shortcut="shift|F1" />
+    <menu label="LSLリファレンス" name="Help">
+      <menu_item_call label="キーワードヘルプ…" name="Keyword Help..." />
     </menu>
   </menu_bar>
-    <tab_container
-     follows="all"
-     halign="left"
-     height="378"
-     left="0"
-	 top_pad="2"
-     name="Tabset"
-     tab_position="bottom"
-     tab_width="100"
-     tab_padding_right="0"
-	 tab_height="16"
-     width="487">
-	<panel
-	 bevel_style="none"
-	 border_style="line"
-	 follows="left|top|right|bottom"
-	 height="377"
-	 layout="topleft"
-	 left="0"
-	 top="0"
-	 name="Script"
-	 label="Script"
-	 width="487">
-		<script_editor
-		 left="0"
-		 top="0"
-		 type="string"
-		 length="1"
-		 follows="left|top|right|bottom"
-		 font="Monospace"
-		 height="376"
-		 ignore_tab="false"
-		 layout="topleft"
-		 max_length="262144"
-		 name="Script Editor"
-		 text_color="ScriptText"
-		 default_color="ScriptText"
-		 bg_writeable_color="ScriptBackground"
-		 bg_focus_color="ScriptBackground"
-		 text_readonly_color="ScriptText"
-		 bg_readonly_color="ScriptBackground"
-		 bg_selected_color="ScriptSelectedColor"
-		 cursor_color="ScriptCursorColor"
-		 width="487"
-		 enable_tooltip_paste="true"
-		 word_wrap="true"
-		 show_context_menu="true">
-			Loading...
-		</script_editor>
-	</panel>
-	<panel
-	 bevel_style="none"
-	 border_style="line"
-	 follows="left|top|right|bottom"
-	 height="377"
-	 layout="topleft"
-	 left="0"
-	 name="Preprocessed"
-	 label="Preprocessed"
-	 width="487">
-		<lsl_preproc_viewer
-		 left="0"
-		 top="0"
-		 type="string"
-		 length="1"
-		 follows="left|top|right|bottom"
-		 font="Monospace"
-		 height="376"
-		 ignore_tab="false"
-		 layout="topleft"
-		 max_length="262144"
-		 name="Post Editor"
-		 text_color="ScriptText"
-		 default_color="ScriptText"
-		 bg_writeable_color="ScriptBackground"
-		 bg_focus_color="ScriptBackground"
-		 text_readonly_color="ScriptText"
-		 bg_readonly_color="ScriptBackground"
-		 bg_selected_color="ScriptSelectedColor"
-		 cursor_color="ScriptCursorColor"
-		 width="487"
-		 word_wrap="true"
-		 show_context_menu="true">
-			Loading...
-		</lsl_preproc_viewer>
-	</panel>
-	</tab_container>
-  <scroll_list
-    top_pad="10"
-    left="0"
-    follows="left|right|bottom"
-    height="60"
-    layout="topleft"
-    name="lsl errors"
-     width="487" />
-  <text
-    follows="left|bottom"
-    height="12"
-    layout="topleft"
-     left="0"
-    name="line_col"
-    width="128" />
-  <combo_box
-    follows="left|bottom"
-    height="23"
-    label="Insert..."
-    layout="topleft"
-    name="Insert..."
-     width="128" />
-  <button
-    follows="right|bottom"
-    height="23"
-    label="Save"
-    label_selected="Save"
-    layout="topleft"
-    top_pad="-35"
-     right="487"
-    name="Save_btn"
-    width="81" />
-  <button
-    enabled="false"
-    follows="right|bottom"
-    height="23"
-    label="Edit..."
-    layout="topleft"
-    top_pad="-23"
-     right="400"
-    name="Edit_btn"
-    width="81" />
-</panel>
+  <tab_container name="Tabset">
+    <panel name="Script" label="スクリプト">
+      <script_editor name="Script Editor">読み込んでいます…</script_editor>
+    </panel>
+    <panel name="Preprocessed" label="プリプロセス済み">
+      <lsl_preproc_viewer name="Post Editor">読み込んでいます…</lsl_preproc_viewer>
+    </panel>
+  </tab_container>
+  <scroll_list name="lsl errors" />
+  <text name="line_col" />
+  <combo_box label="挿入…" name="Insert..." />
+  <button label="保存" label_selected="保存" name="Save_btn" />
+  <button label="編集…" name="Edit_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_search_classifieds.xml b/indra/newview/skins/default/xui/ja/panel_search_classifieds.xml
index 7af7ac76a94..973c5bce147 100644
--- a/indra/newview/skins/default/xui/ja/panel_search_classifieds.xml
+++ b/indra/newview/skins/default/xui/ja/panel_search_classifieds.xml
@@ -1,111 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- height="70"
- layout="topleft"
- name="panel_search_classifieds"
- width="602">
-  <text
-   follows="left|top|right"
-   height="16"
-   layout="topleft"
-   left="4"
-   name="search_title"
-   top="4"
-   value="Enter search terms:"
-   width="255" />
-  <check_box
-   control_name="ShowPGClassifieds"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left="489"
-   name="pg_all"
-   top="4"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_PG_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_general"
-   top_delta="-1"
-   width="18"/>
-  <check_box
-   control_name="ShowMatureClassifieds"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left_pad="2"
-   name="mature_all"
-   top_delta="1"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_M_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_moderate"
-   top_delta="-1"
-   width="18"/>
-  <check_box
-   control_name="ShowAdultClassifieds"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left_pad="2"
-   name="adult_all"
-   top_delta="1"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_R_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_adult"
-   top_delta="-1"
-   width="18"/>
-  <search_editor
-   follows="top|left|right"
-   search_button_visible="true"
-   height="22"
-   text_readonly_color="DkGray"
-   label="Search"
-   layout="topleft"
-   top_pad="1"
-   left="4"
-   right="-128"
-   name="search_bar"
-   select_on_focus="true"
-   commit_on_focus_lost="false"
-   tool_tip="Enter search terms">
-    <search_editor.commit_callback
-     function="Search.query" />
-  </search_editor>
-  <combo_box
-   follows="right|top"
-   layout="topleft"
-   height="23"
-   allow_text_entry="false"
-   top_delta="0"
-   left_pad="2"
-   name="classifieds_category"
-   width="122">
-    <combo_box.commit_callback
-     function="Search.query" />
-  </combo_box>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_search_classifieds">
+  <text name="search_title" value="検索語句を入力:" />
+  <check_box label="" />
+  <icon name="rating_icon_general" />
+  <check_box label="" name="mature_all" />
+
+  <icon name="rating_icon_moderate" />
+  <check_box label="" name="adult_all" />
+
+  <icon name="rating_icon_adult" />
+  <search_editor label="検索" name="search_bar" tool_tip="検索語句を入力してください。" />
+
+  <combo_box name="classifieds_category" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_search_events.xml b/indra/newview/skins/default/xui/ja/panel_search_events.xml
index dbe5739bbf7..4364590d52c 100644
--- a/indra/newview/skins/default/xui/ja/panel_search_events.xml
+++ b/indra/newview/skins/default/xui/ja/panel_search_events.xml
@@ -1,196 +1,37 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- height="70"
- layout="topleft"
- name="panel_search_events"
- width="602">
-  <text
-   follows="left|top"
-   height="16"
-   layout="topleft"
-   left="4"
-   name="search_title"
-   top="4"
-   value="Enter search terms:"
-   width="128" />
-  <radio_group
-   top_delta="0"
-   left="130"
-   height="16"
-   width="230"
-   layout="topleft"
-   initial_value="current"
-   name="events_search_mode">
-    <radio_item
-     height="16"
-     label="Ongoing and Upcoming"
-     layout="topleft"
-     name="current"
-     value="current"
-     top_pad="0"
-     width="120" />
-    <radio_item
-     height="16"
-     label="By Date"
-     layout="topleft"
-     name="date"
-     value="date"
-     left_pad="40"
-     width="120" />
-    <radio_group.commit_callback
-     function="Search.query" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_search_events">
+  <text name="search_title" value="検索語句を入力:" />
+  <radio_group name="events_search_mode">
+    <radio_item label="現在進行中および今後の予定" name="current" value="current" />
+    <radio_item label="日付で" name="date" value="date" />
   </radio_group>
-  <button
-   follows="top|left"
-   height="16"
-   width="16"
-   image_unselected="MinusItem_Off"
-   image_disabled="MinusItem_Disabled"
-   image_selected="MinusItem_Press"
-   image_pressed="MinusItem_Press"
-   image_top_pad="0"
-   layout="topleft"
-   left_pad="14"
-   name="minus_day"
-   top_delta="0">
-    <button.commit_callback
-     function="Search.MinusDay" />
-  </button>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   top_delta="0"
-   layout="topleft"
-   left_pad="5"
-   name="events_date"
-   font.style="BOLD"
-   height="16"
-   width="40"
-   value="4/20" />
-  <button
-   follows="top|left"
-   height="16"
-   width="16"
-   image_unselected="AddItem_Off"
-   image_disabled="AddItem_Disabled"
-   image_selected="AddItem_Press"
-   image_pressed="AddItem_Press"
-   image_top_pad="0"
-   layout="topleft"
-   left_pad="5"
-   name="plus_day"
-   top_delta="0">
-    <button.commit_callback
-     function="Search.AddDay" />
-  </button>
-  <check_box
-   control_name="ShowPGEvents"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left="489"
-   name="pg_all"
-   top="4"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_PG_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_general"
-   top_delta="-1"
-   width="18"/>
-  <check_box
-   control_name="ShowMatureEvents"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left_pad="2"
-   name="mature_all"
-   top_delta="1"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_M_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_moderate"
-   top_delta="-1"
-   width="18"/>
-  <check_box
-   control_name="ShowAdultEvents"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left_pad="2"
-   name="adult_all"
-   top_delta="1"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_R_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_adult"
-   top_delta="-1"
-   width="18"/>
-  <search_editor
-   follows="top|left|right"
-   search_button_visible="true"
-   height="22"
-   text_readonly_color="DkGray"
-   label="Search"
-   layout="topleft"
-   top_pad="1"
-   left="4"
-   right="-128"
-   name="search_bar"
-   select_on_focus="true"
-   commit_on_focus_lost="false"
-   tool_tip="Enter search terms">
-    <search_editor.commit_callback
-     function="Search.query" />
-  </search_editor>
-  <combo_box
-   follows="right|top"
-   layout="topleft"
-   height="23"
-   allow_text_entry="false"
-   top_delta="0"
-   left_pad="2"
-   name="events_category"
-   width="122">
-    <combo_box.item label="Any Category" name="any" value="0" />
+  <button name="minus_day" />
+  <text name="events_date" value="4/20" />
+  <button name="plus_day" />
+  <check_box label="" name="pg_all" />
+
+  <icon name="rating_icon_general" />
+  <check_box label="" name="mature_all" />
+
+  <icon name="rating_icon_moderate" />
+  <check_box label="" name="adult_all" />
+  <icon name="rating_icon_adult" />
+  <search_editor label="Search" name="search_bar" />
+  <combo_box name="events_category">
+    <combo_box.item label="すべてのカテゴリ" name="any" value="0" />
     <combo_box.item label="" value="filter_separator" enabled="false" />
-    <combo_box.item label="Discussion" name="discussion" value="18" />
-    <combo_box.item label="Sports" name="sports" value="19" />
-    <combo_box.item label="Live Music" name="music" value="20" />
+    <combo_box.item label="討論" name="discussion" value="18" />
+    <combo_box.item label="スポーツ" name="sports" value="19" />
+    <combo_box.item label="ライブミュージック" name="music" value="20" />
     <!-- <combo_box.item label="???" name="mystery_category" value="21" /> -->
-    <combo_box.item label="Commercial" name="commercial" value="22" />
-    <combo_box.item label="Nightlife/Entertainment" name="nightlife" value="23" />
-    <combo_box.item label="Games/Contests" name="games" value="24" />
-    <combo_box.item label="Pageants" name="pageants" value="25" />
-    <combo_box.item label="Education" name="education" value="26" />
-    <combo_box.item label="Arts and Culture" name="arts" value="27" />
-    <combo_box.item label="Charity/Support Groups" name="charity" value="28" />
-    <combo_box.item label="Miscellaneous" name="misc" value="29" />
-    <combo_box.commit_callback
-     function="Search.query" />
+    <combo_box.item label="商用" name="commercial" value="22" />
+    <combo_box.item label="夜の生活/エンターティメント" name="nightlife" value="23" />
+    <combo_box.item label="ゲーム/コンテンスト" name="games" value="24" />
+    <combo_box.item label="野外劇" name="pageants" value="25" />
+    <combo_box.item label="教育" name="education" value="26" />
+    <combo_box.item label="芸術と文化" name="arts" value="27" />
+    <combo_box.item label="チャリティー/サポートグループ" name="charity" value="28" />
+    <combo_box.item label="その他" name="misc" value="29" />
+    <combo_box.commit_callback function="Search.query" />
   </combo_box>
-</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_search_groups.xml b/indra/newview/skins/default/xui/ja/panel_search_groups.xml
index 3fd13670289..d87227d080e 100644
--- a/indra/newview/skins/default/xui/ja/panel_search_groups.xml
+++ b/indra/newview/skins/default/xui/ja/panel_search_groups.xml
@@ -1,99 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- height="70"
- layout="topleft"
- name="panel_search_groups"
- width="602">
-  <text
-   follows="left|top|right"
-   height="16"
-   layout="topleft"
-   left="4"
-   name="search_title"
-   top="4"
-   value="Enter search terms:"
-   width="255" />
-  <check_box
-   control_name="ShowPGGroups"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left="489"
-   name="pg_all"
-   top="4"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_PG_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_general"
-   top_delta="-1"
-   width="18"/>
-  <check_box
-   control_name="ShowMatureGroups"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left_pad="2"
-   name="mature_all"
-   top_delta="1"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_M_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_moderate"
-   top_delta="-1"
-   width="18"/>
-  <check_box
-   control_name="ShowAdultGroups"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left_pad="2"
-   name="adult_all"
-   top_delta="1"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_R_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_adult"
-   top_delta="-1"
-   width="18"/>
-  <search_editor
-   follows="top|left|right"
-   search_button_visible="true"
-   height="22"
-   text_readonly_color="DkGray"
-   label="Search"
-   layout="topleft"
-   top_pad="1"
-   left="4"
-   right="-4"
-   name="search_bar"
-   select_on_focus="true"
-   commit_on_focus_lost="false"
-   tool_tip="Enter search terms">
-    <search_editor.commit_callback
-     function="Search.query" />
-  </search_editor>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_search_groups">
+  <text name="search_title" value="検索語句を入力:" />
+  <check_box label="" name="pg_all" />
+  <icon name="rating_icon_general" />
+  <check_box label="" name="mature_all" />
+  <icon name="rating_icon_moderate" />
+  <check_box label="" name="adult_all" />
+  <icon name="rating_icon_adult" />
+  <search_editor label="検索" name="search_bar" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_search_landsales.xml b/indra/newview/skins/default/xui/ja/panel_search_landsales.xml
index 982fcdefc9d..0dafd712fb7 100644
--- a/indra/newview/skins/default/xui/ja/panel_search_landsales.xml
+++ b/indra/newview/skins/default/xui/ja/panel_search_landsales.xml
@@ -1,181 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- height="70"
- layout="topleft"
- name="panel_search_landsales"
- width="602">
-  <text
-   follows="left|top|right"
-   height="16"
-   layout="topleft"
-   left="4"
-   name="search_title"
-   top="4"
-   value="Enter search terms:"
-   width="255" />
-  <check_box
-   control_name="ShowPGLand"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left="489"
-   name="pg_all"
-   top="4"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_PG_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_general"
-   top_delta="-1"
-   width="18"/>
-  <check_box
-   control_name="ShowMatureLand"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left_pad="2"
-   name="mature_all"
-   top_delta="1"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_M_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_moderate"
-   top_delta="-1"
-   width="18"/>
-  <check_box
-   control_name="ShowAdultLand"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left_pad="2"
-   name="adult_all"
-   top_delta="1"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_R_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_adult"
-   top_delta="-1"
-   width="18"/>
-  <check_box
-   control_name="FindLandPrice"
-   follows="left|top"
-   height="16"
-   label="Price &lt;"
-   layout="topleft"
-   left="4"
-   name="price_check"
-   top_pad="6"
-   width="40" >
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <line_editor
-   enabled_control="FindLandPrice"
-   commit_on_focus_lost="false"
-   follows="left|top"
-   height="16"
-   left_pad="20"
-   name="edit_price"
-   layout="topleft"
-   top_delta="-1"
-   width="40" >
-    <line_editor.commit_callback
-     function="Search.query" />
-  </line_editor>
-  <check_box
-   control_name="FindLandArea"
-   follows="left|top"
-   height="16"
-   label="Area &gt;"
-   layout="topleft"
-   left_pad="3"
-   name="area_check"
-   top_delta="1"
-   width="40" >
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <line_editor
-   enabled_control="FindLandArea"
-   commit_on_focus_lost="false"
-   follows="left|top"
-   layout="topleft"
-   height="16"
-   left_pad="18"
-   name="edit_area"
-   top_delta="-1"
-   width="40" >
-    <line_editor.commit_callback
-     function="Search.query" />
-  </line_editor>
-  <combo_box
-   control_name="FindLandType"
-   follows="right|top"
-   layout="topleft"
-   height="22"
-   allow_text_entry="false"
-   left_pad="90"
-   top_delta="-1"
-   name="land_type"
-   width="110">
-    <combo_box.item label="All Categories" name="All" value="All"/>
-    <combo_box.item label="Auction" name="Auction" value="Auction"/>
-    <combo_box.item label="Mainland Sales" name="Mainland" value="Mainland"/>
-    <combo_box.item label="Estate Sales" name="Estate" value="Estate"/>
-    <combo_box.commit_callback
-     function="Search.query" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_search_landsales">
+  <text name="search_title" value="検索語句を入力:" />
+  <check_box label="" name="pg_all" />
+
+  <icon name="rating_icon_general" />
+  <check_box label="" name="mature_all" />
+
+  <icon name="rating_icon_moderate" />
+  <check_box label="" name="adult_all" />
+  <icon name="rating_icon_adult" />
+  <check_box label="価格 >" name="price_check" />
+  <line_editor name="edit_price" />
+  <check_box label="エリア >" name="area_check" />
+  <line_editor name="edit_area" />
+  <combo_box name="land_type">
+    <combo_box.item label="すべてのカテゴリ" name="All" value="All" />
+    <combo_box.item label="オークション" name="Auction" value="Auction" />
+    <combo_box.item label="メインランドのセール" name="Mainland" value="Mainland" />
+    <combo_box.item label="不動産セール" name="Estate" value="Estate" />
   </combo_box>
-  <combo_box
-   control_name="FindLandSort"
-   follows="right|top"
-   layout="topleft"
-   height="22"
-   allow_text_entry="false"
-   left_pad="2"
-   top_delta="0"
-   name="land_sort"
-   width="110">
-    <combo_box.item label="Sort by Name" name="Name_item" value="Name"/>
-    <combo_box.item label="Sort by Price" name="Price_item" value="Price"/>
-    <combo_box.item label="Sort by Price per meter" name="PPM_item" value="PPM"/>
-    <combo_box.item label="Sort by Area" name="Area_item" value="Area"/>
-    <combo_box.commit_callback
-     function="Search.query" />
+  <combo_box name="land_sort">
+    <combo_box.item label="名前でソート" name="Name_item" value="Name" />
+    <combo_box.item label="価格でソート" name="Price_item" value="Price" />
+    <combo_box.item label="㎡あたりの価格でソート" name="PPM_item" value="PPM" />
+    <combo_box.item label="エリアでソート" name="Area_item" value="Area" />
   </combo_box>
-  <check_box
-   control_name="FindLandSortAscending"
-   follows="right|top"
-   height="16"
-   label="Ascending"
-   layout="topleft"
-   left_pad="3"
-   name="ascending"
-   top_delta="5"
-   width="40" >
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-</panel>
+  <check_box label="昇順" name="ascending" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_search_people.xml b/indra/newview/skins/default/xui/ja/panel_search_people.xml
index addd20ff739..a8f7e7f2b35 100644
--- a/indra/newview/skins/default/xui/ja/panel_search_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_search_people.xml
@@ -1,36 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- height="70"
- class="panel_search_people"
- name="panel_search_people"
- width="602">
-  <panel.string name="SeachFilteredOnShortWordsEmpty">
-   Your search terms were too short so no search was performed.
-  </panel.string>
-  <text
-   follows="left|top|right"
-   height="16"
-   layout="topleft"
-   left="4"
-   name="search_title"
-   top="4"
-   value="Enter search terms:"
-   width="255" />
-  <search_editor
-   follows="top|left|right"
-   search_button_visible="true"
-   height="22"
-   text_readonly_color="DkGray"
-   label="Search"
-   layout="topleft"
-   top_pad="1"
-   left="4"
-   right="-4"
-   name="search_bar"
-   select_on_focus="true"
-   commit_on_focus_lost="false"
-   tool_tip="Enter search terms">
-    <search_editor.commit_callback
-     function="Search.query" />
-  </search_editor>
+<panel name="panel_search_people">
+  <panel.string name="SeachFilteredOnShortWordsEmpty">検索語句が短すぎるため、検索は実行されませんでした。</panel.string>
+  <text name="search_title" value="検索語句を入力:" />
+  <search_editor label="検索" name="search_bar" />
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_search_places.xml b/indra/newview/skins/default/xui/ja/panel_search_places.xml
index fabc2c6bbaa..d35c7eb0f05 100644
--- a/indra/newview/skins/default/xui/ja/panel_search_places.xml
+++ b/indra/newview/skins/default/xui/ja/panel_search_places.xml
@@ -1,111 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- height="70"
- layout="topleft"
- name="panel_search_places"
- width="602">
-  <text
-   follows="left|top|right"
-   height="16"
-   layout="topleft"
-   left="4"
-   name="search_title"
-   top="4"
-   value="Enter search terms:"
-   width="255" />
-  <check_box
-   control_name="ShowPGSims"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left="489"
-   name="pg_all"
-   top="4"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_PG_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_general"
-   top_delta="-1"
-   width="18"/>
-  <check_box
-   control_name="ShowMatureSims"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left_pad="2"
-   name="mature_all"
-   top_delta="1"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_M_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_moderate"
-   top_delta="-1"
-   width="18"/>
-  <check_box
-   control_name="ShowAdultSims"
-   follows="right|top"
-   height="16"
-   label=""
-   layout="topleft"
-   left_pad="2"
-   name="adult_all"
-   top_delta="1"
-   width="15">
-    <check_box.commit_callback
-     function="Search.query" />
-  </check_box>
-  <icon
-   follows="right|top"
-   height="16"
-   image_name="Parcel_R_Dark"
-   layout="topleft"
-   left_pad="2"
-   name="rating_icon_adult"
-   top_delta="-1"
-   width="18"/>
-  <search_editor
-   follows="top|left|right"
-   search_button_visible="true"
-   height="22"
-   text_readonly_color="DkGray"
-   label="Search"
-   layout="topleft"
-   top_pad="1"
-   left="4"
-   right="-128"
-   name="search_bar"
-   select_on_focus="true"
-   commit_on_focus_lost="false"
-   tool_tip="Enter search terms">
-    <search_editor.commit_callback
-     function="Search.query" />
-  </search_editor>
-  <combo_box
-   follows="right|top"
-   layout="topleft"
-   height="23"
-   allow_text_entry="false"
-   top_delta="0"
-   left_pad="2"
-   name="places_category"
-   width="122">
-    <combo_box.commit_callback
-     function="Search.query" />
-  </combo_box>
+<panel name="panel_search_places">
+  <text name="search_title" value="検索語句を入力:"/>
+  <check_box label="" name="pg_all" />
+  <icon name="rating_icon_general" />
+  <check_box label="" name="mature_all" />
+  <icon name="rating_icon_moderate" />
+  <check_box label="" name="adult_all" />
+  <icon name="rating_icon_adult" />
+  <search_editor label="検索" name="search_bar" />
+  <combo_box name="places_category" />
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_search_web.xml b/indra/newview/skins/default/xui/ja/panel_search_web.xml
deleted file mode 100644
index c160728e735..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_search_web.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- height="775"
- layout="topleft"
- follows="all"
- name="panel_search_web"
- width="780">
-  <layout_stack
-    bottom="775"
-    follows="all"
-    layout="topleft"
-    left="5"
-    animate="false"
-    name="stack1"
-    orientation="vertical"
-    top="4"
-    width="770">
-    <layout_panel
-      height="40"
-      follows="all"
-      layout="topleft"
-      left_delta="0"
-      name="external_controls"
-      top_delta="0"
-      auto_resize="true"
-      width="585">
-      <web_browser
-        bottom="-2"
-        follows="all"
-        layout="topleft"
-        left="0"
-        name="webbrowser"
-        top="0"/>
-    </layout_panel>
-    <layout_panel
-     name="status_bar"
-     height="23"
-     auto_resize="false">
-      <button
-       image_overlay="Arrow_Left_Off"
-       image_disabled="PushButton_Disabled"
-       image_disabled_selected="PushButton_Disabled"
-       image_selected="PushButton_Selected"
-       image_unselected="PushButton_Off"
-       chrome="true"
-       hover_glow_amount="0.15"
-       tool_tip="Navigate back"
-       follows="left|top"
-       height="22"
-       layout="topleft"
-       left="1"
-       name="back"
-       top="0"
-       width="22">
-        <button.commit_callback
-         function="WebContent.Back" />
-      </button>
-      <button
-       image_overlay="Arrow_Right_Off"
-       image_disabled="PushButton_Disabled"
-       image_disabled_selected="PushButton_Disabled"
-       image_selected="PushButton_Selected"
-       image_unselected="PushButton_Off"
-       chrome="true"
-       tool_tip="Navigate forward"
-       follows="left|top"
-       height="22"
-       layout="topleft"
-       left="27"
-       name="forward"
-       top_delta="0"
-       width="22">
-        <button.commit_callback
-         function="WebContent.Forward" />
-      </button>
-      <button
-       image_overlay="Stop_Off"
-       image_disabled="PushButton_Disabled"
-       image_disabled_selected="PushButton_Disabled"
-       image_selected="PushButton_Selected"
-       image_unselected="PushButton_Off"
-       chrome="true"
-       tool_tip="Stop navigation"
-       enabled="true"
-       follows="left|top"
-       height="22"
-       layout="topleft"
-       left="51"
-       name="stop"
-       top_delta="0"
-       width="22">
-        <button.commit_callback
-         function="WebContent.Stop" />
-      </button>
-      <button
-       image_overlay="Refresh_Off"
-       image_disabled="PushButton_Disabled"
-       image_disabled_selected="PushButton_Disabled"
-       image_selected="PushButton_Selected"
-       image_unselected="PushButton_Off"
-       chrome="true"
-       tool_tip="Reload page"
-       follows="left|top"
-       height="22"
-       layout="topleft"
-       left="51"
-       name="reload"
-       top_delta="0"
-       width="22">
-        <button.commit_callback
-         function="WebContent.Reload" />
-      </button>
-      <text
-       type="string"
-       length="200"
-       follows="bottom|left"
-       height="20"
-       layout="topleft"
-       left_pad="3"
-       name="statusbartext"
-       parse_urls="false"
-       text_color="0.4 0.4 0.4 1"
-       top_delta="1"
-       width="441"/>
-      <progress_bar
-       color_bar="0.3 1.0 0.3 1"
-       follows="bottom|right"
-       height="16"
-       top_delta="1"
-       left_pad="3"
-       layout="topleft"
-       name="statusbarprogress"
-       width="64"/>
-    </layout_panel>
-  </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_toast.xml b/indra/newview/skins/default/xui/ja/panel_toast.xml
index 37a904bca81..e6e44ce309c 100644
--- a/indra/newview/skins/default/xui/ja/panel_toast.xml
+++ b/indra/newview/skins/default/xui/ja/panel_toast.xml
@@ -9,77 +9,10 @@
      look like it is positioned out of floater and able to accept mouse clicks (see EXT-4246)
 -->
 
-<floater
- legacy_header_height="0"
- header_height="0"
- name="toast"
- title=""
- visible="false"
- layout="topleft"
- height="47"  
- width="310"
- left="0"
- top="0"
- background_visible="false"
- bg_opaque_image="Toast_Over"
- bg_alpha_image="Toast_Background"
- can_minimize="false"
- can_tear_off="false"
- can_resize="false"
- can_drag_on_left="false"
- can_close="false"
- can_dock="false"
- border_visible = "false"
- border = "false"
->
- <panel
-  background_opaque="false"
-  border_visible="false"
-  background_visible="true"
-  bg_opaque_image="Toast_Over"
-  bg_alpha_image="Toast_Background"
-  label="wrapper_panel"
-  layout="topleft"
-  left="0"
-  name="wrapper_panel"
-  top="7"
-  height="40"
-  follows="all" 
-  translate="false"
-  width="305">
-  <!-- Don't remove this wiget! It is needed for Overflow and Start-Up toasts!-->
-  <text
-    clip_partial="true" 
-   visible="false"
-   follows="left|top|right|bottom"
-   font="SansSerif"
-   height="20"
-   layout="topleft"
-   left="20"
-   name="toast_text"
-   word_wrap="true"
-   text_color="White"
-   top="5"
-   translate="false"
-   use_ellipses="true"
-   width="260">
-    Toast text;
-  </text>
- </panel>
-  <button
-    layout="topleft"
-    top="0"
-    right="310"
-    width="17"
-    height="17"
-    follows="top|right"
-    visible="false"
-    enabled="true"
-    mouse_opaque="false"
-    name="hide_btn"
-    label=""
-    tab_stop="false"
-    image_unselected="Toast_CloseBtn"
-    image_selected="Toast_CloseBtn"
-  />
+<floater name="toast" title="" height="47">
+  <panel label="ラッパーパネル" name="wrapper_panel">
+    <!-- Don't remove this wiget! It is needed for Overflow and Start-Up toasts!-->
+    <text name="toast_text">トーストのテキスト</text>
+  </panel>
+  <button name="hide_btn" label="" />
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/panel_toolbar_view.xml b/indra/newview/skins/default/xui/ja/panel_toolbar_view.xml
deleted file mode 100644
index 07070b8eaf5..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_toolbar_view.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toolbar_view
- follows="all"
- layout="topleft"
- name="toolbar view"
- height="500"
- width="1024"
- left="0"
- top="0" 
- mouse_opaque="false"
- tab_stop="false"
- visible="true">
-  <layout_stack name="bottom_toolbar_stack"
-                orientation="vertical"
-                left="0"
-                top="0"
-                width="1024"
-                height="500"
-                follows="all"
-                mouse_opaque="false">
-  <layout_panel name="top_toolbar_panel"
-                auto_resize="false"
-                height="30"
-                width="1024"
-                mouse_opaque="false">
-    <toolbar layout="topleft"
-             button_panel.bg_opaque_image="Rounded_Rect_Top"
-             name="toolbar_top"
-             height="30"
-             left="40"
-             right="-40"
-             top="1"
-             side="top"
-             follows="left|right|top"
-             button_display_mode="icons_with_text"
-             visible="true">
-             <icon layout="topleft"
-                    height="28"
-                    width="15"
-                    follows="left|top"
-                    top="20"
-                    left="10"
-                    tab_stop="false" 
-                    visible="false"
-                    use_draw_context_alpha="false"
-                    image_name="Caret_Top_Icon"
-                    name="caret" />
-    </toolbar>
-  </layout_panel>
-  <layout_panel name="vertical_toolbar_panel"
-                auto_resize="true"
-                width="1024"
-                height="500"
-                mouse_opaque="false">
-    <layout_stack name="vertical_toolbar_stack"
-                  orientation="horizontal"
-                  left="0"
-                  top="0"
-                  width="1024"
-                  height="500"
-                  follows="all"
-                  mouse_opaque="false">
-      <layout_panel name="left_toolbar_panel"
-                    auto_resize="false"
-                    height="500"
-                    width="30"
-                    mouse_opaque="false">
-        <toolbar follows="left|top|bottom"
-                 button_panel.bg_opaque_image="Rounded_Rect_Right"
-                 name="toolbar_left"
-                 width="30"
-                 left="0"
-                 top="10"
-                 bottom="-10"
-                 side="left"
-                 button_display_mode="icons_only">
-	             <icon layout="topleft"
-	                   height="15"
-	                   width="28"
-	                   follows="left|top"
-	                   top="20"
-	                   left="10"
-	                   tab_stop="false" 
-                       visible="false"
-	                   image_name="Caret_Left_Icon"
-                       name="caret" />
-        </toolbar>
-      </layout_panel>
-      <layout_panel name="non_toolbar_panel"
-                    auto_resize="true"
-                    mouse_opaque="false"
-                    height="100"
-                    width="200">
-        <view top="0"
-              follows="all"
-              height="100"
-              left="0"
-              mouse_opaque="false"
-              name="floater_snap_region"
-              width="200"/>
-        <view top="0"
-              follows="left|top|bottom"
-              height="100"
-              left="0"
-              mouse_opaque="false"
-              name="minimized_floaters_region"
-              width="160"/>
-        <panel follows="left|top|right"
-               layout="topleft"
-               height="30"
-               left_pad="10"
-               mouse_opaque="false"
-               name="chiclet_container"
-               tab_stop="false"
-               top="0"
-               bg_visible="false"
-               width="20">
-        </panel>          
-        <panel bottom="100"
-               follows="left|right|bottom"
-               height="25"
-               left="0"
-               mouse_opaque="false"
-               tab_stop="false"
-               name="state_management_buttons_container"
-               visible="false"
-               width="350"/>
-      </layout_panel>
-       <layout_panel name="right_toolbar_panel"
-                    auto_resize="false"
-                    height="500"
-                    width="30"
-                    mouse_opaque="false">
-        <toolbar
-          button_panel.bg_opaque_image="Rounded_Rect_Left"
-          follows="right|top|bottom"
-          name="toolbar_right"
-          width="30"
-          left="0"
-          top="10"
-          bottom="-10"
-          side="right"
-          button_display_mode="icons_only">
-	      <icon layout="topleft"
-	            height="15"
-	            width="28"
-	            follows="left|top"
-	            top="20"
-	            left="10"
-	            tab_stop="false" 
-                visible="false"
-	            image_name="Caret_Right_Icon"
-	            name="caret" />
-        </toolbar>
-      </layout_panel>
-    </layout_stack>
-  </layout_panel>
-  <layout_panel name="bottom_toolbar_panel"
-                auto_resize="false"
-                height="30"
-                width="1024"
-                mouse_opaque="false">
-    <toolbar layout="topleft"
-             button_panel.bg_opaque_image="Rounded_Rect_Top"
-             name="toolbar_bottom"
-             height="30"
-             left="40"
-             right="-40"
-             top="0"
-             side="bottom"
-             follows="left|right|bottom"
-             button_display_mode="icons_with_text"
-             visible="true">
-             <icon layout="topleft"
-	            height="28"
-	            width="15"
-	            follows="left|top"
-	            top="20"
-	            left="10"
-	            tab_stop="false" 
-                visible="false"
-                use_draw_context_alpha="false"
-	            image_name="Caret_Bottom_Icon"
-	            name="caret" />
-    </toolbar>
-  </layout_panel>
-  </layout_stack>
-</toolbar_view>
diff --git a/indra/newview/skins/default/xui/ja/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/ja/panel_topinfo_bar.xml
deleted file mode 100644
index 45dd53c4a9d..00000000000
--- a/indra/newview/skins/default/xui/ja/panel_topinfo_bar.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<panel
- background_visible="true"
- background_opaque="false"
- bg_opaque_color="Black_50"
- bg_alpha_color="Black_50"
- follows="left|top"
- height="19"
- layout="topleft"
- name="topinfo_bar"
- width="1024">
-  <button
-    follows="left|top"
-    height="16"
-    hover_glow_amount="0.15"
-    image_disabled="Info_Off"
-    image_disabled_selected="Info_Off"
-    image_selected="Info_Off"
-    image_unselected="Info_Off"
-    left="11"
-    name="place_info_btn"
-    top="1"
-    width="16"/>
-   <text
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left_pad="11"
-     length="1"
-     name="parcel_info_text"
-     top="1"
-     type="string"
-     width="1"/>
-  <icon
-    enabled="true"
-    follows="right|top"
-    height="18"
-    image_name="Parcel_VoiceNo_Dark"
-    name="voice_icon"
-    top="1"
-    visible="false"
-    width="22"
-    />
-  <icon
-    follows="right|top"
-    height="18"
-    image_name="Parcel_FlyNo_Dark"
-    name="fly_icon"
-    top="1"
-    visible="false"
-    width="22"
-    />
-  <icon
-    follows="right|top"
-    height="18"
-    image_name="Parcel_PushNo_Dark"
-    name="push_icon"
-    top="1"
-    visible="false"
-    width="22"
-    />
-  <icon
-    follows="right|top"
-    height="18"
-    image_name="Parcel_BuildNo_Dark"
-    name="build_icon"
-    top="1"
-    visible="false"
-    width="22"
-    />
-  <icon
-    follows="right|top"
-    height="18"
-    image_name="Parcel_ScriptsNo_Dark"
-    name="scripts_icon"
-    top="1"
-    visible="false"
-    width="22"
-    />
-  <icon
-    follows="right|top"
-    height="13"
-    image_name="Parcel_Health_Dark"
-    left="2"
-    name="damage_icon"
-    top="3"
-    visible="false"
-    width="14"
-    />
-  <icon
-    follows="right|top"
-    height="13"
-    image_name="Parcel_SeeAVsOff_Light"
-    left="2"
-    name="see_avatars_icon"
-    top="3"
-    visible="false"
-    width="14"
-    />
-  <text
-    follows="right|top"
-    font="SansSerifSmall"
-    halign="right"
-    height="18"
-    name="damage_text"
-    top="5"
-    visible="false"
-    width="35"
-    />
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/rlva_strings.xml b/indra/newview/skins/default/xui/ja/rlva_strings.xml
index 654cf2b96b2..45a8a7e263f 100644
--- a/indra/newview/skins/default/xui/ja/rlva_strings.xml
+++ b/indra/newview/skins/default/xui/ja/rlva_strings.xml
@@ -1,249 +1,249 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <llsd>
-<map>
+  <map>
 
-	<key>strings</key>
-	<map>
-		<!-- Primarily used when @showloc restricted -->
-		<key>hidden_generic</key>
-		<map>
-			<key>value</key>
-			<string>(Hidden)</string>
-		</map>
-		<key>hidden_parcel</key>
-		<map>
-			<key>value</key>
-			<string>(Hidden parcel)</string>
-		</map>
-		<key>hidden_region</key>
-		<map>
-			<key>value</key>
-			<string>(Hidden region)</string>
-		</map>
-		<key>hidden_grid</key>
-		<map>
-			<key>value</key>
-			<string>(Hidden grid)</string>
-		</map>
+    <key>strings</key>
+    <map>
+      <!-- Primarily used when @showloc restricted -->
+      <key>hidden_generic</key>
+      <map>
+        <key>value</key>
+        <string>(非表示)</string>
+      </map>
+      <key>hidden_parcel</key>
+      <map>
+        <key>value</key>
+        <string>(区画非表示)</string>
+      </map>
+      <key>hidden_region</key>
+      <map>
+        <key>value</key>
+        <string>(リージョン非表示)</string>
+      </map>
+      <key>hidden_grid</key>
+      <map>
+        <key>value</key>
+        <string>(グリッド非表示)</string>
+      </map>
 
-		<!-- Received/sent IMs will be replaced by the matching string when @recvim/sendim restricted -->
-		<key>blocked_recvim</key>
-		<map>
-			<key>value</key>
-			<string>*** IM blocked by your viewer</string>
-			<key>description</key>
-			<string>Shown in place of the original message when an incoming IM is blocked</string>
-			<key>label</key>
-			<string>Blocked incoming IM message (local)</string>
-			<key>customizable</key>
-			<boolean>1</boolean>
-		</map>
-		<key>blocked_sendim</key>
-		<map>
-			<key>value</key>
-			<string>*** IM blocked by sender's viewer</string>
-			<key>description</key>
-			<string>Shown (and sent to the remote party) when an outgoing IM is blocked</string>
-			<key>label</key>
-			<string>Blocked outgoing IM message (local + remote)</string>
-			<key>customizable</key>
-			<boolean>1</boolean>
-		</map>
+      <!-- Received/sent IMs will be replaced by the matching string when @recvim/sendim restricted -->
+      <key>blocked_recvim</key>
+      <map>
+        <key>value</key>
+        <string>※IMはビューアによってブロックされています。</string>
+        <key>description</key>
+        <string>IMの受信がブロックされている場合、元のメッセージの代わりに表示されます。</string>
+        <key>label</key>
+        <string>IMの受信がブロックされているときのメッセージ(ローカル)</string>
+        <key>customizable</key>
+        <boolean>1</boolean>
+      </map>
+      <key>blocked_sendim</key>
+      <map>
+        <key>value</key>
+        <string>※IMは送信者のビューアによってブロックされています。</string>
+        <key>description</key>
+        <string>IMの送信がブロックされている場合、かわりに表示(相手のパーティーには送信)されます。</string>
+        <key>label</key>
+        <string>IMの送信がブロックされているときのメッセージ(ローカル+リモート)</string>
+        <key>customizable</key>
+        <boolean>1</boolean>
+      </map>
 
-		<!-- Sent to the remote party when they issue @list or @except as an IM query (if enabled) -->
-		<key>imquery_list_deny</key>
-		<map>
-			<key>value</key>
-			<string>*** The other party respectfully requests you mind your own business (bunnies made me do it!)</string>
-			<key>description</key>
-			<string>Sent to the remote party when you deny their request to list your active RLV restrictions)</string>
-			<key>label</key>
-			<string>@list and @except command (remote)</string>
-			<key>customizable</key>
-			<boolean>1</boolean>
-		</map>
+      <!-- Sent to the remote party when they issue @list or @except as an IM query (if enabled) -->
+      <key>imquery_list_deny</key>
+      <map>
+        <key>value</key>
+        <string>※相手は、敬意を持って私を気にかけてくださいと要求しています。(バニーさんが私をそうさせたのです!)</string>
+        <key>description</key>
+        <string>有効なRLV制限一覧を取得する要求を拒否した場合に、相手に送信されるメッセージを指定します。</string>
+        <key>label</key>
+        <string>@listと@exceptコマンド(リモート)</string>
+        <key>customizable</key>
+        <boolean>1</boolean>
+      </map>
 
-		<!-- Sent to the remote party as a suffix to @list to inform them there might be more information -->
-		<key>imquery_list_suffix</key>
-		<map>
-			<key>value</key>
-			<string>(Use @except to see the list of active exceptions)</string>
-			<key>description</key>
-			<string>Sent to the remote party as a suffix to @list to inform them how to request your exceptions</string>
-			<key>label</key>
-			<string>@list command suffix (remote)</string>
-			<key>customizable</key>
-			<boolean>0</boolean>
-		</map>
+      <!-- Sent to the remote party as a suffix to @list to inform them there might be more information -->
+      <key>imquery_list_suffix</key>
+      <map>
+        <key>value</key>
+        <string>(有効な例外一覧を表示したい場合、@excelを使用します。)</string>
+        <key>description</key>
+        <string>@listコマンドの接尾辞としてリモートパーティーに送信され、例外としてリクエストする方法が通知されます。</string>
+        <key>label</key>
+        <string>@listコマンドの接尾辞(リモート)</string>
+        <key>customizable</key>
+        <boolean>0</boolean>
+      </map>
 
-		<!-- Sent to the remote party when they issue @stopim as an IM query (if enabled) -->
-		<key>stopim_nosession</key>
-		<map>
-			<key>value</key>
-			<string>*** The other party is not under a @startim restriction</string>
-			<key>description</key>
-			<string>Sent to the remote party when they attempt to forcefully close your IM conversation with them (and no such session exists)</string>
-			<key>label</key>
-			<string>@stopim command with no session (remote)</string>
-			<key>customizable</key>
-			<boolean>1</boolean>
-		</map>
-		<key>stopim_endsession_remote</key>
-		<map>
-			<key>value</key>
-			<string>*** Session has been ended for the other party</string>
-			<key>description</key>
-			<string>Sent to the remote party when they attempt to forcefully close the IM conversation (and it exists)</string>
-			<key>label</key>
-			<string>@stopim command with an active session (remote)</string>
-			<key>customizable</key>
-			<boolean>1</boolean>
-		</map>
-		<key>stopim_endsession_local</key>
-		<map>
-			<key>value</key>
-			<string>[NAME] has remotely closed the IM conversation with @stopim</string>
-		</map>
+      <!-- Sent to the remote party when they issue @stopim as an IM query (if enabled) -->
+      <key>stopim_nosession</key>
+      <map>
+        <key>value</key>
+        <string>※他のパーティーは@startimによる制約を受けていません。</string>
+        <key>description</key>
+        <string>相手があなたとのIM会話を強制的に終了しようとした(もしくはそのようなセッションが存在しない)ときに、相手に送信されるメッセージを指定します。</string>
+        <key>label</key>
+        <string>セッションが無いときの@stopimコマンド(リモート)</string>
+        <key>customizable</key>
+        <boolean>1</boolean>
+      </map>
+      <key>stopim_endsession_remote</key>
+      <map>
+        <key>value</key>
+        <string>※他のパーティーによってセッションは終了しました。</string>
+        <key>description</key>
+        <string>相手がIM会話を強制的に終了しようとした(または、存在する)ときに送信されます。</string>
+        <key>label</key>
+        <string>アクティブなセッションでの@stopimコマンド(リモート)</string>
+        <key>customizable</key>
+        <boolean>1</boolean>
+      </map>
+      <key>stopim_endsession_local</key>
+      <map>
+        <key>value</key>
+        <string>[NAME]さんは、IMによる会話を@stopimで終了しました。</string>
+      </map>
 
-		<!-- Shown as notifications -->
-		<key>blocked_autopilot</key>
-		<map>
-			<key>value</key>
-			<string>Unable to use the autopilot due to RLV restrictions</string>
-		</map>
-		<key>blocked_generic</key>
-		<map>
-			<key>value</key>
-			<string>Unable to perform action due to RLV restrictions</string>
-		</map>
-		<key>blocked_groupchange</key>
-		<map>
-			<key>value</key>
-			<string>Unable to change your active group due to an RLV restriction; switching back to "[GROUP_SLURL]"</string>
-		</map>
-		<key>blocked_invfolder</key>
-		<map>
-			<key>value</key>
-			<string>Unable to perform the requested inventory action due to an RLV locked folder.</string>
-		</map>
-		<key>blocked_nearby</key>
-		<map>
-			<key>value</key>
-			<string>Unable to see the presence of nearby avatars due to RLV restrictions</string>
-		</map>
-		<key>blocked_permattach</key>
-		<map>
-			<key>value</key>
-			<string>Attempt to attach '[OBJECT]' was denied due to RLV restrictions</string>
-		</map>
-		<key>blocked_permteleport</key>
-		<map>
-			<key>value</key>
-			<string>'[OBJECT]' was denied permission to teleport you due to RLV restrictions</string>
-		</map>
-		<key>blocked_scriptdialog</key>
-		<map>
-			<key>value</key>
-			<string>Unable to show script dialog or textbox due to RLV restrictions</string>
-		</map>
-		<key>blocked_share</key>
-		<map>
-			<key>value</key>
-			<string>Unable to share inventory with [RECIPIENT] due to RLV restrictions.</string>
-		</map>
-		<key>blocked_share_generic</key>
-		<map>
-			<key>value</key>
-			<string>Unable to share inventory due to RLV restrictions.</string>
-		</map>
-		<key>blocked_startim</key>
-		<map>
-			<key>value</key>
-			<string>Unable to start IM session with [RECIPIENT] due to RLV restrictions</string>
-		</map>
-		<key>blocked_startconf</key>
-		<map>
-			<key>value</key>
-			<string>Unable to start conference with [RECIPIENT] due to RLV restrictions</string>
-		</map>
-		<key>blocked_teleport</key>
-		<map>
-			<key>value</key>
-			<string>Unable to initiate teleport due to RLV restrictions</string>
-		</map>
-		<key>blocked_teleport_offer</key>
-		<map>
-			<key>value</key>
-			<string>Unable to offer teleport due to RLV restrictions</string>
-		</map>
-		<key>blocked_viewxxx</key>
-		<map>
-			<key>value</key>
-			<string>Unable to open [TYPE] due to RLV restrictions</string>
-		</map>
-		<key>blocked_wireframe</key>
-		<map>
-			<key>value</key>
-			<string>Unable to enable wireframe mode due to RLV restrictions</string>
-		</map>
+      <!-- Shown as notifications -->
+      <key>blocked_autopilot</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、オートパイロットは使用できません。</string>
+      </map>
+      <key>blocked_generic</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、そのアクションは実行できません。</string>
+      </map>
+      <key>blocked_groupchange</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、アクティブなグループを変更できません。「[GROUP_SLURL]」に戻します。</string>
+      </map>
+      <key>blocked_invfolder</key>
+      <map>
+        <key>value</key>
+        <string>RLVによってフォルダがロックされているため、インベントリに対するアクションを実行できません。</string>
+      </map>
+      <key>blocked_nearby</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、近くにいるアバターの存在を確認できません。</string>
+      </map>
+      <key>blocked_permattach</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、「[OBJECT]」の着用が拒否されました。</string>
+      </map>
+      <key>blocked_permteleport</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、「[OBJECT]」によるテレポート操作は拒否されました。</string>
+      </map>
+      <key>blocked_scriptdialog</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、スクリプトによるダイアログやテキストボックスは表示できません。</string>
+      </map>
+      <key>blocked_share</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、[RECIPIENT]とのインベントリの共有はできません。</string>
+      </map>
+      <key>blocked_share_generic</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、インベントリの共有はできません。</string>
+      </map>
+      <key>blocked_startim</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、[RECIPIENT]とのIMセッションを開始できません。</string>
+      </map>
+      <key>blocked_startconf</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、[RECIPIENT]と会話することができません。</string>
+      </map>
+      <key>blocked_teleport</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、テレポートできません。</string>
+      </map>
+      <key>blocked_teleport_offer</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、テレポートのオファーを受け付けられません。</string>
+      </map>
+      <key>blocked_viewxxx</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、[TYPE]を開くことができません。</string>
+      </map>
+      <key>blocked_wireframe</key>
+      <map>
+        <key>value</key>
+        <string>RLVの制限により、ワイヤーフレームモードを有効にできません。</string>
+      </map>
 
-		<!-- Sent as "Busy" messages to the remote party -->
-		<key>blocked_recvim_remote</key>
-		<map>
-			<key>value</key>
-			<string>The Resident you messaged is currently prevented from reading your instant messages at the moment, please try again later.</string>
-			<key>description</key>
-			<string>Sent to the remote party when their IM was blocked</string>
-			<key>label</key>
-			<string>Blocked incoming IM message (remote)</string>
-			<key>customizable</key>
-			<boolean>1</boolean>
-		</map>
-		<key>blocked_tplurerequest_remote</key>
-		<map>
-			<key>value</key>
-			<string>The Resident is currently prevented from accepting. Please try again later.</string>
-			<key>description</key>
-			<string>Sent to the remote party when their teleport offer or request was blocked</string>
-			<key>label</key>
-			<string>Blocked teleport offer/request (remote)</string>
-			<key>customizable</key>
-			<boolean>1</boolean>
-		</map>
-	</map>
+      <!-- Sent as "Busy" messages to the remote party -->
+      <key>blocked_recvim_remote</key>
+      <map>
+        <key>value</key>
+        <string>あなたがメッセージを送信した住民は、現在あなたのインスタントメッセージを読むことができません。お手数ですが、後でもう一度お試しください。</string>
+        <key>description</key>
+        <string>IMがブロックされたときに相手に送信されるメッセージです。</string>
+        <key>label</key>
+        <string>ブロックされたIM受信メッセージ(リモート)</string>
+        <key>customizable</key>
+        <boolean>1</boolean>
+      </map>
+      <key>blocked_tplurerequest_remote</key>
+      <map>
+        <key>value</key>
+        <string>あなたが誘った住民は、現在あなたの要求を受け入れることができません。お手数ですが、後でもう一度試しください。</string>
+        <key>description</key>
+        <string>テレポートのオファーがブロックされたときに、相手に送信されるメッセージです。</string>
+        <key>label</key>
+        <string>ブロックされたテレポートのオファー(リモート)</string>
+        <key>customizable</key>
+        <boolean>1</boolean>
+      </map>
+    </map>
 
-	<!-- Generic names used to replace resident names when @shownames restricted -->
-	<key>anonyms</key>
-	<array>
-		<string>A resident</string>
-		<string>This resident</string>
-		<string>That resident</string>
-		<string>An individual</string>
-		<string>This individual</string>
-		<string>That individual</string>
-		<string>A person</string>
-		<string>This person</string>
-		<string>That person</string>
-		<string>A stranger</string>
-		<string>This stranger</string>
-		<string>That stranger</string>
-		<string>A being</string>
-		<string>This being</string>
-		<string>That being</string>
-		<string>An agent</string>
-		<string>This agent</string>
-		<string>That agent</string>
-		<string>A soul</string>
-		<string>This soul</string>
-		<string>That soul</string>
-		<string>Somebody</string>
-		<string>Some people</string>
-		<string>Someone</string>
-		<string>Mysterious one</string>
-		<string>An unknown being</string>
-		<string>Unidentified one</string>
-		<string>An unknown person</string>
-	</array>
+    <!-- Generic names used to replace resident names when @shownames restricted -->
+    <key>anonyms</key>
+    <array>
+      <string>住民</string>
+      <string>この住民</string>
+      <string>その住民</string>
+      <string>人</string>
+      <string>この人</string>
+      <string>その人</string>
+      <string>人物</string>
+      <string>この人物</string>
+      <string>その人物</string>
+      <string>知らない人</string>
+      <string>この知らない人</string>
+      <string>その知らない人</string>
+      <string>存在</string>
+      <string>この存在</string>
+      <string>その存在</string>
+      <string>エージェント</string>
+      <string>このエージェント</string>
+      <string>そのエージェント</string>
+      <string>é­‚</string>
+      <string>この魂</string>
+      <string>その魂</string>
+      <string>誰か</string>
+      <string>ある人</string>
+      <string>何者か</string>
+      <string>不思議ななにか</string>
+      <string>未知の存在</string>
+      <string>Unidentified one</string>
+      <string>謎の人物</string>
+    </array>
 
-</map>
-</llsd>
+  </map>
+</llsd>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index f2e2c72cf50..046647d5771 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -8,11 +8,15 @@ that are returned from one component and may appear in many places
 <strings>
 
   <!-- Default Args - these arguments will be replaced in all strings -->
-  <string name="SECOND_LIFE">Second Life</string>
-  <string name="APP_NAME">Second Life</string>
-  <string name="CAPITALIZED_APP_NAME">SECOND LIFE</string>
-  <string name="SECOND_LIFE_GRID">Second Lifeグリッド</string>
-  <string name="SUPPORT_SITE">Second Lifeサポートポータル</string>
+  <string name="SECOND_LIFE">[CURRENT_GRID]</string>
+  <string name="APP_NAME">Alchemy</string>
+  <string name="CAPITALIZED_APP_NAME">ALCHEMY</string>
+  <string name="SECOND_LIFE_GRID">[CURRENT_GRID]グリッド</string>
+  <string name="SUPPORT_SITE">サポートポータル</string>
+  <!-- Default Args set in LLViewerNetwork -->
+  <string name="CURRENT_GRID"/>
+  <string name="GRID_ADMIN"/>
+
   <!-- starting up -->
   <string name="StartupDetectingHardware">ハードウェアの検出中です…</string>
   <string name="StartupLoading">[APP_NAME]をインストール中です…</string>
@@ -107,11 +111,11 @@ LibVLCバージョン:[LIBVLC_VERSION]
   <string name="AgniGridLabel">Second Lifeメイングリッド (Agni)</string>
   <string name="AditiGridLabel">Second Lifeベータテストグリッド (Aditi)</string>
 
-  <string name="ViewerDownloadURL">https://secondlife.com/support/downloads/?lang=ja</string>
-  <string name="LoginFailedViewerNotPermitted">お使いの古いビューアでは、Second Lifeにアクセスできません。以下のページから新しいビューアをダウンロードしてください: https://secondlife.com/support/downloads/?lang=ja
+  <string name="ViewerDownloadURL">https://www.alchemyviewer.org/pages/downloads.html</string>
+  <string name="LoginFailedViewerNotPermitted">お使いの古いビューアでは、[CURRENT_GRID]にアクセスできません。以下のページから新しいビューアをダウンロードしてください: https://secondlife.com/support/downloads/?lang=ja
 
 詳細については、FAQ を参照してください:
-https://secondlife.com/viewer-access-faq</string>
+https://www.alchemyviewer.org/pages/downloads.html</string>
   <string name="LoginIntermediateOptionalUpdateAvailable">ビューアの更新(オプション)があります:[VERSION]</string>
   <string name="LoginFailedRequiredUpdate">ビューアの更新(必須):[VERSION]</string>
   <string name="LoginFailedAlreadyLoggedIn">このエージェントは既にログインしています。</string>
@@ -296,7 +300,7 @@ support@secondlife.com にお問い合わせください。</string>
 
   <string name="ReleaseNotes">リリースノート</string>
   <!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
-  <string name="RELEASE_NOTES_BASE_URL" translate="false">https://releasenotes.secondlife.com/viewer/</string>
+  <string name="RELEASE_NOTES_BASE_URL" translate="false">https://git.alchemyviewer.org/alchemy/alchemy/releases/</string>
 
   <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
   <string name="LoadingData">読み込んでいます…</string>
@@ -2898,7 +2902,7 @@ For AI Character: Get the closest navigable point to the point provided.
 続けますか?</string>
   <string name="MBWarning">警告</string>
   <string name="MBNoAutoUpdate">自動更新は現在 Linux には対応していません。
-www.secondlife.com から最新バージョンをダウンロードしてください。</string>
+https://www.alchemyviewer.org から最新バージョンをダウンロードしてください。</string>
   <string name="MBRegClassFailed">RegisterClass 失敗</string>
   <string name="MBError">エラー</string>
   <string name="MBFullScreenErr">[WIDTH]✕[HEIGHT]では全画面で実行することができません。
@@ -4112,4 +4116,51 @@ www.secondlife.com のウェブサイトに接続できるかご確認くださ
 また、お使いのネットワークとファイアウォールが正しく設定されている事もお確かめください。
 このエラーが継続的に起こる場合は、Secondlife.com のサポートセクションから問題を報告してください。
 [https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AD%E3%82%B0%E3%82%A4%E3%83%B3%E3%82%A8%E3%83%A9%E3%83%BC-r1283/ ナレッジベース]</string>
+
+  <!-- Alchemy Strings -->
+  <string name="NotifyIncomingMessage">[NAME]さんからメッセージが届いています…</string>
+  <string name="AvatarTyping">入力中</string>
+  <string name="UnknownAvatar">不明なアバター</string>
+  <string name="NotAvailableOnPlatform">このプラットフォームでは使用できません。</string>
+  <string name="GridInfoTitle">グリッド情報</string>
+
+  <!-- <LSL Preprocessor -->
+  <string name="preproc_toggle_warning">プリプロセッサの切り替えは、このエディタを閉じて再度開くまで完全には有効になりません。</string>
+  <string name="fs_preprocessor_starting">[APP_NAME]プリプロセッサを開始しています…</string>
+  <string name="fs_preprocessor_not_supported">警告:このビルドではプリプロセッサをサポートしていません。([WHERE])</string>
+  <string name="fs_preprocessor_disabled_by_script_marker">[APP_NAME]プリプロセッサは、[LINENUMBER]行目の命令で無効化されています。</string>
+  <string name="fs_preprocessor_settings_list_prefix">設定:</string>
+  <string name="fs_preprocessor_cpp_exception">[ERR_NAME]([LINENUMBER]):[ERR_DESC]</string>
+  <string name="fs_preprocessor_lexing_exception">[SEVERITY]:[ERR_NAME]([LINENUMBER]):[ERR_DESC]</string>
+  <string name="fs_preprocessor_exception">[ERR_NAME]([LINENUMBER]):以下の例外が発生しました:[ERR_DESC]</string>
+  <string name="fs_preprocessor_error">[ERR_NAME]([LINENUMBER]):予期しない例外がキャッチされました。</string>
+  <string name="fs_preprocessor_lsl2_directive_override">LSL2としてコンパイルするディレクティブの優先設定が検出されました。</string>
+  <string name="fs_preprocessor_mono_directive_override">Monoとしてコンパイルするディレクティブの優先設定が検出されました。</string>
+  <!-- LSL Optimizer -->
+  <string name="fs_preprocessor_optimizer_start">参照されていないユーザー定義関数とグローバル変数を最適化します。</string>
+  <string name="fs_preprocessor_optimizer_regex_err">有効な正規表現ではありません:「[WHAT]」;LSL最適化はスキップされました。</string>
+  <string name="fs_preprocessor_optimizer_exception">例外をキャッチしました:「[WHAT]」;LSL最適化はスキップされました。</string>
+  <string name="fs_preprocessor_optimizer_unexpected_exception">LSL最適化時に予期しない例外が発生しました。適用されていません。</string>
+  <!-- LSL Compressor -->
+  <string name="fs_preprocessor_compress_start">不要なスペースを削除してスクリプトテキストを圧縮します。</string>
+  <string name="fs_preprocessor_compress_regex_err">有効な正規表現ではありません:「[WHAT]」;LSL圧縮はスキップされました。</string>
+  <string name="fs_preprocessor_compress_exception">例外をキャッチしました:「[WHAT]」;LSL圧縮はスキップされました。</string>
+  <string name="fs_preprocessor_compress_unexpected_exception">LSL圧縮時に予期しない例外が発生しました。適用されていません。</string>
+  <!-- LSL Lazy lists -->
+  <string name="fs_preprocessor_lazylist_start">遅延リスト変換を適用します。</string>
+  <string name="fs_preprocessor_lazylist_regex_err">有効な正規表現ではありません:「[WHAT]」;LSL遅延リスト変換はスキップされました。</string>
+  <string name="fs_preprocessor_lazylist_exception">例外をキャッチしました:「[WHAT]」;LSL遅延リスト変換されました。</string>
+  <string name="fs_preprocessor_lazylist_unexpected_exception">LSL遅延リスト変換時に予期しない例外が発生しました。適用されていません。</string>
+  <!-- LSL switch statement -->
+  <string name="fs_preprocessor_switchstatement_start">Switch文変換を適用します。</string>
+  <string name="fs_preprocessor_switchstatement_regex_err">有効な正規表現ではありません:「[WHAT]」;Swicth文変換はスキップされました。</string>
+  <string name="fs_preprocessor_switchstatement_exception">例外をキャッチしました:'[WHAT]'; Swicth文変換はスキップされました。</string>
+  <string name="fs_preprocessor_switchstatement_unexpected_exception">Switch文変換時に予期しない例外が発生しました。適用されていません。</string>
+  <!-- LSL Cache -->
+  <string name="fs_preprocessor_cache_miss">キャッシュされたインクルードファイル:「[FILENAME]」</string>
+  <string name="fs_preprocessor_cache_invalidated">インクルードされたファイル「[FILENAME]」に変更がありました。再キャッシュしています。</string>
+  <string name="fs_preprocessor_cache_completed">コンパイルされた「[FILENAME]」をキャッシュしています。</string>
+  <string name="fs_preprocessor_cache_unsafe">エラー:「[FILENAME]」という名前のスクリプトをファイルシステムにコピーするのは安全ではありません。このインクルードは失敗します。</string>
+  <string name="fs_preprocessor_caching_err">エラー:インクルードされた「[FILENAME]」というファイルをキャッシュできませんでした。</string>
+  <string name="fs_preprocessor_truncated">警告:スクリプトのテキストサイズが大きすぎるため、プリプロセッサの出力が切り詰められました。このスクリプトはおそらく機能しません。</string>
 </strings>
\ No newline at end of file
-- 
GitLab