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>
Michael J Gruber committed
May 19, 2015 at 10:51 UTC
a9845c5f504498644abcb5f6fd6adc2ffd076f2b
1 file changed
+1
-1
po/de.po
+1
-1
@@ -10491,7 +10491,7 @@ msgstr ""
10491
10492
#: git-am.sh:166
10493
msgid "Falling back to patching base and 3-way merge..."
10494
-msgstr "Falle zurück zum Patchen der Basis und des 3-Wege-Merges ..."
10494
+msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
10495
10496
#: git-am.sh:182
10497
msgid "Failed to merge in the changes."