Pushed to 2.0 + updated pot and translations