summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarri Ilari Tapio Liusvaara <hliusvaa@cc.hut.fi>2007-09-12 20:02:35 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-09-12 20:51:54 (GMT)
commita9813cb51d4f64e93e2a028a2b749d70e378a8a0 (patch)
tree161474c908826094ca8ca5edfdeb94f62848b116
parent146d73a365c3a1c2e61e646a929a5168ffb2810c (diff)
downloadgit-a9813cb51d4f64e93e2a028a2b749d70e378a8a0.zip
git-a9813cb51d4f64e93e2a028a2b749d70e378a8a0.tar.gz
git-a9813cb51d4f64e93e2a028a2b749d70e378a8a0.tar.bz2
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>
-rwxr-xr-xgit-gui.sh8
-rw-r--r--lib/choose_rev.tcl2
2 files changed, 5 insertions, 5 deletions
diff --git a/git-gui.sh b/git-gui.sh
index d00758e..a4e2ad2 100755
--- 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 a6a442a..5e833a5 100644
--- 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"