Skip to content

Commit a9845c5

Browse files
Michael J Gruberralfth
authored andcommitted
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 <[email protected]> Signed-off-by: Ralf Thielow <[email protected]>
1 parent 47a1657 commit a9845c5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

po/de.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10491,7 +10491,7 @@ msgstr ""
1049110491

1049210492
#: git-am.sh:166
1049310493
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 ..."
1049510495

1049610496
#: git-am.sh:182
1049710497
msgid "Failed to merge in the changes."

0 commit comments

Comments
 (0)