summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/zh
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-05-20 10:08:27 -0700
committerdolphin <dolphin@lindenlab.com>2013-05-20 10:08:27 -0700
commit716a963d5544977863d07770c3c6449b3d9897bb (patch)
tree36ce3c4707851bb04f557d790fe410d26a009293 /indra/newview/skins/default/xui/zh
parent6308f93c6adddc9d396e8d2527e97e0d02c4aa52 (diff)
parent0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff)
Merge with viewer-release
Diffstat (limited to 'indra/newview/skins/default/xui/zh')
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_aaa.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_about.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_about_land.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_activeim.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_auction.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_autoreplace.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_avatar.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_avatar_picker.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_avatar_textures.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_beacons.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_build_options.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_bulk_perms.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_bumps.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_buy_contents.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_buy_currency.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_buy_land.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_buy_object.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_camera.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_chat_bar.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_choose_group.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_color_picker.xml0
-rw-r--r--indra/newview/skins/default/xui/zh/floater_conversation_log.xml8
-rw-r--r--indra/newview/skins/default/xui/zh/floater_conversation_preview.xml7
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_critical.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_destinations.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_display_name.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_environment_settings.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_event.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_fast_timers.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_font_test.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_gesture.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_god_tools.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_hardware_settings.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_help_browser.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_how_to.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_hud.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_im_container.xml29
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_im_session.xml61
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_image_preview.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_import_collada.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_incoming_call.xml8
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_inspect.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_joystick.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_lagmeter.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_land_holdings.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_lsl_guide.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_map.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_media_browser.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_media_settings.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_mem_leaking.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_model_preview.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_moveview.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_mute_object.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_my_appearance.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_my_inventory.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_notification.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_notifications_console.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_object_weights.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_openobject.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_outgoing_call.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml2
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_pay.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_pay_object.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_people.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_perm_prefs.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_picks.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_places.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_post_process.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_preferences.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_preview_animation.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_preview_gesture.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_preview_notecard.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_preview_sound.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_preview_texture.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_price_for_listing.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_publish_classified.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_region_debug_console.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_region_info.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_report_abuse.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_script_debug.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_script_limits.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_script_preview.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_script_queue.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_script_search.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_search.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_select_key.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_sell_land.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_settings_debug.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_snapshot.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_sound_devices.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_sound_preview.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_spellcheck.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_stats.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_sys_well.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_telehub.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml2
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_tools.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_top_objects.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_tos.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_toybox.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_translation_settings.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_url_entry.xml0
-rw-r--r--indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml4
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_voice_controls.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_voice_effect.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/floater_voice_volume.xml8
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_web_content.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_window_size.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/floater_world_map.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/inspect_avatar.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/inspect_group.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/inspect_object.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/inspect_remote_object.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_attachment_other.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_attachment_self.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_avatar_icon.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_avatar_other.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_avatar_self.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_cof_attachment.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_cof_body_part.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_cof_clothing.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_cof_gear.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/menu_conversation.xml31
-rw-r--r--indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml15
-rw-r--r--indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml7
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_edit.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_favorites.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_gesture_gear.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_group_plus.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_hide_navbar.xml0
-rw-r--r--indra/newview/skins/default/xui/zh/menu_im_conversation.xml15
-rw-r--r--indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml7
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_inventory.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_inventory_add.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_land.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_landmark.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_login.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_media_ctrl.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_mini_map.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_navbar.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_nearby_chat.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_notification_well_button.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_object.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_object_icon.xml2
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_outfit_gear.xml2
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_outfit_tab.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_participant_list.xml0
-rw-r--r--indra/newview/skins/default/xui/zh/menu_participant_view.xml13
-rw-r--r--indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml5
-rw-r--r--indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml5
-rw-r--r--indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml5
-rw-r--r--indra/newview/skins/default/xui/zh/menu_people_friends_view.xml8
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_people_groups.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/menu_people_groups_view.xml4
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_people_nearby.xml23
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml14
-rw-r--r--indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml8
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml0
-rw-r--r--indra/newview/skins/default/xui/zh/menu_people_recent_view.xml6
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_picks.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_picks_plus.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_place.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_place_add_button.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_profile_overflow.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_save_outfit.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_script_chiclet.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_slurl.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_text_editor.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_toolbars.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_topinfobar.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_url_agent.xml4
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_url_group.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_url_http.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_url_inventory.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_url_map.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_url_objectim.xml2
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_url_parcel.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_url_slapp.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_url_slurl.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_url_teleport.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_viewer.xml37
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_wearing_gear.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/menu_wearing_tab.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/mime_types.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/mime_types_linux.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/mime_types_mac.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/notifications.xml690
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_active_object_row.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml1
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_avatar_tag.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml15
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_chat_header.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_classified_info.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_cof_wearables.xml0
-rw-r--r--indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml8
-rw-r--r--indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml6
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_alpha.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_classified.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_eyes.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_gloves.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_hair.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_jacket.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_pants.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_physics.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_pick.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_profile.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_shape.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_shirt.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_shoes.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_skin.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_skirt.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_socks.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_underpants.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_edit_wearable.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_group_control_panel.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_group_general.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_group_invite.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_group_land_money.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_group_list_item.xml1
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_group_notices.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_group_notify.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_group_roles.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_im_control_panel.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_instant_message.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_inventory_item.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_landmark_info.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_landmarks.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_login.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_main_inventory.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_me.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_media_settings_general.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_media_settings_security.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_navigation_bar.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_nearby_chat.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_nearby_media.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_notify_textbox.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_online_status_toast.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_outfit_edit.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_outfits_list.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_people.xml88
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_pick_info.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_picks.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_place_profile.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_places.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_postcard_message.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_postcard_settings.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_preferences_chat.xml110
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_preferences_colors.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_preferences_general.xml4
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_preferences_move.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_preferences_setup.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_preferences_sound.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_region_covenant.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_region_debug.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_region_environment.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_region_estate.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_region_general.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_region_terrain.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_script_ed.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_script_question_toast.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_scrolling_param.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_snapshot_local.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_snapshot_options.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_sound_devices.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_status_bar.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_teleport_history.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_voice_effect.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_world_map.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/role_actions.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/sidepanel_appearance.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/sidepanel_inventory.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/sidepanel_item_info.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/sidepanel_task_info.xml1
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/strings.xml66
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/teleport_strings.xml0
349 files changed, 1149 insertions, 189 deletions
diff --git a/indra/newview/skins/default/xui/zh/floater_aaa.xml b/indra/newview/skins/default/xui/zh/floater_aaa.xml
index e2d6a2b004..e2d6a2b004 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/zh/floater_aaa.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index 643881e416..643881e416 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml
index 76db621951..76db621951 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_activeim.xml b/indra/newview/skins/default/xui/zh/floater_activeim.xml
index b148ca8eb4..b148ca8eb4 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/zh/floater_activeim.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml
index 76cb9079c4..76cb9079c4 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml
index ffb0de8a68..ffb0de8a68 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_auction.xml b/indra/newview/skins/default/xui/zh/floater_auction.xml
index 1b589a92cc..1b589a92cc 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_auction.xml
+++ b/indra/newview/skins/default/xui/zh/floater_auction.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_autoreplace.xml b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml
index 4ee07e6295..4ee07e6295 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar.xml b/indra/newview/skins/default/xui/zh/floater_avatar.xml
index 55b1a95a41..55b1a95a41 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
index c19369c859..c19369c859 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
index 69309c96de..69309c96de 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_beacons.xml b/indra/newview/skins/default/xui/zh/floater_beacons.xml
index 83e10804d6..83e10804d6 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/zh/floater_beacons.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_build_options.xml b/indra/newview/skins/default/xui/zh/floater_build_options.xml
index 29f36b461c..29f36b461c 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/zh/floater_build_options.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
index 59751a3a46..59751a3a46 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_bumps.xml b/indra/newview/skins/default/xui/zh/floater_bumps.xml
index 2d76a9f831..2d76a9f831 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bumps.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
index 5e4153de66..5e4153de66 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
index fcf2800728..fcf2800728 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml
index ec700ad7af..ec700ad7af 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
index 51bbd6a561..51bbd6a561 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_object.xml b/indra/newview/skins/default/xui/zh/floater_buy_object.xml
index ff4a1feedb..ff4a1feedb 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_object.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_camera.xml b/indra/newview/skins/default/xui/zh/floater_camera.xml
index becb7b9546..becb7b9546 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_camera.xml
+++ b/indra/newview/skins/default/xui/zh/floater_camera.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml b/indra/newview/skins/default/xui/zh/floater_chat_bar.xml
index f1a69a7688..f1a69a7688 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/zh/floater_chat_bar.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_choose_group.xml b/indra/newview/skins/default/xui/zh/floater_choose_group.xml
index 9977bfc828..9977bfc828 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/zh/floater_choose_group.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_color_picker.xml b/indra/newview/skins/default/xui/zh/floater_color_picker.xml
index fa7b795d4f..fa7b795d4f 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/zh/floater_color_picker.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_log.xml b/indra/newview/skins/default/xui/zh/floater_conversation_log.xml
new file mode 100644
index 0000000000..37115a0310
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="交談記錄">
+ <panel name="buttons_panel">
+ <filter_editor label="人員過濾器" name="people_filter_input"/>
+ <menu_button name="conversation_view_btn" tool_tip="檢視/排序的選項"/>
+ <menu_button name="conversations_gear_btn" tool_tip="對所選的人或群組採取動作"/>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml b/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
new file mode 100644
index 0000000000..ece263f440
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="交談:">
+ <floater.string name="Title">
+ 交談:[NAME]
+ </floater.string>
+ <text name="page_label" value="頁"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_critical.xml b/indra/newview/skins/default/xui/zh/floater_critical.xml
index 7d08fe8af2..7d08fe8af2 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_critical.xml
+++ b/indra/newview/skins/default/xui/zh/floater_critical.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml
index 4aafb31952..4aafb31952 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_destinations.xml b/indra/newview/skins/default/xui/zh/floater_destinations.xml
index f50a6a631a..f50a6a631a 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/zh/floater_destinations.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_display_name.xml b/indra/newview/skins/default/xui/zh/floater_display_name.xml
index aa71bba769..aa71bba769 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/zh/floater_display_name.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml
index b84a4027ea..b84a4027ea 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml
index 1ff832cdc4..1ff832cdc4 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml
index 7943866e72..7943866e72 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_environment_settings.xml b/indra/newview/skins/default/xui/zh/floater_environment_settings.xml
index 1c6f2f936d..1c6f2f936d 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_environment_settings.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_event.xml b/indra/newview/skins/default/xui/zh/floater_event.xml
index 7175731fef..7175731fef 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_event.xml
+++ b/indra/newview/skins/default/xui/zh/floater_event.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_fast_timers.xml b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml
index 871849305c..871849305c 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_font_test.xml b/indra/newview/skins/default/xui/zh/floater_font_test.xml
index ec83c51eb3..ec83c51eb3 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/zh/floater_font_test.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_gesture.xml b/indra/newview/skins/default/xui/zh/floater_gesture.xml
index e7b1ed1de3..e7b1ed1de3 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_gesture.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_god_tools.xml b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
index 69a6eadc8c..69a6eadc8c 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
index 9e3bb88ac0..9e3bb88ac0 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_help_browser.xml b/indra/newview/skins/default/xui/zh/floater_help_browser.xml
index e605d5f19c..e605d5f19c 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/zh/floater_help_browser.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_how_to.xml b/indra/newview/skins/default/xui/zh/floater_how_to.xml
index e033327165..e033327165 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/zh/floater_how_to.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_hud.xml b/indra/newview/skins/default/xui/zh/floater_hud.xml
index a788961e95..a788961e95 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_hud.xml
+++ b/indra/newview/skins/default/xui/zh/floater_hud.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_im_container.xml b/indra/newview/skins/default/xui/zh/floater_im_container.xml
index 2d66c659fe..84ad869100 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_container.xml
@@ -1,2 +1,29 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="交談"/>
+<multi_floater name="floater_im_box" title="交談">
+ <string name="collapse_icon" value="Conv_toolbar_collapse"/>
+ <string name="expand_icon" value="Conv_toolbar_expand"/>
+ <layout_stack name="conversations_stack">
+ <layout_panel name="conversations_layout_panel">
+ <layout_stack name="conversations_pane_buttons_stack">
+ <layout_panel name="conversations_pane_buttons_expanded">
+ <menu_button name="sort_btn" tool_tip="檢視/排序的選項"/>
+ <button name="add_btn" tool_tip="開始新的交談"/>
+ <button name="speak_btn" tool_tip="用麥克風和大家交談"/>
+ </layout_panel>
+ <layout_panel name="conversations_pane_buttons_collapsed">
+ <button name="expand_collapse_btn" tool_tip="縮疊/展開這個清單"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ <layout_panel name="messages_layout_panel">
+ <panel_container name="im_box_tab_container">
+ <panel name="stub_panel">
+ <button name="stub_collapse_btn" tool_tip="縮疊這一區塊"/>
+ <text name="stub_textbox">
+ 這個交談另開了新視窗。 [secondlife:/// 把它收回來]
+ </text>
+ </panel>
+ </panel_container>
+ </layout_panel>
+ </layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml
index 808a0b6720..d63c5507db 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_session.xml
@@ -1,8 +1,59 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="panel_im">
- <layout_stack name="im_panels">
- <layout_panel>
- <line_editor label="至" name="chat_editor"/>
- </layout_panel>
- </layout_stack>
+ <floater.string name="call_btn_start">
+ Conv_toolbar_open_call
+ </floater.string>
+ <floater.string name="call_btn_stop">
+ Conv_toolbar_hang_up
+ </floater.string>
+ <floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+ <floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+ <floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+ <floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+ <floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+ <floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+ <floater.string name="participant_added" value="[NAME] 已受邀加入交談。"/>
+ <floater.string name="multiple_participants_added" value="[NAME] 已受邀加入交談。"/>
+ <floater.string name="tooltip_to_separate_window" value="為這個交談另開新視窗"/>
+ <floater.string name="tooltip_to_main_window" value="將這個交談移回到主視窗"/>
+ <floater.string name="start_call_button_tooltip" value="建立語音通聯"/>
+ <floater.string name="end_call_button_tooltip" value="切斷語音通聯"/>
+ <floater.string name="expcol_button_not_tearoff_tooltip" value="縮疊這一區塊"/>
+ <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="縮疊參與者清單"/>
+ <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="展開參與者清單"/>
+ <view name="contents_view">
+ <layout_stack name="main_stack">
+ <layout_panel name="toolbar_panel">
+ <menu_button name="view_options_btn" tool_tip="檢視/排序的選項"/>
+ <menu_button name="gear_btn" tool_tip="對選取的人採取動作"/>
+ <button name="add_btn" tool_tip="新增某人到這個交談"/>
+ <button name="voice_call_btn" tool_tip="建立語音通聯"/>
+ <button name="close_btn" tool_tip="結束這個交談"/>
+ <button name="expand_collapse_btn" tool_tip="縮疊/展開這個框"/>
+ </layout_panel>
+ <layout_panel name="body_panel">
+ <layout_stack name="im_panels">
+ <layout_panel name="right_part_holder">
+ <panel name="trnsAndChat_panel">
+ <layout_stack name="translate_and_chat_stack">
+ <layout_panel name="translate_chat_checkbox_lp">
+ <check_box label="翻譯聊天內容" name="translate_chat_checkbox"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ <layout_panel name="chat_layout_panel">
+ <layout_stack name="input_panels">
+ <layout_panel name="input_editor_layout_panel">
+ <chat_editor label="至" name="chat_editor"/>
+ </layout_panel>
+ <layout_panel name="input_button_layout_panel">
+ <button name="minz_btn" tool_tip="顯示/隱藏訊息框"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+ </view>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_image_preview.xml b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
index d2de37fa6a..d2de37fa6a 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_import_collada.xml b/indra/newview/skins/default/xui/zh/floater_import_collada.xml
index 8f6b476ccf..8f6b476ccf 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/zh/floater_import_collada.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
index 45a003d3c8..4526eff21d 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
@@ -25,9 +25,9 @@
是否離開 [CURRENT_CHAT] 並加入這個語音聊天?
</floater.string>
<text name="question">
- 是否離開 [CURRENT_CHAT] 並加入這個語音聊天?
+ 如果接聽,你將切斷目前的語音交談。
</text>
- <button label="接受" label_selected="接受" name="Accept"/>
- <button label="拒絕" label_selected="拒絕" name="Reject"/>
- <button label="開始 IM" name="Start IM"/>
+ <button label="接聽" label_selected="接聽" name="Accept"/>
+ <button label="忽視" label_selected="忽視" name="Reject"/>
+ <button label="不接聽但開啟 IM" name="Start IM"/>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inspect.xml b/indra/newview/skins/default/xui/zh/floater_inspect.xml
index 4e1f4b24fd..4e1f4b24fd 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inspect.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
index 6998df75f3..6998df75f3 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
index 6d1d18b67c..6d1d18b67c 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_joystick.xml b/indra/newview/skins/default/xui/zh/floater_joystick.xml
index e0b2cf5a1c..e0b2cf5a1c 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/zh/floater_joystick.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
index e9a082288a..e9a082288a 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
index aae2cfb466..aae2cfb466 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
index f4a7ba5cca..f4a7ba5cca 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml b/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
index b10a480b06..b10a480b06 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_map.xml b/indra/newview/skins/default/xui/zh/floater_map.xml
index 8a030b3b3f..8a030b3b3f 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_map.xml
+++ b/indra/newview/skins/default/xui/zh/floater_map.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_media_browser.xml b/indra/newview/skins/default/xui/zh/floater_media_browser.xml
index 7f030924e1..7f030924e1 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/zh/floater_media_browser.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_media_settings.xml b/indra/newview/skins/default/xui/zh/floater_media_settings.xml
index 3984095a65..3984095a65 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_media_settings.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
index 350254e385..350254e385 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml
index 6b6126c8e0..6b6126c8e0 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_model_preview.xml b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
index 22b3d3b065..22b3d3b065 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_moveview.xml b/indra/newview/skins/default/xui/zh/floater_moveview.xml
index 0b267e8fae..0b267e8fae 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_moveview.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_mute_object.xml b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
index 64998d3e28..64998d3e28 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_my_appearance.xml b/indra/newview/skins/default/xui/zh/floater_my_appearance.xml
index 217ea5d1f9..217ea5d1f9 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/zh/floater_my_appearance.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_my_inventory.xml b/indra/newview/skins/default/xui/zh/floater_my_inventory.xml
index 187597f4eb..187597f4eb 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/floater_my_inventory.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_notification.xml b/indra/newview/skins/default/xui/zh/floater_notification.xml
index 1e0e207fb0..1e0e207fb0 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_notification.xml
+++ b/indra/newview/skins/default/xui/zh/floater_notification.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_notifications_console.xml b/indra/newview/skins/default/xui/zh/floater_notifications_console.xml
index 3478761b0b..3478761b0b 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_notifications_console.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_object_weights.xml b/indra/newview/skins/default/xui/zh/floater_object_weights.xml
index d2875b24b4..d2875b24b4 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/zh/floater_object_weights.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_openobject.xml b/indra/newview/skins/default/xui/zh/floater_openobject.xml
index ce6869487a..ce6869487a 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/zh/floater_openobject.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
index 9e786edcdd..9e786edcdd 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
index e57374f4d7..e57374f4d7 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
index e6971d111f..e6971d111f 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
index be009b54d8..d0978b8b01 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
<text name="show_label">
顯示:
</text>
- <check_box label="世界" name="show_world"/>
+ <check_box label="測試" name="show_world"/>
<check_box label="僅限可移動的" name="show_world_movables_only"/>
<check_box label="導航網面" name="show_navmesh"/>
<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
index 22e5d2e846..22e5d2e846 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_pay.xml b/indra/newview/skins/default/xui/zh/floater_pay.xml
index 69427605a4..69427605a4 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_pay.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_pay_object.xml b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
index 7d20b44bc6..7d20b44bc6 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_people.xml b/indra/newview/skins/default/xui/zh/floater_people.xml
index f629f2f184..f629f2f184 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_people.xml
+++ b/indra/newview/skins/default/xui/zh/floater_people.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
index b38db59ff3..b38db59ff3 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_picks.xml b/indra/newview/skins/default/xui/zh/floater_picks.xml
index a8bfcd99e3..a8bfcd99e3 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_picks.xml
+++ b/indra/newview/skins/default/xui/zh/floater_picks.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_places.xml b/indra/newview/skins/default/xui/zh/floater_places.xml
index f6ef1e2141..f6ef1e2141 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_places.xml
+++ b/indra/newview/skins/default/xui/zh/floater_places.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_post_process.xml b/indra/newview/skins/default/xui/zh/floater_post_process.xml
index 2908f7c1d0..2908f7c1d0 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/zh/floater_post_process.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences.xml b/indra/newview/skins/default/xui/zh/floater_preferences.xml
index b0a27e8c1f..b0a27e8c1f 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preferences.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml
index f91d5c5cdb..f91d5c5cdb 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
index b94d67b7ef..b94d67b7ef 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
index be75038a09..be75038a09 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
index 9447939801..9447939801 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
index d04428a36d..d04428a36d 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
index c56b1c2987..c56b1c2987 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
index 078b490655..078b490655 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
index b810af0145..b810af0145 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
index 4ff2a3fc79..4ff2a3fc79 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_region_info.xml b/indra/newview/skins/default/xui/zh/floater_region_info.xml
index 0e4879f555..0e4879f555 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/zh/floater_region_info.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
index 8dbc216ab5..8dbc216ab5 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug.xml b/indra/newview/skins/default/xui/zh/floater_script_debug.xml
index 5b3500c018..5b3500c018 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_debug.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml
index e70a30fa24..e70a30fa24 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_script_limits.xml b/indra/newview/skins/default/xui/zh/floater_script_limits.xml
index 7cd2c8e6c6..7cd2c8e6c6 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_limits.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_script_preview.xml b/indra/newview/skins/default/xui/zh/floater_script_preview.xml
index a6c6c76181..a6c6c76181 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_preview.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_script_queue.xml b/indra/newview/skins/default/xui/zh/floater_script_queue.xml
index 7c253aa74c..7c253aa74c 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_queue.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_script_search.xml b/indra/newview/skins/default/xui/zh/floater_script_search.xml
index 11c23d933f..11c23d933f 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_search.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_search.xml b/indra/newview/skins/default/xui/zh/floater_search.xml
index 3e85a529ae..3e85a529ae 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_search.xml
+++ b/indra/newview/skins/default/xui/zh/floater_search.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_select_key.xml b/indra/newview/skins/default/xui/zh/floater_select_key.xml
index 231eb48b04..231eb48b04 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/zh/floater_select_key.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_sell_land.xml b/indra/newview/skins/default/xui/zh/floater_sell_land.xml
index 9030f7eb63..9030f7eb63 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_sell_land.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
index 56a31bc292..56a31bc292 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
index e86e20829f..e86e20829f 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_sound_devices.xml b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml
index 0374c74f8f..0374c74f8f 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
index c942ba1cfb..c942ba1cfb 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck.xml
index f5a6665844..f5a6665844 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_spellcheck.xml
+++ b/indra/newview/skins/default/xui/zh/floater_spellcheck.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml
index 6094a3bbce..6094a3bbce 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml
index 4af5684ec1..4af5684ec1 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_stats.xml
+++ b/indra/newview/skins/default/xui/zh/floater_stats.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_sys_well.xml b/indra/newview/skins/default/xui/zh/floater_sys_well.xml
index ca0b7f146d..ca0b7f146d 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/zh/floater_sys_well.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_telehub.xml b/indra/newview/skins/default/xui/zh/floater_telehub.xml
index ee21a78e90..ee21a78e90 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/zh/floater_telehub.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml
index 68fcf3f7f7..68fcf3f7f7 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml
index 83b6df6fe5..83b6df6fe5 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml
+++ b/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index e909a67e2c..02d06323d4 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
<button label="預設" label_selected="預設" name="Default"/>
<button label="空白" label_selected="空白" name="Blank"/>
<button label="無" label_selected="無" name="None"/>
- <check_box initial_value="true" label="實時預覽" name="apply_immediate_check"/>
+ <check_box initial_value="true" label="立即套用" name="apply_immediate_check"/>
<text name="preview_disabled" value="已停用預覽"/>
<filter_editor label="材質過濾器" name="inventory search editor"/>
<check_box initial_value="false" label="顯示資料夾" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml
index 0dcac17a75..0dcac17a75 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml
+++ b/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index 33c9ebeaf0..33c9ebeaf0 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_top_objects.xml b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
index 6f50be0855..6f50be0855 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_tos.xml b/indra/newview/skins/default/xui/zh/floater_tos.xml
index 3da9445a55..3da9445a55 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_tos.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tos.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_toybox.xml b/indra/newview/skins/default/xui/zh/floater_toybox.xml
index fc6b6ea611..fc6b6ea611 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/zh/floater_toybox.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_translation_settings.xml b/indra/newview/skins/default/xui/zh/floater_translation_settings.xml
index fe84872557..fe84872557 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_translation_settings.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_url_entry.xml b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
index 9e3f3cd47d..9e3f3cd47d 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..96caa7d333
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="語音聊天音量">
+ <slider label="語音聊天" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
index a3a7679957..a3a7679957 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
index 81e0204262..aab5fa6028 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="地點" name="voice_effects" title="語音變聲">
+<floater label="地點" name="voice_effects" title="語音變聲試聽">
<string name="no_voice_effect">
(無變聲效果)
</string>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_volume.xml
new file mode 100644
index 0000000000..4260a8d331
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+ Not can_close / no title to avoid window chrome
+ Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="音量">
+ <slider name="volume_slider" tool_tip="音量" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_web_content.xml b/indra/newview/skins/default/xui/zh/floater_web_content.xml
index be6bf8bb27..be6bf8bb27 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/zh/floater_web_content.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
index 967e36ead7..967e36ead7 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_window_size.xml b/indra/newview/skins/default/xui/zh/floater_window_size.xml
index 3942f72d76..3942f72d76 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/zh/floater_window_size.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_world_map.xml b/indra/newview/skins/default/xui/zh/floater_world_map.xml
index 4cd05ebaa0..4cd05ebaa0 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/zh/floater_world_map.xml
diff --git a/indra/newview/skins/default/xui/zh/inspect_avatar.xml b/indra/newview/skins/default/xui/zh/inspect_avatar.xml
index ef10e5d2d0..ef10e5d2d0 100644..100755
--- a/indra/newview/skins/default/xui/zh/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_avatar.xml
diff --git a/indra/newview/skins/default/xui/zh/inspect_group.xml b/indra/newview/skins/default/xui/zh/inspect_group.xml
index ca5ccc3349..ca5ccc3349 100644..100755
--- a/indra/newview/skins/default/xui/zh/inspect_group.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_group.xml
diff --git a/indra/newview/skins/default/xui/zh/inspect_object.xml b/indra/newview/skins/default/xui/zh/inspect_object.xml
index 377b8b7c78..377b8b7c78 100644..100755
--- a/indra/newview/skins/default/xui/zh/inspect_object.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_object.xml
diff --git a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml
index b8418fc8a1..b8418fc8a1 100644..100755
--- a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml
index 3c8c3e4a31..3c8c3e4a31 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
index 885c4b9add..885c4b9add 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
index c14a98c64b..c14a98c64b 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
index ef0986a13b..ef0986a13b 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
index 1d02464748..1d02464748 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
index 32757bbff6..32757bbff6 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml b/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml
index 876fef16df..876fef16df 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml b/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml
index d06207b19d..d06207b19d 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml b/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml
index 300ff47b12..300ff47b12 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
index cd069f9601..eb7093a23c 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="Gear COF">
<menu label="新衣服" name="COF.Gear.New_Clothes"/>
- <menu label="新身體部位" name="COF.Geear.New_Body_Parts"/>
+ <menu label="新身體部位" name="COF.Gear.New_Body_Parts"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation.xml b/indra/newview/skins/default/xui/zh/menu_conversation.xml
new file mode 100644
index 0000000000..507255d0c0
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+ <menu_item_call label="關閉交談" name="close_conversation"/>
+ <menu_item_call label="開啟語音交談" name="open_voice_conversation"/>
+ <menu_item_call label="切斷語音交談" name="disconnect_from_voice"/>
+ <menu_item_call label="察看檔案" name="view_profile"/>
+ <menu_item_call label="IM" name="im"/>
+ <menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
+ <menu_item_call label="語音通話" name="voice_call"/>
+ <menu_item_call label="聊天歷史……" name="chat_history"/>
+ <menu_item_call label="新增朋友" name="add_friend"/>
+ <menu_item_call label="移除朋友" name="remove_friend"/>
+ <menu_item_call label="移除朋友" name="remove_friends"/>
+ <menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+ <menu_item_call label="放大" name="zoom_in"/>
+ <menu_item_call label="地圖" name="map"/>
+ <menu_item_call label="分享" name="share"/>
+ <menu_item_call label="支付" name="pay"/>
+ <menu_item_check label="禁止語音" name="block_unblock"/>
+ <menu_item_check label="禁止文字" name="MuteText"/>
+ <menu_item_call label="群組檔案" name="group_profile"/>
+ <menu_item_call label="啟用群組" name="activate_group"/>
+ <menu_item_call label="離開群組" name="leave_group"/>
+ <context_menu label="主持人選項" name="Moderator Options">
+ <menu_item_check label="允許文字聊天" name="AllowTextChat"/>
+ <menu_item_call label="將此人消音" name="ModerateVoiceMuteSelected"/>
+ <menu_item_call label="取消對此人的消音" name="ModerateVoiceUnMuteSelected"/>
+ <menu_item_call label="所有人消音" name="ModerateVoiceMute"/>
+ <menu_item_call label="取消所有人的消音" name="ModerateVoiceUnmute"/>
+ </context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..49e91417e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+ <menu_item_call label="IM…" name="IM"/>
+ <menu_item_call label="語音通話…" name="Call"/>
+ <menu_item_call label="開啟聊天歷史…" name="Chat history"/>
+ <menu_item_call label="察看檔案" name="View Profile"/>
+ <menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+ <menu_item_call label="加為朋友" name="add_friend"/>
+ <menu_item_call label="移除朋友" name="remove_friend"/>
+ <menu_item_call label="邀請加入群組……" name="Invite"/>
+ <menu_item_call label="地圖" name="Map"/>
+ <menu_item_call label="分享" name="Share"/>
+ <menu_item_call label="支付" name="Pay"/>
+ <menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..3fa99a5cd7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+ <menu_item_check label="依名稱排序" name="sort_by_name"/>
+ <menu_item_check label="依日期排序" name="sort_by_date"/>
+ <menu_item_check label="將朋友列在頂端" name="sort_by_friends"/>
+ <menu_item_call label="檢視附近聊天歷史……" name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_edit.xml b/indra/newview/skins/default/xui/zh/menu_edit.xml
index bda640e5f3..bda640e5f3 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_edit.xml
+++ b/indra/newview/skins/default/xui/zh/menu_edit.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_favorites.xml b/indra/newview/skins/default/xui/zh/menu_favorites.xml
index a01412ce1c..a01412ce1c 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/zh/menu_favorites.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
index 5a38197e4c..5a38197e4c 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_group_plus.xml b/indra/newview/skins/default/xui/zh/menu_group_plus.xml
index d4a5a69104..d4a5a69104 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/zh/menu_group_plus.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml b/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml
index 3f6820cb32..3f6820cb32 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_im_conversation.xml b/indra/newview/skins/default/xui/zh/menu_im_conversation.xml
new file mode 100644
index 0000000000..815b0b594c
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+ <menu_item_call label="察看檔案" name="View Profile"/>
+ <menu_item_call label="加為朋友" name="Add Friend"/>
+ <menu_item_call label="移除朋友" name="remove_friend"/>
+ <menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
+ <menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+ <menu_item_call label="聊天歷史……" name="chat_history"/>
+ <menu_item_call label="放大" name="zoom_in"/>
+ <menu_item_call label="地圖" name="map"/>
+ <menu_item_call label="分享" name="Share"/>
+ <menu_item_call label="支付" name="Pay"/>
+ <menu_item_check label="禁止語音" name="Block/Unblock"/>
+ <menu_item_check label="禁止文字" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..a7006e524a
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+ <menu_item_check label="精簡視野" name="compact_view"/>
+ <menu_item_check label="全展視野" name="expanded_view"/>
+ <menu_item_check label="顯示時間" name="IMShowTime"/>
+ <menu_item_check label="一對一交談時顯示名字" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml
index 85417d554e..85417d554e 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
index 4664fcb027..4664fcb027 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
index 636bdaae09..636bdaae09 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
index f4e886ff67..f4e886ff67 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
index abff0f64ac..abff0f64ac 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
index c48ee0c9be..c48ee0c9be 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml
index 577e5988f8..577e5988f8 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
index 7f745ffaa7..7f745ffaa7 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
index 30bf5a7e75..30bf5a7e75 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
index 8ad0e7324f..8ad0e7324f 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_land.xml b/indra/newview/skins/default/xui/zh/menu_land.xml
index a87ab77dd0..a87ab77dd0 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_land.xml
+++ b/indra/newview/skins/default/xui/zh/menu_land.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_landmark.xml b/indra/newview/skins/default/xui/zh/menu_landmark.xml
index 7372b223cf..7372b223cf 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/zh/menu_landmark.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml
index c327b132a1..c327b132a1 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_login.xml
+++ b/indra/newview/skins/default/xui/zh/menu_login.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml b/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml
index d222d7f658..d222d7f658 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_mini_map.xml b/indra/newview/skins/default/xui/zh/menu_mini_map.xml
index 7fd629471a..7fd629471a 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/zh/menu_mini_map.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml
index 5f82685632..5f82685632 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_navbar.xml b/indra/newview/skins/default/xui/zh/menu_navbar.xml
index d8356e6277..d8356e6277 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/zh/menu_navbar.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
index ce5f5b6e17..ce5f5b6e17 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml
index b629f73584..b629f73584 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_object.xml b/indra/newview/skins/default/xui/zh/menu_object.xml
index 4282c1e131..4282c1e131 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_object.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
index f4f93b0bdc..9655732f2e 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
@@ -2,4 +2,6 @@
<menu name="Object Icon Menu">
<menu_item_call label="物件檔案..." name="Object Profile"/>
<menu_item_call label="封鎖…" name="Block"/>
+ <menu_item_call label="顯示在地圖上" name="show_on_map"/>
+ <menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
</menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
index e85b4b7182..258d0d6b20 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
<menu_item_call label="新頭髮" name="New Hair"/>
<menu_item_call label="新眼睛" name="New Eyes"/>
</menu>
+ <menu_item_call label="展開全部資料夾" name="expand"/>
+ <menu_item_call label="摺疊全部資料夾" name="collapse"/>
<menu_item_call label="裝扮更名" name="rename"/>
<menu_item_call label="刪除裝扮" name="delete_outfit"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
index a4614710f4..a4614710f4 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_list.xml b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
index 2456e9fee9..2456e9fee9 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_view.xml b/indra/newview/skins/default/xui/zh/menu_participant_view.xml
new file mode 100644
index 0000000000..8b35860eb6
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+ <menu_item_check label="將交談依類型排序" name="sort_sessions_by_type"/>
+ <menu_item_check label="將交談依名字排序" name="sort_sessions_by_name"/>
+ <menu_item_check label="將交談依最近活動排序" name="sort_sessions_by_recent"/>
+ <menu_item_check label="將參與者依名字排序" name="sort_participants_by_name"/>
+ <menu_item_check label="將參與者依最近活動排序" name="sort_participants_by_recent"/>
+ <menu_item_call label="聊天偏好設定……" name="chat_preferences"/>
+ <menu_item_call label="隱私偏好設定……" name="privacy_preferences"/>
+ <menu_item_check label="交談記錄……" name="Conversation"/>
+ <menu_item_check label="翻譯附近的聊天" name="Translate_chat"/>
+ <menu_item_check label="翻譯設定……" name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..9a2a3c403d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+ <menu_item_call label="解除封鎖" name="unblock"/>
+ <menu_item_call label="檔案..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..a8cecb4e14
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+ <menu_item_call label="按名字封鎖居民……" name="block_resident_by_name"/>
+ <menu_item_call label="依名稱封鎖物件" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..5b70cd35bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+ <menu_item_check label="依名稱排序" name="sort_by_name"/>
+ <menu_item_check label="依類型排序" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
new file mode 100644
index 0000000000..4251238fd9
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+ <menu_item_check label="依名稱排序" name="sort_name"/>
+ <menu_item_check label="依狀態排序" name="sort_status"/>
+ <menu_item_check label="察看人群圖示" name="view_icons"/>
+ <menu_item_check label="察看許可權限" name="view_permissions"/>
+ <menu_item_check label="檢視交談記錄……" name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
index 59854faeec..59854faeec 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups.xml b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
index 5768c554c9..b4b566f5ca 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
@@ -2,7 +2,7 @@
<menu name="menu_group_plus">
<menu_item_call label="察看資訊" name="View Info"/>
<menu_item_call label="聊天" name="Chat"/>
- <menu_item_call label="通話" name="Call"/>
+ <menu_item_call label="語音通話" name="Call"/>
<menu_item_call label="啟動" name="Activate"/>
<menu_item_call label="退出" name="Leave"/>
</menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
new file mode 100644
index 0000000000..05a30d938f
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+ <menu_item_check label="顯示群組圖示" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
index 1be5c69b94..1be5c69b94 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
index 38d5f3d324..d25adaf8fb 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Avatar Context Menu">
- <menu_item_call label="察看檔案" name="View Profile"/>
- <menu_item_call label="加為朋友" name="Add Friend"/>
- <menu_item_call label="移除朋友" name="Remove Friend"/>
- <menu_item_call label="IM" name="IM"/>
- <menu_item_call label="通話" name="Call"/>
- <menu_item_call label="地圖" name="Map"/>
- <menu_item_call label="分享" name="Share"/>
- <menu_item_call label="支付" name="Pay"/>
- <menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/>
- <menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+ <menu_item_call label="察看檔案" name="view_profile"/>
+ <menu_item_call label="IM" name="im"/>
+ <menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/>
+ <menu_item_call label="語音通話" name="voice_call"/>
+ <menu_item_call label="檢視聊天歷史……" name="chat_history"/>
+ <menu_item_call label="加為朋友" name="add_friend"/>
+ <menu_item_call label="移除朋友" name="remove_friend"/>
+ <menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+ <menu_item_call label="放大" name="zoom_in"/>
+ <menu_item_call label="地圖" name="map"/>
+ <menu_item_call label="分享" name="share"/>
+ <menu_item_call label="支付" name="pay"/>
+ <menu_item_check label="封鎖/不再封鎖" name="block_unblock"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
index 1380e0b307..69f0eab7dc 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Multi-Selected People Context Menu">
- <menu_item_call label="加為朋友" name="Add Friends"/>
- <menu_item_call label="移除朋友" name="Remove Friend"/>
- <menu_item_call label="IM" name="IM"/>
- <menu_item_call label="通話" name="Call"/>
- <menu_item_call label="分享" name="Share"/>
- <menu_item_call label="支付" name="Pay"/>
- <menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+ <menu_item_call label="加為朋友" name="add_friends"/>
+ <menu_item_call label="移除朋友" name="remove_friends"/>
+ <menu_item_call label="IM" name="im"/>
+ <menu_item_call label="通話" name="call"/>
+ <menu_item_call label="分享" name="share"/>
+ <menu_item_call label="支付" name="pay"/>
+ <menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..9bc5638472
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+ <menu_item_check label="依最近說話者排序" name="sort_by_recent_speakers"/>
+ <menu_item_check label="依名稱排序" name="sort_name"/>
+ <menu_item_check label="依距離排序" name="sort_distance"/>
+ <menu_item_check label="察看人群圖示" name="view_icons"/>
+ <menu_item_check label="察看地圖" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
index 6cb0ac3c89..6cb0ac3c89 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
new file mode 100644
index 0000000000..382234c3ec
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+ <menu_item_check label="依最近排序" name="sort_most"/>
+ <menu_item_check label="依名稱排序" name="sort_name"/>
+ <menu_item_check label="察看人群圖示" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
index 5b6e7335d6..5b6e7335d6 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_picks.xml b/indra/newview/skins/default/xui/zh/menu_picks.xml
index 2e88ac2d39..2e88ac2d39 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_picks.xml
+++ b/indra/newview/skins/default/xui/zh/menu_picks.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_picks_plus.xml b/indra/newview/skins/default/xui/zh/menu_picks_plus.xml
index 80922a757d..80922a757d 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/zh/menu_picks_plus.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_place.xml b/indra/newview/skins/default/xui/zh/menu_place.xml
index 3733baf119..3733baf119 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_place.xml
+++ b/indra/newview/skins/default/xui/zh/menu_place.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
index 95f8917234..95f8917234 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
index 27f0c7ebdb..27f0c7ebdb 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
index f23d970b78..f23d970b78 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
index f77e7090c4..f77e7090c4 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_save_outfit.xml b/indra/newview/skins/default/xui/zh/menu_save_outfit.xml
index 53ee6ee977..53ee6ee977 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/zh/menu_save_outfit.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml b/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml
index e9817dd2bc..e9817dd2bc 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_slurl.xml b/indra/newview/skins/default/xui/zh/menu_slurl.xml
index 2cea18105a..2cea18105a 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/zh/menu_slurl.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
index d188840588..d188840588 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
index c636e108ad..c636e108ad 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml
index 90e8098348..90e8098348 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_text_editor.xml b/indra/newview/skins/default/xui/zh/menu_text_editor.xml
index febc0b8b67..febc0b8b67 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/zh/menu_text_editor.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_toolbars.xml b/indra/newview/skins/default/xui/zh/menu_toolbars.xml
index d318992dd5..d318992dd5 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/zh/menu_toolbars.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_topinfobar.xml b/indra/newview/skins/default/xui/zh/menu_topinfobar.xml
index b07e9890ff..b07e9890ff 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/zh/menu_topinfobar.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
index 592bb6561e..72629822d4 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Url Popup">
- <menu_item_call label="顯示居民檔案" name="show_agent"/>
+ <menu_item_call label="察看檔案" name="show_agent"/>
+ <menu_item_call label="送出 IM..." name="send_im"/>
+ <menu_item_call label="加為朋友..." name="add_friend"/>
<menu_item_call label="覆製名稱到剪貼簿" name="url_copy_label"/>
<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_group.xml b/indra/newview/skins/default/xui/zh/menu_url_group.xml
index de97bb731f..de97bb731f 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_group.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_url_http.xml b/indra/newview/skins/default/xui/zh/menu_url_http.xml
index 861cbfb975..861cbfb975 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_http.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_url_inventory.xml b/indra/newview/skins/default/xui/zh/menu_url_inventory.xml
index 8eaea68c6f..8eaea68c6f 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_inventory.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_url_map.xml b/indra/newview/skins/default/xui/zh/menu_url_map.xml
index fbda20fd2f..fbda20fd2f 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_map.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
index b344b21c62..9f3a9d58ff 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Url Popup">
- <menu_item_call label="顯示物件資訊" name="show_object"/>
+ <menu_item_call label="物件檔案..." name="show_object"/>
<menu_item_call label="顯示在地圖上" name="show_on_map"/>
<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
<menu_item_call label="覆製物件名稱到剪貼簿" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_parcel.xml b/indra/newview/skins/default/xui/zh/menu_url_parcel.xml
index 330c28238f..330c28238f 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_parcel.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_url_slapp.xml b/indra/newview/skins/default/xui/zh/menu_url_slapp.xml
index 6ce9a10d3e..6ce9a10d3e 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_slapp.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_url_slurl.xml b/indra/newview/skins/default/xui/zh/menu_url_slurl.xml
index 2fb247f250..2fb247f250 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_slurl.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_url_teleport.xml b/indra/newview/skins/default/xui/zh/menu_url_teleport.xml
index e3e4b4716d..e3e4b4716d 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_teleport.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index ac0e9e7e35..09bdc57819 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -16,10 +16,7 @@
<menu_item_call label="停止我身上的動作" name="Stop Animating My Avatar"/>
<menu_item_call label="行走 / 跑步 / 飛行…" name="Walk / run / fly"/>
</menu>
- <menu label="狀態" name="Status">
- <menu_item_call label="離開" name="Set Away"/>
- <menu_item_call label="忙碌" name="Set Busy"/>
- </menu>
+ <menu label="狀態" name="Status"/>
<menu_item_call label="購買 L$…" name="Buy and Sell L$"/>
<menu_item_call label="商家發件匣…" name="MerchantOutbox"/>
<menu_item_call label="帳戶主控臺…" name="Manage My Account"/>
@@ -30,14 +27,18 @@
<menu_item_call label="退出 [APP_NAME]" name="Quit"/>
</menu>
<menu label="溝通" name="Communicate">
- <menu_item_check label="聊天…" name="Nearby Chat"/>
+ <menu_item_check label="交談……" name="Conversations"/>
+ <menu_item_check label="附近的聊天……" name="Nearby Chat"/>
<menu_item_check label="說話" name="Speak"/>
- <menu_item_check label="語音設定…" name="Nearby Voice"/>
- <menu_item_check label="語音變聲…" name="ShowVoice"/>
+ <menu label="語音變聲" name="VoiceMorphing">
+ <menu_item_check label="沒有變聲效果" name="NoVoiceMorphing"/>
+ <menu_item_check label="預覽……" name="Preview"/>
+ <menu_item_call label="訂閱……" name="Subscribe"/>
+ </menu>
<menu_item_check label="姿勢…" name="Gestures"/>
- <menu_item_call label="朋友" name="My Friends"/>
- <menu_item_call label="群組" name="My Groups"/>
- <menu_item_call label="附近的人群" name="Active Speakers"/>
+ <menu_item_check label="朋友" name="My Friends"/>
+ <menu_item_check label="群組" name="My Groups"/>
+ <menu_item_check label="附近的人群" name="Active Speakers"/>
<menu_item_call label="封鎖清單" name="Block List"/>
</menu>
<menu label="世界" name="World">
@@ -113,7 +114,6 @@
<menu_item_call label="購買" name="Menu Object Buy"/>
<menu_item_call label="取得" name="Menu Object Take"/>
<menu_item_call label="取得副本" name="Take Copy"/>
- <menu_item_call label="回存到我的收納區" name="Save Object Back to My Inventory"/>
<menu_item_call label="回存到物件內容" name="Save Object Back to Object Contents"/>
<menu_item_call label="退回物件" name="Return Object back to Owner"/>
</menu>
@@ -128,6 +128,7 @@
<menu_item_call label="聯結集…" name="pathfinding_linksets_menu_item"/>
<menu_item_call label="角色…" name="pathfinding_characters_menu_item"/>
<menu_item_call label="察看 / 測試…" name="pathfinding_console_menu_item"/>
+ <menu_item_call label="重新產出地區" name="pathfinding_rebake_navmesh_item"/>
</menu>
<menu label="選項" name="Options">
<menu_item_check label="顯示進階權限" name="DebugPermissions"/>
@@ -157,6 +158,13 @@
<menu label="幫助" name="Help">
<menu_item_call label="簡易教學…" name="How To"/>
<menu_item_call label="[SECOND_LIFE] 幫助" name="Second Life Help"/>
+ <menu_item_call label="使用者指南" name="User’s guide"/>
+ <menu_item_call label="知識庫" name="Knowledge Base"/>
+ <menu_item_call label="維基" name="Wiki"/>
+ <menu_item_call label="社群論壇" name="Community Forums"/>
+ <menu_item_call label="支援入口" name="Support portal"/>
+ <menu_item_call label="[SECOND_LIFE] 最新消息" name="Second Life News"/>
+ <menu_item_call label="[SECOND_LIFE] 部落格" name="Second Life Blogs"/>
<menu_item_call label="違規舉報" name="Report Abuse"/>
<menu_item_call label="回報臭蟲" name="Report Bug"/>
<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
@@ -383,9 +391,14 @@
<menu_item_call label="女性測試" name="Test Female"/>
<menu_item_check label="允許選擇化身" name="Allow Select Avatar"/>
</menu>
+ <menu label="動作速度" name="Animation Speed">
+ <menu_item_call label="所有動作加快 10%" name="All Animations 10 Faster"/>
+ <menu_item_call label="所有動作放慢 10%" name="All Animations 10 Slower"/>
+ <menu_item_call label="將所有動作恢復原速" name="Reset All Animation Speed"/>
+ <menu_item_check label="慢動作" name="Slow Motion Animations"/>
+ </menu>
<menu_item_call label="強制參數為預設值" name="Force Params to Default"/>
<menu_item_check label="動作資訊" name="Animation Info"/>
- <menu_item_check label="慢動作" name="Slow Motion Animations"/>
<menu_item_check label="顯示注視在" name="Show Look At"/>
<menu_item_check label="顯示指向在" name="Show Point At"/>
<menu_item_check label="除錯旋軸的更新" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
index 576f7f3b73..576f7f3b73 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml b/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml
index 6184f956d1..6184f956d1 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
index c7d2853995..c7d2853995 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml
index 70af2d2f19..70af2d2f19 100644..100755
--- a/indra/newview/skins/default/xui/zh/mime_types.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types.xml
diff --git a/indra/newview/skins/default/xui/zh/mime_types_linux.xml b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
index 70af2d2f19..70af2d2f19 100644..100755
--- a/indra/newview/skins/default/xui/zh/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
diff --git a/indra/newview/skins/default/xui/zh/mime_types_mac.xml b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
index 70af2d2f19..70af2d2f19 100644..100755
--- a/indra/newview/skins/default/xui/zh/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 9fecf2c104..59be26d43b 100644..100755
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -516,6 +516,24 @@
</url>
<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
</notification>
+ <notification name="AMDOldDriver">
+ 你的顯示卡很可能有新版的驅動程式。 更新顯示驅動程式會大幅改善性能。
+
+ 前往 [_URL] 察看是否有新版驅動程式?
+ <url name="url">
+ http://support.amd.com/us/Pages/AMDSupportHub.aspx
+ </url>
+ <usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
+ </notification>
+ <notification name="NVIDIAOldDriver">
+ 你的顯示卡很可能有新版的驅動程式。 更新顯示驅動程式會大幅改善性能。
+
+ 前往 [_URL] 察看是否有新版驅動程式?
+ <url name="url">
+ http://www.nvidia.com/Download/index.aspx?lang=tw
+ </url>
+ <usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
+ </notification>
<notification name="UnknownGPU">
你的系統含有一個 [APP_NAME] 無法辨認的顯像卡。
原因很可能是 [APP_NAME] 尚未針對新硬體完成測試。 這大概不會出問題,但你可能需要調整顯像設定。
@@ -1536,10 +1554,13 @@ SHA1 指紋:[MD5_DIGEST]
此時無法發出交友邀請。 請稍候再試。
<usetemplate name="okbutton" yestext="確定"/>
</notification>
- <notification name="BusyModeSet">
- 已設為忙碌模式。
-聊天和即時訊息內容將被隱藏。 即時訊息發送者將收到你的「忙碌模式」回應。 所有的瞬間傳送邀請都將被婉拒。 此時起送給你的收納區物項都將丟入垃圾桶。
- <usetemplate ignoretext="我變更我的狀態為忙碌模式" name="okignore" yestext="確定"/>
+ <notification name="DoNotDisturbModeSet">
+ 「請勿打擾」模式目前是開啟狀態。 你將不會收到任何發給你的訊息通知。
+
+- 其他居民將收到你的「請勿打擾」回應(回應內容設於「偏好設定 &gt; 一般設定」)。
+- 所有瞬間傳送的邀請都將被婉拒。
+- 所有語音來電都將拒絕接聽。
+ <usetemplate ignoretext="我變更我的狀態為「請勿打擾」模式" name="okignore" yestext="確定"/>
</notification>
<notification name="JoinedTooManyGroupsMember">
你已達可同時加入的群組數上限。 請先離開另一個群組再加入這一個,或婉拒加入邀請。
@@ -2024,6 +2045,10 @@ SHA1 指紋:[MD5_DIGEST]
前往你的[http://secondlife.com/account/ 塗鴉牆]以察看你的帳戶歷史紀錄?
<usetemplate ignoretext="啟動我的瀏覽器以察看我的帳戶歷史紀錄" name="okcancelignore" notext="取消" yestext="前往頁面"/>
</notification>
+ <notification name="ConfirmAddingChatParticipants">
+ 新增一個人到現有的交談,等於建立新的交談。 所有交談者將會收到新交談通知。
+ <usetemplate ignoretext="確認新增聊天者" name="okcancelignore" notext="取消" yestext="確定"/>
+ </notification>
<notification name="ConfirmQuit">
你確定你要結束退出?
<usetemplate ignoretext="當我結束退出時進行確認" name="okcancelignore" notext="不要結束退出" yestext="結束退出"/>
@@ -2098,14 +2123,14 @@ SHA1 指紋:[MD5_DIGEST]
<button ignore="絕不取代" name="No" text="取消"/>
</form>
</notification>
- <notification label="忙碌模式警告" name="BusyModePay">
- 你現在處於忙碌模式,這意味著你付費後仍將不會收到任何物項。
+ <notification label="「請勿打擾」模式警告" name="DoNotDisturbModePay">
+ 你已開啟「請勿打擾」。 你將不會收到任何付款購買的物項。
-你是否要先離開忙碌模式,再完成交易?
+是否要在完成交易之前,先關閉「請勿打擾」模式?
<form name="form">
- <ignore name="ignore" text="當我在忙碌模式時,將要支付金錢或給他人物件"/>
- <button ignore="總是離開忙碌模式" name="Yes" text="確定"/>
- <button ignore="絕不離開忙碌模式" name="No" text="取消"/>
+ <ignore name="ignore" text="我即將在「請勿打擾」模式下,試圖付錢給他人或給一個物件"/>
+ <button ignore="固定選擇離開「請勿打擾」模式" name="Yes" text="確定"/>
+ <button ignore="永不離開「請勿打擾」模式" name="No" text="取消"/>
</form>
</notification>
<notification name="ConfirmDeleteProtectedCategory">
@@ -2240,11 +2265,8 @@ SHA1 指紋:[MD5_DIGEST]
<notification name="GroupNotice">
主旨:[SUBJECT],訊息:[MESSAGE]
</notification>
- <notification name="FriendOnline">
- &lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前在線上
- </notification>
- <notification name="FriendOffline">
- &lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前離線
+ <notification name="FriendOnlineOffline">
+ &lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前狀態為 [STATUS]
</notification>
<notification name="AddSelfFriend">
雖然你人很好,你還是不能把自己加為朋友。
@@ -2472,13 +2494,6 @@ SHA1 指紋:[MD5_DIGEST]
<notification name="DynamicPathfindingDisabled">
這地區並未啟用動態尋徑。 使用尋徑 LSL 呼叫的帶腳本物件,在此地區可能無法正常運作。
</notification>
- <notification name="PathfindingRebakeNavmesh">
- 更改本地區的某些物件將導致其他移動物件的運作發生問題。 要使移動物件正常運作,請點按「重新產出地區」按鈕。 欲獲知詳情請選擇「幫助」。
- <url name="url">
- http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
- </url>
- <usetemplate helptext="幫助" ignoretext="更改本地區的某些物件將導致其他移動物件的運作發生問題。" name="okhelpignore" yestext="確定"/>
- </notification>
<notification name="PathfindingCannotRebakeNavmesh">
發生錯誤。 問題可能出在網路或伺服器,也可能因為你無權建製物件。 有時,只要登出再登入即能解決這類問題。
<usetemplate name="okbutton" yestext="確定"/>
@@ -2741,7 +2756,7 @@ SHA1 指紋:[MD5_DIGEST]
<notification name="ScriptQuestionCaution">
警告:物件 &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; 要求全權存取你的林登幣帳戶。 你如果允許存取帳戶,它將可在任何時候從你帳戶取走資金,或完全加以清空,或定期取走部分資金,且不會發出警告。
-這很可能是種不當的要求。 如果你不完全瞭解它為何要求存取你的帳戶,請勿允准。
+如果你不完全瞭解它為何要求存取你的帳戶,請勿允准。
<form name="form">
<button name="Grant" text="允許全權存取"/>
<button name="Deny" text="拒絕"/>
@@ -3323,4 +3338,633 @@ SHA1 指紋:[MD5_DIGEST]
你正在刪除 [NUM_ITEMS] 個物項。 你確定你要繼續?
<usetemplate ignoretext="確定要刪除多個物項?" name="okcancelignore" notext="否" yestext="是"/>
</notification>
+ <notification name="AvatarFrozen">
+ [AV_FREEZER] 凍結了你。 你此時無法移動或與周遭互動。
+ </notification>
+ <notification name="AvatarFrozenDuration">
+ [AV_FREEZER] 凍結了你 [AV_FREEZE_TIME] 秒鐘。 你此時無法移動或與周遭互動。
+ </notification>
+ <notification name="YouFrozeAvatar">
+ 化身已凍結。
+ </notification>
+ <notification name="AvatarHasUnFrozenYou">
+ [AV_FREEZER] 解除了對你的凍結。
+ </notification>
+ <notification name="AvatarUnFrozen">
+ 化身已解除凍結。
+ </notification>
+ <notification name="AvatarFreezeFailure">
+ 凍結失敗,因為你在該地段沒有管理員權限。
+ </notification>
+ <notification name="AvatarFreezeThaw">
+ 你遭凍結的時間已過,請恢復正常活動。
+ </notification>
+ <notification name="AvatarCantFreeze">
+ 抱歉,無法凍結該用戶。
+ </notification>
+ <notification name="NowOwnObject">
+ 你現在是物件 [OBJECT_NAME] 的所有人
+ </notification>
+ <notification name="CantRezOnLand">
+ 無法在 [OBJECT_POS] 產生物件,因為這土地的所有人不允許。 請用土地工具察看所有人。
+ </notification>
+ <notification name="RezFailTooManyRequests">
+ 無法產生物件,此刻要求數目過多。
+ </notification>
+ <notification name="SitFailCantMove">
+ 你無法坐下,因為此刻你不能移動。
+ </notification>
+ <notification name="SitFailNotAllowedOnLand">
+ 你不能坐下,因為該土地不允許。
+ </notification>
+ <notification name="SitFailNotSameRegion">
+ 請挨近一點。 無法坐在物件上,因為
+它和你不在同一個地區。
+ </notification>
+ <notification name="NoNewObjectRegionFull">
+ 無法建立新物件。 地區已滿載。
+ </notification>
+ <notification name="FailedToPlaceObject">
+ 無法將物件置於指定地點。 請再試一次。
+ </notification>
+ <notification name="NoOwnNoGardening">
+ 你無法在別人的土地上建立樹和草。
+ </notification>
+ <notification name="NoCopyPermsNoObject">
+ 複製失敗,你無權複製物件 &apos;[OBJ_NAME]&apos;。
+ </notification>
+ <notification name="NoTransPermsNoObject">
+ 複製失敗,因為物件 &apos;[OBJ_NAME]&apos; 無法轉移給你。
+ </notification>
+ <notification name="AddToNavMeshNoCopy">
+ 複製失敗,因為物件 &apos;[OBJ_NAME]&apos; 對導航網面有貢獻。
+ </notification>
+ <notification name="DupeWithNoRootsSelected">
+ 選取了沒有根的重覆物件。
+ </notification>
+ <notification name="CantDupeCuzRegionIsFull">
+ 無法複製物件,因為地區滿載。
+ </notification>
+ <notification name="CantDupeCuzParcelNotFound">
+ 無法複製物件,找不到它們所在的地段。
+ </notification>
+ <notification name="CantCreateCuzParcelFull">
+ 無法建立物件,因為
+地段滿載。
+ </notification>
+ <notification name="RezAttemptFailed">
+ 試圖產生物件失敗。
+ </notification>
+ <notification name="ToxicInvRezAttemptFailed">
+ 無法建立已在此地區造成問題的物件。
+ </notification>
+ <notification name="InvItemIsBlacklisted">
+ 該收納區物項已被列入黑名單。
+ </notification>
+ <notification name="NoCanRezObjects">
+ 你此時無權建立物件。
+ </notification>
+ <notification name="LandSearchBlocked">
+ 土地搜尋遭禁。
+你在短時間內進行了太多次土地搜尋。
+請稍候再試。
+ </notification>
+ <notification name="NotEnoughResourcesToAttach">
+ 腳本資源不足,無法附著物件!
+ </notification>
+ <notification name="YouDiedAndGotTPHome">
+ 你已經死亡並且被瞬間傳送回你的家的位置
+ </notification>
+ <notification name="EjectComingSoon">
+ 你不再允許待在這裡,必須在 [EJECT_TIME] 秒內離開。
+ </notification>
+ <notification name="NoEnterServerFull">
+ 你無法進入這地區,因為
+伺服器滿載。
+ </notification>
+ <notification name="SaveBackToInvDisabled">
+ 「儲存回收納區」功能已被停用。
+ </notification>
+ <notification name="NoExistNoSaveToContents">
+ 無法將 &apos;[OBJ_NAME]&apos; 儲存到物件內容,因為產生它的來源物件已不存在。
+ </notification>
+ <notification name="NoModNoSaveToContents">
+ 無法儲存 [OBJ_NAME] 到物件內容,你無權修改 &apos;[DEST_NAME]&apos; 物件。
+ </notification>
+ <notification name="NoSaveBackToInvDisabled">
+ 無法將 &apos;[OBJ_NAME]&apos; 儲存回收納區,此動作已被停用。
+ </notification>
+ <notification name="NoCopyNoSelCopy">
+ 無法複製你所選的,因為你無權複製物件 &apos;[OBJ_NAME]&apos;。
+ </notification>
+ <notification name="NoTransNoSelCopy">
+ 無法選取複製,因為物件 &apos;[OBJ_NAME]&apos; 不可轉移。
+ </notification>
+ <notification name="NoTransNoCopy">
+ 無法選取複製,因為物件 &apos;[OBJ_NAME]&apos; 不可轉移。
+ </notification>
+ <notification name="NoPermsNoRemoval">
+ 權限系統不允許從模擬器移除物件 &apos;[OBJ_NAME]&apos;。
+ </notification>
+ <notification name="NoModNoSaveSelection">
+ 無法儲存你所選的,因為你無權修改 &apos;[OBJ_NAME]&apos; 物件。
+ </notification>
+ <notification name="NoCopyNoSaveSelection">
+ 無法儲存你所選的,因為物件 &apos;[OBJ_NAME]&apos; 不可複製。
+ </notification>
+ <notification name="NoModNoTaking">
+ 無法拿取你所選的,因為你無權修改 &apos;[OBJ_NAME]&apos; 物件。
+ </notification>
+ <notification name="RezDestInternalError">
+ 內部錯誤:未知的目的地類型。
+ </notification>
+ <notification name="DeleteFailObjNotFound">
+ 刪除失敗,因為找不到物件
+ </notification>
+ <notification name="SorryCantEjectUser">
+ 抱歉,無法踢出該用戶。
+ </notification>
+ <notification name="RegionSezNotAHome">
+ 此地區不許你在此設定「我的家」。
+ </notification>
+ <notification name="HomeLocationLimits">
+ 你只能在自己的土地或大陸資訊中心上設定「我的家」。
+ </notification>
+ <notification name="HomePositionSet">
+ 我的家位置已定。
+ </notification>
+ <notification name="AvatarEjected">
+ 化身已被踢出。
+ </notification>
+ <notification name="AvatarEjectFailed">
+ 踢出失敗,因為你在該地段沒有管理員權限。
+ </notification>
+ <notification name="CantMoveObjectParcelFull">
+ 無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION],因為該目標地段已滿載。
+ </notification>
+ <notification name="CantMoveObjectParcelPerms">
+ 無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION],因為此地段不允許你的物件。
+ </notification>
+ <notification name="CantMoveObjectParcelResources">
+ 無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+ [REGION_NAME] 地區的 [OBJ_POSITION],因為此地段資源不足容納此物件。
+ </notification>
+ <notification name="CantMoveObjectRegionVersion">
+ 無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+ [REGION_NAME] 地區的 [OBJ_POSITION],因為該地區所執行的軟體版本過舊,不支援跨地區接受這個物件。
+ </notification>
+ <notification name="CantMoveObjectNavMesh">
+ 無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION],因為你不得修改跨越地區界限的導航網面。
+ </notification>
+ <notification name="CantMoveObjectWTF">
+ 無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION],原因不明。 ([FAILURE_TYPE])
+ </notification>
+ <notification name="NoPermModifyObject">
+ 你無權變更該物件
+ </notification>
+ <notification name="CantEnablePhysObjContributesToNav">
+ 對導航網面有貢獻的物件,無法啟用物理。
+ </notification>
+ <notification name="CantEnablePhysKeyframedObj">
+ 鍵格動畫物件無法啟用物理。
+ </notification>
+ <notification name="CantEnablePhysNotEnoughLandResources">
+ 無法啟用物件的物理——土地資源不足。
+ </notification>
+ <notification name="CantEnablePhysCostTooGreat">
+ 物件的物理資源成本超過 [MAX_OBJECTS],無法啟用物理
+ </notification>
+ <notification name="PhantomWithConcavePiece">
+ 此物件不得有凹面部件,因為物件是幻影物件,對導航網面有貢獻。
+ </notification>
+ <notification name="UnableAddItem">
+ 無法新增項目!
+ </notification>
+ <notification name="UnableEditItem">
+ 無法編輯這項目!
+ </notification>
+ <notification name="NoPermToEdit">
+ 無權編輯這項目。
+ </notification>
+ <notification name="NoPermToCopyInventory">
+ 無權複製該收納區。
+ </notification>
+ <notification name="CantSaveItemDoesntExist">
+ 無法儲存到物件內容:該項目已不存在。
+ </notification>
+ <notification name="CantSaveItemAlreadyExists">
+ 無法儲存到物件內容:收納區已存在同名稱的項目
+ </notification>
+ <notification name="CantSaveModifyAttachment">
+ 無法儲存到物件內容:這麼做將修改附件的權限。
+ </notification>
+ <notification name="TooManyScripts">
+ 腳本太多。
+ </notification>
+ <notification name="UnableAddScript">
+ 無法新增腳本!
+ </notification>
+ <notification name="AssetServerTimeoutObjReturn">
+ 資產伺服器未在正常時間內反應。 物件已返交模擬器。
+ </notification>
+ <notification name="RegionDisablePhysicsShapes">
+ 本地區未啟用物理形狀。
+ </notification>
+ <notification name="NoModNavmeshAcrossRegions">
+ 你無法變更跨越地區界限的導航網面。
+ </notification>
+ <notification name="NoSetPhysicsPropertiesOnObjectType">
+ 該物件類型不得設定物理性質。
+ </notification>
+ <notification name="NoSetRootPrimWithNoShape">
+ 根幾何元件無法設成無形狀。
+ </notification>
+ <notification name="NoRegionSupportPhysMats">
+ 本地區未啟用物理材料。
+ </notification>
+ <notification name="OnlyRootPrimPhysMats">
+ 只能調整根幾何元件的物理材料。
+ </notification>
+ <notification name="NoSupportCharacterPhysMats">
+ 尚不支援角色設定物理材料。
+ </notification>
+ <notification name="InvalidPhysMatProperty">
+ 指定的物理材料屬性中,至少有一個無效。
+ </notification>
+ <notification name="NoPermsAlterStitchingMeshObj">
+ 網面物件的縫合類型不得變更。
+ </notification>
+ <notification name="NoPermsAlterShapeMeshObj">
+ 網面物件的形狀不得變更。
+ </notification>
+ <notification name="FullRegionCantEnter">
+ 你無法進入這地區,\n因為地區滿載。
+ </notification>
+ <notification name="LinkFailedOwnersDiffer">
+ 聯結失敗——所有人不同
+ </notification>
+ <notification name="LinkFailedNoModNavmeshAcrossRegions">
+ 聯結失敗——無法修改跨越地區界限的導航網面。
+ </notification>
+ <notification name="LinkFailedNoPermToEdit">
+ 聯結失敗,你無權編輯。
+ </notification>
+ <notification name="LinkFailedTooManyPrims">
+ 聯結失敗——幾何元件太多
+ </notification>
+ <notification name="LinkFailedCantLinkNoCopyNoTrans">
+ 聯結失敗——無法將「禁止複製」和「禁止轉移」物件聯結起來
+ </notification>
+ <notification name="LinkFailedNothingLinkable">
+ 聯結失敗——沒有可聯結的東西。
+ </notification>
+ <notification name="LinkFailedTooManyPathfindingChars">
+ 聯結失敗——尋徑角色太多
+ </notification>
+ <notification name="LinkFailedInsufficientLand">
+ 聯結失敗——土地資源不足
+ </notification>
+ <notification name="LinkFailedTooMuchPhysics">
+ 物件使用了過多物理資源,其動態特性已被停用。
+ </notification>
+ <notification name="TeleportedHomeByObjectOnParcel">
+ 你已被 &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 成功瞬間傳送回家
+ </notification>
+ <notification name="TeleportedHomeByObject">
+ 你已成功被物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送回家
+ </notification>
+ <notification name="TeleportedByAttachment">
+ 你已成功被 [ITEM_ID] 上的一個附件瞬間傳送
+ </notification>
+ <notification name="TeleportedByObjectOnParcel">
+ 你已成功被 &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送
+ </notification>
+ <notification name="TeleportedByObjectOwnedBy">
+ 你已成功被 [OWNER_ID] 擁有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送
+ </notification>
+ <notification name="TeleportedByObjectUnknownUser">
+ 你已成功被某未知用戶擁有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送。
+ </notification>
+ <notification name="CantCreateObjectRegionFull">
+ 無法建立要求的物件。 地區已滿載。
+ </notification>
+ <notification name="CantAttackMultipleObjOneSpot">
+ 你不能將多個物件附著到同一個點。
+ </notification>
+ <notification name="CantCreateMultipleObjAtLoc">
+ 你不能在此建立多個物件。
+ </notification>
+ <notification name="UnableToCreateObjTimeOut">
+ 無法建立要求的物件。 物件在資料庫中找不到。
+ </notification>
+ <notification name="UnableToCreateObjUnknown">
+ 無法建立要求的物件。 要求逾時,無法完成。 請再試一次。
+ </notification>
+ <notification name="UnableToCreateObjMissingFromDB">
+ 無法建立要求的物件。 請再試一次。
+ </notification>
+ <notification name="RezFailureTookTooLong">
+ 物件產生失敗,要求的物件載入時間太久。
+ </notification>
+ <notification name="FailedToPlaceObjAtLoc">
+ 無法將物件置於指定地點。 請再試一次。
+ </notification>
+ <notification name="CantCreatePlantsOnLand">
+ 你不得在這土地上建立植物。
+ </notification>
+ <notification name="CantRestoreObjectNoWorldPos">
+ 無法恢復物件。 找不到虛擬世界的位置。
+ </notification>
+ <notification name="CantRezObjectInvalidMeshData">
+ 無法產生物件,它的網面資料無效。
+ </notification>
+ <notification name="CantRezObjectTooManyScripts">
+ 無法產生物件,因為這地區已有太多的腳本。
+ </notification>
+ <notification name="CantCreateObjectNoAccess">
+ 你無權在此建立物件。
+ </notification>
+ <notification name="CantCreateObject">
+ 你此時無權建立物件。
+ </notification>
+ <notification name="InvalidObjectParams">
+ 無效的物件參數
+ </notification>
+ <notification name="CantDuplicateObjectNoAcess">
+ 你權限不夠,無法在此複製物件。
+ </notification>
+ <notification name="CantChangeShape">
+ 你無權變更這個形狀。
+ </notification>
+ <notification name="NoAccessToClaimObjects">
+ 你權限不夠,無法在此收取物件。
+ </notification>
+ <notification name="DeedFailedNoPermToDeedForGroup">
+ 讓渡失敗,你無權為你的群組讓渡物件。
+ </notification>
+ <notification name="NoPrivsToBuyObject">
+ 你權限不夠,無法在此購買物件。
+ </notification>
+ <notification name="CantAttachObjectAvatarSittingOnIt">
+ 無法附著物件,有個化身正坐在物件上。
+ </notification>
+ <notification name="WhyAreYouTryingToWearShrubbery">
+ 樹和草不能當附件穿戴。
+ </notification>
+ <notification name="CantAttachGroupOwnedObjs">
+ 無法附著群組所擁有的物件。
+ </notification>
+ <notification name="CantAttachObjectsNotOwned">
+ 無法附著不是你擁有的物件。
+ </notification>
+ <notification name="CantAttachNavmeshObjects">
+ 無法附著對導航網面有貢獻的物件。
+ </notification>
+ <notification name="CantAttachObjectNoMovePermissions">
+ 無法附著物件,你無權移動該物件。
+ </notification>
+ <notification name="CantAttachNotEnoughScriptResources">
+ 腳本資源不足,無法附著物件!
+ </notification>
+ <notification name="CantDropItemTrialUser">
+ 你無法在此卸除物件,請到「自由嘗試」區域再試。
+ </notification>
+ <notification name="CantDropMeshAttachment">
+ 你無法在此卸除附件。 請選擇把卸除附件送回收納區,再重新成形。
+ </notification>
+ <notification name="CantDropAttachmentNoPermission">
+ 卸除附件失敗:你無權在此處卸除。
+ </notification>
+ <notification name="CantDropAttachmentInsufficientLandResources">
+ 卸除附件失敗:可用土地資源不足。
+ </notification>
+ <notification name="CantDropAttachmentInsufficientResources">
+ 卸除附件失敗:可用資源不足。
+ </notification>
+ <notification name="CantDropObjectFullParcel">
+ 無法在此卸除物件。 地段滿載。
+ </notification>
+ <notification name="CantTouchObjectBannedFromParcel">
+ 無法觸摸/抓取此物件,因為你在該土地地段遭禁。
+ </notification>
+ <notification name="PlzNarrowDeleteParams">
+ 請將刪除參數範圍調小一點。
+ </notification>
+ <notification name="UnableToUploadAsset">
+ 無法上傳資產。
+ </notification>
+ <notification name="CantTeleportCouldNotFindUser">
+ 找不到要瞬間傳送到家的用戶
+ </notification>
+ <notification name="GodlikeRequestFailed">
+ 要求神的權力失敗
+ </notification>
+ <notification name="GenericRequestFailed">
+ 普通請求失敗
+ </notification>
+ <notification name="CantUploadPostcard">
+ 無法上傳明信片。 請稍候再試一次。
+ </notification>
+ <notification name="CantFetchInventoryForGroupNotice">
+ 無法取得群組通知的收納區細節。
+ </notification>
+ <notification name="CantSendGroupNoticeNotPermitted">
+ 無法送出群組通知——未准許。
+ </notification>
+ <notification name="CantSendGroupNoticeCantConstructInventory">
+ 無法送出群組通知——收納區建立失敗。
+ </notification>
+ <notification name="CantParceInventoryInNotice">
+ 無法剖析通知裡的收納品項。
+ </notification>
+ <notification name="TerrainUploadFailed">
+ 地形上傳失敗。
+ </notification>
+ <notification name="TerrainFileWritten">
+ 地形檔案已寫入。
+ </notification>
+ <notification name="TerrainFileWrittenStartingDownload">
+ 地形檔案已寫入,開始下載……
+ </notification>
+ <notification name="TerrainBaked">
+ 地形已定貌。
+ </notification>
+ <notification name="TenObjectsDisabledPlzRefresh">
+ 只成功停用前 10 個所選物件。 若有需要,請刷新之後再選取更多的項目。
+ </notification>
+ <notification name="UpdateViewerBuyParcel">
+ 你必須先更新瀏覽器後,才可購買這個地段。
+ </notification>
+ <notification name="CantBuyParcelNotForSale">
+ 無法購買,此地段不供出售。
+ </notification>
+ <notification name="CantBuySalePriceOrLandAreaChanged">
+ 無法購買,售價或土地面積已變。
+ </notification>
+ <notification name="CantBuyParcelNotAuthorized">
+ 你不是此地段的獲授權的買主。
+ </notification>
+ <notification name="CantBuyParcelAwaitingPurchaseAuth">
+ 你無法購買此地段,該地段已在等候批准購買
+ </notification>
+ <notification name="CantBuildOverflowParcel">
+ 你不得在此建立物件,這麼做將導致地段超載。
+ </notification>
+ <notification name="SelectedMultipleOwnedLand">
+ 你選擇的土地範圍,為不同人所擁有。 請縮小選擇範圍,再試一次。
+ </notification>
+ <notification name="CantJoinTooFewLeasedParcels">
+ 未選取足夠租用地段,無法合併。
+ </notification>
+ <notification name="CantDivideLandMultipleParcelsSelected">
+ 無法分割土地,\n因為你選取了多個地段,\n請縮小所選土地。
+ </notification>
+ <notification name="CantDivideLandCantFindParcel">
+ 無法分割土地。\n找不到地段。\n請到「幫助 &gt; 回報錯誤……」回報問題
+ </notification>
+ <notification name="CantDivideLandWholeParcelSelected">
+ 無法分割土地。 選取了整個地段。\n請試著縮小所選的土地。
+ </notification>
+ <notification name="LandHasBeenDivided">
+ 土地分割成功。
+ </notification>
+ <notification name="PassPurchased">
+ 你購買了通行權。
+ </notification>
+ <notification name="RegionDisallowsClassifieds">
+ 地區不允許分類廣告。
+ </notification>
+ <notification name="LandPassExpireSoon">
+ 你在此土地的通行權即將到期失效。
+ </notification>
+ <notification name="CantSitNoSuitableSurface">
+ 沒有合適的表面讓你坐下,請試一試別處。
+ </notification>
+ <notification name="CantSitNoRoom">
+ 這裡沒有空間讓你坐下,請試試另一處。
+ </notification>
+ <notification name="ClaimObjectFailedNoPermission">
+ 收取物件失敗,因為你權限不足。
+ </notification>
+ <notification name="ClaimObjectFailedNoMoney">
+ 收取物件失敗,因為你 L$ 金額不足。
+ </notification>
+ <notification name="CantDeedGroupLand">
+ 無法讓渡群組所擁有的土地。
+ </notification>
+ <notification name="BuyObjectFailedNoMoney">
+ 購買物件失敗,你 L$ 金額不足。
+ </notification>
+ <notification name="BuyInventoryFailedNoMoney">
+ 購買收納區失敗,你 L$ 金額不足。
+ </notification>
+ <notification name="BuyPassFailedNoMoney">
+ 你的 L$ 不足,無法購買此土地的通行權。
+ </notification>
+ <notification name="CantBuyPassTryAgain">
+ 此時無法購買通行權。 請稍候再試一次。
+ </notification>
+ <notification name="CantCreateObjectParcelFull">
+ 無法建立物件,\n地段滿載。
+ </notification>
+ <notification name="FailedPlacingObject">
+ 無法將物件置於指定地點。 請再試一次。
+ </notification>
+ <notification name="CantCreateLandmarkForEvent">
+ 無法為活動建立地標。
+ </notification>
+ <notification name="GodBeatsFreeze">
+ 你擁有的神力解除了凍結!
+ </notification>
+ <notification name="SpecialPowersRequestFailedLogged">
+ 要求特殊能力失敗。 該要求已載入記錄。
+ </notification>
+ <notification name="ExpireExplanation">
+ 系統此時無法處理你的要求。 要求逾時,無法完成。
+ </notification>
+ <notification name="DieExplanation">
+ 系統無法處理你的要求。
+ </notification>
+ <notification name="AddPrimitiveFailure">
+ 金額不足,無法建立幾何元件。
+ </notification>
+ <notification name="RezObjectFailure">
+ 金額不足,無法建立物件。
+ </notification>
+ <notification name="ResetHomePositionNotLegal">
+ 已重設「我的家」位置,因為前一個位置不合法。
+ </notification>
+ <notification name="CantInviteRegionFull">
+ 此刻你無法邀請任何人到你的位置,因為地區滿載。 請稍候再試一次。
+ </notification>
+ <notification name="CantSetHomeAtRegion">
+ 此地區不許你在此設定「我的家」。
+ </notification>
+ <notification name="ListValidHomeLocations">
+ 你只能在自己的土地或大陸資訊中心上設定「我的家」。
+ </notification>
+ <notification name="SetHomePosition">
+ 我的家位置已定。
+ </notification>
+ <notification name="CantDerezInventoryError">
+ 收納區出錯,無法收納物件。
+ </notification>
+ <notification name="CantCreateRequestedInv">
+ 無法建立要求的收納區。
+ </notification>
+ <notification name="CantCreateRequestedInvFolder">
+ 無法建立要求的收納區資料夾。
+ </notification>
+ <notification name="CantCreateInventory">
+ 無法建立該收納區。
+ </notification>
+ <notification name="CantCreateLandmark">
+ 無法建立地標。
+ </notification>
+ <notification name="CantCreateOutfit">
+ 此時無法建立裝扮。 請過一分鐘後再試。
+ </notification>
+ <notification name="InventoryNotForSale">
+ 收納區沒有待售。
+ </notification>
+ <notification name="CantFindInvItem">
+ 找不到收納區物項。
+ </notification>
+ <notification name="CantFindObject">
+ 找不到物件。
+ </notification>
+ <notification name="CantTransfterMoneyRegionDisabled">
+ 此地區目前未啟用轉移金錢給物件的功能。
+ </notification>
+ <notification name="CantPayNoAgent">
+ 無法決定付款給誰。
+ </notification>
+ <notification name="CantDonateToPublicObjects">
+ 你無法將 L$ 送給公共物件。
+ </notification>
+ <notification name="InventoryCreationInWorldObjectFailed">
+ 針對虛擬世界物件建立收納區失敗。
+ </notification>
+ <notification name="UserBalanceOrLandUsageError">
+ 發生內部錯誤,我們無法如常更新你的瀏覽器。 你瀏覽器顯示的 L$ 餘額或擁有地段,可能和伺服器上的正確數額不一致。
+ </notification>
+ <notification name="LargePrimAgentIntersect">
+ 無法建立和其他參與者發生交截的大型幾何元件。 請等其他參與者移開後再試。
+ </notification>
+ <notification name="PreferenceChatClearLog">
+ 這動作將刪除先前交談的記錄,和所有記錄備份。
+ <usetemplate ignoretext="刪除先前交談記錄前,先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/>
+ </notification>
+ <notification name="PreferenceChatDeleteTranscripts">
+ 這將刪除所有先前交談的內容記錄。 過去交談歷史清單不受影響。 資料夾 [FOLDER] 所有副檔名 .txt 和 txt.backup 的檔案都將刪除。
+ <usetemplate ignoretext="刪除交談內容記錄前先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/>
+ </notification>
+ <notification name="PreferenceChatPathChanged">
+ 無法移動檔案。 已恢復前一個路徑。
+ <usetemplate ignoretext="無法移動檔案。 已恢復前一個路徑。" name="okignore" yestext="確定"/>
+ </notification>
</notifications>
diff --git a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml
index 42a4aa9e85..42a4aa9e85 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
index 7d16ac4129..7d16ac4129 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
index 1c8b56b3d6..e0a49a0add 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
<icon name="permission_edit_mine_icon" tool_tip="這位朋友能編輯、刪除或取得你的物件"/>
<icon name="permission_map_icon" tool_tip="這位朋友能在地圖上找到你的位置"/>
<icon name="permission_online_icon" tool_tip="這位朋友當你上線能看到訊息"/>
+ <button name="info_btn" tool_tip="詳情"/>
<button name="profile_btn" tool_tip="察看檔案"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml b/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml
index fd91ea97d1..fd91ea97d1 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
index 1dfa024138..9f59bb32f8 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="block_list_panel">
- <text name="title_text">
- 封鎖清單
- </text>
- <scroll_list name="blocked" tool_tip="目前封鎖的居民清單"/>
- <button label="封鎖他人" name="Block resident..." tool_tip="挑選一位居民以進行封鎖"/>
- <button label="依名稱封鎖物件" name="Block object by name..." tool_tip="依名稱挑選一個物件進行封鎖"/>
- <button label="解除封鎖" name="Unblock" tool_tip="將居民或物件由封鎖清單中移除"/>
+ <panel label="bottom_panel" name="blocked_buttons_panel">
+ <filter_editor label="過濾器" name="blocked_filter_input"/>
+ <menu_button name="blocked_gear_btn" tool_tip="對所選的人或物件採取動作"/>
+ <menu_button name="view_btn" tool_tip="排序選項"/>
+ <menu_button name="plus_btn" tool_tip="挑選一位居民或物件,加以封鎖"/>
+ <button name="unblock_btn" tool_tip="將居民或物件由封鎖清單中移除"/>
+ </panel>
+ <block_list name="blocked" tool_tip="目前封鎖的居民清單"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml
index fef692c1c5..fef692c1c5 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml
index e4e7a661a7..e4e7a661a7 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml
index 9833e9ef8b..9833e9ef8b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_chat_header.xml b/indra/newview/skins/default/xui/zh/panel_chat_header.xml
index 7916bf5155..7916bf5155 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/zh/panel_chat_header.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml
index 69340349bc..69340349bc 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_classified_info.xml b/indra/newview/skins/default/xui/zh/panel_classified_info.xml
index 6f2dd89318..6f2dd89318 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_classified_info.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml
index ba63dada76..ba63dada76 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml
index 55e72f5347..55e72f5347 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml b/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml
index c074abb568..c074abb568 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..6524d41645
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+ <layout_stack name="conversation_item_stack">
+ <layout_panel name="conversation_title_panel">
+ <text name="conversation_title" value="(載入中)"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..8446ce2130
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+ <icon name="voice_session_icon" tool_tip="包含語音交談"/>
+ <icon name="unread_ims_icon" tool_tip="訊息在你登出期間傳來"/>
+ <button name="delete_btn" tool_tip="移除此項目"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml
index a9e65419c2..a9e65419c2 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml
index 6377bf4135..6377bf4135 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
index 32765a3e16..32765a3e16 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
index b06ece02ad..b06ece02ad 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
index f44d411908..f44d411908 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
index d107eea553..d107eea553 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
index 65f78f9273..65f78f9273 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
index 61e45f911e..61e45f911e 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
index 846ed72961..846ed72961 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml
index 26fedb59be..26fedb59be 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
index faee42fd0e..faee42fd0e 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
index 849b82c71a..849b82c71a 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shape.xml b/indra/newview/skins/default/xui/zh/panel_edit_shape.xml
index f249100786..f249100786 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shape.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
index bc69f2ffc4..bc69f2ffc4 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
index e190bb5bd8..e190bb5bd8 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml
index d8552f52f0..d8552f52f0 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
index 34319fcc01..34319fcc01 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
index 8e19fb5692..8e19fb5692 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
index f5111d629a..f5111d629a 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
index 5ead7c9004..5ead7c9004 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
index e497e285c9..e497e285c9 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
index 4dd7ea6d93..4dd7ea6d93 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
index f468aba514..f468aba514 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_group_general.xml b/indra/newview/skins/default/xui/zh/panel_group_general.xml
index 2b16b61dd1..2b16b61dd1 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_general.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
index f979a4c53e..f979a4c53e 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_group_invite.xml b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
index 8921978b20..8921978b20 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
index 81d5573e1c..81d5573e1c 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
index 175293cdf7..fec4bb572a 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="group_list_item">
<text name="group_name" value="未知"/>
+ <button name="info_btn" tool_tip="詳情"/>
<button name="profile_btn" tool_tip="察看檔案"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notices.xml b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
index ba5f4f1bba..ba5f4f1bba 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notify.xml b/indra/newview/skins/default/xui/zh/panel_group_notify.xml
index 08a8c94876..08a8c94876 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_notify.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
index 59086c3de2..59086c3de2 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
index e937368a2b..e937368a2b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_instant_message.xml b/indra/newview/skins/default/xui/zh/panel_instant_message.xml
index cf9bc7fccb..cf9bc7fccb 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/zh/panel_instant_message.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_inventory_item.xml b/indra/newview/skins/default/xui/zh/panel_inventory_item.xml
index d18047fbcf..d18047fbcf 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_inventory_item.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml
index b50aa24d3f..b50aa24d3f 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_landmarks.xml b/indra/newview/skins/default/xui/zh/panel_landmarks.xml
index eea406170a..eea406170a 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_landmarks.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_login.xml b/indra/newview/skins/default/xui/zh/panel_login.xml
index 672d9bb1a2..672d9bb1a2 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_login.xml
+++ b/indra/newview/skins/default/xui/zh/panel_login.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
index 0ad3d8506d..0ad3d8506d 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_me.xml b/indra/newview/skins/default/xui/zh/panel_me.xml
index aad1348e46..aad1348e46 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_me.xml
+++ b/indra/newview/skins/default/xui/zh/panel_me.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
index 0c11befcf5..0c11befcf5 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
index 4a1eaef3a1..4a1eaef3a1 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
index da84d6fe02..da84d6fe02 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
index 7a11aa961b..7a11aa961b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml
index bb52c13a11..bb52c13a11 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml
+++ b/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml
index fc52168bb7..fc52168bb7 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
index 9489113d09..9489113d09 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
index c11a7a088b..c11a7a088b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml b/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml
index 01a8210338..01a8210338 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml b/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml
index a5d3afccb9..a5d3afccb9 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml
index 8de0bb0e4d..8de0bb0e4d 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
index a698da0ab1..a698da0ab1 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
index 8dd93543c0..8dd93543c0 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml
index 92ec774f9b..92ec774f9b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml
index cfb0180f9c..cfb0180f9c 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
index 693cdcdeca..693cdcdeca 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 59ea7b70e2..5f7aca387a 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -14,81 +14,53 @@
<string name="no_filtered_friends_msg">
找不到你要找的嗎? 請試試[secondlife:///app/search/people/[SEARCH_TERM] 搜尋]。
</string>
- <string name="people_filter_label" value="人員過濾器"/>
- <string name="groups_filter_label" value="群組過濾器"/>
<string name="no_filtered_groups_msg" value="找不到你要找的嗎? 請試試[secondlife:///app/search/groups/[SEARCH_TERM] 搜尋]。"/>
<string name="no_groups_msg" value="要尋找群組考慮加入嗎? 請試試[secondlife:///app/search/groups 搜尋]。"/>
<string name="MiniMapToolTipMsg" value="[REGION](雙擊以開啟地圖,按下 shift 鍵拖曳來平移)"/>
<string name="AltMiniMapToolTipMsg" value="[REGION](雙擊以瞬間傳送,按下 shift 鍵拖曳來平移)"/>
- <filter_editor label="過濾器" name="filter_input"/>
<tab_container name="tabs">
<panel label="附近" name="nearby_panel">
- <panel label="bottom_panel" name="bottom_panel">
- <menu_button name="nearby_view_sort_btn" tool_tip="選項"/>
- <button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
+ <panel label="bottom_panel" name="nearby_buttons_panel">
+ <filter_editor label="人員過濾器" name="nearby_filter_input"/>
+ <button name="gear_btn" tool_tip="對選取的人採取動作"/>
+ <menu_button name="nearby_view_btn" tool_tip="檢視/排序的選項"/>
+ <button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
+ <dnd_button name="nearby_del_btn" tool_tip="將選取的人從朋友名單移除"/>
</panel>
</panel>
- <panel label="我的朋友" name="friends_panel">
+ <panel label="朋友" name="friends_panel">
+ <panel label="bottom_panel" name="friends_buttons_panel">
+ <filter_editor label="人員過濾器" name="friends_filter_input"/>
+ <button name="gear_btn" tool_tip="對選取的人採取動作"/>
+ <menu_button name="friends_view_btn" tool_tip="檢視/排序的選項"/>
+ <button name="friends_add_btn" tool_tip="向某位居民發出交友邀請"/>
+ <dnd_button name="friends_del_btn" tool_tip="將選取的人從朋友名單移除"/>
+ </panel>
<accordion name="friends_accordion">
<accordion_tab name="tab_online" title="上線"/>
<accordion_tab name="tab_all" title="全部"/>
</accordion>
- <panel label="bottom_panel" name="bottom_panel">
- <layout_stack name="bottom_panel">
- <layout_panel name="options_gear_btn_panel">
- <menu_button name="friends_viewsort_btn" tool_tip="顯示額外選項"/>
- </layout_panel>
- <layout_panel name="add_btn_panel">
- <button name="add_btn" tool_tip="向居民發出交友邀請"/>
- </layout_panel>
- <layout_panel name="trash_btn_panel">
- <dnd_button name="del_btn" tool_tip="由你的朋友清單移除所選擇的人"/>
- </layout_panel>
- </layout_stack>
- </panel>
</panel>
- <panel label="我的群組" name="groups_panel">
- <panel label="bottom_panel" name="bottom_panel">
- <menu_button name="groups_viewsort_btn" tool_tip="選項"/>
- <button name="plus_btn" tool_tip="加入群組/創立新群組"/>
- <button name="activate_btn" tool_tip="啟用所選擇的群組"/>
+ <panel label="群組" name="groups_panel">
+ <panel label="bottom_panel" name="groups_buttons_panel">
+ <filter_editor label="群組過濾器" name="groups_filter_input"/>
+ <menu_button name="groups_gear_btn" tool_tip="對所選群組採取動作"/>
+ <menu_button name="groups_view_btn" tool_tip="檢視/排序的選項"/>
+ <menu_button name="plus_btn" tool_tip="加入群組/創立新群組"/>
+ <dnd_button name="minus_btn" tool_tip="離開所選群組"/>
</panel>
</panel>
<panel label="最近" name="recent_panel">
- <panel label="bottom_panel" name="bottom_panel">
- <menu_button name="recent_viewsort_btn" tool_tip="選項"/>
- <button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
+ <panel label="bottom_panel" name="recent_buttons_panel">
+ <filter_editor label="人員過濾器" name="recent_filter_input"/>
+ <button name="gear_btn" tool_tip="對選取的人採取動作"/>
+ <menu_button name="recent_view_btn" tool_tip="檢視/排序的選項"/>
+ <button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
+ <dnd_button name="recent_del_btn" tool_tip="將選取的人從朋友名單移除"/>
</panel>
</panel>
+ <panel label="已封鎖的" name="blocked_panel">
+ <panel label="被封鎖的居民與物件" name="panel_block_list_sidetray"/>
+ </panel>
</tab_container>
- <panel name="button_bar">
- <layout_stack name="bottom_bar_ls">
- <layout_panel name="view_profile_btn_lp">
- <button label="檔案" name="view_profile_btn" tool_tip="顯示圖片、群組與其他居民資訊"/>
- </layout_panel>
- <layout_panel name="im_btn_lp">
- <button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/>
- </layout_panel>
- <layout_panel name="call_btn_lp">
- <button label="通話" name="call_btn" tool_tip="和這位居民通話"/>
- </layout_panel>
- <layout_panel name="share_btn_lp">
- <button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
- </layout_panel>
- <layout_panel name="teleport_btn_lp">
- <button label="瞬間傳送" name="teleport_btn" tool_tip="發出瞬間傳送邀請"/>
- </layout_panel>
- </layout_stack>
- <layout_stack name="bottom_bar_ls1">
- <layout_panel name="group_info_btn_lp">
- <button label="群組檔案" name="group_info_btn" tool_tip="顯示群組資訊"/>
- </layout_panel>
- <layout_panel name="chat_btn_lp">
- <button label="群組聊天" name="chat_btn" tool_tip="開啟聊天會話"/>
- </layout_panel>
- <layout_panel name="group_call_btn_lp">
- <button label="群組通話" name="group_call_btn" tool_tip="與此群組進行通話"/>
- </layout_panel>
- </layout_stack>
- </panel>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_pick_info.xml b/indra/newview/skins/default/xui/zh/panel_pick_info.xml
index cd4cdbf999..cd4cdbf999 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_pick_info.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_picks.xml b/indra/newview/skins/default/xui/zh/panel_picks.xml
index 98d36eaea0..98d36eaea0 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_picks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_picks.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_place_profile.xml b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
index a364f732d8..a364f732d8 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_places.xml b/indra/newview/skins/default/xui/zh/panel_places.xml
index 08cae610f6..08cae610f6 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_places.xml
+++ b/indra/newview/skins/default/xui/zh/panel_places.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_postcard_message.xml b/indra/newview/skins/default/xui/zh/panel_postcard_message.xml
index 563c4fca3c..563c4fca3c 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/zh/panel_postcard_message.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml b/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml
index 900ab3a54e..900ab3a54e 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
index 3a7d79e04b..3a7d79e04b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml
index 94eb3c1389..94eb3c1389 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index cf2f81d313..e700e35516 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="文字聊天" name="chat">
- <text name="font_size">
- 字型尺寸:
- </text>
- <radio_group name="chat_font_size">
- <radio_item label="小" name="radio" value="0"/>
- <radio_item label="中" name="radio2" value="1"/>
- <radio_item label="大" name="radio3" value="2"/>
- </radio_group>
- <check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
- <check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
- <check_box label="啟用純本文 IM 與聊天歷史紀錄" name="plain_text_chat_history"/>
- <check_box label="聊天泡泡" name="bubble_text_chat"/>
- <text name="show_ims_in_label">
- 顯示 IMs 於:
- </text>
- <text name="requires_restart_label">
- (須重新啟動)
- </text>
- <radio_group name="chat_window" tool_tip="顯示你的即時訊息在分開的浮動視窗,或是使用很多頁籤的單一浮動視窗(須重新啟動)">
- <radio_item label="分開視窗" name="radio" value="0"/>
- <radio_item label="頁籤" name="radio2" value="1"/>
- </radio_group>
- <text name="disable_toast_label">
- 啟用傳入聊天的突顯示視窗:
- </text>
- <check_box label="群組聊天" name="EnableGroupChatPopups" tool_tip="當群組聊天訊息抵達時查看突顯式視窗"/>
- <check_box label="IM 聊天" name="EnableIMChatPopups" tool_tip="當即時訊息抵達時查看突顯式視窗"/>
- <spinner label="附近聊天內容提示框停駐時間:" name="nearby_toasts_lifetime"/>
- <spinner label="附近聊天內容提示框消退時間:" name="nearby_toasts_fadingtime"/>
+ <panel>
+ <check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
+ <check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
+ <check_box label="只有我的朋友和群組可以 IM 或與我通話。" name="voice_call_friends_only_check"/>
+ <text name="font_size">
+ 字型尺寸:
+ </text>
+ <combo_box name="chat_font_size">
+ <item label="小" name="Small" value="0"/>
+ <item label="中" name="Medium" value="1"/>
+ <item label="大" name="Large" value="2"/>
+ </combo_box>
+ <check_box label="聊天泡泡" name="bubble_text_chat"/>
+ </panel>
+ <panel>
+ <text name="notifications">
+ 通知
+ </text>
+ <text name="friend_ims">
+ 朋友 IM:
+ </text>
+ <combo_box name="FriendIMOptions">
+ <item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+ <item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+ <item label="無" name="None" value="無"/>
+ </combo_box>
+ <text name="non_friend_ims">
+ 非朋友 IM:
+ </text>
+ <combo_box name="NonFriendIMOptions">
+ <item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+ <item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+ <item label="無" name="None" value="無"/>
+ </combo_box>
+ <text name="conference_ims">
+ 多方交談 IM:
+ </text>
+ <combo_box name="ConferenceIMOptions">
+ <item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+ <item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+ <item label="無" name="None" value="無"/>
+ </combo_box>
+ <text name="group_chat">
+ 群組聊天:
+ </text>
+ <combo_box name="GroupChatOptions">
+ <item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+ <item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+ <item label="無" name="None" value="無"/>
+ </combo_box>
+ <text name="nearby_chat">
+ 附近的聊天:
+ </text>
+ <combo_box name="NearbyChatOptions">
+ <item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+ <item label="Flash 工具列按鈕" name="FlashToolBarButton" value="flash"/>
+ <item label="無" name="None" value="無"/>
+ </combo_box>
+ <text name="notifications_alert">
+ 若要暫時停止所有通知,請設定「溝通 &gt; 請勿打擾」。
+ </text>
+ </panel>
+ <panel>
+ <text name="play_sound">
+ 播放聲音:
+ </text>
+ <check_box label="新交談" name="new_conversation"/>
+ <check_box label="語音通話來電" name="incoming_voice_call"/>
+ <check_box label="瞬間傳送邀請" name="teleport_offer"/>
+ <check_box label="收納物品贈送" name="inventory_offer"/>
+ </panel>
+ <panel>
+ <button label="清空記錄……" name="clear_log"/>
+ <button label="刪除交談內容記錄……" name="delete_transcripts"/>
+ <button label="瀏覽…" label_selected="瀏覽" name="log_path_button"/>
+ </panel>
<button label="翻譯…" name="ok_btn"/>
<button label="自動取代…" name="autoreplace_showgui"/>
<button label="拼字檢查…" name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
index 6af4bb8970..6af4bb8970 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index 7e67a0d02d..044edbed70 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -68,9 +68,9 @@
<combo_box.item label="絕不" name="item4"/>
</combo_box>
<text name="text_box3">
- 忙碌模式回應:
+ 「請勿打擾」預設回應:
</text>
- <text_editor name="busy_response">
+ <text_editor name="do_not_disturb_response">
log_in_to_change
</text_editor>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index 3948a48992..3948a48992 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
index 3a27477885..3a27477885 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
index 07fdfd87e3..07fdfd87e3 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
index a607a7c33b..a607a7c33b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
index e57f08fd74..e57f08fd74 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
index 09043311da..09043311da 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
index d5dd337795..d5dd337795 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_region_debug.xml b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
index e5d5e6eaf7..e5d5e6eaf7 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_region_environment.xml b/indra/newview/skins/default/xui/zh/panel_region_environment.xml
index 8f466af39e..8f466af39e 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_environment.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_region_estate.xml b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
index f3c1c85379..f3c1c85379 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_region_general.xml b/indra/newview/skins/default/xui/zh/panel_region_general.xml
index f6b2c46354..f6b2c46354 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
index 85e759e445..85e759e445 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
index 29e9a35869..29e9a35869 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
index eb32d39f78..eb32d39f78 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
index 40a2dd6926..40a2dd6926 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml b/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml
index a2d0237da0..a2d0237da0 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml b/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml
index bc29058f77..bc29058f77 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml
index fa659040ea..fa659040ea 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml
index cdd79da30c..cdd79da30c 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
index 20fb9b494a..20fb9b494a 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml
index a929c9a3fb..a929c9a3fb 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
index 82c2b10d8d..82c2b10d8d 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
index 853a856104..853a856104 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml
index 6f64a4e83c..6f64a4e83c 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_sound_devices.xml b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml
index fa4e24a605..fa4e24a605 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml
index 4586d4eca1..4586d4eca1 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
index b4cdff9d6b..b4cdff9d6b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml
index 44d545a86d..44d545a86d 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml
index c251994906..c251994906 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_voice_effect.xml b/indra/newview/skins/default/xui/zh/panel_voice_effect.xml
index 6c8a452014..6c8a452014 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/zh/panel_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml
index 70ec028176..70ec028176 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_world_map.xml b/indra/newview/skins/default/xui/zh/panel_world_map.xml
index 84018768a1..84018768a1 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/zh/panel_world_map.xml
diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml
index 767bcecde7..767bcecde7 100644..100755
--- a/indra/newview/skins/default/xui/zh/role_actions.xml
+++ b/indra/newview/skins/default/xui/zh/role_actions.xml
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
index 83a9bdf6a5..83a9bdf6a5 100644..100755
--- a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
index c8aae15011..c8aae15011 100644..100755
--- a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
index 1b093e0ecd..1b093e0ecd 100644..100755
--- a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
index 982dde4010..60f44a3d88 100644..100755
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
<combo_box.item label="購買物件" name="Buyobject"/>
<combo_box.item label="支付物件" name="Payobject"/>
<combo_box.item label="打開" name="Open"/>
+ <combo_box.item label="縮放" name="Zoom"/>
</combo_box>
<panel name="perms_inv">
<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 7e17ed6864..31713ac281 100644..100755
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -614,8 +614,8 @@ http://secondlife.com/viewer-access-faq
<string name="AvatarAway">
離開
</string>
- <string name="AvatarBusy">
- 忙碌
+ <string name="AvatarDoNotDisturb">
+ 請勿打擾
</string>
<string name="AvatarMuted">
封鎖的
@@ -851,6 +851,12 @@ http://secondlife.com/viewer-access-faq
<string name="ST_NO_JOINT">
找不到 ROOT 或旋軸。
</string>
+ <string name="NearbyChatTitle">
+ 附近的聊天中
+ </string>
+ <string name="NearbyChatLabel">
+ (附近的聊天)
+ </string>
<string name="whisper">
低語:
</string>
@@ -914,12 +920,15 @@ http://secondlife.com/viewer-access-faq
<string name="ControlYourCamera">
控制你的攝影機
</string>
- <string name="TeleportYourAgent">
- 瞬間傳送你本人
- </string>
<string name="NotConnected">
未聯接
</string>
+ <string name="AgentNameSubst">
+ (你)
+ </string>
+ <string name="TeleportYourAgent">
+ 瞬間傳送你本人
+ </string>
<string name="SIM_ACCESS_PG">
一般普級
</string>
@@ -1001,18 +1010,6 @@ http://secondlife.com/viewer-access-faq
<string name="dictionary_files">
字典
</string>
- <string name="AvatarSetNotAway">
- 非離開
- </string>
- <string name="AvatarSetAway">
- 離開
- </string>
- <string name="AvatarSetNotBusy">
- 非忙碌
- </string>
- <string name="AvatarSetBusy">
- 忙碌
- </string>
<string name="shape">
體形
</string>
@@ -1981,8 +1978,8 @@ http://secondlife.com/viewer-access-faq
<string name="PanelContentsNewScript">
新腳本
</string>
- <string name="BusyModeResponseDefault">
- 你傳訊過去的居民目前處於忙碌狀態,這意味著他要求不被打擾。 你的訊息仍將留存並顯示於對方的 IM 面板上供稍後查閱。
+ <string name="DoNotDisturbModeResponseDefault">
+ 這居民處於「請勿打擾」狀態,不會立即看到你的訊息。
</string>
<string name="MuteByName">
(按名稱)
@@ -2095,9 +2092,6 @@ http://secondlife.com/viewer-access-faq
<string name="GroupMoneyDate">
[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
</string>
- <string name="ViewerObjectContents">
- 內容
- </string>
<string name="AcquiredItems">
取得物品
</string>
@@ -3869,7 +3863,7 @@ http://secondlife.com/viewer-access-faq
一般普級地區
</string>
<string name="LocationCtrlSeeAVsTooltip">
- 可看到本地段外的化身,並與之交談
+ 這地段外的其他化身,看不見也聽不到位於地段裡的化身
</string>
<string name="LocationCtrlPathfindingDirtyTooltip">
地區重新產出之前,可移動物件可能無法正常運作。
@@ -3946,6 +3940,12 @@ http://secondlife.com/viewer-access-faq
<string name="IM_unblock_only_groups_friends">
要察看這訊息,你必須到「偏好設定 / 隱私」,取消勾選「只有我的朋友和群組可以 IM 或與我通話」。
</string>
+ <string name="OnlineStatus">
+ 上線
+ </string>
+ <string name="OfflineStatus">
+ 離線
+ </string>
<string name="answered_call">
你的通話已經接通
</string>
@@ -3955,6 +3955,9 @@ http://secondlife.com/viewer-access-faq
<string name="you_joined_call">
你發起了語音通話
</string>
+ <string name="you_auto_rejected_call-im">
+ 因為處於「請勿打擾」模式,你已自動拒聽這通語音來電。
+ </string>
<string name="name_started_call">
[NAME] 發起了語音通話
</string>
@@ -3971,7 +3974,7 @@ http://secondlife.com/viewer-access-faq
聯接中...
</string>
<string name="conference-title">
- 臨時多方通話
+ 多人聊天
</string>
<string name="conference-title-incoming">
和 [AGENT_NAME] 多方通話
@@ -4863,6 +4866,9 @@ http://secondlife.com/viewer-access-faq
<string name="Command_Chat_Label">
聊天
</string>
+ <string name="Command_Conversations_Label">
+ 交談
+ </string>
<string name="Command_Compass_Label">
羅盤
</string>
@@ -4938,6 +4944,9 @@ http://secondlife.com/viewer-access-faq
<string name="Command_Chat_Tooltip">
透過文字和附近人們聊天
</string>
+ <string name="Command_Conversations_Tooltip">
+ 和所有人交談
+ </string>
<string name="Command_Compass_Tooltip">
指南針
</string>
@@ -5067,4 +5076,13 @@ http://secondlife.com/viewer-access-faq
<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>
</strings>
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
index 37080a8d0c..37080a8d0c 100644..100755
--- a/indra/newview/skins/default/xui/zh/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml