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@xxxxxxxxxxxxxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html