[Bug 2004265] keyboard layouts should use short country names (was: official name for Taiwan is wrong)