From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Nov 2013 19:26:11 +0000 (-0800)
Subject: Merge git://github.com/git-l10n/git-po
X-Git-Tag: v1.8.5-rc2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=706150404d42c712a1a00acf191cbe3e1c499ca2;p=git

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

* git://github.com/git-l10n/git-po:
  l10n: de.po: improve error message when pushing to unknown upstream
  l10n: de.po: translate 68 new messages
  po/TEAMS: update Thomas Rast's email address
  l10n: Update Swedish translation (2194t0f0u)
  l10n: fr.po 2194/1294 messages translated
  l10n: zh_CN.po: translate 68 messages (2194t0f0u)
  l10n: vi.po (2194t): Update and minor fix
  l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)
---

706150404d42c712a1a00acf191cbe3e1c499ca2