From: Jiang Xin <worldhello.net@gmail.com>
Date: Sat, 6 Jan 2018 23:49:43 +0000 (+0800)
Subject: Merge branch 'master' of git://github.com/git-l10n/git-po
X-Git-Tag: v2.16.0~1^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;ds=sidebyside;h=7398243260f2f0342d9d6e7ce25a194c77741ce0;p=thirdparty%2Fgit.git

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

* 'master' of git://github.com/git-l10n/git-po:
  l10n: es.po: Update Spanish Translation v2.16.0
  l10n: fr.po v2.16.0 round 1
  l10n: bg.po: Updated Bulgarian translation (3284t)
  l10n: sv.po: Update Swedish translation (3284t0f0u)
  l10n: fr.po: "worktree list" mistranslated as prune
  l10n: git.pot: v2.16.0 round 1 (64 new, 25 removed)
  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
---

7398243260f2f0342d9d6e7ce25a194c77741ce0