Merge git://github.com/git-l10n/git-po
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 May 2012 22:35:35 +0000 (15:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 May 2012 22:35:35 +0000 (15:35 -0700)
By Jiang Xin (3) and others
via Jiang Xin (3) and Ralf Thielow (1)
* git://github.com/git-l10n/git-po:
l10n: de.po: translate 3 new messages
l10n: zh_CN.po: translate 3 new messages
l10n: pt_PT.po translate new messages
l10n: Update git.pot (8 new, 4 removed messages)
l10n: Update git.pot (3 new, 2 removed messages)

Trivial merge