Prefer "settings" over "preferences" in i18n (thanks @laudaka)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Merge branch 'master' of https://github.com/kontalk/androidclient