* [PATCH] l10n: de.po: translate 11 new messages
@ 2013-01-28 6:14 Ralf Thielow
2013-01-28 10:33 ` Thomas Rast
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Ralf Thielow @ 2013-01-28 6:14 UTC (permalink / raw)
To: trast, jk, stimming; +Cc: git, Ralf Thielow
Translate 11 new messages came from git.pot update
in 46bc403 (l10n: Update git.pot (11 new, 7 removed
messages)).
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
po/de.po | 37 ++++++++++++++++++-------------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/po/de.po b/po/de.po
index 3779f4c..ed8330a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git 1.8.1\n"
+"Project-Id-Version: git 1.8.2\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2013-01-25 12:33+0800\n"
"PO-Revision-Date: 2012-10-02 19:35+0200\n"
@@ -1033,9 +1033,9 @@ msgid "unable to access '%s': %s"
msgstr "konnte nicht auf '%s' zugreifen: %s"
#: wrapper.c:423
-#, fuzzy, c-format
+#, c-format
msgid "unable to access '%s'"
-msgstr "konnte nicht auf '%s' zugreifen: %s"
+msgstr "konnte nicht auf '%s' zugreifen"
#: wrapper.c:434
#, c-format
@@ -2997,14 +2997,14 @@ msgid "Would remove %s\n"
msgstr "Würde %s löschen\n"
#: builtin/clean.c:26
-#, fuzzy, c-format
+#, c-format
msgid "Skipping repository %s\n"
-msgstr "ungültiges Projektarchiv '%s'"
+msgstr "Überspringe Projektarchiv %s\n"
#: builtin/clean.c:27
-#, fuzzy, c-format
+#, c-format
msgid "Would skip repository %s\n"
-msgstr "ungültiges Projektarchiv '%s'"
+msgstr "Würde Projektarchiv %s überspringen\n"
#: builtin/clean.c:28
#, c-format
@@ -3223,9 +3223,8 @@ msgid "--bare and --origin %s options are incompatible."
msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
#: builtin/clone.c:708
-#, fuzzy
msgid "--bare and --separate-git-dir are incompatible."
-msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
+msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
#: builtin/clone.c:721
#, c-format
@@ -5449,7 +5448,7 @@ msgstr "zeigt Quelle"
#: builtin/log.c:104
msgid "Use mail map file"
-msgstr ""
+msgstr "verwendet \"mailmap\"-Datei"
#: builtin/log.c:105
msgid "decorate options"
@@ -5542,7 +5541,7 @@ msgstr "beginnt die Nummerierung der Patches bei <n> anstatt bei 1"
#: builtin/log.c:1114
msgid "mark the series as Nth re-roll"
-msgstr ""
+msgstr "kennzeichnet die Serie als n-te Fassung"
#: builtin/log.c:1116
msgid "Use [<prefix>] instead of [PATCH]"
@@ -7099,6 +7098,8 @@ msgid ""
"Updates were rejected because the destination reference already exists\n"
"in the remote."
msgstr ""
+"Aktualisierungen wurden zurückgewiesen, weil die Zielreferenz bereits\n"
+"im Fernarchiv existiert."
#: builtin/push.c:269
#, c-format
@@ -7841,14 +7842,12 @@ msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Version>]"
#: builtin/reset.c:26
-#, fuzzy
msgid "git reset [-q] <tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <Version> [--] <Pfade>..."
+msgstr "git reset [-q] <Versionsreferenz> [--] <Pfade>..."
#: builtin/reset.c:27
-#, fuzzy
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<Version>] [--] [<Pfade>...]"
+msgstr "git reset --patch [<Versionsreferenz>] [--] [<Pfade>...]"
#: builtin/reset.c:33
msgid "mixed"
@@ -7916,9 +7915,9 @@ msgid "reset HEAD but keep local changes"
msgstr "setzt Zweigspitze (HEAD) zurück, behält aber lokale Änderungen"
#: builtin/reset.c:275
-#, fuzzy, c-format
+#, c-format
msgid "Failed to resolve '%s' as a valid revision."
-msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
+msgstr "Konnte '%s' nicht als gültige Revision auflösen."
#: builtin/reset.c:278 builtin/reset.c:286
#, c-format
@@ -7926,9 +7925,9 @@ msgid "Could not parse object '%s'."
msgstr "Konnte Objekt '%s' nicht parsen."
#: builtin/reset.c:283
-#, fuzzy, c-format
+#, c-format
msgid "Failed to resolve '%s' as a valid tree."
-msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
+msgstr "Konnte '%s' nicht als gültigen Baum auflösen."
#: builtin/reset.c:292
msgid "--patch is incompatible with --{hard,mixed,soft}"
--
1.8.1.1.439.g50a6b54
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] l10n: de.po: translate 11 new messages
2013-01-28 6:14 [PATCH] l10n: de.po: translate 11 new messages Ralf Thielow
@ 2013-01-28 10:33 ` Thomas Rast
2013-01-28 17:55 ` Ralf Thielow
2013-01-28 16:39 ` Joachim Schmitz
2013-01-28 18:33 ` [PATCHv2] " Ralf Thielow
2 siblings, 1 reply; 12+ messages in thread
From: Thomas Rast @ 2013-01-28 10:33 UTC (permalink / raw)
To: Ralf Thielow; +Cc: jk, stimming, git
Ralf Thielow <ralf.thielow@gmail.com> writes:
> Translate 11 new messages came from git.pot update
> in 46bc403 (l10n: Update git.pot (11 new, 7 removed
> messages)).
> #: builtin/log.c:104
> msgid "Use mail map file"
> -msgstr ""
> +msgstr "verwendet \"mailmap\"-Datei"
Note that case differs here, but it's the English one that doesn't fit
the pattern -- option descriptions usually start with lowercase.
> #: builtin/reset.c:275
> -#, fuzzy, c-format
> +#, c-format
> msgid "Failed to resolve '%s' as a valid revision."
> -msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
> +msgstr "Konnte '%s' nicht als gültige Revision auflösen."
You don't have "revision" in the glossary[1] yet. Wouldn't it be
appropriate to treat it as "commit", and translate as "Version" to avoid
introducing yet another term?
Or am I missing some subtle distinction between commit and revision?
Since it's only a single nit, feel free to add my ack when you reroll:
Acked-by: Thomas Rast <trast@inf.ethz.ch>
[1] https://github.com/ralfth/git-po-de/wiki/Glossary
--
Thomas Rast
trast@{inf,student}.ethz.ch
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] l10n: de.po: translate 11 new messages
2013-01-28 6:14 [PATCH] l10n: de.po: translate 11 new messages Ralf Thielow
2013-01-28 10:33 ` Thomas Rast
@ 2013-01-28 16:39 ` Joachim Schmitz
2013-01-28 18:13 ` Ralf Thielow
2013-01-28 18:33 ` [PATCHv2] " Ralf Thielow
2 siblings, 1 reply; 12+ messages in thread
From: Joachim Schmitz @ 2013-01-28 16:39 UTC (permalink / raw)
To: git
Ralf Thielow wrote:
> Translate 11 new messages came from git.pot update
> in 46bc403 (l10n: Update git.pot (11 new, 7 removed
> messages)).
>
> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
> ---
> po/de.po | 37 ++++++++++++++++++-------------------
> 1 file changed, 18 insertions(+), 19 deletions(-)
>
> diff --git a/po/de.po b/po/de.po
> index 3779f4c..ed8330a 100644
> --- a/po/de.po
> +++ b/po/de.po
> @@ -5,7 +5,7 @@
> #
> msgid ""
> msgstr ""
> -"Project-Id-Version: git 1.8.1\n"
> +"Project-Id-Version: git 1.8.2\n"
Not "Projekt-Id-Version ..."?
> #: builtin/reset.c:33
> msgid "mixed"
> @@ -7916,9 +7915,9 @@ msgid "reset HEAD but keep local changes"
> msgstr "setzt Zweigspitze (HEAD) zurück, behält aber lokale
> Änderungen"
Not "reset -> setze" and "keep" -> halte (imperativ)?
Or is the enlish text wrong and should be "resets" and "keeps"
Bye, Jojo
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] l10n: de.po: translate 11 new messages
2013-01-28 10:33 ` Thomas Rast
@ 2013-01-28 17:55 ` Ralf Thielow
2013-01-28 20:33 ` Philip Oakley
0 siblings, 1 reply; 12+ messages in thread
From: Ralf Thielow @ 2013-01-28 17:55 UTC (permalink / raw)
To: Thomas Rast; +Cc: jk, stimming, git
On Mon, Jan 28, 2013 at 11:33:09AM +0100, Thomas Rast wrote:
> Ralf Thielow <ralf.thielow@gmail.com> writes:
>
> > #: builtin/reset.c:275
> > -#, fuzzy, c-format
> > +#, c-format
> > msgid "Failed to resolve '%s' as a valid revision."
> > -msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
> > +msgstr "Konnte '%s' nicht als gültige Revision auflösen."
>
> You don't have "revision" in the glossary[1] yet. Wouldn't it be
> appropriate to treat it as "commit", and translate as "Version" to avoid
> introducing yet another term?
>
> Or am I missing some subtle distinction between commit and revision?
>
I don't think there's a distinction. Since we've already translated
"revision" as "Revision" in a couple of other messages, I'll make a
new "s/Revision/Version" commit on top.
> Since it's only a single nit, feel free to add my ack when you reroll:
>
> Acked-by: Thomas Rast <trast@inf.ethz.ch>
>
>
> [1] https://github.com/ralfth/git-po-de/wiki/Glossary
>
> --
> Thomas Rast
> trast@{inf,student}.ethz.ch
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] l10n: de.po: translate 11 new messages
2013-01-28 16:39 ` Joachim Schmitz
@ 2013-01-28 18:13 ` Ralf Thielow
2013-01-28 20:52 ` Philip Oakley
0 siblings, 1 reply; 12+ messages in thread
From: Ralf Thielow @ 2013-01-28 18:13 UTC (permalink / raw)
To: Joachim Schmitz; +Cc: git, jk, stimming, trast
On Mon, Jan 28, 2013 at 05:39:27PM +0100, Joachim Schmitz wrote:
> Ralf Thielow wrote:
> >Translate 11 new messages came from git.pot update
> >in 46bc403 (l10n: Update git.pot (11 new, 7 removed
> >messages)).
> >
> >Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
> >---
> > po/de.po | 37 ++++++++++++++++++-------------------
> > 1 file changed, 18 insertions(+), 19 deletions(-)
> >
> >diff --git a/po/de.po b/po/de.po
> >index 3779f4c..ed8330a 100644
> >--- a/po/de.po
> >+++ b/po/de.po
> >@@ -5,7 +5,7 @@
> > #
> > msgid ""
> > msgstr ""
> >-"Project-Id-Version: git 1.8.1\n"
> >+"Project-Id-Version: git 1.8.2\n"
>
> Not "Projekt-Id-Version ..."?
>
I don't think that we need to translate this.
> > #: builtin/reset.c:33
> > msgid "mixed"
> >@@ -7916,9 +7915,9 @@ msgid "reset HEAD but keep local changes"
> > msgstr "setzt Zweigspitze (HEAD) zurück, behält aber lokale
> >Änderungen"
>
> Not "reset -> setze" and "keep" -> halte (imperativ)?
> Or is the enlish text wrong and should be "resets" and "keeps"
>
All translations which describe an option shown by "git <command> -h"
are (or should be) like this. The reading is like "This option..."
followed by such a messages. That's at least how it's done. I don't think
it sounds bad.
According to the glossary, the translation here is wrong because "reset" is
not "*zurück* setzen" but "neu setzen". I'll fix this (and perhaps other
messages) on a commit on top.
> Bye, Jojo
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCHv2] l10n: de.po: translate 11 new messages
2013-01-28 6:14 [PATCH] l10n: de.po: translate 11 new messages Ralf Thielow
2013-01-28 10:33 ` Thomas Rast
2013-01-28 16:39 ` Joachim Schmitz
@ 2013-01-28 18:33 ` Ralf Thielow
2013-01-28 18:33 ` [PATCH] l10n: de.po: translate "revision" consistently as "Version" Ralf Thielow
2013-01-28 18:33 ` [PATCH] l10n: de.po: translate "reset" as "neu setzen" Ralf Thielow
2 siblings, 2 replies; 12+ messages in thread
From: Ralf Thielow @ 2013-01-28 18:33 UTC (permalink / raw)
To: trast, jojo; +Cc: git, jk, stimming, Ralf Thielow
Translate 11 new messages came from git.pot update
in 46bc403 (l10n: Update git.pot (11 new, 7 removed
messages)).
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
---
po/de.po | 37 ++++++++++++++++++-------------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/po/de.po b/po/de.po
index 3779f4c..ed8330a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git 1.8.1\n"
+"Project-Id-Version: git 1.8.2\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2013-01-25 12:33+0800\n"
"PO-Revision-Date: 2012-10-02 19:35+0200\n"
@@ -1033,9 +1033,9 @@ msgid "unable to access '%s': %s"
msgstr "konnte nicht auf '%s' zugreifen: %s"
#: wrapper.c:423
-#, fuzzy, c-format
+#, c-format
msgid "unable to access '%s'"
-msgstr "konnte nicht auf '%s' zugreifen: %s"
+msgstr "konnte nicht auf '%s' zugreifen"
#: wrapper.c:434
#, c-format
@@ -2997,14 +2997,14 @@ msgid "Would remove %s\n"
msgstr "Würde %s löschen\n"
#: builtin/clean.c:26
-#, fuzzy, c-format
+#, c-format
msgid "Skipping repository %s\n"
-msgstr "ungültiges Projektarchiv '%s'"
+msgstr "Überspringe Projektarchiv %s\n"
#: builtin/clean.c:27
-#, fuzzy, c-format
+#, c-format
msgid "Would skip repository %s\n"
-msgstr "ungültiges Projektarchiv '%s'"
+msgstr "Würde Projektarchiv %s überspringen\n"
#: builtin/clean.c:28
#, c-format
@@ -3223,9 +3223,8 @@ msgid "--bare and --origin %s options are incompatible."
msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
#: builtin/clone.c:708
-#, fuzzy
msgid "--bare and --separate-git-dir are incompatible."
-msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
+msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
#: builtin/clone.c:721
#, c-format
@@ -5449,7 +5448,7 @@ msgstr "zeigt Quelle"
#: builtin/log.c:104
msgid "Use mail map file"
-msgstr ""
+msgstr "verwendet \"mailmap\"-Datei"
#: builtin/log.c:105
msgid "decorate options"
@@ -5542,7 +5541,7 @@ msgstr "beginnt die Nummerierung der Patches bei <n> anstatt bei 1"
#: builtin/log.c:1114
msgid "mark the series as Nth re-roll"
-msgstr ""
+msgstr "kennzeichnet die Serie als n-te Fassung"
#: builtin/log.c:1116
msgid "Use [<prefix>] instead of [PATCH]"
@@ -7099,6 +7098,8 @@ msgid ""
"Updates were rejected because the destination reference already exists\n"
"in the remote."
msgstr ""
+"Aktualisierungen wurden zurückgewiesen, weil die Zielreferenz bereits\n"
+"im Fernarchiv existiert."
#: builtin/push.c:269
#, c-format
@@ -7841,14 +7842,12 @@ msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Version>]"
#: builtin/reset.c:26
-#, fuzzy
msgid "git reset [-q] <tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <Version> [--] <Pfade>..."
+msgstr "git reset [-q] <Versionsreferenz> [--] <Pfade>..."
#: builtin/reset.c:27
-#, fuzzy
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<Version>] [--] [<Pfade>...]"
+msgstr "git reset --patch [<Versionsreferenz>] [--] [<Pfade>...]"
#: builtin/reset.c:33
msgid "mixed"
@@ -7916,9 +7915,9 @@ msgid "reset HEAD but keep local changes"
msgstr "setzt Zweigspitze (HEAD) zurück, behält aber lokale Änderungen"
#: builtin/reset.c:275
-#, fuzzy, c-format
+#, c-format
msgid "Failed to resolve '%s' as a valid revision."
-msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
+msgstr "Konnte '%s' nicht als gültige Revision auflösen."
#: builtin/reset.c:278 builtin/reset.c:286
#, c-format
@@ -7926,9 +7925,9 @@ msgid "Could not parse object '%s'."
msgstr "Konnte Objekt '%s' nicht parsen."
#: builtin/reset.c:283
-#, fuzzy, c-format
+#, c-format
msgid "Failed to resolve '%s' as a valid tree."
-msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
+msgstr "Konnte '%s' nicht als gültigen Baum auflösen."
#: builtin/reset.c:292
msgid "--patch is incompatible with --{hard,mixed,soft}"
--
1.8.1.1.439.g50a6b54
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH] l10n: de.po: translate "revision" consistently as "Version"
2013-01-28 18:33 ` [PATCHv2] " Ralf Thielow
@ 2013-01-28 18:33 ` Ralf Thielow
2013-02-01 18:42 ` [PATCH] l10n: de.po: translate "revision" consistently as "Revision" Ralf Thielow
2013-01-28 18:33 ` [PATCH] l10n: de.po: translate "reset" as "neu setzen" Ralf Thielow
1 sibling, 1 reply; 12+ messages in thread
From: Ralf Thielow @ 2013-01-28 18:33 UTC (permalink / raw)
To: trast, jojo; +Cc: git, jk, stimming, Ralf Thielow
In the German translation, we have translated "revision"
as both "Revision" and "Version". In the context of version
control, revision has the same meaning as commit, so we don't
need to use both terms. "revision" is now consistently translated
as "Version".
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
po/de.po | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/po/de.po b/po/de.po
index ed8330a..6c7384b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -156,7 +156,7 @@ msgstr "Dem Projektarchiv fehlen folgende vorausgesetzte Versionen:"
#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347
#: builtin/shortlog.c:157
msgid "revision walk setup failed"
-msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
+msgstr "Einrichtung des Versionsgangs fehlgeschlagen"
#: bundle.c:186
#, c-format
@@ -2201,7 +2201,7 @@ msgstr "arbeite länger, um bessere Übereinstimmungen zu finden"
#: builtin/blame.c:2380
msgid "Use revisions from <file> instead of calling git-rev-list"
-msgstr "Benutzt Revisionen von <Datei> anstatt \"git-rev-list\" aufzurufen"
+msgstr "Benutzt Versionen von <Datei> anstatt \"git-rev-list\" aufzurufen"
#: builtin/blame.c:2381
msgid "Use <file>'s contents as the final image"
@@ -2832,7 +2832,7 @@ msgstr ""
#: builtin/checkout.c:730
msgid "internal error in revision walk"
-msgstr "interner Fehler im Revisionsgang"
+msgstr "interner Fehler im Versionsgang"
#: builtin/checkout.c:734
msgid "Previous HEAD position was"
@@ -6193,7 +6193,7 @@ msgstr "findet Vorfahren für eine einzelne n-Wege-Zusammenführung"
#: builtin/merge-base.c:100
msgid "list revs not reachable from others"
-msgstr "listet Revisionen auf, die nicht durch Andere erreichbar sind"
+msgstr "listet Versionen auf, die nicht durch Andere erreichbar sind"
#: builtin/merge-base.c:102
msgid "is the first one ancestor of the other?"
@@ -6831,7 +6831,7 @@ msgstr "erzeugt keine leeren Pakete"
#: builtin/pack-objects.c:2481
msgid "read revision arguments from standard input"
-msgstr "liest Argumente bezüglich Revisionen von der Standard-Eingabe"
+msgstr "liest Argumente bezüglich Versionen von der Standard-Eingabe"
#: builtin/pack-objects.c:2483
msgid "limit the objects to those that are not yet packed"
@@ -7917,7 +7917,7 @@ msgstr "setzt Zweigspitze (HEAD) zurück, behält aber lokale Änderungen"
#: builtin/reset.c:275
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
-msgstr "Konnte '%s' nicht als gültige Revision auflösen."
+msgstr "Konnte '%s' nicht als gültige Version auflösen."
#: builtin/reset.c:278 builtin/reset.c:286
#, c-format
@@ -8193,7 +8193,7 @@ msgstr ""
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
"current] [--color[=<Wann>] | --no-color] [--sparse] [--more=<n> | --list | --"
"independent | --merge-base] [--no-name | --sha1-name] [--topics] "
-"[(<Revision> | <glob>)...]"
+"[(<Version> | <glob>)...]"
#: builtin/show-branch.c:10
msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -9440,7 +9440,7 @@ msgstr "Kein \"stash\" gefunden."
#: git-stash.sh:359
#, sh-format
msgid "Too many revisions specified: $REV"
-msgstr "Zu viele Revisionen angegeben: $REV"
+msgstr "Zu viele Versionen angegeben: $REV"
#: git-stash.sh:365
#, sh-format
--
1.8.1.1.439.g50a6b54
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH] l10n: de.po: translate "reset" as "neu setzen"
2013-01-28 18:33 ` [PATCHv2] " Ralf Thielow
2013-01-28 18:33 ` [PATCH] l10n: de.po: translate "revision" consistently as "Version" Ralf Thielow
@ 2013-01-28 18:33 ` Ralf Thielow
1 sibling, 0 replies; 12+ messages in thread
From: Ralf Thielow @ 2013-01-28 18:33 UTC (permalink / raw)
To: trast, jojo; +Cc: git, jk, stimming, Ralf Thielow
According to the glossary, "reset" should be
translated as "neu setzen" but in a couple of
messages we've translated it as "zurücksetzen".
This fixes that.
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
Note that the part "neu" is not used in any places because
I think sometimes it sounds better without them.
po/de.po | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/po/de.po b/po/de.po
index 6c7384b..9b1f589 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2764,7 +2764,7 @@ msgstr "Zweigspitze (HEAD) ist jetzt bei"
#: builtin/checkout.c:609
#, c-format
msgid "Reset branch '%s'\n"
-msgstr "Setze Zweig '%s' zurück\n"
+msgstr "Setze Zweig '%s' neu\n"
#: builtin/checkout.c:612
#, c-format
@@ -2774,7 +2774,7 @@ msgstr "Bereits auf '%s'\n"
#: builtin/checkout.c:616
#, c-format
msgid "Switched to and reset branch '%s'\n"
-msgstr "Gewechselt zu zurückgesetztem Zweig '%s'\n"
+msgstr "Gewechselt zu neu gesetztem Zweig '%s'\n"
#: builtin/checkout.c:618 builtin/checkout.c:955
#, c-format
@@ -7900,19 +7900,19 @@ msgstr "weniger Ausgaben, meldet nur Fehler"
#: builtin/reset.c:250
msgid "reset HEAD and index"
-msgstr "setzt Zweigspitze (HEAD) und Bereitstellung zurück"
+msgstr "setzt Zweigspitze (HEAD) und Bereitstellung neu"
#: builtin/reset.c:251
msgid "reset only HEAD"
-msgstr "setzt nur Zweigspitze (HEAD) zurück"
+msgstr "setzt nur Zweigspitze (HEAD) neu"
#: builtin/reset.c:253 builtin/reset.c:255
msgid "reset HEAD, index and working tree"
-msgstr "setzt Zweigspitze (HEAD), Bereitstellung und Arbeitsbaum zurück"
+msgstr "setzt Zweigspitze (HEAD), Bereitstellung und Arbeitsbaum neu"
#: builtin/reset.c:257
msgid "reset HEAD but keep local changes"
-msgstr "setzt Zweigspitze (HEAD) zurück, behält aber lokale Änderungen"
+msgstr "setzt Zweigspitze (HEAD) neu, behält aber lokale Änderungen"
#: builtin/reset.c:275
#, c-format
@@ -7952,7 +7952,7 @@ msgstr "'%s' Zurücksetzung ist in einem bloßen Projektarchiv nicht erlaubt"
#: builtin/reset.c:333
#, c-format
msgid "Could not reset index file to revision '%s'."
-msgstr "Konnte Bereitstellungsdatei nicht zu Version '%s' zurücksetzen."
+msgstr "Konnte Bereitstellungsdatei nicht zu Version '%s' setzen."
#: builtin/reset.c:339
msgid "Unstaged changes after reset:"
@@ -8833,7 +8833,7 @@ msgstr "Baut lokale Versionen auf einem aktuellerem externen Zweig neu auf"
#: common-cmds.h:24
msgid "Reset current HEAD to the specified state"
msgstr ""
-"Setzt die aktuelle Zweigspitze (HEAD) zu einem spezifizierten Zustand zurück"
+"Setzt die aktuelle Zweigspitze (HEAD) zu einem spezifizierten Zustand"
#: common-cmds.h:25
msgid "Remove files from the working tree and from the index"
--
1.8.1.1.439.g50a6b54
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] l10n: de.po: translate 11 new messages
2013-01-28 17:55 ` Ralf Thielow
@ 2013-01-28 20:33 ` Philip Oakley
2013-01-29 7:42 ` Ralf Thielow
0 siblings, 1 reply; 12+ messages in thread
From: Philip Oakley @ 2013-01-28 20:33 UTC (permalink / raw)
To: Ralf Thielow, Thomas Rast; +Cc: jk, stimming, Git List
From: "Ralf Thielow" <ralf.thielow@gmail.com>
Sent: Monday, January 28, 2013 5:55 PM
> On Mon, Jan 28, 2013 at 11:33:09AM +0100, Thomas Rast wrote:
>> Ralf Thielow <ralf.thielow@gmail.com> writes:
>>
>> > #: builtin/reset.c:275
>> > -#, fuzzy, c-format
>> > +#, c-format
>> > msgid "Failed to resolve '%s' as a valid revision."
>> > -msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
>> > +msgstr "Konnte '%s' nicht als gültige Revision auflösen."
>>
>> You don't have "revision" in the glossary[1] yet. Wouldn't it be
>> appropriate to treat it as "commit", and translate as "Version" to
>> avoid
>> introducing yet another term?
>>
>> Or am I missing some subtle distinction between commit and revision?
>>
>
> I don't think there's a distinction.
It was a problem I had http://stackoverflow.com/a/11792712/717355
answered as:
See "SPECIFYING REVISIONS" of git rev-parse:
A revision parameter <rev> typically, but not necessarily, names a
commit object.
It uses what is called an extended SHA1 syntax, [and includes] various
ways to spell object names.
It had me confused for a while.
> Since we've already translated
> "revision" as "Revision" in a couple of other messages, I'll make a
> new "s/Revision/Version" commit on top.
>
>> Since it's only a single nit, feel free to add my ack when you
>> reroll:
>>
>> Acked-by: Thomas Rast <trast@inf.ethz.ch>
>>
>>
>> [1] https://github.com/ralfth/git-po-de/wiki/Glossary
>>
>> --
>> Thomas Rast
>> trast@{inf,student}.ethz.ch
> --
Philip Oakley
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] l10n: de.po: translate 11 new messages
2013-01-28 18:13 ` Ralf Thielow
@ 2013-01-28 20:52 ` Philip Oakley
0 siblings, 0 replies; 12+ messages in thread
From: Philip Oakley @ 2013-01-28 20:52 UTC (permalink / raw)
To: Ralf Thielow, Joachim Schmitz; +Cc: git, jk, stimming, trast, Thomas Ackermann
From: "Ralf Thielow" <ralf.thielow@gmail.com>
Sent: Monday, January 28, 2013 6:13 PM
> On Mon, Jan 28, 2013 at 05:39:27PM +0100, Joachim Schmitz wrote:
>> Ralf Thielow wrote:
>> >Translate 11 new messages came from git.pot update
>> >in 46bc403 (l10n: Update git.pot (11 new, 7 removed
>> >messages)).
>> >
>> >Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
>> >---
>> > po/de.po | 37 ++++++++++++++++++-------------------
>> > 1 file changed, 18 insertions(+), 19 deletions(-)
>> >
>> >diff --git a/po/de.po b/po/de.po
>> >index 3779f4c..ed8330a 100644
>> >--- a/po/de.po
>> >+++ b/po/de.po
>> >@@ -5,7 +5,7 @@
>> > #
>> > msgid ""
>> > msgstr ""
>> >-"Project-Id-Version: git 1.8.1\n"
>> >+"Project-Id-Version: git 1.8.2\n"
Just noticing. Should this be s/git/Git/ to match the
* ta/doc-no-small-caps (2013-01-22) 10 commits
which is cooking?
>>
>> Not "Projekt-Id-Version ..."?
>>
>
> I don't think that we need to translate this.
>
>> > #: builtin/reset.c:33
>> > msgid "mixed"
>> >@@ -7916,9 +7915,9 @@ msgid "reset HEAD but keep local changes"
>> > msgstr "setzt Zweigspitze (HEAD) zurück, behält aber lokale
>> >Änderungen"
>>
>> Not "reset -> setze" and "keep" -> halte (imperativ)?
>> Or is the enlish text wrong and should be "resets" and "keeps"
>>
>
> All translations which describe an option shown by "git <command> -h"
> are (or should be) like this. The reading is like "This option..."
> followed by such a messages. That's at least how it's done. I don't
> think
> it sounds bad.
>
> According to the glossary, the translation here is wrong because
> "reset" is
> not "*zurück* setzen" but "neu setzen". I'll fix this (and perhaps
> other
> messages) on a commit on top.
>
>> Bye, Jojo
Philip Oakley
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] l10n: de.po: translate 11 new messages
2013-01-28 20:33 ` Philip Oakley
@ 2013-01-29 7:42 ` Ralf Thielow
0 siblings, 0 replies; 12+ messages in thread
From: Ralf Thielow @ 2013-01-29 7:42 UTC (permalink / raw)
To: Philip Oakley; +Cc: Thomas Rast, jk, stimming, Git List
2013/1/28 Philip Oakley <philipoakley@iee.org>:
> From: "Ralf Thielow" <ralf.thielow@gmail.com>
> Sent: Monday, January 28, 2013 5:55 PM
>
>> On Mon, Jan 28, 2013 at 11:33:09AM +0100, Thomas Rast wrote:
>>>
>>> Ralf Thielow <ralf.thielow@gmail.com> writes:
>>>
>>> > #: builtin/reset.c:275
>>> > -#, fuzzy, c-format
>>> > +#, c-format
>>> > msgid "Failed to resolve '%s' as a valid revision."
>>> > -msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
>>> > +msgstr "Konnte '%s' nicht als gültige Revision auflösen."
>>>
>>> You don't have "revision" in the glossary[1] yet. Wouldn't it be
>>> appropriate to treat it as "commit", and translate as "Version" to
>>> avoid
>>> introducing yet another term?
>>>
>>> Or am I missing some subtle distinction between commit and revision?
>>>
>>
>> I don't think there's a distinction.
>
>
> It was a problem I had http://stackoverflow.com/a/11792712/717355
> answered as:
>
> See "SPECIFYING REVISIONS" of git rev-parse:
>
> A revision parameter <rev> typically, but not necessarily, names a commit
> object.
> It uses what is called an extended SHA1 syntax, [and includes] various ways
> to spell object names.
>
> It had me confused for a while.
>
Thanks. So it would be a mistake to translate "revision" and "commit"
with the same word. This would hide the special meaning of revision and
the user wouldn't see that there's a difference.
I'll amend the commit which unifys the translation of "revision" and "commit"
in the way that "revision" will be translated as "Revision" in the whole file.
I'll also update the glossary.
>> Since we've already translated
>> "revision" as "Revision" in a couple of other messages, I'll make a
>> new "s/Revision/Version" commit on top.
>>
>>> Since it's only a single nit, feel free to add my ack when you
>>> reroll:
>>>
>>> Acked-by: Thomas Rast <trast@inf.ethz.ch>
>>>
>>>
>>> [1] https://github.com/ralfth/git-po-de/wiki/Glossary
>>>
>>> --
>>> Thomas Rast
>>> trast@{inf,student}.ethz.ch
>>
>> --
>
> Philip Oakley
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] l10n: de.po: translate "revision" consistently as "Revision"
2013-01-28 18:33 ` [PATCH] l10n: de.po: translate "revision" consistently as "Version" Ralf Thielow
@ 2013-02-01 18:42 ` Ralf Thielow
0 siblings, 0 replies; 12+ messages in thread
From: Ralf Thielow @ 2013-02-01 18:42 UTC (permalink / raw)
To: trast, jojo; +Cc: git, jk, stimming, Ralf Thielow
In the current German translation, the word "revision" was
translated as both "Version" (translation of "commit") and
"Revision". Since a revision in Git is not necessarily a
commit, we should not translate it with the same word in
order to give the user an idea that it's not necessarily
the same. After this commit, "revision" is consistently
translated as "Revision".
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
This replaces a patch [1] earlier sent to the list.
I've also updated the glossary [2] of the German translation.
[1]
http://article.gmane.org/gmane.comp.version-control.git/214852
[2]
https://github.com/ralfth/git-po-de/wiki/Glossary
po/de.po | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/po/de.po b/po/de.po
index ed8330a..0a94b4b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4438,7 +4438,7 @@ msgid ""
msgstr ""
"Kein externes Projektarchiv angegeben. Bitte geben Sie entweder eine URL\n"
"oder den Namen des externen Archivs an, von welchem neue\n"
-"Versionen angefordert werden sollen."
+"Revisionen angefordert werden sollen."
#: builtin/fetch.c:932
msgid "You need to specify a tag name."
@@ -4623,7 +4623,7 @@ msgstr ""
#: builtin/grep.c:22
msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
-msgstr "git grep [Optionen] [-e] <Muster> [<Version>...] [[--] <Pfad>...]"
+msgstr "git grep [Optionen] [-e] <Muster> [<Revision>...] [[--] <Pfad>...]"
#: builtin/grep.c:217
#, c-format
@@ -5501,7 +5501,7 @@ msgstr "ungültiges in-reply-to: %s"
#: builtin/log.c:913
msgid "git format-patch [options] [<since> | <revision range>]"
-msgstr "git format-patch [Optionen] [<seit> | <Versionsbereich>]"
+msgstr "git format-patch [Optionen] [<seit> | <Revisionsbereich>]"
#: builtin/log.c:958
msgid "Two output directories?"
@@ -6193,7 +6193,7 @@ msgstr "findet Vorfahren für eine einzelne n-Wege-Zusammenführung"
#: builtin/merge-base.c:100
msgid "list revs not reachable from others"
-msgstr "listet Revisionen auf, die nicht durch Andere erreichbar sind"
+msgstr "listet Versionen auf, die nicht durch Andere erreichbar sind"
#: builtin/merge-base.c:102
msgid "is the first one ancestor of the other?"
@@ -7952,7 +7952,7 @@ msgstr "'%s' Zurücksetzung ist in einem bloßen Projektarchiv nicht erlaubt"
#: builtin/reset.c:333
#, c-format
msgid "Could not reset index file to revision '%s'."
-msgstr "Konnte Bereitstellungsdatei nicht zu Version '%s' zurücksetzen."
+msgstr "Konnte Bereitstellungsdatei nicht zu Revision '%s' zurücksetzen."
#: builtin/reset.c:339
msgid "Unstaged changes after reset:"
@@ -9053,7 +9053,7 @@ msgstr "nicht erkannte Option: '$arg'"
#: git-bisect.sh:99
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
-msgstr "'$arg' scheint keine gültige Version zu sein"
+msgstr "'$arg' scheint keine gültige Revision zu sein"
#: git-bisect.sh:117
msgid "Bad HEAD - I need a HEAD"
@@ -9116,7 +9116,7 @@ msgid ""
"You need to give me at least one good and one bad revisions.\n"
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
msgstr ""
-"Sie müssen mindestens eine korrekte und eine fehlerhafte Version angeben.\n"
+"Sie müssen mindestens eine korrekte und eine fehlerhafte Revision angeben.\n"
"(Sie können dafür \"git bisect bad\" und \"git bisect good\" benutzen.)"
#: git-bisect.sh:292
@@ -9126,7 +9126,7 @@ msgid ""
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
msgstr ""
"Sie müssen mit \"git bisect start\" beginnen.\n"
-"Danach müssen Sie mindestens eine korrekte und eine fehlerhafte Version "
+"Danach müssen Sie mindestens eine korrekte und eine fehlerhafte Revision "
"angeben.\n"
"(Sie können dafür \"git bisect bad\" und \"git bisect good\" benutzen.)"
@@ -9650,7 +9650,7 @@ msgstr ""
#: git-submodule.sh:662
#, sh-format
msgid "Unable to find current revision in submodule path '$sm_path'"
-msgstr "Konnte aktuelle Version in Unterprojekt-Pfad '$sm_path' nicht finden"
+msgstr "Konnte aktuelle Revision in Unterprojekt-Pfad '$sm_path' nicht finden"
#: git-submodule.sh:671 git-submodule.sh:695
#, sh-format
--
1.8.1.2.623.g7d3a2ef
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2013-02-01 18:42 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-28 6:14 [PATCH] l10n: de.po: translate 11 new messages Ralf Thielow
2013-01-28 10:33 ` Thomas Rast
2013-01-28 17:55 ` Ralf Thielow
2013-01-28 20:33 ` Philip Oakley
2013-01-29 7:42 ` Ralf Thielow
2013-01-28 16:39 ` Joachim Schmitz
2013-01-28 18:13 ` Ralf Thielow
2013-01-28 20:52 ` Philip Oakley
2013-01-28 18:33 ` [PATCHv2] " Ralf Thielow
2013-01-28 18:33 ` [PATCH] l10n: de.po: translate "revision" consistently as "Version" Ralf Thielow
2013-02-01 18:42 ` [PATCH] l10n: de.po: translate "revision" consistently as "Revision" Ralf Thielow
2013-01-28 18:33 ` [PATCH] l10n: de.po: translate "reset" as "neu setzen" Ralf Thielow
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.