Automated merge up from viewer-development into mesh-development

indra/newview/skins/default/xui/de/panel_group_notices.xml

indra/newview/skins/default/xui/en/panel_group_notices.xml

...view/skins/default/xui/en/panel_preferences_graphics1.xml

...ewview/skins/default/xui/es/floater_preview_animation.xml

...view/skins/default/xui/es/panel_preferences_graphics1.xml

...ewview/skins/default/xui/fr/floater_preview_animation.xml

indra/newview/skins/default/xui/it/panel_group_notices.xml

indra/newview/skins/default/xui/nl/panel_group_notices.xml

...ewview/skins/default/xui/pl/floater_preview_animation.xml

indra/newview/skins/default/xui/pl/panel_group_notices.xml

...ewview/skins/default/xui/pt/floater_preview_animation.xml

indra/newview/skins/default/xui/pt/panel_group_notices.xml

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

...ewview/skins/default/xui/zh/floater_animation_preview.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