[ticket/35] Fix language entries in acp

Also sneak in a new (tiny) feature ;D
Merge pull request #36 from dcz/ticket/35

[ticket/35] Fix language entries in acp