Merge branch 'master' of https://git.frostnerd.com/PublicAndroidApps/smokescreen into translations

2 jobs for translations in 1 minute and 5 seconds (queued for 1 minute and 28 seconds)