Merge gitk to pick up emergency build fix

gitk: rename zh_CN.po to zh_cn.po

Junio C Hamano committed Sep 17, 2019 at 14:59 UTC 8a3a6817e24ae1cf1fd08fb90b4a99e6817f646d

No changes.