Remove 'After x time' as it makes no sense
Change phrasing again, add a couple more time options
Merge pull request #3516 from RavetcoFX/fix-2

Change "Lock screen when inactive" phrasing