[Merge] lp:~kelemeng/system-service/bug1036840 into lp:system-service

[Colin Watson]

Thanks, merged.  I'm also updating po/system-service.pot in the source package (cd po && intltool-update -g system-service --pot); I'm not sure if this is necessary but it seems wise to avoid confusion.
-- 
https://code.launchpad.net/~kelemeng/system-service/bug1036840/+merge/119633
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~kelemeng/system-service/bug1036840 into lp:system-service.