[PATCH/RFC] l10n: de.po: translate 4 new messages

[PATCH/RFC] l10n: de.po: translate 4 new messages

[Ralf Thielow]

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

Re: [PATCH/RFC] l10n: de.po: translate 4 new messages

[Jan Engelhardt]

On Monday 2012-07-30 18:08, Ralf Thielow wrote:

>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.

Patch is fine from a translation POV;
but I wonder where my contributions had gone.
Ævar, were they ever merged?

commit 0c3db7e983a58f53cbd468e11937750e155de179
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Thu Oct 7 20:52:26 2010 +0200

    po/de.po: complete German translation
    
    Translate all 689 currently translatable messages in Git into
    German. Making the German translation 100% complete.
    
    [Ævar Arnfjörð Bjarmason: Modified by running msgmerge(1) on it to
    normalize the line wrapping, and squashed two of Jan's commits
    together]
    
    Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>

Re: [PATCH/RFC] l10n: de.po: translate 4 new messages

[Ralf Thielow]

On Tue, Jul 31, 2012 at 10:13 AM, Jan Engelhardt <jengelh@inai.de> wrote:
>
> On Monday 2012-07-30 18:08, Ralf Thielow wrote:
>
>>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.
>
> Patch is fine from a translation POV;
> but I wonder where my contributions had gone.
> Ævar, were they ever merged?
>
> commit 0c3db7e983a58f53cbd468e11937750e155de179
> Author: Jan Engelhardt <jengelh@medozas.de>
> Date:   Thu Oct 7 20:52:26 2010 +0200
>
>     po/de.po: complete German translation
>
>     Translate all 689 currently translatable messages in Git into
>     German. Making the German translation 100% complete.
>
>     [Ævar Arnfjörð Bjarmason: Modified by running msgmerge(1) on it to
>     normalize the line wrapping, and squashed two of Jan's commits
>     together]
>
>     Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
>     Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>

I didn't notice that you made a contribution to the German
translation. As described
in po/README, we have a dedicated repository on GitHub [1] which is a
fork of the
git-po repo. If you want to contribute you can fork this repo and send
a pull request,
or send a patch to the ML. Please read po/README for more informations.

[1] https://github.com/ralfth/git-po-de