From a9845c5f504498644abcb5f6fd6adc2ffd076f2b Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 19 May 2015 10:51:34 +0200 Subject: [PATCH] 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 Signed-off-by: Ralf Thielow --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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." -- 2.39.2