git-gui: Disambiguate "commit"

Commit is used as both verb and noun. While these happen to be
the same in some languages, they are not the same in all
languages, so disambiguate them using context-sensitive i18n.

Signed-off-by: Harri Ilari Tapio Liusvaara <hliusvaa@cc.hut.fi>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-gui.sh b/git-gui.sh
index d00758e95af5c2b07d96aebb59f8e34c7168cbb9..a4e2ad2fd7d82403dd2ad1f4844b65662d6cfead 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -10,7 +10,7 @@
 
 set appvers {@@GITGUI_VERSION@@}
 set copyright {
-Copyright © 2006, 2007 Shawn Pearce, et. al.
+Copyright © 2006, 2007 Shawn Pearce, et. al.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -1704,7 +1704,7 @@ if {[is_enabled branch]} {
        .mbar add cascade -label [mc Branch] -menu .mbar.branch
 }
 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
-       .mbar add cascade -label [mc Commit] -menu .mbar.commit
+       .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
 }
 if {[is_enabled transport]} {
        .mbar add cascade -label [mc Merge] -menu .mbar.merge
@@ -1891,7 +1891,7 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {
                -command do_signoff \
                -accelerator $M1T-S
 
-       .mbar.commit add command -label [mc Commit] \
+       .mbar.commit add command -label [mc Commit@@verb] \
                -command do_commit \
                -accelerator $M1T-Return
        lappend disable_on_lock \
@@ -2207,7 +2207,7 @@ button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
        -command do_signoff
 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
 
-button .vpane.lower.commarea.buttons.commit -text [mc Commit] \
+button .vpane.lower.commarea.buttons.commit -text [mc Commit@@verb] \
        -command do_commit
 pack .vpane.lower.commarea.buttons.commit -side top -fill x
 lappend disable_on_lock \

diff --git a/lib/choose_rev.tcl b/lib/choose_rev.tcl
index a6a442ae1dcbad90b1509121e25fd9f02739f71a..5e833a53764ad495f5d7753eb52673e02b73289e 100644 (file)
--- a/lib/choose_rev.tcl
+++ b/lib/choose_rev.tcl
@@ -544,7 +544,7 @@ method _open_tooltip {} {
 
        if {$cmit ne {}} {
                $tooltip_t insert end "\n"
-               $tooltip_t insert end [mc "Commit"] section_header
+               $tooltip_t insert end [mc "Commit@@noun"] section_header
                $tooltip_t insert end "  [lindex $cmit 1]\n"
                $tooltip_t insert end [lindex $cmit 2]
                $tooltip_t insert end " ([lindex $cmit 3])\n"