summaryrefslogtreecommitdiff
path: root/git-gui/lib/branch_delete.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-02 05:11:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-02 05:11:57 (GMT)
commita8816e7bab0354badd915c1da09421a64c982831 (patch)
tree4d481c55f29d977384f312646c84b0adb4ad0d4b /git-gui/lib/branch_delete.tcl
parent1087aba86b4a687cabf03d4a060d4b51282819d3 (diff)
parenta91be3fcbe92c24e809b1ec85881a6da40a9a340 (diff)
downloadgit-a8816e7bab0354badd915c1da09421a64c982831.zip
git-a8816e7bab0354badd915c1da09421a64c982831.tar.gz
git-a8816e7bab0354badd915c1da09421a64c982831.tar.bz2
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: Fixes for Mac OS X TkAqua git-gui: Update Russian translation git-gui: run post-checkout hook after clone git-gui: Ensure consistent usage of mergetool.keepBackup git-gui: fix use of undeclared variable diff_empty_count git-gui (Win): make starting via "Git GUI Here" on .git/ possible git-gui (Win): make "Explore Working Copy" more robust git-gui: run post-checkout hook on checkout git-gui: When calling post-commit hook wrong variable was cleared. git-gui: use `git --html-path` to get the location of installed HTML docs git-gui: fix deleting from the context menu with empty selection git-gui: minor spelling fix and string factorisation. git-gui: various French translation fixes git-gui: Fix merge conflict display error when filename contains spaces git-gui: don't hide the Browse button when resizing the repo chooser Append ampersand to "Target" of lnk files created by do_cygwin_shortcut git-gui: Support more git version notations. git-gui: Avoid an infinite rescan loop in handle_empty_diff. git-gui: Fix post-commit status with subject in non-locale encoding
Diffstat (limited to 'git-gui/lib/branch_delete.tcl')
-rw-r--r--git-gui/lib/branch_delete.tcl4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-gui/lib/branch_delete.tcl b/git-gui/lib/branch_delete.tcl
index ef1930b..20d5e42 100644
--- a/git-gui/lib/branch_delete.tcl
+++ b/git-gui/lib/branch_delete.tcl
@@ -51,7 +51,7 @@ constructor dialog {} {
$w.check \
[mc "Delete Only If Merged Into"] \
]
- $w_check none [mc "Always (Do not perform merge test.)"]
+ $w_check none [mc "Always (Do not perform merge checks)"]
pack $w.check -anchor nw -fill x -pady 5 -padx 5
foreach h [load_all_heads] {
@@ -112,7 +112,7 @@ method _delete {} {
}
if {$to_delete eq {}} return
if {$check_cmt eq {}} {
- set msg [mc "Recovering deleted branches is difficult. \n\n Delete the selected branches?"]
+ set msg [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]
if {[tk_messageBox \
-icon warning \
-type yesno \