automated merge

indra/llrender/llimagegl.cpp

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

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

indra/newview/skins/default/xui/da/floater_tos.xml

indra/newview/skins/default/xui/da/menu_profile_overflow.xml

indra/newview/skins/default/xui/da/panel_edit_pick.xml

indra/newview/skins/default/xui/da/panel_main_inventory.xml

indra/newview/skins/default/xui/da/panel_nearby_media.xml

...wview/skins/default/xui/da/panel_preferences_advanced.xml

...a/newview/skins/default/xui/da/panel_preferences_chat.xml

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

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

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

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

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

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

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

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

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

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