Merged in lindenlab/viewer-lynx

indra/newview/app_settings/settings.xml

.../default/xui/de/floater_preferences_graphics_advanced.xml

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

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

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

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

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

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

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

.../default/xui/es/floater_preferences_graphics_advanced.xml

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

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

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

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

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

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

.../default/xui/fr/floater_preferences_graphics_advanced.xml

...newview/skins/default/xui/fr/menu_people_blocked_gear.xml

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

indra/newview/skins/default/xui/fr/panel_group_roles.xml