From: Ralf Thielow <ralf.thielow@gmail.com>
To: trast@student.ethz.ch, jk@jk.gs, stimming@tuhh.de
Cc: worldhello.net@gmail.com, git@vger.kernel.org,
Ralf Thielow <ralf.thielow@gmail.com>
Subject: [PATCH] l10n: de.po: translate one new message
Date: Mon, 6 Aug 2012 19:31:04 +0200 [thread overview]
Message-ID: <1344274264-11368-1-git-send-email-ralf.thielow@gmail.com> (raw)
In-Reply-To: <CANYiYbE-q82-BmbQ15o8S=0mS2GgURZ1qpX6E1NG80ZNgax_ow@mail.gmail.com>
Translate one new message came from git.pot update
in bb2ba06 (l10n: Update one message in git.pot).
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
Hi German l10n team,
please review also this small update of German
translation. I'll squash it with the last update
and merge the commit messages together.
Thanks,
Ralf
po/de.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/po/de.po b/po/de.po
index 2f56f3f..2739bc0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -594,11 +594,11 @@ msgid "Merging:"
msgstr "Zusammenführung:"
#: merge-recursive.c:1920
-#, fuzzy, c-format
+#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
-msgstr[0] "%u gemeinsame(n) Vorfahren gefunden"
-msgstr[1] "%u gemeinsame(n) Vorfahren gefunden"
+msgstr[0] "%u gemeinsamen Vorfahren gefunden"
+msgstr[1] "%u gemeinsame Vorfahren gefunden"
#: merge-recursive.c:1957
msgid "merge returned no commit"
--
1.7.12.rc1
prev parent reply other threads:[~2012-08-06 17:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-05 17:56 [PATCH] merge-recursive: separate message for common ancestors Ralf Thielow
2012-08-05 18:44 ` Junio C Hamano
2012-08-05 18:55 ` Ralf Thielow
2012-08-05 19:32 ` Junio C Hamano
2012-08-06 1:34 ` Jiang Xin
2012-08-06 17:04 ` Jiang Xin
2012-08-06 17:31 ` Ralf Thielow [this message]
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=1344274264-11368-1-git-send-email-ralf.thielow@gmail.com \
--to=ralf.thielow@gmail.com \
--cc=git@vger.kernel.org \
--cc=jk@jk.gs \
--cc=stimming@tuhh.de \
--cc=trast@student.ethz.ch \
--cc=worldhello.net@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.