Hi Ralf

Thanks a lot for your work.  Below I am pointing out several items that
actually need to be fixed in code (mostly lego messages), so it's a bit
of a TODO list and I don't mean to imply that you should fix those
before your patch goes in.

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

>  #: merge-recursive.c:497
> -#, fuzzy
>  msgid "diff setup failed"
> -msgstr "diff_setup_done fehlgeschlagen"
> +msgstr "Einrichtung der Optionen zur Bestimmung der Unterschiede "
> +"fehlgeschlagen"

That one is really unwieldy.  Judging from a cursory look at the code,
it's an internal error anyway and should probably be "BUG:
diff_setup_done failed" to begin with.

>  #: merge-recursive.c:627
>  msgid "merge-recursive: disk full?"
> -msgstr ""
> +msgstr "merge-recursive: Speicher voll?"

Maybe "Festplatte voll?" to distinguish from RAM.

The funny thing is that write_in_full() never returns 0 unless count=0:
it explicitly sets errno=ENOSPC and returns -1 if write() returned 0.
So this error will not trigger unless the caller passes in size=0, in
which case it is misguided.

>  #: merge-recursive.c:690
> -#, fuzzy, c-format
> +#, c-format
>  msgid "failed to create path '%s'%s"
> -msgstr "Konnte Verknüpfung '%s' nicht erstellen"
> +msgstr "Fehler beim Erstellen des Pfades '%s'%s"

This will need un-legoing...

>  msgid ": perhaps a D/F conflict?"
> -msgstr ""
> +msgstr ": vielleicht ein D/F-Konflikt?"

What's the terminology for conflicts in German?  For D/F, the user needs
to know the English terms.  Not that V/D would be much better.  Maybe
just spell it out.

>  #: merge-recursive.c:726
> -#, fuzzy, c-format
> +#, c-format
>  msgid "refusing to lose untracked file at '%s'"
> -msgstr "Ungültiger Modus '%s' für unbeobachtete Dateien"
> +msgstr "verweigere, da ungefolgte Dateien in '%s' verloren gehen
> würden"

Your glossary[1] says we call them "unbeobachtet"?

>  #: merge-recursive.c:1038 merge-recursive.c:1052
>  #, c-format
> @@ -437,6 +435,8 @@ msgid ""
>  "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
>  "in tree."
>  msgstr ""
> +"KONFLIKT (%s/delete): %s gelöscht in %s und %s in %s. Stand %s von %s wurde 
> "
> +"im Arbeitsbereich gelassen."

This needs de-legoification on the first and fourth %s, which can be
rename/renamed or modify/modified.  Furthermore, in line with the D/F
above, perhaps you should translate "delete"?  But I see that you have
not translated "renamed" etc. below, either.  Was that on purpose?  It
will read a bit odd as

  KONFLIKT (rename/delete): foo gelöscht in bar und renamed in quux. Stand ...

>  #: merge-recursive.c:1591
>  msgid "content"
> -msgstr ""
> +msgstr "content"
>  #: merge-recursive.c:1598
>  msgid "add/add"
> -msgstr ""
> +msgstr "add/add"
>  msgid "CONFLICT (%s): Merge conflict in %s"
> -msgstr ""
> +msgstr "KONFLIKT (%s): Zusammenführungskonflikt in %s"

More candidates for de-legoification.

>  #: merge-recursive.c:1832
>  #, c-format
>  msgid "merging of trees %s and %s failed"
> -msgstr ""
> +msgstr "zusammenführen der Bäume %s und %s fehlgeschlagen"

Capital Z?

>  #: merge-recursive.c:1862
>  #, c-format
>  msgid "Unprocessed path??? %s"
> -msgstr ""
> +msgstr " unverarbeiteter Pfad??? %s"

Stray space at the beginning.

>  #: merge-recursive.c:1918
>  #, c-format
>  msgid "found %u common ancestor(s):"
> -msgstr ""
> +msgstr "%u gemeinsame Vorgänger gefunden"

"ancestor(s)" is not listed in the glossary.  I'd personally pick
"Vorfahren" but I'm probably bikeshedding.

> +"Wenn du das Problem aufgelöst hast, führe \"git rebase --continue\" aus.\n"

Not what you are actually changing, but "resolve" (a merge conflict) is
not in the glossary.  For me

  Wenn du das Problem _gelöst_ hast...

sounds nicer.  "aufgelöst" sounds like "resolve a domain name" or such.

>  msgid "fatal: no such branch: $branch_name"
> -msgstr ""
> +msgstr "fatal: kein solcher Zweig: $branch_name"

kein Zweig $branch_name gefunden?

>  #: git-rebase.sh:474
>  msgid "Please commit or stash them."
> -msgstr ""
> +msgstr "Bitte trage die Änderungen ein oder benutze \"stash\"."

I really like this way of dodging the "stash" translation :-)

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

Thomas Rast
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to