mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-26 09:26:37 +02:00
Code

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>
This commit is contained in:
Michael J Gruber 2015-05-19 10:51:34 +02:00 committed by Ralf Thielow
parent 47a1657ab9
commit a9845c5f50
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
po/de.po
View File

@ -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."