Redesigned options in power/screen modules (wording/layout not final yet)
Improved the layout of the screen module
Cinnamon Settings, power module: Don't show battery/lid info on desktops with no battery/lid
Fixed typos in previous commit
Settings: Layout and fixes in power module
More fixes in cs_power.py
Power module: Fixed widgets not showing when leaving/returning to module
User Details module: fixed Gio warning
Fix regression from:

https://github.com/linuxmint/Cinnamon/commit/3515b554d5f9cd410c9bc9f533c75d171af0b57b
Update desktop files for cinnamon-settings
Settings: Rephrased lock-enabled and lock-delay options
Merge branch 'master' of github.com:linuxmint/Cinnamon
Makepot