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)
commitdd5fc1d9771ac2e83d33ec0cd8161b721b35b3ba
treeab67fd2fc9afe4b7a60c1eea07c57d68a7e6f8af
parent18a9072257bba2960f8b376c40b446d576e86e95
parent765b6440273a126eafc6237e878c089ccfdf53f3
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