fix #9108 - typos (also see [o29957])

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6255 0c6e7542-c601-0410-84e7-c038aed88b3b
see #9094 - add context to some keys

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6256 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror