From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Tue, 19 May 2015 08:51:34 +0000 (+0200)
Subject: l10n: de.po: translation fix for fall-back to 3way merge
X-Git-Tag: v2.4.4~14^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9845c5f504498644abcb5f6fd6adc2ffd076f2b;p=thirdparty%2Fgit.git

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>
---

diff --git a/po/de.po b/po/de.po
index a1274cf0ce..7d603c2602 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10491,7 +10491,7 @@ msgstr ""
 
 #: git-am.sh:166
 msgid "Falling back to patching base and 3-way merge..."
-msgstr "Falle zurück zum Patchen der Basis und des 3-Wege-Merges ..."
+msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
 
 #: git-am.sh:182
 msgid "Failed to merge in the changes."