Settings: Fix for Transifex

Change-Id: Iac28c7fb7427b24659542c06fb2881ebc4d3c7a5
merge remote

Change-Id: I4b5c0999aed691d83dbfec3b2a71c5b44077d60a