git-gui: Clarify the Remote -> Delete... action

Currently, it was not really clear what all does this perform. We rename
"Delete..." to "Delete Branch..." (since this does not delete the remote
as a whole) and relabel the window from "Delete Remote Branch" to "Delete
Branch Remotely" (since the action also involves pushing the delete out).

Signed-off-by: Petr Baudis <petr.baudis@novartis.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-gui.sh b/git-gui.sh
index 4d52f02dcec076d2d1af1c2e542068dbe2fcffde..078636f23f31a2466c479fda8803a953173eb9e3 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -2453,7 +2453,7 @@ if {[is_enabled transport]} {
                -command do_push_anywhere \
                -accelerator $M1T-P
        .mbar.remote add command \
                -command do_push_anywhere \
                -accelerator $M1T-P
        .mbar.remote add command \

-               -label [mc "Delete..."] \
+               -label [mc "Delete Branch..."] \

                -command remote_branch_delete::dialog
 }
 
                -command remote_branch_delete::dialog
 }
 

diff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl
index c7b81486984d46a9dca59867c406a8e247d76313..fbcfb27157682e8a9ffbdbf9d8f1e2ce5341ca73 100644 (file)
--- a/lib/remote_branch_delete.tcl
+++ b/lib/remote_branch_delete.tcl
@@ -26,12 +26,12 @@ constructor dialog {} {
        global all_remotes M1B
 
        make_toplevel top w
        global all_remotes M1B
 
        make_toplevel top w

-       wm title $top [append "[appname] ([reponame]): " [mc "Delete Remote Branch"]]
+       wm title $top [append "[appname] ([reponame]): " [mc "Delete Branch Remotely"]]

        if {$top ne {.}} {
                wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
        }
 
        if {$top ne {.}} {
                wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
        }
 

-       label $w.header -text [mc "Delete Remote Branch"] -font font_uibold
+       label $w.header -text [mc "Delete Branch Remotely"] -font font_uibold

        pack $w.header -side top -fill x
 
        frame $w.buttons
        pack $w.header -side top -fill x
 
        frame $w.buttons