Merge branch 'DRTVWR-559' into DRTVWR-592

16 files changed, 129 insertions, 2 deletions

diff --git a/indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml
new file mode 100644
index 0000000000..c811d94a35
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<bodyparts_list_item name="wearable_item">
+	<item_icon name="item_icon"/>
+	<item_name name="item_name" value="…"/>
+	<lock_panel name="btn_lock" tool_tip="編集権限がありません。"/>
+	<lock_icon name="btn_lock1"/>
+	<edit_panel name="btn_edit_panel"/>
+	<edit_btn name="btn_edit" tool_tip="このシェイプを編集"/>
+</bodyparts_list_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
new file mode 100644
index 0000000000..e952186632
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<clothing_list_item name="wearable_item">
+	<lock_icon name="item_icon"/>
+	<item_name name="item_name" value="…"/>
+	<up_btn name="btn_move_up"/>
+	<down_btn name="btn_move_down"/>
+	<lock_panel name="btn_lock" tool_tip="編集権限がありません。"/>
+	<lock_icon name="btn_lock1"/>
+	<edit_panel name="btn_edit_panel"/>
+	<edit_btn name="btn_edit" tool_tip="この衣装を編集"/>
+</clothing_list_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
new file mode 100644
index 0000000000..741d854813
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<deletable_wearable_list_item name="deletable_wearable_item">
+	<delete_btn name="btn_delete" tool_tip="アウトフィットから削除"/>
+	<item_icon name="item_icon"/>
+	<item_name name="item_name" value="…"/>
+</deletable_wearable_list_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml b/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
index 485ebb3e39..6526b2be67 100644
--- a/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
@@ -1,2 +1,28 @@
-<?xml version="1.0" ?>
-<densityctrl name="density_ctrl" label="密度"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<densityctrl abel="密度" name="density_ctrl">
+	<text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">
+		指数項
+	</text>
+	<slider dname="level_exponential"/>
+	<view left_pad="15" top="15" name="preview_image" height="140" width="140" follows="left|top"/>
+	<text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">
+		指数尺度係数
+	</text>
+	<slider dname="exponential_scale"/>
+	<text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">
+		線形項
+	</text>
+	<slider dname="level_linear"/>
+	<text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">
+		定数項
+	</text>
+	<slider dname="level_constant"/>
+	<text follows="left|top" height="11" layout="topleft" left="15" top_pad="15" width="80">
+		最大高度
+	</text>
+	<slider name="max_altitude"/>
+	<text follows="left|top" height="11" layout="topleft" name="aniso_factor_label" left="15" top_pad="15" width="80">
+		異方性係数
+	</text>
+	<slider name="aniso_factor"/>
+</densityctrl>
diff --git a/indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml
new file mode 100644
index 0000000000..fdf21253cf
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<dummy_clothing_list_item name="dummy_clothing_item">
+	<item_icon name="item_icon"/>
+	<item_name name="item_name" value="…"/>
+	<add_panel name="btn_add_panel"/>
+	<add_btn name="btn_add" tool_tip="この種類のアイテムを更に追加します。"/>
+</dummy_clothing_list_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
new file mode 100644
index 0000000000..b08dc59fc5
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<flat_list_view>
+	<flat_list_view.no_items_text name="no_items_msg" value="一致するものが見つかりませんでした。"/>
+</flat_list_view>
diff --git a/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml
new file mode 100644
index 0000000000..1dd00355fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inbox_folder_view_folder folder_arrow_image="Folder_Arrow" folder_indentation="8" item_height="20" item_top_pad="4" selection_image="Rounded_Square" left_pad="5" icon_pad="2" icon_width="16" text_pad="1" text_pad_right="4" arrow_size="12" max_folder_item_overlap="2">
+	<new_badge label="新規" label_offset_horiz="-1" location="right" padding_horiz="12.5" padding_vert="2" location_offset_hcenter="-23" border_image="New_Tag_Border" border_color="DkGray2" image="New_Tag_Background" image_color="Black"/>
+</inbox_folder_view_folder>
diff --git a/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml
new file mode 100644
index 0000000000..ae652617ef
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inbox_folder_view_item item_height="20" item_top_pad="4" selection_image="Rounded_Square">
+	<new_badge label="新規" label_offset_horiz="-1" location="right" padding_horiz="12.5" padding_vert="2" location_offset_hcenter="-23" border_image="New_Tag_Border" border_color="DkGray2" image="New_Tag_Background" image_color="Black"/>
+</inbox_folder_view_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml b/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
new file mode 100644
index 0000000000..3d51153411
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu_item_separator name="separator" label="─────"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml b/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
new file mode 100644
index 0000000000..badf65a18d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu_item_tear_off name="tear_off" label="〰〰〰〰〰"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/name_editor.xml b/indra/newview/skins/default/xui/ja/widgets/name_editor.xml
new file mode 100644
index 0000000000..98c4373050
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/name_editor.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<name_editor default_text="（取得しています）"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml
new file mode 100644
index 0000000000..1ec542e423
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel_camera_item>
+	<panel_camera_item.icon_over name="hovered_icon"/>
+	<panel_camera_item.icon_selected name="selected_icon"/>
+	<panel_camera_item.picture name="picture"/>
+	<panel_camera_item.selected_picture fname="selected_picture"/>
+	<panel_camera_item.text name="picture_name">
+		テキスト
+	</panel_camera_item.text>
+</panel_camera_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/person_view.xml b/indra/newview/skins/default/xui/ja/widgets/person_view.xml
new file mode 100644
index 0000000000..6d1040d6f6
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/person_view.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<person_view>
+	<avatar_icon/>
+	<last_interaction_time_textbox name="last_interaction_time_textbox"/>
+	<permission_edit_theirs_icon name="permission_edit_theirs_icon" tool_tip="このフレンドのオブジェクトを編集することはできません。"/>
+	<permission_edit_mine_icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトの編集や、削除、取得することができます。"/>
+	<permission_map_icon tool_tip="このフレンドは、マップ上であなたのいる場所を探すことができます。" name="permission_map_icon"/>
+	<permission_online_icon name="permission_online_icon" tool_tip="このフレンドは、あなたがオンラインになったことがわかります。"/>
+	<info_btn name="info_btn" tool_tip="詳細情報"/>
+	<profile_btn name="profile_btn" tool_tip="プロフィールを見る"/>
+	<output_monitor name="speaking_indicator"/>
+</person_view>
diff --git a/indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml
new file mode 100644
index 0000000000..b6f27ad148
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<sun_moon_trackball name="virtualtrackball">
+	<sun_moon_trackball.border/>
+	<sun_moon_trackball.labelN name="labelN" label="北"/>
+	<sun_moon_trackball.labelS name="labelS" label="南"/>
+	<sun_moon_trackball.labelW name="labelW" label="西"/>
+	<sun_moon_trackball.labelE name="labelE" label="東"/>
+	<sun_moon_trackball.button_rotate_top name="btn_rotate_top"/>
+	<sun_moon_trackball.button_rotate_bottom name="btn_rotate_bottom"/>
+	<sun_moon_trackball.button_rotate_left name="btn_rotate_left"/>
+	<sun_moon_trackball.button_rotate_right name="btn_rotate_right"/>
+</sun_moon_trackball>
diff --git a/indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml
new file mode 100644
index 0000000000..e75cab14c8
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_list_item>
+	<default_style/>
+	<worn_style/>
+	<item_icon name="item_icon"/>
+	<item_name name="item_name" value="…"/>
+	<add_btn name="add_wearable"/>
+	<remove_btn name="remove_wearable"/>
+</inventory_list_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/xy_vector.xml b/indra/newview/skins/default/xui/ja/widgets/xy_vector.xml
new file mode 100644
index 0000000000..dcb1966c92
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/xy_vector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<xy_vector name="xyvector">
+	<xy_vector.border visible="true"/>
+	<xy_vector.x_entry name="XEntry" tab_stop="true" label="Ｘ軸："/>
+	<xy_vector.y_entry name="YEntry" tab_stop="true" label="Ｙ軸："/>
+	<xy_vector.touch_area name="TouchArea"/>
+</xy_vector>