From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 May 2012 18:47:49 +0000 (-0700)
Subject: Merge branch 'maint' of git://github.com/git-l10n/git-po into maint
X-Git-Tag: v1.7.10.3~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0b9f4b63a0c1ff351415a1f41dfcbc2461c65e74;p=git.git

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

By Ralf Thielow (6) and others
via Jiang Xin
* 'maint' of git://github.com/git-l10n/git-po:
  l10n: zh_CN.po: translate 1 new message
  l10n: de.po: translate one new message
  l10n: de.po: unify translation of "ahead" and "behind"
  l10n: de.po: collection of improvements
  l10n: de.po: translate "remote" as "extern"
  l10n: de.po: translate "track" as "beobachten"
  l10n: add new members to German translation team
  l10n: de.po: collection of suggestions
  l10n: de.po: translate "bad" as "ungültig" ("invalid")
  l10n: de.po: hopefully uncontroversial fixes
  l10n: de.po: translate "bare" as "bloß"
  l10n: Update git.pot (1 new messages)
---

0b9f4b63a0c1ff351415a1f41dfcbc2461c65e74