From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Jan 2015 21:45:07 +0000 (-0800)
Subject: Merge git://github.com/git-l10n/git-po
X-Git-Tag: v2.3.0-rc2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d588d4d9406691692c60d96e5893d49063129dab;p=thirdparty%2Fgit.git

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

* git://github.com/git-l10n/git-po:
  l10n: correct indentation of show-branch usage
  l10n: de.po: translate 3 messages
  l10n: zh_CN: various fixes on command arguments
  l10n: vi.po(2298t): Updated 3 new strings
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 2
  l10n: git.pot: v2.3.0 round 2 (3 updated)
  l10n: de.po: translate 13 new messages
  l10n: de.po: fix typo
  l10n: de.po: translate "track" as "versionieren"
  l10n: zh_CN: translations for git v2.3.0-rc0
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 1
  l10n: vi.po(2298t): Updated and change Plural-Forms
  l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
  l10n: ca.po: various fixes
---

d588d4d9406691692c60d96e5893d49063129dab