undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Disambiguate "commit"

Browse Source 
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>
This commit is contained in:
Harri Ilari Tapio Liusvaara 2007-09-12 23:02:35 +03:00 committed by Shawn O. Pearce
parent 146d73a365
commit a9813cb51d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-gui.sh
View File

@ -10,7 +10,7 @@
set appvers {@@GITGUI_VERSION@@} set appvers {@@GITGUI_VERSION@@}
set copyright { 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 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 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 .mbar add cascade -label [mc Branch] -menu .mbar.branch
} }
if {[is_enabled multicommit] || [is_enabled singlecommit]} { 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]} { if {[is_enabled transport]} {
.mbar add cascade -label [mc Merge] -menu .mbar.merge .mbar add cascade -label [mc Merge] -menu .mbar.merge
@ -1891,7 +1891,7 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {
-command do_signoff \ -command do_signoff \
-accelerator $M1T-S -accelerator $M1T-S
.mbar.commit add command -label [mc Commit] \ .mbar.commit add command -label [mc Commit@@verb] \
-command do_commit \ -command do_commit \
-accelerator $M1T-Return -accelerator $M1T-Return
lappend disable_on_lock \ lappend disable_on_lock \
@ -2207,7 +2207,7 @@ button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
-command do_signoff -command do_signoff
pack .vpane.lower.commarea.buttons.signoff -side top -fill x 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 -command do_commit
pack .vpane.lower.commarea.buttons.commit -side top -fill x pack .vpane.lower.commarea.buttons.commit -side top -fill x
lappend disable_on_lock \ lappend disable_on_lock \

2
lib/choose_rev.tcl
View File

@ -544,7 +544,7 @@ method _open_tooltip {} {
if {$cmit ne {}} { if {$cmit ne {}} {
$tooltip_t insert end "\n" $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 1]\n"
$tooltip_t insert end [lindex $cmit 2] $tooltip_t insert end [lindex $cmit 2]
$tooltip_t insert end " ([lindex $cmit 3])\n" $tooltip_t insert end " ([lindex $cmit 3])\n"