update from server@local.cht
Merge branch 'local.cht' into local.jap
Merge branch 'local.jap' into jap