From: Jiang Xin <worldhello.net@gmail.com>
Date: Sat, 16 Jun 2018 14:05:21 +0000 (+0800)
Subject: Merge branch 'master' of git://github.com/git-l10n/git-po
X-Git-Tag: v2.18.0~12^2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/19926351bcfaf8d524cbc350c09707018e782609?ds=inline;hp=--cc

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

* 'master' of git://github.com/git-l10n/git-po:
l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2
l10n: bg.po: Updated Bulgarian translation (3608t)
l10n: es.po: Spanish update for v2.18.0 round 2
l10n: git.pot: v2.18.0 round 2 (144 new, 6 removed)
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
---

19926351bcfaf8d524cbc350c09707018e782609