Settings: fix error packages

Change-Id: Id726344c5e05372f3fb0d2175ef4116252103fc6
en_GB translation (localisation)

Change-Id: I19741f48d890abfcc7e6f22a378d049530cf5900
Merge branch 'cm-11.0' into martincz
Settings: statusbar battery style

Change-Id: Ia56de7fb9827ad007ef71bf4493309a13a7ec0e5