[PATCH 3/3] l10: de.po: translation fix for fall-back to 3way merge

From: Michael J Gruber <git@drmicha.warpmail.net>
Date: May 19, 2015, 08:51 UTC
Message-ID: <d7f87b49a0d229a62f2f6c51a327c9fb98690b49.1432025365.git.git@drmicha.warpmail.net>
In-Reply-To: <cover.1432025365.git.git@drmicha.warpmail.net>

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

Notes:
    Really, it would be clearer to say "mittels 3-Wege-Merge", and
    also "using 3way merge" in the original (rather than "and").
    But I tried to stay as close as possible to both the English version
    and the existing translation.

 po/de.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/de.po b/po/de.po
index 6405f3e..b9eaa82 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."

-- 
2.4.0.rc3.332.g886447c