From: Jiang Xin <worldhello.net@gmail.com>
Date: Sun, 31 Dec 2017 02:48:20 +0000 (+0800)
Subject: Merge branch 'maint' of git://github.com/git-l10n/git-po
X-Git-Tag: v2.16.0~1^2~13^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dd5fc1d9771ac2e83d33ec0cd8161b721b35b3ba

Merge branch 'maint' of git://github.com/git-l10n/git-po

* '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
---

dd5fc1d9771ac2e83d33ec0cd8161b721b35b3ba