Fix location strings to match Android standards

h/t maxme

fixes #1524