Rename the key/code we use
Merge branch 'master' into ospalh-special

Conflicts:
	downloadaudio/conflanguage.py
Fix two typos. One in a visible string, one in live code.