From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Ralf Thielow <ralf.thielow@googlemail.com>
Subject: [PATCH 3/3] l10: de.po: translation fix for fall-back to 3way merge
Date: Tue, 19 May 2015 10:51:34 +0200 [thread overview]
Message-ID: <d7f87b49a0d229a62f2f6c51a327c9fb98690b49.1432025365.git.git@drmicha.warpmail.net> (raw)
In-Reply-To: <cover.1432025365.git.git@drmicha.warpmail.net>
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>
---
Notes:
Really, it would be clearer to say "mittels 3-Wege-Merge", and
also "using 3way merge" in the original (rather than "and").
But I tried to stay as close as possible to both the English version
and the existing translation.
po/de.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/de.po b/po/de.po
index 6405f3e..b9eaa82 100644
--- 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."
--
2.4.0.rc3.332.g886447c
next prev parent reply other threads:[~2015-05-19 8:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-19 8:51 [PATCH 0/3] l10: de.po: fixes around rebase Michael J Gruber
2015-05-19 8:51 ` [PATCH 1/3] l10: de.po: grammar fix Michael J Gruber
2015-05-19 21:46 ` Stefan Beller
2015-05-20 8:55 ` Michael J Gruber
2015-05-21 20:27 ` Ralf Thielow
2015-05-19 8:51 ` [PATCH 2/3] l10: de.po: punctuation fixes Michael J Gruber
2015-05-19 8:51 ` Michael J Gruber [this message]
2015-05-19 16:26 ` [PATCH 0/3] l10: de.po: fixes around rebase Ralf Thielow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d7f87b49a0d229a62f2f6c51a327c9fb98690b49.1432025365.git.git@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=ralf.thielow@googlemail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).