Merge branch 'maint' of git://github.com/git-l10n/git-po
authorJiang Xin <worldhello.net@gmail.com>
Sun, 31 Dec 2017 02:48:20 +0000 (10:48 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Sun, 31 Dec 2017 02:48:20 +0000 (10:48 +0800)
* 'maint' of git://github.com/git-l10n/git-po:
l10n: fixes to German translation
l10n: Update Spanish translation
l10n: zh_CN translate parameter name
l10n: zh_CN Fix typo
l10n: Fixes to Catalan translation

Trivial merge