From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Aug 2014 22:12:58 +0000 (-0700)
Subject: Merge git://github.com/git-l10n/git-po
X-Git-Tag: v2.1.1~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c285171dacb2e3fbcb644ad16b14b2cb1875947d;p=thirdparty%2Fgit.git

Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
  l10n: de.po: improve message when switching branches
  l10n: de.po: fix typo
  po/TEAMS: Add Catalan team
  l10n: Add Catalan translation
  l10n: fr.po (2257t) update for version 2.1.0
  l10n: sv.po: Update Swedish translation (2257t0f0u)
  l10n: vi.po (2257t): Update translation
  l10n: Updated Bulgarian translation of git (2257t,0f,0u)
  l10n: zh_CN: translations for git v2.1.0-rc0
  l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)
  l10n: Updated Bulgarian translation of git (2247t,0f,0u)
  l10n: Updated Bulgarian translation of git (2228t,0f,0u)
  l10n: Fix more typos in the Swedish translations
---

c285171dacb2e3fbcb644ad16b14b2cb1875947d