Fixes #562 & updated zh-HK locale

Re-PR, didn't notice master was chosen.