* [PATCH 1/5] stash: make "saved" message translatable
2012-05-02 13:49 ` [PATCH 0/5] de.po suggested updates Thomas Rast
@ 2012-05-02 13:49 ` Thomas Rast
2012-05-02 16:42 ` Junio C Hamano
2012-05-02 13:49 ` [PATCH de.po 2/5] de.po: translate "bare" as "bloß" Thomas Rast
` (5 subsequent siblings)
6 siblings, 1 reply; 28+ messages in thread
From: Thomas Rast @ 2012-05-02 13:49 UTC (permalink / raw)
To: Ralf Thielow
Cc: Jiang Xin, Git List, Junio C Hamano, Jan Krüger, Christian Stimming
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
git-stash.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-stash.sh b/git-stash.sh
index 4e2c7f8..e614eb7 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -233,7 +233,7 @@ save_stash () {
git update-ref -m "$stash_msg" $ref_stash $w_commit ||
die "$(gettext "Cannot save the current status")"
- say Saved working directory and index state "$stash_msg"
+ say "$(eval_gettext "Saved working directory and index state \"\$stash_msg\"")"
if test -z "$patch_mode"
then
--
1.7.10.625.g300dcf
^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH 1/5] stash: make "saved" message translatable
2012-05-02 13:49 ` [PATCH 1/5] stash: make "saved" message translatable Thomas Rast
@ 2012-05-02 16:42 ` Junio C Hamano
0 siblings, 0 replies; 28+ messages in thread
From: Junio C Hamano @ 2012-05-02 16:42 UTC (permalink / raw)
To: Thomas Rast
Cc: Ralf Thielow, Jiang Xin, Git List, Jan Krüger, Christian Stimming
Thomas Rast <trast@student.ethz.ch> writes:
> Signed-off-by: Thomas Rast <trast@student.ethz.ch>
> ---
> git-stash.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git-stash.sh b/git-stash.sh
> index 4e2c7f8..e614eb7 100755
> --- a/git-stash.sh
> +++ b/git-stash.sh
> @@ -233,7 +233,7 @@ save_stash () {
>
> git update-ref -m "$stash_msg" $ref_stash $w_commit ||
> die "$(gettext "Cannot save the current status")"
> - say Saved working directory and index state "$stash_msg"
> + say "$(eval_gettext "Saved working directory and index state \"\$stash_msg\"")"
Do you need backslashes before double quotes here?
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH de.po 2/5] de.po: translate "bare" as "bloß"
2012-05-02 13:49 ` [PATCH 0/5] de.po suggested updates Thomas Rast
2012-05-02 13:49 ` [PATCH 1/5] stash: make "saved" message translatable Thomas Rast
@ 2012-05-02 13:49 ` Thomas Rast
2012-05-02 13:49 ` [PATCH de.po 3/5] de.po: hopefully uncontroversial fixes Thomas Rast
` (4 subsequent siblings)
6 siblings, 0 replies; 28+ messages in thread
From: Thomas Rast @ 2012-05-02 13:49 UTC (permalink / raw)
To: Ralf Thielow
Cc: Jiang Xin, Git List, Junio C Hamano, Jan Krüger, Christian Stimming
git-gui has had precedent for "leer" since ab2d3b0 (git-gui: Update
German translation (12 new or changed strings)., 2010-01-26).
However, that would be "empty".
Change it both in git-gui and git itself.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
git-gui/po/de.po | 4 ++--
po/de.po | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/git-gui/po/de.po b/git-gui/po/de.po
index 44c5ddc..9458f6e 100644
--- a/git-gui/po/de.po
+++ b/git-gui/po/de.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-26 22:22+0100\n"
-"PO-Revision-Date: 2010-01-26 22:25+0100\n"
+"PO-Revision-Date: 2012-05-02 11:54+0200\n"
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
@@ -72,7 +72,7 @@ msgstr ""
#: git-gui.sh:1154
msgid "Cannot use bare repository:"
-msgstr "Leeres Projektarchiv kann nicht benutzt werden:"
+msgstr "Bloßes Projektarchiv kann nicht benutzt werden:"
#: git-gui.sh:1162
msgid "No working directory"
diff --git a/po/de.po b/po/de.po
index a43f646..a7a39ed 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: git 1.7.10\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2012-04-28 20:17+0800\n"
-"PO-Revision-Date: 2012-03-28 18:46+0200\n"
+"PO-Revision-Date: 2012-05-02 15:10+0200\n"
"Last-Translator: Ralf Thielow <ralf.thielow@googlemail.com>\n"
"Language-Team: German\n"
"Language: de\n"
@@ -1376,7 +1376,7 @@ msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen."
#: builtin/clone.c:728
#, c-format
msgid "Cloning into bare repository '%s'...\n"
-msgstr "Klone in leeres Projektarchiv '%s'...\n"
+msgstr "Klone in bloßes Projektarchiv '%s'...\n"
#: builtin/clone.c:730
#, c-format
@@ -3133,7 +3133,7 @@ msgstr "Kann keine %s Zurücksetzung mit Pfaden machen."
#: builtin/reset.c:325
#, c-format
msgid "%s reset is not allowed in a bare repository"
-msgstr "%s Zurücksetzung ist in einem leeren Projektarchiv nicht erlaubt"
+msgstr "'%s' Zurücksetzung ist in einem bloßen Projektarchiv nicht erlaubt"
#: builtin/reset.c:341
#, c-format
--
1.7.10.625.g300dcf
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH de.po 3/5] de.po: hopefully uncontroversial fixes
2012-05-02 13:49 ` [PATCH 0/5] de.po suggested updates Thomas Rast
2012-05-02 13:49 ` [PATCH 1/5] stash: make "saved" message translatable Thomas Rast
2012-05-02 13:49 ` [PATCH de.po 2/5] de.po: translate "bare" as "bloß" Thomas Rast
@ 2012-05-02 13:49 ` Thomas Rast
2012-05-02 13:49 ` [PATCH de.po 4/5] de.po: translate "bad" as "ungültig" ("invalid") Thomas Rast
` (3 subsequent siblings)
6 siblings, 0 replies; 28+ messages in thread
From: Thomas Rast @ 2012-05-02 13:49 UTC (permalink / raw)
To: Ralf Thielow
Cc: Jiang Xin, Git List, Junio C Hamano, Jan Krüger, Christian Stimming
These are all obviously wrong, such as typos or messages where the
current translation is based on a misunderstanding of the original
message.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
po/de.po | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/po/de.po b/po/de.po
index a7a39ed..d391632 100644
--- a/po/de.po
+++ b/po/de.po
@@ -145,7 +145,7 @@ msgstr "'%s': %s"
#: grep.c:1308
#, c-format
msgid "'%s': short read %s"
-msgstr "'%s': kurz gelesen %s"
+msgstr "'%s': read() zu kurz %s"
#: help.c:287
#, c-format
@@ -779,7 +779,7 @@ msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
#: builtin/add.c:414
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Wolltest du vieleicht 'git add .' sagen?\n"
+msgstr "Wolltest du vielleicht 'git add .' sagen?\n"
#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82
#: builtin/rm.c:162
@@ -815,7 +815,7 @@ msgstr "git archive: NACK %s"
#: builtin/archive.c:65
#, c-format
msgid "remote error: %s"
-msgstr "Versandfehler: %s"
+msgstr "Fehler am anderen Ende: %s"
#: builtin/archive.c:66
msgid "git archive: protocol error"
@@ -2234,11 +2234,11 @@ msgstr "Initialisierte leeres"
#: builtin/init-db.c:421
msgid " shared"
-msgstr " geteilt"
+msgstr " geteiltes"
#: builtin/init-db.c:440
msgid "cannot tell cwd"
-msgstr "kann nicht \"cwd\" sagen"
+msgstr "kann aktuelles Verzeichnis nicht bestimmen"
#: builtin/init-db.c:521 builtin/init-db.c:528
#, c-format
@@ -2978,7 +2978,7 @@ msgstr ""
"Zweiges hinter seinem entfernten Gegenstück ist. Wenn du nicht beabsichtigt\n"
"hast, diesen Zweig zu versenden, kannst du auch den zu versendenden Zweig\n"
"spezifizieren oder die Konfigurationsvariable 'push.default' zu 'current'\n"
-"oder 'upstream' setze, um nur den aktuellen Zweig zu versenden."
+"oder 'upstream' setzen, um nur den aktuellen Zweig zu versenden."
#: builtin/push.c:150
msgid ""
@@ -3057,7 +3057,7 @@ msgstr "--delete ist inkompatibel mit --all, --mirror und --tags"
#: builtin/push.c:344
msgid "--delete doesn't make sense without any refs"
-msgstr "--delete macht ohne irgendeine Referenz ohne keinen Sinn"
+msgstr "--delete macht ohne irgendeine Referenz keinen Sinn"
#: builtin/reset.c:33
msgid "mixed"
@@ -3283,7 +3283,7 @@ msgstr "Die Markierungsbeschreibung wurde gelassen in %s\n"
#: builtin/tag.c:421
msgid "switch 'points-at' requires an object"
-msgstr "Wechseln von 'points-at' erfordert ein Objekt"
+msgstr "Option 'points-at' erfordert ein Objekt"
#: builtin/tag.c:423
#, c-format
@@ -3437,7 +3437,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 Option zu sein"
+msgstr "'$arg' scheint keine gültige Version zu sein"
#: git-bisect.sh:117
msgid "Bad HEAD - I need a HEAD"
@@ -3471,7 +3471,7 @@ msgstr "Schlechte Referenz-Eingabe: $arg"
#: git-bisect.sh:232
msgid "Please call 'bisect_state' with at least one argument."
-msgstr "Bitte rufe 'bisect_state' mit mindestens einem Argument."
+msgstr "Bitte rufe 'bisect_state' mit mindestens einem Argument auf."
#: git-bisect.sh:244
#, sh-format
@@ -3610,7 +3610,7 @@ msgstr "$reference ist keine gültige Referenz"
#: git-stash.sh:393
#, sh-format
msgid "'$args' is not a stash-like commit"
-msgstr "'$args' ist keine \"stash\"-artiger Version"
+msgstr "'$args' ist keine \"stash\"-artige Version"
#: git-stash.sh:404
#, sh-format
@@ -3809,7 +3809,7 @@ msgstr " Warnung: $name beinhaltet nicht Version $sha1_dst"
#: git-submodule.sh:776
#, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr " Warnung: $name beinhaltet nich die Versionen $sha1_src und $sha1_dst"
+msgstr " Warnung: $name beinhaltet nicht die Versionen $sha1_src und $sha1_dst"
#: git-submodule.sh:801
msgid "blob"
--
1.7.10.625.g300dcf
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH de.po 4/5] de.po: translate "bad" as "ungültig" ("invalid")
2012-05-02 13:49 ` [PATCH 0/5] de.po suggested updates Thomas Rast
` (2 preceding siblings ...)
2012-05-02 13:49 ` [PATCH de.po 3/5] de.po: hopefully uncontroversial fixes Thomas Rast
@ 2012-05-02 13:49 ` Thomas Rast
2012-05-02 13:49 ` [PATCH de.po 5/5] de.po: collection of suggestions Thomas Rast
` (2 subsequent siblings)
6 siblings, 0 replies; 28+ messages in thread
From: Thomas Rast @ 2012-05-02 13:49 UTC (permalink / raw)
To: Ralf Thielow
Cc: Jiang Xin, Git List, Junio C Hamano, Jan Krüger, Christian Stimming
"schlecht" doesn't quite sound right to me, especially in messages
like "bad object" where the object doesn't even exist in the first
place.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
po/de.po | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/po/de.po b/po/de.po
index d391632..a1a765a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2101,7 +2101,7 @@ msgstr "keine Muster gegeben"
#: builtin/grep.c:902
#, c-format
msgid "bad object %s"
-msgstr "schlechtes Objekt %s"
+msgstr "ungültiges Objekt %s"
#: builtin/grep.c:943
msgid "--open-files-in-pager only works on the worktree"
@@ -2444,7 +2444,7 @@ msgstr "'%s' zeigt auf keine Version"
#: builtin/merge.c:536
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Schlechter branch.%s.mergeoptions String: %s"
+msgstr "Ungültiger branch.%s.mergeoptions String: %s"
#: builtin/merge.c:629
msgid "git write-tree failed to write a tree"
@@ -2659,7 +2659,7 @@ msgstr "Prüfe Umbenennen von '%s' nach '%s'\n"
#: builtin/mv.c:112
msgid "bad source"
-msgstr "schlechte Quelle"
+msgstr "ungültige Quelle"
#: builtin/mv.c:115
msgid "can not move directory into itself"
@@ -2786,7 +2786,7 @@ msgstr "Kann uninitialisierten/unreferenzierten Notiz-Baum nicht eintragen."
#: builtin/notes.c:340
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Schlechter notes.rewriteMode Wert: '%s'"
+msgstr "Ungültiger notes.rewriteMode Wert: '%s'"
#: builtin/notes.c:350
#, c-format
@@ -2799,7 +2799,7 @@ msgstr ""
#: builtin/notes.c:377
#, c-format
msgid "Bad %s value: '%s'"
-msgstr "Schlechter %s Wert: '%s'"
+msgstr "Ungültiger %s Wert: '%s'"
#: builtin/notes.c:441
#, c-format
@@ -2881,7 +2881,7 @@ msgstr "Nicht unterstützte Bereitstellungsversion %s"
#: builtin/pack-objects.c:2314
#, c-format
msgid "bad index version '%s'"
-msgstr "Schlechte Bereitstellungsversion '%s'"
+msgstr "Ungültige Bereitstellungsversion '%s'"
#: builtin/pack-objects.c:2322
#, c-format
@@ -3007,7 +3007,7 @@ msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
#: builtin/push.c:226
#, c-format
msgid "bad repository '%s'"
-msgstr "schlechtes Projektarchiv '%s'"
+msgstr "ungültiges Projektarchiv '%s'"
#: builtin/push.c:227
msgid ""
@@ -3266,7 +3266,7 @@ msgstr "konnte Markierungsdatei nicht schreiben"
#: builtin/tag.c:321
msgid "bad object type."
-msgstr "schlechter Objekt-Typ"
+msgstr "ungültiger Objekt-Typ"
#: builtin/tag.c:334
msgid "tag header too big."
@@ -3441,7 +3441,7 @@ msgstr "'$arg' scheint keine gültige Version zu sein"
#: git-bisect.sh:117
msgid "Bad HEAD - I need a HEAD"
-msgstr "Schlechte Zweigspitze (HEAD) - Ich brauche eine Zweigspitze (HEAD)"
+msgstr "Ungültige Zweigspitze (HEAD) - Ich brauche eine Zweigspitze (HEAD)"
#: git-bisect.sh:130
#, sh-format
@@ -3457,17 +3457,17 @@ msgstr "werde nicht auf gesuchtem Baum halbieren"
#: git-bisect.sh:144
msgid "Bad HEAD - strange symbolic ref"
-msgstr "Schlechte Zweigspitze (HEAD) - merkwürdige symbolische Referenz"
+msgstr "Ungültige Zweigspitze (HEAD) - merkwürdige symbolische Referenz"
#: git-bisect.sh:189
#, sh-format
msgid "Bad bisect_write argument: $state"
-msgstr "Schlechtes \"bisect_write\" Argument: $state"
+msgstr "Ungültiges \"bisect_write\" Argument: $state"
#: git-bisect.sh:218
#, sh-format
msgid "Bad rev input: $arg"
-msgstr "Schlechte Referenz-Eingabe: $arg"
+msgstr "Ungültige Referenz-Eingabe: $arg"
#: git-bisect.sh:232
msgid "Please call 'bisect_state' with at least one argument."
@@ -3476,7 +3476,7 @@ msgstr "Bitte rufe 'bisect_state' mit mindestens einem Argument auf."
#: git-bisect.sh:244
#, sh-format
msgid "Bad rev input: $rev"
-msgstr "Schlechte Referenz-Eingabe: $rev"
+msgstr "Ungültige Referenz-Eingabe: $rev"
#: git-bisect.sh:250
msgid "'git bisect bad' can take only one argument."
--
1.7.10.625.g300dcf
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH de.po 5/5] de.po: collection of suggestions
2012-05-02 13:49 ` [PATCH 0/5] de.po suggested updates Thomas Rast
` (3 preceding siblings ...)
2012-05-02 13:49 ` [PATCH de.po 4/5] de.po: translate "bad" as "ungültig" ("invalid") Thomas Rast
@ 2012-05-02 13:49 ` Thomas Rast
2012-05-02 18:36 ` Ralf Thielow
2012-05-02 19:42 ` Christian Stimming
2012-05-02 17:52 ` [PATCH 0/5] de.po suggested updates Ralf Thielow
2012-05-02 19:13 ` Christian Stimming
6 siblings, 2 replies; 28+ messages in thread
From: Thomas Rast @ 2012-05-02 13:49 UTC (permalink / raw)
To: Ralf Thielow
Cc: Jiang Xin, Git List, Junio C Hamano, Jan Krüger, Christian Stimming
A long list of suggested changes to the translation. None of them are
clear-cut, though I of course think they are an improvement ;-)
Please do not apply this patch "blindly"; take them as suggestions,
and keep only the ones you like. The S-O-B refers to the
opensourciness of it.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
po/de.po | 97 ++++++++++++++++++++++++++++----------------------------------
1 file changed, 43 insertions(+), 54 deletions(-)
diff --git a/po/de.po b/po/de.po
index a1a765a..f6df558 100644
--- a/po/de.po
+++ b/po/de.po
@@ -34,8 +34,8 @@ msgid ""
"or use 'git commit -a'."
msgstr ""
"Korrigiere dies im Arbeitsbaum,\n"
-"und benutze dann 'git add/rm <Datei>' wie\n"
-"vorgesehen, um die Auflösung zu markieren und dann einzutragen,\n"
+"und benutze dann 'git add/rm <Datei>' \n"
+"um die Auflösung entsprechend zu markieren und einzutragen,\n"
"oder benutze 'git commit -a'."
#: commit.c:48
@@ -360,7 +360,7 @@ msgstr "Fehlerhaftes Optionsblatt: %s"
#: sequencer.c:666
msgid "a cherry-pick or revert is already in progress"
-msgstr "\"cherry-pick\" oder \"revert\" wird bereits ausgeführt"
+msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang"
#: sequencer.c:667
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
@@ -378,7 +378,7 @@ msgstr "Fehler beim Einpacken von %s."
#: sequencer.c:706 sequencer.c:840
msgid "no cherry-pick or revert in progress"
-msgstr "kein \"cherry-pick\" oder \"revert\" in Ausführung"
+msgstr "kein \"cherry-pick\" oder \"revert\" im Gang"
#: sequencer.c:708
msgid "cannot resolve HEAD"
@@ -386,7 +386,7 @@ msgstr "kann Zweigspitze (HEAD) nicht auflösen"
#: sequencer.c:710
msgid "cannot abort from a branch yet to be born"
-msgstr "kann nicht von einem Zweig abbrechen, der noch geboren wird"
+msgstr "kann nicht abbrechen: bin auf einem Zweig, der noch geboren wird"
#: sequencer.c:732
#, c-format
@@ -475,12 +475,11 @@ msgstr "Änderungen, die nicht zum Eintragen bereitgestellt sind:"
#: wt-status.c:173
msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr " (benutze \"git add <Datei>...\" zur Aktualisierung der Eintragung)"
+msgstr " (benutze \"git add <Datei>...\" zum Bereitstellen)"
#: wt-status.c:175
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr ""
-" (benutze \"git add/rm <Datei>...\" zur Aktualisierung der Eintragung)"
+msgstr " (benutze \"git add/rm <Datei>...\" zum Bereitstellen)"
#: wt-status.c:176
msgid ""
@@ -507,7 +506,7 @@ msgstr " (benutze \"git %s <Datei>...\" zum Einfügen in die Eintragung)"
#: wt-status.c:207
msgid "bug"
-msgstr "Fehler"
+msgstr "Bug"
#: wt-status.c:212
msgid "both deleted:"
@@ -676,11 +675,11 @@ msgstr "hinter "
#: wt-status.c:908 wt-status.c:911
msgid "ahead "
-msgstr "über "
+msgstr "weiter: "
#: wt-status.c:913
msgid ", behind "
-msgstr ", hinter "
+msgstr ", zurückgefallen "
#: builtin/add.c:62
#, c-format
@@ -903,12 +902,12 @@ msgstr "Zweig '%s' zeigt auf keine Version"
#: builtin/branch.c:396
#, c-format
msgid "behind %d] "
-msgstr "hinter %d] "
+msgstr "%d hinterher] "
#: builtin/branch.c:398
#, c-format
msgid "ahead %d] "
-msgstr "vor %d] "
+msgstr "%d voraus] "
#: builtin/branch.c:400
#, c-format
@@ -1570,9 +1569,8 @@ msgid ""
" Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-" Zeilen beginnend\n"
-"mit '#' werden ignoriert, und eine leere Versionsbeschreibung bricht die "
-"Eintragung ab.\n"
+" Zeilen, die mit '#'\n"
+"beginnen, werden ignoriert, und eine leere Versionsbeschreibung bricht die Eintragung ab.\n"
#: builtin/commit.c:820
msgid ""
@@ -1580,8 +1578,8 @@ msgid ""
"with '#' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
-" Zeilen beginnend\n"
-"mit '#' werden beibehalten; wenn du möchtest, kannst du diese entfernen.\n"
+" Zeilen, die mit '#'\n"
+"beginnen, werden beibehalten; wenn du möchtest, kannst du diese entfernen.\n"
"Eine leere Versionsbeschreibung bricht die Eintragung ab.\n"
#: builtin/commit.c:832
@@ -1762,7 +1760,7 @@ msgstr "annotierte Markierung %s hat keinen eingebetteten Namen"
#: builtin/describe.c:240
#, c-format
msgid "tag '%s' is really '%s' here"
-msgstr "Markierung '%s' ist wirklich '%s' hier"
+msgstr "Markierung '%s' ist eigentlich '%s' hier"
#: builtin/describe.c:267
#, c-format
@@ -1831,7 +1829,7 @@ msgstr "Keine Namen gefunden, kann nichts beschreiben."
#: builtin/describe.c:482
msgid "--dirty is incompatible with committishes"
-msgstr "--dirty ist inkompatibel mit \"committish\"-Werten"
+msgstr "--dirty ist inkompatibel mit Versionen"
#: builtin/diff.c:77
#, c-format
@@ -2001,8 +1999,8 @@ msgid ""
"remote name from which new revisions should be fetched."
msgstr ""
"Kein entferntes Projektarchiv spezifiziert. Bitte spezifiziere entweder\n"
-"eine URL oder einen Entfernungsname, von welchem neue Revisionen angefordert "
-"werden sollen."
+"eine URL oder den Namen eines entfernten Archivs, von welchem neue\n"
+"Revisionen angefordert werden sollen."
#: builtin/fetch.c:927
msgid "You need to specify a tag name."
@@ -2034,7 +2032,7 @@ msgstr "Ungültiger %s: '%s'"
#: builtin/gc.c:78
msgid "Too many options specified"
-msgstr "Zu viele Optionen spezifiziert"
+msgstr "Zu viele Optionen angegeben"
#: builtin/gc.c:103
#, c-format
@@ -2044,7 +2042,7 @@ msgstr "wahnsinnig langes Objekt-Verzeichnis %.*s"
#: builtin/gc.c:223
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
-msgstr "Automatische Paketierung des Repositories für optimale Leitung.\n"
+msgstr "Automatisches packen des Projektarchivs für optimale Leistung.\n"
#: builtin/gc.c:226
#, c-format
@@ -2052,17 +2050,13 @@ msgid ""
"Auto packing the repository for optimum performance. You may also\n"
"run \"git gc\" manually. See \"git help gc\" for more information.\n"
msgstr ""
-"Automatische Paketierung des Repositories für optimale Leitung. Du darfst "
-"auch\n"
-"\"git gc\" manuell ausführen. Siehe \"git help gc\" für weitere "
-"Informationen.\n"
+"Automatisches packen des Projektarchivs für optimale Leistung. Du kannst auch\n"
+"\"git gc\" manuell ausführen. Siehe \"git help gc\" für weitere Informationen.\n"
#: builtin/gc.c:256
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr ""
-"Es gibt zu viele unerreichbare, verlorene Objekte; führe 'git prune' aus um "
-"diese zu entfernen."
+msgstr "Es gibt zu viele unerreichbare lose Objekte; führe 'git prune' aus um diese zu entfernen."
#: builtin/grep.c:216
#, c-format
@@ -2328,11 +2322,11 @@ msgstr "unechte Einreicher-Informationen %s"
#: builtin/log.c:1224
msgid "-n and -k are mutually exclusive."
-msgstr "-n und -k sind zueinander exklusiv"
+msgstr "-n und -k schliessen sich gegenseitig aus"
#: builtin/log.c:1226
msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix und -k sind zueinander exklusiv"
+msgstr "--subject-prefix und -k schliessen sich gegenseitig aus"
#: builtin/log.c:1231 builtin/shortlog.c:284
#, c-format
@@ -2594,12 +2588,11 @@ msgstr "Kann nur exakt eine Version in einem leeren Kopf zusammenführen."
#: builtin/merge.c:1296
msgid "Squash commit into empty head not supported yet"
-msgstr ""
-"Quetschen einer Version in einen leeren Kopf wird momentan nicht unterstützt."
+msgstr "Bin auf einem Zweig, der noch geboren wird; kann nicht quetschen."
#: builtin/merge.c:1298
msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "nicht vorzuspulende Version macht in einem leeren Kopf keinen Sinn"
+msgstr "Bin auf einem Zweig, der noch geboren wird; --no-ff macht keinen Sinn."
#: builtin/merge.c:1413
#, c-format
@@ -2997,7 +2990,7 @@ msgstr ""
#: builtin/push.c:190
#, c-format
msgid "Pushing to %s\n"
-msgstr "Schiebe zu %s\n"
+msgstr "Versende nach %s\n"
#: builtin/push.c:194
#, c-format
@@ -3061,19 +3054,19 @@ msgstr "--delete macht ohne irgendeine Referenz keinen Sinn"
#: builtin/reset.c:33
msgid "mixed"
-msgstr "gemischt"
+msgstr "mixed"
#: builtin/reset.c:33
msgid "soft"
-msgstr "weich"
+msgstr "soft"
#: builtin/reset.c:33
msgid "hard"
-msgstr "hart"
+msgstr "hard"
#: builtin/reset.c:33
msgid "keep"
-msgstr "halten"
+msgstr "keep"
#: builtin/reset.c:77
msgid "You do not have a valid HEAD."
@@ -3108,8 +3101,7 @@ msgstr "Nicht bereitgestellte Änderungen nach Zurücksetzung:"
#: builtin/reset.c:223
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
-msgstr ""
-"Kann keine %s Zurücksetzung innerhalb einer Zusammenführung durchführen."
+msgstr "Kann keine '%s' Zurücksetzung innerhalb einer Zusammenführung durchführen."
#: builtin/reset.c:297
#, c-format
@@ -3128,7 +3120,7 @@ msgstr ""
#: builtin/reset.c:313
#, c-format
msgid "Cannot do %s reset with paths."
-msgstr "Kann keine %s Zurücksetzung mit Pfaden machen."
+msgstr "Kann keine '%s' Zurücksetzung mit Pfaden machen."
#: builtin/reset.c:325
#, c-format
@@ -3237,7 +3229,7 @@ msgstr ""
"\n"
"#\n"
"# Gebe eine Markierungsbeschreibung ein\n"
-"# Zeilen beginnend mit '#' werden ignoriert.\n"
+"# Zeilen, die mit '#' beginnen, werden ignoriert.\n"
"#\n"
#: builtin/tag.c:254
@@ -3252,8 +3244,8 @@ msgstr ""
"\n"
"#\n"
"# Gebe eine Markierungsbeschreibung ein\n"
-"# Zeilen beginnend mit '#' werden behalten; du darfst diese selbst entfernen "
-"wenn du möchtest.\n"
+"# Zeilen, die mit '#' beginnen, werden behalten; du darfst diese\n"
+"# selbst entfernen wenn du möchtest.\n"
"#\n"
#: builtin/tag.c:294
@@ -3351,8 +3343,7 @@ msgid ""
"It does not apply to blobs recorded in its index."
msgstr ""
"Hast du den Patch per Hand editiert?\n"
-"Er kann nicht auf aufgezeichnete Blobs in seiner Bereitstellung angewendet "
-"werden."
+"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
#: git-am.sh:163
msgid "Falling back to patching base and 3-way merge..."
@@ -3398,9 +3389,7 @@ msgstr ""
#: git-am.sh:755
msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"Kann nicht interaktiv sein, ohne das die Standard-Eingabe mit einem Terminal "
-"verbunden ist."
+msgstr "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem Terminal verbunden ist."
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
@@ -3500,7 +3489,7 @@ msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr ""
-"Konnte die originale Zweigspitze (HEAD) '$branch' nicht auschecken.\n"
+"Konnte die ursprüngliche Zweigspitze (HEAD) '$branch' nicht auschecken.\n"
"Versuche 'git bisect reset <Version>'."
#: git-bisect.sh:390
@@ -3543,7 +3532,7 @@ msgstr ""
#: git-pull.sh:253
msgid "Cannot merge multiple branches into empty head"
-msgstr "Kann nicht mehrere Zweige in einen leeren Kopf zusammenführen"
+msgstr "Kann nicht mehrere Zweige in einen ungeborenen Zweig zusammenführen"
#: git-pull.sh:257
msgid "Cannot rebase onto multiple branches"
--
1.7.10.625.g300dcf
^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH de.po 5/5] de.po: collection of suggestions
2012-05-02 13:49 ` [PATCH de.po 5/5] de.po: collection of suggestions Thomas Rast
@ 2012-05-02 18:36 ` Ralf Thielow
2012-05-02 19:43 ` Thomas Rast
2012-05-02 19:42 ` Christian Stimming
1 sibling, 1 reply; 28+ messages in thread
From: Ralf Thielow @ 2012-05-02 18:36 UTC (permalink / raw)
To: Thomas Rast
Cc: Jiang Xin, Git List, Junio C Hamano, Jan Krüger, Christian Stimming
Looks good so far.
I amended (and applied) your patch but have changed the following parts.
If you don't agree with them, please let me know. Commonly I don't change
a patch but I want to get these changes in and I think you'll agree with my
changes.
> +"um die Auflösung entsprechend zu markieren und einzutragen,\n"
> "oder benutze 'git commit -a'."
There are a couple of other parts in the file with the same pattern.
I've changed them in the same way.
> #: wt-status.c:207
> msgid "bug"
> -msgstr "Fehler"
> +msgstr "Bug"
I don't think that "Bug" is a better translation than "Fehler". It's not
really a German word. Most of the German people should
know what that means, but at least it's the same question
like the translation of terms like "commit". I removed it for now.
> +"und benutze dann 'git add/rm <Datei>' \n"
I removed the whitespace before the line break.
I also changed "..packen..." to "...Packen...".
Thanks
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH de.po 5/5] de.po: collection of suggestions
2012-05-02 18:36 ` Ralf Thielow
@ 2012-05-02 19:43 ` Thomas Rast
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Rast @ 2012-05-02 19:43 UTC (permalink / raw)
To: Ralf Thielow
Cc: Jiang Xin, Git List, Junio C Hamano, Jan Krüger, Christian Stimming
Ralf Thielow <ralf.thielow@googlemail.com> writes:
>> #: wt-status.c:207
>> msgid "bug"
>> -msgstr "Fehler"
>> +msgstr "Bug"
>
> I don't think that "Bug" is a better translation than "Fehler". It's not
> really a German word. Most of the German people should
> know what that means, but at least it's the same question
> like the translation of terms like "commit". I removed it for now.
Ok. My rationale was that given "Bug", the user would be more likely to
send an email reporting it. But it probably doesn't matter.
--
Thomas Rast
trast@{inf,student}.ethz.ch
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH de.po 5/5] de.po: collection of suggestions
2012-05-02 13:49 ` [PATCH de.po 5/5] de.po: collection of suggestions Thomas Rast
2012-05-02 18:36 ` Ralf Thielow
@ 2012-05-02 19:42 ` Christian Stimming
2012-05-03 7:42 ` Thomas Rast
1 sibling, 1 reply; 28+ messages in thread
From: Christian Stimming @ 2012-05-02 19:42 UTC (permalink / raw)
To: Thomas Rast
Cc: Ralf Thielow, Jiang Xin, Git List, Junio C Hamano, Jan Krüger
As one of the earlier translators: I agree with most of those as well. Thanks
a lot. However, one small remark:
Am Mittwoch, 2. Mai 2012, 15:49:27 schrieb Thomas Rast:
> @@ -676,11 +675,11 @@ msgstr "hinter "
>
> #: wt-status.c:908 wt-status.c:911
> msgid "ahead "
> -msgstr "über "
> +msgstr "weiter: "
>
> #: wt-status.c:913
> msgid ", behind "
> -msgstr ", hinter "
> +msgstr ", zurückgefallen "
>
> #: builtin/add.c:62
> #, c-format
> @@ -903,12 +902,12 @@ msgstr "Zweig '%s' zeigt auf keine Version"
> #: builtin/branch.c:396
> #, c-format
> msgid "behind %d] "
> -msgstr "hinter %d] "
> +msgstr "%d hinterher] "
>
> #: builtin/branch.c:398
> #, c-format
> msgid "ahead %d] "
> -msgstr "vor %d] "
> +msgstr "%d voraus] "
In the above hunk, you said "ahead = weiter" and "behind = zurückgefallen",
but now you say "ahead = voraus" and "behind = hinterher". Is it helpful to
use two different translations, or shouldn't those rather be chosen
identically? The second set sounds somewhat better to me, but the more
important question is whether both hunks should use the same translations.
Best Regards,
Christian
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH de.po 5/5] de.po: collection of suggestions
2012-05-02 19:42 ` Christian Stimming
@ 2012-05-03 7:42 ` Thomas Rast
2012-05-03 13:12 ` [PATCH on ab/i18n] branch: remove lego in i18n tracking info strings Nguyễn Thái Ngọc Duy
0 siblings, 1 reply; 28+ messages in thread
From: Thomas Rast @ 2012-05-03 7:42 UTC (permalink / raw)
To: Christian Stimming
Cc: Thomas Rast, Ralf Thielow, Jiang Xin, Git List, Junio C Hamano,
Jan Krüger
Christian Stimming <stimming@tuhh.de> writes:
> As one of the earlier translators: I agree with most of those as well. Thanks
> a lot. However, one small remark:
>
> Am Mittwoch, 2. Mai 2012, 15:49:27 schrieb Thomas Rast:
>> @@ -676,11 +675,11 @@ msgstr "hinter "
>>
>> #: wt-status.c:908 wt-status.c:911
>> msgid "ahead "
>> -msgstr "über "
>> +msgstr "weiter: "
>>
>> #: wt-status.c:913
>> msgid ", behind "
>> -msgstr ", hinter "
>> +msgstr ", zurückgefallen "
>>
>> #: builtin/add.c:62
>> #, c-format
>> @@ -903,12 +902,12 @@ msgstr "Zweig '%s' zeigt auf keine Version"
>> #: builtin/branch.c:396
>> #, c-format
>> msgid "behind %d] "
>> -msgstr "hinter %d] "
>> +msgstr "%d hinterher] "
>>
>> #: builtin/branch.c:398
>> #, c-format
>> msgid "ahead %d] "
>> -msgstr "vor %d] "
>> +msgstr "%d voraus] "
>
> In the above hunk, you said "ahead = weiter" and "behind = zurückgefallen",
> but now you say "ahead = voraus" and "behind = hinterher". Is it helpful to
> use two different translations, or shouldn't those rather be chosen
> identically? The second set sounds somewhat better to me, but the more
> important question is whether both hunks should use the same translations.
Yeah, sorry about that. The whole thing is a mess because of the lego
going on. It would probably be better to first patch the code into
shape so that it builds the displays in one step, and then translate
that. As it stands, it's very hard to translate because wt-status.c
does not even let you reposition the number.
--
Thomas Rast
trast@{inf,student}.ethz.ch
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH on ab/i18n] branch: remove lego in i18n tracking info strings
2012-05-03 7:42 ` Thomas Rast
@ 2012-05-03 13:12 ` Nguyễn Thái Ngọc Duy
2012-05-04 16:10 ` Junio C Hamano
0 siblings, 1 reply; 28+ messages in thread
From: Nguyễn Thái Ngọc Duy @ 2012-05-03 13:12 UTC (permalink / raw)
To: git
Cc: Thomas Rast, Christian Stimming, Ralf Thielow, Jiang Xin,
Junio C Hamano, Ævar Arnfjörð,
Jan Krüger, Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
On Thu, May 3, 2012 at 2:42 PM, Thomas Rast <trast@inf.ethz.ch> wrote:
> Christian Stimming <stimming@tuhh.de> writes:
>
>> As one of the earlier translators: I agree with most of those as well. Thanks
>> a lot. However, one small remark:
>>
>> Am Mittwoch, 2. Mai 2012, 15:49:27 schrieb Thomas Rast:
>>> @@ -676,11 +675,11 @@ msgstr "hinter "
>>>
>>> #: wt-status.c:908 wt-status.c:911
>>> msgid "ahead "
>>> -msgstr "über "
>>> +msgstr "weiter: "
>>>
>>> #: wt-status.c:913
>>> msgid ", behind "
>>> -msgstr ", hinter "
>>> +msgstr ", zurückgefallen "
>>>
>>> #: builtin/add.c:62
>>> #, c-format
>>> @@ -903,12 +902,12 @@ msgstr "Zweig '%s' zeigt auf keine Version"
>>> #: builtin/branch.c:396
>>> #, c-format
>>> msgid "behind %d] "
>>> -msgstr "hinter %d] "
>>> +msgstr "%d hinterher] "
>>>
>>> #: builtin/branch.c:398
>>> #, c-format
>>> msgid "ahead %d] "
>>> -msgstr "vor %d] "
>>> +msgstr "%d voraus] "
>>
>> In the above hunk, you said "ahead = weiter" and "behind = zurückgefallen",
>> but now you say "ahead = voraus" and "behind = hinterher". Is it helpful to
>> use two different translations, or shouldn't those rather be chosen
>> identically? The second set sounds somewhat better to me, but the more
>> important question is whether both hunks should use the same translations.
>
> Yeah, sorry about that. The whole thing is a mess because of the lego
> going on. It would probably be better to first patch the code into
> shape so that it builds the displays in one step, and then translate
> that. As it stands, it's very hard to translate because wt-status.c
> does not even let you reposition the number.
The translator in me totally agrees with you. I'll look into
wt-status legos, but we probably need better infrastructure to mix
color and text. Pseudo html tags to to mark color, like
"On branch <color1>%s</color1>" is probably not a bad idea.
builtin/branch.c | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 8813d2e..5011881 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -384,6 +384,7 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
int show_upstream_ref)
{
int ours, theirs;
+ const char *ref = NULL;
struct branch *branch = branch_get(branch_name);
if (!stat_tracking_info(branch, &ours, &theirs)) {
@@ -394,16 +395,28 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
return;
}
- strbuf_addch(stat, '[');
if (show_upstream_ref)
- strbuf_addf(stat, "%s: ",
- shorten_unambiguous_ref(branch->merge[0]->dst, 0));
- if (!ours)
- strbuf_addf(stat, _("behind %d] "), theirs);
- else if (!theirs)
- strbuf_addf(stat, _("ahead %d] "), ours);
- else
- strbuf_addf(stat, _("ahead %d, behind %d] "), ours, theirs);
+ ref = shorten_unambiguous_ref(branch->merge[0]->dst, 0);
+ if (!ours) {
+ if (ref)
+ strbuf_addf(stat, _("[%s: behind %d]"), ref, theirs);
+ else
+ strbuf_addf(stat, _("[behind %d]"), theirs);
+
+ } else if (!theirs) {
+ if (ref)
+ strbuf_addf(stat, _("[%s: ahead %d]"), ref, ours);
+ else
+ strbuf_addf(stat, _("[ahead %d]"), ours);
+ } else {
+ if (ref)
+ strbuf_addf(stat, _("[%s: ahead %d, behind %d]"),
+ ref, ours, theirs);
+ else
+ strbuf_addf(stat, _("[ahead %d, behind %d]"),
+ ours, theirs);
+ }
+ strbuf_addch(stat, ' ');
}
static int matches_merge_filter(struct commit *commit)
--
1.7.8.36.g69ee2
^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH on ab/i18n] branch: remove lego in i18n tracking info strings
2012-05-03 13:12 ` [PATCH on ab/i18n] branch: remove lego in i18n tracking info strings Nguyễn Thái Ngọc Duy
@ 2012-05-04 16:10 ` Junio C Hamano
2012-05-06 13:06 ` Nguyen Thai Ngoc Duy
0 siblings, 1 reply; 28+ messages in thread
From: Junio C Hamano @ 2012-05-04 16:10 UTC (permalink / raw)
To: Nguyễn Thái Ngọc Duy
Cc: git, Thomas Rast, Christian Stimming, Ralf Thielow, Jiang Xin,
Junio C Hamano, Ævar Arnfjörð,
Jan Krüger
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> Pseudo html tags to to mark color, like
> "On branch <color1>%s</color1>" is probably not a bad idea.
The output machinery needs to understand _some_ color mark-up if the
destination does not support ANSI colors natively, and there already is
such a code in compat/ for windows IIRC. Adding yet another color mark-up
wouldn't help anybody. I would suggest to just declare that internally we
use ANSI colors as the standard color mark-up and be done with it.
> builtin/branch.c | 31 ++++++++++++++++++++++---------
> 1 files changed, 22 insertions(+), 9 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 8813d2e..5011881 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -384,6 +384,7 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
> int show_upstream_ref)
> {
> int ours, theirs;
> + const char *ref = NULL;
> struct branch *branch = branch_get(branch_name);
>
> if (!stat_tracking_info(branch, &ours, &theirs)) {
> @@ -394,16 +395,28 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
> return;
> }
>
> - strbuf_addch(stat, '[');
> if (show_upstream_ref)
> - strbuf_addf(stat, "%s: ",
> - shorten_unambiguous_ref(branch->merge[0]->dst, 0));
> - if (!ours)
> - strbuf_addf(stat, _("behind %d] "), theirs);
> - else if (!theirs)
> - strbuf_addf(stat, _("ahead %d] "), ours);
> - else
> - strbuf_addf(stat, _("ahead %d, behind %d] "), ours, theirs);
> + ref = shorten_unambiguous_ref(branch->merge[0]->dst, 0);
> + if (!ours) {
> + if (ref)
> + strbuf_addf(stat, _("[%s: behind %d]"), ref, theirs);
> + else
> + strbuf_addf(stat, _("[behind %d]"), theirs);
> +
> + } else if (!theirs) {
> + if (ref)
> + strbuf_addf(stat, _("[%s: ahead %d]"), ref, ours);
> + else
> + strbuf_addf(stat, _("[ahead %d]"), ours);
> + } else {
> + if (ref)
> + strbuf_addf(stat, _("[%s: ahead %d, behind %d]"),
> + ref, ours, theirs);
> + else
> + strbuf_addf(stat, _("[ahead %d, behind %d]"),
> + ours, theirs);
> + }
> + strbuf_addch(stat, ' ');
You should free "ref" here, as it is an allocated piece of memory you own.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH on ab/i18n] branch: remove lego in i18n tracking info strings
2012-05-04 16:10 ` Junio C Hamano
@ 2012-05-06 13:06 ` Nguyen Thai Ngoc Duy
0 siblings, 0 replies; 28+ messages in thread
From: Nguyen Thai Ngoc Duy @ 2012-05-06 13:06 UTC (permalink / raw)
To: Junio C Hamano
Cc: git, Thomas Rast, Christian Stimming, Ralf Thielow, Jiang Xin,
Ævar Arnfjörð,
Jan Krüger
On Fri, May 4, 2012 at 11:10 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
>
>> Pseudo html tags to to mark color, like
>> "On branch <color1>%s</color1>" is probably not a bad idea.
>
> The output machinery needs to understand _some_ color mark-up if the
> destination does not support ANSI colors natively, and there already is
> such a code in compat/ for windows IIRC. Adding yet another color mark-up
> wouldn't help anybody. I would suggest to just declare that internally we
> use ANSI colors as the standard color mark-up and be done with it.
Ævar started a new thread about this and I elaborated a little bit
there [1]. We cannot just put straight ANSI colors in the string
because they are customizable. We don't know what color to put in the
string at compile time. So we need an intermediate color
representation for translators anyway to avoid fragmented strings. The
problem is which way is better, "On branch %s%s%s", "On branch
<color>%s</color>" or some other ways
[1] http://thread.gmane.org/gmane.comp.version-control.git/196869/focus=196908
--
Duy
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 0/5] de.po suggested updates
2012-05-02 13:49 ` [PATCH 0/5] de.po suggested updates Thomas Rast
` (4 preceding siblings ...)
2012-05-02 13:49 ` [PATCH de.po 5/5] de.po: collection of suggestions Thomas Rast
@ 2012-05-02 17:52 ` Ralf Thielow
2012-05-02 19:13 ` Christian Stimming
6 siblings, 0 replies; 28+ messages in thread
From: Ralf Thielow @ 2012-05-02 17:52 UTC (permalink / raw)
To: Thomas Rast
Cc: Jiang Xin, Git List, Junio C Hamano, Jan Krüger, Christian Stimming
> [2/5] does away with the "bare"->"leer" issue that I used as an
> example earlier. There's precedent in git-gui :-( This does
> raise the question if it's kosher to patch both git and git-gui
> at the same time, but if we want to keep the translations in
> sync it probably won't be the last such patch.
>
> [3/5] collects all the "obvious" stuff
>
> [4/5] and [5/5] gather the less-obvious stuff -- keep what you like.
Looks good.
I applied 2-4 and most of the 5th (i'll comment it for itself) on my
maint branch.
Thanks
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 0/5] de.po suggested updates
2012-05-02 13:49 ` [PATCH 0/5] de.po suggested updates Thomas Rast
` (5 preceding siblings ...)
2012-05-02 17:52 ` [PATCH 0/5] de.po suggested updates Ralf Thielow
@ 2012-05-02 19:13 ` Christian Stimming
6 siblings, 0 replies; 28+ messages in thread
From: Christian Stimming @ 2012-05-02 19:13 UTC (permalink / raw)
To: Thomas Rast
Cc: Ralf Thielow, Jiang Xin, Git List, Junio C Hamano, Jan Krüger
Am Mittwoch, 2. Mai 2012, 15:49:22 schrieb Thomas Rast:
> The rest are for Ralf.
>
> [2/5] does away with the "bare"->"leer" issue that I used as an
> example earlier. There's precedent in git-gui :-( This does
> raise the question if it's kosher to patch both git and git-gui
> at the same time, but if we want to keep the translations in
> sync it probably won't be the last such patch.
>
> [3/5] collects all the "obvious" stuff
>
> [4/5] and
As one of the earlier translators: I agree with all of those and I agree those
are completely improvements. Thanks for improving the translation!
Regards,
Christian
> [5/5] gather the less-obvious stuff -- keep what you like.
>
> Cheers,
> Thomas
>
> Thomas Rast (5):
> stash: make "saved" message translatable
> de.po: translate "bare" as "bloß"
> de.po: hopefully uncontroversial fixes
> de.po: translate "bad" as "ungültig" ("invalid")
> de.po: collection of suggestions
>
> git-gui/po/de.po | 4 +-
> git-stash.sh | 2 +-
> po/de.po | 153
> +++++++++++++++++++++++++----------------------------- 3 files changed, 74
> insertions(+), 85 deletions(-)
^ permalink raw reply [flat|nested] 28+ messages in thread