| commit | a9845c5f504498644abcb5f6fd6adc2ffd076f2b | |
| author | Michael J Gruber <git@drmicha.warpmail.net> | |
| Tue, 19 May 2015 08:51:34 +0000 (19 10:51 +0200) | ||
| committer | Ralf Thielow <ralf.thielow@gmail.com> | |
| Fri, 12 Jun 2015 18:40:04 +0000 (12 20:40 +0200) | ||
| tree | 4e462015fd9e005cb5e1abe1a0e56d46bb26544e | treesnapshot (tar.gz zip) |
| parent | 47a1657ab902a4cd98f34d01277246c533216beb | commitdiff |
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 <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
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 <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
| po/de.po | diffblobblamehistory |