{"thread":{"id":"32751","subject":"[PATCH] l10n: de.po: translate 11 new messages","startedAt":"2013-01-28T06:14:59Z","lastAt":"2013-02-01T18:42:13Z","messageCount":12,"participants":["Ralf Thielow","Thomas Rast","Joachim Schmitz","Philip Oakley"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"208062","messageId":"1359353699-3987-1-git-send-email-ralf.thielow@gmail.com","threadId":"32751","inReplyTo":null,"subject":"[PATCH] l10n: de.po: translate 11 new messages","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2013-01-28T06:14:59Z","receivedAt":"2013-01-28T06:14:59Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"Translate 11 new messages came from git.pot update\nin 46bc403 (l10n: Update git.pot (11 new, 7 removed\nmessages)).\n\nSigned-off-by: Ralf Thielow \n---\n po/de.po | 37 ++++++++++++++++++-------------------\n 1 file changed, 18 insertions(+), 19 deletions(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex 3779f4c..ed8330a 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -5,7 +5,7 @@\n #\n msgid \"\"\n msgstr \"\"\n-\"Project-Id-Version: git 1.8.1\\n\"\n+\"Project-Id-Version: git 1.8.2\\n\"\n \"Report-Msgid-Bugs-To: Git Mailing List \\n\"\n \"POT-Creation-Date: 2013-01-25 12:33+0800\\n\"\n \"PO-Revision-Date: 2012-10-02 19:35+0200\\n\"\n@@ -1033,9 +1033,9 @@ msgid \"unable to access '%s': %s\"\n msgstr \"konnte nicht auf '%s' zugreifen: %s\"\n \n #: wrapper.c:423\n-#, fuzzy, c-format\n+#, c-format\n msgid \"unable to access '%s'\"\n-msgstr \"konnte nicht auf '%s' zugreifen: %s\"\n+msgstr \"konnte nicht auf '%s' zugreifen\"\n \n #: wrapper.c:434\n #, c-format\n@@ -2997,14 +2997,14 @@ msgid \"Would remove %s\\n\"\n msgstr \"Würde %s löschen\\n\"\n \n #: builtin/clean.c:26\n-#, fuzzy, c-format\n+#, c-format\n msgid \"Skipping repository %s\\n\"\n-msgstr \"ungültiges Projektarchiv '%s'\"\n+msgstr \"Überspringe Projektarchiv %s\\n\"\n \n #: builtin/clean.c:27\n-#, fuzzy, c-format\n+#, c-format\n msgid \"Would skip repository %s\\n\"\n-msgstr \"ungültiges Projektarchiv '%s'\"\n+msgstr \"Würde Projektarchiv %s überspringen\\n\"\n \n #: builtin/clean.c:28\n #, c-format\n@@ -3223,9 +3223,8 @@ msgid \"--bare and --origin %s options are incompatible.\"\n msgstr \"Die Optionen --bare und --origin %s sind inkompatibel.\"\n \n #: builtin/clone.c:708\n-#, fuzzy\n msgid \"--bare and --separate-git-dir are incompatible.\"\n-msgstr \"Die Optionen --bare und --origin %s sind inkompatibel.\"\n+msgstr \"Die Optionen --bare und --separate-git-dir sind inkompatibel.\"\n \n #: builtin/clone.c:721\n #, c-format\n@@ -5449,7 +5448,7 @@ msgstr \"zeigt Quelle\"\n \n #: builtin/log.c:104\n msgid \"Use mail map file\"\n-msgstr \"\"\n+msgstr \"verwendet \\\"mailmap\\\"-Datei\"\n \n #: builtin/log.c:105\n msgid \"decorate options\"\n@@ -5542,7 +5541,7 @@ msgstr \"beginnt die Nummerierung der Patches bei anstatt bei 1\"\n \n #: builtin/log.c:1114\n msgid \"mark the series as Nth re-roll\"\n-msgstr \"\"\n+msgstr \"kennzeichnet die Serie als n-te Fassung\"\n \n #: builtin/log.c:1116\n msgid \"Use [] instead of [PATCH]\"\n@@ -7099,6 +7098,8 @@ msgid \"\"\n \"Updates were rejected because the destination reference already exists\\n\"\n \"in the remote.\"\n msgstr \"\"\n+\"Aktualisierungen wurden zurückgewiesen, weil die Zielreferenz bereits\\n\"\n+\"im Fernarchiv existiert.\"\n \n #: builtin/push.c:269\n #, c-format\n@@ -7841,14 +7842,12 @@ msgstr \"\"\n \"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] []\"\n \n #: builtin/reset.c:26\n-#, fuzzy\n msgid \"git reset [-q] [--] ...\"\n-msgstr \"git reset [-q] [--] ...\"\n+msgstr \"git reset [-q] [--] ...\"\n \n #: builtin/reset.c:27\n-#, fuzzy\n msgid \"git reset --patch [] [--] [...]\"\n-msgstr \"git reset --patch [] [--] [...]\"\n+msgstr \"git reset --patch [] [--] [...]\"\n \n #: builtin/reset.c:33\n msgid \"mixed\"\n@@ -7916,9 +7915,9 @@ msgid \"reset HEAD but keep local changes\"\n msgstr \"setzt Zweigspitze (HEAD) zurück, behält aber lokale Änderungen\"\n \n #: builtin/reset.c:275\n-#, fuzzy, c-format\n+#, c-format\n msgid \"Failed to resolve '%s' as a valid revision.\"\n-msgstr \"Konnte '%s' nicht als gültige Referenz auflösen.\"\n+msgstr \"Konnte '%s' nicht als gültige Revision auflösen.\"\n \n #: builtin/reset.c:278 builtin/reset.c:286\n #, c-format\n@@ -7926,9 +7925,9 @@ msgid \"Could not parse object '%s'.\"\n msgstr \"Konnte Objekt '%s' nicht parsen.\"\n \n #: builtin/reset.c:283\n-#, fuzzy, c-format\n+#, c-format\n msgid \"Failed to resolve '%s' as a valid tree.\"\n-msgstr \"Konnte '%s' nicht als gültige Referenz auflösen.\"\n+msgstr \"Konnte '%s' nicht als gültigen Baum auflösen.\"\n \n #: builtin/reset.c:292\n msgid \"--patch is incompatible with --{hard,mixed,soft}\"\n-- \n1.8.1.1.439.g50a6b54\n"},{"id":"208077","messageId":"87sj5l38d6.fsf@pctrast.inf.ethz.ch","threadId":"32751","inReplyTo":"1359353699-3987-1-git-send-email-ralf.thielow@gmail.com","subject":"Re: [PATCH] l10n: de.po: translate 11 new messages","fromName":"Thomas Rast","fromEmail":"trast@inf.ethz.ch","sentAt":"2013-01-28T10:33:09Z","receivedAt":"2013-01-28T10:33:09Z","isPatch":true,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Ralf Thielow writes:\n\n> Translate 11 new messages came from git.pot update\n> in 46bc403 (l10n: Update git.pot (11 new, 7 removed\n> messages)).\n\n> #: builtin/log.c:104\n> msgid \"Use mail map file\"\n> -msgstr \"\"\n> +msgstr \"verwendet \\\"mailmap\\\"-Datei\"\n\nNote that case differs here, but it's the English one that doesn't fit\nthe pattern -- option descriptions usually start with lowercase.\n\n> #: builtin/reset.c:275\n> -#, fuzzy, c-format\n> +#, c-format\n> msgid \"Failed to resolve '%s' as a valid revision.\"\n> -msgstr \"Konnte '%s' nicht als gültige Referenz auflösen.\"\n> +msgstr \"Konnte '%s' nicht als gültige Revision auflösen.\"\n\nYou don't have \"revision\" in the glossary[1] yet. Wouldn't it be\nappropriate to treat it as \"commit\", and translate as \"Version\" to avoid\nintroducing yet another term?\n\nOr am I missing some subtle distinction between commit and revision?\n\nSince it's only a single nit, feel free to add my ack when you reroll:\n\nAcked-by: Thomas Rast \n\n\n[1] https://github.com/ralfth/git-po-de/wiki/Glossary\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"},{"id":"208089","messageId":"ke69ta$1e4$1@ger.gmane.org","threadId":"32751","inReplyTo":"1359353699-3987-1-git-send-email-ralf.thielow@gmail.com","subject":"Re: [PATCH] l10n: de.po: translate 11 new messages","fromName":"Joachim Schmitz","fromEmail":"jojo@schmitz-digital.de","sentAt":"2013-01-28T16:39:27Z","receivedAt":"2013-01-28T16:39:27Z","isPatch":true,"sender":{"key":"jojo@schmitz-digital.de","avatar":"https://avatars.githubusercontent.com/u/1786669?v=4"},"body":"Ralf Thielow wrote:\n> Translate 11 new messages came from git.pot update\n> in 46bc403 (l10n: Update git.pot (11 new, 7 removed\n> messages)).\n>\n> Signed-off-by: Ralf Thielow \n> ---\n> po/de.po | 37 ++++++++++++++++++-------------------\n> 1 file changed, 18 insertions(+), 19 deletions(-)\n>\n> diff --git a/po/de.po b/po/de.po\n> index 3779f4c..ed8330a 100644\n> --- a/po/de.po\n> +++ b/po/de.po\n> @@ -5,7 +5,7 @@\n> #\n> msgid \"\"\n> msgstr \"\"\n> -\"Project-Id-Version: git 1.8.1\\n\"\n> +\"Project-Id-Version: git 1.8.2\\n\"\n\nNot \"Projekt-Id-Version ...\"?\n\n> #: builtin/reset.c:33\n> msgid \"mixed\"\n> @@ -7916,9 +7915,9 @@ msgid \"reset HEAD but keep local changes\"\n> msgstr \"setzt Zweigspitze (HEAD) zurück, behält aber lokale\n> Änderungen\"\n\nNot \"reset -> setze\" and \"keep\" -> halte (imperativ)?\nOr is the enlish text wrong and should be \"resets\" and \"keeps\"\n\nBye, Jojo \n"},{"id":"208095","messageId":"20130128175514.GA2926@rath-ubuntu","threadId":"32751","inReplyTo":"87sj5l38d6.fsf@pctrast.inf.ethz.ch","subject":"Re: [PATCH] l10n: de.po: translate 11 new messages","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2013-01-28T17:55:14Z","receivedAt":"2013-01-28T17:55:14Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"On Mon, Jan 28, 2013 at 11:33:09AM +0100, Thomas Rast wrote:\n> Ralf Thielow writes:\n> \n> > #: builtin/reset.c:275\n> > -#, fuzzy, c-format\n> > +#, c-format\n> > msgid \"Failed to resolve '%s' as a valid revision.\"\n> > -msgstr \"Konnte '%s' nicht als gültige Referenz auflösen.\"\n> > +msgstr \"Konnte '%s' nicht als gültige Revision auflösen.\"\n> \n> You don't have \"revision\" in the glossary[1] yet. Wouldn't it be\n> appropriate to treat it as \"commit\", and translate as \"Version\" to avoid\n> introducing yet another term?\n> \n> Or am I missing some subtle distinction between commit and revision?\n> \n\nI don't think there's a distinction. Since we've already translated\n\"revision\" as \"Revision\" in a couple of other messages, I'll make a\nnew \"s/Revision/Version\" commit on top.\n\n> Since it's only a single nit, feel free to add my ack when you reroll:\n> \n> Acked-by: Thomas Rast \n> \n> \n> [1] https://github.com/ralfth/git-po-de/wiki/Glossary\n> \n> -- \n> Thomas Rast\n> trast@{inf,student}.ethz.ch\n"},{"id":"208097","messageId":"20130128181315.GB2926@rath-ubuntu","threadId":"32751","inReplyTo":"ke69ta$1e4$1@ger.gmane.org","subject":"Re: [PATCH] l10n: de.po: translate 11 new messages","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2013-01-28T18:13:15Z","receivedAt":"2013-01-28T18:13:15Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"On Mon, Jan 28, 2013 at 05:39:27PM +0100, Joachim Schmitz wrote:\n> Ralf Thielow wrote:\n> >Translate 11 new messages came from git.pot update\n> >in 46bc403 (l10n: Update git.pot (11 new, 7 removed\n> >messages)).\n> >\n> >Signed-off-by: Ralf Thielow \n> >---\n> > po/de.po | 37 ++++++++++++++++++-------------------\n> > 1 file changed, 18 insertions(+), 19 deletions(-)\n> >\n> >diff --git a/po/de.po b/po/de.po\n> >index 3779f4c..ed8330a 100644\n> >--- a/po/de.po\n> >+++ b/po/de.po\n> >@@ -5,7 +5,7 @@\n> > #\n> > msgid \"\"\n> > msgstr \"\"\n> >-\"Project-Id-Version: git 1.8.1\\n\"\n> >+\"Project-Id-Version: git 1.8.2\\n\"\n> \n> Not \"Projekt-Id-Version ...\"?\n> \n\nI don't think that we need to translate this.\n\n> > #: builtin/reset.c:33\n> > msgid \"mixed\"\n> >@@ -7916,9 +7915,9 @@ msgid \"reset HEAD but keep local changes\"\n> > msgstr \"setzt Zweigspitze (HEAD) zurück, behält aber lokale\n> >Änderungen\"\n> \n> Not \"reset -> setze\" and \"keep\" -> halte (imperativ)?\n> Or is the enlish text wrong and should be \"resets\" and \"keeps\"\n> \n\nAll translations which describe an option shown by \"git -h\"\nare (or should be) like this. The reading is like \"This option...\"\nfollowed by such a messages. That's at least how it's done. I don't think\nit sounds bad.\n\nAccording to the glossary, the translation here is wrong because \"reset\" is\nnot \"*zurück* setzen\" but \"neu setzen\". I'll fix this (and perhaps other\nmessages) on a commit on top.\n\n> Bye, Jojo\n> \n> \n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n"},{"id":"208101","messageId":"1359398014-3325-1-git-send-email-ralf.thielow@gmail.com","threadId":"32751","inReplyTo":"1359353699-3987-1-git-send-email-ralf.thielow@gmail.com","subject":"[PATCHv2] l10n: de.po: translate 11 new messages","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2013-01-28T18:33:32Z","receivedAt":"2013-01-28T18:33:32Z","isPatch":false,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"Translate 11 new messages came from git.pot update\nin 46bc403 (l10n: Update git.pot (11 new, 7 removed\nmessages)).\n\nSigned-off-by: Ralf Thielow \nAcked-by: Thomas Rast \n---\n po/de.po | 37 ++++++++++++++++++-------------------\n 1 file changed, 18 insertions(+), 19 deletions(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex 3779f4c..ed8330a 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -5,7 +5,7 @@\n #\n msgid \"\"\n msgstr \"\"\n-\"Project-Id-Version: git 1.8.1\\n\"\n+\"Project-Id-Version: git 1.8.2\\n\"\n \"Report-Msgid-Bugs-To: Git Mailing List \\n\"\n \"POT-Creation-Date: 2013-01-25 12:33+0800\\n\"\n \"PO-Revision-Date: 2012-10-02 19:35+0200\\n\"\n@@ -1033,9 +1033,9 @@ msgid \"unable to access '%s': %s\"\n msgstr \"konnte nicht auf '%s' zugreifen: %s\"\n \n #: wrapper.c:423\n-#, fuzzy, c-format\n+#, c-format\n msgid \"unable to access '%s'\"\n-msgstr \"konnte nicht auf '%s' zugreifen: %s\"\n+msgstr \"konnte nicht auf '%s' zugreifen\"\n \n #: wrapper.c:434\n #, c-format\n@@ -2997,14 +2997,14 @@ msgid \"Would remove %s\\n\"\n msgstr \"Würde %s löschen\\n\"\n \n #: builtin/clean.c:26\n-#, fuzzy, c-format\n+#, c-format\n msgid \"Skipping repository %s\\n\"\n-msgstr \"ungültiges Projektarchiv '%s'\"\n+msgstr \"Überspringe Projektarchiv %s\\n\"\n \n #: builtin/clean.c:27\n-#, fuzzy, c-format\n+#, c-format\n msgid \"Would skip repository %s\\n\"\n-msgstr \"ungültiges Projektarchiv '%s'\"\n+msgstr \"Würde Projektarchiv %s überspringen\\n\"\n \n #: builtin/clean.c:28\n #, c-format\n@@ -3223,9 +3223,8 @@ msgid \"--bare and --origin %s options are incompatible.\"\n msgstr \"Die Optionen --bare und --origin %s sind inkompatibel.\"\n \n #: builtin/clone.c:708\n-#, fuzzy\n msgid \"--bare and --separate-git-dir are incompatible.\"\n-msgstr \"Die Optionen --bare und --origin %s sind inkompatibel.\"\n+msgstr \"Die Optionen --bare und --separate-git-dir sind inkompatibel.\"\n \n #: builtin/clone.c:721\n #, c-format\n@@ -5449,7 +5448,7 @@ msgstr \"zeigt Quelle\"\n \n #: builtin/log.c:104\n msgid \"Use mail map file\"\n-msgstr \"\"\n+msgstr \"verwendet \\\"mailmap\\\"-Datei\"\n \n #: builtin/log.c:105\n msgid \"decorate options\"\n@@ -5542,7 +5541,7 @@ msgstr \"beginnt die Nummerierung der Patches bei anstatt bei 1\"\n \n #: builtin/log.c:1114\n msgid \"mark the series as Nth re-roll\"\n-msgstr \"\"\n+msgstr \"kennzeichnet die Serie als n-te Fassung\"\n \n #: builtin/log.c:1116\n msgid \"Use [] instead of [PATCH]\"\n@@ -7099,6 +7098,8 @@ msgid \"\"\n \"Updates were rejected because the destination reference already exists\\n\"\n \"in the remote.\"\n msgstr \"\"\n+\"Aktualisierungen wurden zurückgewiesen, weil die Zielreferenz bereits\\n\"\n+\"im Fernarchiv existiert.\"\n \n #: builtin/push.c:269\n #, c-format\n@@ -7841,14 +7842,12 @@ msgstr \"\"\n \"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] []\"\n \n #: builtin/reset.c:26\n-#, fuzzy\n msgid \"git reset [-q] [--] ...\"\n-msgstr \"git reset [-q] [--] ...\"\n+msgstr \"git reset [-q] [--] ...\"\n \n #: builtin/reset.c:27\n-#, fuzzy\n msgid \"git reset --patch [] [--] [...]\"\n-msgstr \"git reset --patch [] [--] [...]\"\n+msgstr \"git reset --patch [] [--] [...]\"\n \n #: builtin/reset.c:33\n msgid \"mixed\"\n@@ -7916,9 +7915,9 @@ msgid \"reset HEAD but keep local changes\"\n msgstr \"setzt Zweigspitze (HEAD) zurück, behält aber lokale Änderungen\"\n \n #: builtin/reset.c:275\n-#, fuzzy, c-format\n+#, c-format\n msgid \"Failed to resolve '%s' as a valid revision.\"\n-msgstr \"Konnte '%s' nicht als gültige Referenz auflösen.\"\n+msgstr \"Konnte '%s' nicht als gültige Revision auflösen.\"\n \n #: builtin/reset.c:278 builtin/reset.c:286\n #, c-format\n@@ -7926,9 +7925,9 @@ msgid \"Could not parse object '%s'.\"\n msgstr \"Konnte Objekt '%s' nicht parsen.\"\n \n #: builtin/reset.c:283\n-#, fuzzy, c-format\n+#, c-format\n msgid \"Failed to resolve '%s' as a valid tree.\"\n-msgstr \"Konnte '%s' nicht als gültige Referenz auflösen.\"\n+msgstr \"Konnte '%s' nicht als gültigen Baum auflösen.\"\n \n #: builtin/reset.c:292\n msgid \"--patch is incompatible with --{hard,mixed,soft}\"\n-- \n1.8.1.1.439.g50a6b54\n"},{"id":"208102","messageId":"1359398014-3325-2-git-send-email-ralf.thielow@gmail.com","threadId":"32751","inReplyTo":"1359398014-3325-1-git-send-email-ralf.thielow@gmail.com","subject":"[PATCH] l10n: de.po: translate \"revision\" consistently as \"Version\"","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2013-01-28T18:33:33Z","receivedAt":"2013-01-28T18:33:33Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"In the German translation, we have translated \"revision\"\nas both \"Revision\" and \"Version\". In the context of version\ncontrol, revision has the same meaning as commit, so we don't\nneed to use both terms. \"revision\" is now consistently translated\nas \"Version\".\n\nSigned-off-by: Ralf Thielow \n---\n po/de.po | 16 ++++++++--------\n 1 file changed, 8 insertions(+), 8 deletions(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex ed8330a..6c7384b 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -156,7 +156,7 @@ msgstr \"Dem Projektarchiv fehlen folgende vorausgesetzte Versionen:\"\n #: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347\n #: builtin/shortlog.c:157\n msgid \"revision walk setup failed\"\n-msgstr \"Einrichtung des Revisionsgangs fehlgeschlagen\"\n+msgstr \"Einrichtung des Versionsgangs fehlgeschlagen\"\n \n #: bundle.c:186\n #, c-format\n@@ -2201,7 +2201,7 @@ msgstr \"arbeite länger, um bessere Übereinstimmungen zu finden\"\n \n #: builtin/blame.c:2380\n msgid \"Use revisions from instead of calling git-rev-list\"\n-msgstr \"Benutzt Revisionen von anstatt \\\"git-rev-list\\\" aufzurufen\"\n+msgstr \"Benutzt Versionen von anstatt \\\"git-rev-list\\\" aufzurufen\"\n \n #: builtin/blame.c:2381\n msgid \"Use 's contents as the final image\"\n@@ -2832,7 +2832,7 @@ msgstr \"\"\n \n #: builtin/checkout.c:730\n msgid \"internal error in revision walk\"\n-msgstr \"interner Fehler im Revisionsgang\"\n+msgstr \"interner Fehler im Versionsgang\"\n \n #: builtin/checkout.c:734\n msgid \"Previous HEAD position was\"\n@@ -6193,7 +6193,7 @@ msgstr \"findet Vorfahren für eine einzelne n-Wege-Zusammenführung\"\n \n #: builtin/merge-base.c:100\n msgid \"list revs not reachable from others\"\n-msgstr \"listet Revisionen auf, die nicht durch Andere erreichbar sind\"\n+msgstr \"listet Versionen auf, die nicht durch Andere erreichbar sind\"\n \n #: builtin/merge-base.c:102\n msgid \"is the first one ancestor of the other?\"\n@@ -6831,7 +6831,7 @@ msgstr \"erzeugt keine leeren Pakete\"\n \n #: builtin/pack-objects.c:2481\n msgid \"read revision arguments from standard input\"\n-msgstr \"liest Argumente bezüglich Revisionen von der Standard-Eingabe\"\n+msgstr \"liest Argumente bezüglich Versionen von der Standard-Eingabe\"\n \n #: builtin/pack-objects.c:2483\n msgid \"limit the objects to those that are not yet packed\"\n@@ -7917,7 +7917,7 @@ msgstr \"setzt Zweigspitze (HEAD) zurück, behält aber lokale Änderungen\"\n #: builtin/reset.c:275\n #, c-format\n msgid \"Failed to resolve '%s' as a valid revision.\"\n-msgstr \"Konnte '%s' nicht als gültige Revision auflösen.\"\n+msgstr \"Konnte '%s' nicht als gültige Version auflösen.\"\n \n #: builtin/reset.c:278 builtin/reset.c:286\n #, c-format\n@@ -8193,7 +8193,7 @@ msgstr \"\"\n \"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--\"\n \"current] [--color[=] | --no-color] [--sparse] [--more= | --list | --\"\n \"independent | --merge-base] [--no-name | --sha1-name] [--topics] \"\n-\"[( | )...]\"\n+\"[( | )...]\"\n \n #: builtin/show-branch.c:10\n msgid \"git show-branch (-g|--reflog)[=[,]] [--list] []\"\n@@ -9440,7 +9440,7 @@ msgstr \"Kein \\\"stash\\\" gefunden.\"\n #: git-stash.sh:359\n #, sh-format\n msgid \"Too many revisions specified: $REV\"\n-msgstr \"Zu viele Revisionen angegeben: $REV\"\n+msgstr \"Zu viele Versionen angegeben: $REV\"\n \n #: git-stash.sh:365\n #, sh-format\n-- \n1.8.1.1.439.g50a6b54\n"},{"id":"208103","messageId":"1359398014-3325-3-git-send-email-ralf.thielow@gmail.com","threadId":"32751","inReplyTo":"1359398014-3325-1-git-send-email-ralf.thielow@gmail.com","subject":"[PATCH] l10n: de.po: translate \"reset\" as \"neu setzen\"","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2013-01-28T18:33:34Z","receivedAt":"2013-01-28T18:33:34Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"According to the glossary, \"reset\" should be\ntranslated as \"neu setzen\" but in a couple of\nmessages we've translated it as \"zurücksetzen\".\nThis fixes that.\n\nSigned-off-by: Ralf Thielow \n---\n\nNote that the part \"neu\" is not used in any places because\nI think sometimes it sounds better without them.\n\n po/de.po | 16 ++++++++--------\n 1 file changed, 8 insertions(+), 8 deletions(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex 6c7384b..9b1f589 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -2764,7 +2764,7 @@ msgstr \"Zweigspitze (HEAD) ist jetzt bei\"\n #: builtin/checkout.c:609\n #, c-format\n msgid \"Reset branch '%s'\\n\"\n-msgstr \"Setze Zweig '%s' zurück\\n\"\n+msgstr \"Setze Zweig '%s' neu\\n\"\n \n #: builtin/checkout.c:612\n #, c-format\n@@ -2774,7 +2774,7 @@ msgstr \"Bereits auf '%s'\\n\"\n #: builtin/checkout.c:616\n #, c-format\n msgid \"Switched to and reset branch '%s'\\n\"\n-msgstr \"Gewechselt zu zurückgesetztem Zweig '%s'\\n\"\n+msgstr \"Gewechselt zu neu gesetztem Zweig '%s'\\n\"\n \n #: builtin/checkout.c:618 builtin/checkout.c:955\n #, c-format\n@@ -7900,19 +7900,19 @@ msgstr \"weniger Ausgaben, meldet nur Fehler\"\n \n #: builtin/reset.c:250\n msgid \"reset HEAD and index\"\n-msgstr \"setzt Zweigspitze (HEAD) und Bereitstellung zurück\"\n+msgstr \"setzt Zweigspitze (HEAD) und Bereitstellung neu\"\n \n #: builtin/reset.c:251\n msgid \"reset only HEAD\"\n-msgstr \"setzt nur Zweigspitze (HEAD) zurück\"\n+msgstr \"setzt nur Zweigspitze (HEAD) neu\"\n \n #: builtin/reset.c:253 builtin/reset.c:255\n msgid \"reset HEAD, index and working tree\"\n-msgstr \"setzt Zweigspitze (HEAD), Bereitstellung und Arbeitsbaum zurück\"\n+msgstr \"setzt Zweigspitze (HEAD), Bereitstellung und Arbeitsbaum neu\"\n \n #: builtin/reset.c:257\n msgid \"reset HEAD but keep local changes\"\n-msgstr \"setzt Zweigspitze (HEAD) zurück, behält aber lokale Änderungen\"\n+msgstr \"setzt Zweigspitze (HEAD) neu, behält aber lokale Änderungen\"\n \n #: builtin/reset.c:275\n #, c-format\n@@ -7952,7 +7952,7 @@ msgstr \"'%s' Zurücksetzung ist in einem bloßen Projektarchiv nicht erlaubt\"\n #: builtin/reset.c:333\n #, c-format\n msgid \"Could not reset index file to revision '%s'.\"\n-msgstr \"Konnte Bereitstellungsdatei nicht zu Version '%s' zurücksetzen.\"\n+msgstr \"Konnte Bereitstellungsdatei nicht zu Version '%s' setzen.\"\n \n #: builtin/reset.c:339\n msgid \"Unstaged changes after reset:\"\n@@ -8833,7 +8833,7 @@ msgstr \"Baut lokale Versionen auf einem aktuellerem externen Zweig neu auf\"\n #: common-cmds.h:24\n msgid \"Reset current HEAD to the specified state\"\n msgstr \"\"\n-\"Setzt die aktuelle Zweigspitze (HEAD) zu einem spezifizierten Zustand zurück\"\n+\"Setzt die aktuelle Zweigspitze (HEAD) zu einem spezifizierten Zustand\"\n \n #: common-cmds.h:25\n msgid \"Remove files from the working tree and from the index\"\n-- \n1.8.1.1.439.g50a6b54\n"},{"id":"208114","messageId":"AE5DE037F2E44705AC6716EEB19948B1@PhilipOakley","threadId":"32751","inReplyTo":"20130128175514.GA2926@rath-ubuntu","subject":"Re: [PATCH] l10n: de.po: translate 11 new messages","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.org","sentAt":null,"receivedAt":"2013-01-28T20:16:07Z","isPatch":true,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"From: \"Ralf Thielow\" \nSent: Monday, January 28, 2013 5:55 PM\n> On Mon, Jan 28, 2013 at 11:33:09AM +0100, Thomas Rast wrote:\n>> Ralf Thielow writes:\n>>\n>> > #: builtin/reset.c:275\n>> > -#, fuzzy, c-format\n>> > +#, c-format\n>> > msgid \"Failed to resolve '%s' as a valid revision.\"\n>> > -msgstr \"Konnte '%s' nicht als gültige Referenz auflösen.\"\n>> > +msgstr \"Konnte '%s' nicht als gültige Revision auflösen.\"\n>>\n>> You don't have \"revision\" in the glossary[1] yet. Wouldn't it be\n>> appropriate to treat it as \"commit\", and translate as \"Version\" to\n>> avoid\n>> introducing yet another term?\n>>\n>> Or am I missing some subtle distinction between commit and revision?\n>>\n>\n> I don't think there's a distinction.\n\nIt was a problem I had http://stackoverflow.com/a/11792712/717355\nanswered as:\n\nSee \"SPECIFYING REVISIONS\" of git rev-parse:\n\n A revision parameter typically, but not necessarily, names a \ncommit object.\n It uses what is called an extended SHA1 syntax, [and includes] various \nways to spell object names.\n\nIt had me confused for a while.\n\n> Since we've already translated\n> \"revision\" as \"Revision\" in a couple of other messages, I'll make a\n> new \"s/Revision/Version\" commit on top.\n>\n>> Since it's only a single nit, feel free to add my ack when you\n>> reroll:\n>>\n>> Acked-by: Thomas Rast \n>>\n>>\n>> [1] https://github.com/ralfth/git-po-de/wiki/Glossary\n>>\n>> -- \n>> Thomas Rast\n>> trast@{inf,student}.ethz.ch\n> --\nPhilip Oakley \n"},{"id":"208121","messageId":"F873F54C3F2C49CC9640F35F5626717B@PhilipOakley","threadId":"32751","inReplyTo":"20130128181315.GB2926@rath-ubuntu","subject":"Re: [PATCH] l10n: de.po: translate 11 new messages","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.org","sentAt":null,"receivedAt":"2013-01-28T20:51:53Z","isPatch":true,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"From: \"Ralf Thielow\" \nSent: Monday, January 28, 2013 6:13 PM\n> On Mon, Jan 28, 2013 at 05:39:27PM +0100, Joachim Schmitz wrote:\n>> Ralf Thielow wrote:\n>> >Translate 11 new messages came from git.pot update\n>> >in 46bc403 (l10n: Update git.pot (11 new, 7 removed\n>> >messages)).\n>> >\n>> >Signed-off-by: Ralf Thielow \n>> >---\n>> > po/de.po | 37 ++++++++++++++++++-------------------\n>> > 1 file changed, 18 insertions(+), 19 deletions(-)\n>> >\n>> >diff --git a/po/de.po b/po/de.po\n>> >index 3779f4c..ed8330a 100644\n>> >--- a/po/de.po\n>> >+++ b/po/de.po\n>> >@@ -5,7 +5,7 @@\n>> > #\n>> > msgid \"\"\n>> > msgstr \"\"\n>> >-\"Project-Id-Version: git 1.8.1\\n\"\n>> >+\"Project-Id-Version: git 1.8.2\\n\"\n\nJust noticing. Should this be s/git/Git/ to match the\n* ta/doc-no-small-caps (2013-01-22) 10 commits\nwhich is cooking?\n\n>>\n>> Not \"Projekt-Id-Version ...\"?\n>>\n>\n> I don't think that we need to translate this.\n>\n>> > #: builtin/reset.c:33\n>> > msgid \"mixed\"\n>> >@@ -7916,9 +7915,9 @@ msgid \"reset HEAD but keep local changes\"\n>> > msgstr \"setzt Zweigspitze (HEAD) zurück, behält aber lokale\n>> >Änderungen\"\n>>\n>> Not \"reset -> setze\" and \"keep\" -> halte (imperativ)?\n>> Or is the enlish text wrong and should be \"resets\" and \"keeps\"\n>>\n>\n> All translations which describe an option shown by \"git -h\"\n> are (or should be) like this. The reading is like \"This option...\"\n> followed by such a messages. That's at least how it's done. I don't \n> think\n> it sounds bad.\n>\n> According to the glossary, the translation here is wrong because \n> \"reset\" is\n> not \"*zurück* setzen\" but \"neu setzen\". I'll fix this (and perhaps \n> other\n> messages) on a commit on top.\n>\n>> Bye, Jojo\n\nPhilip Oakley \n"},{"id":"208157","messageId":"CAN0XMOK6PMCC-Cr9cX9a3ng6+gijAOTQf2WmxyTXXpZ2TvR3Cg@mail.gmail.com","threadId":"32751","inReplyTo":"AE5DE037F2E44705AC6716EEB19948B1@PhilipOakley","subject":"Re: [PATCH] l10n: de.po: translate 11 new messages","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2013-01-29T07:42:14Z","receivedAt":"2013-01-29T07:42:14Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"2013/1/28 Philip Oakley :\n> From: \"Ralf Thielow\" \n> Sent: Monday, January 28, 2013 5:55 PM\n>\n>> On Mon, Jan 28, 2013 at 11:33:09AM +0100, Thomas Rast wrote:\n>>>\n>>> Ralf Thielow writes:\n>>>\n>>> > #: builtin/reset.c:275\n>>> > -#, fuzzy, c-format\n>>> > +#, c-format\n>>> > msgid \"Failed to resolve '%s' as a valid revision.\"\n>>> > -msgstr \"Konnte '%s' nicht als gültige Referenz auflösen.\"\n>>> > +msgstr \"Konnte '%s' nicht als gültige Revision auflösen.\"\n>>>\n>>> You don't have \"revision\" in the glossary[1] yet. Wouldn't it be\n>>> appropriate to treat it as \"commit\", and translate as \"Version\" to\n>>> avoid\n>>> introducing yet another term?\n>>>\n>>> Or am I missing some subtle distinction between commit and revision?\n>>>\n>>\n>> I don't think there's a distinction.\n>\n>\n> It was a problem I had http://stackoverflow.com/a/11792712/717355\n> answered as:\n>\n> See \"SPECIFYING REVISIONS\" of git rev-parse:\n>\n> A revision parameter typically, but not necessarily, names a commit\n> object.\n> It uses what is called an extended SHA1 syntax, [and includes] various ways\n> to spell object names.\n>\n> It had me confused for a while.\n>\n\nThanks. So it would be a mistake to translate \"revision\" and \"commit\"\nwith the same word. This would hide the special meaning of revision and\nthe user wouldn't see that there's a difference.\n\nI'll amend the commit which unifys the translation of \"revision\" and \"commit\"\nin the way that \"revision\" will be translated as \"Revision\" in the whole file.\nI'll also update the glossary.\n\n>> Since we've already translated\n>> \"revision\" as \"Revision\" in a couple of other messages, I'll make a\n>> new \"s/Revision/Version\" commit on top.\n>>\n>>> Since it's only a single nit, feel free to add my ack when you\n>>> reroll:\n>>>\n>>> Acked-by: Thomas Rast \n>>>\n>>>\n>>> [1] https://github.com/ralfth/git-po-de/wiki/Glossary\n>>>\n>>> --\n>>> Thomas Rast\n>>> trast@{inf,student}.ethz.ch\n>>\n>> --\n>\n> Philip Oakley\n"},{"id":"208482","messageId":"1359744133-5520-1-git-send-email-ralf.thielow@gmail.com","threadId":"32751","inReplyTo":"1359398014-3325-2-git-send-email-ralf.thielow@gmail.com","subject":"[PATCH] l10n: de.po: translate \"revision\" consistently as \"Revision\"","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2013-02-01T18:42:13Z","receivedAt":"2013-02-01T18:42:13Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"In the current German translation, the word \"revision\" was\ntranslated as both \"Version\" (translation of \"commit\") and\n\"Revision\". Since a revision in Git is not necessarily a\ncommit, we should not translate it with the same word in\norder to give the user an idea that it's not necessarily\nthe same. After this commit, \"revision\" is consistently\ntranslated as \"Revision\".\n\nSigned-off-by: Ralf Thielow \n---\nThis replaces a patch [1] earlier sent to the list.\nI've also updated the glossary [2] of the German translation.\n\n[1]\nhttp://article.gmane.org/gmane.comp.version-control.git/214852\n[2]\nhttps://github.com/ralfth/git-po-de/wiki/Glossary\n\n po/de.po | 18 +++++++++---------\n 1 file changed, 9 insertions(+), 9 deletions(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex ed8330a..0a94b4b 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -4438,7 +4438,7 @@ msgid \"\"\n msgstr \"\"\n \"Kein externes Projektarchiv angegeben. Bitte geben Sie entweder eine URL\\n\"\n \"oder den Namen des externen Archivs an, von welchem neue\\n\"\n-\"Versionen angefordert werden sollen.\"\n+\"Revisionen angefordert werden sollen.\"\n \n #: builtin/fetch.c:932\n msgid \"You need to specify a tag name.\"\n@@ -4623,7 +4623,7 @@ msgstr \"\"\n \n #: builtin/grep.c:22\n msgid \"git grep [options] [-e] [...] [[--] ...]\"\n-msgstr \"git grep [Optionen] [-e] [...] [[--] ...]\"\n+msgstr \"git grep [Optionen] [-e] [...] [[--] ...]\"\n \n #: builtin/grep.c:217\n #, c-format\n@@ -5501,7 +5501,7 @@ msgstr \"ungültiges in-reply-to: %s\"\n \n #: builtin/log.c:913\n msgid \"git format-patch [options] [ | ]\"\n-msgstr \"git format-patch [Optionen] [ | ]\"\n+msgstr \"git format-patch [Optionen] [ | ]\"\n \n #: builtin/log.c:958\n msgid \"Two output directories?\"\n@@ -6193,7 +6193,7 @@ msgstr \"findet Vorfahren für eine einzelne n-Wege-Zusammenführung\"\n \n #: builtin/merge-base.c:100\n msgid \"list revs not reachable from others\"\n-msgstr \"listet Revisionen auf, die nicht durch Andere erreichbar sind\"\n+msgstr \"listet Versionen auf, die nicht durch Andere erreichbar sind\"\n \n #: builtin/merge-base.c:102\n msgid \"is the first one ancestor of the other?\"\n@@ -7952,7 +7952,7 @@ msgstr \"'%s' Zurücksetzung ist in einem bloßen Projektarchiv nicht erlaubt\"\n #: builtin/reset.c:333\n #, c-format\n msgid \"Could not reset index file to revision '%s'.\"\n-msgstr \"Konnte Bereitstellungsdatei nicht zu Version '%s' zurücksetzen.\"\n+msgstr \"Konnte Bereitstellungsdatei nicht zu Revision '%s' zurücksetzen.\"\n \n #: builtin/reset.c:339\n msgid \"Unstaged changes after reset:\"\n@@ -9053,7 +9053,7 @@ msgstr \"nicht erkannte Option: '$arg'\"\n #: git-bisect.sh:99\n #, sh-format\n msgid \"'$arg' does not appear to be a valid revision\"\n-msgstr \"'$arg' scheint keine gültige Version zu sein\"\n+msgstr \"'$arg' scheint keine gültige Revision zu sein\"\n \n #: git-bisect.sh:117\n msgid \"Bad HEAD - I need a HEAD\"\n@@ -9116,7 +9116,7 @@ msgid \"\"\n \"You need to give me at least one good and one bad revisions.\\n\"\n \"(You can use \\\"git bisect bad\\\" and \\\"git bisect good\\\" for that.)\"\n msgstr \"\"\n-\"Sie müssen mindestens eine korrekte und eine fehlerhafte Version angeben.\\n\"\n+\"Sie müssen mindestens eine korrekte und eine fehlerhafte Revision angeben.\\n\"\n \"(Sie können dafür \\\"git bisect bad\\\" und \\\"git bisect good\\\" benutzen.)\"\n \n #: git-bisect.sh:292\n@@ -9126,7 +9126,7 @@ msgid \"\"\n \"(You can use \\\"git bisect bad\\\" and \\\"git bisect good\\\" for that.)\"\n msgstr \"\"\n \"Sie müssen mit \\\"git bisect start\\\" beginnen.\\n\"\n-\"Danach müssen Sie mindestens eine korrekte und eine fehlerhafte Version \"\n+\"Danach müssen Sie mindestens eine korrekte und eine fehlerhafte Revision \"\n \"angeben.\\n\"\n \"(Sie können dafür \\\"git bisect bad\\\" und \\\"git bisect good\\\" benutzen.)\"\n \n@@ -9650,7 +9650,7 @@ msgstr \"\"\n #: git-submodule.sh:662\n #, sh-format\n msgid \"Unable to find current revision in submodule path '$sm_path'\"\n-msgstr \"Konnte aktuelle Version in Unterprojekt-Pfad '$sm_path' nicht finden\"\n+msgstr \"Konnte aktuelle Revision in Unterprojekt-Pfad '$sm_path' nicht finden\"\n \n #: git-submodule.sh:671 git-submodule.sh:695\n #, sh-format\n-- \n1.8.1.2.623.g7d3a2ef\n"}]}