Merged in lindenlab/viewer-lynx

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

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

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

...iew/skins/default/xui/de/floater_environment_settings.xml

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

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

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

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

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

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

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

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

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

.../newview/skins/default/xui/es/floater_edit_sky_preset.xml

...iew/skins/default/xui/es/floater_environment_settings.xml

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

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

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

.../newview/skins/default/xui/es/menu_people_nearby_view.xml

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