Merged SL 1.23.4 into Imprudence.

Conflicts:
	linden/doc/contributions.txt
	linden/indra/CMakeLists.txt
	linden/indra/cmake/APR.cmake
	linden/indra/cmake/CopyWinLibs.cmake
	linden/indra/cmake/OPENAL.cmake
	linden/indra/develop.py
	linden/indra/llaudio/audioengine.cpp
	linden/indra/llcommon/indra_constants.h
	linden/indra/llcommon/llversionviewer.h
	linden/indra/llcrashlogger/llcrashlogger.cpp
	linden/indra/llmedia/llmediaimplgstreamer.cpp
	linden/indra/llmedia/llmediaimplgstreamer.h
	linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
	linden/indra/llmedia/llmediaimplgstreamer_syms.h
	linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
	linden/indra/llmedia/llmediamanager.cpp
	linden/indra/llmessage/llassetstorage.cpp
	linden/indra/llui/lltexteditor.cpp
	linden/indra/llvfs/lldir.cpp
	linden/indra/newview/CMakeLists.txt
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/Info-Imprudence.plist
	linden/indra/newview/app_settings/logcontrol.xml
	linden/indra/newview/app_settings/settings.xml
	linden/indra/newview/installers/windows/installer_template.nsi
	linden/indra/newview/llagent.cpp
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llcallingcard.cpp
	linden/indra/newview/llfilepicker.cpp
	linden/indra/newview/llfloateractivespeakers.cpp
	linden/indra/newview/llfloateravatarpicker.cpp
	linden/indra/newview/llfloaterbulkpermission.cpp
	linden/indra/newview/llfloaterbulkpermission.h
	linden/indra/newview/llfloaterchat.cpp
	linden/indra/newview/llfloatergodtools.cpp
	linden/indra/newview/llfloaterhtmlhelp.cpp
	linden/indra/newview/llfloatertools.cpp
	linden/indra/newview/llfloatertools.h
	linden/indra/newview/llfloatertopobjects.cpp
	linden/indra/newview/llinventorybridge.cpp
	linden/indra/newview/llinventoryview.cpp
	linden/indra/newview/llnetmap.cpp
	linden/indra/newview/llnetmap.h
	linden/indra/newview/llpanelland.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/llpanelobject.cpp
	linden/indra/newview/llprefsim.cpp
	linden/indra/newview/lltexturecache.cpp
	linden/indra/newview/lltoolbrush.cpp
	linden/indra/newview/llvieweraudio.cpp
	linden/indra/newview/llviewermenu.cpp
	linden/indra/newview/llviewermessage.cpp
	linden/indra/newview/llviewerparcelmedia.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/llwebbrowserctrl.cpp
	linden/indra/newview/llworldmapview.cpp
	linden/indra/newview/pipeline.cpp
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/colors_base.xml
	linden/indra/newview/skins/default/xui/de/floater_active_speakers.xml
	linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml
	linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
	linden/indra/newview/skins/default/xui/de/floater_joystick.xml
	linden/indra/newview/skins/default/xui/de/floater_mute_object.xml
	linden/indra/newview/skins/default/xui/de/floater_sim_release_message.xml
	linden/indra/newview/skins/default/xui/de/panel_media_controls.xml
	linden/indra/newview/skins/default/xui/de/panel_preferences_voice.xml
	linden/indra/newview/skins/default/xui/de/strings.xml
	linden/indra/newview/skins/default/xui/de/teleport_strings.xml
	linden/indra/newview/skins/default/xui/en-us/alerts.xml
	linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
	linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
	linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
	linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml
	linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
	linden/indra/newview/skins/default/xui/en-us/floater_chatterbox.xml
	linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml
	linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
	linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
	linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
	linden/indra/newview/skins/default/xui/en-us/menu_login.xml
	linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
	linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
	linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
	linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
	linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
	linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
	linden/indra/newview/skins/default/xui/en-us/notify.xml
	linden/indra/newview/skins/default/xui/en-us/panel_bars.xml
	linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
	linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
	linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
	linden/indra/newview/skins/default/xui/en-us/strings.xml
	linden/indra/newview/skins/default/xui/es/alerts.xml
	linden/indra/newview/skins/default/xui/es/floater_about.xml
	linden/indra/newview/skins/default/xui/es/floater_about_land.xml
	linden/indra/newview/skins/default/xui/es/floater_animation_preview.xml
	linden/indra/newview/skins/default/xui/es/floater_auction.xml
	linden/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
	linden/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
	linden/indra/newview/skins/default/xui/es/floater_build_options.xml
	linden/indra/newview/skins/default/xui/es/floater_bumps.xml
	linden/indra/newview/skins/default/xui/es/floater_buy_contents.xml
	linden/indra/newview/skins/default/xui/es/floater_buy_currency.xml
	linden/indra/newview/skins/default/xui/es/floater_buy_land.xml
	linden/indra/newview/skins/default/xui/es/floater_buy_object.xml
	linden/indra/newview/skins/default/xui/es/floater_chat_history.xml
	linden/indra/newview/skins/default/xui/es/floater_choose_group.xml
	linden/indra/newview/skins/default/xui/es/floater_clothing.xml
	linden/indra/newview/skins/default/xui/es/floater_color_picker.xml
	linden/indra/newview/skins/default/xui/es/floater_critical.xml
	linden/indra/newview/skins/default/xui/es/floater_customize.xml
	linden/indra/newview/skins/default/xui/es/floater_directory.xml
	linden/indra/newview/skins/default/xui/es/floater_gesture.xml
	linden/indra/newview/skins/default/xui/es/floater_group_info.xml
	linden/indra/newview/skins/default/xui/es/floater_html.xml
	linden/indra/newview/skins/default/xui/es/floater_im.xml
	linden/indra/newview/skins/default/xui/es/floater_image_preview.xml
	linden/indra/newview/skins/default/xui/es/floater_import.xml
	linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
	linden/indra/newview/skins/default/xui/es/floater_inventory.xml
	linden/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
	linden/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
	linden/indra/newview/skins/default/xui/es/floater_land_holdings.xml
	linden/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
	linden/indra/newview/skins/default/xui/es/floater_moveview.xml
	linden/indra/newview/skins/default/xui/es/floater_mute.xml
	linden/indra/newview/skins/default/xui/es/floater_name_description.xml
	linden/indra/newview/skins/default/xui/es/floater_new_im.xml
	linden/indra/newview/skins/default/xui/es/floater_new_outfit_dialog.xml
	linden/indra/newview/skins/default/xui/es/floater_openobject.xml
	linden/indra/newview/skins/default/xui/es/floater_pay.xml
	linden/indra/newview/skins/default/xui/es/floater_pay_object.xml
	linden/indra/newview/skins/default/xui/es/floater_postcard.xml
	linden/indra/newview/skins/default/xui/es/floater_preferences.xml
	linden/indra/newview/skins/default/xui/es/floater_preview_animation.xml
	linden/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml
	linden/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
	linden/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
	linden/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml
	linden/indra/newview/skins/default/xui/es/floater_preview_sound.xml
	linden/indra/newview/skins/default/xui/es/floater_preview_texture.xml
	linden/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml
	linden/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
	linden/indra/newview/skins/default/xui/es/floater_profile.xml
	linden/indra/newview/skins/default/xui/es/floater_report_abuse.xml
	linden/indra/newview/skins/default/xui/es/floater_script_debug.xml
	linden/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml
	linden/indra/newview/skins/default/xui/es/floater_script_preview.xml
	linden/indra/newview/skins/default/xui/es/floater_script_queue.xml
	linden/indra/newview/skins/default/xui/es/floater_script_search.xml
	linden/indra/newview/skins/default/xui/es/floater_sell_land.xml
	linden/indra/newview/skins/default/xui/es/floater_settings_debug.xml
	linden/indra/newview/skins/default/xui/es/floater_snapshot.xml
	linden/indra/newview/skins/default/xui/es/floater_sound_preview.xml
	linden/indra/newview/skins/default/xui/es/floater_telehub.xml
	linden/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
	linden/indra/newview/skins/default/xui/es/floater_tools.xml
	linden/indra/newview/skins/default/xui/es/floater_top_objects.xml
	linden/indra/newview/skins/default/xui/es/floater_tos.xml
	linden/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml
	linden/indra/newview/skins/default/xui/es/floater_world_map.xml
	linden/indra/newview/skins/default/xui/es/menu_inventory.xml
	linden/indra/newview/skins/default/xui/es/menu_pie_attachment.xml
	linden/indra/newview/skins/default/xui/es/menu_pie_avatar.xml
	linden/indra/newview/skins/default/xui/es/menu_pie_land.xml
	linden/indra/newview/skins/default/xui/es/menu_pie_object.xml
	linden/indra/newview/skins/default/xui/es/menu_pie_self.xml
	linden/indra/newview/skins/default/xui/es/menu_viewer.xml
	linden/indra/newview/skins/default/xui/es/notify.xml
	linden/indra/newview/skins/default/xui/es/panel_avatar.xml
	linden/indra/newview/skins/default/xui/es/panel_avatar_classified.xml
	linden/indra/newview/skins/default/xui/es/panel_avatar_pick.xml
	linden/indra/newview/skins/default/xui/es/panel_chat_bar.xml
	linden/indra/newview/skins/default/xui/es/panel_classified.xml
	linden/indra/newview/skins/default/xui/es/panel_event.xml
	linden/indra/newview/skins/default/xui/es/panel_group.xml
	linden/indra/newview/skins/default/xui/es/panel_group_finder.xml
	linden/indra/newview/skins/default/xui/es/panel_group_general.xml
	linden/indra/newview/skins/default/xui/es/panel_group_invite.xml
	linden/indra/newview/skins/default/xui/es/panel_group_land_money.xml
	linden/indra/newview/skins/default/xui/es/panel_group_notices.xml
	linden/indra/newview/skins/default/xui/es/panel_group_roles.xml
	linden/indra/newview/skins/default/xui/es/panel_group_voting.xml
	linden/indra/newview/skins/default/xui/es/panel_land_covenant.xml
	linden/indra/newview/skins/default/xui/es/panel_login.xml
	linden/indra/newview/skins/default/xui/es/panel_overlaybar.xml
	linden/indra/newview/skins/default/xui/es/panel_place.xml
	linden/indra/newview/skins/default/xui/es/panel_place_small.xml
	linden/indra/newview/skins/default/xui/es/panel_preferences_audio.xml
	linden/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
	linden/indra/newview/skins/default/xui/es/panel_preferences_general.xml
	linden/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
	linden/indra/newview/skins/default/xui/es/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/es/panel_preferences_input.xml
	linden/indra/newview/skins/default/xui/es/panel_preferences_network.xml
	linden/indra/newview/skins/default/xui/es/panel_preferences_popups.xml
	linden/indra/newview/skins/default/xui/es/panel_region_covenant.xml
	linden/indra/newview/skins/default/xui/es/panel_region_debug.xml
	linden/indra/newview/skins/default/xui/es/panel_region_estate.xml
	linden/indra/newview/skins/default/xui/es/panel_region_general.xml
	linden/indra/newview/skins/default/xui/es/panel_region_terrain.xml
	linden/indra/newview/skins/default/xui/es/panel_region_texture.xml
	linden/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
	linden/indra/newview/skins/default/xui/es/panel_status_bar.xml
	linden/indra/newview/skins/default/xui/es/panel_toolbar.xml
	linden/indra/newview/skins/default/xui/es/panel_top_pick.xml
	linden/indra/newview/skins/default/xui/fr/alerts.xml
	linden/indra/newview/skins/default/xui/fr/floater_about.xml
	linden/indra/newview/skins/default/xui/fr/floater_about_land.xml
	linden/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
	linden/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
	linden/indra/newview/skins/default/xui/fr/floater_beacons.xml
	linden/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
	linden/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
	linden/indra/newview/skins/default/xui/fr/floater_buy_land.xml
	linden/indra/newview/skins/default/xui/fr/floater_chat_history.xml
	linden/indra/newview/skins/default/xui/fr/floater_clothing.xml
	linden/indra/newview/skins/default/xui/fr/floater_customize.xml
	linden/indra/newview/skins/default/xui/fr/floater_directory.xml
	linden/indra/newview/skins/default/xui/fr/floater_god_tools.xml
	linden/indra/newview/skins/default/xui/fr/floater_group_info.xml
	linden/indra/newview/skins/default/xui/fr/floater_html.xml
	linden/indra/newview/skins/default/xui/fr/floater_im.xml
	linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
	linden/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml
	linden/indra/newview/skins/default/xui/fr/floater_inventory.xml
	linden/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
	linden/indra/newview/skins/default/xui/fr/floater_joystick.xml
	linden/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
	linden/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
	linden/indra/newview/skins/default/xui/fr/floater_media_browser.xml
	linden/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
	linden/indra/newview/skins/default/xui/fr/floater_name_description.xml
	linden/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
	linden/indra/newview/skins/default/xui/fr/floater_profile.xml
	linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
	linden/indra/newview/skins/default/xui/fr/floater_script_search.xml
	linden/indra/newview/skins/default/xui/fr/floater_sell_land.xml
	linden/indra/newview/skins/default/xui/fr/floater_snapshot.xml
	linden/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
	linden/indra/newview/skins/default/xui/fr/floater_tools.xml
	linden/indra/newview/skins/default/xui/fr/floater_top_objects.xml
	linden/indra/newview/skins/default/xui/fr/floater_world_map.xml
	linden/indra/newview/skins/default/xui/fr/menu_inventory.xml
	linden/indra/newview/skins/default/xui/fr/menu_login.xml
	linden/indra/newview/skins/default/xui/fr/menu_pie_attachment.xml
	linden/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml
	linden/indra/newview/skins/default/xui/fr/menu_pie_object.xml
	linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
	linden/indra/newview/skins/default/xui/fr/notify.xml
	linden/indra/newview/skins/default/xui/fr/panel_audio.xml
	linden/indra/newview/skins/default/xui/fr/panel_avatar.xml
	linden/indra/newview/skins/default/xui/fr/panel_avatar_classified.xml
	linden/indra/newview/skins/default/xui/fr/panel_classified.xml
	linden/indra/newview/skins/default/xui/fr/panel_event.xml
	linden/indra/newview/skins/default/xui/fr/panel_friends.xml
	linden/indra/newview/skins/default/xui/fr/panel_group_general.xml
	linden/indra/newview/skins/default/xui/fr/panel_group_invite.xml
	linden/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
	linden/indra/newview/skins/default/xui/fr/panel_group_roles.xml
	linden/indra/newview/skins/default/xui/fr/panel_login.xml
	linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
	linden/indra/newview/skins/default/xui/fr/panel_media_remote_expanded.xml
	linden/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
	linden/indra/newview/skins/default/xui/fr/panel_place.xml
	linden/indra/newview/skins/default/xui/fr/panel_place_small.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_input.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_network.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
	linden/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
	linden/indra/newview/skins/default/xui/fr/panel_region_debug.xml
	linden/indra/newview/skins/default/xui/fr/panel_region_general.xml
	linden/indra/newview/skins/default/xui/fr/panel_voice_controls.xml
	linden/indra/newview/skins/default/xui/fr/role_actions.xml
	linden/indra/newview/skins/default/xui/fr/strings.xml
	linden/indra/newview/skins/default/xui/fr/teleport_strings.xml
	linden/indra/newview/skins/default/xui/ja/floater_active_speakers.xml
	linden/indra/newview/skins/default/xui/ja/floater_html.xml
	linden/indra/newview/skins/default/xui/ja/floater_instant_message_ad_hoc.xml
	linden/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml
	linden/indra/newview/skins/default/xui/ja/floater_joystick.xml
	linden/indra/newview/skins/default/xui/ja/floater_media_browser.xml
	linden/indra/newview/skins/default/xui/ja/floater_windlight_options.xml
	linden/indra/newview/skins/default/xui/ja/menu_login.xml
	linden/indra/newview/skins/default/xui/ja/panel_friends.xml
	linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml
	linden/indra/newview/skins/default/xui/ja/panel_media_remote_expanded.xml
	linden/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml
	linden/indra/newview/skins/default/xui/ja/panel_speaker_controls.xml
	linden/indra/newview/skins/default/xui/ja/strings.xml
	linden/indra/newview/skins/default/xui/ja/teleport_strings.xml
	linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml
	linden/indra/newview/skins/default/xui/pt/alerts.xml
	linden/indra/newview/skins/default/xui/pt/floater_about.xml
	linden/indra/newview/skins/default/xui/pt/floater_about_land.xml
	linden/indra/newview/skins/default/xui/pt/floater_active_speakers.xml
	linden/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
	linden/indra/newview/skins/default/xui/pt/floater_auction.xml
	linden/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
	linden/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
	linden/indra/newview/skins/default/xui/pt/floater_beacons.xml
	linden/indra/newview/skins/default/xui/pt/floater_build_options.xml
	linden/indra/newview/skins/default/xui/pt/floater_bumps.xml
	linden/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
	linden/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
	linden/indra/newview/skins/default/xui/pt/floater_buy_land.xml
	linden/indra/newview/skins/default/xui/pt/floater_buy_object.xml
	linden/indra/newview/skins/default/xui/pt/floater_chat_history.xml
	linden/indra/newview/skins/default/xui/pt/floater_clothing.xml
	linden/indra/newview/skins/default/xui/pt/floater_color_picker.xml
	linden/indra/newview/skins/default/xui/pt/floater_critical.xml
	linden/indra/newview/skins/default/xui/pt/floater_customize.xml
	linden/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
	linden/indra/newview/skins/default/xui/pt/floater_directory.xml
	linden/indra/newview/skins/default/xui/pt/floater_env_settings.xml
	linden/indra/newview/skins/default/xui/pt/floater_gesture.xml
	linden/indra/newview/skins/default/xui/pt/floater_god_tools.xml
	linden/indra/newview/skins/default/xui/pt/floater_group_info.xml
	linden/indra/newview/skins/default/xui/pt/floater_im.xml
	linden/indra/newview/skins/default/xui/pt/floater_image_preview.xml
	linden/indra/newview/skins/default/xui/pt/floater_inspect.xml
	linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
	linden/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml
	linden/indra/newview/skins/default/xui/pt/floater_instant_message_group.xml
	linden/indra/newview/skins/default/xui/pt/floater_inventory.xml
	linden/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
	linden/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
	linden/indra/newview/skins/default/xui/pt/floater_joystick.xml
	linden/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
	linden/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
	linden/indra/newview/skins/default/xui/pt/floater_landmark_ctrl.xml
	linden/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
	linden/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
	linden/indra/newview/skins/default/xui/pt/floater_media_browser.xml
	linden/indra/newview/skins/default/xui/pt/floater_moveview.xml
	linden/indra/newview/skins/default/xui/pt/floater_mute.xml
	linden/indra/newview/skins/default/xui/pt/floater_mute_object.xml
	linden/indra/newview/skins/default/xui/pt/floater_name_description.xml
	linden/indra/newview/skins/default/xui/pt/floater_new_outfit_dialog.xml
	linden/indra/newview/skins/default/xui/pt/floater_openobject.xml
	linden/indra/newview/skins/default/xui/pt/floater_pay.xml
	linden/indra/newview/skins/default/xui/pt/floater_postcard.xml
	linden/indra/newview/skins/default/xui/pt/floater_preferences.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_classified.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_event.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_url.xml
	linden/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml
	linden/indra/newview/skins/default/xui/pt/floater_profile.xml
	linden/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
	linden/indra/newview/skins/default/xui/pt/floater_script_debug.xml
	linden/indra/newview/skins/default/xui/pt/floater_script_queue.xml
	linden/indra/newview/skins/default/xui/pt/floater_script_search.xml
	linden/indra/newview/skins/default/xui/pt/floater_sell_land.xml
	linden/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
	linden/indra/newview/skins/default/xui/pt/floater_sim_release_message.xml
	linden/indra/newview/skins/default/xui/pt/floater_snapshot.xml
	linden/indra/newview/skins/default/xui/pt/floater_sound_preview.xml
	linden/indra/newview/skins/default/xui/pt/floater_telehub.xml
	linden/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
	linden/indra/newview/skins/default/xui/pt/floater_tools.xml
	linden/indra/newview/skins/default/xui/pt/floater_top_objects.xml
	linden/indra/newview/skins/default/xui/pt/floater_tos.xml
	linden/indra/newview/skins/default/xui/pt/floater_url_entry.xml
	linden/indra/newview/skins/default/xui/pt/floater_water.xml
	linden/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml
	linden/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
	linden/indra/newview/skins/default/xui/pt/floater_world_map.xml
	linden/indra/newview/skins/default/xui/pt/menu_inventory.xml
	linden/indra/newview/skins/default/xui/pt/menu_pie_attachment.xml
	linden/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml
	linden/indra/newview/skins/default/xui/pt/menu_pie_land.xml
	linden/indra/newview/skins/default/xui/pt/menu_pie_object.xml
	linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
	linden/indra/newview/skins/default/xui/pt/notify.xml
	linden/indra/newview/skins/default/xui/pt/panel_account_details.xml
	linden/indra/newview/skins/default/xui/pt/panel_account_planning.xml
	linden/indra/newview/skins/default/xui/pt/panel_account_transactions.xml
	linden/indra/newview/skins/default/xui/pt/panel_audio_device.xml
	linden/indra/newview/skins/default/xui/pt/panel_avatar.xml
	linden/indra/newview/skins/default/xui/pt/panel_avatar_classified.xml
	linden/indra/newview/skins/default/xui/pt/panel_avatar_pick.xml
	linden/indra/newview/skins/default/xui/pt/panel_chat_bar.xml
	linden/indra/newview/skins/default/xui/pt/panel_classified.xml
	linden/indra/newview/skins/default/xui/pt/panel_event.xml
	linden/indra/newview/skins/default/xui/pt/panel_friends.xml
	linden/indra/newview/skins/default/xui/pt/panel_group.xml
	linden/indra/newview/skins/default/xui/pt/panel_group_finder.xml
	linden/indra/newview/skins/default/xui/pt/panel_group_general.xml
	linden/indra/newview/skins/default/xui/pt/panel_group_invite.xml
	linden/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
	linden/indra/newview/skins/default/xui/pt/panel_group_notices.xml
	linden/indra/newview/skins/default/xui/pt/panel_group_roles.xml
	linden/indra/newview/skins/default/xui/pt/panel_group_voting.xml
	linden/indra/newview/skins/default/xui/pt/panel_land_covenant.xml
	linden/indra/newview/skins/default/xui/pt/panel_login.xml
	linden/indra/newview/skins/default/xui/pt/panel_overlaybar.xml
	linden/indra/newview/skins/default/xui/pt/panel_place.xml
	linden/indra/newview/skins/default/xui/pt/panel_place_small.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_input.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_network.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_popups.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_voice.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_web.xml
	linden/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
	linden/indra/newview/skins/default/xui/pt/panel_region_debug.xml
	linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml
	linden/indra/newview/skins/default/xui/pt/panel_region_general.xml
	linden/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
	linden/indra/newview/skins/default/xui/pt/panel_region_texture.xml
	linden/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml
	linden/indra/newview/skins/default/xui/pt/panel_speaker_controls.xml
	linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml
	linden/indra/newview/skins/default/xui/pt/panel_toolbar.xml
	linden/indra/newview/skins/default/xui/pt/panel_top_pick.xml
	linden/indra/newview/skins/default/xui/pt/panel_voice_controls.xml
	linden/indra/newview/skins/default/xui/pt/panel_voice_enable.xml
	linden/indra/newview/skins/default/xui/pt/panel_voice_options.xml
	linden/indra/newview/skins/default/xui/pt/strings.xml
	linden/indra/newview/skins/default/xui/pt/teleport_strings.xml
	linden/indra/newview/skins/default/xui/zh/floater_env_settings.xml
	linden/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml
	linden/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
	linden/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml
	linden/indra/newview/skins/default/xui/zh/floater_post_process.xml
	linden/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
	linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
	linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
	linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
	linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
	linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
	linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
	linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
	linden/indra/newview/skins/default/xui/zh/panel_friends.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_invite.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_notices.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_roles.xml
	linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
	linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
	linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml
	linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml
	linden/indra/newview/skins/default/xui/zh/strings.xml
	linden/indra/newview/skins/silver/colors_base.xml
	linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
	linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml
	linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml
	linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
	linden/indra/newview/viewer_manifest.py
	linden/install.xml

1 files changed, 195 insertions, 224 deletions

diff --git a/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml b/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
index 8f8d8d7..14657e8 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
@@ -1,224 +1,195 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Panel Avatar">
-        <tab_container name="tab">
-                <panel label="第二人生" name="2nd Life">
-                        <text name="CaptionTextAcctInfo">
-                                [ACCTTYPE]
-[PAYMENTINFO]
-[AGEVERIFICATION]
-                        </text>
-                        <text name="AcctTypeResident">
-                                居民
-                        </text>
-                        <text name="AcctTypeTrial">
-                                试用者
-                        </text>
-                        <text name="AcctTypeCharterMember">
-                                宪章制定委员会成员
-                        </text>
-                        <text name="AcctTypeEmployee">
-                                林登实验室雇员
-                        </text>
-                        <text name="PaymentInfoUsed">
-                                支付信息已使用
-                        </text>
-                        <text name="PaymentInfoOnFile">
-                                支付信息在案
-                        </text>
-                        <text name="NoPaymentInfoOnFile">
-                                无支付信息
-                        </text>
-                        <text
-                                 name="AgeVerified" >
-                                年龄已验证
-                        </text>
-                        <text
-                                 name="NotAgeVerified" >
-                                年龄未验证
-                        </text>
-                        <text name="Name:">
-                                名字:
-                        </text>
-                        <text name="online_yes">
-                                当前在线
-                        </text>
-                        <text name="online_no">
-                                不在线
-                        </text>
-                        <text name="online_unknown">
-                                在线状态未知
-                        </text>
-                        <text name="label">
-                                出生:
-                        </text>
-                        <text name="label2">
-                                账户:
-                        </text>
-                        <text name="partner_label"
-                             tool_tip="第二人生搭档。要获取更多关于如何设置此项功能， 请登陆www.secondlife.com/partner">
-                                搭档:
-                        </text>
-                        <button
-                                 label="i"
-                                 label_selected="i"
-                                 name="partner_info"
-                                 tool_tip="点击打开搭档的档案" />
-                        <line_editor name="partner_edit"
-                             tool_tip="第二人生搭档。要获取更多关于如何设置此项功能， 请登陆www.secondlife.com/partner">
-                                [FIRST] [LAST]
-                        </line_editor>
-                        <text name="Photo:">
-                                照片：
-                        </text>
-                        <texture_picker label="" name="img" tool_tip="点击这里来选择图片" />
-                        <text name="Ratings:">
-                                级别:
-                        </text>
-                        <text name="Groups:">
-                                社团:
-                        </text>
-                        <text name="About:">
-                                关于:
-                        </text>
-                        <text name="(500 chars)">
-                                (500 个字)
-                        </text>
-                        <text name="Give item:">
-                                给与物品:
-                        </text>
-                        <text name="Give inventory"
-                             tool_tip="要把库存中的物体赠与这个人，将其拖动到这里。">
-                                放置库存物品于此。
-                        </text>
-                        <check_box label="在搜索结果中显示" name="allow_publish"
-                             tool_tip="在搜索中显示额外信息，例如描述和照片。" />
-                        <button label="?" label_selected="?" name="?" />
-                        <!-- <button label="在地图中显示" label_selected="在地图中显示"
-                             name="Show on Map" /> -->
-                        <button label="在地图中显示" label_selected="在地图中显示"
-                             name="Find on Map" />
-                                 
-                        <button label="邀请瞬间移动..." label_selected="邀请瞬间移动..."
-                             name="Offer Teleport..." />
-                        <button
-                                 label="添加为好友..."
-                                 label_selected="添加为好友..."
-                                 name="Add Friend..." />
-
-                        <!-- <button label="评分..." label_selected="评分..." name="Rate..." /> -->
-                        <button label="付款..." label_selected="付款..." name="Pay..." />
-                        <button label="即时消息..." label_selected="即时消息..."
-                             name="Instant Message..." />
-                        <button label="屏蔽" label_selected="屏蔽" name="Mute" />
-                </panel>
-                <panel label="Web" name="WebProfile">
-                        <line_editor
-                                 is_unicode="false"
-                                 name="url_edit" />
-                        <flyout_button
-                                 label="加载"
-                                 label_selected="加载"
-                                 name="load"
-                                 tool_tip="用内部浏览器打开这个档案页面。">
-                                <flyout_button_item
-                                        value="open">
-                                        在外部浏览器中打开</flyout_button_item>
-                                <flyout_button_item
-                                        value="home">返回原来页面</flyout_button_item>
-                        </flyout_button>
-                        <button label="?" label_selected="?" name="web_profile_help" />
-                        <check_box label="自动加载网络档案" name="auto_load"
-                             tool_tip="不询问就自动加载 *所有* 网络档案。" />
-                        <text name="status_text">
-                        </text>
-                </panel>
-                <panel label="兴趣" name="Interests">
-                        <text name="I Want To:">
-                                我想要:
-                        </text>
-                        <check_box label="建造" name="chk0" />
-                        <check_box label="探索" name="chk1" />
-                        <check_box label="聚会" name="chk2" />
-                        <check_box label="受雇" name="chk6" />
-                        <check_box label="组团" name="chk3" />
-                        <check_box label="购买" name="chk4" />
-                        <check_box label="出售" name="chk5" />
-                        <check_box label="雇佣" name="chk7" />
-                        <text name="Skills:">
-                                技能：
-                        </text>
-                        <check_box label="材质" name="schk0" />
-                        <check_box label="建筑" name="schk1" />
-                        <check_box label="计划事件" name="schk2" />
-                        <check_box label="建模" name="schk3" />
-                        <check_box label="编辑脚本" name="schk4" />
-                        <check_box label="个性化人物" name="schk5" />
-                        <text name="Languages:">
-                                语言:
-                        </text>
-                </panel>
-                <panel label="收藏" name="Picks">
-                        <text name="Tell everyone about your favorite places in Second Life.">
-                                告诉大家你在第二人生中最喜欢的地点。
-                        </text>
-                        <button label="新建..." label_selected="新建..." name="New..." />
-                        <button label="删除..." label_selected="删除..." name="Delete..." />
-                </panel>
-                <panel label="分类广告" name="Classified">
-                        <text name="Place an ad in Second Life&apos;s classified listings.">
-                                在第二人生的分类栏中刊登广告。
-                        </text>
-                        <button label="新建..." label_selected="新建..." name="New..." />
-                        <button label="删除..." label_selected="删除..." name="Delete..." />
-                </panel>
-                <panel label="第一人生" name="1st Life">
-                        <text name="Photo:">
-                                照片：
-                        </text>
-                        <texture_picker label="" name="img" tool_tip="点击这里来选择图片" />
-                        <text name="Info:">
-                                消息:
-                        </text>
-                        <text name="(250 chars)">
-                                (250个字)
-                        </text>
-                </panel>
-                <panel label="我的备注" name="My Notes">
-                        <text name="label">
-                                使用这块空间来记录你关于这个人的笔记。 追踪交易
-进展，合作的项目，等等。只有你可以看见这些笔记。
-你观察的人看不见，其他人也看不见。
-                        </text>
-                </panel>
-        </tab_container>
-        <button label="OK" label_selected="OK" name="OK" />
-        <button label="取消" label_selected="取消" name="Cancel" />
-        <button label="踢人" label_selected="踢人" name="Kick" />
-        <button label="锁定" label_selected="锁定" name="Freeze"
-             tool_tip="停止此居民的现有动作和对话。" />
-        <button label="解锁" label_selected="解锁" name="Unfreeze"
-             tool_tip="解除冻结的居民。" />
-        <button label="CSR" label_selected="CSR" name="csr_btn"
-             tool_tip="对此位居民开启顾客服务工具。" />
-        <text name="ShowOnMapNonFriend">
-                在地图上显示位置。
-由于你和它们之间没有友谊关系，所以刚才的操作无效。
-        </text>
-        <text name="ShowOnMapFriendOffline">
-                在地图上显示位置。
-由于对方不在线，刚才的操作无效。
-        </text>
-        <text name="ShowOnMapFriendOnline">
-                在地图上显示位置。
-        </text>
-        <text name="TeleportGod">
-                强制瞬间移动到你的位置。
-        </text>
-        <text name="TeleportPrelude">
-                邀请瞬间移动到你所在的位置。但当你离开方位岛时，此项功能才可用。
-        </text>
-        <text name="TeleportNormal">
-                邀请瞬间移动到你所在的位置。
-        </text>
-</panel>
-<!--Translated for Second Life 1.19.0 (80044)-->
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<panel name="Panel Avatar">

+        <tab_container name="tab">

+                <panel label="第二人生" name="2nd Life">

+                        <string name="CaptionTextAcctInfo">

+                                [ACCTTYPE]

+[PAYMENTINFO]

+[AGEVERIFICATION]

+                        </string>

+                        <string name="AcctTypeResident">

+                                居民

+                        </string>

+                        <string name="AcctTypeTrial">

+                                试用者

+                        </string>

+                        <string name="AcctTypeCharterMember">

+                                宪章制定委员会成员

+                        </string>

+                        <string name="AcctTypeEmployee">

+                                林登实验室雇员

+                        </string>

+                        <string name="PaymentInfoUsed">

+                                支付信息已使用

+                        </string>

+                        <string name="PaymentInfoOnFile">

+                                支付信息在案

+                        </string>

+                        <string name="NoPaymentInfoOnFile">

+                                无支付信息

+                        </string>

+                        <string name="AgeVerified">

+                                年龄已验证

+                        </string>

+                        <string name="NotAgeVerified">

+                                年龄未验证

+                        </string>

+                        <text name="Name:">

+                                名字:

+                        </text>

+                        <text name="online_yes">

+                                当前在线

+                        </text>

+                        <text name="label">

+                                出生:

+                        </text>

+                        <text name="label2">

+                                账户:

+                        </text>

+                        <text name="partner_label" tool_tip="第二人生搭档。要获取更多关于如何设置此项功能， 请登陆www.secondlife.com/partner">

+                                搭档:

+                        </text>

+                        <button label="i" label_selected="i" name="partner_info" tool_tip="点击打开搭档的档案"/>

+                        <line_editor name="partner_edit" tool_tip="第二人生搭档。要获取更多关于如何设置此项功能， 请登陆www.secondlife.com/partner">

+                                [FIRST] [LAST]

+                        </line_editor>

+                        <text name="Photo:">

+                                照片：

+                        </text>

+                        <texture_picker label="" name="img" tool_tip="点击这里来选择图片"/>

+                        <text name="Groups:">

+                                社团:

+                        </text>

+                        <text name="About:">

+                                关于:

+                        </text>

+                        <text name="(500 chars)">

+                                (500 个字)

+                        </text>

+                        <text name="Give item:">

+                                给与物品:

+                        </text>

+                        <text name="Give inventory" tool_tip="要把库存中的物体赠与这个人，将其拖动到这里。">

+                                放置库存物品于此。

+                        </text>

+                        <check_box label="在搜索结果中显示" name="allow_publish" tool_tip="在搜索中显示额外信息，例如描述和照片。"/>

+                        <button label="?" label_selected="?" name="?"/>

+                        <button label="在地图中显示" label_selected="在地图中显示" name="Find on Map"/>

+                        <button label="邀请瞬间移动..." label_selected="邀请瞬间移动..." name="Offer Teleport..."/>

+                        <button label="添加为好友..." label_selected="添加为好友..." name="Add Friend..."/>

+                        <button label="付款..." label_selected="付款..." name="Pay..."/>

+                        <button label="即时消息..." label_selected="即时消息..." name="Instant Message..." tool_tip="即时通信"/>

+                        <button label="屏蔽" label_selected="屏蔽" name="Mute"/>

+                </panel>

+                <panel label="Web" name="WebProfile">

+                        <line_editor is_unicode="false" name="url_edit"/>

+                        <flyout_button label="加载" label_selected="加载" name="load" tool_tip="用内部浏览器打开这个档案页面。">

+                                <flyout_button_item name="open_item">

+                                        在外部浏览器中

+                                </flyout_button_item>

+                                <flyout_button_item name="home_item">

+                                        家连接

+                                </flyout_button_item>

+                        </flyout_button>

+                        <button label="?" label_selected="?" name="web_profile_help"/>

+                        <check_box label="自动加载网络档案" name="auto_load" tool_tip="不询问就自动加载 *所有* 网络档案。"/>

+                        <text name="status_text"/>

+                </panel>

+                <panel label="兴趣" name="Interests">

+                        <text name="I Want To:">

+                                我想要:

+                        </text>

+                        <check_box label="建造" name="chk0"/>

+                        <check_box label="探索" name="chk1"/>

+                        <check_box label="聚会" name="chk2"/>

+                        <check_box label="受雇" name="chk6"/>

+                        <check_box label="组团" name="chk3"/>

+                        <check_box label="购买" name="chk4"/>

+                        <check_box label="出售" name="chk5"/>

+                        <check_box label="雇佣" name="chk7"/>

+                        <text name="Skills:">

+                                技能：

+                        </text>

+                        <check_box label="材质" name="schk0"/>

+                        <check_box label="建筑" name="schk1"/>

+                        <check_box label="计划事件" name="schk2"/>

+                        <check_box label="建模" name="schk3"/>

+                        <check_box label="编辑脚本" name="schk4"/>

+                        <check_box label="个性化人物" name="schk5"/>

+                        <text name="Languages:">

+                                语言:

+                        </text>

+                </panel>

+                <panel label="收藏" name="Picks">

+                        <text name="Tell everyone about your favorite places in Second Life.">

+                                告诉大家你在第二人生中最喜欢的地点。

+                        </text>

+                        <button label="新建..." label_selected="新建..." name="New..."/>

+                        <button label="删除..." label_selected="删除..." name="Delete..."/>

+                        <text name="loading_text">

+                                加载...

+                        </text>

+                </panel>

+                <panel label="分类广告" name="Classified">

+                        <text name="Place an ad in Second Life&apos;s classified listings.">

+                                在第二人生的分类栏中刊登广告。

+                        </text>

+                        <button label="新建..." label_selected="新建..." name="New..."/>

+                        <button label="删除..." label_selected="删除..." name="Delete..."/>

+                        <text name="loading_text">

+                                加载...

+                        </text>

+                </panel>

+                <panel label="第一人生" name="1st Life">

+                        <text name="Photo:">

+                                照片：

+                        </text>

+                        <texture_picker label="" name="img" tool_tip="点击这里来选择图片"/>

+                        <text name="Info:">

+                                消息:

+                        </text>

+                        <text name="(250 chars)">

+                                (250个字)

+                        </text>

+                </panel>

+                <panel label="我的备注" name="My Notes">

+                        <string name="Loading">

+                                加载...

+                        </string>

+                        <text name="label">

+                                使用这块空间来记录你关于这个人的笔记。 追踪交易

+进展，合作的项目，等等。只有你可以看见这些笔记。

+你观察的人看不见，其他人也看不见。

+                        </text>

+                </panel>

+        </tab_container>

+        <button label="OK" label_selected="OK" name="OK"/>

+        <button label="取消" label_selected="取消" name="Cancel"/>

+        <button label="踢人" label_selected="踢人" name="Kick"/>

+        <button label="锁定" label_selected="锁定" name="Freeze" tool_tip="停止此居民的现有动作和对话。"/>

+        <button label="解锁" label_selected="解锁" name="Unfreeze" tool_tip="解除冻结的居民。"/>

+        <button label="CSR" label_selected="CSR" name="csr_btn" tool_tip="对此位居民开启顾客服务工具。"/>

+        <string name="ShowOnMapNonFriend">

+                在地图上显示位置。

+由于你和它们之间没有友谊关系，所以刚才的操作无效。

+        </string>

+        <string name="ShowOnMapFriendOffline">

+                在地图上显示位置。

+由于对方不在线，刚才的操作无效。

+        </string>

+        <string name="ShowOnMapFriendOnline">

+                在地图上显示位置。

+        </string>

+        <string name="TeleportGod">

+                强制瞬间移动到你的位置。

+        </string>

+        <string name="TeleportPrelude">

+                邀请瞬间移动到你所在的位置。但当你离开方位岛时，此项功能才可用。

+        </string>

+        <string name="TeleportNormal">

+                邀请瞬间移动到你所在的位置。

+        </string>

+        <string name="Loading">

+                加载...

+        </string>

+</panel>