tree f16e7534f1d761c4e4e3a03fddd3494f89fbb454
parent 0ffa154b5b37396462aeff3750933f05982ace63
parent 1f6fb7ffc344e59589ac794ce7ae47ae7c2cff42
author Junio C Hamano <gitster@pobox.com> 1384284371 -0800
committer Junio C Hamano <gitster@pobox.com> 1384284371 -0800

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)