git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ralf Thielow <ralf.thielow@gmail.com>
To: trast@student.ethz.ch, jk@jk.gs, stimming@tuhh.de
Cc: git@vger.kernel.org, Ralf Thielow <ralf.thielow@gmail.com>
Subject: [PATCH] l10n: de.po: translate 5 messages
Date: Tue,  6 Aug 2013 20:29:54 +0200	[thread overview]
Message-ID: <1375813794-4578-1-git-send-email-ralf.thielow@gmail.com> (raw)

Translate 5 new messages came from git.pot update in b8ecf23
(l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
 po/de.po | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/po/de.po b/po/de.po
index 7599f9c..11dde11 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1210,11 +1210,10 @@ msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
 #: sequencer.c:1130
 msgid "Can't cherry-pick into empty head"
 msgstr "Kann nicht als allerersten Commit einen Cherry-Pick ausführen."
 
 #: sha1_name.c:440
-#, fuzzy
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
 "may be created by mistake. For example,\n"
 "\n"
@@ -1232,11 +1231,11 @@ msgstr ""
 "  git checkout -b $br $(git rev-parse ...)\n"
 "\n"
 "wobei \"$br\" leer ist und eine 40-Hex-Referenz erzeugt\n"
 "wurde. Bitte prüfen Sie diese Referenzen und löschen\n"
 "Sie sie gegebenenfalls. Unterdrücken Sie diese Meldung\n"
-"indem Sie \"git config advice.object_name_warning false\"\n"
+"indem Sie \"git config advice.objectNameWarning false\"\n"
 "ausführen."
 
 #: sha1_name.c:1097
 msgid "HEAD does not point to a branch"
 msgstr "HEAD zeigt auf keinen Branch"
@@ -4000,11 +3999,10 @@ msgstr ""
 "Sie fragten den jüngsten Commit nachzubessern, aber das würde diesen leer\n"
 "machen. Sie können Ihr Kommando mit --allow-empty wiederholen, oder diesen\n"
 "Commit mit \"git reset HEAD^\" vollständig entfernen.\n"
 
 #: builtin/commit.c:62
-#, fuzzy
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
 "\n"
 "    git commit --allow-empty\n"
@@ -4014,25 +4012,30 @@ msgstr ""
 "Konfliktauflösung.\n"
 "Wenn Sie dies trotzdem committen wollen, benutzen Sie:\n"
 "\n"
 "    git commit --allow-empty\n"
 "\n"
-"Andernfalls benutzen Sie bitte 'git reset'\n"
 
 #: builtin/commit.c:69
 msgid "Otherwise, please use 'git reset'\n"
-msgstr ""
+msgstr "Andernfalls benutzen Sie bitte 'git reset'\n"
 
 #: builtin/commit.c:72
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
 "    git reset\n"
 "\n"
 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
 "the remaining commits.\n"
 msgstr ""
+"Wenn Sie diesen Commit auslassen möchten, benutzen Sie:\n"
+"\n"
+"    git reset\n"
+"\n"
+"Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
+"Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
 
 #: builtin/commit.c:279
 msgid "failed to unpack HEAD tree object"
 msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD."
 
@@ -10040,11 +10043,10 @@ msgstr "\"autostash\" angewendet."
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Kann $stash_sha1 nicht speichern."
 
 #: git-rebase.sh:160
-#, fuzzy
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
-- 
1.8.2.1873.gfc589a4

             reply	other threads:[~2013-08-06 18:30 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-06 18:29 Ralf Thielow [this message]
2013-08-07  9:17 ` [PATCH] l10n: de.po: translate 5 messages Thomas Rast
2013-08-07  9:22   ` Jeff King

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=1375813794-4578-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 \
    /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).