merge changes for DRTVWR-240

.hgtags

indra/newview/skins/default/xui/zh/floater_about.xml

indra/newview/skins/default/xui/zh/floater_about_land.xml

...w/skins/default/xui/zh/floater_animation_anim_preview.xml

...ew/skins/default/xui/zh/floater_animation_bvh_preview.xml

indra/newview/skins/default/xui/zh/floater_autoreplace.xml

indra/newview/skins/default/xui/zh/floater_avatar.xml

indra/newview/skins/default/xui/zh/floater_buy_currency.xml

indra/newview/skins/default/xui/zh/floater_camera.xml

indra/newview/skins/default/xui/zh/floater_chat_bar.xml

indra/newview/skins/default/xui/zh/floater_destinations.xml

indra/newview/skins/default/xui/zh/floater_fast_timers.xml

...ewview/skins/default/xui/zh/floater_hardware_settings.xml

indra/newview/skins/default/xui/zh/floater_how_to.xml

indra/newview/skins/default/xui/zh/floater_map.xml

.../newview/skins/default/xui/zh/floater_merchant_outbox.xml

indra/newview/skins/default/xui/zh/floater_model_preview.xml

indra/newview/skins/default/xui/zh/floater_moveview.xml

indra/newview/skins/default/xui/zh/floater_my_appearance.xml

indra/newview/skins/default/xui/zh/floater_my_inventory.xml