Merge

indra/llxuixml/lltrans.cpp

indra/media_plugins/winmmshim/CMakeLists.txt

indra/newview/app_settings/CA.pem

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_minimal.xml

indra/newview/llbottomtray.cpp

indra/newview/llnavigationbar.cpp

indra/newview/llviewermedia.cpp

indra/newview/llviewermenu.cpp

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

indra/newview/skins/minimal/xui/en/floater_camera.xml

indra/newview/skins/minimal/xui/en/inspect_object.xml

indra/newview/skins/minimal/xui/en/main_view.xml

...newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml

...newview/skins/minimal/xui/en/menu_inspect_object_gear.xml

.../newview/skins/minimal/xui/en/notification_visibility.xml

indra/newview/skins/minimal/xui/en/panel_bottomtray.xml

indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml