From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 30 Sep 2012 06:20:13 +0000 (-0700)
Subject: Merge branch 'maint' of git://github.com/git-l10n/git-po into maint
X-Git-Tag: v1.7.12.2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d4018a5e4a79d0c7f17334f0724c773cfa8acd72;p=git.git

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

Update German and Simplified Chinese translations.

* 'maint' of git://github.com/git-l10n/git-po:
  l10n: de.po: correct translation of a 'rebase' message
  l10n: Improve many translation for zh_CN
  l10n: Unify the translation for '(un)expected'
---

d4018a5e4a79d0c7f17334f0724c773cfa8acd72