Skip to contentSkip to conversation

[Gitk Patch 0/6]

PATCH In review Robin Rosenberg 3 participants 15 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

cover [Gitk Patch 0/6]

(This is a resend to include gitk maintainer Paul Mackerras)

I finally got tired of pressing Alt and some letter to activate menus in Gitk. For example in "any" program you can press Alt-F to have the File menu drop down and then select the underscored character to select the wanted menu.

This series makes it possible. Friends of TCL may think my solution is too hack-ish. It doesn't fix all of the similary problem (mostly button) but that is the subject of later patches as it looks like it requires other means.

Git gui has the same problem, but again, subject to another series.

#1 lore raw

PATCH 1/6 gitk: Add procedure to create accelerated menus

These are the undescores menu items that can be selected with the Alt+letter, key combination on Windows and Linux or Command+letter on Macs.

---
 gitk |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)
gitk +27 -0
index 2eaa2ae..050019c 100755
@@ -1750,6 +1750,33 @@ proc setoptions {} {
     option add *Entry.font uifont startupFile
 }
 
+# Menu command wrapper. Intercepts any -label arguments, 
+# removes the & and adds the -underline argument necessary
+# to implement the menu accelerator.
+proc mcw {menubar args} {
+    set ai [lsearch $args "-label"]
+    if { $ai > 0 } {
+	set label [lindex $args [expr {$ai + 1}]]
+	foreach {l u} [::tk::UnderlineAmpersand $label] {
+	    lset args [expr {$ai + 1}] $l
+	}
+	lappend args -underline
+	lappend args $u
+    }
+    set cmd [ list $menubar ]
+    foreach a $args {
+	lappend cmd $a
+    }
+    eval $cmd
+}
+
+# Wrapper for mc to remove ampersands used for accelerators.
+proc mca {label} {
+    set tl8 [mc $label]
+    foreach {l u} [::tk::UnderlineAmpersand $tl8] break
+    return $l
+}
+
 proc makewindow {} {
     global canv canv2 canv3 linespc charspc ctext cflist cscroll
     global tabstop
Signature · 1 line
1.6.0.2.308.gef4a
#2 lore raw

PATCH 2/6 gitk: Change menus to use accelerated design

---
 gitk |   88 +++++++++++++++++++++++++++++++++---------------------------------
 1 files changed, 44 insertions(+), 44 deletions(-)
gitk +44 -44
index 050019c..6298b0a 100755
@@ -1795,31 +1795,31 @@ proc makewindow {} {
     global have_tk85
 
     menu .bar
-    .bar add cascade -label [mc "File"] -menu .bar.file
+    mcw .bar add cascade -label [mc "File"] -menu .bar.file
     menu .bar.file
-    .bar.file add command -label [mc "Update"] -command updatecommits
-    .bar.file add command -label [mc "Reload"] -command reloadcommits
-    .bar.file add command -label [mc "Reread references"] -command rereadrefs
-    .bar.file add command -label [mc "List references"] -command showrefs
-    .bar.file add command -label [mc "Quit"] -command doquit
+    mcw .bar.file add command -label [mc "Update"] -command updatecommits
+    mcw .bar.file add command -label [mc "Reload"] -command reloadcommits
+    mcw .bar.file add command -label [mc "Reread references"] -command rereadrefs
+    mcw .bar.file add command -label [mc "List references"] -command showrefs
+    mcw .bar.file add command -label [mc "Quit"] -command doquit
     menu .bar.edit
-    .bar add cascade -label [mc "Edit"] -menu .bar.edit
-    .bar.edit add command -label [mc "Preferences"] -command doprefs
+    mcw .bar add cascade -label [mc "Edit"] -menu .bar.edit
+    mcw .bar.edit add command -label [mc "Preferences"] -command doprefs
 
     menu .bar.view
-    .bar add cascade -label [mc "View"] -menu .bar.view
-    .bar.view add command -label [mc "New view..."] -command {newview 0}
-    .bar.view add command -label [mc "Edit view..."] -command editview \
+    mcw .bar add cascade -label [mc "View"] -menu .bar.view
+    mcw .bar.view add command -label [mc "New view..."] -command {newview 0}
+    mcw .bar.view add command -label [mc "Edit view..."] -command editview \
 	-state disabled
-    .bar.view add command -label [mc "Delete view"] -command delview -state disabled
-    .bar.view add separator
-    .bar.view add radiobutton -label [mc "All files"] -command {showview 0} \
+    mcw .bar.view add command -label [mc "Delete view"] -command delview -state disabled
+    mcw .bar.view add separator
+    mcw .bar.view add radiobutton -label [mc "All files"] -command {showview 0} \
 	-variable selectedview -value 0
 
     menu .bar.help
-    .bar add cascade -label [mc "Help"] -menu .bar.help
-    .bar.help add command -label [mc "About gitk"] -command about
-    .bar.help add command -label [mc "Key bindings"] -command keys
+    mcw .bar add cascade -label [mc "Help"] -menu .bar.help
+    mcw .bar.help add command -label [mc "About gitk"] -command about
+    mcw .bar.help add command -label [mc "Key bindings"] -command keys
     .bar.help configure
     . configure -menu .bar
 
@@ -2201,47 +2201,47 @@ proc makewindow {} {
 
     set rowctxmenu .rowctxmenu
     menu $rowctxmenu -tearoff 0
-    $rowctxmenu add command -label [mc "Diff this -> selected"] \
+    mcw $rowctxmenu add command -label [mc "Diff this -> selected"] \
 	-command {diffvssel 0}
-    $rowctxmenu add command -label [mc "Diff selected -> this"] \
+    mcw $rowctxmenu add command -label [mc "Diff selected -> this"] \
 	-command {diffvssel 1}
-    $rowctxmenu add command -label [mc "Make patch"] -command mkpatch
-    $rowctxmenu add command -label [mc "Create tag"] -command mktag
-    $rowctxmenu add command -label [mc "Write commit to file"] -command writecommit
-    $rowctxmenu add command -label [mc "Create new branch"] -command mkbranch
-    $rowctxmenu add command -label [mc "Cherry-pick this commit"] \
+    mcw $rowctxmenu add command -label [mc "Make patch"] -command mkpatch
+    mcw $rowctxmenu add command -label [mc "Create tag"] -command mktag
+    mcw $rowctxmenu add command -label [mc "Write commit to file"] -command writecommit
+    mcw $rowctxmenu add command -label [mc "Create new branch"] -command mkbranch
+    mcw $rowctxmenu add command -label [mc "Cherry-pick this commit"] \
 	-command cherrypick
-    $rowctxmenu add command -label [mc "Reset HEAD branch to here"] \
+    mcw $rowctxmenu add command -label [mc "Reset HEAD branch to here"] \
 	-command resethead
 
     set fakerowmenu .fakerowmenu
     menu $fakerowmenu -tearoff 0
-    $fakerowmenu add command -label [mc "Diff this -> selected"] \
+    mcw $fakerowmenu add command -label [mc "Diff this -> selected"] \
 	-command {diffvssel 0}
-    $fakerowmenu add command -label [mc "Diff selected -> this"] \
+    mcw $fakerowmenu add command -label [mc "Diff selected -> this"] \
 	-command {diffvssel 1}
-    $fakerowmenu add command -label [mc "Make patch"] -command mkpatch
-#    $fakerowmenu add command -label [mc "Commit"] -command {mkcommit 0}
-#    $fakerowmenu add command -label [mc "Commit all"] -command {mkcommit 1}
-#    $fakerowmenu add command -label [mc "Revert local changes"] -command revertlocal
+    mcw $fakerowmenu add command -label [mc "Make patch"] -command mkpatch
+#   mcw $fakerowmenu add command -label [mc "Commit"] -command {mkcommit 0}
+#   mcw $fakerowmenu add command -label [mc "Commit all"] -command {mkcommit 1}
+#   mcw $fakerowmenu add command -label [mc "Revert local changes"] -command revertlocal
 
     set headctxmenu .headctxmenu
     menu $headctxmenu -tearoff 0
-    $headctxmenu add command -label [mc "Check out this branch"] \
+    mcw $headctxmenu add command -label [mc "Check out this branch"] \
 	-command cobranch
-    $headctxmenu add command -label [mc "Remove this branch"] \
+    mcw $headctxmenu add command -label [mc "Remove this branch"] \
 	-command rmbranch
 
     global flist_menu
     set flist_menu .flistctxmenu
     menu $flist_menu -tearoff 0
-    $flist_menu add command -label [mc "Highlight this too"] \
+    mcw $flist_menu add command -label [mc "Highlight this too"] \
 	-command {flist_hl 0}
-    $flist_menu add command -label [mc "Highlight this only"] \
+    mcw $flist_menu add command -label [mc "Highlight this only"] \
 	-command {flist_hl 1}
-    $flist_menu add command -label [mc "External diff"] \
+    mcw $flist_menu add command -label [mc "External diff"] \
         -command {external_diff}
-    $flist_menu add command -label [mc "Blame parent commit"] \
+    mcw $flist_menu add command -label [mc "Blame parent commit"] \
         -command {external_blame 1}
 }
 
@@ -3401,8 +3401,8 @@ proc showview {n} {
 
     set curview $n
     set selectedview $n
-    .bar.view entryconf [mc "Edit view..."] -state [expr {$n == 0? "disabled": "normal"}]
-    .bar.view entryconf [mc "Delete view"] -state [expr {$n == 0? "disabled": "normal"}]
+    .bar.view entryconf [mca "&Edit view..."] -state [expr {$n == 0? "disabled": "normal"}]
+    .bar.view entryconf [mca "&Delete view"] -state [expr {$n == 0? "disabled": "normal"}]
 
     run refill_reflist
     if {![info exists viewcomplete($n)]} {
@@ -7315,9 +7315,9 @@ proc rowmenu {x y id} {
     } else {
 	set menu $fakerowmenu
     }
-    $menu entryconfigure [mc "Diff this -> selected"] -state $state
-    $menu entryconfigure [mc "Diff selected -> this"] -state $state
-    $menu entryconfigure [mc "Make patch"] -state $state
+    $menu entryconfigure [mca "Diff &this -> selected"] -state $state
+    $menu entryconfigure [mca "Diff &selected -> this"] -state $state
+    $menu entryconfigure [mca "&Make patch"] -state $state
     tk_popup $menu $x $y
 }
 
@@ -10046,8 +10046,8 @@ if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
     set viewperm(1) 0
     set vdatemode(1) 0
     addviewmenu 1
-    .bar.view entryconf [mc "Edit view..."] -state normal
-    .bar.view entryconf [mc "Delete view"] -state normal
+    .bar.view entryconf [mca "&Edit view..."] -state normal
+    .bar.view entryconf [mca "&Delete view"] -state normal
 }
 
 if {[info exists permviews]} {
Signature · 1 line
1.6.0.2.308.gef4a
#3 lore raw

PATCH 3/6 gitk: regenerated po files

We intend to change the source strings. This is a "null" update using make update-po to make the real changes easier to see later on.

---
 po/de.po |  443 ++++++++++++++++++++++++++++---------------------------
 po/es.po |  500 +++++++++++++++++++++++++++++++++-----------------------------
 po/it.po |  489 +++++++++++++++++++++++++++++++++----------------------------
 po/sv.po |  431 +++++++++++++++++++++++++++--------------------------
 4 files changed, 978 insertions(+), 885 deletions(-)
po/de.po +226 -217
index 04ee570..af18389 100644
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-24 22:32+0200\n"
+"POT-Creation-Date: 2008-10-07 23:06+0200\n"
 "PO-Revision-Date: 2008-05-24 22:40+0200\n"
 "Last-Translator: Christian Stimming <[email protected]>\n"
 "Language-Team: German\n"
@@ -15,17 +15,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gitk:102
+#: gitk:113
 msgid "Couldn't get list of unmerged files:"
 msgstr "Liste der nicht-zusammengeführten Dateien nicht gefunden:"
 
-#: gitk:329
+#: gitk:340
 msgid "No files selected: --merge specified but no files are unmerged."
 msgstr ""
 "Keine Dateien ausgewählt: --merge angegeben, es existieren aber keine nicht-"
 "zusammengeführten Dateien."
 
-#: gitk:332
+#: gitk:343
 msgid ""
 "No files selected: --merge specified but no unmerged files are within file "
 "limit."
@@ -33,257 +33,261 @@ msgstr ""
 "Keine Dateien ausgewähle: --merge angegeben, aber keine nicht-"
 "zusammengeführten Dateien sind in der Dateiauswahl."
 
-#: gitk:354
+#: gitk:365
 msgid "Error executing git log:"
 msgstr "Fehler beim Ausführen von git-log:"
 
-#: gitk:369
+#: gitk:378
 msgid "Reading"
 msgstr "Lesen"
 
-#: gitk:151 gitk:2191
+#: gitk:438 gitk:3459
 msgid "Reading commits..."
 msgstr "Versionen lesen..."
 
-#: gitk:275
-msgid "Can't parse git log output:"
-msgstr "Ausgabe von git-log kann nicht erkannt werden:"
-
-#: gitk:386 gitk:2195
+#: gitk:441 gitk:1528 gitk:3462
 msgid "No commits selected"
 msgstr "Keine Versionen ausgewählt."
 
-#: gitk:500
+#: gitk:1399
+msgid "Can't parse git log output:"
+msgstr "Ausgabe von git-log kann nicht erkannt werden:"
+
+#: gitk:1605
 msgid "No commit information available"
 msgstr "Keine Versionsinformation verfügbar"
 
-#: gitk:599 gitk:621 gitk:1955 gitk:6424 gitk:7924 gitk:8083
+#: gitk:1709 gitk:1731 gitk:3256 gitk:7727 gitk:9256 gitk:9424
 msgid "OK"
 msgstr "Ok"
 
-#: gitk:623 gitk:1956 gitk:6108 gitk:6179 gitk:6276 gitk:6322 gitk:6426
-#: gitk:7925 gitk:8084
+#: gitk:1733 gitk:3257 gitk:7403 gitk:7474 gitk:7577 gitk:7623 gitk:7729
+#: gitk:9257 gitk:9425
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: gitk:661
+#: gitk:1798
 msgid "File"
 msgstr "Datei"
 
-#: gitk:663
+#: gitk:1800
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: gitk:1722
+#: gitk:1801
 msgid "Reload"
 msgstr "Neu laden"
 
-#: gitk:1723
+#: gitk:1802
 msgid "Reread references"
 msgstr "Zweige neu laden"
 
-#: gitk:665
+#: gitk:1803
 msgid "List references"
 msgstr "Zweige/Markierungen auflisten"
 
-#: gitk:666
+#: gitk:1804
 msgid "Quit"
 msgstr "Beenden"
 
-#: gitk:668
+#: gitk:1806
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: gitk:669
+#: gitk:1807
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: gitk:672 gitk:1892
+#: gitk:1810 gitk:3193
 msgid "View"
 msgstr "Ansicht"
 
-#: gitk:673
+#: gitk:1811
 msgid "New view..."
 msgstr "Neue Ansicht..."
 
-#: gitk:674 gitk:2133 gitk:8723
+#: gitk:1812
 msgid "Edit view..."
 msgstr "Ansicht bearbeiten..."
 
-#: gitk:676 gitk:2134 gitk:8724
+#: gitk:1814
 msgid "Delete view"
 msgstr "Ansicht löschen"
 
-#: gitk:678
+#: gitk:1816
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: gitk:682
+#: gitk:1820
 msgid "Help"
 msgstr "Hilfe"
 
-#: gitk:683 gitk:1317
+#: gitk:1821 gitk:2484
 msgid "About gitk"
 msgstr "Über gitk"
 
-#: gitk:684
+#: gitk:1822
 msgid "Key bindings"
 msgstr "Tastenkürzel"
 
-#: gitk:741
+#: gitk:1879
 msgid "SHA1 ID: "
 msgstr "SHA1:"
 
-#: gitk:1831
+#: gitk:1910
 msgid "Row"
 msgstr "Zeile"
 
-#: gitk:1862
+#: gitk:1941
 msgid "Find"
 msgstr "Suche"
 
-#: gitk:792
+#: gitk:1942
 msgid "next"
 msgstr "nächste"
 
-#: gitk:793
+#: gitk:1943
 msgid "prev"
 msgstr "vorige"
 
-#: gitk:794
+#: gitk:1944
 msgid "commit"
 msgstr "Version nach"
 
-#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369
+#: gitk:1947 gitk:1949 gitk:3614 gitk:3637 gitk:3661 gitk:5547 gitk:5618
 msgid "containing:"
 msgstr "Beschreibung:"
 
-#: gitk:800 gitk:1778 gitk:1783 gitk:2431
+#: gitk:1950 gitk:2951 gitk:2956 gitk:3689
 msgid "touching paths:"
 msgstr "Dateien:"
 
-#: gitk:801 gitk:2436
+#: gitk:1951 gitk:3694
 msgid "adding/removing string:"
 msgstr "Änderungen:"
 
-#: gitk:810 gitk:812
+#: gitk:1960 gitk:1962
 msgid "Exact"
 msgstr "Exakt"
 
-#: gitk:812 gitk:2514 gitk:4274
+#: gitk:1962 gitk:3770 gitk:5515
 msgid "IgnCase"
 msgstr "Kein Groß/Klein"
 
-#: gitk:812 gitk:2405 gitk:2512 gitk:4270
+#: gitk:1962 gitk:3663 gitk:3768 gitk:5511
 msgid "Regexp"
 msgstr "Regexp"
 
-#: gitk:814 gitk:815 gitk:2533 gitk:2563 gitk:2570 gitk:4380 gitk:4436
+#: gitk:1964 gitk:1965 gitk:3789 gitk:3819 gitk:3826 gitk:5638 gitk:5705
 msgid "All fields"
 msgstr "Alle Felder"
 
-#: gitk:815 gitk:2531 gitk:2563 gitk:4336
+#: gitk:1965 gitk:3787 gitk:3819 gitk:5577
 msgid "Headline"
 msgstr "Überschrift"
 
-#: gitk:816 gitk:2531 gitk:4336 gitk:4436 gitk:4827
+#: gitk:1966 gitk:3787 gitk:5577 gitk:5705 gitk:6106
 msgid "Comments"
 msgstr "Beschreibung"
 
-#: gitk:816 gitk:2531 gitk:2535 gitk:2570 gitk:4336 gitk:4763 gitk:5957
-#: gitk:5972
+#: gitk:1966 gitk:3787 gitk:3791 gitk:3826 gitk:5577 gitk:6042 gitk:7249
+#: gitk:7264
 msgid "Author"
 msgstr "Autor"
 
-#: gitk:816 gitk:2531 gitk:4336 gitk:4765
+#: gitk:1966 gitk:3787 gitk:5577 gitk:6044
 msgid "Committer"
 msgstr "Eintragender"
 
-#: gitk:845
+#: gitk:1995
 msgid "Search"
 msgstr "Suche"
 
-#: gitk:852
+#: gitk:2002
 msgid "Diff"
 msgstr "Vergleich"
 
-#: gitk:854
+#: gitk:2004
 msgid "Old version"
 msgstr "Alte Version"
 
-#: gitk:856
+#: gitk:2006
 msgid "New version"
 msgstr "Neue Version"
 
-#: gitk:858
+#: gitk:2008
 msgid "Lines of context"
 msgstr "Kontextzeilen"
 
-#: gitk:868
+#: gitk:2018
 msgid "Ignore space change"
 msgstr "Leerzeichenänderungen ignorieren"
 
-#: gitk:926
+#: gitk:2076
 msgid "Patch"
 msgstr "Patch"
 
-#: gitk:928
+#: gitk:2078
 msgid "Tree"
 msgstr "Baum"
 
-#: gitk:1053 gitk:1068 gitk:6023
+#: gitk:2204 gitk:2219
 msgid "Diff this -> selected"
 msgstr "Vergleich diese -> gewählte"
 
-#: gitk:1055 gitk:1070 gitk:6024
+#: gitk:2206 gitk:2221
 msgid "Diff selected -> this"
 msgstr "Vergleich gewählte -> diese"
 
-#: gitk:1057 gitk:1072 gitk:6025
+#: gitk:2208 gitk:2223
 msgid "Make patch"
 msgstr "Patch erstellen"
 
-#: gitk:1058 gitk:6163
+#: gitk:2209 gitk:7458
 msgid "Create tag"
 msgstr "Markierung erstellen"
 
-#: gitk:1059 gitk:6256
+#: gitk:2210 gitk:7557
 msgid "Write commit to file"
 msgstr "Version in Datei schreiben"
 
-#: gitk:1060 gitk:6310
+#: gitk:2211 gitk:7611
 msgid "Create new branch"
 msgstr "Neuen Zweig erstellen"
 
-#: gitk:1061
+#: gitk:2212
 msgid "Cherry-pick this commit"
 msgstr "Diese Version pflücken"
 
-#: gitk:1063
+#: gitk:2214
 msgid "Reset HEAD branch to here"
 msgstr "HEAD-Zweig auf diese Version zurücksetzen"
 
-#: gitk:1079
+#: gitk:2230
 msgid "Check out this branch"
 msgstr "Auf diesen Zweig umstellen"
 
-#: gitk:1081
+#: gitk:2232
 msgid "Remove this branch"
 msgstr "Zweig löschen"
 
-#: gitk:1087
+#: gitk:2238
 msgid "Highlight this too"
 msgstr "Diesen auch hervorheben"
 
-#: gitk:1089
+#: gitk:2240
 msgid "Highlight this only"
 msgstr "Nur diesen hervorheben"
 
-#: gitk:2162
+#: gitk:2242
 msgid "External diff"
 msgstr "Externer Vergleich"
 
-#: gitk:2403
+#: gitk:2244
+msgid "Blame parent commit"
+msgstr ""
+
+#: gitk:2485
 msgid ""
 "\n"
 "Gitk - a commit viewer for git\n"
@@ -297,431 +301,436 @@ msgstr ""
 "\n"
 "Copyright © 2005-2008 Paul Mackerras\n"
 "\n"
-"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public License"
+"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public "
+"License"
 
-#: gitk:1326 gitk:1387 gitk:6582
+#: gitk:2493 gitk:2554 gitk:7906
 msgid "Close"
 msgstr "Schließen"
 
-#: gitk:1345
+#: gitk:2512
 msgid "Gitk key bindings"
 msgstr "Gitk Tastaturbelegung"
 
-#: gitk:1347
+#: gitk:2514
 msgid "Gitk key bindings:"
 msgstr "Gitk Tastaturbelegung:"
 
-#: gitk:1349
+#: gitk:2516
 #, tcl-format
 msgid "<%s-Q>\t\tQuit"
 msgstr "<%s-Q>\t\tBeenden"
 
-#: gitk:1350
+#: gitk:2517
 msgid "<Home>\t\tMove to first commit"
 msgstr "<Pos1>\t\tZur neuesten Version springen"
 
-#: gitk:1351
+#: gitk:2518
 msgid "<End>\t\tMove to last commit"
 msgstr "<Ende>\t\tZur ältesten Version springen"
 
-#: gitk:1352
+#: gitk:2519
 msgid "<Up>, p, i\tMove up one commit"
 msgstr "<Hoch>, p, i\tNächste neuere Version"
 
-#: gitk:1353
+#: gitk:2520
 msgid "<Down>, n, k\tMove down one commit"
 msgstr "<Runter>, n, k\tNächste ältere Version"
 
-#: gitk:1354
+#: gitk:2521
 msgid "<Left>, z, j\tGo back in history list"
 msgstr "<Links>, z, j\tEine Version zurückgehen"
 
-#: gitk:1355
+#: gitk:2522
 msgid "<Right>, x, l\tGo forward in history list"
 msgstr "<Rechts>, x, l\tEine Version weitergehen"
 
-#: gitk:1356
+#: gitk:2523
 msgid "<PageUp>\tMove up one page in commit list"
 msgstr "<BildHoch>\tEine Seite nach oben blättern"
 
-#: gitk:1357
+#: gitk:2524
 msgid "<PageDown>\tMove down one page in commit list"
 msgstr "<BildRunter>\tEine Seite nach unten blättern"
 
-#: gitk:1358
+#: gitk:2525
 #, tcl-format
 msgid "<%s-Home>\tScroll to top of commit list"
 msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern"
 
-#: gitk:1359
+#: gitk:2526
 #, tcl-format
 msgid "<%s-End>\tScroll to bottom of commit list"
 msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern"
 
-#: gitk:1360
+#: gitk:2527
 #, tcl-format
 msgid "<%s-Up>\tScroll commit list up one line"
 msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern"
 
-#: gitk:1361
+#: gitk:2528
 #, tcl-format
 msgid "<%s-Down>\tScroll commit list down one line"
 msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern"
 
-#: gitk:1362
+#: gitk:2529
 #, tcl-format
 msgid "<%s-PageUp>\tScroll commit list up one page"
 msgstr "<%s-BildHoch>\tVersionsliste eine Seite hoch blättern"
 
-#: gitk:1363
+#: gitk:2530
 #, tcl-format
 msgid "<%s-PageDown>\tScroll commit list down one page"
 msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern"
 
-#: gitk:1364
+#: gitk:2531
 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
 msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)"
 
-#: gitk:1365
+#: gitk:2532
 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
 msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)"
 
-#: gitk:1366
+#: gitk:2533
 msgid "<Delete>, b\tScroll diff view up one page"
 msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern"
 
-#: gitk:1367
+#: gitk:2534
 msgid "<Backspace>\tScroll diff view up one page"
 msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern"
 
-#: gitk:1368
+#: gitk:2535
 msgid "<Space>\t\tScroll diff view down one page"
 msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern"
 
-#: gitk:1369
+#: gitk:2536
 msgid "u\t\tScroll diff view up 18 lines"
 msgstr "u\t\tVergleich um 18 Zeilen nach oben (»up«) blättern"
 
-#: gitk:1370
+#: gitk:2537
 msgid "d\t\tScroll diff view down 18 lines"
 msgstr "d\t\tVergleich um 18 Zeilen nach unten (»down«) blättern"
 
-#: gitk:1371
+#: gitk:2538
 #, tcl-format
 msgid "<%s-F>\t\tFind"
 msgstr "<%s-F>\t\tSuchen"
 
-#: gitk:1372
+#: gitk:2539
 #, tcl-format
 msgid "<%s-G>\t\tMove to next find hit"
 msgstr "<%s-G>\t\tWeitersuchen"
 
-#: gitk:1373
+#: gitk:2540
 msgid "<Return>\tMove to next find hit"
 msgstr "<Eingabetaste>\tWeitersuchen"
 
-#: gitk:1374
+#: gitk:2541
 msgid "/\t\tMove to next find hit, or redo find"
 msgstr "/\t\tWeitersuchen oder neue Suche beginnen"
 
-#: gitk:1375
+#: gitk:2542
 msgid "?\t\tMove to previous find hit"
 msgstr "?\t\tRückwärts weitersuchen"
 
-#: gitk:1376
+#: gitk:2543
 msgid "f\t\tScroll diff view to next file"
 msgstr "f\t\tVergleich zur nächsten Datei (»file«) blättern"
 
-#: gitk:1377
+#: gitk:2544
 #, tcl-format
 msgid "<%s-S>\t\tSearch for next hit in diff view"
 msgstr "<%s-S>\t\tWeitersuchen im Vergleich"
 
-#: gitk:1378
+#: gitk:2545
 #, 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
+#: gitk:2546
 #, tcl-format
 msgid "<%s-KP+>\tIncrease font size"
 msgstr "<%s-Nummerblock-Plus>\tSchriftgröße vergrößern"
 
-#: gitk:1380
+#: gitk:2547
 #, tcl-format
 msgid "<%s-plus>\tIncrease font size"
 msgstr "<%s-Plus>\tSchriftgröße vergrößern"
 
-#: gitk:1381
+#: gitk:2548
 #, tcl-format
 msgid "<%s-KP->\tDecrease font size"
 msgstr "<%s-Nummernblock-> Schriftgröße verkleinern"
 
-#: gitk:1382
+#: gitk:2549
 #, tcl-format
 msgid "<%s-minus>\tDecrease font size"
 msgstr "<%s-Minus>\tSchriftgröße verkleinern"
 
-#: gitk:1383
+#: gitk:2550
 msgid "<F5>\t\tUpdate"
 msgstr "<F5>\t\tAktualisieren"
 
-#: gitk:1896
+#: gitk:3065
+#, fuzzy
+msgid "No such commit"
+msgstr "Keine Änderungen eingetragen"
+
+#: gitk:3197
 msgid "Gitk view definition"
 msgstr "Gitk Ansichten"
 
-#: gitk:1921
+#: gitk:3222
 msgid "Name"
 msgstr "Name"
 
-#: gitk:1924
+#: gitk:3225
 msgid "Remember this view"
 msgstr "Diese Ansicht speichern"
 
-#: gitk:3126
+#: gitk:3229
 msgid "Commits to include (arguments to git log):"
 msgstr "Versionen anzeigen (Argumente von git-log):"
 
-#: gitk:3133
+#: gitk:3236
 msgid "Command to generate more commits to include:"
 msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:"
 
-#: gitk:1942
+#: gitk:3243
 msgid "Enter files and directories to include, one per line:"
 msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):"
 
-#: gitk:1989
+#: gitk:3290
 msgid "Error in commit selection arguments:"
 msgstr "Fehler in den ausgewählten Versionen:"
 
-#: gitk:2043 gitk:2127 gitk:2583 gitk:2597 gitk:3781 gitk:8689 gitk:8690
+#: gitk:3344 gitk:3396 gitk:3839 gitk:3853 gitk:5057 gitk:10013 gitk:10014
 msgid "None"
 msgstr "Keine"
 
-#: gitk:2531 gitk:4336 gitk:5959 gitk:5974
+#: gitk:3787 gitk:5577 gitk:7251 gitk:7266
 msgid "Date"
 msgstr "Datum"
 
-#: gitk:2531 gitk:4336
+#: gitk:3787 gitk:5577
 msgid "CDate"
 msgstr "Eintragedatum"
 
-#: gitk:2680 gitk:2685
+#: gitk:3936 gitk:3941
 msgid "Descendant"
 msgstr "Abkömmling"
 
-#: gitk:2681
+#: gitk:3937
 msgid "Not descendant"
 msgstr "Nicht Abkömmling"
 
-#: gitk:2688 gitk:2693
+#: gitk:3944 gitk:3949
 msgid "Ancestor"
 msgstr "Vorgänger"
 
-#: gitk:2689
+#: gitk:3945
 msgid "Not ancestor"
 msgstr "Nicht Vorgänger"
 
-#: gitk:2924
+#: gitk:4184
 msgid "Local changes checked in to index but not committed"
 msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen"
 
-#: gitk:2954
+#: gitk:4217
 msgid "Local uncommitted changes, not checked in to index"
 msgstr "Lokale Änderungen, nicht bereitgestellt"
 
-#: gitk:4305
+#: gitk:5546
 msgid "Searching"
 msgstr "Suchen"
 
-#: gitk:4767
+#: gitk:6046
 msgid "Tags:"
 msgstr "Markierungen:"
 
-#: gitk:4784 gitk:4790 gitk:5952
+#: gitk:6063 gitk:6069 gitk:7244
 msgid "Parent"
 msgstr "Eltern"
 
-#: gitk:4795
+#: gitk:6074
 msgid "Child"
 msgstr "Kind"
 
-#: gitk:4804
+#: gitk:6083
 msgid "Branch"
 msgstr "Zweig"
 
-#: gitk:4807
+#: gitk:6086
 msgid "Follows"
 msgstr "Folgt auf"
 
-#: gitk:4810
+#: gitk:6089
 msgid "Precedes"
 msgstr "Vorgänger von"
 
-#: gitk:5094
+#: gitk:6373
 msgid "Error getting merge diffs:"
 msgstr "Fehler beim Laden des Vergleichs:"
 
-#: gitk:5779
+#: gitk:7077
 msgid "Goto:"
 msgstr "Gehe zu:"
 
-#: gitk:5781
+#: gitk:7079
 msgid "SHA1 ID:"
 msgstr "SHA1-Hashwert:"
 
-#: gitk:5806
+#: gitk:7098
 #, tcl-format
 msgid "Short SHA1 id %s is ambiguous"
 msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig"
 
-#: gitk:5818
+#: gitk:7110
 #, tcl-format
 msgid "SHA1 id %s is not known"
 msgstr "SHA1-Hashwert »%s« unbekannt"
 
-#: gitk:5820
+#: gitk:7112
 #, tcl-format
 msgid "Tag/Head %s is not known"
 msgstr "Markierung/Zweig »%s« ist unbekannt"
 
-#: gitk:5962
+#: gitk:7254
 msgid "Children"
 msgstr "Kinder"
 
-#: gitk:6019
+#: gitk:7311
 #, tcl-format
 msgid "Reset %s branch to here"
 msgstr "Zweig »%s« hierher zurücksetzen"
 
-#: gitk:7204
+#: gitk:7313
 msgid "Detached head: can't reset"
 msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich"
 
-#: gitk:7236
+#: gitk:7345
 msgid "Top"
 msgstr "Oben"
 
-#: gitk:6051
+#: gitk:7346
 msgid "From"
 msgstr "Von"
 
-#: gitk:6056
+#: gitk:7351
 msgid "To"
 msgstr "bis"
 
-#: gitk:6079
+#: gitk:7374
 msgid "Generate patch"
 msgstr "Patch erstellen"
 
-#: gitk:6081
+#: gitk:7376
 msgid "From:"
 msgstr "Von:"
 
-#: gitk:6090
+#: gitk:7385
 msgid "To:"
 msgstr "bis:"
 
-#: gitk:6099
+#: gitk:7394
 msgid "Reverse"
 msgstr "Umgekehrt"
 
-#: gitk:6101 gitk:6270
+#: gitk:7396 gitk:7571
 msgid "Output file:"
 msgstr "Ausgabedatei:"
 
-#: gitk:6107
+#: gitk:7402
 msgid "Generate"
 msgstr "Erzeugen"
 
-#: gitk:6143
+#: gitk:7438
 msgid "Error creating patch:"
 msgstr "Fehler beim Patch erzeugen:"
 
-#: gitk:6165 gitk:6258 gitk:6312
+#: gitk:7460 gitk:7559 gitk:7613
 msgid "ID:"
 msgstr "ID:"
 
-#: gitk:6174
+#: gitk:7469
 msgid "Tag name:"
 msgstr "Markierungsname:"
 
-#: gitk:6178 gitk:6321
+#: gitk:7473 gitk:7622
 msgid "Create"
 msgstr "Erstellen"
 
-#: gitk:6193
+#: gitk:7488
 msgid "No tag name specified"
 msgstr "Kein Markierungsname angegeben"
 
-#: gitk:6197
+#: gitk:7492
 #, tcl-format
 msgid "Tag \"%s\" already exists"
 msgstr "Markierung »%s« existiert bereits."
 
-#: gitk:6203
+#: gitk:7498
 msgid "Error creating tag:"
 msgstr "Fehler bei Markierung erstellen:"
 
-#: gitk:6267
+#: gitk:7568
 msgid "Command:"
 msgstr "Kommando:"
 
-#: gitk:6275
+#: gitk:7576
 msgid "Write"
 msgstr "Schreiben"
 
-#: gitk:6291
+#: gitk:7592
 msgid "Error writing commit:"
 msgstr "Fehler beim Schreiben der Version:"
 
-#: gitk:6317
+#: gitk:7618
 msgid "Name:"
 msgstr "Name:"
 
-#: gitk:6336
+#: gitk:7637
 msgid "Please specify a name for the new branch"
 msgstr "Bitte geben Sie einen Namen für den neuen Zweig an."
 
-#: gitk:6365
+#: gitk:7666
 #, 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?"
+"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut eintragen?"
 
-#: gitk:6370
+#: gitk:7671
 msgid "Cherry-picking"
 msgstr "Version pflücken"
 
-#: gitk:6382
+#: gitk:7683
 msgid "No changes committed"
 msgstr "Keine Änderungen eingetragen"
 
-#: gitk:6405
+#: gitk:7708
 msgid "Confirm reset"
 msgstr "Zurücksetzen bestätigen"
 
-#: gitk:6407
+#: gitk:7710
 #, tcl-format
 msgid "Reset branch %s to %s?"
 msgstr "Zweig »%s« auf »%s« zurücksetzen?"
 
-#: gitk:6411
+#: gitk:7714
 msgid "Reset type:"
 msgstr "Art des Zurücksetzens:"
 
-#: gitk:6415
+#: gitk:7718
 msgid "Soft: Leave working tree and index untouched"
 msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert"
 
-#: gitk:6418
+#: gitk:7721
 msgid "Mixed: Leave working tree untouched, reset index"
 msgstr ""
 "Gemischt: Arbeitskopie unverändert,\n"
 "Bereitstellung zurückgesetzt"
 
-#: gitk:6421
+#: gitk:7724
 msgid ""
 "Hard: Reset working tree and index\n"
 "(discard ALL local changes)"
@@ -729,21 +738,21 @@ msgstr ""
 "Hart: Arbeitskopie und Bereitstellung\n"
 "(Alle lokalen Änderungen werden gelöscht)"
 
-#: gitk:6437
+#: gitk:7740
 msgid "Resetting"
 msgstr "Zurücksetzen"
 
-#: gitk:6494
+#: gitk:7797
 msgid "Checking out"
 msgstr "Umstellen"
 
-#: gitk:6524
+#: gitk:7848
 msgid "Cannot delete the currently checked-out branch"
 msgstr ""
 "Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht "
 "gelöscht werden."
 
-#: gitk:6530
+#: gitk:7854
 #, tcl-format
 msgid ""
 "The commits on branch %s aren't on any other branch.\n"
@@ -752,16 +761,16 @@ msgstr ""
 "Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n"
 "Zweig »%s« trotzdem löschen?"
 
-#: gitk:6561
+#: gitk:7885
 #, tcl-format
 msgid "Tags and heads: %s"
 msgstr "Markierungen und Zweige: %s"
 
-#: gitk:6575
+#: gitk:7899
 msgid "Filter"
 msgstr "Filtern"
 
-#: gitk:6869
+#: gitk:8193
 msgid ""
 "Error reading commit topology information; branch and preceding/following "
 "tag information will be incomplete."
@@ -769,125 +778,125 @@ msgstr ""
 "Fehler beim Lesen der Strukturinformationen; Zweige und Vorgänger/Nachfolger "
 "Informationen werden unvollständig sein."
 
-#: gitk:7853
+#: gitk:9179
 msgid "Tag"
 msgstr "Markierung"
 
-#: gitk:7853
+#: gitk:9179
 msgid "Id"
 msgstr "Id"
 
-#: gitk:7893
+#: gitk:9225
 msgid "Gitk font chooser"
 msgstr "Gitk Schriften wählen"
 
-#: gitk:7910
+#: gitk:9242
 msgid "B"
 msgstr "F"
 
-#: gitk:7913
+#: gitk:9245
 msgid "I"
 msgstr "K"
 
-#: gitk:8006
+#: gitk:9338
 msgid "Gitk preferences"
 msgstr "Gitk Einstellungen"
 
-#: gitk:8007
+#: gitk:9339
 msgid "Commit list display options"
 msgstr "Anzeige Versionsliste"
 
-#: gitk:8010
+#: gitk:9342
 msgid "Maximum graph width (lines)"
 msgstr "Maximale Graphenbreite (Zeilen)"
 
-#: gitk:8014
+#: gitk:9346
 #, tcl-format
 msgid "Maximum graph width (% of pane)"
 msgstr "Maximale Graphenbreite (% des Fensters)"
 
-#: gitk:8019
+#: gitk:9351
 msgid "Show local changes"
 msgstr "Lokale Änderungen anzeigen"
 
-#: gitk:8024
+#: gitk:9356
 msgid "Auto-select SHA1"
 msgstr "SHA1-Hashwert automatisch markieren"
 
-#: gitk:8029
+#: gitk:9361
 msgid "Diff display options"
 msgstr "Anzeige Vergleich"
 
-#: gitk:8031
+#: gitk:9363
 msgid "Tab spacing"
 msgstr "Tabulatorbreite"
 
-#: gitk:8035
+#: gitk:9367
 msgid "Display nearby tags"
 msgstr "Naheliegende Überschriften anzeigen"
 
-#: gitk:8040
+#: gitk:9372
 msgid "Limit diffs to listed paths"
 msgstr "Vergleich nur für angezeigte Pfade"
 
-#: gitk:9264
+#: gitk:9379
 msgid "External diff tool"
 msgstr "Externes Vergleich-(Diff-)Programm"
 
-#: gitk:9266
+#: gitk:9381
 msgid "Choose..."
 msgstr "Wählen..."
 
-#: gitk:9271
+#: gitk:9386
 msgid "Colors: press to choose"
 msgstr "Farben: Klicken zum Wählen"
 
-#: gitk:8048
+#: gitk:9389
 msgid "Background"
 msgstr "Hintergrund"
 
-#: gitk:8052
+#: gitk:9393
 msgid "Foreground"
 msgstr "Vordergrund"
 
-#: gitk:8056
+#: gitk:9397
 msgid "Diff: old lines"
 msgstr "Vergleich: Alte Zeilen"
 
-#: gitk:8061
+#: gitk:9402
 msgid "Diff: new lines"
 msgstr "Vergleich: Neue Zeilen"
 
-#: gitk:8066
+#: gitk:9407
 msgid "Diff: hunk header"
 msgstr "Vergleich: Änderungstitel"
 
-#: gitk:8072
+#: gitk:9413
 msgid "Select bg"
 msgstr "Hintergrundfarbe Auswählen"
 
-#: gitk:8076
+#: gitk:9417
 msgid "Fonts: press to choose"
 msgstr "Schriftart: Klicken zum Wählen"
 
-#: gitk:8078
+#: gitk:9419
 msgid "Main font"
 msgstr "Programmschriftart"
 
-#: gitk:8079
+#: gitk:9420
 msgid "Diff display font"
 msgstr "Vergleich"
 
-#: gitk:8080
+#: gitk:9421
 msgid "User interface font"
 msgstr "Beschriftungen"
 
-#: gitk:8096
+#: gitk:9446
 #, tcl-format
 msgid "Gitk: choose color for %s"
 msgstr "Gitk: Farbe wählen für %s"
 
-#: gitk:8477
+#: gitk:9827
 msgid ""
 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
 " Gitk requires at least Tcl/Tk 8.4."
@@ -895,24 +904,24 @@ msgstr ""
 "Gitk läuft nicht mit dieser Version von Tcl/Tk.\n"
 "Gitk benötigt mindestens Tcl/Tk 8.4."
 
-#: gitk:8566
+#: gitk:9919
 msgid "Cannot find a git repository here."
 msgstr "Kein Git-Projektarchiv gefunden."
 
-#: gitk:8570
+#: gitk:9923
 #, tcl-format
 msgid "Cannot find the git directory \"%s\"."
 msgstr "Git-Verzeichnis »%s« wurde nicht gefunden."
 
-#: gitk:8613
+#: gitk:9970
 #, tcl-format
 msgid "Ambiguous argument '%s': both revision and filename"
 msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert."
 
-#: gitk:8625
+#: gitk:9982
 msgid "Bad arguments to gitk:"
 msgstr "Falsche Kommandozeilen-Parameter für gitk:"
 
-#: gitk:9915
+#: gitk:10042
 msgid "Command line"
 msgstr "Kommandozeile"
po/es.po +269 -231

1,145 lines not on this page · raw message

po/it.po +263 -226

731 lines not on this page · raw message

po/sv.po +220 -211

431 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.6.0.2.308.gef4a

Part of the diff is not shown here. View the raw message.

#4 lore raw

PATCH 4/6 gitk: Add accelerator hints

---
 gitk |   66 +++++++++++++++++++++++++++++++++---------------------------------
 1 files changed, 33 insertions(+), 33 deletions(-)
gitk +33 -33
index 6298b0a..79de9a6 100755
@@ -1795,31 +1795,31 @@ proc makewindow {} {
     global have_tk85
 
     menu .bar
-    mcw .bar add cascade -label [mc "File"] -menu .bar.file
+    mcw .bar add cascade -label [mc "&File"] -menu .bar.file
     menu .bar.file
-    mcw .bar.file add command -label [mc "Update"] -command updatecommits
-    mcw .bar.file add command -label [mc "Reload"] -command reloadcommits
-    mcw .bar.file add command -label [mc "Reread references"] -command rereadrefs
-    mcw .bar.file add command -label [mc "List references"] -command showrefs
-    mcw .bar.file add command -label [mc "Quit"] -command doquit
+    mcw .bar.file add command -label [mc "&Update"] -command updatecommits
+    mcw .bar.file add command -label [mc "&Reload"] -command reloadcommits
+    mcw .bar.file add command -label [mc "R&eread references"] -command rereadrefs
+    mcw .bar.file add command -label [mc "&List references"] -command showrefs
+    mcw .bar.file add command -label [mc "&Quit"] -command doquit
     menu .bar.edit
-    mcw .bar add cascade -label [mc "Edit"] -menu .bar.edit
-    mcw .bar.edit add command -label [mc "Preferences"] -command doprefs
+    mcw .bar add cascade -label [mc "&Edit"] -menu .bar.edit
+    mcw .bar.edit add command -label [mc "&Preferences"] -command doprefs
 
     menu .bar.view
-    mcw .bar add cascade -label [mc "View"] -menu .bar.view
-    mcw .bar.view add command -label [mc "New view..."] -command {newview 0}
-    mcw .bar.view add command -label [mc "Edit view..."] -command editview \
+    mcw .bar add cascade -label [mc "&View"] -menu .bar.view
+    mcw .bar.view add command -label [mc "&New view..."] -command {newview 0}
+    mcw .bar.view add command -label [mc "&Edit view..."] -command editview \
 	-state disabled
-    mcw .bar.view add command -label [mc "Delete view"] -command delview -state disabled
+    mcw .bar.view add command -label [mc "&Delete view"] -command delview -state disabled
     mcw .bar.view add separator
-    mcw .bar.view add radiobutton -label [mc "All files"] -command {showview 0} \
+    mcw .bar.view add radiobutton -label [mc "&All files"] -command {showview 0} \
 	-variable selectedview -value 0
 
     menu .bar.help
-    mcw .bar add cascade -label [mc "Help"] -menu .bar.help
-    mcw .bar.help add command -label [mc "About gitk"] -command about
-    mcw .bar.help add command -label [mc "Key bindings"] -command keys
+    mcw .bar add cascade -label [mc "&Help"] -menu .bar.help
+    mcw .bar.help add command -label [mc "&About gitk"] -command about
+    mcw .bar.help add command -label [mc "&Key bindings"] -command keys
     .bar.help configure
     . configure -menu .bar
 
@@ -2201,47 +2201,47 @@ proc makewindow {} {
 
     set rowctxmenu .rowctxmenu
     menu $rowctxmenu -tearoff 0
-    mcw $rowctxmenu add command -label [mc "Diff this -> selected"] \
+    mcw $rowctxmenu add command -label [mc "Diff &this -> selected"] \
 	-command {diffvssel 0}
-    mcw $rowctxmenu add command -label [mc "Diff selected -> this"] \
+    mcw $rowctxmenu add command -label [mc "Diff &selected -> this"] \
 	-command {diffvssel 1}
-    mcw $rowctxmenu add command -label [mc "Make patch"] -command mkpatch
-    mcw $rowctxmenu add command -label [mc "Create tag"] -command mktag
-    mcw $rowctxmenu add command -label [mc "Write commit to file"] -command writecommit
-    mcw $rowctxmenu add command -label [mc "Create new branch"] -command mkbranch
-    mcw $rowctxmenu add command -label [mc "Cherry-pick this commit"] \
+    mcw $rowctxmenu add command -label [mc "&Make patch"] -command mkpatch
+    mcw $rowctxmenu add command -label [mc "Create ta&g"] -command mktag
+    mcw $rowctxmenu add command -label [mc "&Write commit to file"] -command writecommit
+    mcw $rowctxmenu add command -label [mc "Create new &branch"] -command mkbranch
+    mcw $rowctxmenu add command -label [mc "C&herry-pick this commit"] \
 	-command cherrypick
-    mcw $rowctxmenu add command -label [mc "Reset HEAD branch to here"] \
+    mcw $rowctxmenu add command -label [mc "&Reset HEAD branch to here"] \
 	-command resethead
 
     set fakerowmenu .fakerowmenu
     menu $fakerowmenu -tearoff 0
-    mcw $fakerowmenu add command -label [mc "Diff this -> selected"] \
+    mcw $fakerowmenu add command -label [mc "Diff &this -> selected"] \
 	-command {diffvssel 0}
-    mcw $fakerowmenu add command -label [mc "Diff selected -> this"] \
+    mcw $fakerowmenu add command -label [mc "Diff &selected -> this"] \
 	-command {diffvssel 1}
-    mcw $fakerowmenu add command -label [mc "Make patch"] -command mkpatch
+    mcw $fakerowmenu add command -label [mc "&Make patch"] -command mkpatch
 #   mcw $fakerowmenu add command -label [mc "Commit"] -command {mkcommit 0}
 #   mcw $fakerowmenu add command -label [mc "Commit all"] -command {mkcommit 1}
 #   mcw $fakerowmenu add command -label [mc "Revert local changes"] -command revertlocal
 
     set headctxmenu .headctxmenu
     menu $headctxmenu -tearoff 0
-    mcw $headctxmenu add command -label [mc "Check out this branch"] \
+    mcw $headctxmenu add command -label [mc "Check &out this branch"] \
 	-command cobranch
-    mcw $headctxmenu add command -label [mc "Remove this branch"] \
+    mcw $headctxmenu add command -label [mc "Re&move this branch"] \
 	-command rmbranch
 
     global flist_menu
     set flist_menu .flistctxmenu
     menu $flist_menu -tearoff 0
-    mcw $flist_menu add command -label [mc "Highlight this too"] \
+    mcw $flist_menu add command -label [mc "Highlight this &too"] \
 	-command {flist_hl 0}
-    mcw $flist_menu add command -label [mc "Highlight this only"] \
+    mcw $flist_menu add command -label [mc "Highlight this &only"] \
 	-command {flist_hl 1}
-    mcw $flist_menu add command -label [mc "External diff"] \
+    mcw $flist_menu add command -label [mc "E&xternal diff"] \
         -command {external_diff}
-    mcw $flist_menu add command -label [mc "Blame parent commit"] \
+    mcw $flist_menu add command -label [mc "&Blame parent commit"] \
         -command {external_blame 1}
 }
 
Signature · 1 line
1.6.0.2.308.gef4a
#5 lore raw

PATCH 5/6 gitk: regenerated po files

make update-po

Also unmade all new "fuzzy" tags

---
 po/de.po |   92 +++++++++++++++++++++++++++++++++++++------------------------
 po/es.po |   92 +++++++++++++++++++++++++++++++++++++------------------------
 po/it.po |   92 +++++++++++++++++++++++++++++++++++++------------------------
 po/sv.po |   92 +++++++++++++++++++++++++++++++++++++------------------------
 4 files changed, 224 insertions(+), 144 deletions(-)
po/de.po +56 -36
index af18389..aea76a7 100644
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 23:06+0200\n"
+"POT-Creation-Date: 2008-10-07 23:08+0200\n"
 "PO-Revision-Date: 2008-05-24 22:40+0200\n"
 "Last-Translator: Christian Stimming <[email protected]>\n"
 "Language-Team: German\n"
@@ -67,67 +67,67 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 #: gitk:1798
-msgid "File"
+msgid "&File"
 msgstr "Datei"
 
 #: gitk:1800
-msgid "Update"
+msgid "&Update"
 msgstr "Aktualisieren"
 
 #: gitk:1801
-msgid "Reload"
+msgid "&Reload"
 msgstr "Neu laden"
 
 #: gitk:1802
-msgid "Reread references"
+msgid "R&eread references"
 msgstr "Zweige neu laden"
 
 #: gitk:1803
-msgid "List references"
+msgid "&List references"
 msgstr "Zweige/Markierungen auflisten"
 
 #: gitk:1804
-msgid "Quit"
+msgid "&Quit"
 msgstr "Beenden"
 
 #: gitk:1806
-msgid "Edit"
+msgid "&Edit"
 msgstr "Bearbeiten"
 
 #: gitk:1807
-msgid "Preferences"
+msgid "&Preferences"
 msgstr "Einstellungen"
 
-#: gitk:1810 gitk:3193
-msgid "View"
+#: gitk:1810
+msgid "&View"
 msgstr "Ansicht"
 
 #: gitk:1811
-msgid "New view..."
+msgid "&New view..."
 msgstr "Neue Ansicht..."
 
 #: gitk:1812
-msgid "Edit view..."
+msgid "&Edit view..."
 msgstr "Ansicht bearbeiten..."
 
 #: gitk:1814
-msgid "Delete view"
+msgid "&Delete view"
 msgstr "Ansicht löschen"
 
 #: gitk:1816
-msgid "All files"
+msgid "&All files"
 msgstr "Alle Dateien"
 
 #: gitk:1820
-msgid "Help"
+msgid "&Help"
 msgstr "Hilfe"
 
-#: gitk:1821 gitk:2484
-msgid "About gitk"
+#: gitk:1821
+msgid "&About gitk"
 msgstr "Über gitk"
 
 #: gitk:1822
-msgid "Key bindings"
+msgid "&Key bindings"
 msgstr "Tastenkürzel"
 
 #: gitk:1879
@@ -232,61 +232,65 @@ msgid "Tree"
 msgstr "Baum"
 
 #: gitk:2204 gitk:2219
-msgid "Diff this -> selected"
+msgid "Diff &this -> selected"
 msgstr "Vergleich diese -> gewählte"
 
 #: gitk:2206 gitk:2221
-msgid "Diff selected -> this"
+msgid "Diff &selected -> this"
 msgstr "Vergleich gewählte -> diese"
 
 #: gitk:2208 gitk:2223
-msgid "Make patch"
+msgid "&Make patch"
 msgstr "Patch erstellen"
 
-#: gitk:2209 gitk:7458
-msgid "Create tag"
+#: gitk:2209
+msgid "Create ta&g"
 msgstr "Markierung erstellen"
 
-#: gitk:2210 gitk:7557
-msgid "Write commit to file"
+#: gitk:2210
+msgid "&Write commit to file"
 msgstr "Version in Datei schreiben"
 
-#: gitk:2211 gitk:7611
-msgid "Create new branch"
+#: gitk:2211
+msgid "Create new &branch"
 msgstr "Neuen Zweig erstellen"
 
 #: gitk:2212
-msgid "Cherry-pick this commit"
+msgid "C&herry-pick this commit"
 msgstr "Diese Version pflücken"
 
 #: gitk:2214
-msgid "Reset HEAD branch to here"
+msgid "&Reset HEAD branch to here"
 msgstr "HEAD-Zweig auf diese Version zurücksetzen"
 
 #: gitk:2230
-msgid "Check out this branch"
+msgid "Check &out this branch"
 msgstr "Auf diesen Zweig umstellen"
 
 #: gitk:2232
-msgid "Remove this branch"
+msgid "Re&move this branch"
 msgstr "Zweig löschen"
 
 #: gitk:2238
-msgid "Highlight this too"
+msgid "Highlight this &too"
 msgstr "Diesen auch hervorheben"
 
 #: gitk:2240
-msgid "Highlight this only"
+msgid "Highlight this &only"
 msgstr "Nur diesen hervorheben"
 
 #: gitk:2242
-msgid "External diff"
+msgid "E&xternal diff"
 msgstr "Externer Vergleich"
 
 #: gitk:2244
-msgid "Blame parent commit"
+msgid "&Blame parent commit"
 msgstr ""
 
+#: gitk:2484
+msgid "About gitk"
+msgstr "Über gitk"
+
 #: gitk:2485
 msgid ""
 "\n"
@@ -476,6 +480,10 @@ msgstr "<F5>\t\tAktualisieren"
 msgid "No such commit"
 msgstr "Keine Änderungen eingetragen"
 
+#: gitk:3193
+msgid "View"
+msgstr "Ansicht"
+
 #: gitk:3197
 msgid "Gitk view definition"
 msgstr "Gitk Ansichten"
@@ -648,6 +656,10 @@ msgstr "Erzeugen"
 msgid "Error creating patch:"
 msgstr "Fehler beim Patch erzeugen:"
 
+#: gitk:7458
+msgid "Create tag"
+msgstr "Markierung erstellen"
+
 #: gitk:7460 gitk:7559 gitk:7613
 msgid "ID:"
 msgstr "ID:"
@@ -673,6 +685,10 @@ msgstr "Markierung »%s« existiert bereits."
 msgid "Error creating tag:"
 msgstr "Fehler bei Markierung erstellen:"
 
+#: gitk:7557
+msgid "Write commit to file"
+msgstr "Version in Datei schreiben"
+
 #: gitk:7568
 msgid "Command:"
 msgstr "Kommando:"
@@ -685,6 +701,10 @@ msgstr "Schreiben"
 msgid "Error writing commit:"
 msgstr "Fehler beim Schreiben der Version:"
 
+#: gitk:7611
+msgid "Create new branch"
+msgstr "Neuen Zweig erstellen"
+
 #: gitk:7618
 msgid "Name:"
 msgstr "Name:"
po/es.po +56 -36

216 lines not on this page · raw message

po/it.po +56 -36

216 lines not on this page · raw message

po/sv.po +56 -36

215 lines not on this page · raw message

Signature · 1 line
1.6.0.2.308.gef4a
#6 lore raw

PATCH 6/6 gitk: Add menu accelerators for Swedish translation

---
 po/sv.po |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)
po/sv.po +30 -30
index c1c3ed2..af3da51 100644
@@ -69,67 +69,67 @@ msgstr "Avbryt"
 
 #: gitk:1798
 msgid "&File"
-msgstr "Arkiv"
+msgstr "&Arkiv"
 
 #: gitk:1800
 msgid "&Update"
-msgstr "Uppdatera"
+msgstr "&Uppdatera"
 
 #: gitk:1801
 msgid "&Reload"
-msgstr "Ladda om"
+msgstr "&Ladda om"
 
 #: gitk:1802
 msgid "R&eread references"
-msgstr "Läs om referenser"
+msgstr "L&äs om referenser"
 
 #: gitk:1803
 msgid "&List references"
-msgstr "Visa referenser"
+msgstr "&Visa referenser"
 
 #: gitk:1804
 msgid "&Quit"
-msgstr "Avsluta"
+msgstr "&Avsluta"
 
 #: gitk:1806
 msgid "&Edit"
-msgstr "Redigera"
+msgstr "&Redigera"
 
 #: gitk:1807
 msgid "&Preferences"
-msgstr "Inställningar"
+msgstr "&Inställningar"
 
 #: gitk:1810
 msgid "&View"
-msgstr "Visa"
+msgstr "&Visa"
 
 #: gitk:1811
 msgid "&New view..."
-msgstr "Ny vy..."
+msgstr "&Ny vy..."
 
 #: gitk:1812
 msgid "&Edit view..."
-msgstr "Ändra vy..."
+msgstr "&Ändra vy..."
 
 #: gitk:1814
 msgid "&Delete view"
-msgstr "Ta bort vy"
+msgstr "&Ta bort vy"
 
 #: gitk:1816
 msgid "&All files"
-msgstr "Alla filer"
+msgstr "&Alla filer"
 
 #: gitk:1820
 msgid "&Help"
-msgstr "Hjälp"
+msgstr "&Hjälp"
 
 #: gitk:1821
 msgid "&About gitk"
-msgstr "Om gitk"
+msgstr "&Om gitk"
 
 #: gitk:1822
 msgid "&Key bindings"
-msgstr "Tangentbordsbindningar"
+msgstr "&Tangentbordsbindningar"
 
 #: gitk:1879
 msgid "SHA1 ID: "
@@ -234,59 +234,59 @@ msgstr "Träd"
 
 #: gitk:2204 gitk:2219
 msgid "Diff &this -> selected"
-msgstr "Diff denna -> markerad"
+msgstr "Diff &denna -> markerad"
 
 #: gitk:2206 gitk:2221
 msgid "Diff &selected -> this"
-msgstr "Diff markerad -> denna"
+msgstr "Diff &markerad -> denna"
 
 #: gitk:2208 gitk:2223
 msgid "&Make patch"
-msgstr "Skapa patch"
+msgstr "Skapa &patch"
 
 #: gitk:2209
 msgid "Create ta&g"
-msgstr "Skapa tagg"
+msgstr "Skapa &tagg"
 
 #: gitk:2210
 msgid "&Write commit to file"
-msgstr "Skriv incheckning till fil"
+msgstr "Skriv incheckning till &fil"
 
 #: gitk:2211
 msgid "Create new &branch"
-msgstr "Skapa ny gren"
+msgstr "Skapa ny &gren"
 
 #: gitk:2212
 msgid "C&herry-pick this commit"
-msgstr "Plocka denna incheckning"
+msgstr "P&locka denna incheckning"
 
 #: gitk:2214
 msgid "&Reset HEAD branch to here"
-msgstr "Återställ HEAD-grenen hit"
+msgstr "&Återställ HEAD-grenen hit"
 
 #: gitk:2230
 msgid "Check &out this branch"
-msgstr "Checka ut denna gren"
+msgstr "&Checka ut denna gren"
 
 #: gitk:2232
 msgid "Re&move this branch"
-msgstr "Ta bort denna gren"
+msgstr "Ta &bort denna gren"
 
 #: gitk:2238
 msgid "Highlight this &too"
-msgstr "Markera även detta"
+msgstr "Markera &även detta"
 
 #: gitk:2240
 msgid "Highlight this &only"
-msgstr "Markera bara detta"
+msgstr "Markera &bara detta"
 
 #: gitk:2242
 msgid "E&xternal diff"
-msgstr "Extern diff"
+msgstr "&Extern diff"
 
 #: gitk:2244
 msgid "&Blame parent commit"
-msgstr ""
+msgstr "&Kommentera mot incheckningens föräldrer"
 
 #: gitk:2484
 msgid "About gitk"
Signature · 1 line
1.6.0.2.308.gef4a
#7 lore raw

Re: [Gitk PATCH 1/6] gitk: Add procedure to create accelerated menus

In reply to Robin Rosenberg

gitk proc setoptions {} { · line 1760

Quoted 5 lines · Robin Rosenberg
gitk +5 -0
+proc mcw {menubar args} {
+    set ai [lsearch $args "-label"]
+    if { $ai > 0 } {
+	set label [lindex $args [expr {$ai + 1}]]
+	foreach {l u} [::tk::UnderlineAmpersand $label] {

Where did you find out about ::tk::UnderlineAmpersand? Is it part of the exported interface of Tk that we can rely on in future?

gitk proc setoptions {} { · line 1777

Quoted 5 lines
gitk +5 -0
+# Wrapper for mc to remove ampersands used for accelerators.
+proc mca {label} {
+    set tl8 [mc $label]
+    foreach {l u} [::tk::UnderlineAmpersand $tl8] break
+    return $l
	return [string map {"&" ""} [mc $label]]

instead, perhaps?

Paul.

#8 lore raw

Re: [Gitk PATCH 1/6] gitk: Add procedure to create accelerated menus

lördagen den 11 oktober 2008 03.40.09 skrev Paul Mackerras:

Quoted 10 lines

gitk proc setoptions {} { · line 1760

Quoted 5 lines · Robin Rosenberg
gitk +5 -0
+proc mcw {menubar args} {
+    set ai [lsearch $args "-label"]
+    if { $ai > 0 } {
+	set label [lindex $args [expr {$ai + 1}]]
+	foreach {l u} [::tk::UnderlineAmpersand $label] {

Where did you find out about ::tk::UnderlineAmpersand? Is it part of the exported interface of Tk that we can rely on in future?

I found it here. http://wiki.tcl.tk/1632. It hints that it may not be unoffical. Seems to
original from: http://groups.google.com/group/comp.lang.perl.tk/browse_thread/thread/5b6f4c6a4a9f17b4/c9f8ab47800d27ee?lnk=st&q=#c9f8ab47800d27ee

so if someone thinks there is a problem we could replace it with UnderlineAmpersand with tcl code to do the same (or rip it as is if the license allows it).

Quoted 10 lines

gitk proc setoptions {} { · line 1777

Quoted 6 lines
gitk +5 -0
+# Wrapper for mc to remove ampersands used for accelerators.
+proc mca {label} {
+    set tl8 [mc $label]
+    foreach {l u} [::tk::UnderlineAmpersand $tl8] break
+    return $l
	return [string map {"&" ""} [mc $label]]

instead, perhaps?

In theory we should translate && to & also, which UnderLineAmpersand does.

-- robin

#9 lore raw
In reply to Robin Rosenberg
Quoted 1 line · Robin Rosenberg

(This is a resend to include gitk maintainer Paul Mackerras)

Thanks.

Quoted 8 lines

I finally got tired of pressing Alt and some letter to activate menus in Gitk. For example in "any" program you can press Alt-F to have the File menu drop down and then select the underscored character to select the wanted menu.

This series makes it possible. Friends of TCL may think my solution is too hack-ish. It doesn't fix all of the similary problem (mostly button) but that is the subject of later patches as it looks like it requires other means.

It'll do for a first cut, but there would be a nicer way to do it, I think.

Also, I think patches 2 and 4 should be combined into one, as should patches 5 and 6. I'll do that and apply the series as 4 commits, unless you have an objection.

Paul.

#10 lore raw

lördagen den 11 oktober 2008 04.44.30 skrev Paul Mackerras:

Quoted 15 lines
Quoted 1 line · Robin Rosenberg

(This is a resend to include gitk maintainer Paul Mackerras)

Thanks.

Quoted 8 lines

I finally got tired of pressing Alt and some letter to activate menus in Gitk. For example in "any" program you can press Alt-F to have the File menu drop down and then select the underscored character to select the wanted menu.

This series makes it possible. Friends of TCL may think my solution is too hack-ish. It doesn't fix all of the similary problem (mostly button) but that is the subject of later patches as it looks like it requires other means.

Quoted 6 lines

It'll do for a first cut, but there would be a nicer way to do it, I think.

Also, I think patches 2 and 4 should be combined into one, as should patches 5 and 6. I'll do that and apply the series as 4 commits, unless you have an objection.

I split the commits to simplify review. My thought about squashing would be different, but I have no strong opinions here. I was thinking 1+2, 4+5, 3+5, 6

-- robin

#11 lore raw
In reply to Robin Rosenberg
Quoted 8 lines · Robin Rosenberg

I finally got tired of pressing Alt and some letter to activate menus in Gitk. For example in "any" program you can press Alt-F to have the File menu drop down and then select the underscored character to select the wanted menu.

This series makes it possible. Friends of TCL may think my solution is too hack-ish. It doesn't fix all of the similary problem (mostly button) but that is the subject of later patches as it looks like it requires other means.

Have a look at what I just pushed out. It adds infrastructure to let us use "&" in menu items to specify an alt+letter accelerator, but in a different way to your patches. If you'd like to redo your patch to add "&" to the menu items, that would be good.

Paul.

#12 lore raw

PATCH 1/1 Add menu accelerators

---

lördagen den 18 oktober 2008 14.11.22 skrev Paul Mackerras:

Quoted 4 lines

Have a look at what I just pushed out. It adds infrastructure to let us use "&" in menu items to specify an alt+letter accelerator, but in a different way to your patches. If you'd like to redo your patch to add "&" to the menu items, that would be good.

Looks fine. Seems to work too. Then we want to do the same thing with buttons. Btw, is it only for me that the "popup menu key" does not work for in gitk?

This patch does not include re-generated po's, nor the updated swedish translation.

-- robin

 gitk |   72 +++++++++++++++++++++++++++++++++---------------------------------
 1 files changed, 36 insertions(+), 36 deletions(-)
gitk +36 -36
index 3678de1..e65c0ce 100755
@@ -1817,26 +1817,26 @@ proc makewindow {} {
     # The "mc" arguments here are purely so that xgettext
     # sees the following string as needing to be translated
     makemenu .bar {
-	{mc "File" cascade {
-	    {mc "Update" command updatecommits -accelerator F5}
-	    {mc "Reload" command reloadcommits}
-	    {mc "Reread references" command rereadrefs}
-	    {mc "List references" command showrefs}
-	    {mc "Quit" command doquit}
+	{mc "&File" cascade {
+	    {mc "&Update" command updatecommits -accelerator F5}
+	    {mc "&Reload" command reloadcommits}
+	    {mc "R&eread references" command rereadrefs}
+	    {mc "&List references" command showrefs}
+	    {mc "&Quit" command doquit}
 	}}
-	{mc "Edit" cascade {
-	    {mc "Preferences" command doprefs}
+	{mc "&Edit" cascade {
+	    {mc "&Preferences" command doprefs}
 	}}
-	{mc "View" cascade {
-	    {mc "New view..." command {newview 0}}
-	    {mc "Edit view..." command editview -state disabled}
-	    {mc "Delete view" command delview -state disabled}
+	{mc "&View" cascade {
+	    {mc "&New view..." command {newview 0}}
+	    {mc "&Edit view..." command editview -state disabled}
+	    {mc "&Delete view" command delview -state disabled}
 	    {xx "" separator}
-	    {mc "All files" radiobutton {selectedview 0} -command {showview 0}}
+	    {mc "&All files" radiobutton {selectedview 0} -command {showview 0}}
 	}}
-	{mc "Help" cascade {
-	    {mc "About gitk" command about}
-	    {mc "Key bindings" command keys}
+	{mc "&Help" cascade {
+	    {mc "&About gitk" command about}
+	    {mc "&Key bindings" command keys}
 	}}
     }
     . configure -menu .bar
@@ -2220,39 +2220,39 @@ proc makewindow {} {
 
     set rowctxmenu .rowctxmenu
     makemenu $rowctxmenu {
-	{mc "Diff this -> selected" command {diffvssel 0}}
-	{mc "Diff selected -> this" command {diffvssel 1}}
-	{mc "Make patch" command mkpatch}
-	{mc "Create tag" command mktag}
-	{mc "Write commit to file" command writecommit}
-	{mc "Create new branch" command mkbranch}
-	{mc "Cherry-pick this commit" command cherrypick}
-	{mc "Reset HEAD branch to here" command resethead}
+	{mc "Diff &this -> selected" command {diffvssel 0}}
+	{mc "Diff &selected -> this" command {diffvssel 1}}
+	{mc "Make &patch" command mkpatch}
+	{mc "Create ta&g" command mktag}
+	{mc "&Write commit to file" command writecommit}
+	{mc "Create new &branch" command mkbranch}
+	{mc "&Cherry-pick this commit" command cherrypick}
+	{mc "&Reset HEAD branch to here" command resethead}
     }
     $rowctxmenu configure -tearoff 0
 
     set fakerowmenu .fakerowmenu
     makemenu $fakerowmenu {
-	{mc "Diff this -> selected" command {diffvssel 0}}
-	{mc "Diff selected -> this" command {diffvssel 1}}
-	{mc "Make patch" command mkpatch}
+	{mc "Diff &this -> selected" command {diffvssel 0}}
+	{mc "Diff &selected -> this" command {diffvssel 1}}
+	{mc "Make &patch" command mkpatch}
     }
     $fakerowmenu configure -tearoff 0
 
     set headctxmenu .headctxmenu
     makemenu $headctxmenu {
-	{mc "Check out this branch" command cobranch}
-	{mc "Remove this branch" command rmbranch}
+	{mc "&Check out this branch" command cobranch}
+	{mc "&Remove this branch" command rmbranch}
     }
     $headctxmenu configure -tearoff 0
 
     global flist_menu
     set flist_menu .flistctxmenu
     makemenu $flist_menu {
-	{mc "Highlight this too" command {flist_hl 0}}
-	{mc "Highlight this only" command {flist_hl 1}}
-	{mc "External diff" command {external_diff}}
-	{mc "Blame parent commit" command {external_blame 1}}
+	{mc "Highlight this &too" command {flist_hl 0}}
+	{mc "Highlight this &only" command {flist_hl 1}}
+	{mc "E&xternal diff" command {external_diff}}
+	{mc "&Blame parent commit" command {external_blame 1}}
     }
     $flist_menu configure -tearoff 0
 }
@@ -7361,9 +7361,9 @@ proc rowmenu {x y id} {
     } else {
 	set menu $fakerowmenu
     }
-    $menu entryconfigure [mca "Diff this -> selected"] -state $state
-    $menu entryconfigure [mca "Diff selected -> this"] -state $state
-    $menu entryconfigure [mca "Make patch"] -state $state
+    $menu entryconfigure [mca "Diff &this -> selected"] -state $state
+    $menu entryconfigure [mca "Diff &selected -> this"] -state $state
+    $menu entryconfigure [mca "Make &patch"] -state $state
     tk_popup $menu $x $y
 }
 
Signature · 1 line
1.6.0.2.308.gef4a
#13 lore raw

PATCH v2 1/1 Add menu accelerators

In reply to Paul Mackerras
---
 gitk |   80 +++++++++++++++++++++++++++++++++---------------------------------
 1 files changed, 40 insertions(+), 40 deletions(-)

This one is slightly better than the first one. Works with gitk id...id too.

-- robin

gitk +40 -40
index 3678de1..df039b9 100755
@@ -1817,26 +1817,26 @@ proc makewindow {} {
     # The "mc" arguments here are purely so that xgettext
     # sees the following string as needing to be translated
     makemenu .bar {
-	{mc "File" cascade {
-	    {mc "Update" command updatecommits -accelerator F5}
-	    {mc "Reload" command reloadcommits}
-	    {mc "Reread references" command rereadrefs}
-	    {mc "List references" command showrefs}
-	    {mc "Quit" command doquit}
+	{mc "&File" cascade {
+	    {mc "&Update" command updatecommits -accelerator F5}
+	    {mc "&Reload" command reloadcommits}
+	    {mc "R&eread references" command rereadrefs}
+	    {mc "&List references" command showrefs}
+	    {mc "&Quit" command doquit}
 	}}
-	{mc "Edit" cascade {
-	    {mc "Preferences" command doprefs}
+	{mc "&Edit" cascade {
+	    {mc "&Preferences" command doprefs}
 	}}
-	{mc "View" cascade {
-	    {mc "New view..." command {newview 0}}
-	    {mc "Edit view..." command editview -state disabled}
-	    {mc "Delete view" command delview -state disabled}
+	{mc "&View" cascade {
+	    {mc "&New view..." command {newview 0}}
+	    {mc "&Edit view..." command editview -state disabled}
+	    {mc "&Delete view" command delview -state disabled}
 	    {xx "" separator}
-	    {mc "All files" radiobutton {selectedview 0} -command {showview 0}}
+	    {mc "&All files" radiobutton {selectedview 0} -command {showview 0}}
 	}}
-	{mc "Help" cascade {
-	    {mc "About gitk" command about}
-	    {mc "Key bindings" command keys}
+	{mc "&Help" cascade {
+	    {mc "&About gitk" command about}
+	    {mc "&Key bindings" command keys}
 	}}
     }
     . configure -menu .bar
@@ -2220,39 +2220,39 @@ proc makewindow {} {
 
     set rowctxmenu .rowctxmenu
     makemenu $rowctxmenu {
-	{mc "Diff this -> selected" command {diffvssel 0}}
-	{mc "Diff selected -> this" command {diffvssel 1}}
-	{mc "Make patch" command mkpatch}
-	{mc "Create tag" command mktag}
-	{mc "Write commit to file" command writecommit}
-	{mc "Create new branch" command mkbranch}
-	{mc "Cherry-pick this commit" command cherrypick}
-	{mc "Reset HEAD branch to here" command resethead}
+	{mc "Diff &this -> selected" command {diffvssel 0}}
+	{mc "Diff &selected -> this" command {diffvssel 1}}
+	{mc "Make &patch" command mkpatch}
+	{mc "Create ta&g" command mktag}
+	{mc "&Write commit to file" command writecommit}
+	{mc "Create new &branch" command mkbranch}
+	{mc "&Cherry-pick this commit" command cherrypick}
+	{mc "&Reset HEAD branch to here" command resethead}
     }
     $rowctxmenu configure -tearoff 0
 
     set fakerowmenu .fakerowmenu
     makemenu $fakerowmenu {
-	{mc "Diff this -> selected" command {diffvssel 0}}
-	{mc "Diff selected -> this" command {diffvssel 1}}
-	{mc "Make patch" command mkpatch}
+	{mc "Diff &this -> selected" command {diffvssel 0}}
+	{mc "Diff &selected -> this" command {diffvssel 1}}
+	{mc "Make &patch" command mkpatch}
     }
     $fakerowmenu configure -tearoff 0
 
     set headctxmenu .headctxmenu
     makemenu $headctxmenu {
-	{mc "Check out this branch" command cobranch}
-	{mc "Remove this branch" command rmbranch}
+	{mc "&Check out this branch" command cobranch}
+	{mc "&Remove this branch" command rmbranch}
     }
     $headctxmenu configure -tearoff 0
 
     global flist_menu
     set flist_menu .flistctxmenu
     makemenu $flist_menu {
-	{mc "Highlight this too" command {flist_hl 0}}
-	{mc "Highlight this only" command {flist_hl 1}}
-	{mc "External diff" command {external_diff}}
-	{mc "Blame parent commit" command {external_blame 1}}
+	{mc "Highlight this &too" command {flist_hl 0}}
+	{mc "Highlight this &only" command {flist_hl 1}}
+	{mc "E&xternal diff" command {external_diff}}
+	{mc "&Blame parent commit" command {external_blame 1}}
     }
     $flist_menu configure -tearoff 0
 }
@@ -3414,8 +3414,8 @@ proc showview {n} {
 
     set curview $n
     set selectedview $n
-    .bar.view entryconf [mca "Edit view..."] -state [expr {$n == 0? "disabled": "normal"}]
-    .bar.view entryconf [mca "Delete view"] -state [expr {$n == 0? "disabled": "normal"}]
+    .bar.view entryconf [mca "&Edit view..."] -state [expr {$n == 0? "disabled": "normal"}]
+    .bar.view entryconf [mca "&Delete view"] -state [expr {$n == 0? "disabled": "normal"}]
 
     run refill_reflist
     if {![info exists viewcomplete($n)]} {
@@ -7361,9 +7361,9 @@ proc rowmenu {x y id} {
     } else {
 	set menu $fakerowmenu
     }
-    $menu entryconfigure [mca "Diff this -> selected"] -state $state
-    $menu entryconfigure [mca "Diff selected -> this"] -state $state
-    $menu entryconfigure [mca "Make patch"] -state $state
+    $menu entryconfigure [mca "Diff &this -> selected"] -state $state
+    $menu entryconfigure [mca "Diff &selected -> this"] -state $state
+    $menu entryconfigure [mca "Make &patch"] -state $state
     tk_popup $menu $x $y
 }
 
@@ -10184,8 +10184,8 @@ if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
     set viewperm(1) 0
     set vdatemode(1) 0
     addviewmenu 1
-    .bar.view entryconf [mca "Edit view..."] -state normal
-    .bar.view entryconf [mca "Delete view"] -state normal
+    .bar.view entryconf [mca "&Edit view..."] -state normal
+    .bar.view entryconf [mca "&Delete view"] -state normal
 }
 
 if {[info exists permviews]} {
Signature · 1 line
1.6.0.2.308.gef4a
#14 lore raw

Re: [GITK PATCH v2] Add menu accelerators

Quoted 6 lines · Robin Rosenberg
---
 gitk |   80 +++++++++++++++++++++++++++++++++---------------------------------
 1 files changed, 40 insertions(+), 40 deletions(-)

This one is slightly better than the first one. Works with gitk id...id too.

With that patch, I'm finding that pressing Alt-f pops up the File menu, but also triggers the binding for 'f' in the main window (scroll diff window to the next file), which is annoying. I'm not sure why, I will need to track that down.

Paul.