[RFC] l10n: de.po: translate 76 new messages

[RFC] l10n: de.po: translate 76 new messages

[Ralf Thielow]

Translate 76 new messages came from git.pot update
in 3b6137f (l10n: Update git.pot (76 new, 4 removed
messages)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---

Hi German l10n team,

please review this update of German translation.
Please note that this patch is based on a preparation
commit which just contains the "msgmerge", so it might
not be applicable directly.

Thanks

 po/de.po | 214 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 114 insertions(+), 100 deletions(-)

diff --git a/po/de.po b/po/de.po
index 679f14b..a208c56 100644
--- a/po/de.po
+++ b/po/de.po
@@ -232,9 +232,8 @@ msgstr ""
 "%s"
 
 #: diff.c:1400
-#, fuzzy
 msgid " 0 files changed"
-msgstr " 0 Dateien geändert\n"
+msgstr " 0 Dateien geändert"
 
 #: diff.c:1404
 #, c-format
@@ -351,57 +350,56 @@ msgstr[1] ""
 #: merge-recursive.c:190
 #, c-format
 msgid "(bad commit)\n"
-msgstr ""
+msgstr "(ungültige Version)\n"
 
 #: merge-recursive.c:206
-#, fuzzy, c-format
+#, c-format
 msgid "addinfo_cache failed for path '%s'"
-msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
+msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen"
 
 #: merge-recursive.c:268
-#, fuzzy
 msgid "error building trees"
-msgstr "Fehler beim Erzeugen der Zweige"
+msgstr "Fehler beim Erstellen der Bäume"
 
 #: merge-recursive.c:497
-#, fuzzy
 msgid "diff setup failed"
-msgstr "diff_setup_done fehlgeschlagen"
+msgstr "Einrichtung der Optionen zur Bestimmung der Unterschiede "
+"fehlgeschlagen"
 
 #: merge-recursive.c:627
 msgid "merge-recursive: disk full?"
-msgstr ""
+msgstr "merge-recursive: Speicher voll?"
 
 #: merge-recursive.c:690
-#, fuzzy, c-format
+#, c-format
 msgid "failed to create path '%s'%s"
-msgstr "Konnte Verknüpfung '%s' nicht erstellen"
+msgstr "Fehler beim Erstellen des Pfades '%s'%s"
 
 #: merge-recursive.c:701
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s to make room for subdirectory\n"
-msgstr "Entferne Notiz für Objekt %s\n"
+msgstr "Entferne %s um Platz für Unterverzeichnis zu schaffen\n"
 
 #. something else exists
 #. .. but not some other error (who really cares what?)
 #: merge-recursive.c:715 merge-recursive.c:736
 msgid ": perhaps a D/F conflict?"
-msgstr ""
+msgstr ": vielleicht ein D/F-Konflikt?"
 
 #: merge-recursive.c:726
-#, fuzzy, c-format
+#, c-format
 msgid "refusing to lose untracked file at '%s'"
-msgstr "Ungültiger Modus '%s' für unbeobachtete Dateien"
+msgstr "verweigere, da ungefolgte Dateien in '%s' verloren gehen würden"
 
 #: merge-recursive.c:766
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read object %s '%s'"
-msgstr "Kann %s nicht lesen: %s"
+msgstr "kann Objekt %s '%s' nicht lesen"
 
 #: merge-recursive.c:768
 #, c-format
 msgid "blob expected for %s '%s'"
-msgstr ""
+msgstr "Blob erwartet für %s '%s'"
 
 #: merge-recursive.c:791 builtin/clone.c:302
 #, c-format
@@ -409,27 +407,27 @@ msgid "failed to open '%s'"
 msgstr "Fehler beim Öffnen von '%s'"
 
 #: merge-recursive.c:799
-#, fuzzy, c-format
+#, c-format
 msgid "failed to symlink '%s'"
-msgstr "Konnte '%s' nicht entfernen"
+msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s'"
 
 #: merge-recursive.c:802
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
-msgstr ""
+msgstr "weiß nicht was mit %06o %s '%s' zu machen ist"
 
 #: merge-recursive.c:939
 msgid "Failed to execute internal merge"
-msgstr ""
+msgstr "Fehler bei Ausführung der internen Zusammenführung"
 
 #: merge-recursive.c:943
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add %s to database"
-msgstr "Konnte %s nicht nach %s verschieben"
+msgstr "Konnte %s nicht zur Datenbank hinzufügen"
 
 #: merge-recursive.c:959
 msgid "unsupported object type in the tree"
-msgstr ""
+msgstr "nicht unterstützter Objekttyp im Baum"
 
 #: merge-recursive.c:1038 merge-recursive.c:1052
 #, c-format
@@ -437,6 +435,8 @@ msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree."
 msgstr ""
+"KONFLIKT (%s/delete): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
+"im Arbeitsbereich gelassen."
 
 #: merge-recursive.c:1044 merge-recursive.c:1057
 #, c-format
@@ -444,19 +444,21 @@ msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree at %s."
 msgstr ""
+"KONFLIKT (%s/delete): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
+"im Arbeitsbereich bei %s gelassen."
 
 #: merge-recursive.c:1098
 msgid "rename"
-msgstr ""
+msgstr "rename"
 
 #: merge-recursive.c:1098
 msgid "renamed"
-msgstr ""
+msgstr "renamed"
 
 #: merge-recursive.c:1154
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
-msgstr ""
+msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu"
 
 #: merge-recursive.c:1176
 #, c-format
@@ -464,72 +466,74 @@ msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 "\"->\"%s\" in \"%s\"%s"
 msgstr ""
+"KONFLIKT (rename/rename): Benenne um \"%s\"->\"%s\" in Zweig \"%s\" und "
+"\"%s\"->\"%s\" in Zweig \"%s\"%s"
 
 #: merge-recursive.c:1181
 msgid " (left unresolved)"
-msgstr ""
+msgstr " (bleibt unaufgelöst)"
 
 #: merge-recursive.c:1235
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
-msgstr ""
+msgstr "KONFLIKT (rename/rename): Benenne um %s->%s in %s. "
+"Benenne um %s->%s in %s"
 
 #: merge-recursive.c:1265
-#, fuzzy, c-format
+#, c-format
 msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Benenne %s nach %s um\n"
+msgstr "Benenne stattdessen %s nach %s und %s nach %s um"
 
 #: merge-recursive.c:1464
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
+msgstr "KONFLIKT (rename/add): Benenne um %s->%s in %s. %s hinzugefügt in %s"
 
 #: merge-recursive.c:1474
-#, fuzzy, c-format
+#, c-format
 msgid "Adding merged %s"
-msgstr "nicht zusammengeführt:   %s"
+msgstr "Füge zusammengeführte Datei %s hinzu"
 
 #: merge-recursive.c:1479 merge-recursive.c:1677
 #, c-format
 msgid "Adding as %s instead"
-msgstr ""
+msgstr "Füge stattdessen als %s hinzu"
 
 #: merge-recursive.c:1530
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read object %s"
-msgstr "Kann existierendes Objekt %s nicht lesen."
+msgstr "kann Objekt %s nicht lesen"
 
 #: merge-recursive.c:1533
-#, fuzzy, c-format
+#, c-format
 msgid "object %s is not a blob"
-msgstr "Objekt %s nicht gefunden"
+msgstr "Objekt %s ist kein Blob"
 
 #: merge-recursive.c:1581
 msgid "modify"
-msgstr ""
+msgstr "modify"
 
 #: merge-recursive.c:1581
-#, fuzzy
 msgid "modified"
-msgstr "von beiden geändert:"
+msgstr "modified"
 
 #: merge-recursive.c:1591
 msgid "content"
-msgstr ""
+msgstr "content"
 
 #: merge-recursive.c:1598
 msgid "add/add"
-msgstr ""
+msgstr "add/add"
 
 #: merge-recursive.c:1632
 #, c-format
 msgid "Skipped %s (merged same as existing)"
-msgstr ""
+msgstr "%s ausgelassen (Ergebnis der Zusammenführung existiert bereits)"
 
 #: merge-recursive.c:1646
 #, c-format
 msgid "Auto-merging %s"
-msgstr ""
+msgstr "automatische Zusammenführung von %s"
 
 #: merge-recursive.c:1650 git-submodule.sh:844
 msgid "submodule"
@@ -538,65 +542,65 @@ msgstr "Unterprojekt"
 #: merge-recursive.c:1651
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr ""
+msgstr "KONFLIKT (%s): Zusammenführungskonflikt in %s"
 
 #: merge-recursive.c:1741
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "Entferne %s\n"
+msgstr "Entferne %s"
 
 #: merge-recursive.c:1766
 msgid "file/directory"
-msgstr ""
+msgstr "Datei/Verzeichnis"
 
 #: merge-recursive.c:1772
 msgid "directory/file"
-msgstr ""
+msgstr "Verzeichnis/Datei"
 
 #: merge-recursive.c:1777
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr ""
+msgstr "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. "
+"Füge %s als %s hinzu."
 
 #: merge-recursive.c:1787
-#, fuzzy, c-format
+#, c-format
 msgid "Adding %s"
-msgstr "Aktualisiere %s"
+msgstr "Füge %s hinzu"
 
 #: merge-recursive.c:1804
 msgid "Fatal merge failure, shouldn't happen."
-msgstr ""
+msgstr "Fataler Fehler bei der Zusammenführung. Sollte nicht passieren."
 
 #: merge-recursive.c:1823
-#, fuzzy
 msgid "Already up-to-date!"
-msgstr "Aktualisierung erzwungen"
+msgstr "Bereits aktuell!"
 
 #: merge-recursive.c:1832
 #, c-format
 msgid "merging of trees %s and %s failed"
-msgstr ""
+msgstr "zusammenführen der Bäume %s und %s fehlgeschlagen"
 
 #: merge-recursive.c:1862
 #, c-format
 msgid "Unprocessed path??? %s"
-msgstr ""
+msgstr " unverarbeiteter Pfad??? %s"
 
 #: merge-recursive.c:1907
 msgid "Merging:"
-msgstr ""
+msgstr "Zusammenführung:"
 
 #: merge-recursive.c:1918
 #, c-format
 msgid "found %u common ancestor(s):"
-msgstr ""
+msgstr "%u gemeinsame Vorgänger gefunden"
 
 #: merge-recursive.c:1954
 msgid "merge returned no commit"
-msgstr ""
+msgstr "Zusammenführung hat keine Version zurückgegeben"
 
 #: merge-recursive.c:2011
-#, fuzzy, c-format
+#, c-format
 msgid "Could not parse object '%s'"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
@@ -5322,7 +5326,7 @@ msgstr ""
 "Keine Zurücksetzung zu ORIG_HEAD."
 
 #: git-am.sh:105
-#, fuzzy, sh-format
+#, sh-format
 msgid ""
 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
@@ -5347,7 +5351,8 @@ msgstr ""
 
 #: git-am.sh:139
 msgid "Using index info to reconstruct a base tree..."
-msgstr ""
+msgstr "Verwende Informationen aus der Bereitstellung um einen Basisbaum "
+"nachzustellen"
 
 #: git-am.sh:154
 msgid ""
@@ -5362,9 +5367,8 @@ msgid "Falling back to patching base and 3-way merge..."
 msgstr "Falle zurück zum Patchen der Basis und der 3-Wege-Zusammenführung..."
 
 #: git-am.sh:179
-#, fuzzy
 msgid "Failed to merge in the changes."
-msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
+msgstr "Zusammenführung der Änderungen fehlgeschlagen"
 
 #: git-am.sh:274
 msgid "Only one StGIT patch series can be applied at once"
@@ -5384,6 +5388,8 @@ msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
 msgstr ""
+"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
+"entfernt. Bitte nicht mehr verwenden."
 
 #: git-am.sh:477
 #, sh-format
@@ -5680,51 +5686,50 @@ msgid "Cannot rebase onto multiple branches"
 msgstr "kann nicht auf mehrere Zweige neu aufbauen"
 
 #: git-rebase.sh:52
-#, fuzzy
 msgid ""
 "When you have resolved this problem, run \"git rebase --continue\".\n"
 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
 "To check out the original branch and stop rebasing, run \"git rebase --abort"
 "\"."
 msgstr ""
-"Wenn du das Problem aufgelöst hast, führe \"$cmdline --resolved\" aus.\n"
-"Falls du diesen Patch auslassen möchtest, führe stattdessen \"$cmdline --skip"
-"\" aus.\n"
-"Um den ursprünglichen Zweig wiederherzustellen und die Anwendung der "
-"Patches\n"
-"abzubrechen, führe \"$cmdline --abort\" aus."
+"Wenn du das Problem aufgelöst hast, führe \"git rebase --continue\" aus.\n"
+"Falls du diesen Patch auslassen möchtest, führe stattdessen \"git rebase "
+"--skip\" aus.\n"
+"Um den ursprünglichen Zweig wiederherzustellen und den Neuaufbau abzubrechen,\n"
+"führe \"git rebase --abort\" aus."
 
 #: git-rebase.sh:159
 msgid "The pre-rebase hook refused to rebase."
-msgstr ""
+msgstr "Der \"pre-rebase hook\" hat den Neuaufbau zurückgewiesen."
 
 #: git-rebase.sh:164
 msgid "It looks like git-am is in progress. Cannot rebase."
-msgstr ""
+msgstr "\"git-am\" scheint im Gange zu sein. Kann nicht neu aufbauen."
 
 #: git-rebase.sh:295
 msgid "The --exec option must be used with the --interactive option"
-msgstr ""
+msgstr "Die --exec Option muss mit der --interactive Option benutzt werden"
 
 #: git-rebase.sh:300
 msgid "No rebase in progress?"
-msgstr ""
+msgstr "Kein Neuaufbau im Gange?"
 
 #: git-rebase.sh:313
-#, fuzzy
 msgid "Cannot read HEAD"
-msgstr "kann Zweigspitze (HEAD) nicht auflösen"
+msgstr "Kann Zweigspitze (HEAD) nicht lesen"
 
 #: git-rebase.sh:316
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr ""
+"Du musst alle Zusammenführungskonflikte editieren und diese dann\n"
+"mittels \"git add\" als aufgelöst markieren"
 
 #: git-rebase.sh:334
-#, fuzzy, sh-format
+#, sh-format
 msgid "Could not move back to $head_name"
-msgstr "Konnte Zweig %s nicht entfernen"
+msgstr "Konnte nicht zu $head_name zurückgehen"
 
 #: git-rebase.sh:350
 #, sh-format
@@ -5738,60 +5743,70 @@ msgid ""
 "and run me again.  I am stopping in case you still have something\n"
 "valuable there."
 msgstr ""
+"Es scheint so, als gäbe es das Verzeichnis $state_dir_base bereits, und\n"
+"es wäre verwunderlich, wenn ein Neuaufbau bereits im Gange ist. Wenn das\n"
+"der Fall ist, probiere bitte\n"
+"\t$cmd_live_rebase\n"
+"Wenn das nicht der Fall ist, probiere bitte\n"
+"\t$cmd_clear_stale_rebase\n"
+"und führe dieses Kommando nochmal aus. Es wird angehalten, falls bereits\n"
+"etwas Nützliches vorhanden ist."
 
 #: git-rebase.sh:395
 #, sh-format
 msgid "invalid upstream $upstream_name"
-msgstr ""
+msgstr "ungültiger Übernahmezweig $upstream_name"
 
 #: git-rebase.sh:419
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
-msgstr ""
+msgstr "$onto_name: es gibt mehr als eine Zusammenführungsbasis"
 
 #: git-rebase.sh:422 git-rebase.sh:426
 #, sh-format
 msgid "$onto_name: there is no merge base"
-msgstr ""
+msgstr "$onto_name: es gibt keine Zusammenführungsbasis"
 
 #: git-rebase.sh:431
-#, fuzzy, sh-format
+#, sh-format
 msgid "Does not point to a valid commit: $onto_name"
-msgstr "'%s' zeigt auf keine Version"
+msgstr "$onto_name zeigt auf keine gültige Version"
 
 #: git-rebase.sh:454
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
-msgstr ""
+msgstr "fatal: kein solcher Zweig: $branch_name"
 
 #: git-rebase.sh:474
 msgid "Please commit or stash them."
-msgstr ""
+msgstr "Bitte trage die Änderungen ein oder benutze \"stash\"."
 
 #: git-rebase.sh:492
 #, sh-format
 msgid "Current branch $branch_name is up to date."
-msgstr ""
+msgstr "Aktueller Zweig $branch_name ist auf dem neusten Stand."
 
 #: git-rebase.sh:495
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr ""
+msgstr "Aktueller Zweig $branch_name ist auf dem neusten Stand, "
+"Neuaufbau erzwungen."
 
 #: git-rebase.sh:506
-#, fuzzy, sh-format
+#, sh-format
 msgid "Changes from $mb to $onto:"
-msgstr "zum Eintragen bereitgestellte Änderungen:"
+msgstr "Änderungen von $mb zu $onto:"
 
 #. Detach HEAD and reset the tree
 #: git-rebase.sh:515
 msgid "First, rewinding head to replay your work on top of it..."
-msgstr ""
+msgstr "Zunächst wird die Zweigspitze zurückgespult, um deine Änderungen\n"
+"darauf neu anzuwenden..."
 
 #: git-rebase.sh:523
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr ""
+msgstr "$branch_name zu $onto_name vorgespult."
 
 #: git-stash.sh:51
 msgid "git stash clear with parameters is unimplemented"
@@ -6081,9 +6096,8 @@ msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "Fehler bei Rekursion in Unterprojekt-Pfad '$sm_path'"
 
 #: git-submodule.sh:754
-#, fuzzy
 msgid "The --cached option cannot be used with the --files option"
-msgstr "--cached kann nicht mit --files benutzt werden"
+msgstr "Die --cached Option kann nicht mit der --files Option benutzt werden"
 
 #. unexpected type
 #: git-submodule.sh:794
-- 
1.7.12.rc1

Re: [RFC] l10n: de.po: translate 76 new messages

[Thomas Rast]

Hi Ralf

Thanks a lot for your work.  Below I am pointing out several items that
actually need to be fixed in code (mostly lego messages), so it's a bit
of a TODO list and I don't mean to imply that you should fix those
before your patch goes in.


Ralf Thielow <ralf.thielow@gmail.com> writes:

>  #: merge-recursive.c:497
> -#, fuzzy
>  msgid "diff setup failed"
> -msgstr "diff_setup_done fehlgeschlagen"
> +msgstr "Einrichtung der Optionen zur Bestimmung der Unterschiede "
> +"fehlgeschlagen"

That one is really unwieldy.  Judging from a cursory look at the code,
it's an internal error anyway and should probably be "BUG:
diff_setup_done failed" to begin with.

>  #: merge-recursive.c:627
>  msgid "merge-recursive: disk full?"
> -msgstr ""
> +msgstr "merge-recursive: Speicher voll?"

Maybe "Festplatte voll?" to distinguish from RAM.

The funny thing is that write_in_full() never returns 0 unless count=0:
it explicitly sets errno=ENOSPC and returns -1 if write() returned 0.
So this error will not trigger unless the caller passes in size=0, in
which case it is misguided.

>  #: merge-recursive.c:690
> -#, fuzzy, c-format
> +#, c-format
>  msgid "failed to create path '%s'%s"
> -msgstr "Konnte Verknüpfung '%s' nicht erstellen"
> +msgstr "Fehler beim Erstellen des Pfades '%s'%s"

This will need un-legoing...

>  msgid ": perhaps a D/F conflict?"
> -msgstr ""
> +msgstr ": vielleicht ein D/F-Konflikt?"

What's the terminology for conflicts in German?  For D/F, the user needs
to know the English terms.  Not that V/D would be much better.  Maybe
just spell it out.

>  #: merge-recursive.c:726
> -#, fuzzy, c-format
> +#, c-format
>  msgid "refusing to lose untracked file at '%s'"
> -msgstr "Ungültiger Modus '%s' für unbeobachtete Dateien"
> +msgstr "verweigere, da ungefolgte Dateien in '%s' verloren gehen
> würden"

Your glossary[1] says we call them "unbeobachtet"?

>  #: merge-recursive.c:1038 merge-recursive.c:1052
>  #, c-format
> @@ -437,6 +435,8 @@ msgid ""
>  "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
>  "in tree."
>  msgstr ""
> +"KONFLIKT (%s/delete): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
> +"im Arbeitsbereich gelassen."

This needs de-legoification on the first and fourth %s, which can be
rename/renamed or modify/modified.  Furthermore, in line with the D/F
above, perhaps you should translate "delete"?  But I see that you have
not translated "renamed" etc. below, either.  Was that on purpose?  It
will read a bit odd as

  KONFLIKT (rename/delete): foo gelöscht in bar und renamed in quux. Stand ...

>  #: merge-recursive.c:1591
>  msgid "content"
> -msgstr ""
> +msgstr "content"
>  
>  #: merge-recursive.c:1598
>  msgid "add/add"
> -msgstr ""
> +msgstr "add/add"
[...]
>  msgid "CONFLICT (%s): Merge conflict in %s"
> -msgstr ""
> +msgstr "KONFLIKT (%s): Zusammenführungskonflikt in %s"

More candidates for de-legoification.

>  #: merge-recursive.c:1832
>  #, c-format
>  msgid "merging of trees %s and %s failed"
> -msgstr ""
> +msgstr "zusammenführen der Bäume %s und %s fehlgeschlagen"

Capital Z?

>  #: merge-recursive.c:1862
>  #, c-format
>  msgid "Unprocessed path??? %s"
> -msgstr ""
> +msgstr " unverarbeiteter Pfad??? %s"

Stray space at the beginning.

>  #: merge-recursive.c:1918
>  #, c-format
>  msgid "found %u common ancestor(s):"
> -msgstr ""
> +msgstr "%u gemeinsame Vorgänger gefunden"

"ancestor(s)" is not listed in the glossary.  I'd personally pick
"Vorfahren" but I'm probably bikeshedding.

> +"Wenn du das Problem aufgelöst hast, führe \"git rebase --continue\" aus.\n"

Not what you are actually changing, but "resolve" (a merge conflict) is
not in the glossary.  For me

  Wenn du das Problem _gelöst_ hast...

sounds nicer.  "aufgelöst" sounds like "resolve a domain name" or such.

>  msgid "fatal: no such branch: $branch_name"
> -msgstr ""
> +msgstr "fatal: kein solcher Zweig: $branch_name"

kein Zweig $branch_name gefunden?

>  #: git-rebase.sh:474
>  msgid "Please commit or stash them."
> -msgstr ""
> +msgstr "Bitte trage die Änderungen ein oder benutze \"stash\"."

I really like this way of dodging the "stash" translation :-)


Footnotes: 
[1]  https://github.com/ralfth/git-po-de/wiki/Glossary

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

Re: [RFC] l10n: de.po: translate 76 new messages

[Ralf Thielow]

Hi Thomas,

thanks for your review.

On Fri, Aug 3, 2012 at 10:59 AM, Thomas Rast <trast@inf.ethz.ch> wrote:
>
> Ralf Thielow <ralf.thielow@gmail.com> writes:
>
>>  #: merge-recursive.c:497
>> -#, fuzzy
>>  msgid "diff setup failed"
>> -msgstr "diff_setup_done fehlgeschlagen"
>> +msgstr "Einrichtung der Optionen zur Bestimmung der Unterschiede "
>> +"fehlgeschlagen"
>
> That one is really unwieldy.  Judging from a cursory look at the code,
> it's an internal error anyway and should probably be "BUG:
> diff_setup_done failed" to begin with.
>

You're right. There are already places where the message is
"diff_setup_done failed"

#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
msgid "diff_setup_done failed"
msgstr "diff_setup_done fehlgeschlagen"

We could just translate it in this way. It's not really the same message,
but the same meaning.

>>  #: merge-recursive.c:627
>>  msgid "merge-recursive: disk full?"
>> -msgstr ""
>> +msgstr "merge-recursive: Speicher voll?"
>
> Maybe "Festplatte voll?" to distinguish from RAM.
>

I agree. There is also another message (#: builtin/commit.c:1590)
translated in this way. I'll change it both. Thanks

>>  msgid ": perhaps a D/F conflict?"
>> -msgstr ""
>> +msgstr ": vielleicht ein D/F-Konflikt?"
>
> What's the terminology for conflicts in German?  For D/F, the user needs
> to know the English terms.  Not that V/D would be much better.  Maybe
> just spell it out.
>

Thanks. I'll spell it out but would leave the term "Konflikt"?!

>>  #: merge-recursive.c:726
>> -#, fuzzy, c-format
>> +#, c-format
>>  msgid "refusing to lose untracked file at '%s'"
>> -msgstr "Ungültiger Modus '%s' für unbeobachtete Dateien"
>> +msgstr "verweigere, da ungefolgte Dateien in '%s' verloren gehen
>> würden"
>
> Your glossary[1] says we call them "unbeobachtet"?
>

Oops. I'll change. Thanks

>>  #: merge-recursive.c:1038 merge-recursive.c:1052
>>  #, c-format
>> @@ -437,6 +435,8 @@ msgid ""
>>  "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
>>  "in tree."
>>  msgstr ""
>> +"KONFLIKT (%s/delete): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
>> +"im Arbeitsbereich gelassen."
>
> This needs de-legoification on the first and fourth %s, which can be
> rename/renamed or modify/modified.  Furthermore, in line with the D/F
> above, perhaps you should translate "delete"?  But I see that you have
> not translated "renamed" etc. below, either.  Was that on purpose?  It
> will read a bit odd as
>
>   KONFLIKT (rename/delete): foo gelöscht in bar und renamed in quux. Stand ...

Gah, I misunderstood the values of the placeholders. The reason why I haven't
translate "delete" or "rename" is because they're part of the
"KONFLIKT (%s/delete)"
messages, aren't they? Translate it all would solve the problem. Thanks

>
>>  #: merge-recursive.c:1832
>>  #, c-format
>>  msgid "merging of trees %s and %s failed"
>> -msgstr ""
>> +msgstr "zusammenführen der Bäume %s und %s fehlgeschlagen"
>
> Capital Z?
>

Would indeed be nicer, thanks.

>>  #: merge-recursive.c:1862
>>  #, c-format
>>  msgid "Unprocessed path??? %s"
>> -msgstr ""
>> +msgstr " unverarbeiteter Pfad??? %s"
>
> Stray space at the beginning.
>

I'll fix.

>>  #: merge-recursive.c:1918
>>  #, c-format
>>  msgid "found %u common ancestor(s):"
>> -msgstr ""
>> +msgstr "%u gemeinsame Vorgänger gefunden"
>
> "ancestor(s)" is not listed in the glossary.  I'd personally pick
> "Vorfahren" but I'm probably bikeshedding.
>

"Vorfahre(n)" sounds indeed a bit nicer. I'll change it and
update the glossary.

>> +"Wenn du das Problem aufgelöst hast, führe \"git rebase --continue\" aus.\n"
>
> Not what you are actually changing, but "resolve" (a merge conflict) is
> not in the glossary.  For me
>
>   Wenn du das Problem _gelöst_ hast...
>
> sounds nicer.  "aufgelöst" sounds like "resolve a domain name" or such.

Thanks.

>
>>  msgid "fatal: no such branch: $branch_name"
>> -msgstr ""
>> +msgstr "fatal: kein solcher Zweig: $branch_name"
>
> kein Zweig $branch_name gefunden?
>

what about "Zweig $branch_name nicht gefunden"?

Thanks
Ralf

Re: [RFC] l10n: de.po: translate 76 new messages

[Thomas Rast]

Ralf Thielow <ralf.thielow@gmail.com> writes:
>
>>>  msgid ": perhaps a D/F conflict?"
>>> -msgstr ""
>>> +msgstr ": vielleicht ein D/F-Konflikt?"
>>
>> What's the terminology for conflicts in German?  For D/F, the user needs
>> to know the English terms.  Not that V/D would be much better.  Maybe
>> just spell it out.
>>
>
> Thanks. I'll spell it out but would leave the term "Konflikt"?!

Yes, I agree with conflict -> Konflikt.

>>>  #: merge-recursive.c:1038 merge-recursive.c:1052
>>>  #, c-format
>>> @@ -437,6 +435,8 @@ msgid ""
>>>  "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
>>>  "in tree."
>>>  msgstr ""
>>> +"KONFLIKT (%s/delete): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
>>> +"im Arbeitsbereich gelassen."
>>
>> This needs de-legoification on the first and fourth %s, which can be
>> rename/renamed or modify/modified.  Furthermore, in line with the D/F
>> above, perhaps you should translate "delete"?  But I see that you have
>> not translated "renamed" etc. below, either.  Was that on purpose?  It
>> will read a bit odd as
>>
>>   KONFLIKT (rename/delete): foo gelöscht in bar und renamed in quux. Stand ...
>
> Gah, I misunderstood the values of the placeholders. The reason why I haven't
> translate "delete" or "rename" is because they're part of the
> "KONFLIKT (%s/delete)"
> messages, aren't they? Translate it all would solve the problem. Thanks

Well, it's a bit confusing.  AFAICS the verb (rename/modify) goes into
the parens at the start, and the participle (renamed/modified) goes into
the fourth %s.  So if you decided to *not* translate the
"(rename/delete)" conflict description, you would have to translate
"renamed" (to fit it into the sentence) but not "rename".

Which would be really hard to maintain.  So let's not do that.  I think
it's better if you translate them all.

>>>  msgid "fatal: no such branch: $branch_name"
>>> -msgstr ""
>>> +msgstr "fatal: kein solcher Zweig: $branch_name"
>>
>> kein Zweig $branch_name gefunden?
>>
>
> what about "Zweig $branch_name nicht gefunden"?

Sure.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

[PATCH 1/2] diff_setup_done(): return void

[Thomas Rast]

diff_setup_done() has historically returned an error code, but lost
the last nonzero return in 943d5b7 (allow diff.renamelimit to be set
regardless of -M/-C, 2006-08-09).  The callers were in a pretty
confused state: some actually checked for the return code, and some
did not.

Let it return void, and patch all callers to take this into account.
This conveniently also gets rid of a handful of different(!) error
messages that could never be triggered anyway.

Note that the function can still die().

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---

> On Fri, Aug 3, 2012 at 10:59 AM, Thomas Rast <trast@inf.ethz.ch> wrote:
> >
> > Ralf Thielow <ralf.thielow@gmail.com> writes:
> >
> >>  #: merge-recursive.c:497
> >> -#, fuzzy
> >>  msgid "diff setup failed"
> >> -msgstr "diff_setup_done fehlgeschlagen"
> >> +msgstr "Einrichtung der Optionen zur Bestimmung der Unterschiede "
> >> +"fehlgeschlagen"
> >
> > That one is really unwieldy.  Judging from a cursory look at the code,
> > it's an internal error anyway and should probably be "BUG:
> > diff_setup_done failed" to begin with.
> >
> 
> You're right. There are already places where the message is
> "diff_setup_done failed"
> 
> #: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
> msgid "diff_setup_done failed"
> msgstr "diff_setup_done fehlgeschlagen"
> 
> We could just translate it in this way. It's not really the same message,
> but the same meaning.

I looked again.  They're entirely redundant.  Let's remove all of
them.

 builtin/blame.c    | 9 +++------
 builtin/checkout.c | 3 +--
 builtin/diff.c     | 3 +--
 builtin/merge.c    | 3 +--
 diff-no-index.c    | 3 +--
 diff.c             | 4 +---
 diff.h             | 2 +-
 line.c             | 3 +++
 merge-recursive.c  | 3 +--
 notes-merge.c      | 6 ++----
 patch-ids.c        | 3 +--
 revision.c         | 3 +--
 submodule.c        | 3 +--
 tree-diff.c        | 3 +--
 14 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/builtin/blame.c b/builtin/blame.c
index bae576c..dbe969b 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -408,8 +408,7 @@ static struct origin *find_origin(struct scoreboard *sb,
 	paths[1] = NULL;
 
 	diff_tree_setup_paths(paths, &diff_opts);
-	if (diff_setup_done(&diff_opts) < 0)
-		die("diff-setup");
+	diff_setup_done(&diff_opts);
 
 	if (is_null_sha1(origin->commit->object.sha1))
 		do_diff_cache(parent->tree->object.sha1, &diff_opts);
@@ -495,8 +494,7 @@ static struct origin *find_rename(struct scoreboard *sb,
 	diff_opts.single_follow = origin->path;
 	paths[0] = NULL;
 	diff_tree_setup_paths(paths, &diff_opts);
-	if (diff_setup_done(&diff_opts) < 0)
-		die("diff-setup");
+	diff_setup_done(&diff_opts);
 
 	if (is_null_sha1(origin->commit->object.sha1))
 		do_diff_cache(parent->tree->object.sha1, &diff_opts);
@@ -1081,8 +1079,7 @@ static int find_copy_in_parent(struct scoreboard *sb,
 
 	paths[0] = NULL;
 	diff_tree_setup_paths(paths, &diff_opts);
-	if (diff_setup_done(&diff_opts) < 0)
-		die("diff-setup");
+	diff_setup_done(&diff_opts);
 
 	/* Try "find copies harder" on new path if requested;
 	 * we do not want to use diffcore_rename() actually to
diff --git a/builtin/checkout.c b/builtin/checkout.c
index d812219..7d922c6 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -316,8 +316,7 @@ static void show_local_changes(struct object *head, struct diff_options *opts)
 	init_revisions(&rev, NULL);
 	rev.diffopt.flags = opts->flags;
 	rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS;
-	if (diff_setup_done(&rev.diffopt) < 0)
-		die(_("diff_setup_done failed"));
+	diff_setup_done(&rev.diffopt);
 	add_pending_object(&rev, head, NULL);
 	run_diff_index(&rev, 0);
 }
diff --git a/builtin/diff.c b/builtin/diff.c
index bf72298..9650be2 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -302,8 +302,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 	argc = setup_revisions(argc, argv, &rev, NULL);
 	if (!rev.diffopt.output_format) {
 		rev.diffopt.output_format = DIFF_FORMAT_PATCH;
-		if (diff_setup_done(&rev.diffopt) < 0)
-			die(_("diff_setup_done failed"));
+		diff_setup_done(&rev.diffopt);
 	}
 
 	DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
diff --git a/builtin/merge.c b/builtin/merge.c
index dd50a0c..e81fde6 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -404,8 +404,7 @@ static void finish(struct commit *head_commit,
 		opts.output_format |=
 			DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
 		opts.detect_rename = DIFF_DETECT_RENAME;
-		if (diff_setup_done(&opts) < 0)
-			die(_("diff_setup_done failed"));
+		diff_setup_done(&opts);
 		diff_tree_sha1(head, new_head, "", &opts);
 		diffcore_std(&opts);
 		diff_flush(&opts);
diff --git a/diff-no-index.c b/diff-no-index.c
index 0b46a0f..74da659 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -258,8 +258,7 @@ void diff_no_index(struct rev_info *revs,
 	DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
 
 	revs->max_count = -2;
-	if (diff_setup_done(&revs->diffopt) < 0)
-		die("diff_setup_done failed");
+	diff_setup_done(&revs->diffopt);
 
 	setup_diff_pager(&revs->diffopt);
 	DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
diff --git a/diff.c b/diff.c
index 0c1e4fc..e8678c8 100644
--- a/diff.c
+++ b/diff.c
@@ -3187,7 +3187,7 @@ void diff_setup(struct diff_options *options)
 	}
 }
 
-int diff_setup_done(struct diff_options *options)
+void diff_setup_done(struct diff_options *options)
 {
 	int count = 0;
 
@@ -3286,8 +3286,6 @@ int diff_setup_done(struct diff_options *options)
 		options->output_format = DIFF_FORMAT_NO_OUTPUT;
 		DIFF_OPT_SET(options, EXIT_WITH_STATUS);
 	}
-
-	return 0;
 }
 
 static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
diff --git a/diff.h b/diff.h
index e9284f2..d89d989 100644
--- a/diff.h
+++ b/diff.h
@@ -247,7 +247,7 @@ extern int parse_long_opt(const char *opt, const char **argv,
 extern int diff_use_color_default;
 extern void diff_setup(struct diff_options *);
 extern int diff_opt_parse(struct diff_options *, const char **, int);
-extern int diff_setup_done(struct diff_options *);
+extern void diff_setup_done(struct diff_options *);
 
 #define DIFF_DETECT_RENAME	1
 #define DIFF_DETECT_COPY	2
diff --git a/line.c b/line.c
index a008c2c..fe7ace7 100644
--- a/line.c
+++ b/line.c
@@ -1177,6 +1177,9 @@ static int process_diff_filepair(struct rev_info *rev,
 		return 0;
 	if (rg->ranges.nr == 0)
 		return 0;
+	if (rg->ranges.nr == 1 &&
+	    rg->ranges.ranges[0].start == rg->ranges.ranges[0].end)
+		return 0;
 
 	assert(pair->two->sha1_valid);
 	diff_populate_filespec(pair->two, 0);
diff --git a/merge-recursive.c b/merge-recursive.c
index 8903a73..a7bb212 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -493,8 +493,7 @@ static struct string_list *get_renames(struct merge_options *o,
 	opts.rename_score = o->rename_score;
 	opts.show_rename_progress = o->show_rename_progress;
 	opts.output_format = DIFF_FORMAT_NO_OUTPUT;
-	if (diff_setup_done(&opts) < 0)
-		die(_("diff setup failed"));
+	diff_setup_done(&opts);
 	diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
 	diffcore_std(&opts);
 	if (opts.needed_rename_limit > o->needed_rename_limit)
diff --git a/notes-merge.c b/notes-merge.c
index 29c6411..0f67bd3 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -126,8 +126,7 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
 	diff_setup(&opt);
 	DIFF_OPT_SET(&opt, RECURSIVE);
 	opt.output_format = DIFF_FORMAT_NO_OUTPUT;
-	if (diff_setup_done(&opt) < 0)
-		die("diff_setup_done failed");
+	diff_setup_done(&opt);
 	diff_tree_sha1(base, remote, "", &opt);
 	diffcore_std(&opt);
 
@@ -190,8 +189,7 @@ static void diff_tree_local(struct notes_merge_options *o,
 	diff_setup(&opt);
 	DIFF_OPT_SET(&opt, RECURSIVE);
 	opt.output_format = DIFF_FORMAT_NO_OUTPUT;
-	if (diff_setup_done(&opt) < 0)
-		die("diff_setup_done failed");
+	diff_setup_done(&opt);
 	diff_tree_sha1(base, local, "", &opt);
 	diffcore_std(&opt);
 
diff --git a/patch-ids.c b/patch-ids.c
index 5717257..bc8a28f 100644
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -39,8 +39,7 @@ int init_patch_ids(struct patch_ids *ids)
 	memset(ids, 0, sizeof(*ids));
 	diff_setup(&ids->diffopts);
 	DIFF_OPT_SET(&ids->diffopts, RECURSIVE);
-	if (diff_setup_done(&ids->diffopts) < 0)
-		return error("diff_setup_done failed");
+	diff_setup_done(&ids->diffopts);
 	return 0;
 }
 
diff --git a/revision.c b/revision.c
index d20ff72..2253a82 100644
--- a/revision.c
+++ b/revision.c
@@ -1870,8 +1870,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 		revs->topo_order = 1;
 	}
 
-	if (diff_setup_done(&revs->diffopt) < 0)
-		die("diff_setup_done failed");
+	diff_setup_done(&revs->diffopt);
 
 	compile_grep_patterns(&revs->grep_filter);
 
diff --git a/submodule.c b/submodule.c
index 959d349..19dc6a6 100644
--- a/submodule.c
+++ b/submodule.c
@@ -574,8 +574,7 @@ static void calculate_changed_submodule_paths(void)
 			DIFF_OPT_SET(&diff_opts, RECURSIVE);
 			diff_opts.output_format |= DIFF_FORMAT_CALLBACK;
 			diff_opts.format_callback = submodule_collect_changed_cb;
-			if (diff_setup_done(&diff_opts) < 0)
-				die("diff_setup_done failed");
+			diff_setup_done(&diff_opts);
 			diff_tree_sha1(parent->item->object.sha1, commit->object.sha1, "", &diff_opts);
 			diffcore_std(&diff_opts);
 			diff_flush(&diff_opts);
diff --git a/tree-diff.c b/tree-diff.c
index 7e54833..ba01563 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -212,8 +212,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
 	diff_opts.rename_score = opt->rename_score;
 	paths[0] = NULL;
 	diff_tree_setup_paths(paths, &diff_opts);
-	if (diff_setup_done(&diff_opts) < 0)
-		die("unable to set up diff options to follow renames");
+	diff_setup_done(&diff_opts);
 	diff_tree(t1, t2, base, &diff_opts);
 	diffcore_std(&diff_opts);
 	diff_tree_release_paths(&diff_opts);
-- 
1.7.12.rc1.219.gb14e69c

[PATCH 2/2] merge-recursive: eliminate flush_buffer() in favor of write_in_full()

[Thomas Rast]

flush_buffer() is a thin wrapper around write_in_full() with two very
confusing properties:

* It runs a loop to handle short reads, ensuring that we write
  everything.  But that is precisely what write_in_full() does!

* It checks for a return value of 0 from write_in_full(), which cannot
  happen: it returns this value only if count=0, but flush_buffer()
  will never call write_in_full() in this case.

Remove it.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---

Much easier than worrying about the "disk full?" message.

 merge-recursive.c | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index a7bb212..3d4eb82 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -613,23 +613,6 @@ static char *unique_path(struct merge_options *o, const char *path, const char *
 	return newpath;
 }
 
-static void flush_buffer(int fd, const char *buf, unsigned long size)
-{
-	while (size > 0) {
-		long ret = write_in_full(fd, buf, size);
-		if (ret < 0) {
-			/* Ignore epipe */
-			if (errno == EPIPE)
-				break;
-			die_errno("merge-recursive");
-		} else if (!ret) {
-			die(_("merge-recursive: disk full?"));
-		}
-		size -= ret;
-		buf += ret;
-	}
-}
-
 static int dir_in_way(const char *path, int check_working_copy)
 {
 	int pos, pathlen = strlen(path);
@@ -788,7 +771,7 @@ static void update_file_flags(struct merge_options *o,
 			fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
 			if (fd < 0)
 				die_errno(_("failed to open '%s'"), path);
-			flush_buffer(fd, buf, size);
+			write_in_full(fd, buf, size);
 			close(fd);
 		} else if (S_ISLNK(mode)) {
 			char *lnk = xmemdupz(buf, size);
-- 
1.7.12.rc1.219.gb14e69c

Re: [PATCH 1/2] diff_setup_done(): return void

[Thomas Rast]

Thomas Rast <trast@student.ethz.ch> writes:

> diff --git a/line.c b/line.c
> index a008c2c..fe7ace7 100644
> --- a/line.c
> +++ b/line.c
> @@ -1177,6 +1177,9 @@ static int process_diff_filepair(struct rev_info *rev,
>  		return 0;
>  	if (rg->ranges.nr == 0)
>  		return 0;
> +	if (rg->ranges.nr == 1 &&
> +	    rg->ranges.ranges[0].start == rg->ranges.ranges[0].end)
> +		return 0;

This hunk is totally unrelated, sorry for accidentally including it.
You can remove it before application, or I can resend.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

Re: [RFC] l10n: de.po: translate 76 new messages

[Ralf Thielow]

On Fri, Aug 3, 2012 at 2:16 PM, Thomas Rast <trast@student.ethz.ch> wrote:
>>>
>>>   KONFLIKT (rename/delete): foo gelöscht in bar und renamed in quux. Stand ...
>>
>> Gah, I misunderstood the values of the placeholders. The reason why I haven't
>> translate "delete" or "rename" is because they're part of the
>> "KONFLIKT (%s/delete)"
>> messages, aren't they? Translate it all would solve the problem. Thanks
>
> Well, it's a bit confusing.  AFAICS the verb (rename/modify) goes into
> the parens at the start, and the participle (renamed/modified) goes into
> the fourth %s.  So if you decided to *not* translate the
> "(rename/delete)" conflict description, you would have to translate
> "renamed" (to fit it into the sentence) but not "rename".
>
> Which would be really hard to maintain.  So let's not do that.  I think
> it's better if you translate them all.
>

That's what i meant. Sorry if I was unclear.

Re: [RFC] l10n: de.po: translate 76 new messages

[Ralf Thielow]

On Fri, Aug 3, 2012 at 10:59 AM, Thomas Rast <trast@inf.ethz.ch> wrote:
>>  #: merge-recursive.c:1918
>>  #, c-format
>>  msgid "found %u common ancestor(s):"
>> -msgstr ""
>> +msgstr "%u gemeinsame Vorgänger gefunden"
>

Another TODO is to make two different messages in case
that %u is one and bigger than one as it's done in diff.c
like "Q_(" %d file changed", " %d files changed", files)".

Based on your suggestions it would be now translated as
"%u gemeinsame(n) Vorfahren gefunden"
It would be nicer to have two messages like
"%u gemeinsamen Vorfahren gefunden"
"%u gemeinsame Vorfahren gefunden"

[RFCv2] l10n: de.po: translate 76 new messages

[Ralf Thielow]

Translate 76 new messages came from git.pot update
in 3b6137f (l10n: Update git.pot (76 new, 4 removed
messages)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
 po/de.po | 216 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 115 insertions(+), 101 deletions(-)

diff --git a/po/de.po b/po/de.po
index 679f14b..5959004 100644
--- a/po/de.po
+++ b/po/de.po
@@ -232,9 +232,8 @@ msgstr ""
 "%s"
 
 #: diff.c:1400
-#, fuzzy
 msgid " 0 files changed"
-msgstr " 0 Dateien geändert\n"
+msgstr " 0 Dateien geändert"
 
 #: diff.c:1404
 #, c-format
@@ -351,57 +350,55 @@ msgstr[1] ""
 #: merge-recursive.c:190
 #, c-format
 msgid "(bad commit)\n"
-msgstr ""
+msgstr "(ungültige Version)\n"
 
 #: merge-recursive.c:206
-#, fuzzy, c-format
+#, c-format
 msgid "addinfo_cache failed for path '%s'"
-msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
+msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen"
 
 #: merge-recursive.c:268
-#, fuzzy
 msgid "error building trees"
-msgstr "Fehler beim Erzeugen der Zweige"
+msgstr "Fehler beim Erstellen der Bäume"
 
 #: merge-recursive.c:497
-#, fuzzy
 msgid "diff setup failed"
 msgstr "diff_setup_done fehlgeschlagen"
 
 #: merge-recursive.c:627
 msgid "merge-recursive: disk full?"
-msgstr ""
+msgstr "merge-recursive: Festplatte voll?"
 
 #: merge-recursive.c:690
-#, fuzzy, c-format
+#, c-format
 msgid "failed to create path '%s'%s"
-msgstr "Konnte Verknüpfung '%s' nicht erstellen"
+msgstr "Fehler beim Erstellen des Pfades '%s'%s"
 
 #: merge-recursive.c:701
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s to make room for subdirectory\n"
-msgstr "Entferne Notiz für Objekt %s\n"
+msgstr "Entferne %s um Platz für Unterverzeichnis zu schaffen\n"
 
 #. something else exists
 #. .. but not some other error (who really cares what?)
 #: merge-recursive.c:715 merge-recursive.c:736
 msgid ": perhaps a D/F conflict?"
-msgstr ""
+msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
 
 #: merge-recursive.c:726
-#, fuzzy, c-format
+#, c-format
 msgid "refusing to lose untracked file at '%s'"
-msgstr "Ungültiger Modus '%s' für unbeobachtete Dateien"
+msgstr "verweigere, da unbeobachtete Dateien in '%s' verloren gehen würden"
 
 #: merge-recursive.c:766
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read object %s '%s'"
-msgstr "Kann %s nicht lesen: %s"
+msgstr "kann Objekt %s '%s' nicht lesen"
 
 #: merge-recursive.c:768
 #, c-format
 msgid "blob expected for %s '%s'"
-msgstr ""
+msgstr "Blob erwartet für %s '%s'"
 
 #: merge-recursive.c:791 builtin/clone.c:302
 #, c-format
@@ -409,27 +406,27 @@ msgid "failed to open '%s'"
 msgstr "Fehler beim Öffnen von '%s'"
 
 #: merge-recursive.c:799
-#, fuzzy, c-format
+#, c-format
 msgid "failed to symlink '%s'"
-msgstr "Konnte '%s' nicht entfernen"
+msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s'"
 
 #: merge-recursive.c:802
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
-msgstr ""
+msgstr "weiß nicht was mit %06o %s '%s' zu machen ist"
 
 #: merge-recursive.c:939
 msgid "Failed to execute internal merge"
-msgstr ""
+msgstr "Fehler bei Ausführung der internen Zusammenführung"
 
 #: merge-recursive.c:943
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add %s to database"
-msgstr "Konnte %s nicht nach %s verschieben"
+msgstr "Konnte %s nicht zur Datenbank hinzufügen"
 
 #: merge-recursive.c:959
 msgid "unsupported object type in the tree"
-msgstr ""
+msgstr "nicht unterstützter Objekttyp im Baum"
 
 #: merge-recursive.c:1038 merge-recursive.c:1052
 #, c-format
@@ -437,6 +434,8 @@ msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree."
 msgstr ""
+"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
+"im Arbeitsbereich gelassen."
 
 #: merge-recursive.c:1044 merge-recursive.c:1057
 #, c-format
@@ -444,19 +443,21 @@ msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree at %s."
 msgstr ""
+"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
+"im Arbeitsbereich bei %s gelassen."
 
 #: merge-recursive.c:1098
 msgid "rename"
-msgstr ""
+msgstr "umbenennen"
 
 #: merge-recursive.c:1098
 msgid "renamed"
-msgstr ""
+msgstr "umbenannt"
 
 #: merge-recursive.c:1154
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
-msgstr ""
+msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu"
 
 #: merge-recursive.c:1176
 #, c-format
@@ -464,72 +465,75 @@ msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 "\"->\"%s\" in \"%s\"%s"
 msgstr ""
+"KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Zweig \"%s\" und "
+"\"%s\"->\"%s\" in Zweig \"%s\"%s"
 
 #: merge-recursive.c:1181
 msgid " (left unresolved)"
-msgstr ""
+msgstr " (bleibt unaufgelöst)"
 
 #: merge-recursive.c:1235
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
-msgstr ""
+msgstr "KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. "
+"Benenne um %s->%s in %s"
 
 #: merge-recursive.c:1265
-#, fuzzy, c-format
+#, c-format
 msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Benenne %s nach %s um\n"
+msgstr "Benenne stattdessen %s nach %s und %s nach %s um"
 
 #: merge-recursive.c:1464
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
+msgstr "KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s "
+"hinzugefügt in %s"
 
 #: merge-recursive.c:1474
-#, fuzzy, c-format
+#, c-format
 msgid "Adding merged %s"
-msgstr "nicht zusammengeführt:   %s"
+msgstr "Füge zusammengeführte Datei %s hinzu"
 
 #: merge-recursive.c:1479 merge-recursive.c:1677
 #, c-format
 msgid "Adding as %s instead"
-msgstr ""
+msgstr "Füge stattdessen als %s hinzu"
 
 #: merge-recursive.c:1530
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read object %s"
-msgstr "Kann existierendes Objekt %s nicht lesen."
+msgstr "kann Objekt %s nicht lesen"
 
 #: merge-recursive.c:1533
-#, fuzzy, c-format
+#, c-format
 msgid "object %s is not a blob"
-msgstr "Objekt %s nicht gefunden"
+msgstr "Objekt %s ist kein Blob"
 
 #: merge-recursive.c:1581
 msgid "modify"
-msgstr ""
+msgstr "ändern"
 
 #: merge-recursive.c:1581
-#, fuzzy
 msgid "modified"
-msgstr "von beiden geändert:"
+msgstr "geändert"
 
 #: merge-recursive.c:1591
 msgid "content"
-msgstr ""
+msgstr "Inhalt"
 
 #: merge-recursive.c:1598
 msgid "add/add"
-msgstr ""
+msgstr "hinzufügen/hinzufügen"
 
 #: merge-recursive.c:1632
 #, c-format
 msgid "Skipped %s (merged same as existing)"
-msgstr ""
+msgstr "%s ausgelassen (Ergebnis der Zusammenführung existiert bereits)"
 
 #: merge-recursive.c:1646
 #, c-format
 msgid "Auto-merging %s"
-msgstr ""
+msgstr "automatische Zusammenführung von %s"
 
 #: merge-recursive.c:1650 git-submodule.sh:844
 msgid "submodule"
@@ -538,65 +542,65 @@ msgstr "Unterprojekt"
 #: merge-recursive.c:1651
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr ""
+msgstr "KONFLIKT (%s): Zusammenführungskonflikt in %s"
 
 #: merge-recursive.c:1741
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "Entferne %s\n"
+msgstr "Entferne %s"
 
 #: merge-recursive.c:1766
 msgid "file/directory"
-msgstr ""
+msgstr "Datei/Verzeichnis"
 
 #: merge-recursive.c:1772
 msgid "directory/file"
-msgstr ""
+msgstr "Verzeichnis/Datei"
 
 #: merge-recursive.c:1777
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr ""
+msgstr "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. "
+"Füge %s als %s hinzu."
 
 #: merge-recursive.c:1787
-#, fuzzy, c-format
+#, c-format
 msgid "Adding %s"
-msgstr "Aktualisiere %s"
+msgstr "Füge %s hinzu"
 
 #: merge-recursive.c:1804
 msgid "Fatal merge failure, shouldn't happen."
-msgstr ""
+msgstr "Fataler Fehler bei der Zusammenführung. Sollte nicht passieren."
 
 #: merge-recursive.c:1823
-#, fuzzy
 msgid "Already up-to-date!"
-msgstr "Aktualisierung erzwungen"
+msgstr "Bereits aktuell!"
 
 #: merge-recursive.c:1832
 #, c-format
 msgid "merging of trees %s and %s failed"
-msgstr ""
+msgstr "Zusammenführen der Bäume %s und %s fehlgeschlagen"
 
 #: merge-recursive.c:1862
 #, c-format
 msgid "Unprocessed path??? %s"
-msgstr ""
+msgstr "unverarbeiteter Pfad??? %s"
 
 #: merge-recursive.c:1907
 msgid "Merging:"
-msgstr ""
+msgstr "Zusammenführung:"
 
 #: merge-recursive.c:1918
 #, c-format
 msgid "found %u common ancestor(s):"
-msgstr ""
+msgstr "%u gemeinsame(n) Vorfahren gefunden"
 
 #: merge-recursive.c:1954
 msgid "merge returned no commit"
-msgstr ""
+msgstr "Zusammenführung hat keine Version zurückgegeben"
 
 #: merge-recursive.c:2011
-#, fuzzy, c-format
+#, c-format
 msgid "Could not parse object '%s'"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
@@ -2882,7 +2886,7 @@ msgid ""
 "not exceeded, and then \"git reset HEAD\" to recover."
 msgstr ""
 "Das Projektarchiv wurde aktualisiert, aber die \"new_index\"-Datei\n"
-"konnte nicht geschrieben werden. Prüfe, dass dein Speicher nicht\n"
+"konnte nicht geschrieben werden. Prüfe, dass deine Festplatte nicht\n"
 "voll und Dein Kontingent nicht aufgebraucht ist und führe\n"
 "anschließend \"git reset HEAD\" zu Wiederherstellung aus."
 
@@ -5322,13 +5326,13 @@ msgstr ""
 "Keine Zurücksetzung zu ORIG_HEAD."
 
 #: git-am.sh:105
-#, fuzzy, sh-format
+#, sh-format
 msgid ""
 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
 msgstr ""
-"Wenn du das Problem aufgelöst hast, führe \"$cmdline --resolved\" aus.\n"
+"Wenn du das Problem gelöst hast, führe \"$cmdline --resolved\" aus.\n"
 "Falls du diesen Patch auslassen möchtest, führe stattdessen \"$cmdline --skip"
 "\" aus.\n"
 "Um den ursprünglichen Zweig wiederherzustellen und die Anwendung der "
@@ -5347,7 +5351,8 @@ msgstr ""
 
 #: git-am.sh:139
 msgid "Using index info to reconstruct a base tree..."
-msgstr ""
+msgstr "Verwende Informationen aus der Bereitstellung um einen Basisbaum "
+"nachzustellen"
 
 #: git-am.sh:154
 msgid ""
@@ -5362,9 +5367,8 @@ msgid "Falling back to patching base and 3-way merge..."
 msgstr "Falle zurück zum Patchen der Basis und der 3-Wege-Zusammenführung..."
 
 #: git-am.sh:179
-#, fuzzy
 msgid "Failed to merge in the changes."
-msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
+msgstr "Zusammenführung der Änderungen fehlgeschlagen"
 
 #: git-am.sh:274
 msgid "Only one StGIT patch series can be applied at once"
@@ -5384,6 +5388,8 @@ msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
 msgstr ""
+"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
+"entfernt. Bitte nicht mehr verwenden."
 
 #: git-am.sh:477
 #, sh-format
@@ -5680,51 +5686,50 @@ msgid "Cannot rebase onto multiple branches"
 msgstr "kann nicht auf mehrere Zweige neu aufbauen"
 
 #: git-rebase.sh:52
-#, fuzzy
 msgid ""
 "When you have resolved this problem, run \"git rebase --continue\".\n"
 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
 "To check out the original branch and stop rebasing, run \"git rebase --abort"
 "\"."
 msgstr ""
-"Wenn du das Problem aufgelöst hast, führe \"$cmdline --resolved\" aus.\n"
-"Falls du diesen Patch auslassen möchtest, führe stattdessen \"$cmdline --skip"
-"\" aus.\n"
-"Um den ursprünglichen Zweig wiederherzustellen und die Anwendung der "
-"Patches\n"
-"abzubrechen, führe \"$cmdline --abort\" aus."
+"Wenn du das Problem aufgelöst hast, führe \"git rebase --continue\" aus.\n"
+"Falls du diesen Patch auslassen möchtest, führe stattdessen \"git rebase "
+"--skip\" aus.\n"
+"Um den ursprünglichen Zweig wiederherzustellen und den Neuaufbau abzubrechen,\n"
+"führe \"git rebase --abort\" aus."
 
 #: git-rebase.sh:159
 msgid "The pre-rebase hook refused to rebase."
-msgstr ""
+msgstr "Der \"pre-rebase hook\" hat den Neuaufbau zurückgewiesen."
 
 #: git-rebase.sh:164
 msgid "It looks like git-am is in progress. Cannot rebase."
-msgstr ""
+msgstr "\"git-am\" scheint im Gange zu sein. Kann nicht neu aufbauen."
 
 #: git-rebase.sh:295
 msgid "The --exec option must be used with the --interactive option"
-msgstr ""
+msgstr "Die --exec Option muss mit der --interactive Option benutzt werden"
 
 #: git-rebase.sh:300
 msgid "No rebase in progress?"
-msgstr ""
+msgstr "Kein Neuaufbau im Gange?"
 
 #: git-rebase.sh:313
-#, fuzzy
 msgid "Cannot read HEAD"
-msgstr "kann Zweigspitze (HEAD) nicht auflösen"
+msgstr "Kann Zweigspitze (HEAD) nicht lesen"
 
 #: git-rebase.sh:316
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr ""
+"Du musst alle Zusammenführungskonflikte editieren und diese dann\n"
+"mittels \"git add\" als aufgelöst markieren"
 
 #: git-rebase.sh:334
-#, fuzzy, sh-format
+#, sh-format
 msgid "Could not move back to $head_name"
-msgstr "Konnte Zweig %s nicht entfernen"
+msgstr "Konnte nicht zu $head_name zurückgehen"
 
 #: git-rebase.sh:350
 #, sh-format
@@ -5738,60 +5743,70 @@ msgid ""
 "and run me again.  I am stopping in case you still have something\n"
 "valuable there."
 msgstr ""
+"Es scheint so, als gäbe es das Verzeichnis $state_dir_base bereits, und\n"
+"es wäre verwunderlich, wenn ein Neuaufbau bereits im Gange ist. Wenn das\n"
+"der Fall ist, probiere bitte\n"
+"\t$cmd_live_rebase\n"
+"Wenn das nicht der Fall ist, probiere bitte\n"
+"\t$cmd_clear_stale_rebase\n"
+"und führe dieses Kommando nochmal aus. Es wird angehalten, falls bereits\n"
+"etwas Nützliches vorhanden ist."
 
 #: git-rebase.sh:395
 #, sh-format
 msgid "invalid upstream $upstream_name"
-msgstr ""
+msgstr "ungültiger Übernahmezweig $upstream_name"
 
 #: git-rebase.sh:419
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
-msgstr ""
+msgstr "$onto_name: es gibt mehr als eine Zusammenführungsbasis"
 
 #: git-rebase.sh:422 git-rebase.sh:426
 #, sh-format
 msgid "$onto_name: there is no merge base"
-msgstr ""
+msgstr "$onto_name: es gibt keine Zusammenführungsbasis"
 
 #: git-rebase.sh:431
-#, fuzzy, sh-format
+#, sh-format
 msgid "Does not point to a valid commit: $onto_name"
-msgstr "'%s' zeigt auf keine Version"
+msgstr "$onto_name zeigt auf keine gültige Version"
 
 #: git-rebase.sh:454
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
-msgstr ""
+msgstr "fatal: Zweig $branch_name nicht gefunden"
 
 #: git-rebase.sh:474
 msgid "Please commit or stash them."
-msgstr ""
+msgstr "Bitte trage die Änderungen ein oder benutze \"stash\"."
 
 #: git-rebase.sh:492
 #, sh-format
 msgid "Current branch $branch_name is up to date."
-msgstr ""
+msgstr "Aktueller Zweig $branch_name ist auf dem neusten Stand."
 
 #: git-rebase.sh:495
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr ""
+msgstr "Aktueller Zweig $branch_name ist auf dem neusten Stand, "
+"Neuaufbau erzwungen."
 
 #: git-rebase.sh:506
-#, fuzzy, sh-format
+#, sh-format
 msgid "Changes from $mb to $onto:"
-msgstr "zum Eintragen bereitgestellte Änderungen:"
+msgstr "Änderungen von $mb zu $onto:"
 
 #. Detach HEAD and reset the tree
 #: git-rebase.sh:515
 msgid "First, rewinding head to replay your work on top of it..."
-msgstr ""
+msgstr "Zunächst wird die Zweigspitze zurückgespult, um deine Änderungen\n"
+"darauf neu anzuwenden..."
 
 #: git-rebase.sh:523
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr ""
+msgstr "$branch_name zu $onto_name vorgespult."
 
 #: git-stash.sh:51
 msgid "git stash clear with parameters is unimplemented"
@@ -6081,9 +6096,8 @@ msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "Fehler bei Rekursion in Unterprojekt-Pfad '$sm_path'"
 
 #: git-submodule.sh:754
-#, fuzzy
 msgid "The --cached option cannot be used with the --files option"
-msgstr "--cached kann nicht mit --files benutzt werden"
+msgstr "Die --cached Option kann nicht mit der --files Option benutzt werden"
 
 #. unexpected type
 #: git-submodule.sh:794
-- 
1.7.11.2