From: Alex Henrie <alexhenrie24@gmail.com>
To: paulus@samba.org, bernt@norang.ca, git@vger.kernel.org
Cc: Alex Henrie <alexhenrie24@gmail.com>
Subject: [PATCH] gitk: Remove mc parameter from proc show_error
Date: Thu, 2 Apr 2015 15:05:35 -0600 [thread overview]
Message-ID: <1428008735-10943-1-git-send-email-alexhenrie24@gmail.com> (raw)
This partially reverts commit 8d849957d81fc0480a52570d66cc3c2a688ecb1b.
This change makes the string "OK" translatable and the string "mc" not
translatable. It will take effect the next time `make update-po` is run.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
gitk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gitk b/gitk
index 30fcd30..7193f6f 100755
--- a/gitk
+++ b/gitk
@@ -1894,13 +1894,13 @@ proc make_transient {window origin} {
}
}
-proc show_error {w top msg {mc mc}} {
+proc show_error {w top msg} {
global NS
if {![info exists NS]} {set NS ""}
if {[wm state $top] eq "withdrawn"} { wm deiconify $top }
message $w.m -text $msg -justify center -aspect 400
pack $w.m -side top -fill x -padx 20 -pady 20
- ${NS}::button $w.ok -default active -text [$mc OK] -command "destroy $top"
+ ${NS}::button $w.ok -default active -text [mc OK] -command "destroy $top"
pack $w.ok -side bottom -fill x
bind $top <Visibility> "grab $top; focus $top"
bind $top <Key-Return> "destroy $top"
--
2.3.5
next reply other threads:[~2015-04-02 21:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-02 21:05 Alex Henrie [this message]
2015-04-06 3:33 ` [PATCH] gitk: Remove mc parameter from proc show_error Paul Mackerras
-- strict thread matches above, loose matches on Subject: below --
2015-05-02 3:13 Alex Henrie
2015-05-02 10:05 ` Paul Mackerras
2015-05-03 4:24 ` Alex Henrie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428008735-10943-1-git-send-email-alexhenrie24@gmail.com \
--to=alexhenrie24@gmail.com \
--cc=bernt@norang.ca \
--cc=git@vger.kernel.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).