added SCOOP string to core
amalgamate cargo and fuel scoop slots to a single slot
New Multi Scoop equipment added, is a cargo + fuel scoop
Make the fuel_scoop capacity impact the scooping rate

While I was at it, I've differentiated the rates of the normal
fuel scoop equipment and the "all in one" equipment.
auto-commit: translation updates
auto-commit: translation updates
improve translation description on notoriously difficult strings
Merge branch 'Amalgamate-ship-scoops' #3267
auto-commit: translation updates
auto-commit: translation updates
auto-commit: translation updates
data/ui/InfoView/ShipInfo.lua - "None"
Merge branch 'fix_string_not_in_translationsystem'
Require OpenGL 3.1 context when opening the SDL window

Since it appears we've settled for OpenGL 3.1 and not 3.2, ask SDL for
that.
auto-commit: translation updates
clarify scoop string translation description
Merge pull request #3269 from laarmen/opengl-3.1

Require OpenGL 3.1 context when opening the SDL window
Update Changelog.txt