From: Ralf Thielow <ralf.thielow@gmail.com>
To: trast@student.ethz.ch, jk@jk.gs, stimming@tuhh.de
Cc: git@vger.kernel.org, worldhello.net@gmail.com,
Ralf Thielow <ralf.thielow@gmail.com>
Subject: [PATCH/RFC] l10n: de.po: translate 2 new messages
Date: Wed, 5 Sep 2012 19:11:40 +0200 [thread overview]
Message-ID: <1346865100-10908-1-git-send-email-ralf.thielow@gmail.com> (raw)
Translate 2 new messages came from git.pot update in
ccfca8d (l10n: Update git.pot (2 new, 4 removed messages)).
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
Hi German l10n team,
please review this small update on German translation.
This patch here is based on a preparation commit which
just contains the "msgmerge" change.
For an easier review, I'll copy the first message in english
in this email.
The second change shows that there are some newlines, came
from 'msgmerge', on places where we don't want to have them.
I'll fix that soon.
A hint on this translation:
I've translated "See 'git help config' and search for" as
"Führe 'git help config' aus und suche nach...", not as
"Siehe 'git help config' und suche nach..." because the second
doesn't sound good to me. Perhaps someone else has a better
idea.
Thanks,
Ralf
#: builtin/push.c:151
msgid ""
"push.default is unset; its implicit value is changing in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
"and maintain the current behavior after the default changes, use:\n"
"\n"
" git config --global push.default matching\n"
"\n"
"To squelch this message and adopt the new behavior now, use:\n"
"\n"
" git config --global push.default simple\n"
"\n"
"See 'git help config' and search for 'push.default' for further "
"information.\n"
"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
"'current' instead of 'simple' if you sometimes use older versions of Git)"
po/de.po | 20 ++++++++++++++++++--
1 Datei geändert, 18 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
diff --git a/po/de.po b/po/de.po
index f3d232e..df5187e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4431,6 +4431,23 @@ msgid ""
"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
"'current' instead of 'simple' if you sometimes use older versions of Git)"
msgstr ""
+"'push.default' ist nicht gesetzt; der implizit gesetzte Wert wird in\n"
+"Git 2.0 von 'matching' nach 'simple' geändert. Um diese Meldung zu unter-\n"
+"drücken und das aktuelle Verhalten nach Änderung des Standardwertes\n"
+"beizubehalten, benutze:"
+"\n"
+" git config --global push.default matching\n"
+"\n"
+"Um diese Meldung zu unterdrücken und das neue Verhalten jetzt zu übernehmen,\n"
+"benutze:\n"
+"\n"
+" git config --global push.default simple\n"
+"\n"
+"Führe 'git help config' aus und suche nach 'push.default' für weitere "
+"Informationen.\n"
+"(Der Modus 'simple' wurde in Git 1.7.11 eingeführt. Benutze den gleichartigen"
+" Modus 'current' anstatt 'simple', falls du gelegentlich ältere Versionen von"
+" Git benutzt)"
#: builtin/push.c:199
msgid ""
@@ -4453,7 +4470,6 @@ msgstr ""
"für weitere Details."
#: builtin/push.c:212
-#, fuzzy
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. If you did not intend to push that branch, you may want to\n"
@@ -4465,7 +4481,7 @@ msgstr ""
"beabsichtigt hast, diesen Zweig zu versenden, kannst du auch den zu "
"versendenden\n"
"Zweig spezifizieren oder die Konfigurationsvariable 'push.default' zu "
-"'current'\n"
+"'simple', 'current'\n"
"oder 'upstream' setzen, um nur den aktuellen Zweig zu versenden."
#: builtin/push.c:218
--
1.7.12
next reply other threads:[~2012-09-05 17:11 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-05 17:11 Ralf Thielow [this message]
2012-09-05 17:21 ` [PATCH/RFC] l10n: de.po: translate 2 new messages Ralf Thielow
2012-09-06 16:44 ` Thomas Rast
2012-09-06 17:15 ` Ralf Thielow
2012-09-07 10:31 ` Jiang Xin
2012-09-07 16:36 ` Ralf Thielow
2012-09-07 17:05 ` Ralf Thielow
2012-09-07 17:12 ` Ralf Thielow
2012-09-07 17:44 ` Junio C Hamano
2012-09-07 19:05 ` [PATCH 0/2] multiline prefixes on messages Ralf Thielow
2012-09-07 19:05 ` [PATCH 1/2] advice: extract function to print messages with prefix Ralf Thielow
2012-09-07 19:32 ` Junio C Hamano
2012-09-07 19:56 ` Ralf Thielow
2012-09-07 20:52 ` Junio C Hamano
2012-09-07 21:09 ` Ralf Thielow
2012-09-07 21:16 ` Junio C Hamano
2012-09-07 21:20 ` Junio C Hamano
2012-09-07 19:05 ` [PATCH 2/2] i18n: mark prefix "warning:" for translation 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=1346865100-10908-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 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).