Merge branch 'merge' of https://github.com/ChrisADR/git-po into maint
authorJiang Xin <worldhello.net@gmail.com>
Wed, 21 Feb 2018 14:22:51 +0000 (22:22 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Wed, 21 Feb 2018 14:22:51 +0000 (22:22 +0800)
* 'merge' of https://github.com/ChrisADR/git-po:
l10n: es.po: fixes to Spanish translation

Trivial merge