Andrew's git / gitweb.git / diff
?
l10n: de.po: translation fix for fall-back to 3way merge
authorMichael J Gruber <git@drmicha.warpmail.net>
Tue, 19 May 2015 08:51:34 +0000 (10:51 +0200)
committerRalf Thielow <ralf.thielow@gmail.com>
Fri, 12 Jun 2015 18:40:04 +0000 (20:40 +0200)
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>
po/de.po patch | blob | history
diff --git a/po/de.po b/po/de.po
index a1274cf0ced8d530c718952d49e22a05811912cc..7d603c26026bf9c2104efb2626e39d8e09bc1cba 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -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."