From: Junio C Hamano Date: Sun, 14 Jun 2015 21:24:49 +0000 (-0700) Subject: Merge tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po into maint X-Git-Tag: v2.4.4~14 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2c185f0476bbbd3a49dee54f3b67a76d90c59091 Merge tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po into maint l10n-2.4-maint-de-updates * tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po: l10n: de.po: translation fix for fall-back to 3way merge l10n: de.po: punctuation fixes l10n: de.po: grammar fix l10n: de.po: change error message from "sagen" to "Meinten Sie" --- 2c185f0476bbbd3a49dee54f3b67a76d90c59091