summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/ja
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/ja')
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_about.xml1
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_about_land.xml6
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_activeim.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_auction.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_autoreplace.xml6
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_avatar.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_avatar_picker.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_avatar_textures.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_beacons.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_build_options.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_bulk_perms.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_bumps.xml2
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_buy_contents.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_buy_currency.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_buy_land.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_buy_object.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_camera.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_chat_bar.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_choose_group.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_color_picker.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_critical.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml0
-rw-r--r--indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml14
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_destinations.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_display_name.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_environment_settings.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_event.xml0
-rw-r--r--indra/newview/skins/default/xui/ja/floater_experienceprofile.xml2
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_fast_timers.xml11
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_font_test.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_gesture.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_god_tools.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_hardware_settings.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_help_browser.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_how_to.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_hud.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_im_container.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_im_session.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_image_preview.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_import_collada.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_incoming_call.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_inspect.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml6
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_joystick.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_land_holdings.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml14
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_lsl_guide.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_map.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_media_browser.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_media_settings.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_mem_leaking.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml11
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_model_preview.xml41
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_moveview.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_mute_object.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_my_appearance.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_my_inventory.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_notification.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_notifications_console.xml0
-rw-r--r--indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml39
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_object_weights.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_openobject.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_outgoing_call.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml10
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml10
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml29
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_pay.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_pay_object.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_people.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_perm_prefs.xml0
-rw-r--r--indra/newview/skins/default/xui/ja/floater_perms_default.xml39
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_picks.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_places.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_post_process.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_preferences.xml0
-rw-r--r--indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml115
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_preview_animation.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_preview_gesture.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_preview_notecard.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_preview_sound.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_preview_texture.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_price_for_listing.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_publish_classified.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_region_debug_console.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_region_info.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_report_abuse.xml0
-rw-r--r--indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml14
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_script_debug.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_script_limits.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_script_preview.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_script_queue.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_script_search.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_search.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_select_key.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_sell_land.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_settings_debug.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_snapshot.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_sound_devices.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_sound_preview.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_spellcheck.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml9
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_stats.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_sys_well.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_telehub.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_tools.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_top_objects.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_tos.xml3
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_toybox.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_translation_settings.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_url_entry.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_voice_controls.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_voice_effect.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_web_content.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_window_size.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/floater_world_map.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/inspect_avatar.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/inspect_group.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/inspect_object.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/inspect_remote_object.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/language_settings.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_attachment_other.xml3
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_attachment_self.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_avatar_icon.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_avatar_other.xml3
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_avatar_self.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_cof_attachment.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_cof_body_part.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_cof_clothing.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_cof_gear.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_edit.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_favorites.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_gesture_gear.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_group_plus.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_hide_navbar.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_inventory.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_inventory_add.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_land.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_landmark.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_login.xml1
-rw-r--r--indra/newview/skins/default/xui/ja/menu_marketplace_view.xml2
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_media_ctrl.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_mini_map.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_navbar.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_nearby_chat.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_notification_well_button.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_object.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_object_icon.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_outfit_gear.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_outfit_tab.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_participant_list.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_people_groups.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_people_nearby.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_picks.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_picks_plus.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_place.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_place_add_button.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_profile_overflow.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_save_outfit.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_script_chiclet.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_slurl.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_text_editor.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_toolbars.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_topinfobar.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_url_agent.xml0
-rw-r--r--indra/newview/skins/default/xui/ja/menu_url_email.xml5
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_url_group.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_url_http.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_url_inventory.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_url_map.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_url_objectim.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_url_parcel.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_url_slapp.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_url_slurl.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_url_teleport.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_viewer.xml7
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_wearing_gear.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/menu_wearing_tab.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/mime_types.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/mime_types_linux.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/mime_types_mac.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/notifications.xml111
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_active_object_row.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_avatar_tag.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_chat_header.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_classified_info.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_cof_wearables.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_alpha.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_classified.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_eyes.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_gloves.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_hair.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_jacket.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_pants.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_physics.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_pick.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_profile.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_shape.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_shirt.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_shoes.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_skin.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_skirt.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_socks.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_underpants.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_edit_wearable.xml0
-rw-r--r--indra/newview/skins/default/xui/ja/panel_experience_log.xml2
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_group_control_panel.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_group_general.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_group_invite.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_group_land_money.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_group_list_item.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_group_notices.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_group_notify.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_group_roles.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_im_control_panel.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_instant_message.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_inventory_item.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_landmark_info.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_landmarks.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_login.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_main_inventory.xml7
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_me.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_media_settings_general.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_media_settings_security.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_navigation_bar.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_nearby_chat.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_nearby_media.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_notifications_channel.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_notify_textbox.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_online_status_toast.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_outfit_edit.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_outfits_list.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_people.xml1
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_pick_info.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_picks.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_place_profile.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_places.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_postcard_message.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_postcard_settings.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml2
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_preferences_chat.xml11
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_preferences_colors.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_preferences_general.xml4
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml112
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_preferences_move.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_preferences_setup.xml7
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_preferences_sound.xml0
-rw-r--r--indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml7
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml5
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_region_covenant.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_region_debug.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_region_environment.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_region_estate.xml0
-rw-r--r--indra/newview/skins/default/xui/ja/panel_region_experiences.xml2
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_region_general.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_region_terrain.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_script_ed.xml0
-rw-r--r--indra/newview/skins/default/xui/ja/panel_script_experience.xml2
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_script_question_toast.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_scrolling_param.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml2
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_snapshot_local.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_snapshot_options.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_sound_devices.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_status_bar.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_sys_well_item.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_teleport_history.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml0
-rw-r--r--indra/newview/skins/default/xui/ja/panel_tools_texture.xml10
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_voice_effect.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/panel_world_map.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/role_actions.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/sidepanel_appearance.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/sidepanel_inventory.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/sidepanel_item_info.xml2
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/sidepanel_task_info.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/strings.xml96
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/teleport_strings.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/ja/xui_version.xml0
346 files changed, 565 insertions, 223 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 91a61ab225..cf5e97bd8d 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -3,6 +3,7 @@
<tab_container name="about_tab">
<panel label="情報" name="support_panel">
<button label="クリップボードにコピー" name="copy_btn"/>
+ <button label="アップデートを確認" name="update_btn"/>
</panel>
<panel label="クレジット" name="credits_panel">
<text name="linden_intro">Second Life の提供元: Lindens の、
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index fc1ed5554a..8614335690 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -450,7 +450,7 @@
<spinner label="アクセス時間:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="常に許可" name="AllowedText">
- 立入を許可された住人
+ 立入を許可された住人 ([COUNT])
</text>
<name_list name="AccessList" tool_tip="(合計[LISTED] 人、最大 [MAX] 人)"/>
<button label="追加" name="add_allowed"/>
@@ -458,13 +458,13 @@
</panel>
<panel name="Banned_layout_panel">
<text label="禁止" name="BanCheck">
- 立入を禁止された住人
+ 立入を禁止された住人 ([COUNT])
</text>
<name_list name="BannedList" tool_tip="(合計 [LISTED] 人、最大 [MAX] 人)"/>
<button label="追加" name="add_banned"/>
<button label="削除" label_selected="削除" name="remove_banned"/>
</panel>
</panel>
- <panel label="経験" name="land_experiences_panel"/>
+ <panel label="体験" name="land_experiences_panel"/>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_activeim.xml b/indra/newview/skins/default/xui/ja/floater_activeim.xml
index 1c743e1fd2..1c743e1fd2 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/ja/floater_activeim.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
index 2bada303ae..2bada303ae 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
index 20c7298462..20c7298462 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_auction.xml b/indra/newview/skins/default/xui/ja/floater_auction.xml
index e9aa287f2c..e9aa287f2c 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_auction.xml
+++ b/indra/newview/skins/default/xui/ja/floater_auction.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
index 21abf59160..cf75fa3372 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
@@ -13,6 +13,12 @@
</scroll_list>
<button label="追加..." name="autoreplace_add_entry"/>
<button label="削除" name="autoreplace_delete_entry"/>
+ <text name="autoreplace_keyword_txt">
+ キーワード:
+ </text>
+ <text name="autoreplace_replacement_txt">
+ 置換:
+ </text>
<button label="エントリを保存" name="autoreplace_save_entry" tool_tip="このエントリを保存します。"/>
<button label="変更を保存" name="autoreplace_save_changes" tool_tip="変更をすべて保存します。"/>
<button label="取り消し" name="autoreplace_cancel" tool_tip="変更をすべて破棄します。"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar.xml b/indra/newview/skins/default/xui/ja/floater_avatar.xml
index d289580506..d289580506 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
index 4bd6b4e053..4bd6b4e053 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
index 5c23b77498..5c23b77498 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_beacons.xml b/indra/newview/skins/default/xui/ja/floater_beacons.xml
index a55698e3d0..a55698e3d0 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/ja/floater_beacons.xml
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 6865409e7a..6865409e7a 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_build_options.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
index 1b5a745cc4..1b5a745cc4 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_bumps.xml b/indra/newview/skins/default/xui/ja/floater_bumps.xml
index fd12a9e69a..62f8a0669e 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bumps.xml
@@ -19,6 +19,6 @@
[TIME] [NAME] が物理的オブジェクトであなたをたたきました
</floater.string>
<floater.string name="timeStr">
- [[hour,datetime,slt]:[min,datetime,slt]]
+ [[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
</floater.string>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
index 7e4932c78f..7e4932c78f 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index a472f163e3..a472f163e3 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
index 37fd6826e5..37fd6826e5 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
index 34f9d38de1..34f9d38de1 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_object.xml b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
index ce269df6da..ce269df6da 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml
index 982e5ce42b..982e5ce42b 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
index 9f5df6fb85..9f5df6fb85 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_choose_group.xml b/indra/newview/skins/default/xui/ja/floater_choose_group.xml
index 7d91cb69ed..7d91cb69ed 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/ja/floater_choose_group.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_color_picker.xml b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
index dc87d27a15..dc87d27a15 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_critical.xml b/indra/newview/skins/default/xui/ja/floater_critical.xml
index f69c24622a..f69c24622a 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_critical.xml
+++ b/indra/newview/skins/default/xui/ja/floater_critical.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml
index eb39d1b336..eb39d1b336 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000..50e508ad40
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="優先プリセットを削除">
+ <string name="title_graphic">
+ グラフィックプリセットを削除
+ </string>
+ <string name="title_camera">
+ カメラプリセットを削除
+ </string>
+ <text name="Preset">
+ プリセットを選択
+ </text>
+ <button label="削除" name="delete"/>
+ <button label="取り消し" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_destinations.xml b/indra/newview/skins/default/xui/ja/floater_destinations.xml
index b7f6ad4d4e..b7f6ad4d4e 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/ja/floater_destinations.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_display_name.xml b/indra/newview/skins/default/xui/ja/floater_display_name.xml
index cc71b1cd9f..cc71b1cd9f 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/ja/floater_display_name.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml
index fd601672b6..fd601672b6 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml
index 68d0c70baa..68d0c70baa 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml
index eddfbd4298..eddfbd4298 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_environment_settings.xml b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml
index 0e3803119f..0e3803119f 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml
index ca50ba8ef8..ca50ba8ef8 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_event.xml
+++ b/indra/newview/skins/default/xui/ja/floater_event.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml b/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
index 7819b887db..be9cfd8c01 100644
--- a/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater title="EXPERIENCE PROFILE">
<floater.string name="empty_slurl">
- (なし)
+ (なし)
</floater.string>
<floater.string name="maturity_icon_general">
&quot;Parcel_PG_Light&quot;
diff --git a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
index 5f538ecdb0..b226dfbfe1 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
@@ -6,5 +6,16 @@
<string name="run">
走る
</string>
+ <combo_box name="time_scale_combo">
+ <item label="2x 平均" name="2x Average"/>
+ <item label="最大" name="Max"/>
+ <item label="最近の最大" name="Recent Max"/>
+ <item label="100ms" name="100ms"/>
+ </combo_box>
+ <combo_box name="metric_combo">
+ <item label="時間" name="Time"/>
+ <item label="通話数" name="Number of Calls"/>
+ <item label="Hz" name="Hz"/>
+ </combo_box>
<button label="一時停止" name="pause_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_font_test.xml b/indra/newview/skins/default/xui/ja/floater_font_test.xml
index b853f395dd..b853f395dd 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/ja/floater_font_test.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_gesture.xml b/indra/newview/skins/default/xui/ja/floater_gesture.xml
index 1ed5ad31db..1ed5ad31db 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_gesture.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
index 9e5d473db7..9e5d473db7 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
index c8b8e918e0..c8b8e918e0 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_help_browser.xml b/indra/newview/skins/default/xui/ja/floater_help_browser.xml
index 15200d7ef7..15200d7ef7 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_help_browser.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_how_to.xml b/indra/newview/skins/default/xui/ja/floater_how_to.xml
index 4cebe27226..4cebe27226 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/ja/floater_how_to.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_hud.xml b/indra/newview/skins/default/xui/ja/floater_hud.xml
index e3841c2cd9..e3841c2cd9 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_hud.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hud.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml
index a155efdc1e..a155efdc1e 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
index 7ed46f7f01..7ed46f7f01 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_session.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_image_preview.xml b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
index 1ffc27fd70..1ffc27fd70 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_import_collada.xml b/indra/newview/skins/default/xui/ja/floater_import_collada.xml
index 65edafb169..65edafb169 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/ja/floater_import_collada.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
index 308f6f9a3d..308f6f9a3d 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml
index b3825c0b7f..b3825c0b7f 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
index 8d3a655a06..8d3a655a06 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
index 19d767ab57..e6b105e0dc 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
<radio_item label="より古い" name="older"/>
</radio_group>
<spinner label="経過時間" name="spin_hours_ago"/>
+ <text name="label_hours">
+ 時間
+ </text>
<spinner label="経過日数" name="spin_days_ago"/>
+ <text name="label_days">
+ 日間
+ </text>
<button label="閉じる" label_selected="閉じる" name="Close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml
index daa480ef5a..daa480ef5a 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/ja/floater_joystick.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
index aca916f22f..aca916f22f 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
index 864feef8cc..f48cc642ee 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
@@ -27,6 +27,6 @@
<button label="リセット" label_selected="リセット" name="Reset"/>
<check_box initial_value="true" label="実行中" name="running"/>
<check_box initial_value="true" label="Mono" name="mono"/>
- <check_box label="次の体験を使用:" name="enable_xp"/>
+ <check_box label="体験を使用:" name="enable_xp"/>
<button label="&gt;" name="view_profile"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
new file mode 100644
index 0000000000..351d8507cc
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="優先プリセットをロード">
+ <string name="title_graphic">
+ グラフィックプリセットをロード
+ </string>
+ <string name="title_camera">
+ カメラプリセットをロード
+ </string>
+ <text name="Preset">
+ プリセットを選択
+ </text>
+ <button label="OK" name="ok"/>
+ <button label="取り消し" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
index 5773752788..5773752788 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml
index 1122203446..1122203446 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_map.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_media_browser.xml b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
index c4731b73a3..c4731b73a3 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_media_settings.xml b/indra/newview/skins/default/xui/ja/floater_media_settings.xml
index 46ac1a8dfd..46ac1a8dfd 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_settings.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
index f48bb94e32..f48bb94e32 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml
index c59a3dc0ab..2edb3c624c 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
<string name="OutboxInitializing">
初期化中...
</string>
- <panel label="">
- <panel>
+ <panel label="" name="panel_1">
+ <panel name="panel_2">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
ロード中...
</text>
</panel>
</panel>
- <panel>
+ <panel name="panel_3">
+ <panel name="outbox_generic_drag_target">
+ <text name="text_1">
+ ここにアイテムをドラッグして、フォルダを作成する
+ </text>
+ </panel>
<button label="マーケットプレイスに送信" name="outbox_import_btn" tool_tip="自分のマーケットプレイス店頭に移動"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
index 942cc91317..108892dd6d 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -55,6 +55,9 @@
<string name="mesh_status_invalid_material_list">
LOD 付きの材料は参考モデルのサブセットではありません。
</string>
+ <string name="phys_status_vertex_limit_exceeded">
+ 一部の物理的な外殻構造が頂点の制限を超えます。
+ </string>
<string name="layer_all">
全て
</string>
@@ -93,52 +96,52 @@
<text initial_value="頂点" name="vertices" value="頂点"/>
<text initial_value="高" name="high_label" value="高"/>
<combo_box name="lod_source_high">
- <item name="Load from file" value="ファイルからロード"/>
- <item name="Generate" value="生成"/>
+ <item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
+ <item label="生成" name="Generate" value="生成"/>
</combo_box>
<button label="参照" name="lod_browse_high"/>
<combo_box name="lod_mode_high">
- <item name="Triangle Limit" value="三角形の限度数"/>
- <item name="Error Threshold" value="エラーしきい値"/>
+ <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
+ <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
</combo_box>
<text initial_value="0" name="high_triangles" value="0"/>
<text initial_value="0" name="high_vertices" value="0"/>
<text initial_value="中" name="medium_label" value="中"/>
<combo_box name="lod_source_medium">
- <item name="Load from file" value="ファイルからロード"/>
- <item name="Generate" value="生成"/>
- <item name="Use LoD above" value="上記の LoD を使用"/>
+ <item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
+ <item label="生成" name="Generate" value="生成"/>
+ <item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用"/>
</combo_box>
<button label="参照" name="lod_browse_medium"/>
<combo_box name="lod_mode_medium">
- <item name="Triangle Limit" value="三角形の限度数"/>
- <item name="Error Threshold" value="エラーしきい値"/>
+ <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
+ <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
</combo_box>
<text initial_value="0" name="medium_triangles" value="0"/>
<text initial_value="0" name="medium_vertices" value="0"/>
<text initial_value="低" name="low_label" value="低"/>
<combo_box name="lod_source_low">
- <item name="Load from file" value="ファイルからロード"/>
- <item name="Generate" value="生成"/>
- <item name="Use LoD above" value="上記の LoD を使用"/>
+ <item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
+ <item label="生成" name="Generate" value="生成"/>
+ <item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用"/>
</combo_box>
<button label="参照" name="lod_browse_low"/>
<combo_box name="lod_mode_low">
- <item name="Triangle Limit" value="三角形の限度数"/>
- <item name="Error Threshold" value="エラーしきい値"/>
+ <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
+ <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
</combo_box>
<text initial_value="0" name="low_triangles" value="0"/>
<text initial_value="0" name="low_vertices" value="0"/>
<text initial_value="最低" name="lowest_label" value="最低"/>
<combo_box name="lod_source_lowest">
- <item name="Load from file" value="ファイルからロード"/>
- <item name="Generate" value="生成"/>
- <item name="Use LoD above" value="上記の LoD を使用"/>
+ <item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
+ <item label="生成" name="Generate" value="生成"/>
+ <item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用"/>
</combo_box>
<button label="参照" name="lod_browse_lowest"/>
<combo_box name="lod_mode_lowest">
- <item name="Triangle Limit" value="三角形の限度数"/>
- <item name="Error Threshold" value="エラーしきい値"/>
+ <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
+ <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
</combo_box>
<text initial_value="0" name="lowest_triangles" value="0"/>
<text initial_value="0" name="lowest_vertices" value="0"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_moveview.xml b/indra/newview/skins/default/xui/ja/floater_moveview.xml
index aed3b78a14..aed3b78a14 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_moveview.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_mute_object.xml b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
index 04ffd5254d..04ffd5254d 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
index c9a0ecefd7..c9a0ecefd7 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
index d708fc3dec..d708fc3dec 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_notification.xml b/indra/newview/skins/default/xui/ja/floater_notification.xml
index 0f37b30f52..0f37b30f52 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_notification.xml
+++ b/indra/newview/skins/default/xui/ja/floater_notification.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
index c9d9ea7acb..c9d9ea7acb 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000..feac052d6c
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="通知">
+ <floater.string name="system_tab_title">
+ システム ([COUNT])
+ </floater.string>
+ <floater.string name="transactions_tab_title">
+ 取引 ([COUNT])
+ </floater.string>
+ <floater.string name="group_invitations_tab_title">
+ 招待 ([COUNT])
+ </floater.string>
+ <floater.string name="group_notices_tab_title">
+ グループ ([COUNT])
+ </floater.string>
+ <string name="title_notification_tabbed_window">
+ 通知
+ </string>
+ <layout_stack name="TabButtonsStack">
+ <layout_panel name="TabButtonsLayoutPanel">
+ <tab_container name="notifications_tab_container">
+ <panel label="システム (0)" name="system_notification_list_tab"/>
+ <panel label="取引 (0)" name="transaction_notifications_tab"/>
+ <panel label="招待 (0)" name="group_invite_notifications_tab"/>
+ <panel label="グループ (0)" name="group_notice_notifications_tab"/>
+ </tab_container>
+ <layout_stack name="ButtonsStack">
+ <layout_panel name="CondenseAllButtonPanel">
+ <button label="全て折り畳む" name="collapse_all_button"/>
+ </layout_panel>
+ <layout_panel name="GapLayoutPanel">
+ <panel label="ギャップパネル" name="GapPanel"/>
+ </layout_panel>
+ <layout_panel name="DeleteAllButtonPanel">
+ <button label="全て削除" name="delete_all_button"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_object_weights.xml b/indra/newview/skins/default/xui/ja/floater_object_weights.xml
index d727a268fb..d727a268fb 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/ja/floater_object_weights.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_openobject.xml b/indra/newview/skins/default/xui/ja/floater_openobject.xml
index 3f2f71511b..3f2f71511b 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/ja/floater_openobject.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
index 70555e6ded..70555e6ded 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
index f1a05e0eec..f1a05e0eec 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
index ada96b5b62..0e72b40dc6 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
<floater.string name="character_owner_group">
[group]
</floater.string>
- <panel>
+ <panel name="pathfinding_chars_main">
<scroll_list name="objects_scroll_list">
<scroll_list.columns label="名前" name="name"/>
<scroll_list.columns label="説明" name="description"/>
@@ -36,15 +36,15 @@
<scroll_list.columns label="高度" name="altitude"/>
</scroll_list>
<text name="messaging_status">
- キャラクター:
+ キャラクター:
</text>
- <button label="リストを更新" name="refresh_objects_list"/>
+ <button label="リスト更新" name="refresh_objects_list"/>
<button label="すべて選択" name="select_all_objects"/>
<button label="何も選択しない" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_chars_actions">
<text name="actions_label">
- 選択したキャラクターに対するアクション:
+ 選択したキャラクターに対するアクション:
</text>
<check_box label="ビーコンを表示" name="show_beacon"/>
<check_box label="物理効果カプセルを表示" name="show_physics_capsule"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
index ec107f3e6b..d531d588f7 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
<floater.string name="pathing_error">
パスの生成中にエラーが発生しました。
</floater.string>
+ <panel name="pathfinding_console_main">
+ <text name="viewer_status_label">
+ ビューワステータス
+ </text>
+ </panel>
+ <panel name="pathfinding_console_simulator">
+ <text name="simulator_status_label">
+ シミュレータステータス
+ </text>
+ </panel>
<tab_container name="view_test_tab_container">
<panel label="表示" name="view_panel">
<text name="show_label">
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
index 4441d5e738..b65207a025 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
<floater.string name="linkset_choose_use">
リンクセットの用途を選択...
</floater.string>
- <panel>
+ <panel name="pathfinding_linksets_main">
+ <text name="linksets_filter_label">
+ フィルター:
+ </text>
+ <text name="linksets_name_label">
+ 名前
+ </text>
+ <text name="linksets_desc_label">
+ 説明
+ </text>
<combo_box name="filter_by_linkset_use">
<combo_box.item label="リンクセットの用途でフィルター..." name="filter_by_linkset_use_none"/>
<combo_box.item label="歩行可能" name="filter_by_linkset_use_walkable"/>
@@ -103,8 +112,8 @@
<button label="適用" name="apply_filters"/>
<button label="クリア" name="clear_filters"/>
<scroll_list name="objects_scroll_list">
- <scroll_list.columns label="名前(ルートプリム)" name="name"/>
- <scroll_list.columns label="説明(ルートプリム)" name="description"/>
+ <scroll_list.columns label="名前 (ルートプリム)" name="name"/>
+ <scroll_list.columns label="説明 (ルートプリム)" name="description"/>
<scroll_list.columns label="所有者" name="owner"/>
<scroll_list.columns label="スクリプト" name="scripted"/>
<scroll_list.columns label="負荷" name="land_impact"/>
@@ -116,13 +125,16 @@
<scroll_list.columns label="D %" name="d_percent"/>
</scroll_list>
<text name="messaging_status">
- リンクセット:
+ リンクセット:
</text>
<button label="リスト更新" name="refresh_objects_list"/>
<button label="すべて選択" name="select_all_objects"/>
<button label="何も選択しない" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_actions">
+ <text name="linksets_actions_label">
+ 選択したリンクセットに対するアクション (リンクセットがワールドから削除されると、その属性が失われる場合があります):
+ </text>
<check_box label="ビーコンを表示" name="show_beacon"/>
<button label="取る" name="take_objects"/>
<button label="コピーを取る" name="take_copy_objects"/>
@@ -130,9 +142,12 @@
<button label="返却" name="return_objects"/>
<button label="削除" name="delete_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_attributes">
+ <text name="linksets_attributes_label">
+ 選択したリンクセットの属性を編集し、ボタンを押して変更を適用します
+ </text>
<text name="walkability_coefficients_label">
- 歩行可能性:
+ 歩行可能性:
</text>
<text name="edit_a_label">
A
diff --git a/indra/newview/skins/default/xui/ja/floater_pay.xml b/indra/newview/skins/default/xui/ja/floater_pay.xml
index 0ca0990bd4..0ca0990bd4 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_pay.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_pay_object.xml b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
index 3331cee0e0..3331cee0e0 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_people.xml b/indra/newview/skins/default/xui/ja/floater_people.xml
index b180658ab7..b180658ab7 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_people.xml
+++ b/indra/newview/skins/default/xui/ja/floater_people.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
index 98cda25a81..98cda25a81 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_perms_default.xml b/indra/newview/skins/default/xui/ja/floater_perms_default.xml
index 1eac6b9e35..0dfc75014e 100644
--- a/indra/newview/skins/default/xui/ja/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/ja/floater_perms_default.xml
@@ -1,6 +1,43 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="perms default" title="デフォルトの作成権限">
- <panel label="デフォルト権限" name="default permissions"/>
+ <panel label="デフォルト権限" name="default permissions">
+ <text name="label_1">
+ 次の所有者:
+ </text>
+ <text name="label_2">
+ コピー
+ </text>
+ <text name="label_3">
+ 修正
+ </text>
+ <text name="label_4">
+ 再販・プレゼント
+ </text>
+ <text name="label_5">
+ グループで共同管理
+ </text>
+ <text name="label_6">
+ 誰に対してもコピーを許可
+ </text>
+ <text name="label_7" tool_tip="オブジェクトを作成するときにデフォルトの権限を設定する">
+ オブジェクト
+ </text>
+ <text name="label_8" tool_tip="アップロードしたアイテムにデフォルトの権限を設定する">
+ アップロード
+ </text>
+ <text name="label_9" tool_tip="スクリプトを作成するときにデフォルトの権限を設定する">
+ スクリプト
+ </text>
+ <text name="label_10" tool_tip="ノートカードを作成するときにデフォルトの権限を設定する">
+ ノートカード
+ </text>
+ <text name="label_11" tool_tip="ジェスチャーを作成するときにデフォルトの権限を設定する">
+ ジェスチャー
+ </text>
+ <text name="label_12" tool_tip="衣服またはボディパーツを作成するときにデフォルトの権限を設定する">
+ 着用物
+ </text>
+ </panel>
<button label="OK" label_selected="OK" name="ok"/>
<button label="取り消し" label_selected="取り消し" name="cancel"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_picks.xml b/indra/newview/skins/default/xui/ja/floater_picks.xml
index 359585eb86..359585eb86 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_picks.xml
+++ b/indra/newview/skins/default/xui/ja/floater_picks.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_places.xml b/indra/newview/skins/default/xui/ja/floater_places.xml
index 0d167444db..0d167444db 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_places.xml
+++ b/indra/newview/skins/default/xui/ja/floater_places.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_post_process.xml b/indra/newview/skins/default/xui/ja/floater_post_process.xml
index 7c4d9c78ee..7c4d9c78ee 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/ja/floater_post_process.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml
index d48a8241ec..d48a8241ec 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000..a95c45c275
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="詳細グラフィックス設定">
+ <text name="GeneralText">
+ 全般
+ </text>
+ <slider label="描画距離:" name="DrawDistance"/>
+ <text name="DrawDistanceMeterText2">
+ m
+ </text>
+ <slider label="最大パーティクル数:" name="MaxParticleCount"/>
+ <slider label="ポストプロセス品質:" name="RenderPostProcess"/>
+ <text name="PostProcessText">
+ 低
+ </text>
+ <text name="AvatarText">
+ アバター
+ </text>
+ <slider label="最大の複雑さ:" name="IndirectMaxComplexity" tool_tip="どの時点で複雑な表示のアバターをベタ色の人形として表示するかを管理します"/>
+ <text name="IndirectMaxComplexityText">
+ 0
+ </text>
+ <slider label="簡略化せずに描画する最大数:" name="IndirectMaxNonImpostors"/>
+ <text name="IndirectMaxNonImpostorsText">
+ 0
+ </text>
+ <slider label="詳細:" name="AvatarMeshDetail"/>
+ <text name="AvatarMeshDetailText">
+ 低
+ </text>
+ <slider label="物理演算:" name="AvatarPhysicsDetail"/>
+ <text name="AvatarPhysicsDetailText">
+ 低
+ </text>
+ <text name="ShadersText">
+ ハードウェア
+ </text>
+ <slider label="テクスチャメモリ (MB):" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てられたメモリの量。ビデオカードのメモリに既定。数値を下げるとパフォーマンスが向上しますが、テクスチャの精度が落ちることがあります。"/>
+ <slider label="フォグの距離比率:" name="fog"/>
+ <slider label="ガンマ:" name="gamma"/>
+ <text name="(brightness, lower is brighter)">
+ (0 でデフォルト、低いほど明るい)
+ </text>
+ <check_box label="異方的フィルタリング (有効にすると速度が低下)" name="ani"/>
+ <check_box initial_value="true" label="OpenGL Vertex Buffer Objects を有効化" name="vbo" tool_tip="最新のハードウェアでこのオプションを有効にするとパフォーマンスが向上します。ただし、古いハードウェアでは VBO の実装が貧弱なため、このオプションを有効にするとクラッシュする場合があります。"/>
+ <check_box initial_value="true" label="テクスチャ圧縮の有効化 (再起動後に反映)" name="texture compression" tool_tip="ビデオメモリでテクスチャを圧縮すると、一部のカラー品質を犠牲にして、高解像度のテクスチャをロードできます。"/>
+ <text name="antialiasing label">
+ アンチエイリアシング:
+ </text>
+ <combo_box label="アンチエイリアシング" name="fsaa">
+ <combo_box.item label="無効" name="FSAADisabled"/>
+ <combo_box.item label="2x" name="2x"/>
+ <combo_box.item label="4x" name="4x"/>
+ <combo_box.item label="8x" name="8x"/>
+ <combo_box.item label="16x" name="16x"/>
+ </combo_box>
+ <text name="antialiasing restart">
+ (再起動後に反映)
+ </text>
+ <slider label="地形のメッシュの詳細:" name="TerrainMeshDetail"/>
+ <text name="TerrainMeshDetailText">
+ 低
+ </text>
+ <slider label="木:" name="TreeMeshDetail"/>
+ <text name="TreeMeshDetailText">
+ 低
+ </text>
+ <slider label="オブジェクト:" name="ObjectMeshDetail"/>
+ <text name="ObjectMeshDetailText">
+ 低
+ </text>
+ <slider label="フレキシプリム:" name="FlexibleMeshDetail"/>
+ <text name="FlexibleMeshDetailText">
+ 低
+ </text>
+ <check_box initial_value="true" label="透明な水" name="TransparentWater"/>
+ <check_box initial_value="true" label="バンプマッピングと光沢" name="BumpShiny"/>
+ <check_box initial_value="true" label="近くの光" name="LocalLights"/>
+ <check_box initial_value="true" label="基本シェーダー" name="BasicShaders" tool_tip="このオプションを無効にすると、グラフィックカードのドライバの種類によっては、クラッシュするのを防ぎます。"/>
+ <slider label="地形詳細:" name="TerrainDetail"/>
+ <text name="TerrainDetailText">
+ 低
+ </text>
+ <check_box initial_value="true" label="アバターハードウェアスキニング" name="AvatarVertexProgram"/>
+ <check_box initial_value="true" label="アバターの布" name="AvatarCloth"/>
+ <text name="ReflectionsText">
+ 水の反射:
+ </text>
+ <combo_box name="Reflections">
+ <combo_box.item label="最小" name="0"/>
+ <combo_box.item label="地形と樹木" name="1"/>
+ <combo_box.item label="すべての静止オブジェクト" name="2"/>
+ <combo_box.item label="すべてのアバターとオブジェクト" name="3"/>
+ <combo_box.item label="すべて" name="4"/>
+ </combo_box>
+ <check_box initial_value="true" label="周囲 (大気) シェーダー" name="WindLightUseAtmosShaders"/>
+ <slider label="空:" name="SkyMeshDetail"/>
+ <text name="SkyMeshDetailText">
+ 低
+ </text>
+ <check_box initial_value="true" label="高度なライティングモデル" name="UseLightShaders"/>
+ <check_box initial_value="true" label="アンビエントオクルージョン" name="UseSSAO"/>
+ <check_box initial_value="true" label="フィールドの遠近感" name="UseDoF"/>
+ <text name="RenderShadowDetailText">
+ 影:
+ </text>
+ <combo_box name="ShadowDetail">
+ <combo_box.item label="なし" name="0"/>
+ <combo_box.item label="太陽/月" name="1"/>
+ <combo_box.item label="太陽/月・プロジェクタ" name="2"/>
+ </combo_box>
+ <button label="推奨設定にリセット" name="Defaults"/>
+ <button label="OK" label_selected="OK" name="OK"/>
+ <button label="取り消し" label_selected="取り消し" name="Cancel"/>
+ <check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
index 4638fd002e..4638fd002e 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
index a3042f66ea..a3042f66ea 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
index 59ce36b022..59ce36b022 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
index ae8ae9f7b5..ae8ae9f7b5 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
index 5c0f05cec6..5c0f05cec6 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
index 4617fd1d92..4617fd1d92 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
index 10a46247a7..10a46247a7 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
index f33406da51..f33406da51 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
index 4edb4972e4..4edb4972e4 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_region_info.xml b/indra/newview/skins/default/xui/ja/floater_region_info.xml
index d08c51c61e..d08c51c61e 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_info.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index 7631cd7aba..7631cd7aba 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
new file mode 100644
index 0000000000..cdc67b3148
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="優先プリセットを保存">
+ <string name="title_graphic">
+ グラフィックプリセットを保存
+ </string>
+ <string name="title_camera">
+ カメラプリセットを保存
+ </string>
+ <text name="Preset">
+ プリセットの名前を入力するか、既存のプリセットを選択します。
+ </text>
+ <button label="保存" name="save"/>
+ <button label="取り消し" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug.xml b/indra/newview/skins/default/xui/ja/floater_script_debug.xml
index 0ac7a988e0..0ac7a988e0 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_debug.xml
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
index e70a30fa24..e70a30fa24 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_script_limits.xml b/indra/newview/skins/default/xui/ja/floater_script_limits.xml
index 7ccd858af7..7ccd858af7 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_limits.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_script_preview.xml b/indra/newview/skins/default/xui/ja/floater_script_preview.xml
index 656357aa17..656357aa17 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_preview.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_script_queue.xml b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
index 97e79fb483..97e79fb483 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_script_search.xml b/indra/newview/skins/default/xui/ja/floater_script_search.xml
index bc4f48c995..bc4f48c995 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_search.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_search.xml b/indra/newview/skins/default/xui/ja/floater_search.xml
index 0723be0068..0723be0068 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_search.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_select_key.xml b/indra/newview/skins/default/xui/ja/floater_select_key.xml
index d41be86873..d41be86873 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/ja/floater_select_key.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
index aa368eef11..aa368eef11 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
index cb7950bf53..cb7950bf53 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index f04193d034..f04193d034 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
index 28d2388bed..28d2388bed 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
index 7d83309c46..7d83309c46 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
index 31fbef9bcf..31fbef9bcf 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
+++ b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
index febe153d25..81bfbe15f5 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="spellcheck_import" title="辞書をインポート">
+ <text name="import_dict">
+ 辞書:
+ </text>
<button label="参照" label_selected="参照" name="dictionary_path_browse"/>
+ <text name="import_name">
+ 名前:
+ </text>
+ <text name="import_lang">
+ 言語:
+ </text>
<button label="インポート" name="ok_btn"/>
<button label="取り消し" name="cancel_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml
index 3bc343639b..3bc343639b 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_stats.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_sys_well.xml b/indra/newview/skins/default/xui/ja/floater_sys_well.xml
index 45e97bdf5d..45e97bdf5d 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sys_well.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_telehub.xml b/indra/newview/skins/default/xui/ja/floater_telehub.xml
index 7318083771..7318083771 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/ja/floater_telehub.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
index 31b5bbd3bf..31b5bbd3bf 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
index 40fd8e9f93..40fd8e9f93 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
index 37233d3e68..37233d3e68 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
index adc35137b5..adc35137b5 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index eeaa361649..eeaa361649 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_top_objects.xml b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
index cc81ead116..cc81ead116 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_tos.xml b/indra/newview/skins/default/xui/ja/floater_tos.xml
index ae064724c0..dc7165b1ed 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_tos.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tos.xml
@@ -12,4 +12,7 @@
<text name="tos_heading">
次の利用規約とプライバシーポリシーをよくお読みください。 [SECOND_LIFE] へのログインを続けるには、規約に同意する必要があります。
</text>
+ <text name="external_tos_required">
+ 操作を続けるには、my.secondlife.com に移動して、ログインし、利用規約を承諾する必要があります。ありがとうございました。
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_toybox.xml b/indra/newview/skins/default/xui/ja/floater_toybox.xml
index 682352ec82..682352ec82 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/ja/floater_toybox.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
index 27143086ac..27143086ac 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
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 8e09e4748a..8e09e4748a 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
index f7d3fd11e0..f7d3fd11e0 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
index b38ea9331a..b38ea9331a 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_web_content.xml b/indra/newview/skins/default/xui/ja/floater_web_content.xml
index 48fe8aee78..48fe8aee78 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/ja/floater_web_content.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
index 34aba9d485..34aba9d485 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_window_size.xml b/indra/newview/skins/default/xui/ja/floater_window_size.xml
index 416813d6cc..416813d6cc 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/ja/floater_window_size.xml
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 cc07596adc..cc07596adc 100755..100644
--- a/indra/newview/skins/default/xui/ja/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml
diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
index 42b67cd333..42b67cd333 100755..100644
--- a/indra/newview/skins/default/xui/ja/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
diff --git a/indra/newview/skins/default/xui/ja/inspect_group.xml b/indra/newview/skins/default/xui/ja/inspect_group.xml
index be628befdf..be628befdf 100755..100644
--- a/indra/newview/skins/default/xui/ja/inspect_group.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_group.xml
diff --git a/indra/newview/skins/default/xui/ja/inspect_object.xml b/indra/newview/skins/default/xui/ja/inspect_object.xml
index e6999ac9b1..e6999ac9b1 100755..100644
--- a/indra/newview/skins/default/xui/ja/inspect_object.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_object.xml
diff --git a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
index 483d3fec52..483d3fec52 100755..100644
--- a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
diff --git a/indra/newview/skins/default/xui/ja/language_settings.xml b/indra/newview/skins/default/xui/ja/language_settings.xml
index 91e8f4be7c..91e8f4be7c 100755..100644
--- a/indra/newview/skins/default/xui/ja/language_settings.xml
+++ b/indra/newview/skins/default/xui/ja/language_settings.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
index 982a03c6a8..982a03c6a8 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
index 930af10692..7705dd9090 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
@@ -15,5 +15,8 @@
<menu_item_call label="ズームイン" name="Zoom In"/>
<menu_item_call label="支払う" name="Pay..."/>
<menu_item_call label="オブジェクトのプロフィール" name="Object Inspect"/>
+ <menu_item_check label="通常表示" name="RenderNormally"/>
+ <menu_item_check label="表示しない" name="DoNotRender"/>
+ <menu_item_check label="完全表示" name="AlwaysRenderFully"/>
<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
index e7aa3cfc30..e7aa3cfc30 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
index 80ce080e39..80ce080e39 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
index f9cadc36ac..482f2bdaa5 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
@@ -14,5 +14,8 @@
<menu_item_call label="ダンプ XML" name="Dump XML"/>
<menu_item_call label="ズームイン" name="Zoom In"/>
<menu_item_call label="支払う" name="Pay..."/>
+ <menu_item_check label="通常表示" name="RenderNormally"/>
+ <menu_item_check label="表示しない" name="DoNotRender"/>
+ <menu_item_check label="完全表示" name="AlwaysRenderFully"/>
<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
index a14cfd5876..a14cfd5876 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
index e786d02e40..e786d02e40 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
index eb5faa2545..eb5faa2545 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
index d984342896..d984342896 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
index 07bcefd9b3..07bcefd9b3 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_edit.xml b/indra/newview/skins/default/xui/ja/menu_edit.xml
index c2ef0179b2..c2ef0179b2 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_edit.xml
+++ b/indra/newview/skins/default/xui/ja/menu_edit.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_favorites.xml b/indra/newview/skins/default/xui/ja/menu_favorites.xml
index 4708b1446c..4708b1446c 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/ja/menu_favorites.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
index abf490a247..abf490a247 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_group_plus.xml b/indra/newview/skins/default/xui/ja/menu_group_plus.xml
index 3787f7d645..3787f7d645 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/ja/menu_group_plus.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
index 2e633ae1b2..2e633ae1b2 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
index 8cd6fa4a27..8cd6fa4a27 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
index 5bcb96f083..5bcb96f083 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
index 5453f998fa..5453f998fa 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
index 9d0d0f10a6..9d0d0f10a6 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
index 5a0519ba19..5a0519ba19 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
index e3e206f3aa..e3e206f3aa 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
index 9a4a8138f5..9a4a8138f5 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
index 9a68ed8a6b..9a68ed8a6b 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
index ae5ddbb78f..ae5ddbb78f 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
index 18478b5711..18478b5711 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_land.xml b/indra/newview/skins/default/xui/ja/menu_land.xml
index 3754bd7fa4..3754bd7fa4 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_land.xml
+++ b/indra/newview/skins/default/xui/ja/menu_land.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_landmark.xml b/indra/newview/skins/default/xui/ja/menu_landmark.xml
index c134422955..c134422955 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/ja/menu_landmark.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
index cd8bd52f91..abf7bce067 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -15,6 +15,7 @@
<menu_item_call label="[SECOND_LIFE] ブログ" name="Second Life Blogs"/>
<menu_item_call label="バグを報告する" name="Report Bug"/>
<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
+ <menu_item_call label="アップデートを確認" name="Check for Updates"/>
</menu>
<menu_item_check label="デバッグメニューを表示する" name="Show Debug Menu"/>
<menu label="デバッグ" name="Debug">
diff --git a/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml b/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
index ad36aa3f77..bf38075556 100644
--- a/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="名前による並べ替え" name="sort_by_name"/>
+ <menu_item_check label="新しい順に並べ替え" name="sort_by_recent"/>
<menu_item_check label="在庫高順に並べ替え (低から高へ)" name="sort_by_stock_amount"/>
<menu_item_check label="リストフォルダのみ表示" name="show_only_listing_folders"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
index faae4ef717..faae4ef717 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
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 2e733ee24b..2e733ee24b 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
index 43f86e84bf..43f86e84bf 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_navbar.xml b/indra/newview/skins/default/xui/ja/menu_navbar.xml
index 9ae2e58198..9ae2e58198 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_navbar.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
index c2e4a27686..c2e4a27686 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
index 913bae8958..913bae8958 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
index ae02edefe2..ae02edefe2 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
index 6448e9244e..6448e9244e 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
index 1969ae2a10..1969ae2a10 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
index 9491c22f31..9491c22f31 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_list.xml b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
index 64d8ded722..64d8ded722 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
index 76340e4d76..76340e4d76 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
index 2c0c85ba28..2c0c85ba28 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
index bfc7d15017..bfc7d15017 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
index 972ab767bf..972ab767bf 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
index fe85e278cf..fe85e278cf 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
index 44c5438509..44c5438509 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
index b4f177a068..b4f177a068 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_picks.xml b/indra/newview/skins/default/xui/ja/menu_picks.xml
index 011d3d2526..011d3d2526 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_picks.xml
+++ b/indra/newview/skins/default/xui/ja/menu_picks.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
index 84bf90fea0..84bf90fea0 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_place.xml b/indra/newview/skins/default/xui/ja/menu_place.xml
index a9f05e126d..a9f05e126d 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_place.xml
+++ b/indra/newview/skins/default/xui/ja/menu_place.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
index d5ce88b055..d5ce88b055 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
index c455204722..c455204722 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
index 579f2c2cbd..579f2c2cbd 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
index 9d3a5dda1c..9d3a5dda1c 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
index 6513d9264a..6513d9264a 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
index a89dd0bcbe..a89dd0bcbe 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_slurl.xml b/indra/newview/skins/default/xui/ja/menu_slurl.xml
index 61ba3085d9..61ba3085d9 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_slurl.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
index 901eab9166..901eab9166 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
index 61642048b8..61642048b8 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
index 4dd44d2ec8..4dd44d2ec8 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_text_editor.xml b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
index eda973c888..eda973c888 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_toolbars.xml b/indra/newview/skins/default/xui/ja/menu_toolbars.xml
index d5363a5131..d5363a5131 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/ja/menu_toolbars.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
index 1a67a2a8f7..1a67a2a8f7 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index 639602ce3c..639602ce3c 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_email.xml b/indra/newview/skins/default/xui/ja/menu_url_email.xml
new file mode 100644
index 0000000000..6c41d759fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+ <menu_item_call label="外部クライアントで電子メールを作成" name="email_open_external"/>
+ <menu_item_call label="電子メールをクリップボードにコピー" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_group.xml b/indra/newview/skins/default/xui/ja/menu_url_group.xml
index 1dd3d79438..1dd3d79438 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_group.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_http.xml b/indra/newview/skins/default/xui/ja/menu_url_http.xml
index c3da8a8686..c3da8a8686 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_http.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
index 147ab44a1b..147ab44a1b 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_map.xml b/indra/newview/skins/default/xui/ja/menu_url_map.xml
index 8d41e1a571..8d41e1a571 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_map.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
index a02ca8415d..a02ca8415d 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
index 8d264059d3..8d264059d3 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
index a516c5a075..a516c5a075 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
index 2c857ec915..2c857ec915 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
index c3507a9a33..c3507a9a33 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 0384dc1efc..3c2e294868 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -180,6 +180,7 @@
<menu_item_call label="バグを報告する" name="Report Bug"/>
<menu_item_call label="衝突・プッシュ・打撃" name="Bumps, Pushes &amp;amp; Hits"/>
<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
+ <menu_item_call label="アップデートを確認" name="Check for Updates"/>
</menu>
<menu label="アドバンス" name="Advanced">
<menu_item_call label="テクスチャのリベークをする" name="Rebake Texture"/>
@@ -193,7 +194,7 @@
<menu_item_call label="ラグ計測器" name="Lag Meter"/>
<menu_item_check label="統計バー" name="Statistics Bar"/>
<menu_item_call label="シーン ロード統計情報" name="Scene Load Statistics"/>
- <menu_item_check label="アバターの描画ウェイトを表示" name="Avatar Rendering Cost"/>
+ <menu_item_check label="アバターの複雑さ情報を表示" name="Avatar Draw Info"/>
</menu>
<menu label="ハイライトと目に見えるもの" name="Highlighting and Visibility">
<menu_item_check label="チージービーコン" name="Cheesy Beacon"/>
@@ -316,8 +317,6 @@
<menu_item_check label="ジョイント" name="Joints"/>
<menu_item_check label="レイキャスト" name="Raycast"/>
<menu_item_check label="風のベクトル" name="Wind Vectors"/>
- <menu_item_check label="描画の詳細度" name="rendercomplexity"/>
- <menu_item_check label="添付アイテムのバイト数" name="attachment bytes"/>
<menu_item_check label="スカルプト" name="Sculpt"/>
<menu label="テクスチャの密度" name="Texture Density">
<menu_item_check label="なし" name="None"/>
@@ -423,13 +422,11 @@
<menu_item_check label="キャラクター Vis のデバッグ" name="Debug Character Vis"/>
<menu_item_check label="骨組みの衝突判定を表示する" name="Show Collision Skeleton"/>
<menu_item_check label="エージェントのターゲットを表示する" name="Display Agent Target"/>
- --&gt;
<menu_item_call label="アタッチメントをダンプ" name="Dump Attachments"/>
<menu_item_call label="アバターテクスチャをデバッグ" name="Debug Avatar Textures"/>
<menu_item_call label="ローカルテクスチャをダンプ" name="Dump Local Textures"/>
</menu>
<menu_item_check label="HTTP Texture" name="HTTP Textures"/>
- <menu_item_check label="HTTP インベントリ" name="HTTP Inventory"/>
<menu_item_call label="圧縮画像" name="Compress Images"/>
<menu_item_call label="Visual Leak Detector を有効にする" name="Enable Visual Leak Detector"/>
<menu_item_check label="デバッグ用のミニダンプを出力する" name="Output Debug Minidump"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
index c402fa0b6d..c402fa0b6d 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
index 5334042dc9..5334042dc9 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
index 9effed1f42..9effed1f42 100755..100644
--- a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
diff --git a/indra/newview/skins/default/xui/ja/mime_types.xml b/indra/newview/skins/default/xui/ja/mime_types.xml
index bfc8d0b724..bfc8d0b724 100755..100644
--- a/indra/newview/skins/default/xui/ja/mime_types.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types.xml
diff --git a/indra/newview/skins/default/xui/ja/mime_types_linux.xml b/indra/newview/skins/default/xui/ja/mime_types_linux.xml
index cb1e48148f..cb1e48148f 100755..100644
--- a/indra/newview/skins/default/xui/ja/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types_linux.xml
diff --git a/indra/newview/skins/default/xui/ja/mime_types_mac.xml b/indra/newview/skins/default/xui/ja/mime_types_mac.xml
index cb1e48148f..cb1e48148f 100755..100644
--- a/indra/newview/skins/default/xui/ja/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types_mac.xml
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index b3b4e06a68..a573e86e5f 100755..100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -163,6 +163,10 @@
&apos;[ERROR_CODE]&apos;
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="MerchantForceValidateListing">
+ リストを作成するために、リストするコンテンツの階層を固定しました。
+ <usetemplate ignoretext="リストの作成によりコンテンツの階層が修正されることを警告する" name="okignore" yestext="OK"/>
+ </notification>
<notification name="ConfirmMerchantActiveChange">
この操作により、このリストの有効な内容が変更されます。続けますか?
<usetemplate ignoretext="マーケットプレイスで有効なリストを変更する前に確認する" name="okcancelignore" notext="取り消し" yestext="OK"/>
@@ -210,15 +214,9 @@
在庫が空のため、リストを削除しました。もう一度リストを表示するには、在庫フォルダにユニットを追加する必要があります。
<usetemplate ignoretext="在庫フォルダが空のためにリストが表示されないと警告が表示されます" name="okignore" yestext="OK"/>
</notification>
- <notification name="CompileQueueSaveText">
- 次の理由で、スクリプト用テキストのアップロード時に問題が起こりました。
-[REASON]
-後でもう一度お試しください。
- </notification>
- <notification name="CompileQueueSaveBytecode">
- 次の理由で、コンパイルしたスクリプトのアップロード時に問題が起こりました。
-[REASON]
-後でもう一度お試しください。
+ <notification name="AlertMerchantVersionFolderEmpty">
+ バージョンフォルダが空のため、リストを削除しました。もう一度リストを表示するには、バージョンフォルダにアイテムを追加する必要があります。
+ <usetemplate ignoretext="バージョンフォルダが空のためにリストが表示されないと警告が表示されます" name="okignore" yestext="OK"/>
</notification>
<notification name="WriteAnimationFail">
アニメーションデータの書き込みに問題があります。後でもう一度お試しください。
@@ -331,6 +329,14 @@
[COUNT] 名のメンバーをグループから追放しようとしています。
<usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="取り消し" yestext="追放"/>
</notification>
+ <notification name="BanGroupMemberWarning">
+ [AVATAR_NAME] をグループから追放しようとしています。
+ <usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="取り消し" yestext="禁止"/>
+ </notification>
+ <notification name="BanGroupMembersWarning">
+ [COUNT] 名のメンバーをグループから追放しようとしています。
+ <usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="取り消し" yestext="禁止"/>
+ </notification>
<notification name="AttachmentDrop">
アタッチメントを下に置こうとしています。
続けますか?
@@ -425,7 +431,7 @@ L$ が不足しているのでこのグループに参加することができ
<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
</notification>
<notification name="ReturnAllTopObjects">
- 全てのリストされたオブジェクトを所有者に本当に返却しますか?
+ リストされた全てのオブジェクトを所有者の持ち物に戻しますか?これによりすべてのスクリプト化されたオブジェクトがリージョンに戻ります!
<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
</notification>
<notification name="DisableAllTopObjects">
@@ -609,16 +615,10 @@ L$ が不足しているのでこのグループに参加することができ
(**警告**:この操作後元に戻すことはできません)
<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
</notification>
- <notification name="SaveScriptFailReason">
- 次の理由で、スクリプトの保存に問題が起こりました。 [REASON]。 後でもう一度試してください。
- </notification>
<notification name="SaveScriptFailObjectNotFound">
スクリプトの保存に失敗しました。スクリプトが入ったオブジェクトが見つかりません。
オブジェクトは範囲外か、または削除されているかもしれません。
</notification>
- <notification name="SaveBytecodeFailReason">
- 次の理由で、コンパイルしたスクリプトの保存時に問題が起こりました。 [REASON]。 後でもう一度試してください。
- </notification>
<notification name="StartRegionEmpty">
ログイン位置が指定されていません。
ログイン位置の欄にリージョン名を入力するか、「最後にログアウトした場所」か「自宅(ホーム)」を選択してください。
@@ -631,6 +631,10 @@ L$ が不足しているのでこのグループに参加することができ
<notification name="CannotDownloadFile">
ファイルをダウンロードできません。
</notification>
+ <notification label="" name="MediaFileDownloadUnsupported">
+ [SECOND_LIFE] でサポートされていないファイルのダウンロードを要求しました。
+ <usetemplate ignoretext="サポートされていないファイルのダウンロードを警告する" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CannotWriteFile">
ファイル [[FILE]] を書き込めません。
</notification>
@@ -1139,8 +1143,9 @@ L$ は返金されません。
通常これは一時的なエラーです。 数分後にもう一度着用物をカスタマイズ・保存してください。
</notification>
<notification name="YouHaveBeenLoggedOut">
- しまった、 [SECOND_LIFE] からログアウトされてしまいました。
- [MESSAGE]
+ しまった、[SECOND_LIFE] からログアウトされてしまいました。
+
+[MESSAGE]
<usetemplate name="okcancelbuttons" notext="終了" yestext="IMとチャットを表示"/>
</notification>
<notification name="OnlyOfficerCanBuyLand">
@@ -1390,6 +1395,13 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries を参照してく
<ignore name="ignore" text="衣類がダウンロードされるまで時間がかかっているとき"/>
</form>
</notification>
+ <notification name="RegionAndAgentComplexity">
+ ご使用の [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 表示の複雑さ] は [AGENT_COMPLEXITY] です。
+[OVERLIMIT_MSG]
+ </notification>
+ <notification name="AgentComplexity">
+ ご使用の [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 表示の複雑さ] は [AGENT_COMPLEXITY] です。
+ </notification>
<notification name="FirstRun">
[APP_NAME] のインストールが完了しました。
@@ -1669,6 +1681,25 @@ http://secondlife.com/download から最新バージョンをダウンロード
[[INFO_URL] このアップデートに関する情報] を参照
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="UpdateDownloadInProgress">
+ アップデートを利用できます。
+バックグラウンドでアップデートをダウンロードしています。準備ができ次第、インストールを完了するために、ビューワを再起動するように求めるメッセージが表示されます。
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateDownloadComplete">
+ アップデートがダウンロードされました。再起動中にインストールされます。
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateCheckError">
+ アップデートの確認中にエラーが発生しました。
+あとでもう一度お試しください。
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateViewerUpToDate">
+ ご利用のビューワは最新です!
+最新の機能と修正を今すぐ試したい場合は、代替ビューワページ (http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers) をチェックしてください。
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="DeedObjectToGroup">
このオブジェクトを譲渡するとグループは以下のことが可能です:
* オブジェクトに支払われた L$ を受領します。
@@ -1776,6 +1807,14 @@ http://secondlife.com/download から最新バージョンをダウンロード
加入できるグループの最大限に達しました。 新しくグループに参加、または作成する前に、どれかグループから抜けてください。
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="GroupLimitInfo">
+ ベースアカウントのグループ制限は [MAX_BASIC]、[https://secondlife.com/premium/ プレミアム] アカウントの
+グループ制限は [MAX_PREMIUM] です。
+アカウントをダウングレードした場合、さらにグループに参加する前に、下の [MAX_BASIC] グループ制限を取得する必要があります。
+
+[https://secondlife.com/my/account/membership.php 今すぐアップグレード!]
+ <usetemplate name="okbutton" yestext="閉じる"/>
+ </notification>
<notification name="KickUser">
どのようなメッセージを添えてこの住人を追い出しますか?
<form name="form">
@@ -1973,11 +2012,11 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name を参照してくだ
<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
</notification>
<notification label="不動産を選択" name="EstateTrustedExperienceAdd">
- この不動産のキー体験リストにのみ追加しますか、それとも [ALL_ESTATES] のキー体験リストに追加しますか?
+ この不動産のキー リストにのみ追加しますか、それとも [ALL_ESTATES] のキー リストに追加しますか?
<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
</notification>
<notification label="不動産を選択" name="EstateTrustedExperienceRemove">
- この不動産の信頼済み体験リストからのみ削除しますか、それとも [ALL_ESTATES] の信頼済みリストから削除しますか?
+ この不動産のキーリストからのみ削除しますか、それとも [ALL_ESTATES] のキーリストから削除しますか?
<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
</notification>
<notification label="キックを確認" name="EstateKickUser">
@@ -2291,6 +2330,10 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します
L$[AMOUNT] を [TARGET] に支払うことを確認してください。
<usetemplate ignoretext="支払い前に確認 (合計金額が L$200 以上の場合)" name="okcancelignore" notext="取り消し" yestext="支払い"/>
</notification>
+ <notification name="PayObjectFailed">
+ 支払いが失敗しました: オブジェクトが見つかりませんでした。
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
このオブジェクトには、あなたがコピーできるアイテムはありません。
</notification>
@@ -2322,10 +2365,9 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します
[QUESTION]
<usetemplate ignoretext="アイテムを削除する前の確認" name="okcancelignore" notext="取り消し" yestext="OK"/>
</notification>
- <notification name="HelpReportAbuseEmailLL">
- このツールを利用して [http://secondlife.com/corporate/tos.php 利用規約] や [http://jp.secondlife.com/corporate/cs.php コミュニティスタンダード] の違反を報告してください。
-
-報告された嫌がらせはすべて調査・解決されます。
+ <notification name="ConfirmUnlink">
+ これは、リンクセットによる広範囲の選択です。リンクを解除すると、もう一度リンクできなくなる可能性があります。そのような場合に備えて、リンクセットを自分の持ち物にコピーできます。
+ <usetemplate ignoretext="リンクセットのリンクを解除するときに確認する" name="okcancelignore" notext="取り消し" yestext="リンクを外す"/>
</notification>
<notification name="HelpReportAbuseSelectCategory">
嫌がらせ報告のカテゴリを選択してください。
@@ -3034,7 +3076,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
所有者のレーティング区分より高いレーティング区分の体験を設定できません。
</notification>
<notification name="RestrictedTermExperienceProfileMessage">
- 次の条件により、体験プロフィール名および説明の更新ができませんでした: [extra_info]
+ 次の条件により、体験プロフィール名および説明の更新ができませんでした: [extra_info]
</notification>
<notification name="TeleportedHomeExperienceRemoved">
体験 secondlife:///app/experience/[public_id]/profile を削除するために、[region_name] リージョンからテレポートされ、このリージョンに入ることはできなくなりました。
@@ -3049,7 +3091,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
</form>
</notification>
<notification name="TrustedExperiencesAvailable">
- この目的地へのアクセス権がありません。下の体験を受け入れることにより、このリージョンに入ることができます:
+ この目的地へのアクセス権がありません。下の体験を受け入れることにより、このリージョンに入ることができます:
[EXPERIENCE_LIST]
@@ -3058,7 +3100,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
<notification name="ExperienceEvent">
[EventType] by the secondlife:///app/experience/[public_id]/profile experience により、オブジェクトでアクション ([EventType]) を実行することが許可されました。
所有者:secondlife:///app/agent/[OwnerID]/inspect
-オブジェクト名:[ObjectName]
+オブジェクト名:[ObjectName]
区画名:[ParcelName]
</notification>
<notification name="ExperienceEventAttachment">
@@ -3072,9 +3114,9 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
権限が許可されると、体験プロフィールから呼び出さない限り、この体験にこのメッセージが再び表示されることはありません。
-この体験に関連付けられたスクリプトにより、この体験が有効なリージョンで以下のことを実行できます:
+この体験に関連付けられたスクリプトにより、この体験が有効なリージョンで以下のことを実行できます:
-[QUESTIONS]よろしいですか?
+[QUESTIONS] よろしいですか?
<form name="form">
<button name="BlockExperience" text="体験をブロック"/>
<button name="Mute" text="オブジェクトをブロックする"/>
@@ -3256,6 +3298,12 @@ M キーを押して変更します。
<notification name="AttachmentSaved">
アタッチメントが保存されました。
</notification>
+ <notification name="PresetNotSaved">
+ プリセット [NAME] の保存中にエラーが発生しました。
+ </notification>
+ <notification name="PresetNotDeleted">
+ プリセット [NAME] の削除中にエラーが発生しました。
+ </notification>
<notification name="UnableToFindHelpTopic">
ヘルプトピックが見つかりませんでした。
</notification>
@@ -3288,9 +3336,8 @@ M キーを押して変更します。
共有する住人を選択します。
</notification>
<notification name="MeshUploadError">
- [LABEL] をアップロードできませんでした:[MESSAGE] [IDENTIFIER]
-
-詳細についてはログをご覧ください。
+ [LABEL] をアップロードできませんでした:[MESSAGE] [IDENTIFIER]
+[DETAILS] 詳しくは、SecondLife.log をご覧ください。
</notification>
<notification name="MeshUploadPermError">
メッシュのアップロード許可をリクエスト中にエラーが発生しました。
diff --git a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
index bac885e5d8..bac885e5d8 100755..100644
--- a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
index 90491e84c5..90491e84c5 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
index 17e1283d24..17e1283d24 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
index 3ef8eba19f..3ef8eba19f 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
index fd91ea97d1..fd91ea97d1 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
index 9263e5f347..9263e5f347 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
index 95a5a26d4e..95a5a26d4e 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
index 42d8a21660..42d8a21660 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
index 6eca8adfe5..6eca8adfe5 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_chat_header.xml b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
index 7916bf5155..7916bf5155 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
index 6717ba9ba3..6717ba9ba3 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_classified_info.xml b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
index 57a255afde..57a255afde 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
index 2159f17fec..2159f17fec 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
index 158b2fa6ac..158b2fa6ac 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
index b9bc10c220..b9bc10c220 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
index a1e30283ee..a1e30283ee 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
index 0395d4edd8..0395d4edd8 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
index 7250da69a4..7250da69a4 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
index b556b68e02..b556b68e02 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
index 94967999a1..94967999a1 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
index 72eb120c3d..72eb120c3d 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
index f73f760192..f73f760192 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
index ee39e9435c..ee39e9435c 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
index 6a1789c9f4..6a1789c9f4 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
index 6ebf0062dc..6ebf0062dc 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
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 39ea1df1e3..39ea1df1e3 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
index 4cbd7f793b..4cbd7f793b 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
index 5a3a949150..5a3a949150 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
index f33daa4eba..f33daa4eba 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
index c7626189af..c7626189af 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
index 7573132576..7573132576 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
index 6efc4ce99a..6efc4ce99a 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
index 71fc7c5682..71fc7c5682 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
index f4cfe6d83f..f4cfe6d83f 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
index f345a81922..f345a81922 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
index 66b2ffa8ba..66b2ffa8ba 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
index 000dac7b5b..000dac7b5b 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_log.xml b/indra/newview/skins/default/xui/ja/panel_experience_log.xml
index 39e0e27b05..16976df035 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_log.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_log.xml
@@ -15,7 +15,7 @@
<button label="報告" name="btn_report_xp"/>
</layout_panel>
<layout_panel name="button_panel">
- <check_box label="すべてのイベントを通知 日数" name="notify_all"/>
+ <check_box label="すべてのイベント 日数を通知" name="notify_all"/>
<button label="クリア" name="btn_clear"/>
<button label="&lt;" name="btn_prev"/>
<button label="&gt;" name="btn_next"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
index 49749732c9..49749732c9 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml
index a1bfb67823..a1bfb67823 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
index bd1013d6ca..bd1013d6ca 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
index 2639454a01..2639454a01 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
index 82be58a0fb..82be58a0fb 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
index 77d3d8f391..77d3d8f391 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
index ddad6c1f9b..ddad6c1f9b 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notify.xml b/indra/newview/skins/default/xui/ja/panel_group_notify.xml
index 7135ae780d..7135ae780d 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_notify.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
index 0e231b5b4f..0e231b5b4f 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
index f2429ac12a..f2429ac12a 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_instant_message.xml b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
index bf4cbcdc46..bf4cbcdc46 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
index d18047fbcf..d18047fbcf 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
index 7fca66f90f..7fca66f90f 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_landmarks.xml b/indra/newview/skins/default/xui/ja/panel_landmarks.xml
index 24d6ff23ae..24d6ff23ae 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_landmarks.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index 5f2007e0da..5f2007e0da 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
index f908262f4f..1e7c260061 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="もの" name="main inventory panel">
<panel.string name="ItemcountFetching">
[ITEM_COUNT] 個のアイテムを取得中です... [FILTER]
@@ -6,6 +6,9 @@
<panel.string name="ItemcountCompleted">
[ITEM_COUNT] 個のアイテム [FILTER]
</panel.string>
+ <panel.string name="ItemcountUnknown">
+ [ITEM_COUNT] 個の取得アイテム [FILTER]
+ </panel.string>
<text name="ItemcountText">
アイテム:
</text>
@@ -16,7 +19,7 @@
</tab_container>
<layout_stack name="bottom_panel">
<layout_panel name="options_gear_btn_panel">
- <button name="options_gear_btn" tool_tip="オプションを表示します"/>
+ <menu_button name="options_gear_btn" tool_tip="オプションを表示します"/>
</layout_panel>
<layout_panel name="add_btn_panel">
<button name="add_btn" tool_tip="新しいアイテムを追加します"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_me.xml b/indra/newview/skins/default/xui/ja/panel_me.xml
index 3df1ae8048..3df1ae8048 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_me.xml
+++ b/indra/newview/skins/default/xui/ja/panel_me.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
index 6321dbb048..6321dbb048 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
index 11d9ed4c16..11d9ed4c16 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
index ea4fdb9ce5..ea4fdb9ce5 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
index 51402b2e00..51402b2e00 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
index 4048b48d3a..4048b48d3a 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
index 201fb0a376..201fb0a376 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
index c29ec64304..c29ec64304 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
index aff427ed49..aff427ed49 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
index 8e0cf4bc9d..8e0cf4bc9d 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
index fdc489f375..fdc489f375 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml
index 1a14283113..1a14283113 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
index e89ce0c479..e89ce0c479 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
index 93df0ba2bd..93df0ba2bd 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
index e8caab0696..e8caab0696 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
index df9ef40113..df9ef40113 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
index fd03e6b89e..fd03e6b89e 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index dd8fd41681..5fc4b57a08 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -18,6 +18,7 @@
<string name="no_groups_msg" value="グループをお探しですか? [secondlife:///app/search/groups 検索] をお試しください。"/>
<string name="MiniMapToolTipMsg" value="[地域](ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動)"/>
<string name="AltMiniMapToolTipMsg" value="[地域](ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動)"/>
+ <string name="GroupCountWithInfo" value="あなたは [COUNT] グループに属しているので、まだ [REMAINING] 参加できます。[secondlife:/// 詳細]"/>
<tab_container name="tabs">
<panel label="近く" name="nearby_panel">
<panel label="bottom_panel" name="nearby_buttons_panel">
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 e7b5d1929d..e7b5d1929d 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_pick_info.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_picks.xml b/indra/newview/skins/default/xui/ja/panel_picks.xml
index c6eaaeef41..c6eaaeef41 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_picks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_picks.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
index 7235bc0f18..7235bc0f18 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml
index 9d3925afdc..9d3925afdc 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_places.xml
+++ b/indra/newview/skins/default/xui/ja/panel_places.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
index b7c3f48557..b7c3f48557 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
index f34fdc6b67..f34fdc6b67 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
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 6e8797ec5e..62b8daeb4e 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
<check_box label="複数のビューワを許可" name="allow_multiple_viewer_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"/>
+ <check_box label="開発メニューを表示" name="show_develop_menu_check"/>
<button label="デフォルト作成許可" name="default_creation_permissions"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
index 7fd2e31698..7fd2e31698 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index 1c3204ea04..1473281502 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
<check_box label="インベントリを送る" name="inventory_offer"/>
</panel>
<panel name="log_settings">
+ <text name="logging_label">
+ 保存:
+ </text>
+ <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 label="ログを消去..." name="clear_log"/>
<button label="テキストチャットを削除..." name="delete_transcripts"/>
+ <text name="log_location_label">
+ 場所:
+ </text>
<button label="参照..." label_selected="参照" name="log_path_button"/>
</panel>
<button label="他の言語..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
index 9f6abf8fcb..9f6abf8fcb 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 39bc05c845..e2b74354fa 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -6,12 +6,12 @@
<combo_box name="language_combobox">
<combo_box.item label="システムデフォルト" name="System Default Language"/>
<combo_box.item label="English (英語)" name="English"/>
- <combo_box.item label="Dansk (デンマーク語) – ベータ" name="Danish"/>
+ <combo_box.item label="Dansk (デンマーク語) - ベータ" name="Danish"/>
<combo_box.item label="Deutsch (ドイツ語) – ベータ" name="Deutsch(German)"/>
<combo_box.item label="Español (スペイン語) – ベータ" name="Spanish"/>
<combo_box.item label="Français (フランス語) – ベータ" name="French"/>
<combo_box.item label="Italiano (イタリア語) - ベータ" name="Italian"/>
- <combo_box.item label="Polski (ポーランド語) - ベータ" name="Polish"/>
+ <combo_box.item label="Polski (ポーランド語) - ベータ" name="Polish"/>
<combo_box.item label="Português(ポルトガル語) - ベータ" name="Portugese"/>
<combo_box.item label="Русский (ロシア語) - ベータ" name="Russian"/>
<combo_box.item label="Türkçe (トルコ語) - ベータ" name="Turkish"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 15017e330e..8fbe9b56b9 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="表示" name="Display panel">
+ <text name="preset_text">
+ (なし)
+ </text>
<text name="QualitySpeed">
クオリティとスピード:
</text>
- <text name="FasterText">
- 速い
- </text>
- <text name="BetterText">
- 遅い
- </text>
<text name="ShadersPrefText">
</text>
@@ -21,94 +18,17 @@
<text name="ShadersPrefText4">
超高
</text>
- <panel label="カスタムグラフィック" name="CustomGraphics Panel">
- <text name="ShadersText">
- シェーダー:
- </text>
- <check_box initial_value="true" label="透明な水" name="TransparentWater"/>
- <check_box initial_value="true" label="バンプマッピングと光沢" name="BumpShiny"/>
- <check_box initial_value="true" label="近くの光" name="LocalLights"/>
- <check_box initial_value="true" label="基本シェーダー" name="BasicShaders" tool_tip="このオプションを無効にすると、グラフィックカードのドライバの種類によっては、クラッシュするのを防ぎます。"/>
- <check_box initial_value="true" label="周囲(大気)シェーダー" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="高度なライティングモデル" name="UseLightShaders"/>
- <check_box initial_value="true" label="アンビエントオクルージョン" name="UseSSAO"/>
- <check_box initial_value="true" label="フィールドの遠近感" name="UseDoF"/>
- <text name="shadows_label">
- 影:
- </text>
- <combo_box name="ShadowDetail">
- <combo_box.item label="なし" name="0"/>
- <combo_box.item label="太陽/月" name="1"/>
- <combo_box.item label="太陽/月・プロジェクタ" name="2"/>
- </combo_box>
- <text name="reflection_label">
- 水の反射:
- </text>
- <combo_box initial_value="true" label="水の反射" name="Reflections">
- <combo_box.item label="最小" name="0"/>
- <combo_box.item label="地形と樹木" name="1"/>
- <combo_box.item label="すべての静止オブジェクト" name="2"/>
- <combo_box.item label="すべてのアバターとオブジェクト" name="3"/>
- <combo_box.item label="すべて" name="4"/>
- </combo_box>
- <slider label="アバターの物理作用:" name="AvatarPhysicsDetail"/>
- <text name="AvatarPhysicsDetailText">
- 低
- </text>
- <slider label="描画距離:" name="DrawDistance"/>
- <text name="DrawDistanceMeterText2">
- m
- </text>
- <slider label="最大パーティクル数:" name="MaxParticleCount"/>
- <slider label="簡略化せずに描画するアバターの最大数:" name="MaxNumberAvatarDrawn"/>
- <slider label="ポストプロセス品質:" name="RenderPostProcess"/>
- <text name="MeshDetailText">
- メッシュ詳細:
- </text>
- <slider label=" オブジェクト:" name="ObjectMeshDetail"/>
- <slider label=" フレキシプリム:" name="FlexibleMeshDetail"/>
- <slider label=" 樹木:" name="TreeMeshDetail"/>
- <slider label=" アバター:" name="AvatarMeshDetail"/>
- <slider label=" 地形:" name="TerrainMeshDetail"/>
- <slider label=" 空:" name="SkyMeshDetail"/>
- <text name="PostProcessText">
- 低
- </text>
- <text name="ObjectMeshDetailText">
- 低
- </text>
- <text name="FlexibleMeshDetailText">
- 低
- </text>
- <text name="TreeMeshDetailText">
- 低
- </text>
- <text name="AvatarMeshDetailText">
- 低
- </text>
- <text name="TerrainMeshDetailText">
- 低
- </text>
- <text name="SkyMeshDetailText">
- 低
- </text>
- <text name="AvatarRenderingText">
- アバターレンダリング:
- </text>
- <check_box initial_value="true" label="アバターの描画を簡略化" name="AvatarImpostors"/>
- <check_box initial_value="true" label="ハードウェアスキニング" name="AvatarVertexProgram"/>
- <check_box initial_value="true" label="アバターの布" name="AvatarCloth"/>
- <text name="TerrainDetailText">
- 地形詳細:
- </text>
- <radio_group name="TerrainDetailRadio">
- <radio_item label="低" name="0"/>
- <radio_item label="高" name="2"/>
- </radio_group>
- --&gt;
- </panel>
- <button label="適用" label_selected="適用" name="Apply"/>
- <button label="リセット" name="Defaults"/>
- <button label="詳しい設定" name="Advanced"/>
- <button label="ハードウェア" label_selected="ハードウェア" name="GraphicsHardwareButton"/>
+ <text name="FasterText">
+ 速い
+ </text>
+ <text name="BetterText">
+ 遅い
+ </text>
+ <check_box initial_value="true" label="周囲 (大気) シェーダー" name="WindLightUseAtmosShaders"/>
+ <check_box initial_value="true" label="高度なライティングモデル" name="UseLightShaders"/>
+ <button label="設定をプリセットとして保存..." name="PrefSaveButton"/>
+ <button label="プリセットをロード..." name="PrefLoadButton"/>
+ <button label="事前設定を削除..." name="PrefDeleteButton"/>
+ <button label="推奨設定にリセット" name="Defaults"/>
+ <button label="詳細設定..." name="AdvancedSettings"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
index 121bebfd52..121bebfd52 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
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 2db6a688f3..2db6a688f3 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
index c1ddf08465..be823938a2 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -16,19 +16,18 @@
</text>
<radio_group name="preferred_browser_behavior">
<radio_item label="すべてのリンクにマイ ブラウザ (Chrome、Firefox、IE) を使用" name="internal" tool_tip="デフォルトのシステム Web ブラウザでヘルプや Web リンク先などを見ます。全画面で起動中にはおすすめしません。" value="0"/>
- <radio_item label="Second Life リンクにのみ内蔵ブラウザを使用" name="external" tool_tip="ヘルプ、Web リンクなどにはデフォルトシステムのブラウザを使用します。
-内蔵ブラウザは LindenLab/SecondLife リンクにのみ使用されます。" value="1"/>
+ <radio_item label="Second Life リンクにのみ内蔵ブラウザを使用" name="external" tool_tip="ヘルプ、Web リンクなどにはデフォルトシステムのブラウザを使用します。 内蔵ブラウザは LindenLab/SecondLife リンクにのみ使用されます。" value="1"/>
+ <radio_item label="すべてのリンクに内蔵ブラウザを使用" name="external_all" tool_tip="内蔵ブラウザでヘルプや Web リンクなどを見ます。[APP_NAME] 内に新しいウィンドウでこのブラウザが開きます。" value="2"/>
</radio_group>
<check_box initial_value="true" label="プラグインを有効にする" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Cookie を受け入れる" name="cookies_enabled"/>
<check_box initial_value="true" label="Javascript を有効にする" name="browser_javascript_enabled"/>
- <check_box initial_value="false" label="メディアブラウザのポップアップを有効にする" name="media_popup_enabled"/>
<text name="Software updates:">
ソフトウェアアップデート:
</text>
<combo_box name="updater_service_combobox">
<combo_box.item label="自動的にインストール" name="Install_automatically"/>
- <combo_box.item label="手動でアップデートをダウンロード&amp;インストール" name="Install_manual"/>
+ <combo_box.item label="更新を手動でダウンロードしてインストールします" name="Install_manual"/>
</combo_box>
<check_box label="release candidate にアップグレードします" name="update_willing_to_test"/>
<text name="Proxy Settings:">
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 3a4c360ccc..3a4c360ccc 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
new file mode 100644
index 0000000000..422ed01cbb
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+ <text name="Graphic Presets">
+ グラフィックプリセット
+ </text>
+ <button label="グラフィックス設定を開く" name="open_prefs_btn" tool_tip="グラフィックス設定を開きます"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
index 5506373eb0..6e9d7341a0 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
@@ -39,12 +39,9 @@
<layout_panel name="media_address">
<line_editor name="media_address_url" tool_tip="メディア URL"/>
<layout_stack name="media_address_url_icons">
- <layout_panel>
+ <layout_panel name="media_address_url_icons_wl">
<icon name="media_whitelist_flag" tool_tip="ホワイトリスト有効"/>
</layout_panel>
- <layout_panel>
- <icon name="media_secure_lock_flag" tool_tip="安全な閲覧"/>
- </layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
index 5214f79141..5214f79141 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
index 908af3d66a..908af3d66a 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
index f6ef3f0934..f6ef3f0934 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index b5cc6b9765..b5cc6b9765 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_region_experiences.xml b/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
index f13c7bea4d..711b8e7291 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
@@ -3,7 +3,7 @@
<panel.string name="trusted_estate_text">
どんな体験でもキーになる可能性があります。
-キー体験には、この不動産で動作する権限があります。
+キー体験には、この不動産で実行する権限があります。
さらに、不動産でパブリックアクセスが許可されない場合、キー体験に参加する住人は不動産に入って、キー体験にいる間滞在することができます。
</panel.string>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml
index d23007dc6b..d23007dc6b 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
index fb853c1925..fb853c1925 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_script_ed.xml b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
index 3aa20d0a3c..3aa20d0a3c 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_script_experience.xml b/indra/newview/skins/default/xui/ja/panel_script_experience.xml
index 1c5ea2958b..eb8a510b20 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_experience.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_experience.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="script_experience" title="体験">
<button label="体験" name="Expand Experience"/>
- <check_box label="次の体験を使用:" name="enable_xp"/>
+ <check_box label="体験を使用" name="enable_xp"/>
<layout_stack name="xp_details">
<layout_panel>
<combo_box label="体験を選択..." name="Experiences..."/>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
index 494884c187..494884c187 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
index d91eba9699..d91eba9699 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
index a2d0237da0..a2d0237da0 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
index b698fa762d..b698fa762d 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
index fa659040ea..fa659040ea 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
index d06db8ccb1..d06db8ccb1 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
index ea17cd6526..ea17cd6526 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
index a42dd12a9c..32aeca0026 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
画像をインベントリに保存するには L$[UPLOAD_COST] の費用がかかります。画像をテクスチャとして保存するには平方形式の 1 つを選択してください。
</text>
<combo_box label="解像度" name="texture_size_combo">
- <combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
+ <combo_box.item label="現在のウィンドウ (512x512)" name="CurrentWindow"/>
<combo_box.item label="小(128x128)" name="Small(128x128)"/>
<combo_box.item label="中(256x256)" name="Medium(256x256)"/>
<combo_box.item label="大(512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
index d23056a3d5..d23056a3d5 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
index 492115bec0..492115bec0 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
index 80d400c846..80d400c846 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
index 0824504235..0824504235 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
index 2308aff19b..2308aff19b 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index 2e1446d450..2e1446d450 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
index 81db7c8989..81db7c8989 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
index 58e396877c..58e396877c 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
index 0340bfe754..0340bfe754 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
index 34763f78c1..1c55992336 100644
--- a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
@@ -21,11 +21,11 @@
<combo_box.item label="材質" name="Materials"/>
<combo_box.item label="メディア" name="Media"/>
</combo_box>
- <combo_box name="combobox mattype">
- <combo_box.item label="テクスチャ (拡散)" name="Texture (diffuse)"/>
- <combo_box.item label="凹凸 (標準)" name="Bumpiness (normal)"/>
- <combo_box.item label="輝き (反射)" name="Shininess (specular)"/>
- </combo_box>
+ <radio_group name="radio_material_type">
+ <radio_item label="テクスチャ (拡散)" name="Texture (diffuse)" value="0"/>
+ <radio_item label="凹凸 (標準)" name="Bumpiness (normal)" value="1"/>
+ <radio_item label="輝き (反射)" name="Shininess (specular)" value="2"/>
+ </radio_group>
<texture_picker label="テクスチャ" name="texture control" tool_tip="クリックして写真を選択します"/>
<text name="label alphamode">
アルファモード
diff --git a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
index 530f0fb59d..530f0fb59d 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
index 967dedf061..967dedf061 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_world_map.xml b/indra/newview/skins/default/xui/ja/panel_world_map.xml
index 8ff853193a..8ff853193a 100755..100644
--- a/indra/newview/skins/default/xui/ja/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/panel_world_map.xml
diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml
index eb2c12accc..eb2c12accc 100755..100644
--- a/indra/newview/skins/default/xui/ja/role_actions.xml
+++ b/indra/newview/skins/default/xui/ja/role_actions.xml
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
index 30cef9ccc0..30cef9ccc0 100755..100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
index 5aa0e86a5b..5aa0e86a5b 100755..100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
index d888470846..35e9b66bc8 100755..100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="item properties" title="アイテムのプロフィール">
<panel.string name="loading_experience">
- (ローディング)
+ (ローディング)
</panel.string>
<panel.string name="unknown">
(不明)
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index 858307800b..858307800b 100755..100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 22eb9ce888..1ad977fe88 100755..100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -38,10 +38,7 @@
グラフィックを初期化できませんでした。グラフィックドライバを更新してください。
</string>
<string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
- </string>
- <string name="AboutCompiler">
- コンパイラー [COMPILER] [COMPILER_VERSION] バージョン
+ [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</string>
<string name="AboutPosition">
あなたの現在地は、[POSITION_LOCAL_0,number,1]、[POSITION_LOCAL_1,number,1]、[POSITION_LOCAL_2,number,1] の [REGION] です。位置は &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; です。([HOSTIP])
@@ -63,11 +60,10 @@ OS バージョン:[OS_VERSION]
<string name="AboutLibs">
OpenGL バージョン:[OPENGL_VERSION]
-libcurl バージョン:[LIBCURL_VERSION]
J2C デコーダバージョン:[J2C_VERSION]
オーディオドライババージョン:[AUDIO_DRIVER_VERSION]
-Qt Webkit バージョン:[QT_WEBKIT_VERSION]
-ボイスサーバーバージョン:[VOICE_VERSION]
+LLCEFLib/CEF バージョン: [LLCEFLIB_VERSION]
+ボイスサーバーバージョン: [VOICE_VERSION]
</string>
<string name="AboutTraffic">
パケットロス:[PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
@@ -177,6 +173,12 @@ Qt Webkit バージョン:[QT_WEBKIT_VERSION]
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="AgniGridLabel">
+ Second Life メイングリッド (Agni)
+ </string>
+ <string name="AditiGridLabel">
+ Second Life ベータテストグリッド (Aditi)
+ </string>
<string name="ViewerDownloadURL">
http://secondlife.com/download
</string>
@@ -452,6 +454,9 @@ support@secondlife.com にお問い合わせください。
[AMOUNT] 以上のアイテムを含むフォルダを装着できません。「詳細設定」 &gt; 「デバッグ設定を表示」 &gt; 「WearFolderLimit」でこの制限を変更できます。
</string>
<string name="TooltipPrice" value="L$[AMOUNT]:"/>
+ <string name="TooltipSLIcon">
+ これは、SecondLife.com または LindenLab.com の公式ドメイン上のページにリンクします。
+ </string>
<string name="TooltipOutboxDragToWorld">
マーケットプレイスのリストフォルダからアイテムを Rez できません
</string>
@@ -471,7 +476,7 @@ support@secondlife.com にお問い合わせください。
在庫アイテム数が [AMOUNT] 個を超えています。
</string>
<string name="TooltipOutboxCannotDropOnRoot">
- アイテムまたはフォルダは「すべて」タブによってのみドロップできます。このタブを選択してから、もう一度アイテムまたはフォルダを選択してください。
+ アイテムまたはフォルダは「すべて」または「関連付けされていない」タブによってのみドロップできます。これらのタブのいずれかを選択してから、もう一度アイテムまたはフォルダを選択してください。
</string>
<string name="TooltipOutboxNoTransfer">
これらのオブジェクトの 1 つまたは複数は売り渡したり譲渡したりできないものです
@@ -555,6 +560,9 @@ support@secondlife.com にお問い合わせください。
クリックして secondlife:// コマンドを出します
</string>
<string name="CurrentURL" value=" 現在の URL: [CurrentURL]"/>
+ <string name="TooltipEmail">
+ クリックして電子メールを作成
+ </string>
<string name="SLurlLabelTeleport">
テレポート
</string>
@@ -1080,7 +1088,7 @@ support@secondlife.com にお問い合わせください。
<string name="AgentNameSubst">
(あなた)
</string>
- <string name="JoinAnExperience"/><!-- intentionally blank -->
+ <string name="JoinAnExperience"/>
<string name="SilentlyManageEstateAccess">
土地のアクセスリストを管理するときにアラートを表示しない
</string>
@@ -1859,6 +1867,21 @@ support@secondlife.com にお問い合わせください。
<string name="TodayOld">
今日参加
</string>
+ <string name="av_render_everyone_now">
+ 全員にあなたが見えるようになりました。
+ </string>
+ <string name="av_render_not_everyone">
+ あなたのまわりの一部の人には、あなたが見えない可能性があります。
+ </string>
+ <string name="av_render_over_half">
+ あなたの周囲の半分以上の人に、あなたが表示されない可能性があります。
+ </string>
+ <string name="av_render_most_of">
+ あなたのまわりのほとんどの人に、あなたが見えない可能性があります。
+ </string>
+ <string name="av_render_anyone">
+ あなたのまわりの誰にもあなたが見えない可能性があります。
+ </string>
<string name="AgeYearsA">
[COUNT] 年
</string>
@@ -1976,6 +1999,9 @@ support@secondlife.com にお問い合わせください。
<string name="CompileQueueUnknownFailure">
原因不明の失敗によりダウンロードができません
</string>
+ <string name="CompileNoExperiencePerm">
+ [EXPERIENCE] 体験による [SCRIPT] スクリプトのスキップ。
+ </string>
<string name="CompileQueueTitle">
リコンパイル進行
</string>
@@ -2021,9 +2047,6 @@ support@secondlife.com にお問い合わせください。
<string name="GroupsNone">
なし
</string>
- <string name="CompileNoExperiencePerm">
- [EXPERIENCE] 体験による [SCRIPT] スクリプトのスキップ。
- </string>
<string name="Group" value=" (グループ)"/>
<string name="Unknown">
(不明)
@@ -5379,23 +5402,11 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
<string name="UserDictionary">
[User]
</string>
- <string name="logging_calls_disabled_log_empty">
- 会話はログに記録されていません。ログの記録を開始するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
- </string>
- <string name="logging_calls_disabled_log_not_empty">
- これ以上の会話は記録されません。ログの記録を再開するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
- </string>
- <string name="logging_calls_enabled_log_empty">
- ログイン時の会話はありません。誰かにご連絡した後、または誰かがあなたに連絡した後、ログエントリがここに表示されます。
- </string>
- <string name="loading_chat_logs">
- ロード中...
- </string>
<string name="experience_tools_experience">
体験
</string>
<string name="ExperienceNameNull">
- (体験なし)
+ (体験なし)
</string>
<string name="ExperienceNameUntitled">
(タイトルのない体験)
@@ -5449,7 +5460,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
体験の権限を自動的に承諾
</string>
<string name="ExperiencePermissionShortUnknown">
- が不明な操作を実行しました: [Permission]
+ が不明な操作を実行しました: [Permission]
</string>
<string name="ExperiencePermissionShort1">
コントロールする
@@ -5472,4 +5483,37 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
<string name="ExperiencePermissionShort12">
権限
</string>
+ <string name="logging_calls_disabled_log_empty">
+ 会話はログに記録されていません。ログの記録を開始するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
+ </string>
+ <string name="logging_calls_disabled_log_not_empty">
+ これ以上の会話は記録されません。ログの記録を再開するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
+ </string>
+ <string name="logging_calls_enabled_log_empty">
+ ログイン時の会話はありません。誰かにご連絡した後、または誰かがあなたに連絡した後、ログエントリがここに表示されます。
+ </string>
+ <string name="loading_chat_logs">
+ ロード中...
+ </string>
+ <string name="preset_combo_label">
+ -空リスト-
+ </string>
+ <string name="Default">
+ デフォルト
+ </string>
+ <string name="none_paren_cap">
+ (なし)
+ </string>
+ <string name="no_limit">
+ 無制限
+ </string>
+ <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+ 物理形状に小さすぎる三角形が含まれています。物理モデルを簡略化してください。
+ </string>
+ <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+ 物理形状に不正な確認データがあります。物理モデルを修正してください。
+ </string>
+ <string name="Mav_Details_MAV_UNKNOWN_VERSION">
+ 物理形状のバージョンが正しくありません。物理モデルに正しいバージョンを設定してください。
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
index 4555420ba8..4555420ba8 100755..100644
--- a/indra/newview/skins/default/xui/ja/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml
diff --git a/indra/newview/skins/default/xui/ja/xui_version.xml b/indra/newview/skins/default/xui/ja/xui_version.xml
index 0e777751d3..0e777751d3 100755..100644
--- a/indra/newview/skins/default/xui/ja/xui_version.xml
+++ b/indra/newview/skins/default/xui/ja/xui_version.xml