Merge branch 'maint'

diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl
index 0adcf9d958b76b5a52386effe6afbca95f0abaf9..318078615862adab052d0d0f637f82176a0a785a 100644 (file)
--- a/git-gui/lib/choose_repository.tcl
+++ b/git-gui/lib/choose_repository.tcl
@@ -38,7 +38,7 @@ constructor pick {} {
                menu $m_repo
 
                if {[is_MacOSX]} {
-                       $w.mbar add cascade -label [mc Apple] -menu .mbar.apple
+                       $w.mbar add cascade -label Apple -menu .mbar.apple
                        menu $w.mbar.apple
                        $w.mbar.apple add command \
                                -label [mc "About %s" [appname]] \
@@ -388,9 +388,7 @@ method _do_new {} {
                -command [cb _new_local_path]
        set w_localpath $w_body.where.t
 
-       pack $w_body.where.b -side right
-       pack $w_body.where.l -side left
-       pack $w_body.where.t -fill x
+       grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew
        pack $w_body.where -fill x
 
        trace add variable @local_path write [cb _write_local_path]
@@ -987,9 +985,7 @@ method _do_open {} {
                -text [mc "Browse"] \
                -command [cb _open_local_path]
 
-       pack $w_body.where.b -side right
-       pack $w_body.where.l -side left
-       pack $w_body.where.t -fill x
+       grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew
        pack $w_body.where -fill x
 
        trace add variable @local_path write [cb _write_local_path]