diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-21 00:00:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-21 00:00:56 -0800 |
| commit | d794d9e70ebb8c767b04f25c03290ef305cd31ab (patch) | |
| tree | 94b449643ef448eded6b3000400871913b7c0182 /git-gui/lib/error.tcl | |
| parent | 183f84365de7b4b1fe0e15cebce80a95023aa1d6 (diff) | |
| parent | 41188dd1a837df08a959b63a2f56357971fa4549 (diff) | |
| download | git-d794d9e70ebb8c767b04f25c03290ef305cd31ab.tar.gz git-d794d9e70ebb8c767b04f25c03290ef305cd31ab.tar.xz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: (96 commits)
git-gui 0.9.0
git-gui: Bind Meta-T for "Stage To Commit" menu action
git-gui: Allow users to set font weights to bold
git-gui: Update Japanese strings (part 2)
git-gui: Update Japanese strings
Updated russian translation of git-gui
po2msg: actually output statistics
po2msg: ignore untranslated messages
po2msg: ignore entries marked with "fuzzy"
git-gui: Protect against bad translation strings
git-gui: Make sure we get errors from git-update-index
More updates and corrections to the russian translation of git-gui
Updated Russian translation.
git-gui: Update German translation
git-gui: Add more terms to glossary.
git-gui: Paper bag fix the global config parsing
git-gui: Honor a config.mak in git-gui's top level
git-gui: Collapse $env(HOME) to ~/ in recent repositories on Windows
git-gui: Support cloning Cygwin based work-dirs
git-gui: Use proper Windows shortcuts instead of bat files
...
Diffstat (limited to 'git-gui/lib/error.tcl')
| -rw-r--r-- | git-gui/lib/error.tcl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-gui/lib/error.tcl b/git-gui/lib/error.tcl index 16a22187b..13565b7ab 100644 --- a/git-gui/lib/error.tcl +++ b/git-gui/lib/error.tcl @@ -9,7 +9,7 @@ proc error_popup {msg} { set cmd [list tk_messageBox \ -icon error \ -type ok \ - -title "$title: error" \ + -title [append "$title: " [mc "error"]] \ -message $msg] if {[winfo ismapped .]} { lappend cmd -parent . @@ -25,7 +25,7 @@ proc warn_popup {msg} { set cmd [list tk_messageBox \ -icon warning \ -type ok \ - -title "$title: warning" \ + -title [append "$title: " [mc "warning"]] \ -message $msg] if {[winfo ismapped .]} { lappend cmd -parent . @@ -78,7 +78,7 @@ proc hook_failed_popup {hook msg} { -font font_diff \ -yscrollcommand [list $w.m.sby set] label $w.m.l2 \ - -text {You must correct the above errors before committing.} \ + -text [mc "You must correct the above errors before committing."] \ -anchor w \ -justify left \ -font font_uibold @@ -99,6 +99,6 @@ proc hook_failed_popup {hook msg} { bind $w <Visibility> "grab $w; focus $w" bind $w <Key-Return> "destroy $w" - wm title $w "[appname] ([reponame]): error" + wm title $w [append "[appname] ([reponame]): " [mc "error"]] tkwait window $w } |