Skip to content

Commit

Permalink
l10n: de.po: translation fix for fall-back to 3way merge
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael J Gruber authored and Ralf Thielow committed Jun 12, 2015
1 parent 47a1657 commit a9845c5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit a9845c5

Please sign in to comment.