Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-12-03 Thread Michael J Gruber
Ralf Thielow venit, vidit, dixit 03.12.2012 05:48:
 Thanks Thomas and Michael!
 
 2012/11/30 Thomas Rast tr...@inf.ethz.ch:
 
  #: builtin/update-index.c:756
  msgid mark files as \index-only\
 -msgstr 
 +msgstr markiert Dateien als \index-only\

 Likewise, but here I don't even understand what the manpage is trying to
 tell me, in particular I don't see how it would be different from
 assume-unchanged.  Maybe see manpage would be the best documentation.
 
 I'm not really sure what to do with it. In this version (see below) I kept
 it. Did you mean we should add (siehe Hilfeseite) or something in the
 translation, or does it belong to the original message and the translation
 would just follow?


I'd say the translation above is fine, and no matter what language the
user messages are in, the user would have to consult the man page for
this very special feature, but I don't think we have to say so explicitly.

 +wiederholte Ausführung der Phasen #2 und #3 für die aufgelisteten Pfade

 ISTR we settled on something for 'stage', but it's not in the glossary.
 Either way I don't think this is it.  Ausführung der Phasen would mean
 that it's some part of a process, whereas the stages are a state.

 I've changed it to
 wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade
 What do you think?
 
 ---
  po/de.po | 123 
 +++
  1 file changed, 61 insertions(+), 62 deletions(-)
...
  #: builtin/fsck.c:620
  msgid also consider packs and alternate objects
 -msgstr betrachtet auch Pakete und wechselnde Objekte
 +msgstr 

Oops ;)

  #: builtin/push.c:391
  msgid check
 -msgstr Überprüfung
 +msgstr 

Is this meant to omit the text? (I may have missed the pertaining
discussion.)


  #: builtin/update-index.c:753
  msgid clear assumed-unchanged bit
 @@ -8568,7 +8567,7 @@ msgstr fügt Einträge von der Standard-Eingabe der 
 Bereitstellung hinzu
  #: builtin/update-index.c:776
  msgid repopulate stages #2 and #3 for the listed paths
  msgstr 
 -wiederholte Ausführung der Phasen #2 und #3 für die aufgelisteten Pfade
 +wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade

I can't seem to find the other occurence in de.po, but state should be
the same as in

copy out the files from named stage (checkout-index).

Zustand seems to be appropriate.

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


Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-12-03 Thread Ralf Thielow
2012/12/3 Michael J Gruber g...@drmicha.warpmail.net:
  1 file changed, 61 insertions(+), 62 deletions(-)
 ...
  #: builtin/fsck.c:620
  msgid also consider packs and alternate objects
 -msgstr betrachtet auch Pakete und wechselnde Objekte
 +msgstr 

 Oops ;)

  #: builtin/push.c:391
  msgid check
 -msgstr Überprüfung
 +msgstr 

 Is this meant to omit the text? (I may have missed the pertaining
 discussion.)


For now, we let these two messages untranslated.

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


Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-12-02 Thread Ralf Thielow
Thanks Thomas and Michael!

2012/11/30 Thomas Rast tr...@inf.ethz.ch:

  #: builtin/update-index.c:756
  msgid mark files as \index-only\
 -msgstr 
 +msgstr markiert Dateien als \index-only\

 Likewise, but here I don't even understand what the manpage is trying to
 tell me, in particular I don't see how it would be different from
 assume-unchanged.  Maybe see manpage would be the best documentation.

I'm not really sure what to do with it. In this version (see below) I kept
it. Did you mean we should add (siehe Hilfeseite) or something in the
translation, or does it belong to the original message and the translation
would just follow?

 +wiederholte Ausführung der Phasen #2 und #3 für die aufgelisteten Pfade

 ISTR we settled on something for 'stage', but it's not in the glossary.
 Either way I don't think this is it.  Ausführung der Phasen would mean
 that it's some part of a process, whereas the stages are a state.

I've changed it to
wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade
What do you think?

---
 po/de.po | 123 +++
 1 file changed, 61 insertions(+), 62 deletions(-)

diff --git a/po/de.po b/po/de.po
index 1f49610..5e14d9c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1978,7 +1978,7 @@ msgstr Pfade sind getrennt durch NUL Zeichen
 #: builtin/apply.c:4336
 msgid ensure at least n lines of context match
 msgstr 
-stellt sicher, dass mindestens Anzahl Zeilen des Kontextes übereinstimmen
+stellt sicher, dass mindestens n Zeilen des Kontextes übereinstimmen
 
 #: builtin/apply.c:4337
 msgid action
@@ -2167,7 +2167,7 @@ msgstr Unterdrückt den Namen des Autors und den 
Zeitstempel (Standard: aus)
 
 #: builtin/blame.c:2329
 msgid Show author email instead of name (Default: off)
-msgstr Zeigt anstatt des Namens die eMail-Adresse des Autors (Standard: aus)
+msgstr Zeigt anstatt des Namens die Email-Adresse des Autors (Standard: aus)
 
 #: builtin/blame.c:2330
 msgid Ignore whitespace differences
@@ -4072,7 +4072,7 @@ msgstr gibt nur exakte Übereinstimmungen aus
 
 #: builtin/describe.c:412
 msgid consider n most recent tags (default: 10)
-msgstr betrachtet die jüngsten Anzahl Markierungen (Standard: 10)
+msgstr betrachtet die jüngsten n Markierungen (Standard: 10)
 
 #: builtin/describe.c:414
 msgid only consider tags matching pattern
@@ -4143,7 +4143,7 @@ msgstr git fast-export [rev-list-opts]
 
 #: builtin/fast-export.c:635
 msgid show progress after n objects
-msgstr zeigt Fortschritt nach Anzahl Objekten an
+msgstr zeigt Fortschritt nach n Objekten an
 
 #: builtin/fast-export.c:637
 msgid select handling of signed tags
@@ -4422,7 +4422,7 @@ msgstr 
 #: builtin/fmt-merge-msg.c:13
 msgid git fmt-merge-msg [-m message] [--log[=n]|--no-log] [--file file]
 msgstr 
-git fmt-merge-msg [-m Beschreibung] [--log[=Anzahl]|--no-log] [--file 
+git fmt-merge-msg [-m Beschreibung] [--log[=n]|--no-log] [--file 
 Datei]
 
 #: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786
@@ -4433,7 +4433,7 @@ msgstr Anzahl
 
 #: builtin/fmt-merge-msg.c:654
 msgid populate log with at most n entries from shortlog
-msgstr fügt Historie mit höchstens Nummer Einträgen von \shortlog\ hinzu
+msgstr fügt Historie mit höchstens n Einträgen von \shortlog\ hinzu
 
 #: builtin/fmt-merge-msg.c:657
 msgid alias for --log (deprecated)
@@ -4457,23 +4457,23 @@ msgstr git for-each-ref [Optionen] [Muster]
 
 #: builtin/for-each-ref.c:994
 msgid quote placeholders suitably for shells
-msgstr quotiert Platzhalter geeignet für Shells
+msgstr formatiert Platzhalter als Shell-String
 
 #: builtin/for-each-ref.c:996
 msgid quote placeholders suitably for perl
-msgstr quotiert Platzhalter geeignet für Perl
+msgstr formatiert Platzhalter als Perl-String
 
 #: builtin/for-each-ref.c:998
 msgid quote placeholders suitably for python
-msgstr quotiert Platzhalter geeignet für Python
+msgstr formatiert Platzhalter als Python-String
 
 #: builtin/for-each-ref.c:1000
 msgid quote placeholders suitably for tcl
-msgstr quotiert Platzhalter geeignet für TCL
+msgstr formatiert Platzhalter als TCL-String
 
 #: builtin/for-each-ref.c:1003
 msgid show only n matched refs
-msgstr zeigt nur Nummer passende Referenzen
+msgstr zeigt nur n passende Referenzen
 
 #: builtin/for-each-ref.c:1004
 msgid format
@@ -4489,7 +4489,7 @@ msgstr Schüssel
 
 #: builtin/for-each-ref.c:1006
 msgid field name to sort on
-msgstr Name des Felder zum Sortieren
+msgstr sortiere nach diesem Feld
 
 #: builtin/fsck.c:608
 msgid git fsck [options] [object...]
@@ -4521,7 +4521,7 @@ msgstr erzeugt Kopfknoten des Referenzprotokolls 
(Standard)
 
 #: builtin/fsck.c:620
 msgid also consider packs and alternate objects
-msgstr betrachtet auch Pakete und wechselnde Objekte
+msgstr 
 
 #: builtin/fsck.c:621
 msgid enable more strict checking
@@ -4645,7 +4645,7 @@ msgstr findet Übereinstimmungen unabhängig von Groß- und 
Kleinschreibung
 
 #: builtin/grep.c:741
 msgid match patterns only at word 

Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-11-29 Thread Michael J Gruber
Ralf Thielow venit, vidit, dixit 28.11.2012 19:22:
 Hi Ralf,

 This is the middle third of my review.  Sorry for the long wait!  I hope
 it can still be useful.

 
 Hi Thomas,
 
 no problem. Thanks for your review. Of course it's very useful.
 Some of the mistakes I made are so obvious that I can't say what
 I've had in mind when translation these messages :/ But some aren't,
 so thanks for the further explanations within your review.
 
 I don't really share your apparent aversion to just using n :-)
 I don't really have one :) so I'm fine with using n.
 
 This would be a good time to settle on a good translation for
 rewriting.  Perhaps neu schreiben.  Überschreiben to me implies
 On some other places we actually use neu schreiben.

How about umschreiben? neu schreiben is more like write from
scratch, whereas rewrite is more often about taking a given base and
modifying it.

 -msgstr 
 +msgstr erzeugt kleinere Pakete

 Smaller is not really the point: they are packs that do not have the
 [...]
 You could call them abgespeckt ;-)
 I used dünner!?
 
 Furthermore I've unified the translation of email to Email,
 not eMail. You'll see the result below. I hope I haven't missed
 something.
 
 Thanks,
 Ralf
 
 ---
  po/de.po | 95 
 
  1 file changed, 47 insertions(+), 48 deletions(-)
 
 diff --git a/po/de.po b/po/de.po
 index fe6e8cf..1a75ea2 100644
 --- a/po/de.po
 +++ b/po/de.po
...
  #: builtin/fsck.c:608
  msgid git fsck [options] [object...]
 @@ -4521,7 +4521,7 @@ msgstr erzeugt Kopfknoten des Referenzprotokolls 
 (Standard)
  
  #: builtin/fsck.c:620
  msgid also consider packs and alternate objects
 -msgstr betrachtet auch Pakete und wechselnde Objekte
 +msgstr 

alternate objects (hopefully) don't change much, so that wechselnde
is misleading.

Is there a set translation standard for the alternative object store
mechanism in git (alternates)? Otherwise alternative Objekte may be
choice which is close to the original and conveys the aspect that they
are objects from an alternative store.


  #: builtin/grep.c:817
  msgid indicate hit with exit status without output
 -msgstr kennzeichnet Übereinstimmungen mit Beendigungsstatus, ohne Ausgabe
 +msgstr zeigt Übereinstimmungen mit Beendigungsstatus, ohne Ausgabe

maybe zeigt Übereinstimmungen nur durch Beendigungsstatus an

mit sounds like including, additionally. Also, nothing is shown
(zeigt), but something is indicated (zeigt an).


  #: builtin/log.c:102
  msgid decorate options
 -msgstr Ausgabeoptionen
 +msgstr decorate Optionen

decorate-Optionen (unless we want to match the standard set by the bad
old KR translation ;) )


  #: builtin/log.c:1098
  msgid add To: header
 -msgstr fügt Kopfteil \To:\ hinzu
 +msgstr fügt  \To:\ Header hinzu

Here and in the following I'd a -, e.g.

msgstr fügt  \To:\-Header hinzu

  #: builtin/log.c:1100
  msgid add Cc: header
 -msgstr fügt Kopteil \Cc:\ hinzu
 +msgstr fügt \Cc:\ Header hinzu
...
 -lädt Konfiguration für Kommando beim Überschreiben von Versionen 
 +lädt Konfiguration für Kommando beim Neuschreiben von Versionen 
  (impliziert --stdin)

Umschreiben (if that becomes the agreed upon term for rewrite).

Just my two Pfennig ;)

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


Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-11-29 Thread Thomas Rast
Hi Ralf

Here is the final third of my review.

  #: builtin/prune-packed.c:7
  msgid git prune-packed [-n|--dry-run] [-q|--quiet]
 -msgstr 
 +msgstr git prune-packed [-n|--dry-run] [-q|--quite]
 ^
typo at the far end

  #: builtin/prune.c:133
 -#, fuzzy
  msgid report pruned objects
 -msgstr kann Objekt %s nicht lesen
 +msgstr meldet entfernte Objekte

If you translate pruned as gelöscht or some such, that avoids the
ambiguity with remote.

  #: builtin/prune.c:136
  msgid expire objects older than time
 -msgstr 
 +msgstr lässt Objekte älter als Zeit verfallen

verfallen is nice!

  #: builtin/push.c:391
  msgid check
 -msgstr 
 +msgstr Überprüfung

I think the original string should not be translatable to begin with.
The manpage says

  --recurse-submodules=check|on-demand
  Make sure all submodule commits used by the revisions to be pushed
  are available on a remote tracking branch. If *check* is used git
  will verify that all submodule commits that changed in the
  revisions to be pushed are available on at least one remote of the
  submodule. If any commits are missing the push will be aborted and
  exit with non-zero status. If *on-demand* is used all submodules
  that changed in the revisions to be pushed will be pushed. If
  on-demand was not able to push all necessary revisions it will
  also be aborted and exit with non-zero status.

So 'check' is not translatable.

  #: builtin/push.c:395 builtin/push.c:396
  msgid receive pack program
 -msgstr 
 +msgstr Programm zum Empfangen von Paketen

Or perhaps 'receive-pack' Programm.

  #: builtin/read-tree.c:111
 -#, fuzzy
  msgid only empty the index
 -msgstr Konnte die Bereitstellung nicht lesen
 +msgstr leert nur die Bereitstellung

Only here means it doesn't read-a-tree, but empty the index.  So
dropping the nur would probably be better.

  #: builtin/remote.c:11
  msgid git remote [-v | --verbose]
 -msgstr 
 +msgstr git remove [-v | --verbose]
  ^^^
typo

  #: builtin/remote.c:173
  msgid set up remote as a mirror to push to or fetch from
  msgstr 
 +Aufsetzen der Fernarchivs als Spiegelarchiv zum Versenden und Anfordern
  ^^^
des?

  Run \git rev-parse --parseopt -h\ for more information on the first 
 usage.
  msgstr 
 +git rev-parse --parseopt [Optionen] -- [Argumente...]\n
 +   or: git rev-parse --sq-quote [Argumente...]\n
 +   or: git rev-parse [Optionen] [Argumente...]\n
 +\n
 +Führe \git rev-parse --parseopt -h\ für weitere Informationen bei erster 
 +Verwendung aus.

Should use 'oder:' in the case split, shouldn't it?

  #: builtin/rm.c:134
 -#, fuzzy
  msgid do not list removed files
 -msgstr Kann geänderte Dateien nicht aus der Bereitstellung herausnehmen
 +msgstr listet keine entfernten Dateien auf

Again removed-gelöscht or some such avoids an ambiguity.

  #: builtin/show-branch.c:651
 -#, fuzzy
  msgid show remote-tracking and local branches
 -msgstr Kein externer Übernahmezweig für %s von %s
 +msgstr zeigt externer Übernahmezweige und lokale Zweige an
  ^^^
[...]
  #: builtin/show-branch.c:653
 -#, fuzzy
  msgid show remote-tracking branches
 -msgstr Kein externer Übernahmezweig für %s von %s
 +msgstr zeigt externer Übernahmezweige an
  ^^^

extern*e*

  #: builtin/tag.c:464
 -#, fuzzy
  msgid use another key to sign the tag
 -msgstr konnte Markierung nicht signieren
 +msgstr benutzt einen Schlüssel um die Markierung zu signieren

The original says *another* -- maybe

  benutzt einen anderen Schlüssel um die Markierung zu signieren

  #: builtin/update-index.c:750
  msgid mark files as \not changing\
 -msgstr 
 +msgstr markiert Dateien als \not changing\

Neither original nor translation are very helpful.  Maybe

  Always assume this file to be unchanged
  Betrachte diese Datei immer als unverändert

  #: builtin/update-index.c:756
  msgid mark files as \index-only\
 -msgstr 
 +msgstr markiert Dateien als \index-only\

Likewise, but here I don't even understand what the manpage is trying to
tell me, in particular I don't see how it would be different from
assume-unchanged.  Maybe see manpage would be the best documentation.

  #: builtin/update-index.c:776
  msgid repopulate stages #2 and #3 for the listed paths
  msgstr 
 +wiederholte Ausführung der Phasen #2 und #3 für die aufgelisteten Pfade

ISTR we settled on something for 'stage', but it's not in the glossary.
Either way I don't think this is it.  Ausführung der Phasen would mean
that it's some part of a process, whereas the stages are a state.


Yay, that's it.  Even in three parts it was tedious, and I cannot begin
to imagine what *writing* 825 new translations must have felt like.
Thanks for your work!

- Thomas

-- 
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  

Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-11-28 Thread Ralf Thielow
 Hi Ralf,

 This is the middle third of my review.  Sorry for the long wait!  I hope
 it can still be useful.


Hi Thomas,

no problem. Thanks for your review. Of course it's very useful.
Some of the mistakes I made are so obvious that I can't say what
I've had in mind when translation these messages :/ But some aren't,
so thanks for the further explanations within your review.

 I don't really share your apparent aversion to just using n :-)
I don't really have one :) so I'm fine with using n.

 This would be a good time to settle on a good translation for
 rewriting.  Perhaps neu schreiben.  Überschreiben to me implies
On some other places we actually use neu schreiben.

 -msgstr 
 +msgstr erzeugt kleinere Pakete

 Smaller is not really the point: they are packs that do not have the
[...]
 You could call them abgespeckt ;-)
I used dünner!?

Furthermore I've unified the translation of email to Email,
not eMail. You'll see the result below. I hope I haven't missed
something.

Thanks,
Ralf

---
 po/de.po | 95 
 1 file changed, 47 insertions(+), 48 deletions(-)

diff --git a/po/de.po b/po/de.po
index fe6e8cf..1a75ea2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1978,7 +1978,7 @@ msgstr Pfade sind getrennt durch NUL Zeichen
 #: builtin/apply.c:4336
 msgid ensure at least n lines of context match
 msgstr 
-stellt sicher, dass mindestens Anzahl Zeilen des Kontextes übereinstimmen
+stellt sicher, dass mindestens n Zeilen des Kontextes übereinstimmen
 
 #: builtin/apply.c:4337
 msgid action
@@ -2167,7 +2167,7 @@ msgstr Unterdrückt den Namen des Autors und den 
Zeitstempel (Standard: aus)
 
 #: builtin/blame.c:2329
 msgid Show author email instead of name (Default: off)
-msgstr Zeigt anstatt des Namens die eMail-Adresse des Autors (Standard: aus)
+msgstr Zeigt anstatt des Namens die Email-Adresse des Autors (Standard: aus)
 
 #: builtin/blame.c:2330
 msgid Ignore whitespace differences
@@ -4072,7 +4072,7 @@ msgstr gibt nur exakte Übereinstimmungen aus
 
 #: builtin/describe.c:412
 msgid consider n most recent tags (default: 10)
-msgstr betrachtet die jüngsten Anzahl Markierungen (Standard: 10)
+msgstr betrachtet die jüngsten n Markierungen (Standard: 10)
 
 #: builtin/describe.c:414
 msgid only consider tags matching pattern
@@ -4143,7 +4143,7 @@ msgstr git fast-export [rev-list-opts]
 
 #: builtin/fast-export.c:635
 msgid show progress after n objects
-msgstr zeigt Fortschritt nach Anzahl Objekten an
+msgstr zeigt Fortschritt nach n Objekten an
 
 #: builtin/fast-export.c:637
 msgid select handling of signed tags
@@ -4422,7 +4422,7 @@ msgstr 
 #: builtin/fmt-merge-msg.c:13
 msgid git fmt-merge-msg [-m message] [--log[=n]|--no-log] [--file file]
 msgstr 
-git fmt-merge-msg [-m Beschreibung] [--log[=Anzahl]|--no-log] [--file 
+git fmt-merge-msg [-m Beschreibung] [--log[=n]|--no-log] [--file 
 Datei]
 
 #: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786
@@ -4433,7 +4433,7 @@ msgstr Anzahl
 
 #: builtin/fmt-merge-msg.c:654
 msgid populate log with at most n entries from shortlog
-msgstr fügt Historie mit höchstens Nummer Einträgen von \shortlog\ hinzu
+msgstr fügt Historie mit höchstens n Einträgen von \shortlog\ hinzu
 
 #: builtin/fmt-merge-msg.c:657
 msgid alias for --log (deprecated)
@@ -4457,23 +4457,23 @@ msgstr git for-each-ref [Optionen] [Muster]
 
 #: builtin/for-each-ref.c:994
 msgid quote placeholders suitably for shells
-msgstr quotiert Platzhalter geeignet für Shells
+msgstr formatiert Platzhalter als Shell-String
 
 #: builtin/for-each-ref.c:996
 msgid quote placeholders suitably for perl
-msgstr quotiert Platzhalter geeignet für Perl
+msgstr formatiert Platzhalter als Perl-String
 
 #: builtin/for-each-ref.c:998
 msgid quote placeholders suitably for python
-msgstr quotiert Platzhalter geeignet für Python
+msgstr formatiert Platzhalter als Python-String
 
 #: builtin/for-each-ref.c:1000
 msgid quote placeholders suitably for tcl
-msgstr quotiert Platzhalter geeignet für TCL
+msgstr formatiert Platzhalter als TCL-String
 
 #: builtin/for-each-ref.c:1003
 msgid show only n matched refs
-msgstr zeigt nur Nummer passende Referenzen
+msgstr zeigt nur n passende Referenzen
 
 #: builtin/for-each-ref.c:1004
 msgid format
@@ -4489,7 +4489,7 @@ msgstr Schüssel
 
 #: builtin/for-each-ref.c:1006
 msgid field name to sort on
-msgstr Name des Felder zum Sortieren
+msgstr sortiere nach diesem Feld
 
 #: builtin/fsck.c:608
 msgid git fsck [options] [object...]
@@ -4521,7 +4521,7 @@ msgstr erzeugt Kopfknoten des Referenzprotokolls 
(Standard)
 
 #: builtin/fsck.c:620
 msgid also consider packs and alternate objects
-msgstr betrachtet auch Pakete und wechselnde Objekte
+msgstr 
 
 #: builtin/fsck.c:621
 msgid enable more strict checking
@@ -4645,7 +4645,7 @@ msgstr findet Übereinstimmungen unabhängig von Groß- und 
Kleinschreibung
 
 #: builtin/grep.c:741
 msgid match patterns only at word boundaries
-msgstr findet Muster nur 

Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-11-27 Thread Thomas Rast
  #: builtin/pack-refs.c:6
  msgid git pack-refs [options]
 -msgstr 
 +msgstr git pack-refs [Optionen]
  
  #: builtin/pack-refs.c:14
  msgid pack everything
 -msgstr 
 +msgstr packt alles
  
  #: builtin/pack-refs.c:15
  msgid prune loose refs (default)
 -msgstr 
 +msgstr entfernt lose Referenzen (Standard)
  
  #: builtin/prune-packed.c:7
  msgid git prune-packed [-n|--dry-run] [-q|--quiet]
 -msgstr 
 +msgstr git prune-packed [-n|--dry-run] [-q|--quite]
  
  #: builtin/prune.c:12
  msgid git prune [-n] [-v] [--expire time] [--] [head...]
 -msgstr 
 +msgstr git prune [-n] [-v] [--expire Zeit] [--] [Zweigspitze...]
  
  #: builtin/prune.c:132
 -#, fuzzy
  msgid do not remove, show only
 -msgstr Würde nicht entfernen %s\n
 +msgstr nicht entfernen, nur anzeigen
  
  #: builtin/prune.c:133
 -#, fuzzy
  msgid report pruned objects
 -msgstr kann Objekt %s nicht lesen
 +msgstr meldet entfernte Objekte
  
  #: builtin/prune.c:136
  msgid expire objects older than time
 -msgstr 
 +msgstr lässt Objekte älter als Zeit verfallen
  
  #: builtin/push.c:14
 -#, fuzzy
  msgid git push [options] [repository [refspec...]]
 -msgstr git apply [Optionen] [Patch...]
 +msgstr git push [Optionen] [Projektarchiv [Referenzspezifikation...]]
  
  #: builtin/push.c:45
  msgid tag shorthand without tag
 @@ -7141,55 +7098,53 @@ msgid --all and --mirror are incompatible
  msgstr --all und --mirror sind inkompatibel
  
  #: builtin/push.c:382
 -#, fuzzy
  msgid repository
 -msgstr ungültiges Projektarchiv '%s'
 +msgstr Projektarchiv
  
  #: builtin/push.c:383
  msgid push all refs
 -msgstr 
 +msgstr versendet alle Referenzen
  
  #: builtin/push.c:384
  msgid mirror all refs
 -msgstr 
 +msgstr spiegelt alle Referenzen
  
  #: builtin/push.c:386
 -#, fuzzy
  msgid delete refs
 -msgstr gelöscht
 +msgstr löscht Referenzen
  
  #: builtin/push.c:387
  msgid push tags (can't be used with --all or --mirror)
  msgstr 
 +versendet Markierungen (kann nicht mit --all oder --mirror benutzt werden)
  
  #: builtin/push.c:390
 -#, fuzzy
  msgid force updates
 -msgstr Aktualisierung erzwungen
 +msgstr erzwingt Aktualisierung
  
  #: builtin/push.c:391
  msgid check
 -msgstr 
 +msgstr Überprüfung
  
  #: builtin/push.c:392
  msgid control recursive pushing of submodules
 -msgstr 
 +msgstr steuert rekursives Versenden von Unterprojekten
  
  #: builtin/push.c:394
  msgid use thin pack
 -msgstr 
 +msgstr benutzt kleinere Pakete
  
  #: builtin/push.c:395 builtin/push.c:396
  msgid receive pack program
 -msgstr 
 +msgstr Programm zum Empfangen von Paketen
  
  #: builtin/push.c:397
  msgid set upstream for git pull/status
 -msgstr 
 +msgstr setzt externes Projektarchiv für \git pull/status\
  
  #: builtin/push.c:400
  msgid prune locally removed refs
 -msgstr 
 +msgstr entfernt lokal gelöschte Referenzen
  
  #: builtin/push.c:410
  msgid --delete is incompatible with --all, --mirror and --tags
 @@ -7205,155 +7160,160 @@ msgid 
  [-u [--exclude-per-directory=gitignore] | -i]] [--no-sparse-checkout] [--
  index-output=file] (--empty | tree-ish1 [tree-ish2 [tree-ish3]])
  msgstr 
 +git read-tree [[-m [--trivial] [--aggressive] | --reset | 
 --prefix=Prefix] 
 +[-u [--exclude-per-directory=gitignore] | -i]] [--no-sparse-checkout] [--
 +index-output=Datei] (--empty | Versionsreferenz1 [Versionsreferenz2 
 +[Versionsreferenz3]])
  
  #: builtin/read-tree.c:108
 -#, fuzzy
  msgid write resulting index to file
 -msgstr beschädigte Bereitstellungsdatei
 +msgstr schreibt resultierende Bereitstellung nach Datei
  
  #: builtin/read-tree.c:111
 -#, fuzzy
  msgid only empty the index
 -msgstr Konnte die Bereitstellung nicht lesen
 +msgstr leert nur die Bereitstellung
  
  #: builtin/read-tree.c:113
 -#, fuzzy
  msgid Merging
 -msgstr Zusammenführung:
 +msgstr Zusammenführung
  
  #: builtin/read-tree.c:115
  msgid perform a merge in addition to a read
 -msgstr 
 +msgstr führt eine Zusammenführung zusätzlich zum Lesen aus
  
  #: builtin/read-tree.c:117
  msgid 3-way merge if no file level merging required
  msgstr 
 +3-Wege-Zusammenführung, wenn keine Zusammenführung auf Dateiebene 
 +erforderlich ist
  
  #: builtin/read-tree.c:119
  msgid 3-way merge in presence of adds and removes
  msgstr 
 +3-Wege-Zusammenführung bei Vorhandensein von hinzugefügten/entfernten 
 Zeilen
  
  #: builtin/read-tree.c:121
  msgid same as -m, but discard unmerged entries
 -msgstr 
 +msgstr genau wie -m, verwirft aber nicht zusammengeführte Einträge
  
  #: builtin/read-tree.c:122
 -#, fuzzy
  msgid subdirectory/
 -msgstr Verzeichnis/Datei
 +msgstr Unterverzeichnis/
  
  #: builtin/read-tree.c:123
  msgid read the tree into the index under subdirectory/
 -msgstr 
 +msgstr liest den Baum in die Bereitstellung unter Unterverzeichnis/
  
  #: builtin/read-tree.c:126
  msgid update working tree with merge result
 -msgstr 
 +msgstr aktualisiert Arbeitsbaum mit Ergebnis der Zusammenführung
  
  #: builtin/read-tree.c:128
 -#, fuzzy
  msgid gitignore
 -msgstr Ignorierte
 +msgstr gitignore
 

Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-11-27 Thread Thomas Rast
Hi Ralf,

This is the middle third of my review.  Sorry for the long wait!  I hope
it can still be useful.

Also, sorry for the other mail that I just sent out seconds ago.  That
was what I wanted to save as to be done in the last third, but
I accidentally hit the wrong key and sent it out.

- Thomas


 @@ -4459,6 +4423,8 @@ msgstr 
  #: builtin/fmt-merge-msg.c:13
  msgid git fmt-merge-msg [-m message] [--log[=n]|--no-log] [--file 
 file]
  msgstr 
 +git fmt-merge-msg [-m Beschreibung] [--log[=Anzahl]|--no-log] [--file 
 +Datei]
  
  #: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786
  #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192
 @@ -4468,115 +4434,111 @@ msgstr Anzahl
  
  #: builtin/fmt-merge-msg.c:654
  msgid populate log with at most n entries from shortlog
 -msgstr 
 +msgstr fügt Historie mit höchstens Nummer Einträgen von \shortlog\ 
 hinzu

I don't really share your apparent aversion to just using n :-)

  #: builtin/for-each-ref.c:994
  msgid quote placeholders suitably for shells
 -msgstr 
 +msgstr quotiert Platzhalter geeignet für Shells
[...]
  #: builtin/for-each-ref.c:996
  msgid quote placeholders suitably for perl
 +msgstr quotiert Platzhalter geeignet für Perl
[etc]

quote is a hard one, and quotiert sounds very wrong to me.  How
about weaseling out along the lines of

  Formatiert Platzhalter als {Shell|Perl|Python|TCL} Zeichenfolge

or even Shell-String.

  #: builtin/for-each-ref.c:1003
  msgid show only n matched refs
 -msgstr 
 +msgstr zeigt nur Nummer passende Referenzen

This should be Anzahl if you insist on translating the 'n'.

  #: builtin/for-each-ref.c:1006
  msgid field name to sort on
 -msgstr 
 +msgstr Name des Felder zum Sortieren

Feld_s_?

Or just sortiere nach diesem Feld.

  #: builtin/fsck.c:618
  msgid make index objects head nodes
 -msgstr 
 +msgstr erzeugt Kopfknoten der Bereitstellungsobjekte

The English version is equally obscure, but this refers to (also)
walking the objects listed in the index.  Furthermore, --cache is
actually the default if you don't list any objects to walk.

  #: builtin/fsck.c:620
  msgid also consider packs and alternate objects
 -msgstr 
 +msgstr betrachtet auch Pakete und wechselnde Objekte

The glossary tells me pack - Archiv.

An alternate object [store] is essentially a pointer to the object store
of another repository.  It may best be left untranslated, as it's a
pretty advanced feature.

  #: builtin/grep.c:741
  msgid match patterns only at word boundaries
 -msgstr 
 +msgstr findet Muster nur innerhalb von Wörtern

The translation gets the purpose wrong: the option forces a
word-boundary match on either side of the pattern, so that you will find
only one or more words matching the pattern.  The manpage has a precise
definition:

Match the pattern only at word boundary (either begin at the
beginning of a line, or preceded by a non-word character; end at
the end of a line or followed by a non-word character).

Maybe suche nur ganze Wörter would suffice as a concise description.

  #: builtin/grep.c:817
  msgid indicate hit with exit status without output
 -msgstr 
 +msgstr kennzeichnet Übereinstimmungen mit Beendigungsstatus, ohne Ausgabe

The indicate should be zeigen or some such, since it only tells
whether there were any matches at all.

I spent some time looking for a better translation of exit status, but
couldn't find anything helpful (such as a German translation of diff(1)
or a Wikipedia page on exit status).

  #: builtin/hash-object.c:77
  msgid process file as it were from this path
 -msgstr 
 +msgstr verarbeitet Datei, wie es von diesem Pfad wäre

als ob sie von diesem Pfad wäre?

  #: builtin/help.c:47
  msgid show info page
 -msgstr 
 +msgstr zeigt Informationsseite

info here refers to GNU info, presumably it should be left as
info-Seite or some such.

  #: builtin/index-pack.c:1106
  msgid confusion beyond insanity
 @@ -5150,12 +5111,12 @@ msgstr Fehler beim Auflösen der Unterschiede
  #: builtin/index-pack.c:1112
  #, c-format
  msgid completed with %d local objects
 -msgstr 
 +msgstr fertiggestellt mit %d lokalen Objekten

*vervollständigt* mit %d lokalen Objekten

  #: builtin/log.c:102
  msgid decorate options
 -msgstr 
 +msgstr Ausgabeoptionen

'decorate' is the option to mark commits by the refs pointing at them,
and should probably not be translated.

The English version is quite tautological though, since it just turns
into

--decorate[=...]  decorate options

  #: builtin/log.c:1091
  msgid don't include a patch matching a commit upstream
  msgstr 
 +schließt keine Patches ein, die einer Version im externen Projektarchiv 
 +entsprechen

Upstream refers to the notional upstream state, which does not even have
to be a branch here.  I.e., if you say

  git format-patch --ignore-if-in-upstream commit

then it will format the range 'commit..HEAD', ignoring patches that are
already in 'HEAD..commit'.

So it's not an upstream 

Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-10-13 Thread Thomas Rast
Hi Ralf

I just realized that, unfortunately, your original message is far beyond
the message size limit on vger (10 bytes according to [1]).  So
nobody outside of the Cc list has seen it...

Note for other readers: the glossary (also mentioned a few times below)
is at

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

We're using it to keep things consistent.


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

  msgid git archive --list
 -msgstr git archive: NACK %s
 +msgstr git archive --list

I suppose a literal command invocation shouldn't be translatable in the
first place.

  #: archive.c:322
  msgid archive format
 -msgstr 
 +msgstr Archivformat

This is a bit tricky because you call a repository Projektarchiv.  The
simplest solution I can come up with is replacing all instances of
archive in the messages of git-archive with Ausgabe (output).  Still
leaves the confusion between git-archive's name and the Projektarchiv,
though.

  #: archive.c:324
  msgid prepend prefix to each pathname in the archive
 -msgstr 
 +msgstr stellt einen Prefix vor jeden Pfadnamen in dem Archiv

Präfix?

  #: archive.c:346 builtin/archive.c:95 builtin/notes.c:616
 -#, fuzzy
  msgid command
 -msgstr führe $command aus
 +msgstr Kommando
  
  #: archive.c:347 builtin/archive.c:96
  msgid path to the remote git-upload-archive command
 -msgstr 
 +msgstr Pfad zum externen \git-upload-archive\ Kommando

In both of these it may be less strange to call it Programm, since
you're supposed to give it the path to the git-upload-archive program.

  #: wt-status.c:1040
 -#, fuzzy, c-format
 +#, c-format
  msgid nothing to commit (create/copy files and use \git add\ to track)\n
 -msgstr  (Erstelle/Kopiere Dateien und benutze \git add\ zum Beobachten)
 +msgstr 
 +nichts zum Eintragen (Erstelle/Kopiere Dateien und benutze \git add\ zum 
 +Beobachten)\n
  
  #: wt-status.c:1043 wt-status.c:1048
 -#, fuzzy, c-format
 +#, c-format
  msgid nothing to commit\n
 -msgstr nichts zum Eintragen%s\n
 +msgstr nichts zum Eintragen\n

In these and others, nichts einzutragen would sound nicer.

  #: builtin/add.c:322
 -#, fuzzy
  msgid interactive picking
 -msgstr interaktives Hinzufügen fehlgeschlagen
 +msgstr interaktives Pflücken

interaktives Auswählen would let us reserve pflücken for
cherry-picking (and similar operations, e.g. in the TODO sheet of rebase
-i).

  #: builtin/add.c:327
  msgid record only the fact that the path will be added later
 -msgstr 
 +msgstr speichert nur den Fakt, dass der Pfad später hinzugefügt wird

Fakt? :-)

How about:

  speichert nur, dass der Pfad später hinzugefügt werden soll

  #: builtin/add.c:331
  msgid check if - even missing - files are ignored in dry run
 -msgstr 
 +msgstr prüft ob - auch fehlende - Dateien im Trockenlauf ignoriert werden

You called dry run a Probelauf earlier, which I liked better.

  #: builtin/blame.c:2316
  msgid Show blame entries as we find them, incrementally
 -msgstr 
 +msgstr Zeigt \blame\-Einträge wie gefunden, schrittweise

Zeigt blame-Einträge schrittweise, während wir sie generieren

(or something along those lines, but wie gefunden makes no sense)

  #: builtin/blame.c:2317
  msgid Show blank SHA-1 for boundary commits (Default: off)
 -msgstr 
 +msgstr Zeigt leere SHA-1 für Grenzversionen (Standard: off)
  
  #: builtin/blame.c:2318
  msgid Do not treat root commits as boundaries (Default: off)
 -msgstr 
 +msgstr Behandelt Ursprungsversionen nicht als Grenzen (Standard: off)

Standard: aus?  It's not like it takes an argument on or off.
This is in a lot of the messages of git-blame.

I added {root,boundary} commit to the glossary according to these.

  #: builtin/blame.c:2331
  msgid Spend extra cycles to find better match
 -msgstr 
 +msgstr führt zusätzliche Durchläufe für bessere Übereinstimmungen durch

Cycles here does not mean Durchläufe (cycles through a loop) but CPU
cycles.  How about

  arbeite länger, um bessere Übereinstimmungen zu finden

  #: builtin/branch.c:724
 -#, fuzzy
  msgid Generic options
 -msgstr Ungültige Option: %s
 +msgstr Generische Optionen

Allgemeine Optionen?

  #: builtin/branch.c:726
  msgid show hash and subject, give twice for upstream branch
  msgstr 
 +Zeigt Hash und Betreff, doppelte Angabe für Anzeige des externen 
 +Übernahmezweiges

I don't think I would understand the doppelte Angabe.  How about

  Zeigt Hash und Betreff; -vv: zusätzlich externen Übernahmezweig

  #: builtin/branch.c:727
  msgid suppress informational messages
 -msgstr 
 +msgstr unterdrückt informatorische Meldungen

I don't think that's a word.  unterdrückt Informationsmeldungen?

  #: builtin/branch.c:762
 -#, fuzzy
  msgid force creation (when already exists)
 -msgstr externes Projektarchiv %s existiert bereits
 +msgstr erzwingt Erzeugung (wenn dieser bereits existiert)

Erzeuge auch, wenn der Zweig bereits existiert?

Not a big difference, but avoids Erzeugung.

  #: builtin/branch.c:876
  #, c-format
  msgid Branch '%s' has no upstream information
 -msgstr