merge changes for social-473

.hgtags

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

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

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

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

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

...a/newview/skins/default/xui/de/panel_avatar_list_item.xml

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

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

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

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

...newview/skins/default/xui/de/panel_preferences_colors.xml

...ewview/skins/default/xui/de/panel_preferences_privacy.xml

.../newview/skins/default/xui/de/panel_preferences_setup.xml

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

indra/newview/skins/default/xui/es/floater_web_content.xml

indra/newview/skins/default/xui/es/menu_login.xml

indra/newview/skins/default/xui/es/menu_mini_map.xml

indra/newview/skins/default/xui/es/menu_viewer.xml

indra/newview/skins/default/xui/es/notifications.xml