[RFC] l10n: de.po: translate 29 new messages

[RFC] l10n: de.po: translate 29 new messages

[Ralf Thielow]

Translate 29 new messages came from git.pot update
in 11b9017 (l10n: Update git.pot (29 new messages)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---

Hi German translation team,

please review this update of German translation.
This patch might not be applicable directly because
it's based on a preparation commit which just contains
changes of "msgmerge". After this patch passed the
review, i'll merge them together.

Thanks,
Ralf

 po/de.po | 92 +++++++++++++++++++++++++++-------------------------------------
 1 Datei geändert, 38 Zeilen hinzugefügt(+), 54 Zeilen entfernt(-)

diff --git a/po/de.po b/po/de.po
index 96b993b..0cbcd64 100644
--- a/po/de.po
+++ b/po/de.po
@@ -71,9 +71,8 @@ msgstr[0] "Das Paket enthält %d Referenz"
 msgstr[1] "Das Paket enthält %d Referenzen"
 
 #: bundle.c:192
-#, fuzzy
 msgid "The bundle records a complete history."
-msgstr "Das Paket benötigt diese Referenz"
+msgstr "Das Paket speichert eine komplette Historie."
 
 #: bundle.c:195
 #, c-format
@@ -696,11 +695,8 @@ msgstr ""
 "Bereitstellung)"
 
 #: wt-status.c:174
-#, fuzzy
 msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr ""
-"  (benutze \"git add/rm <Datei>...\" um die Auflösung entsprechend zu "
-"markieren)"
+msgstr "  (benutze \"git add/rm <Datei>...\" um die Auflösung zu markieren)"
 
 #: wt-status.c:176 wt-status.c:180
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
@@ -709,11 +705,8 @@ msgstr ""
 "markieren)"
 
 #: wt-status.c:178
-#, fuzzy
 msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr ""
-"  (benutze \"git add/rm <Datei>...\" um die Auflösung entsprechend zu "
-"markieren)"
+msgstr "  (benutze \"git add/rm <Datei>...\" um die Auflösung zu markieren)"
 
 #: wt-status.c:189
 msgid "Changes to be committed:"
@@ -844,112 +837,104 @@ msgid "bug: unhandled diff status %c"
 msgstr "Fehler: unbehandelter Differenz-Status %c"
 
 #: wt-status.c:786
-#, fuzzy
 msgid "You have unmerged paths."
-msgstr "Nicht zusammengeführte Pfade:"
+msgstr "Du hast nicht zusammengeführte Pfade."
 
 #: wt-status.c:789 wt-status.c:913
-#, fuzzy
 msgid "  (fix conflicts and run \"git commit\")"
-msgstr " (benutze \"git add\" und/oder \"git commit -a\")"
+msgstr " (behebe die Konflikte und führe \"git commit\" aus)"
 
 #: wt-status.c:792
 msgid "All conflicts fixed but you are still merging."
-msgstr ""
+msgstr "Alle Konflikte sind behoben, aber du bist immer noch beim "
+"Zusammenführen."
 
 #: wt-status.c:795
-#, fuzzy
 msgid "  (use \"git commit\" to conclude merge)"
-msgstr ""
-"Zusammenführung wurde nicht eingetragen; benutze 'git commit' um die "
-"Zusammenführung abzuschließen.\n"
+msgstr "  (benutze \"git commit\" um die Zusammenführung abzuschließen)"
 
 #: wt-status.c:805
-#, fuzzy
 msgid "You are in the middle of an am session."
-msgstr "Eine Zusammenführung ist im Gange -- kann nicht nachbessern."
+msgstr "Eine \"am\"-Sitzung ist im Gange."
 
 #: wt-status.c:808
 msgid "The current patch is empty."
-msgstr ""
+msgstr "Der aktuelle Patch ist leer."
 
 #: wt-status.c:812
 msgid "  (fix conflicts and then run \"git am --resolved\")"
-msgstr ""
+msgstr "  (behebe die Konflikte und führe dann \"git am --resolved\" aus)"
 
 #: wt-status.c:814
-#, fuzzy
 msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr " (benutze \"git add\" zum Beobachten)"
+msgstr " (benutze \"git am --skip\" um diesen Patch auszulassen)"
 
 #: wt-status.c:816
 msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr ""
+msgstr "  (benutze \"git am --abort\" um den ursprünglichen Zweig "
+"wiederherzustellen)"
 
 #: wt-status.c:874 wt-status.c:884
-#, fuzzy
 msgid "You are currently rebasing."
-msgstr "Du befindest dich auf keinem Zweig."
+msgstr "Du bist gerade beim Neuaufbau."
 
 #: wt-status.c:877
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr ""
+msgstr "  (behebe die Konflikte und führe dann \"git rebase --continue\" aus)"
 
 #: wt-status.c:879
-#, fuzzy
 msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr ""
-"  (benutze \"git reset %s <Datei>...\" zum Herausnehmen aus der "
-"Bereitstellung)"
+msgstr "  (benutze \"git rebase --skip\" um diesen Patch auszulassen)"
 
 #: wt-status.c:881
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr ""
+msgstr "  (benutze \"git rebase --abort\" um den ursprünglichen Zweig "
+"auszuchecken)"
 
 #: wt-status.c:887
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr ""
+msgstr "  (alle Konflikte behoben: führe \"git rebase --continue\" aus)"
 
 #: wt-status.c:889
 msgid "You are currently splitting a commit during a rebase."
-msgstr ""
+msgstr "Du teilst gerade eine Version während eines Neuaufbaus auf."
 
 #: wt-status.c:892
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr ""
+msgstr "  (Sobald dein Arbeitsverzeichnis sauber ist, führe "
+"\"git rebase --continue\" aus)"
 
 #: wt-status.c:894
-#, fuzzy
 msgid "You are currently editing a commit during a rebase."
-msgstr ""
-"Kann keine partielle Eintragung durchführen, während eine Zusammenführung im "
-"Gange ist."
+msgstr "Du editierst gerade eine Version während eines Neuaufbaus."
 
 #: wt-status.c:897
 msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr ""
+msgstr "  (benutze \"git commit --amend\" um die aktuelle Version "
+"nachzubessern)"
 
 #: wt-status.c:899
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr ""
+msgstr "  (benutze \"git rebase --continue\" sobald deine Änderungen "
+"abgeschlossen sind)"
 
 #: wt-status.c:909
 msgid "You are currently cherry-picking."
-msgstr ""
+msgstr "Du führst gerade \"cherry-pick\" aus."
 
 #: wt-status.c:916
 msgid "  (all conflicts fixed: run \"git commit\")"
-msgstr ""
+msgstr "  (alle Konflikte behoben: führe \"git commit\" aus)"
 
 #: wt-status.c:925
-#, fuzzy
 msgid "You are currently bisecting."
-msgstr "Wir sind nicht beim Halbieren."
+msgstr "Du bist gerade beim Halbieren."
 
 #: wt-status.c:928
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr ""
+msgstr "  (benutze \"git bisect reset\" um zum ursprünglichen Zweig "
+"zurückzukehren)"
 
 #: wt-status.c:979
 msgid "On branch "
@@ -3175,9 +3160,9 @@ msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
 
 #: builtin/index-pack.c:649 builtin/pack-objects.c:170
 #: builtin/pack-objects.c:262
-#, fuzzy, c-format
+#, c-format
 msgid "unable to read %s"
-msgstr "konnte %s nicht schreiben"
+msgstr "kann %s nicht lesen"
 
 #: builtin/index-pack.c:715
 #, c-format
@@ -3228,9 +3213,8 @@ msgid "pack has junk at the end"
 msgstr "Paketende enthält nicht verwendbaren Inhalt"
 
 #: builtin/index-pack.c:1028
-#, fuzzy
 msgid "confusion beyond insanity in parse_pack_objects()"
-msgstr "Fehler beim Auflösen der Unterschiede"
+msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
 
 #: builtin/index-pack.c:1051
 msgid "Resolving deltas"
@@ -4066,9 +4050,9 @@ msgid "Unknown subcommand: %s"
 msgstr "Unbekanntes Unterkommando: %s"
 
 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
-#, fuzzy, c-format
+#, c-format
 msgid "deflate error (%d)"
-msgstr "Fehler am anderen Ende: %s"
+msgstr "Fehler beim Komprimieren (%d)"
 
 #: builtin/pack-objects.c:2398
 #, c-format
-- 
1.7.11.1

Re: [RFC] l10n: de.po: translate 29 new messages

[Christian Stimming]

Hi Ralf,

very good. I have a few remarks, though, on particularly chosen word 
translations:

Am Dienstag, 3. Juli 2012, 19:04:46 schrieb Ralf Thielow:
>  #: wt-status.c:874 wt-status.c:884
> -#, fuzzy
>  msgid "You are currently rebasing."
> -msgstr "Du befindest dich auf keinem Zweig."
> +msgstr "Du bist gerade beim Neuaufbau."

Is "rebase" = "Neuaufbau"? My last thought on this wording was "rebase" = 
"Umpflanzen".

>  #: wt-status.c:889
>  msgid "You are currently splitting a commit during a rebase."
> -msgstr ""
> +msgstr "Du teilst gerade eine Version während eines Neuaufbaus auf."

Maybe
"Du teilst gerade eine Version auf während eines Neuaufbaus."

>  #: wt-status.c:909
>  msgid "You are currently cherry-picking."
> -msgstr ""
> +msgstr "Du führst gerade \"cherry-pick\" aus."

I thought "cherry-pick" = "pflücken", or is there a different glossary choice?

Thanks!

Christian

Re: [RFC] l10n: de.po: translate 29 new messages

[Ralf Thielow]

Hi Christian,

thanks for your review.

On Tue, Jul 3, 2012 at 10:03 PM, Christian Stimming <stimming@tuhh.de> wrote:
> Hi Ralf,

> Am Dienstag, 3. Juli 2012, 19:04:46 schrieb Ralf Thielow:
>>  #: wt-status.c:874 wt-status.c:884
>> -#, fuzzy
>>  msgid "You are currently rebasing."
>> -msgstr "Du befindest dich auf keinem Zweig."
>> +msgstr "Du bist gerade beim Neuaufbau."
>
> Is "rebase" = "Neuaufbau"? My last thought on this wording was "rebase" =
> "Umpflanzen".

According to the current state of the glossary on GitHub, "rebase" as a
verb is translated as "neu aufbauen". There are already translations using
this. For example:

#: builtin/remote.c:998
#, c-format
msgid "rebases onto remote %s"
msgstr "baut neu auf externen Zweig %s auf"

In this translation, "rebase" is used as a noun for the very first time.
So, I simply translate it with "Neuaufbau". In fact, we can use different
translations for verbs and nouns. Not really sure whether we should do this
for "rebase".

Using "Umpflanzen" for "rebase" as a noun, would result in
msgstr "Du bist gerade beim Umplanzen."
Using "Umplanzen" was a verb, would result in
msgstr "Du planzt gerade um."

For me, "Umpflanzen" sounds a bit like "working with plants
in the garden". I do not have a strong opinion on this, though.

Are there thoughts from others?

>>  #: wt-status.c:889
>>  msgid "You are currently splitting a commit during a rebase."
>> -msgstr ""
>> +msgstr "Du teilst gerade eine Version während eines Neuaufbaus auf."
>
> Maybe
> "Du teilst gerade eine Version auf während eines Neuaufbaus."
>

I don't think that this is grammatically correct.

>>  #: wt-status.c:909
>>  msgid "You are currently cherry-picking."
>> -msgstr ""
>> +msgstr "Du führst gerade \"cherry-pick\" aus."
>
> I thought "cherry-pick" = "pflücken", or is there a different glossary choice?

At the moment we do not have a translation for "cherry-pick" in the glossary.
In older parts of the translation we left it as it is, and I prefer to
follow this
for now. If we decide to translate it, we should do this in the whole
translation.
I've added your suggestion to the glossary.

Thanks,
Ralf

Re: [RFC] l10n: de.po: translate 29 new messages

[Andreas Schwab]

Ralf Thielow <ralf.thielow@gmail.com> writes:

> Hi Christian,
>
> thanks for your review.
>
> On Tue, Jul 3, 2012 at 10:03 PM, Christian Stimming <stimming@tuhh.de> wrote:
>> Hi Ralf,
>
>> Am Dienstag, 3. Juli 2012, 19:04:46 schrieb Ralf Thielow:
>>>  #: wt-status.c:874 wt-status.c:884
>>> -#, fuzzy
>>>  msgid "You are currently rebasing."
>>> -msgstr "Du befindest dich auf keinem Zweig."
>>> +msgstr "Du bist gerade beim Neuaufbau."
>>
>> Is "rebase" = "Neuaufbau"? My last thought on this wording was "rebase" =
>> "Umpflanzen".

"Basisumbau"?

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [RFC] l10n: de.po: translate 29 new messages

[Christian Stimming]

Hi Ralf,

Am Mittwoch, 4. Juli 2012, 09:20:40 schrieb Ralf Thielow:
> >> -msgstr "Du befindest dich auf keinem Zweig."
> >> +msgstr "Du bist gerade beim Neuaufbau."
> > 
> > Is "rebase" = "Neuaufbau"? My last thought on this wording was "rebase"
> > = "Umpflanzen".
> 
> According to the current state of the glossary on GitHub, "rebase" as a
> verb is translated as "neu aufbauen". There are already translations using
> this. For example:
> 
> #: builtin/remote.c:998
> #, c-format
> msgid "rebases onto remote %s"
> msgstr "baut neu auf externen Zweig %s auf"
> 
> In this translation, "rebase" is used as a noun for the very first time.
> So, I simply translate it with "Neuaufbau". In fact, we can use different
> translations for verbs and nouns. Not really sure whether we should do this
> for "rebase".
> 
> Using "Umpflanzen" for "rebase" as a noun, would result in
> msgstr "Du bist gerade beim Umplanzen."
> Using "Umplanzen" was a verb, would result in
> msgstr "Du planzt gerade um."
> 
> For me, "Umpflanzen" sounds a bit like "working with plants
> in the garden". I do not have a strong opinion on this, though.

That's true. The wording goes very far into gardening, which is an argument 
against it. An argument for it is that it consequently re-uses the tree and 
branch metaphor, which is indeed also related to gardening.

I thought "neu aufbauen" is probably useful in the context of the gc or fsck 
command... no strong opinion on this, too, though.

Thanks for the reminder of the glossary - indeed I forgot to check that first.

Regards,

Christian

Re: [RFC] l10n: de.po: translate 29 new messages

[Ralf Thielow]

>>> Is "rebase" = "Neuaufbau"? My last thought on this wording was "rebase" =
>>> "Umpflanzen".
>
> "Basisumbau"?
>

I have added both suggestions to the glossary that they don't get lost when
we discuss about non-optimal and/or missing parts within the glossary.

Ralf

Re: [RFC] l10n: de.po: translate 29 new messages

[Michael J Gruber]

Ralf Thielow venit, vidit, dixit 05.07.2012 20:16:
>>>> Is "rebase" = "Neuaufbau"? My last thought on this wording was "rebase" =
>>>> "Umpflanzen".
>>
>> "Basisumbau"?
>>
> 
> I have added both suggestions to the glossary that they don't get lost when
> we discuss about non-optimal and/or missing parts within the glossary.

Not the base is being reconstructed, but what's on top of it. So,
"Basiswechsel" would be more appropriate.

But: "Umpflanzen" is really a great term which stays within the context
of trees, roots and branches. Strictly speaking, "Umpflanzen" refers to
something you do at the root level. The corresponding action for
branches would be "Umpfropfen". I think that also conveys the effort
that is sometimes necessary ;)

Michael

Re: [RFC] l10n: de.po: translate 29 new messages

[Ralf Thielow]

On Fri, Jul 6, 2012 at 8:20 PM, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
> Ralf Thielow venit, vidit, dixit 05.07.2012 20:16:
>>>>> Is "rebase" = "Neuaufbau"? My last thought on this wording was "rebase" =
>>>>> "Umpflanzen".
>>>
>>> "Basisumbau"?
>>>
>>
>> I have added both suggestions to the glossary that they don't get lost when
>> we discuss about non-optimal and/or missing parts within the glossary.
>
> Not the base is being reconstructed, but what's on top of it. So,
> "Basiswechsel" would be more appropriate.
>

I agree with you. There is no question what it means, but what are
the best german words for it.

> But: "Umpflanzen" is really a great term which stays within the context
> of trees, roots and branches. Strictly speaking, "Umpflanzen" refers to
> something you do at the root level. The corresponding action for
> branches would be "Umpfropfen". I think that also conveys the effort
> that is sometimes necessary ;)

"Neuaufbau": it contains the concept of rebase
"Umpflanzen": it contains the concept of rebase
"Umpfropfen": Actually, this word isn't familiar to me. It's a bit
unusual, isn't it?
(but it might contains the concept of rebase)

The whole point is that the user needs to know what it actually meant
in git-context.
If a user read "sie pflanzen gerade um" or "sie pfropfen gerade um", I
don't think that
this is the best solution. I haven't said that "sie bauen gerade neu
auf" is the optimal one,
for me it's better, though.

We really need to discuss (and thats indeed also an issue on other
translation teams), which
git (or SCM) related words we shouldn't translate at all.

Thanks,
Ralf

Re: [RFC] l10n: de.po: translate 29 new messages

[Peter Baumann]

On Fri, Jul 06, 2012 at 08:58:21PM +0200, Ralf Thielow wrote:
> On Fri, Jul 6, 2012 at 8:20 PM, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
> > Ralf Thielow venit, vidit, dixit 05.07.2012 20:16:
> >>>>> Is "rebase" = "Neuaufbau"? My last thought on this wording was "rebase" =
> >>>>> "Umpflanzen".
> >>>
> >>> "Basisumbau"?
> >>>
> >>
> >> I have added both suggestions to the glossary that they don't get lost when
> >> we discuss about non-optimal and/or missing parts within the glossary.
> >
> > Not the base is being reconstructed, but what's on top of it. So,
> > "Basiswechsel" would be more appropriate.
> >
> 
> I agree with you. There is no question what it means, but what are
> the best german words for it.
> 
> > But: "Umpflanzen" is really a great term which stays within the context
> > of trees, roots and branches. Strictly speaking, "Umpflanzen" refers to
> > something you do at the root level. The corresponding action for
> > branches would be "Umpfropfen". I think that also conveys the effort
> > that is sometimes necessary ;)
> 
> "Neuaufbau": it contains the concept of rebase
> "Umpflanzen": it contains the concept of rebase
> "Umpfropfen": Actually, this word isn't familiar to me. It's a bit
> unusual, isn't it?
> (but it might contains the concept of rebase)
> 
> The whole point is that the user needs to know what it actually meant
> in git-context.
> If a user read "sie pflanzen gerade um" or "sie pfropfen gerade um", I
> don't think that
> this is the best solution. I haven't said that "sie bauen gerade neu
> auf" is the optimal one,
> for me it's better, though.
> 
> We really need to discuss (and thats indeed also an issue on other
> translation teams), which
> git (or SCM) related words we shouldn't translate at all.

I have to agree with this last sentence. Most of the git gui terms are really
not understandable to me (and even the team I introduced it too). The only way to 
actually "guess" what it means is by knowing the position of the buttons and then
getting the actual command from the position. 

AFAIK it makes no senes to translate terms like "commit" to "Abzeichen" like it is used
in git gui. I don't know *anybody* here in my IT business environment who uses this word
or even would guess what it means.  Everyone is used to the Denglisch Version "committen" 
or "einchecken".

But in case you insist of translating this word (which I wouldn't!!!),
may I toss in another suggestion: "Umsetzen"

-Peter

Re: [RFC] l10n: de.po: translate 29 new messages

[Ralf Thielow]

> AFAIK it makes no senes to translate terms like "commit" to "Abzeichen" like it is used
> in git gui. I don't know *anybody* here in my IT business environment who uses this word
> or even would guess what it means.  Everyone is used to the Denglisch Version "committen"
> or "einchecken".

As far as i can see, "Abzeichen" is only used as translation for "Sign off".
"commit" is translated as "eintragen". So i don't see what your
problem is, actually.

If you have a problem caused by translation, please send a bug-report
to the GIT ML
that we are able to detect and fix them.

Thanks

Ralf