Re: [PATCH] l10n: de.po: translate 27 new messages
2014-02-08 20:59 GMT+01:00 David Kastrup : > Ralf Thielow writes: > >> 2014-02-08 20:22 GMT+01:00 David Kastrup : >>> "verberge keine aufgepfropften Commits" seems much more in the spirit of >>> the original terminology. "verbirgt keine Commits mit künstlichen >>> Vorgängern" is plainly wrong anyway since it is not the commits _with_ >>> grafts which are hidden but rather the commits _provided_ by grafts. >>> >> >> Maybe "verbirgt keine Commits auf Basis künstlicher Vorgänger"? > > No. If at all "Verbirgt keine künstlichen Vorgänger" or "keine > künstlichen Vorgängercommits" since the "künstlicher Vorgänger" _is_ the > commit that is hidden: the graft, if we are being totally meticulous, is > the list of artificial parents for a given commit. The option, when > activated, hides those artificial parents. > > And "Do not" is not "Does not", so "Verbirgt" seems also wrong as it > likely should be "Verberge" (imperative). But then it would depend on > the overall style in which this imperative is usually translated. > Oh, I seem to have misunderstood the thing :/ So I'd be "verbirgt keine künstlichen Vorgänger-Commits". For short descriptions of options we currently don't use the imperative. This should be changed. Thanks > -- > David Kastrup -- 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
Re: [PATCH] l10n: de.po: translate 27 new messages
Ralf Thielow writes: > 2014-02-08 20:22 GMT+01:00 David Kastrup : >> "verberge keine aufgepfropften Commits" seems much more in the spirit of >> the original terminology. "verbirgt keine Commits mit künstlichen >> Vorgängern" is plainly wrong anyway since it is not the commits _with_ >> grafts which are hidden but rather the commits _provided_ by grafts. >> > > Maybe "verbirgt keine Commits auf Basis künstlicher Vorgänger"? No. If at all "Verbirgt keine künstlichen Vorgänger" or "keine künstlichen Vorgängercommits" since the "künstlicher Vorgänger" _is_ the commit that is hidden: the graft, if we are being totally meticulous, is the list of artificial parents for a given commit. The option, when activated, hides those artificial parents. And "Do not" is not "Does not", so "Verbirgt" seems also wrong as it likely should be "Verberge" (imperative). But then it would depend on the overall style in which this imperative is usually translated. -- David Kastrup -- 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
Re: [PATCH] l10n: de.po: translate 27 new messages
2014-02-08 20:22 GMT+01:00 David Kastrup : > "verberge keine aufgepfropften Commits" seems much more in the spirit of > the original terminology. "verbirgt keine Commits mit künstlichen > Vorgängern" is plainly wrong anyway since it is not the commits _with_ > grafts which are hidden but rather the commits _provided_ by grafts. > Maybe "verbirgt keine Commits auf Basis künstlicher Vorgänger"? > -- > David Kastrup -- 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
Re: [PATCH] l10n: de.po: translate 27 new messages
Thomas Rast writes: > David Kastrup writes: > >> Thomas Rast writes: >> >>> I don't really like 'gesondert eingehängt', how about 'transplantiert' >>> instead? >> >> I suggest using the actual translation here as it is perfectly fitting >> for both literal and figurative meaning: "aufgepfropft". > > I didn't pick that one from the dictionary's suggestions because I > cannot remember ever using its original meaning. Perhaps I am moving in > the wrong circles? ;-) > > However Ralf pointed out on IRC that we actually have this already: > > #: builtin/pack-objects.c:2508 > msgid "do not hide commits by grafts" > msgstr "verbirgt keine Commits mit künstlichen Vorgängern (\"grafts\")" > > So it makes more sense to stick to that translation. "verberge keine aufgepfropften Commits" seems much more in the spirit of the original terminology. "verbirgt keine Commits mit künstlichen Vorgängern" is plainly wrong anyway since it is not the commits _with_ grafts which are hidden but rather the commits _provided_ by grafts. -- David Kastrup -- 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
Re: [PATCH] l10n: de.po: translate 27 new messages
David Kastrup writes: > Thomas Rast writes: > >> I don't really like 'gesondert eingehängt', how about 'transplantiert' >> instead? > > I suggest using the actual translation here as it is perfectly fitting > for both literal and figurative meaning: "aufgepfropft". I didn't pick that one from the dictionary's suggestions because I cannot remember ever using its original meaning. Perhaps I am moving in the wrong circles? ;-) However Ralf pointed out on IRC that we actually have this already: #: builtin/pack-objects.c:2508 msgid "do not hide commits by grafts" msgstr "verbirgt keine Commits mit künstlichen Vorgängern (\"grafts\")" So it makes more sense to stick to that translation. -- Thomas Rast t...@thomasrast.ch -- 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
Re: [PATCH] l10n: de.po: translate 27 new messages
Thomas Rast writes: > I see you are defining new glossary terms: > > shallow unvollständig > grafted gesondert eingehängt > > I guess the first one is reasonable if we don't call anything > "incomplete"? (I don't think we do, just checking.) "oberflächlich" seems better: a shallow clone is not "incomplete": the cloning process ran to completion. > I don't really like 'gesondert eingehängt', how about 'transplantiert' > instead? I suggest using the actual translation here as it is perfectly fitting for both literal and figurative meaning: "aufgepfropft". -- David Kastrup -- 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
Re: [PATCH] l10n: de.po: translate 27 new messages
I see you are defining new glossary terms: shallow unvollständig grafted gesondert eingehängt I guess the first one is reasonable if we don't call anything "incomplete"? (I don't think we do, just checking.) I don't really like 'gesondert eingehängt', how about 'transplantiert' instead? Or just say graft=Graft and use 'mit Grafts' or some similar workaround, since it is a highly specialized term. Ralf Thielow writes: > #: diff.c:113 > #, c-format > @@ -975,21 +975,23 @@ msgid "" > "There is nothing to exclude from by :(exclude) patterns.\n" > "Perhaps you forgot to add either ':/' or '.' ?" > msgstr "" > +"Es gibt nichts, was durch :(exclude) Muster ausgeschlossen wird.\n" > +"Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?" Doesn't sound right -- the original seems to describe the situation where you are using :(exclude) without any non-excluded paths, whereas the German first sentence sounds like you are using :(exclude) when it doesn't match any paths. Perhaps it works if translated very liberally: ":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n" "Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?" > #: remote.c:753 > -#, fuzzy, c-format > +#, c-format > msgid "Cannot fetch both %s and %s to %s" > -msgstr "Kann keine Commit-Beschreibung für %s bekommen" > +msgstr "Kann 'fetch' nicht für %s und %s nach %s ausführen." [...] > #: remote.c:761 > #, c-format > msgid "%s tracks both %s and %s" > -msgstr "" > +msgstr "%s folgt %s und %s" In both of these the key point is "both". Perhaps use "sowohl... als auch". > #: wt-status.c:275 > -#, fuzzy > msgid "new file" > -msgstr "neue Datei: %s" > +msgstr "neue Datei:" [...] > #: wt-status.c:285 > -#, fuzzy > msgid "typechange" > -msgstr "Typänderung: %s" > +msgstr "Typänderung:" > > #: wt-status.c:287 > -#, fuzzy > msgid "unknown" > -msgstr "unbekannt:%s" > +msgstr "unbekannt:" Do we still need the trailing colon? -- Thomas Rast t...@thomasrast.ch -- 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
Re: [PATCH] l10n: de.po: translate 27 new messages
2014/1/24 Ralf Thielow : > Translate 27 new messages came from git.pot update in > df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed). > > Signed-off-by: Ralf Thielow > --- > po/de.po | 90 > > 1 file changed, 45 insertions(+), 45 deletions(-) > > #: wt-status.c:275 > -#, fuzzy > msgid "new file" > -msgstr "neue Datei: %s" > +msgstr "neue Datei:" > > #: wt-status.c:277 > msgid "copied" > -msgstr "" > +msgstr "kopiert" > > #: wt-status.c:279 > -#, fuzzy > msgid "deleted" > msgstr "gelöscht" > > #: wt-status.c:285 > -#, fuzzy > msgid "typechange" > -msgstr "Typänderung: %s" > +msgstr "Typänderung:" > > #: wt-status.c:287 > -#, fuzzy > msgid "unknown" > -msgstr "unbekannt:%s" > +msgstr "unbekannt:" > > #: wt-status.c:289 > -#, fuzzy > msgid "unmerged" > -msgstr "zusammenführen" > +msgstr "nicht zusammengeführt" > Inconsistent ending colons, some have and some not. -- Jiang Xin -- 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
[PATCH] l10n: de.po: translate 27 new messages
Translate 27 new messages came from git.pot update in df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed). Signed-off-by: Ralf Thielow --- po/de.po | 90 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/po/de.po b/po/de.po index 9c03238..e771efd 100644 --- a/po/de.po +++ b/po/de.po @@ -442,9 +442,9 @@ msgstr[0] "vor %lu Jahr" msgstr[1] "vor %lu Jahren" #: diffcore-order.c:24 -#, fuzzy, c-format +#, c-format msgid "failed to read orderfile '%s'" -msgstr "Fehler beim Lesen des Objektes '%s'." +msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'." #: diff.c:113 #, c-format @@ -975,21 +975,23 @@ msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "" +"Es gibt nichts, was durch :(exclude) Muster ausgeschlossen wird.\n" +"Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?" #: remote.c:753 -#, fuzzy, c-format +#, c-format msgid "Cannot fetch both %s and %s to %s" -msgstr "Kann keine Commit-Beschreibung für %s bekommen" +msgstr "Kann 'fetch' nicht für %s und %s nach %s ausführen." #: remote.c:757 #, c-format msgid "%s usually tracks %s, not %s" -msgstr "" +msgstr "%s folgt üblicherweise %s, nicht %s" #: remote.c:761 #, c-format msgid "%s tracks both %s and %s" -msgstr "" +msgstr "%s folgt %s und %s" #. #. * This last possibility doesn't occur because @@ -997,9 +999,8 @@ msgstr "" #. * the end of the list. #. #: remote.c:769 -#, fuzzy msgid "Internal error" -msgstr "interner Fehler" +msgstr "Interner Fehler" #: remote.c:1871 #, c-format @@ -1575,33 +1576,28 @@ msgid "both modified:" msgstr "von beiden geändert:" #: wt-status.c:275 -#, fuzzy msgid "new file" -msgstr "neue Datei: %s" +msgstr "neue Datei:" #: wt-status.c:277 msgid "copied" -msgstr "" +msgstr "kopiert" #: wt-status.c:279 -#, fuzzy msgid "deleted" msgstr "gelöscht" #: wt-status.c:285 -#, fuzzy msgid "typechange" -msgstr "Typänderung: %s" +msgstr "Typänderung:" #: wt-status.c:287 -#, fuzzy msgid "unknown" -msgstr "unbekannt:%s" +msgstr "unbekannt:" #: wt-status.c:289 -#, fuzzy msgid "unmerged" -msgstr "zusammenführen" +msgstr "nicht zusammengeführt" #: wt-status.c:336 msgid "new commits, " @@ -1633,6 +1629,8 @@ msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" +"Ändern Sie nicht die Zeile oberhalb.\n" +"Alles unterhalb wird entfernt." #: wt-status.c:899 msgid "You have unmerged paths." @@ -3991,14 +3989,14 @@ msgid "reference repository '%s' is not a local repository." msgstr "Referenziertes Repository '%s' ist kein lokales Repository." #: builtin/clone.c:256 -#, fuzzy, c-format +#, c-format msgid "reference repository '%s' is shallow" -msgstr "Referenziertes Repository '%s' ist kein lokales Repository." +msgstr "Referenziertes Repository '%s' ist unvollständig (shallow)." #: builtin/clone.c:259 -#, fuzzy, c-format +#, c-format msgid "reference repository '%s' is grafted" -msgstr "referenziert Repository" +msgstr "Referenziertes Repository '%s' ist gesondert eingehängt (graft)." #: builtin/clone.c:321 #, c-format @@ -4099,16 +4097,16 @@ msgstr "" #: builtin/clone.c:805 msgid "source repository is shallow, ignoring --local" -msgstr "" +msgstr "Quelle ist ein unvollständiges Repository (shallow), ignoriere --local" #: builtin/clone.c:810 msgid "--local is ignored" msgstr "--local wird ignoriert" #: builtin/clone.c:814 builtin/fetch.c:1119 -#, fuzzy, c-format +#, c-format msgid "depth %s is not a positive number" -msgstr "Objekt %s ist kein Blob" +msgstr "Tiefe %s ist keine positive Zahl" #: builtin/clone.c:824 #, c-format @@ -5215,9 +5213,8 @@ msgid "default mode for recursion" msgstr "Standard-Modus für Rekursion" #: builtin/fetch.c:109 -#, fuzzy msgid "accept refs that update .git/shallow" -msgstr "Konnte aktualisierte .gitmodules-Datei nicht lesen" +msgstr "akzeptiert Referenzen die .git/shallow aktualisieren" #: builtin/fetch.c:347 msgid "Couldn't find remote ref HEAD" @@ -5287,7 +5284,8 @@ msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" #: builtin/fetch.c:579 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "" +msgstr "%s wurde zurückgewiesen, da Ursprungs-Commits von unvollständigen\n" +"Repositories (shallow) nicht aktualisiert werden dürfen." #: builtin/fetch.c:667 builtin/fetch.c:750 #, c-format @@ -7181,9 +7179,8 @@ msgid "git merge-base --is-ancestor " msgstr "git merge-base --is-ancestor " #: builtin/merge-base.c:33 -#, fuzzy msgid "git merge-base --fork-point []" -msgstr "git merge-base --is-ancestor " +msgstr "git merge-base --fork-point []" #: builtin/merge-base.c:214 msgid "output all common ancestors" @@ -7203,7 +7200,7 @@ msgstr "ist der Erste ein Vorgänger-Commit von dem Anderen?" #: builtin/merge-base.c:222 msgid "find where
