[PATCH] gitk: Update German translation

[PATCH] gitk: Update German translation

[Christian Stimming]

[-- Attachment #1: Type: text/plain, Size: 543 bytes --]

Attached to avoid whitespace problems. This patch is against master of 
gitk.git at git.kernel.org.

By the way, the following two keybinding explanations seem ambiguous to me:

>   <Home>  Move to first commit
>   <End>   Move to last commit

What happens is that <home> jumps to the newest commit and <end> jumps to the 
oldest commit. Whether the "first" commit should be the newest or the oldest 
is, well, somewhat ambiguous. I'd propose to talk about the newest or topmost 
commit, but rather not about the "first".

Regards,

Christian

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gitk-Update-German-translation.patch --]
[-- Type: text/x-diff; charset="us-ascii"; name="0001-gitk-Update-German-translation.patch", Size: 23768 bytes --]

From 73e062a073c429f199af84d855c784b94a70220f Mon Sep 17 00:00:00 2001
From: Christian Stimming <stimming@tuhh.de>
Date: Thu, 1 May 2008 21:38:37 +0200
Subject: [PATCH] gitk: Update German translation

---
 po/de.po |  505 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 338 insertions(+), 167 deletions(-)

diff --git a/po/de.po b/po/de.po
index 5ee2fca..58b342a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,249 +7,253 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-09 22:20+0100\n"
-"PO-Revision-Date: 2008-01-09 22:21+0100\n"
+"POT-Creation-Date: 2008-05-01 11:54+0200\n"
+"PO-Revision-Date: 2008-05-01 21:32+0200\n"
 "Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gitk:101
+#: gitk:111
 msgid "Error executing git rev-list:"
 msgstr "Fehler beim Ausführen von git-rev-list:"
 
-#: gitk:114
+#: gitk:124
 msgid "Reading"
 msgstr "Lesen"
 
-#: gitk:141 gitk:2143
+#: gitk:151 gitk:2191
 msgid "Reading commits..."
 msgstr "Versionen lesen..."
 
-#: gitk:264
+#: gitk:275
 msgid "Can't parse git log output:"
 msgstr "Git log Ausgabe kann nicht erkannt werden:"
 
-#: gitk:375 gitk:2147
+#: gitk:386 gitk:2195
 msgid "No commits selected"
 msgstr "Keine Versionen ausgewählt."
 
-#: gitk:486
+#: gitk:500
 msgid "No commit information available"
 msgstr "Keine Versionsinformation verfügbar"
 
-#: gitk:585 gitk:607 gitk:1908 gitk:6366 gitk:7866 gitk:8020
+#: gitk:599 gitk:621 gitk:1955 gitk:6424 gitk:7924 gitk:8083
 msgid "OK"
 msgstr "Ok"
 
-#: gitk:609 gitk:1909 gitk:6046 gitk:6117 gitk:6218 gitk:6264 gitk:6368
-#: gitk:7867 gitk:8021
+#: gitk:623 gitk:1956 gitk:6108 gitk:6179 gitk:6276 gitk:6322 gitk:6426
+#: gitk:7925 gitk:8084
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: gitk:646
+#: gitk:661
 msgid "File"
 msgstr "Datei"
 
-#: gitk:648
+#: gitk:663
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: gitk:649
+#: gitk:664
 msgid "Reread references"
 msgstr "Zweige neu laden"
 
-#: gitk:650
+#: gitk:665
 msgid "List references"
 msgstr "Zweige auflisten"
 
-#: gitk:651
+#: gitk:666
 msgid "Quit"
 msgstr "Beenden"
 
-#: gitk:653
+#: gitk:668
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: gitk:654
+#: gitk:669
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: gitk:657
+#: gitk:672 gitk:1892
 msgid "View"
 msgstr "Ansicht"
 
-#: gitk:658
+#: gitk:673
 msgid "New view..."
 msgstr "Neue Ansicht..."
 
-#: gitk:659 gitk:2085 gitk:8651
+#: gitk:674 gitk:2133 gitk:8723
 msgid "Edit view..."
 msgstr "Ansicht bearbeiten..."
 
-#: gitk:661 gitk:2086 gitk:8652
+#: gitk:676 gitk:2134 gitk:8724
 msgid "Delete view"
 msgstr "Ansicht löschen"
 
-#: gitk:663
+#: gitk:678
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: gitk:667
+#: gitk:682
 msgid "Help"
 msgstr "Hilfe"
 
-#: gitk:668 gitk:1280
+#: gitk:683 gitk:1317
 msgid "About gitk"
 msgstr "Über gitk"
 
-#: gitk:669
+#: gitk:684
 msgid "Key bindings"
 msgstr "Tastenkürzel"
 
-#: gitk:726
+#: gitk:741
 msgid "SHA1 ID: "
 msgstr "SHA1:"
 
-#: gitk:776
+#: gitk:791
 msgid "Find"
 msgstr "Suche"
 
-#: gitk:777
+#: gitk:792
 msgid "next"
 msgstr "nächste"
 
-#: gitk:778
+#: gitk:793
 msgid "prev"
 msgstr "vorige"
 
-#: gitk:779
+#: gitk:794
 msgid "commit"
 msgstr "Version"
 
-#: gitk:782 gitk:784 gitk:2308 gitk:2331 gitk:2355 gitk:4257 gitk:4320
+#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369
 msgid "containing:"
 msgstr "enthaltend:"
 
-#: gitk:785 gitk:1741 gitk:1746 gitk:2383
+#: gitk:800 gitk:1778 gitk:1783 gitk:2431
 msgid "touching paths:"
 msgstr "Pfad betreffend:"
 
-#: gitk:786 gitk:2388
+#: gitk:801 gitk:2436
 msgid "adding/removing string:"
 msgstr "String dazu/löschen:"
 
-#: gitk:795 gitk:797
+#: gitk:810 gitk:812
 msgid "Exact"
 msgstr "Exakt"
 
-#: gitk:797 gitk:2466 gitk:4225
+#: gitk:812 gitk:2514 gitk:4274
 msgid "IgnCase"
 msgstr "Kein Groß/Klein"
 
-#: gitk:797 gitk:2357 gitk:2464 gitk:4221
+#: gitk:812 gitk:2405 gitk:2512 gitk:4270
 msgid "Regexp"
 msgstr "Regexp"
 
-#: gitk:799 gitk:800 gitk:2485 gitk:2515 gitk:2522 gitk:4331 gitk:4387
+#: gitk:814 gitk:815 gitk:2533 gitk:2563 gitk:2570 gitk:4380 gitk:4436
 msgid "All fields"
 msgstr "Alle Felder"
 
-#: gitk:800 gitk:2483 gitk:2515 gitk:4287
+#: gitk:815 gitk:2531 gitk:2563 gitk:4336
 msgid "Headline"
 msgstr "Überschrift"
 
-#: gitk:801 gitk:2483 gitk:4287 gitk:4387 gitk:4775
+#: gitk:816 gitk:2531 gitk:4336 gitk:4436 gitk:4827
 msgid "Comments"
 msgstr "Beschreibung"
 
-#: gitk:801 gitk:2483 gitk:2487 gitk:2522 gitk:4287 gitk:4711 gitk:5895
-#: gitk:5910
+#: gitk:816 gitk:2531 gitk:2535 gitk:2570 gitk:4336 gitk:4763 gitk:5957
+#: gitk:5972
 msgid "Author"
 msgstr "Autor"
 
-#: gitk:801 gitk:2483 gitk:4287 gitk:4713
+#: gitk:816 gitk:2531 gitk:4336 gitk:4765
 msgid "Committer"
 msgstr "Eintragender"
 
-#: gitk:829
+#: gitk:845
 msgid "Search"
 msgstr "Suche"
 
-#: gitk:836
+#: gitk:852
 msgid "Diff"
 msgstr "Vergleich"
 
-#: gitk:838
+#: gitk:854
 msgid "Old version"
 msgstr "Alte Version"
 
-#: gitk:840
+#: gitk:856
 msgid "New version"
 msgstr "Neue Version"
 
-#: gitk:842
+#: gitk:858
 msgid "Lines of context"
 msgstr "Kontextzeilen"
 
-#: gitk:900
+#: gitk:868
+msgid "Ignore space change"
+msgstr "Leerzeichenänderungen ignorieren"
+
+#: gitk:926
 msgid "Patch"
 msgstr "Patch"
 
-#: gitk:902
+#: gitk:928
 msgid "Tree"
 msgstr "Baum"
 
-#: gitk:1018 gitk:1033 gitk:5961
+#: gitk:1053 gitk:1068 gitk:6023
 msgid "Diff this -> selected"
 msgstr "Vergleich diese -> gewählte"
 
-#: gitk:1020 gitk:1035 gitk:5962
+#: gitk:1055 gitk:1070 gitk:6024
 msgid "Diff selected -> this"
 msgstr "Vergleich gewählte -> diese"
 
-#: gitk:1022 gitk:1037 gitk:5963
+#: gitk:1057 gitk:1072 gitk:6025
 msgid "Make patch"
 msgstr "Patch erstellen"
 
-#: gitk:1023 gitk:6101
+#: gitk:1058 gitk:6163
 msgid "Create tag"
 msgstr "Markierung erstellen"
 
-#: gitk:1024 gitk:6198
+#: gitk:1059 gitk:6256
 msgid "Write commit to file"
 msgstr "Version in Datei schreiben"
 
-#: gitk:1025 gitk:6252
+#: gitk:1060 gitk:6310
 msgid "Create new branch"
 msgstr "Neuen Zweig erstellen"
 
-#: gitk:1026
+#: gitk:1061
 msgid "Cherry-pick this commit"
 msgstr "Diese Version pflücken"
 
-#: gitk:1028
+#: gitk:1063
 msgid "Reset HEAD branch to here"
 msgstr "HEAD-Zweig auf diese Version zurücksetzen"
 
-#: gitk:1044
+#: gitk:1079
 msgid "Check out this branch"
 msgstr "Auf diesen Zweig umstellen"
 
-#: gitk:1046
+#: gitk:1081
 msgid "Remove this branch"
 msgstr "Zweig löschen"
 
-#: gitk:1052
+#: gitk:1087
 msgid "Highlight this too"
 msgstr "Diesen auch hervorheben"
 
-#: gitk:1054
+#: gitk:1089
 msgid "Highlight this only"
 msgstr "Nur diesen hervorheben"
 
-#: gitk:1281
+#: gitk:1318
 msgid ""
 "\n"
 "Gitk - a commit viewer for git\n"
@@ -267,262 +271,425 @@ msgstr ""
 "License\n"
 "        "
 
-#: gitk:1289 gitk:1350 gitk:6524
+#: gitk:1326 gitk:1387 gitk:6582
 msgid "Close"
 msgstr "Schließen"
 
-#: gitk:1308
+#: gitk:1345
 msgid "Gitk key bindings"
 msgstr "Gitk Tastaturbelegung"
 
-#: gitk:1858
+#: gitk:1347
+msgid "Gitk key bindings:"
+msgstr "Gitk Tastaturbelegung:"
+
+#: gitk:1349
+#, tcl-format
+msgid "<%s-Q>\t\tQuit"
+msgstr "<%s-Q>\t\tBeenden"
+
+#: gitk:1350
+msgid "<Home>\t\tMove to first commit"
+msgstr "<Pos1>\t\tZur neuesten Version springen"
+
+#: gitk:1351
+msgid "<End>\t\tMove to last commit"
+msgstr "<Ende>\t\tZur ältesten Version springen"
+
+#: gitk:1352
+msgid "<Up>, p, i\tMove up one commit"
+msgstr "<Hoch>, p, i\tNächste neuere Version"
+
+#: gitk:1353
+msgid "<Down>, n, k\tMove down one commit"
+msgstr "<Runter>, n, k\tNächste ältere Version"
+
+#: gitk:1354
+msgid "<Left>, z, j\tGo back in history list"
+msgstr "<Links>, z, j\tEine Version zurück gehen"
+
+#: gitk:1355
+msgid "<Right>, x, l\tGo forward in history list"
+msgstr "<Rechts>, x, l\tEine Version nach vorne gehen"
+
+#: gitk:1356
+msgid "<PageUp>\tMove up one page in commit list"
+msgstr "<BildHoch>\tEine Seite nach oben blättern"
+
+#: gitk:1357
+msgid "<PageDown>\tMove down one page in commit list"
+msgstr "<BildRunter>\tEine Seite nach unten blättern"
+
+#: gitk:1358
+#, tcl-format
+msgid "<%s-Home>\tScroll to top of commit list"
+msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern"
+
+#: gitk:1359
+#, tcl-format
+msgid "<%s-End>\tScroll to bottom of commit list"
+msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern"
+
+#: gitk:1360
+#, tcl-format
+msgid "<%s-Up>\tScroll commit list up one line"
+msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern"
+
+#: gitk:1361
+#, tcl-format
+msgid "<%s-Down>\tScroll commit list down one line"
+msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern"
+
+#: gitk:1362
+#, tcl-format
+msgid "<%s-PageUp>\tScroll commit list up one page"
+msgstr "<%s-BildHoch>\tVersionsliste eine Seite hoch blättern"
+
+#: gitk:1363
+#, tcl-format
+msgid "<%s-PageDown>\tScroll commit list down one page"
+msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern"
+
+#: gitk:1364
+msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
+msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)"
+
+#: gitk:1365
+msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
+msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)"
+
+#: gitk:1366
+msgid "<Delete>, b\tScroll diff view up one page"
+msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern"
+
+#: gitk:1367
+msgid "<Backspace>\tScroll diff view up one page"
+msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern"
+
+#: gitk:1368
+msgid "<Space>\t\tScroll diff view down one page"
+msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern"
+
+#: gitk:1369
+msgid "u\t\tScroll diff view up 18 lines"
+msgstr "u\t\tVergleich um 18 Zeilen nach oben (»up«) blättern"
+
+#: gitk:1370
+msgid "d\t\tScroll diff view down 18 lines"
+msgstr "d\t\tVergleich um 18 Zeilen nach unten (»down«) blättern"
+
+#: gitk:1371
+#, tcl-format
+msgid "<%s-F>\t\tFind"
+msgstr "<%s-F>\t\tSuchen"
+
+#: gitk:1372
+#, tcl-format
+msgid "<%s-G>\t\tMove to next find hit"
+msgstr "<%s-G>\t\tWeitersuchen"
+
+#: gitk:1373
+msgid "<Return>\tMove to next find hit"
+msgstr "<Eingabetaste>\tWeitersuchen"
+
+#: gitk:1374
+msgid "/\t\tMove to next find hit, or redo find"
+msgstr "/\t\tWeitersuchen oder neue Suche beginnen"
+
+#: gitk:1375
+msgid "?\t\tMove to previous find hit"
+msgstr "?\t\tRückwärts weitersuchen"
+
+#: gitk:1376
+msgid "f\t\tScroll diff view to next file"
+msgstr "f\t\tVergleich zur nächsten Datei (»file«) blättern"
+
+#: gitk:1377
+#, tcl-format
+msgid "<%s-S>\t\tSearch for next hit in diff view"
+msgstr "<%s-S>\t\tWeitersuchen im Vergleich"
+
+#: gitk:1378
+#, tcl-format
+msgid "<%s-R>\t\tSearch for previous hit in diff view"
+msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich"
+
+#: gitk:1379
+#, tcl-format
+msgid "<%s-KP+>\tIncrease font size"
+msgstr "<%s-Nummerblock-Plus>\tSchriftgröße vergrößern"
+
+#: gitk:1380
+#, tcl-format
+msgid "<%s-plus>\tIncrease font size"
+msgstr "<%s-Plus>\tSchriftgröße vergrößern"
+
+#: gitk:1381
+#, tcl-format
+msgid "<%s-KP->\tDecrease font size"
+msgstr "<%s-Nummernblock-> Schriftgröße verkleinern"
+
+#: gitk:1382
+#, tcl-format
+msgid "<%s-minus>\tDecrease font size"
+msgstr "<%s-Minus>\tSchriftgröße verkleinern"
+
+#: gitk:1383
+msgid "<F5>\t\tUpdate"
+msgstr "<F5>\t\tAktualisieren"
+
+#: gitk:1896
 msgid "Gitk view definition"
 msgstr "Gitk Ansichten"
 
-#: gitk:1882
+#: gitk:1921
 msgid "Name"
 msgstr "Name"
 
-#: gitk:1885
+#: gitk:1924
 msgid "Remember this view"
 msgstr "Diese Ansicht speichern"
 
-#: gitk:1889
+#: gitk:1928
 msgid "Commits to include (arguments to git rev-list):"
 msgstr "Versionen anzeigen (Argumente von git-rev-list):"
 
-#: gitk:1895
+#: gitk:1935
+msgid "Command to generate more commits to include:"
+msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:"
+
+#: gitk:1942
 msgid "Enter files and directories to include, one per line:"
 msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):"
 
-#: gitk:1942
+#: gitk:1989
 msgid "Error in commit selection arguments:"
 msgstr "Fehler in den ausgewählten Versionen:"
 
-#: gitk:1993 gitk:2079 gitk:2535 gitk:2549 gitk:3732 gitk:8620 gitk:8621
+#: gitk:2043 gitk:2127 gitk:2583 gitk:2597 gitk:3781 gitk:8689 gitk:8690
 msgid "None"
 msgstr "Keine"
 
-#: gitk:2483 gitk:4287 gitk:5897 gitk:5912
+#: gitk:2531 gitk:4336 gitk:5959 gitk:5974
 msgid "Date"
 msgstr "Datum"
 
-#: gitk:2483 gitk:4287
+#: gitk:2531 gitk:4336
 msgid "CDate"
 msgstr "Eintragedatum"
 
-#: gitk:2632 gitk:2637
+#: gitk:2680 gitk:2685
 msgid "Descendant"
 msgstr "Abkömmling"
 
-#: gitk:2633
+#: gitk:2681
 msgid "Not descendant"
 msgstr "Nicht Abkömmling"
 
-#: gitk:2640 gitk:2645
+#: gitk:2688 gitk:2693
 msgid "Ancestor"
 msgstr "Vorgänger"
 
-#: gitk:2641
+#: gitk:2689
 msgid "Not ancestor"
 msgstr "Nicht Vorgänger"
 
-#: gitk:2875
+#: gitk:2924
 msgid "Local changes checked in to index but not committed"
 msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen"
 
-#: gitk:2905
+#: gitk:2954
 msgid "Local uncommitted changes, not checked in to index"
 msgstr "Lokale Änderungen, nicht bereitgestellt"
 
-#: gitk:4256
+#: gitk:4305
 msgid "Searching"
 msgstr "Suchen"
 
-#: gitk:4715
+#: gitk:4767
 msgid "Tags:"
 msgstr "Markierungen:"
 
-#: gitk:4732 gitk:4738 gitk:5890
+#: gitk:4784 gitk:4790 gitk:5952
 msgid "Parent"
 msgstr "Eltern"
 
-#: gitk:4743
+#: gitk:4795
 msgid "Child"
 msgstr "Kind"
 
-#: gitk:4752
+#: gitk:4804
 msgid "Branch"
 msgstr "Zweig"
 
-#: gitk:4755
+#: gitk:4807
 msgid "Follows"
 msgstr "Folgt auf"
 
-#: gitk:4758
+#: gitk:4810
 msgid "Precedes"
 msgstr "Vorgänger von"
 
-#: gitk:5040
+#: gitk:5094
 msgid "Error getting merge diffs:"
 msgstr "Fehler beim Laden des Vergleichs:"
 
-#: gitk:5717
+#: gitk:5779
 msgid "Goto:"
 msgstr "Gehe zu:"
 
-#: gitk:5719
+#: gitk:5781
 msgid "SHA1 ID:"
 msgstr "SHA1 Kennung:"
 
-#: gitk:5744
+#: gitk:5806
 #, tcl-format
 msgid "Short SHA1 id %s is ambiguous"
 msgstr "Kurze SHA1-Kennung »%s« ist mehrdeutig"
 
-#: gitk:5756
+#: gitk:5818
 #, tcl-format
 msgid "SHA1 id %s is not known"
 msgstr "SHA1-Kennung »%s« unbekannt"
 
-#: gitk:5758
+#: gitk:5820
 #, tcl-format
 msgid "Tag/Head %s is not known"
 msgstr "Markierung/Zweig »%s« ist unbekannt"
 
-#: gitk:5900
+#: gitk:5962
 msgid "Children"
 msgstr "Kinder"
 
-#: gitk:5957
+#: gitk:6019
 #, tcl-format
 msgid "Reset %s branch to here"
 msgstr "Zweig »%s« hierher zurücksetzen"
 
-#: gitk:5988
+#: gitk:6050
 msgid "Top"
 msgstr "Oben"
 
-#: gitk:5989
+#: gitk:6051
 msgid "From"
 msgstr "Von"
 
-#: gitk:5994
+#: gitk:6056
 msgid "To"
 msgstr "bis"
 
-#: gitk:6017
+#: gitk:6079
 msgid "Generate patch"
 msgstr "Patch erstellen"
 
-#: gitk:6019
+#: gitk:6081
 msgid "From:"
 msgstr "Von:"
 
-#: gitk:6028
+#: gitk:6090
 msgid "To:"
 msgstr "bis:"
 
-#: gitk:6037
+#: gitk:6099
 msgid "Reverse"
 msgstr "Umgekehrt"
 
-#: gitk:6039 gitk:6212
+#: gitk:6101 gitk:6270
 msgid "Output file:"
 msgstr "Ausgabedatei:"
 
-#: gitk:6045
+#: gitk:6107
 msgid "Generate"
 msgstr "Erzeugen"
 
-#: gitk:6081
+#: gitk:6143
 msgid "Error creating patch:"
 msgstr "Fehler beim Patch erzeugen:"
 
-#: gitk:6103 gitk:6200 gitk:6254
+#: gitk:6165 gitk:6258 gitk:6312
 msgid "ID:"
 msgstr "ID:"
 
-#: gitk:6112
+#: gitk:6174
 msgid "Tag name:"
 msgstr "Markierungsname:"
 
-#: gitk:6116 gitk:6263
+#: gitk:6178 gitk:6321
 msgid "Create"
 msgstr "Erstellen"
 
-#: gitk:6131
+#: gitk:6193
 msgid "No tag name specified"
 msgstr "Kein Markierungsname angegeben"
 
-#: gitk:6135
+#: gitk:6197
 #, tcl-format
 msgid "Tag \"%s\" already exists"
 msgstr "Markierung »%s« existiert bereits."
 
-#: gitk:6145
+#: gitk:6203
 msgid "Error creating tag:"
 msgstr "Fehler bei Markierung erstellen:"
 
-#: gitk:6209
+#: gitk:6267
 msgid "Command:"
 msgstr "Kommando:"
 
-#: gitk:6217
+#: gitk:6275
 msgid "Write"
 msgstr "Schreiben"
 
-#: gitk:6233
+#: gitk:6291
 msgid "Error writing commit:"
 msgstr "Fehler beim Version eintragen:"
 
-#: gitk:6259
+#: gitk:6317
 msgid "Name:"
 msgstr "Name:"
 
-#: gitk:6278
+#: gitk:6336
 msgid "Please specify a name for the new branch"
 msgstr "Bitte geben Sie einen Namen für den neuen Zweig an."
 
-#: gitk:6307
+#: gitk:6365
 #, tcl-format
 msgid "Commit %s is already included in branch %s -- really re-apply it?"
 msgstr ""
 "Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut "
 "eintragen?"
 
-#: gitk:6312
+#: gitk:6370
 msgid "Cherry-picking"
 msgstr "Version pflücken"
 
-#: gitk:6324
+#: gitk:6382
 msgid "No changes committed"
 msgstr "Keine Änderungen eingetragen"
 
-#: gitk:6347
+#: gitk:6405
 msgid "Confirm reset"
 msgstr "Zurücksetzen bestätigen"
 
-#: gitk:6349
+#: gitk:6407
 #, tcl-format
 msgid "Reset branch %s to %s?"
 msgstr "Zweig »%s« auf »%s« zurücksetzen?"
 
-#: gitk:6353
+#: gitk:6411
 msgid "Reset type:"
 msgstr "Art des Zurücksetzens:"
 
-#: gitk:6357
+#: gitk:6415
 msgid "Soft: Leave working tree and index untouched"
 msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert"
 
-#: gitk:6360
+#: gitk:6418
 msgid "Mixed: Leave working tree untouched, reset index"
 msgstr ""
 "Gemischt: Arbeitskopie unverändert,\n"
 "Bereitstellung zurückgesetzt"
 
-#: gitk:6363
+#: gitk:6421
 msgid ""
 "Hard: Reset working tree and index\n"
 "(discard ALL local changes)"
@@ -530,21 +697,21 @@ msgstr ""
 "Hart: Arbeitskopie und Bereitstellung\n"
 "(Alle lokalen Änderungen werden gelöscht)"
 
-#: gitk:6379
+#: gitk:6437
 msgid "Resetting"
 msgstr "Zurücksetzen"
 
-#: gitk:6436
+#: gitk:6494
 msgid "Checking out"
 msgstr "Umstellen"
 
-#: gitk:6466
+#: gitk:6524
 msgid "Cannot delete the currently checked-out branch"
 msgstr ""
 "Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht "
 "gelöscht werden."
 
-#: gitk:6472
+#: gitk:6530
 #, tcl-format
 msgid ""
 "The commits on branch %s aren't on any other branch.\n"
@@ -553,16 +720,16 @@ msgstr ""
 "Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n"
 "Zweig »%s« trotzdem löschen?"
 
-#: gitk:6503
+#: gitk:6561
 #, tcl-format
 msgid "Tags and heads: %s"
 msgstr "Markierungen und Zweige: %s"
 
-#: gitk:6517
+#: gitk:6575
 msgid "Filter"
 msgstr "Filtern"
 
-#: gitk:6811
+#: gitk:6869
 msgid ""
 "Error reading commit topology information; branch and preceding/following "
 "tag information will be incomplete."
@@ -570,113 +737,117 @@ msgstr ""
 "Fehler beim Lesen der Strukturinformationen; Zweige und Vorgänger/Nachfolger "
 "Informationen werden unvollständig sein."
 
-#: gitk:7795
+#: gitk:7853
 msgid "Tag"
 msgstr "Markierung"
 
-#: gitk:7795
+#: gitk:7853
 msgid "Id"
 msgstr "Id"
 
-#: gitk:7835
+#: gitk:7893
 msgid "Gitk font chooser"
 msgstr "Gitk Schriften wählen"
 
-#: gitk:7852
+#: gitk:7910
 msgid "B"
 msgstr "F"
 
-#: gitk:7855
+#: gitk:7913
 msgid "I"
 msgstr "K"
 
-#: gitk:7948
+#: gitk:8006
 msgid "Gitk preferences"
 msgstr "Gitk Einstellungen"
 
-#: gitk:7949
+#: gitk:8007
 msgid "Commit list display options"
 msgstr "Anzeige Versionsliste"
 
-#: gitk:7952
+#: gitk:8010
 msgid "Maximum graph width (lines)"
 msgstr "Maximale Graphenbreite (Zeilen)"
 
-#: gitk:7956
+#: gitk:8014
 #, tcl-format
 msgid "Maximum graph width (% of pane)"
 msgstr "Maximale Graphenbreite (% des Fensters)"
 
-#: gitk:7961
+#: gitk:8019
 msgid "Show local changes"
 msgstr "Lokale Änderungen anzeigen"
 
-#: gitk:7966
+#: gitk:8024
+msgid "Auto-select SHA1"
+msgstr "SHA1 Hashwert automatisch markieren"
+
+#: gitk:8029
 msgid "Diff display options"
 msgstr "Anzeige Vergleich"
 
-#: gitk:7968
+#: gitk:8031
 msgid "Tab spacing"
 msgstr "Tabulatorbreite"
 
-#: gitk:7972
+#: gitk:8035
 msgid "Display nearby tags"
 msgstr "Naheliegende Überschriften anzeigen"
 
-#: gitk:7977
+#: gitk:8040
 msgid "Limit diffs to listed paths"
 msgstr "Vergleich nur für angezeigte Pfade"
 
-#: gitk:7982
+#: gitk:8045
 msgid "Colors: press to choose"
 msgstr "Farben: Klicken zum Wählen"
 
-#: gitk:7985
+#: gitk:8048
 msgid "Background"
 msgstr "Vordergrund"
 
-#: gitk:7989
+#: gitk:8052
 msgid "Foreground"
 msgstr "Hintergrund"
 
-#: gitk:7993
+#: gitk:8056
 msgid "Diff: old lines"
 msgstr "Vergleich: Alte Zeilen"
 
-#: gitk:7998
+#: gitk:8061
 msgid "Diff: new lines"
 msgstr "Vergleich: Neue Zeilen"
 
-#: gitk:8003
+#: gitk:8066
 msgid "Diff: hunk header"
 msgstr "Vergleich: Änderungstitel"
 
-#: gitk:8009
+#: gitk:8072
 msgid "Select bg"
 msgstr "Hintergrundfarbe Auswählen"
 
-#: gitk:8013
+#: gitk:8076
 msgid "Fonts: press to choose"
 msgstr "Schriftart: Klicken zum Wählen"
 
-#: gitk:8015
+#: gitk:8078
 msgid "Main font"
 msgstr "Programmschriftart"
 
-#: gitk:8016
+#: gitk:8079
 msgid "Diff display font"
 msgstr "Vergleich"
 
-#: gitk:8017
+#: gitk:8080
 msgid "User interface font"
 msgstr "Beschriftungen"
 
-#: gitk:8033
+#: gitk:8096
 #, tcl-format
 msgid "Gitk: choose color for %s"
 msgstr "Gitk: Farbe wählen für %s"
 
-#: gitk:8414
+#: gitk:8477
 msgid ""
 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
 " Gitk requires at least Tcl/Tk 8.4."
@@ -684,35 +855,35 @@ msgstr ""
 "Gitk läuft nicht mit dieser Version von Tcl/Tk.\n"
 "Gitk benötigt mindestens Tcl/Tk 8.4."
 
-#: gitk:8501
+#: gitk:8566
 msgid "Cannot find a git repository here."
 msgstr "Kein Git-Projektarchiv gefunden."
 
-#: gitk:8505
+#: gitk:8570
 #, tcl-format
 msgid "Cannot find the git directory \"%s\"."
 msgstr "Git-Verzeichnis »%s« wurde nicht gefunden."
 
-#: gitk:8544
+#: gitk:8613
 #, tcl-format
 msgid "Ambiguous argument '%s': both revision and filename"
 msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert."
 
-#: gitk:8556
+#: gitk:8625
 msgid "Bad arguments to gitk:"
 msgstr "Falsche Kommandozeilen-Parameter für gitk:"
 
-#: gitk:8568
+#: gitk:8637
 msgid "Couldn't get list of unmerged files:"
 msgstr "Liste der nicht-zusammengeführten Dateien nicht gefunden:"
 
-#: gitk:8584
+#: gitk:8653
 msgid "No files selected: --merge specified but no files are unmerged."
 msgstr ""
 "Keine Dateien ausgewähle: --merge angegeben, es existieren aber keine nicht-"
 "zusammengeführten Dateien."
 
-#: gitk:8587
+#: gitk:8656
 msgid ""
 "No files selected: --merge specified but no unmerged files are within file "
 "limit."
@@ -720,6 +891,6 @@ msgstr ""
 "Keine Dateien ausgewähle: --merge angegeben, aber keine nicht-"
 "zusammengeführten Dateien sind in der Dateiauswahl."
 
-#: gitk:8646
+#: gitk:8717
 msgid "Command line"
 msgstr "Kommandozeile"
-- 
1.5.4.2.133.g3d51e

Re: [PATCH] gitk: Update German translation

[Stephan Beyer]

[-- Attachment #1: Type: text/plain, Size: 4679 bytes --]

> I'd propose to talk about the newest or topmost commit, 
> but rather not about the "first".

I agree, but s/newest/latest/ :)


Well.
Although your patch does not cover the translations itself (and although
I neither use the German translation of gitk and use gitk very seldom at
all), I've taken a look at the given translations and want to drop some
comments/corrections.

> -#: gitk:141 gitk:2143
> +#: gitk:151 gitk:2191
>  msgid "Reading commits..."
>  msgstr "Versionen lesen..."

Is "Version" really the German translation for "commit" throughout the
whole git suite?
(Ehh, is git translated at all?)
I'd recommend "Commit" or "Eintragung"...

"Version" is so CVS/SVN-like.

> -#: gitk:264
> +#: gitk:275
>  msgid "Can't parse git log output:"
>  msgstr "Git log Ausgabe kann nicht erkannt werden:"

"git-log-Ausgabe" oder "Ausgabe von git-log"

> -#: gitk:650
> +#: gitk:665
>  msgid "List references"
>  msgstr "Zweige auflisten"

Hm, the button lists branches and tags.
Is then "Zweige" (= branches) only correct?
What about "Referenzen auflisten" or "Zweige/Markierungen auflisten" 
(or however "tags" is translated).

> -#: gitk:782 gitk:784 gitk:2308 gitk:2331 gitk:2355 gitk:4257 gitk:4320
> +#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369
>  msgid "containing:"
>  msgstr "enthaltend:"

"enthält:"

> -#: gitk:785 gitk:1741 gitk:1746 gitk:2383
> +#: gitk:800 gitk:1778 gitk:1783 gitk:2431
>  msgid "touching paths:"
>  msgstr "Pfad betreffend:"

"betrifft Pfad:"

> -#: gitk:786 gitk:2388
> +#: gitk:801 gitk:2436
>  msgid "adding/removing string:"
>  msgstr "String dazu/l??schen:"

"ändert Zeichenkette:"

> -#: gitk:797 gitk:2466 gitk:4225
> +#: gitk:812 gitk:2514 gitk:4274
>  msgid "IgnCase"
>  msgstr "Kein Gro??/Klein"

The translation is rather ambiguous. Or is it just me? ;)
"Ignoriere Groß-/Kleinschreibung"  or
"Groß-/Kleinschreibung ignorieren"

> -#: gitk:801 gitk:2483 gitk:4287 gitk:4713
> +#: gitk:816 gitk:2531 gitk:4336 gitk:4765
>  msgid "Committer"
>  msgstr "Eintragender"

"Versionierender" ... No, just a bad joke ;-)
The translation is good.

> -#: gitk:1026
> +#: gitk:1061
>  msgid "Cherry-pick this commit"
>  msgstr "Diese Version pfl??cken"

If I didn't knew that it means "cherry-pick", I'd have no idea
what the function behind that German words does. ;-)
(That's why I don't have locales set to my mother tongue. Just because I
only have to understand the programmer and not the translator first.)

"Diesen Commit übernehmen"
"Diesen Commit kopieren"
"Diese Eintragung übernehmen"

> +#: gitk:1354
> +msgid "<Left>, z, j\tGo back in history list"
> +msgstr "<Links>, z, j\tEine Version zur??ck gehen"

I think it's still "zurückgehen" and not "zurück gehen" in the latest
German spelling.

> +#: gitk:1355
> +msgid "<Right>, x, l\tGo forward in history list"
> +msgstr "<Rechts>, x, l\tEine Version nach vorne gehen"

"nach vorne gehen" sounds so colloquial.
Better, perhaps: "weitergehen"?

> -#: gitk:5719
> +#: gitk:5781
>  msgid "SHA1 ID:"
>  msgstr "SHA1 Kennung:"

Somewhere else it has been translated to "SHA1:", which is imho better.
Otherwise it'd be "SHA1-Kennung".

> -#: gitk:5744
> +#: gitk:5806
>  #, tcl-format
>  msgid "Short SHA1 id %s is ambiguous"
>  msgstr "Kurze SHA1-Kennung ??%s?? ist mehrdeutig"

Here it's correct.

> -#: gitk:6081
> +#: gitk:6143
>  msgid "Error creating patch:"
>  msgstr "Fehler beim Patch erzeugen:"

"Fehler bei der Erzeugung des Patches"

> -#: gitk:6233
> +#: gitk:6291
>  msgid "Error writing commit:"
>  msgstr "Fehler beim Version eintragen:"

"Fehler bei der Eintragung:"
"Fehler beim Schreiben der Eintragung:" (or "Version", if really used in
other places)

> -#: gitk:7966
> +#: gitk:8024
> +msgid "Auto-select SHA1"
> +msgstr "SHA1 Hashwert automatisch markieren"

"SHA1-Hashwert"

> -#: gitk:7985
> +#: gitk:8048
>  msgid "Background"
>  msgstr "Vordergrund"
>  
> -#: gitk:7989
> +#: gitk:8052
>  msgid "Foreground"
>  msgstr "Hintergrund"

Funny. It's vice versa!

msgid "Background"
msgstr "Hintergrund"

msgid "Foreground"
msgstr "Vordergrund"

> -#: gitk:8587
> +#: gitk:8656
>  msgid ""
>  "No files selected: --merge specified but no unmerged files are within file "
>  "limit."
> @@ -720,6 +891,6 @@ msgstr ""
>  "Keine Dateien ausgew??hle: --merge angegeben, aber keine nicht-"
                            ^
			    t
>  "zusammengef??hrten Dateien sind in der Dateiauswahl."

Regards,
  Stephan

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] gitk: Update German translation

[Paul Mackerras]

Christian Stimming writes:

> Attached to avoid whitespace problems. This patch is against master of 
> gitk.git at git.kernel.org.

Thanks.

> By the way, the following two keybinding explanations seem ambiguous to me:
> 
> >   <Home>  Move to first commit
> >   <End>   Move to last commit
> 
> What happens is that <home> jumps to the newest commit and <end> jumps to the 
> oldest commit. Whether the "first" commit should be the newest or the oldest 
> is, well, somewhat ambiguous. I'd propose to talk about the newest or topmost 
> commit, but rather not about the "first".

Well, the commits aren't in date order, strictly speaking, and the
last commit isn't necessarily the oldest (though the first commit will
in fact be the newest).  How about:

<Home>	Move to head of list
<End>	Move to tail of list

Would that be any clearer?

Paul.

Re: [PATCH] gitk: Update German translation

[Paul Mackerras]

Christian Stimming writes:

> Attached to avoid whitespace problems. This patch is against master of 
> gitk.git at git.kernel.org.

Thanks.  Can I have a Signed-off-by from you for it?

Paul.

Re: [PATCH] gitk: Update German translation

[Christian Stimming]

Am Freitag, 2. Mai 2008 14:56 schrieb Paul Mackerras:
> Christian Stimming writes:
> > Attached to avoid whitespace problems. This patch is against master of
> > gitk.git at git.kernel.org.
>
> Thanks.  Can I have a Signed-off-by from you for it?

Yes.

Christian

Re: [PATCH] gitk: Update German translation

[Christian Stimming]

Am Freitag, 2. Mai 2008 13:49 schrieb Paul Mackerras:
> > By the way, the following two keybinding explanations seem ambiguous to 
me:
> > >   <Home>  Move to first commit
> > >   <End>   Move to last commit
> >
> > What happens is that <home> jumps to the newest commit and <end> jumps to
> > the oldest commit. Whether the "first" commit should be the newest or the
> > oldest is, well, somewhat ambiguous. I'd propose to talk about the newest
> > or topmost commit, but rather not about the "first".
>
> Well, the commits aren't in date order, strictly speaking, and the
> last commit isn't necessarily the oldest (though the first commit will
> in fact be the newest).  How about:
>
> <Home>	Move to head of list
> <End>	Move to tail of list
>
> Would that be any clearer?

I think "head of list" and "tail of list" are more the terms about the 
implementation detail and not so much an explanation that is easily 
understood for the user. I think some combination using the word "top" should 
rather be used to make it really clear we're talking about the upper end of 
the window.

Christian

Re: [PATCH] gitk: Update German translation

[Christian Stimming]

Am Donnerstag, 1. Mai 2008 23:10 schrieb Stephan Beyer:
> > I'd propose to talk about the newest or topmost commit,
> > but rather not about the "first".
>
> I agree, but s/newest/latest/ :)

Both is possible, and a third alternative is "most recent". I couldn't care 
less, as long as we get away from the ambiguous "first".

> Well.
> Although your patch does not cover the translations itself (and although
> I neither use the German translation of gitk and use gitk very seldom at
> all), I've taken a look at the given translations and want to drop some
> comments/corrections.

Thanks for the feedback about the German translation. Indeed there is no git 
translation into German, at least none that I know of so far. What exists is 
the translation of git-gui which includes a glossary of terms that are used 
throughout git-gui (and git). That glossary and the git-gui translation was 
created by myself as well. At the time when the glossary was created, it was 
also discussed here in the list quite a lot, see 
http://article.gmane.org/gmane.comp.version-control.git/53181 and more 
importantly this whole thread 
http://kerneltrap.org/mailarchive/git/2007/9/16/269956 (somehow gmane.org 
doesn't have this thread available?!?)

Hence, translations for terms like "commit" have indeed been discussed quite a 
bit, and I'm quite satisfied with the current wording. You're welcome to 
propose alternatives, but please be prepared to give really good reasons as 
for why an alternative is really better than the current version.

Nevertheless thanks a lot for the typos you spotted. I'll list those that are 
easy and I agree upon first, and I'll comment on the other and more difficult 
words later.

+++ The easy ones:

> > -#: gitk:264
> > +#: gitk:275
> >  msgid "Can't parse git log output:"
> >  msgstr "Git log Ausgabe kann nicht erkannt werden:"
>
> "git-log-Ausgabe" oder "Ausgabe von git-log"

Ok.

> > -#: gitk:650
> > +#: gitk:665
> >  msgid "List references"
> >  msgstr "Zweige auflisten"
>
> Hm, the button lists branches and tags.
> Is then "Zweige" (= branches) only correct?
> What about "Referenzen auflisten" or "Zweige/Markierungen auflisten"
> (or however "tags" is translated).

Ok.

> > -#: gitk:7966
> > +#: gitk:8024
> > +msgid "Auto-select SHA1"
> > +msgstr "SHA1 Hashwert automatisch markieren"
>
> "SHA1-Hashwert"

Ok.

> > -#: gitk:7985
> > +#: gitk:8048
> >  msgid "Background"
> >  msgstr "Vordergrund"
> >
> > -#: gitk:7989
> > +#: gitk:8052
> >  msgid "Foreground"
> >  msgstr "Hintergrund"
>
> Funny. It's vice versa!

Thanks a lot! No idea why nobody saw this so far, including me.

> > -#: gitk:8587
> > +#: gitk:8656
> >  msgid ""
> >  "No files selected: --merge specified but no unmerged files are within
> > file " "limit."
> > @@ -720,6 +891,6 @@ msgstr ""
> >  "Keine Dateien ausgew??hle: 
>                             ^
> 			    t

Ok, thanks.

> > +#: gitk:1354
> > +msgid "<Left>, z, j\tGo back in history list"
> > +msgstr "<Links>, z, j\tEine Version zur??ck gehen"
>
> I think it's still "zurückgehen" and not "zurück gehen" in the latest
> German spelling.

Ok.

> > +#: gitk:1355
> > +msgid "<Right>, x, l\tGo forward in history list"
> > +msgstr "<Rechts>, x, l\tEine Version nach vorne gehen"
>
> "nach vorne gehen" sounds so colloquial.
> Better, perhaps: "weitergehen"?

Ok. "weitergehen" IMHO has a similar problem as the first/last issue - the 
user doesn't know which direction is meant. But your proposal is better than 
the colloquial term.

> > -#: gitk:5719
> > +#: gitk:5781
> >  msgid "SHA1 ID:"
> >  msgstr "SHA1 Kennung:"
>
> Somewhere else it has been translated to "SHA1:", which is imho better.
> Otherwise it'd be "SHA1-Kennung".

The latter. Thanks. As for why it was "SHA1:" in one string, I'll explain 
below.

> > -#: gitk:6233
> > +#: gitk:6291
> >  msgid "Error writing commit:"
> >  msgstr "Fehler beim Version eintragen:"
>
> "Fehler bei der Eintragung:"
> "Fehler beim Schreiben der Eintragung:" (or "Version", if really used in
> other places)

"Fehler beim Schreiben der Version" it is, thanks.


+++ Now the more difficult ones

> > -#: gitk:141 gitk:2143
> > +#: gitk:151 gitk:2191
> >  msgid "Reading commits..."
> >  msgstr "Versionen lesen..."
>
> Is "Version" really the German translation for "commit" throughout the
> whole git suite?
> (Ehh, is git translated at all?)
> I'd recommend "Commit" or "Eintragung"...
>
> "Version" is so CVS/SVN-like.

"Version" is what came out as most convincing from last September's 
discussion. "Commit" is only for those who want the English version anyway, 
hence that's not the target audience of this translation. "Eintragung" would 
indeed be one possibility, but when I explain how git works to other Germans, 
I would always talk about the "Versionen" that you can browse and merge and 
add. The word works quite nicely, which is another argument for it. On the 
other hand I don't understand how "is so CVS-like" would be any argument in 
favor or against this particular German word.

> > -#: gitk:782 gitk:784 gitk:2308 gitk:2331 gitk:2355 gitk:4257 gitk:4320
> > +#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369
> >  msgid "containing:"
> >  msgstr "enthaltend:"
>
> "enthält:"

No. Please have a look at the place where this is used. In fact this word is 
used as the part of a full sentence (which in itself is very bad i18n style, 
but that's another discussion), and the sentence reads "Suche nächste/vorige 
Version enthaltend:". The sentence is already quite "holprig" and I'm sorry 
for that, but at least it is still gramatically correct. Using "enthält" 
would make it gramatically wrong. Same for the other following strings that 
you mentioned.

> > -#: gitk:786 gitk:2388
> > +#: gitk:801 gitk:2436
> >  msgid "adding/removing string:"
> >  msgstr "String dazu/l??schen:"
>
> "ändert Zeichenkette:"

Hm... I'd say "Zeichenkette ändernd", but thinking about it, I'm not even sure 
anymore whether this is what this criterion will search for?

> > -#: gitk:797 gitk:2466 gitk:4225
> > +#: gitk:812 gitk:2514 gitk:4274
> >  msgid "IgnCase"
> >  msgstr "Kein Gro??/Klein"
>
> The translation is rather ambiguous. Or is it just me? ;)
> "Ignoriere Groß-/Kleinschreibung"  or
> "Groß-/Kleinschreibung ignorieren"

In principle yes, but again please have a look at where this string actually 
appears in the program. The multichoice box there really must not be very 
wide. That's why I came up with this weird short form 
of "Groß-/Kleinschreibung ignorieren", but the original string is just as 
well already a weird abbreviation.

> > -#: gitk:1026
> > +#: gitk:1061
> >  msgid "Cherry-pick this commit"
> >  msgstr "Diese Version pfl??cken"
>
> If I didn't knew that it means "cherry-pick", I'd have no idea
> what the function behind that German words does. ;-)
> (That's why I don't have locales set to my mother tongue. Just because I
> only have to understand the programmer and not the translator first.)

No, you're missing the point again. If you didn't knew what "cherry-pick" 
means, you would have no idea what the function behind it does. In other 
words: Git invented a new word here anyway. Hence, a new word will appear in 
the translation, too, and it isn't an argument that you didn't recognize it 
as your familiar english word at first. It *is* an argument if the actual 
action can be described in a better and more understandable way by a 
different German word, though.

> "Diesen Commit übernehmen"
> "Diesen Commit kopieren"
> "Diese Eintragung übernehmen"

"Diese Version kopieren" would be one possibility - but this bears the 
question why git itself doesn't call this action "to copy a commit". To 
me, "Version kopieren" rather sounds like the familiar "copy to clipboard" 
action in the Edit menu, but it misses the part that this commit will 
immediately be committed (heh) to the currently checked out branch.

> > -#: gitk:6081
> > +#: gitk:6143
> >  msgid "Error creating patch:"
> >  msgstr "Fehler beim Patch erzeugen:"
>
> "Fehler bei der Erzeugung des Patches"

I agree the original string is sub-optimal, but "Erzeugung"? Also not a nice 
word. Anything better?

Thank you very much for your feedback!

Regards,

Christian

[PATCH] gitk: German translation again updated

[Christian Stimming]

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

This includes the fixed typos and proposals by Stephan Beyer that were easy to 
agree upon.

This patch is to be committed on top of yesterday's German translation patch.

Regards,

Christian

(Attached because of whitespace yadda yadda)

[-- Attachment #2: 0001-gitk-German-translation-again-updated.patch --]
[-- Type: text/x-diff, Size: 3682 bytes --]

From 980528caeee6565fe477e87b90dfde79a4f29416 Mon Sep 17 00:00:00 2001
From: Christian Stimming <stimming@tuhh.de>
Date: Fri, 2 May 2008 21:33:34 +0200
Subject: [PATCH] gitk: German translation again updated

This includes suggestions by Stephan Beyer.
---
 po/de.po |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/po/de.po b/po/de.po
index 58b342a..b9867bf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-05-01 11:54+0200\n"
-"PO-Revision-Date: 2008-05-01 21:32+0200\n"
+"PO-Revision-Date: 2008-05-02 21:12+0200\n"
 "Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr "Versionen lesen..."
 
 #: gitk:275
 msgid "Can't parse git log output:"
-msgstr "Git log Ausgabe kann nicht erkannt werden:"
+msgstr "Ausgabe von git-log kann nicht erkannt werden:"
 
 #: gitk:386 gitk:2195
 msgid "No commits selected"
@@ -62,7 +62,7 @@ msgstr "Zweige neu laden"
 
 #: gitk:665
 msgid "List references"
-msgstr "Zweige auflisten"
+msgstr "Zweige/Markierungen auflisten"
 
 #: gitk:666
 msgid "Quit"
@@ -138,7 +138,7 @@ msgstr "Pfad betreffend:"
 
 #: gitk:801 gitk:2436
 msgid "adding/removing string:"
-msgstr "String dazu/löschen:"
+msgstr "Zeichenkette ändernd:"
 
 #: gitk:810 gitk:812
 msgid "Exact"
@@ -306,11 +306,11 @@ msgstr "<Runter>, n, k\tNächste ältere Version"
 
 #: gitk:1354
 msgid "<Left>, z, j\tGo back in history list"
-msgstr "<Links>, z, j\tEine Version zurück gehen"
+msgstr "<Links>, z, j\tEine Version zurückgehen"
 
 #: gitk:1355
 msgid "<Right>, x, l\tGo forward in history list"
-msgstr "<Rechts>, x, l\tEine Version nach vorne gehen"
+msgstr "<Rechts>, x, l\tEine Version weitergehen"
 
 #: gitk:1356
 msgid "<PageUp>\tMove up one page in commit list"
@@ -540,17 +540,17 @@ msgstr "Gehe zu:"
 
 #: gitk:5781
 msgid "SHA1 ID:"
-msgstr "SHA1 Kennung:"
+msgstr "SHA1-Hashwert:"
 
 #: gitk:5806
 #, tcl-format
 msgid "Short SHA1 id %s is ambiguous"
-msgstr "Kurze SHA1-Kennung »%s« ist mehrdeutig"
+msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig"
 
 #: gitk:5818
 #, tcl-format
 msgid "SHA1 id %s is not known"
-msgstr "SHA1-Kennung »%s« unbekannt"
+msgstr "SHA1-Hashwert »%s« unbekannt"
 
 #: gitk:5820
 #, tcl-format
@@ -641,7 +641,7 @@ msgstr "Schreiben"
 
 #: gitk:6291
 msgid "Error writing commit:"
-msgstr "Fehler beim Version eintragen:"
+msgstr "Fehler beim Schreiben der Version:"
 
 #: gitk:6317
 msgid "Name:"
@@ -780,7 +780,7 @@ msgstr "Lokale Änderungen anzeigen"
 
 #: gitk:8024
 msgid "Auto-select SHA1"
-msgstr "SHA1 Hashwert automatisch markieren"
+msgstr "SHA1-Hashwert automatisch markieren"
 
 #: gitk:8029
 msgid "Diff display options"
@@ -804,11 +804,11 @@ msgstr "Farben: Klicken zum Wählen"
 
 #: gitk:8048
 msgid "Background"
-msgstr "Vordergrund"
+msgstr "Hintergrund"
 
 #: gitk:8052
 msgid "Foreground"
-msgstr "Hintergrund"
+msgstr "Vordergrund"
 
 #: gitk:8056
 msgid "Diff: old lines"
@@ -879,9 +879,7 @@ msgstr "Liste der nicht-zusammengeführten Dateien nicht gefunden:"
 
 #: gitk:8653
 msgid "No files selected: --merge specified but no files are unmerged."
-msgstr ""
-"Keine Dateien ausgewähle: --merge angegeben, es existieren aber keine nicht-"
-"zusammengeführten Dateien."
+msgstr "Keine Dateien ausgewählt: --merge angegeben, es existieren aber keine nicht-zusammengeführten Dateien."
 
 #: gitk:8656
 msgid ""
-- 
1.5.4.2.133.g3d51e

Re: [PATCH] gitk: Update German translation

[Stephan Beyer]

Hi,

> That glossary and the git-gui translation was created by myself as well.

And you did a great job doing it. ;)

> Hence, translations for terms like "commit" have indeed been discussed
> quite a bit,

It's ok then. I didn't know that there was big discussion about that. 
Thanks for the links.

> > >  msgid "Reading commits..."
> > >  msgstr "Versionen lesen..."
> >
> > Is "Version" really the German translation for "commit" throughout the
> > whole git suite?
> > (Ehh, is git translated at all?)
> > I'd recommend "Commit" or "Eintragung"...
> 
> "Version" is what came out as most convincing from last September's 
> discussion. "Commit" is only for those who want the English version
> anyway, hence that's not the target audience of this translation.

I understand the point for using "Version" as the German translation for
the noun "commit" (seems to be the best choice), but I think I have a 
different view on the target audience of the translation. :-)

I think, most of the users of a translated git-gui or gitk are not people
who do not understand an English word at all. I think, they just like to
act in a localized environment.
But SCM tool users of any nationality usually know what a "commit" is,
so I see nothing bad in using "Commit" in the German translation.
And the German word "Version" is a broader term that can lead to some
misunderstanding; the English word "commit" used in German sentences
is a clear technical term for SCM tool users.

It's the typical problem in German technical literature. There is the one
type where every technical term is translated to a German word in the hope
that it will be easier to understand but could also leave the reader in 
some confusion because she has another understanding of the known word.
And there is the other type, where technical terms are kept untranslated 
to let the readers easily understand original English literature 
but also resulting in a lot of "denglisch" sentences.
So a really good translation of technical literature and its technical 
terms is pretty hard.

The most German translations in the free software world are translated
using the first, the "translate every term" paradigm. So it seems good
to me that gitk/git-gui follows that way. Nevertheless, just because of 
this paradigm I switched back to the original/English versions. ;)

> > "nach vorne gehen" sounds so colloquial.
> > Better, perhaps: "weitergehen"?
> 
> Ok. "weitergehen" IMHO has a similar problem as the first/last issue - the
> user doesn't know which direction is meant.

Mh, I thought that "nach vorne" and "weiter" have the same meaning here.
But perhaps I'm wrong.

> But your proposal is better than the colloquial term.

I don't know if colloquial terms are really bad in software.
Perhaps it depends on the software. E.g. in games or fun tools it can be nice.

> > > -#: gitk:6081
> > > +#: gitk:6143
> > >  msgid "Error creating patch:"
> > >  msgstr "Fehler beim Patch erzeugen:"
> >
> > "Fehler bei der Erzeugung des Patches"
> 
> I agree the original string is sub-optimal, but "Erzeugung"? Also not a
> nice word. Anything better?

Sorry, I meant "Fehler beim Erzeugen des Patches"
as in
 > > >  msgid "Error writing commit:"
 > > >  msgstr "Fehler beim Version eintragen:"
 > > [...]
 > "Fehler beim Schreiben der Version" it is, thanks.
(which also could be "Fehler beim Eintragen der Version")

The reason for my correction is that "beim Version eintragen"
is wrong according to my last look at the German grammar rules,
but note that I'm not up-to-date ;-)
A correct choice could be something like "beim Versionseintragen" 
or "beim Version-Eintragen" (or Version-eintragen?) Not sure.
So I thought using the Genitive case is a good choice.

Btw, I'm convinced that every German will also understand your
original translation.

> > >  msgid "containing:"
> > >  msgstr "enthaltend:"
> >
> > "enthält:"
> 
> No. Please have a look at the place where this is used.

I did. But you are right that my proposal is wrong.

> In fact this word is used as the part of a full sentence 
> (which in itself is very bad i18n style, but that's another discussion),
> and the sentence reads "Suche nächste/vorige Version enthaltend:".

My mistake was that I began reading at "Version"... ;)

> The sentence is already quite "holprig"

The original
 "Find next/prev commit _containing:_ [insert]"
should be translated to
 "Suche nächste/vorige Version, die [insert] enthält."
But this is beyond the used techniques for software translation ;-)

Looking at the other two cases:
 "Find next/prev commit _touching paths:_ [insert]"
and
 "Find next/prev commit _adding/removing String:_ [insert]"
and looking what they are actually doing,
I come to another solution that should make it clear:
 1. "Suche nächste/vorige Version _nach Beschreibung:_ [insert]"
 2. "Suche nächste/vorige Version _nach Pfaden:_ [insert]"
    (or maybe "nach Dateien:", if it's commonly accepted that 
     directories are files, too.)
 3. "Suche nächste/vorige Version _nach Änderungen:_ [insert]"
(This is btw a very cool feature and a reason to use gitk more often.)

> > >  msgid "IgnCase"
> > >  msgstr "Kein Gro??/Klein"
> >
> > The translation is rather ambiguous. Or is it just me? ;)
> > "Ignoriere Groß-/Kleinschreibung"  or
> > "Groß-/Kleinschreibung ignorieren"
> 
> In principle yes, but again please have a look at where this string
> actually appears in the program. The multichoice box there really must
> not be very wide.

Ah ok. I got in a hurry when writing the last mail, but I wondered
why there's "IgnCase" and not "Ignore case".
Hmmm, so I'd possibly take "Groß/klein egal" which has the same length
as yours but yours is also good, since it's not ambiguous to me anymore,
because another choice of the multichoice box is "exakt" ;-)

> > >  msgid "Cherry-pick this commit"
> > >  msgstr "Diese Version pfl??cken"
> >
> > If I didn't knew that it means "cherry-pick", I'd have no idea
> > what the function behind that German words does. ;-)
> 
> No, you're missing the point again. If you didn't knew what "cherry-pick" 
> means, you would have no idea what the function behind it does.

Right, but if I know what "cherry-pick" means, I could still have no idea
what the function behind "Version pflücken" does.
A word-by-word translation like "Kirsche pflücken" would also result in a
grinning me (as a user), but I'd recognize it as the 'git-cherry-pick' 
that I know.

> In other words: Git invented a new word here anyway.

No, "cherry picking" is a commonly used term.

I wonder what a commonly used German phrase with a similar meaning is...
Something like "sich die Rosine(n) herauspicken"? (Is this a common phrase?)
But a translation to "Diese Rosine herauspicken" is also confusing.
("Warum ist dieser Commit eine Rosine? 
  Was passiert, wenn ich sie herauspicke?
  Ist er dann weg?")

> It *is* an argument if the actual action can be described in a better
> and more understandable way by a different German word, though.

Yes.
A user of the English version might also need to know what 
git-cherry-pick does before clicking on "Cherry-pick this commit".
Or does this come by intuition? 
(Hard to see for me, as I'm no native English speaker.)

> > "Diesen Commit übernehmen"
> > "Diesen Commit kopieren"
> > "Diese Eintragung übernehmen"
> 
> "Diese Version kopieren" would be one possibility - but this bears the 
> question why git itself doesn't call this action "to copy a commit".

To confuse the translation issue. ;-)

> "Version kopieren" rather sounds like the familiar "copy to clipboard"
> action in the Edit menu,

Good point.

Btw, 'man git-cherry-pick' says
        "Apply the change introduced by an existing commit".
So why not take this and use
 "Durch diese Version eingeführte Änderungen übernehmen" or
 "Durch diese Version eingeführte Änderungen anwenden"?

Regards,
  Stephan
-- 
GMX startet ShortView.de. Hier findest Du Leute mit Deinen Interessen!
Jetzt dabei sein: http://www.shortview.de/?mc=sv_ext_mf@gmx

Re: [PATCH] gitk: Update German translation

[Paul Mackerras]

Christian Stimming writes:

> > Well, the commits aren't in date order, strictly speaking, and the
> > last commit isn't necessarily the oldest (though the first commit will
> > in fact be the newest).  How about:
> >
> > <Home>	Move to head of list
> > <End>	Move to tail of list
> >
> > Would that be any clearer?
> 
> I think "head of list" and "tail of list" are more the terms about the 
> implementation detail and not so much an explanation that is easily 
> understood for the user. I think some combination using the word "top" should 
> rather be used to make it really clear we're talking about the upper end of 
> the window.

The list isn't just a detail, it's what the user sees in the top pane:
the commits, listed in some order.

How about "top of list" and "bottom of list"?  Or "start of list" and
"end of list"?

Paul.

Re: [PATCH] gitk: Update German translation

[Christian Stimming]

Am Samstag, 3. Mai 2008 09:53 schrieb Paul Mackerras:
> Christian Stimming writes:
> > > Well, the commits aren't in date order, strictly speaking, and the
> > > last commit isn't necessarily the oldest (though the first commit will
> > > in fact be the newest).  How about:
> > >
> > > <Home>	Move to head of list
> > > <End>	Move to tail of list
> > >
> > > Would that be any clearer?
> >
> > I think "head of list" and "tail of list" are more the terms about the
> > implementation detail and not so much an explanation that is easily
> > understood for the user. I think some combination using the word "top"
> > should rather be used to make it really clear we're talking about the
> > upper end of the window.
>
> The list isn't just a detail, it's what the user sees in the top pane:
> the commits, listed in some order.
>
> How about "top of list" and "bottom of list"?  Or "start of list" and
> "end of list"?

I think "top of list" and "bottom of list" would work quite well.

Regards,

Christian

Re: [PATCH] gitk: Update German translation

[Christian Stimming]

Hi Stephan,

thanks for your feedback. I won't have time to answer this in detail until end 
of next week. I'll just highlight a few things:

* Translation "commit" - "Version": Indeed this depends on the target 
audience. Those who prefer the english terms IMHO are by definition no longer 
the target audience. That's why I prefer this German word in the translation. 
By the way, I strongly suggest reading the German TortoiseSVN documentation - 
IMHO they've created a really good translation.

Am Samstag, 3. Mai 2008 03:24 schrieb Stephan Beyer:
> > In fact this word is used as the part of a full sentence
> > (which in itself is very bad i18n style, but that's another discussion),
> > and the sentence reads "Suche nächste/vorige Version enthaltend:".
>
> My mistake was that I began reading at "Version"... ;)
>
> > The sentence is already quite "holprig"
>
> The original
>  "Find next/prev commit _containing:_ [insert]"
> should be translated to
>  "Suche nächste/vorige Version, die [insert] enthält."
> But this is beyond the used techniques for software translation ;-)

Yes. But maybe even without GUI modifications this can be translated in a 
better way. Eventually, I would expect something like this:

  Suchen: Nächste / vorige Fundstelle mit Kriterium 'Enthält Zeichenkette': 
[insert]

IMHO this shouldn't be one single sentence which is what the current english 
GUI tries to mimic. Instead, this should be something with a heading and a 
choicebox for the criteria and appropriate labels for those. Maybe we can 
come up with a translation that already does this - the above sentence was a 
quick thought but there are surely better ways to do this.

> > > >  msgid "Cherry-pick this commit"
> > > >  msgstr "Diese Version pflücken"
>
> > In other words: Git invented a new word here anyway.
>
> No, "cherry picking" is a commonly used term.
>
> I wonder what a commonly used German phrase with a similar meaning is...
> Something like "sich die Rosine(n) herauspicken"? (Is this a common
> phrase?) But a translation to "Diese Rosine herauspicken" is also
> confusing. ("Warum ist dieser Commit eine Rosine?
>   Was passiert, wenn ich sie herauspicke?
>   Ist er dann weg?")

Good point. We shouldn't come up with "Rosinen" here. Maybe "herauspicken", 
but then "pflücken" can work as well. Branches are called "Zweige", so it's 
not too far-fetched to have an action for "etwas von einem Zweig pflücken".

> Btw, 'man git-cherry-pick' says
>         "Apply the change introduced by an existing commit".
> So why not take this and use
>  "Durch diese Version eingeführte Änderungen übernehmen" or
>  "Durch diese Version eingeführte Änderungen anwenden"?

This is indeed a case where a better translation can still be found. However, 
all of "kopieren, übernehmen, anwenden" IMHO sound too similar to actions 
that already appear here or there in the version control GUI. Cherry-picking 
is a specialized action and should thus get a specialized German word. 

Regards,

Christian

Re: [PATCH] gitk: Update German translation

[Stephan Beyer]

[-- Attachment #1: Type: text/plain, Size: 2368 bytes --]

Hi Christian,

> > The original
> >  "Find next/prev commit _containing:_ [insert]"
> > should be translated to
> >  "Suche nächste/vorige Version, die [insert] enthält."
> > But this is beyond the used techniques for software translation ;-)
> 
> Yes. But maybe even without GUI modifications this can be translated in a 
> better way. Eventually, I would expect something like this:
> 
>   Suchen: Nächste / vorige Fundstelle mit Kriterium 'Enthält Zeichenkette':  [insert]

This can be a choice, but it's very long. ;-)

I want to repeat my suggestions from the last mail:
  1. "Suche nächste/vorige Version nach _Beschreibung:_ [insert]"
  2. "Suche nächste/vorige Version nach _Pfaden:_ [insert]"
     (or maybe "nach _Dateien:_", if it's commonly accepted that 
      directories are files, too.)
  3. "Suche nächste/vorige Version nach _Änderungen:_ [insert]"
which makes it much more clearer than the English original, imho.

> IMHO this shouldn't be one single sentence which is what the current english 
> GUI tries to mimic. Instead, this should be something with a heading and a 
> choicebox for the criteria and appropriate labels for those.

Yes, if one single sentence does not work in another language, why keep
it?  But, one single sentence works here ;-)

> > Btw, 'man git-cherry-pick' says
> >         "Apply the change introduced by an existing commit".
> > So why not take this and use
> >  "Durch diese Version eingeführte Änderungen übernehmen" or
> >  "Durch diese Version eingeführte Änderungen anwenden"?
> 
> This is indeed a case where a better translation can still be found. However, 
> all of "kopieren, übernehmen, anwenden" IMHO sound too similar to actions 
> that already appear here or there in the version control GUI.

You are right with "kopieren" and "anwenden", but where is "übernehmen"?

Ok, it is used in the glossary for "pull", but nowhere in code that is
actually used.  And I think a better translation for "pull" is
something that stresses the fact that "pull" = "fetch" + "merge",
something like "Holen und Zusammenführen".

> Cherry-picking is a specialized action and should thus get a specialized 
> German word. 

I'm still unsure about this.  But it's your choice. ;-)

Kind regards,
  Stephan

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] gitk: Update German translation

[Christian Stimming]

Hi Stephan,

Am Donnerstag, 15. Mai 2008 18:20 schrieb Stephan Beyer:
> > > The original
> > >  "Find next/prev commit _containing:_ [insert]"
> > > should be translated to
> > >  "Suche nächste/vorige Version, die [insert] enthält."
> > > But this is beyond the used techniques for software translation ;-)
>
> I want to repeat my suggestions from the last mail:
>   1. "Suche nächste/vorige Version nach _Beschreibung:_ [insert]"
>   2. "Suche nächste/vorige Version nach _Pfaden:_ [insert]"
>      (or maybe "nach _Dateien:_", if it's commonly accepted that
>       directories are files, too.)
>   3. "Suche nächste/vorige Version nach _Änderungen:_ [insert]"
> which makes it much more clearer than the English original, imho.

Okay, I've inserted your suggestions in my translation update. I'm not too 
sure about any translation of this part, but your proposal is maybe better 
than the existing one.

> > > Btw, 'man git-cherry-pick' says
> > >         "Apply the change introduced by an existing commit".
> > > So why not take this and use
> > >  "Durch diese Version eingeführte Änderungen übernehmen" or
> > >  "Durch diese Version eingeführte Änderungen anwenden"?
> >
> > This is indeed a case where a better translation can still be found.
> > However, all of "kopieren, übernehmen, anwenden" IMHO sound too similar
> > to actions that already appear here or there in the version control GUI.
>
> You are right with "kopieren" and "anwenden", but where is "übernehmen"?
>
> Ok, it is used in the glossary for "pull", but nowhere in code that is
> actually used.  

The glossary is for git-gui, which has GUI items for "git pull" but not "git 
cherry-pick", currently. OTOH gitk has GUI items only for "git cherry-pick" 
but not "git pull", currently.

> And I think a better translation for "pull" is 
> something that stresses the fact that "pull" = "fetch" + "merge",
> something like "Holen und Zusammenführen".

That's indeed an interesting suggestion. (Which bears the question why it is 
being called "pull" in English in the first place, when it should rather be 
described by "fetch and merge". Heh.)

> > Cherry-picking is a specialized action and should thus get a specialized
> > German word.
>
> I'm still unsure about this.  But it's your choice. ;-)

Yeah. I'm also not completely sure, but for now I'd still prefer "pflücken" 
over the other possibilities we've discussed so far.

Regards,

Christian

Re: [PATCH] gitk: Update German translation

[Stephan Beyer]

[-- Attachment #1: Type: text/plain, Size: 1348 bytes --]

Hi Christian,

> > I want to repeat my suggestions from the last mail:
> >   1. "Suche nächste/vorige Version nach _Beschreibung:_ [insert]"
> >   2. "Suche nächste/vorige Version nach _Pfaden:_ [insert]"
> >      (or maybe "nach _Dateien:_", if it's commonly accepted that
> >       directories are files, too.)
> >   3. "Suche nächste/vorige Version nach _Änderungen:_ [insert]"
> > which makes it much more clearer than the English original, imho.
> 
> Okay, I've inserted your suggestions in my translation update. I'm not too 
> sure about any translation of this part, but your proposal is maybe better 
> than the existing one.

You can make yourself sure by trying the features or by reading the
source code. ;-)
Since I've translated them in that way, I know what they do and I use them
more often.  So I'm pretty sure.

> > And I think a better translation for "pull" is 
> > something that stresses the fact that "pull" = "fetch" + "merge",
> > something like "Holen und Zusammenführen".
> 
> That's indeed an interesting suggestion. (Which bears the question why it is 
> being called "pull" in English in the first place,

Well, this seems not to be clear to some users, since there is often
uncertainty about "pull" ;)

Regards,
  Stephan

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]