From: Jiang Xin <worldhello.net@gmail.com>
Date: Fri, 8 Jun 2018 01:01:56 +0000 (+0800)
Subject: Merge branch 'master' of git://github.com/git-l10n/git-po
X-Git-Tag: v2.18.0~12^2~1^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=098a3ffcd32c9acc7498ff7cd95ab47fa11eaba7;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: fr.po v2.18 round 1
  l10n: vi(3470t): Updated Vietnamese translation for v2.18.0
  l10n: es.po: Spanish update for v2.18.0 round 1
  l10n: git.pot: v2.18.0 round 1 (108 new, 14 removed)
  l10n: TEAMS: remove inactive de team members
  l10n: de.po: fix typos
  l10n: Update Catalan translation
---

098a3ffcd32c9acc7498ff7cd95ab47fa11eaba7