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: worldhello.net@gmail.com, git@vger.kernel.org,
	Ralf Thielow <ralf.thielow@gmail.com>
Subject: [PATCH/RFC] l10n: de.po: translate 4 new messages
Date: Mon, 30 Jul 2012 18:08:56 +0200	[thread overview]
Message-ID: <1343664536-11408-1-git-send-email-ralf.thielow@gmail.com> (raw)

Translate 4 new messages came from git.pot update in 0bbe5b4
(l10n: Update git.pot (4 new, 3 removed messages)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
Hi German l10n team,

please review this small update on German
translation.

Thanks,
Ralf

 po/de.po | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/po/de.po b/po/de.po
index 0f9323d..c44cabe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: git 1.7.11\n"
+"Project-Id-Version: git 1.7.12\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 "POT-Creation-Date: 2012-07-30 09:18+0800\n"
 "PO-Revision-Date: 2012-03-28 18:46+0200\n"
@@ -1320,9 +1320,9 @@ msgid "patch failed: %s:%ld"
 msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
 
 #: builtin/apply.c:3061
-#, fuzzy, c-format
+#, c-format
 msgid "cannot checkout %s"
-msgstr "kann nicht in Verzeichnis %s wechseln"
+msgstr "kann %s nicht auschecken"
 
 #: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
 #, c-format
@@ -1330,9 +1330,9 @@ msgid "read of %s failed"
 msgstr "Konnte %s nicht lesen"
 
 #: builtin/apply.c:3139 builtin/apply.c:3361
-#, fuzzy, c-format
+#, c-format
 msgid "path %s has been renamed/deleted"
-msgstr "Patch %s wurde umbenannt/gelöscht"
+msgstr "Pfad %s wurde umbenannt/gelöscht"
 
 #: builtin/apply.c:3220 builtin/apply.c:3375
 #, c-format
@@ -1537,7 +1537,8 @@ msgstr "wendet den Patch an (Benutzung mit --stat/--summary/--check)"
 
 #: builtin/apply.c:4312
 msgid "attempt three-way merge if a patch does not apply"
-msgstr ""
+msgstr "versucht 3-Wege-Zusammenführung, wenn der Patch nicht angewendet "
+"werden konnte"
 
 #: builtin/apply.c:4314
 msgid "build a temporary index based on embedded index information"
@@ -1605,9 +1606,8 @@ msgid "prepend <root> to all filenames"
 msgstr "stellt <Wurzelverzeichnis> vor alle Dateinamen"
 
 #: builtin/apply.c:4367
-#, fuzzy
 msgid "--3way outside a repository"
-msgstr "--cached außerhalb eines Projektarchivs"
+msgstr "--3way außerhalb eines Projektarchivs"
 
 #: builtin/apply.c:4375
 msgid "--index outside a repository"
-- 
1.7.11.2

             reply	other threads:[~2012-07-30 16:09 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-30 16:08 Ralf Thielow [this message]
2012-07-31  8:13 ` [PATCH/RFC] l10n: de.po: translate 4 new messages Jan Engelhardt
2012-07-31  8:45   ` 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=1343664536-11408-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).