diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2015-05-19 10:51:34 +0200 |
|---|---|---|
| committer | Ralf Thielow <ralf.thielow@gmail.com> | 2015-06-12 20:40:04 +0200 |
| commit | a9845c5f504498644abcb5f6fd6adc2ffd076f2b (patch) | |
| tree | 4e462015fd9e005cb5e1abe1a0e56d46bb26544e /po | |
| parent | 47a1657ab902a4cd98f34d01277246c533216beb (diff) | |
| download | git-a9845c5f504498644abcb5f6fd6adc2ffd076f2b.tar.gz | |
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>
Diffstat (limited to 'po')
| -rw-r--r-- | po/de.po | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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." |