git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 47a1657)
l10n: de.po: translation fix for fall-back to 3way merge
authorMichael J Gruber <redacted>
Tue, 19 May 2015 08:51:34 +0000 (10:51 +0200)
committerRalf Thielow <redacted>
Fri, 12 Jun 2015 18:40:04 +0000 (20:40 +0200)
commita9845c5f504498644abcb5f6fd6adc2ffd076f2b
tree4e462015fd9e005cb5e1abe1a0e56d46bb26544etree | snapshot
parent47a1657ab902a4cd98f34d01277246c533216bebcommit | diff
l10n: de.po: translation fix for fall-back to 3way merge

The English version is correct, but misleading: It is not the 3way merge
that is being patched also, but that is being fallen back to also.

The German version translates the former meaning. Make it translate the
latter.

Signed-off-by: Michael J Gruber <redacted>
Signed-off-by: Ralf Thielow <redacted>
po/de.po diff | blob | history
git clone https://git.99rst.org/PROJECT