Merge branch 'maint'

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

Jiang Xin committed Sep 28, 2012 at 06:53 UTC 4d8e8ed8aa130fbd7f51debbd410fd11b5dd811a

No changes.