tree 8e011cdcc42ca5f5454a94849c1e5067fe74d68e
parent 31d69db340d3d056668cbc278abf01a0a552d9b4
parent 5b3ba7193f2f99fa1c23c1952f3e0f880e101ae2
author Junio C Hamano <gitster@pobox.com> 1348986013 -0700
committer Junio C Hamano <gitster@pobox.com> 1348986013 -0700

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'