merge

indra/llcommon/llversionviewer.h

indra/newview/lltexturefetch.cpp

indra/newview/lltexturefetch.h

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

.../newview/skins/default/xui/pt/floater_preview_gesture.xml

indra/newview/skins/default/xui/pt/floater_world_map.xml

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

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

indra/newview/skins/default/xui/pt/panel_group_notices.xml

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

.../newview/skins/default/xui/pt/panel_preferences_sound.xml

...a/newview/skins/default/xui/pt/panel_teleport_history.xml

indra/newview/skins/default/xui/pt/sidepanel_item_info.xml

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