Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-gui.sh8
-rw-r--r--lib/option.tcl12
2 files changed, 13 insertions, 7 deletions
diff --git a/git-gui.sh b/git-gui.sh
index c8307a6eef..be506b908c 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -2018,8 +2018,12 @@ if {[is_MacOSX]} {
.mbar.apple add command -label [mc "About %s" [appname]] \
-command do_about
- .mbar.apple add command -label [mc "Options..."] \
- -command do_options
+ .mbar.apple add separator
+ .mbar.apple add command \
+ -label [mc "Preferences..."] \
+ -command do_options \
+ -accelerator $M1T-,
+ bind . <$M1B-,> do_options
} else {
# -- Edit Menu
#
diff --git a/lib/option.tcl b/lib/option.tcl
index de6bd90edc..f812e5e89a 100644
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@ -78,10 +78,6 @@ proc do_options {} {
toplevel $w
wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
- label $w.header -text [mc "Options"] \
- -font font_uibold
- pack $w.header -side top -fill x
-
frame $w.buttons
button $w.buttons.restore -text [mc "Restore Defaults"] \
-default normal \
@@ -199,7 +195,13 @@ proc do_options {} {
bind $w <Visibility> "grab $w; focus $w.buttons.save"
bind $w <Key-Escape> "destroy $w"
bind $w <Key-Return> [list do_save_config $w]
- wm title $w [append "[appname] ([reponame]): " [mc "Options"]]
+
+ if {[is_MacOSX]} {
+ set t [mc "Preferences"]
+ } else {
+ set t [mc "Options"]
+ }
+ wm title $w "[appname] ([reponame]): $t"
tkwait window $w
}