merge changes for DRTVWR-205

.hgtags

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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