{"thread":{"id":"16614","subject":"[PATCH 2/2] gitk: Update German translation.","startedAt":"2008-12-06T19:48:30Z","lastAt":"2008-12-06T19:49:24Z","messageCount":2,"participants":["Christian Stimming"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"97278","messageId":"200812062048.30412.stimming@tuhh.de","threadId":"16614","inReplyTo":null,"subject":"[PATCH 1/2] gitk: Mark forgotten strings (header sentence parts in color chooser) for translation.","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-12-06T19:48:30Z","receivedAt":"2008-12-06T19:48:30Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"---\n gitk |   12 ++++++------\n 1 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/gitk b/gitk\nindex a5e24e4..39aabb3 100755\n--- a/gitk\n+++ b/gitk\n@@ -10150,26 +10150,26 @@ proc doprefs {} {\n     grid $top.cdisp - -sticky w -pady 10\n     label $top.bg -padx 40 -relief sunk -background $bgcolor\n     button $top.bgbut -text [mc \"Background\"] -font optionfont \\\n-\t-command [list choosecolor bgcolor {} $top.bg background setbg]\n+\t-command [list choosecolor bgcolor {} $top.bg [mc \"background\"] setbg]\n     grid x $top.bgbut $top.bg -sticky w\n     label $top.fg -padx 40 -relief sunk -background $fgcolor\n     button $top.fgbut -text [mc \"Foreground\"] -font optionfont \\\n-\t-command [list choosecolor fgcolor {} $top.fg foreground setfg]\n+\t-command [list choosecolor fgcolor {} $top.fg [mc \"foreground\"] setfg]\n     grid x $top.fgbut $top.fg -sticky w\n     label $top.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]\n     button $top.diffoldbut -text [mc \"Diff: old lines\"] -font optionfont \\\n-\t-command [list choosecolor diffcolors 0 $top.diffold \"diff old lines\" \\\n+\t-command [list choosecolor diffcolors 0 $top.diffold [mc \"diff old lines\"] \\\n \t\t      [list $ctext tag conf d0 -foreground]]\n     grid x $top.diffoldbut $top.diffold -sticky w\n     label $top.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]\n     button $top.diffnewbut -text [mc \"Diff: new lines\"] -font optionfont \\\n-\t-command [list choosecolor diffcolors 1 $top.diffnew \"diff new lines\" \\\n+\t-command [list choosecolor diffcolors 1 $top.diffnew [mc \"diff new lines\"] \\\n \t\t      [list $ctext tag conf dresult -foreground]]\n     grid x $top.diffnewbut $top.diffnew -sticky w\n     label $top.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]\n     button $top.hunksepbut -text [mc \"Diff: hunk header\"] -font optionfont \\\n \t-command [list choosecolor diffcolors 2 $top.hunksep \\\n-\t\t      \"diff hunk header\" \\\n+\t\t      [mc \"diff hunk header\"] \\\n \t\t      [list $ctext tag conf hunksep -foreground]]\n     grid x $top.hunksepbut $top.hunksep -sticky w\n     label $top.markbgsep -padx 40 -relief sunk -background $markbgcolor\n@@ -10180,7 +10180,7 @@ proc doprefs {} {\n     grid x $top.markbgbut $top.markbgsep -sticky w\n     label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor\n     button $top.selbgbut -text [mc \"Select bg\"] -font optionfont \\\n-\t-command [list choosecolor selectbgcolor {} $top.selbgsep background setselbg]\n+\t-command [list choosecolor selectbgcolor {} $top.selbgsep [mc \"background\"] setselbg]\n     grid x $top.selbgbut $top.selbgsep -sticky w\n \n     label $top.cfont -text [mc \"Fonts: press to choose\"]\n-- \n1.6.0.3.517.g759a\n"},{"id":"97277","messageId":"200812062049.24884.stimming@tuhh.de","threadId":"16614","inReplyTo":"200812062048.30412.stimming@tuhh.de","subject":"[PATCH 2/2] gitk: Update German translation.","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-12-06T19:49:24Z","receivedAt":"2008-12-06T19:49:24Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"Attached to avoid whitespace problems.\n\nRegards,\n\nChristian\n\n\nFrom 282060ac531fee722142f9d39c4ff29570723cbb Mon Sep 17 00:00:00 2001\nFrom: Christian Stimming <stimming@tuhh.de>\nDate: Sat, 6 Dec 2008 20:47:15 +0100\nSubject: [PATCH 2/2] gitk: Update German translation.\n\nMerged with most recent \"make update-po\" result.\n\nSigned-off-by: Christian Stimming <stimming@tuhh.de>\n---\n po/de.po |  186 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------\n 1 files changed, 157 insertions(+), 29 deletions(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex e0a6dee..825dc98 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -7,8 +7,8 @@ msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: git-gui\\n\"\n \"Report-Msgid-Bugs-To: \\n\"\n-\"POT-Creation-Date: 2008-10-25 13:18+0200\\n\"\n-\"PO-Revision-Date: 2008-10-25 13:23+0200\\n\"\n+\"POT-Creation-Date: 2008-12-06 20:40+0100\\n\"\n+\"PO-Revision-Date: 2008-12-06 20:45+0100\\n\"\n \"Last-Translator: Christian Stimming <stimming@tuhh.de>\\n\"\n \"Language-Team: German\\n\"\n \"MIME-Version: 1.0\\n\"\n@@ -90,7 +90,11 @@ msgstr \"Zweige neu laden\"\n msgid \"List references\"\n msgstr \"Zweige/Markierungen auflisten\"\n \n-#: gitk:1815\n+#: gitk:1915\n+msgid \"Start git gui\"\n+msgstr \"»git gui« starten\"\n+\n+#: gitk:1917\n msgid \"Quit\"\n msgstr \"Beenden\"\n \n@@ -295,7 +299,15 @@ msgstr \"Externer Vergleich\"\n msgid \"Blame parent commit\"\n msgstr \"Annotieren der Elternversion\"\n \n-#: gitk:2488\n+#: gitk:2360\n+msgid \"Show origin of this line\"\n+msgstr \"Herkunft dieser Zeile anzeigen\"\n+\n+#: gitk:2361\n+msgid \"Run git gui blame on this line\"\n+msgstr \"Annotieren (»git gui blame«) von dieser Zeile\"\n+\n+#: gitk:2606\n msgid \"\"\n \"\\n\"\n \"Gitk - a commit viewer for git\\n\"\n@@ -501,7 +513,38 @@ msgstr \"Version nicht gefunden\"\n msgid \"git gui blame: command failed:\"\n msgstr \"git gui blame: Kommando fehlgeschlagen:\"\n \n-#: gitk:3092\n+#: gitk:3398\n+#, tcl-format\n+msgid \"Couldn't read merge head: %s\"\n+msgstr \"Zusammenführungs-Spitze konnte nicht gelesen werden: %s\"\n+\n+#: gitk:3406\n+#, tcl-format\n+msgid \"Error reading index: %s\"\n+msgstr \"Fehler beim Lesen der Bereitstellung (»index«): %s\"\n+\n+#: gitk:3431\n+#, tcl-format\n+msgid \"Couldn't start git blame: %s\"\n+msgstr \"»git blame« konnte nicht gestartet werden: %s\"\n+\n+#: gitk:3434 gitk:6160\n+msgid \"Searching\"\n+msgstr \"Suchen\"\n+\n+#: gitk:3466\n+#, tcl-format\n+msgid \"Error running git blame: %s\"\n+msgstr \"Fehler beim Ausführen von »git blame«: %s\"\n+\n+#: gitk:3494\n+#, tcl-format\n+msgid \"That line comes from commit %s,  which is not in this view\"\n+msgstr \"\"\n+\"Diese Zeile stammt aus Version %s, welche nicht in dieser Ansicht gezeigt \"\n+\"wird.\"\n+\n+#: gitk:3508\n msgid \"External diff viewer failed:\"\n msgstr \"Externes Vergleich-(Diff-)Programm fehlgeschlagen:\"\n \n@@ -509,11 +552,7 @@ msgstr \"Externes Vergleich-(Diff-)Programm fehlgeschlagen:\"\n msgid \"Gitk view definition\"\n msgstr \"Gitk Ansichten\"\n \n-#: gitk:3225\n-msgid \"Name\"\n-msgstr \"Name\"\n-\n-#: gitk:3228\n+#: gitk:3630\n msgid \"Remember this view\"\n msgstr \"Diese Ansicht speichern\"\n \n@@ -521,15 +560,55 @@ msgstr \"Diese Ansicht speichern\"\n msgid \"Commits to include (arguments to git log):\"\n msgstr \"Versionen anzeigen (Argumente von git-log):\"\n \n-#: gitk:3239\n+#: gitk:3632\n+msgid \"Use all refs\"\n+msgstr \"Alle Zweige verwenden\"\n+\n+#: gitk:3633\n+msgid \"Strictly sort by date\"\n+msgstr \"Streng nach Datum sortieren\"\n+\n+#: gitk:3634\n+msgid \"Mark branch sides\"\n+msgstr \"Zweig-Seiten markieren\"\n+\n+#: gitk:3635\n+msgid \"Since date:\"\n+msgstr \"Von Datum:\"\n+\n+#: gitk:3636\n+msgid \"Until date:\"\n+msgstr \"Bis Datum:\"\n+\n+#: gitk:3637\n+msgid \"Max count:\"\n+msgstr \"Max. Anzahl:\"\n+\n+#: gitk:3638\n+msgid \"Skip:\"\n+msgstr \"Überspringen:\"\n+\n+#: gitk:3639\n+msgid \"Limit to first parent\"\n+msgstr \"Auf erste Elternversion beschränken\"\n+\n+#: gitk:3640\n msgid \"Command to generate more commits to include:\"\n msgstr \"Versionsliste durch folgendes Kommando erzeugen lassen:\"\n \n-#: gitk:3246\n+#: gitk:3749\n+msgid \"Name\"\n+msgstr \"Name\"\n+\n+#: gitk:3797\n msgid \"Enter files and directories to include, one per line:\"\n msgstr \"Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):\"\n \n-#: gitk:3293\n+#: gitk:3811\n+msgid \"Apply (F5)\"\n+msgstr \"Anwenden (F5)\"\n+\n+#: gitk:3849\n msgid \"Error in commit selection arguments:\"\n msgstr \"Fehler in den ausgewählten Versionen:\"\n \n@@ -569,11 +648,7 @@ msgstr \"Lokale Änderungen bereitgestellt, aber nicht eingetragen\"\n msgid \"Local uncommitted changes, not checked in to index\"\n msgstr \"Lokale Änderungen, nicht bereitgestellt\"\n \n-#: gitk:5549\n-msgid \"Searching\"\n-msgstr \"Suchen\"\n-\n-#: gitk:6049\n+#: gitk:6673\n msgid \"Tags:\"\n msgstr \"Markierungen:\"\n \n@@ -597,11 +672,12 @@ msgstr \"Folgt auf\"\n msgid \"Precedes\"\n msgstr \"Vorgänger von\"\n \n-#: gitk:6378\n-msgid \"Error getting merge diffs:\"\n-msgstr \"Fehler beim Laden des Vergleichs:\"\n+#: gitk:7209\n+#, tcl-format\n+msgid \"Error getting diffs: %s\"\n+msgstr \"Fehler beim Laden des Vergleichs: %s\"\n \n-#: gitk:7113\n+#: gitk:7748\n msgid \"Goto:\"\n msgstr \"Gehe zu:\"\n \n@@ -722,7 +798,12 @@ msgstr \"Name:\"\n msgid \"Please specify a name for the new branch\"\n msgstr \"Bitte geben Sie einen Namen für den neuen Zweig an.\"\n \n-#: gitk:7703\n+#: gitk:8328\n+#, tcl-format\n+msgid \"Branch '%s' already exists. Overwrite?\"\n+msgstr \"Zweig »%s« existiert bereits. Soll er überschrieben werden?\"\n+\n+#: gitk:8394\n #, tcl-format\n msgid \"Commit %s is already included in branch %s -- really re-apply it?\"\n msgstr \"\"\n@@ -733,7 +814,26 @@ msgstr \"\"\n msgid \"Cherry-picking\"\n msgstr \"Version pflücken\"\n \n-#: gitk:7720\n+#: gitk:8408\n+#, tcl-format\n+msgid \"\"\n+\"Cherry-pick failed because of local changes to file '%s'.\\n\"\n+\"Please commit, reset or stash your changes and try again.\"\n+msgstr \"\"\n+\"Pflücken fehlgeschlagen, da noch lokale Änderungen in Datei »%s«\\n\"\n+\"vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\\n\"\n+\"zwischenspeichern (»git stash») und dann erneut versuchen.\"\n+\n+#: gitk:8414\n+msgid \"\"\n+\"Cherry-pick failed because of merge conflict.\\n\"\n+\"Do you wish to run git citool to resolve it?\"\n+msgstr \"\"\n+\"Pflücken fehlgeschlagen, da ein Zusammenführungs-Konflikt aufgetreten\\n\"\n+\"ist. Soll das »git citool« (Zusammenführungs-Werkzeug) aufgerufen\\n\"\n+\"werden, um diesen Konflikt aufzulösen?\"\n+\n+#: gitk:8430\n msgid \"No changes committed\"\n msgstr \"Keine Änderungen eingetragen\"\n \n@@ -889,23 +989,51 @@ msgstr \"Farben: Klicken zum Wählen\"\n msgid \"Background\"\n msgstr \"Hintergrund\"\n \n-#: gitk:9435\n+#: gitk:10153 gitk:10183\n+msgid \"background\"\n+msgstr \"Hintergrund\"\n+\n+#: gitk:10156\n msgid \"Foreground\"\n msgstr \"Vordergrund\"\n \n-#: gitk:9439\n+#: gitk:10157\n+msgid \"foreground\"\n+msgstr \"Vordergrund\"\n+\n+#: gitk:10160\n msgid \"Diff: old lines\"\n msgstr \"Vergleich: Alte Zeilen\"\n \n-#: gitk:9444\n+#: gitk:10161\n+msgid \"diff old lines\"\n+msgstr \"Vergleich - Alte Zeilen\"\n+\n+#: gitk:10165\n msgid \"Diff: new lines\"\n msgstr \"Vergleich: Neue Zeilen\"\n \n-#: gitk:9449\n+#: gitk:10166\n+msgid \"diff new lines\"\n+msgstr \"Vergleich - Neue Zeilen\"\n+\n+#: gitk:10170\n msgid \"Diff: hunk header\"\n msgstr \"Vergleich: Änderungstitel\"\n \n-#: gitk:9455\n+#: gitk:10172\n+msgid \"diff hunk header\"\n+msgstr \"Vergleich - Änderungstitel\"\n+\n+#: gitk:10176\n+msgid \"Marked line bg\"\n+msgstr \"Markierte Zeile Hintergrund\"\n+\n+#: gitk:10178\n+msgid \"marked line background\"\n+msgstr \"markierte Zeile Hintergrund\"\n+\n+#: gitk:10182\n msgid \"Select bg\"\n msgstr \"Hintergrundfarbe Auswählen\"\n \n-- \n1.6.0.3.517.g759a\n\n"}]}