Changed zh_CN to just zh - this is more universal

Also, updated translation handling