[Python-checkins] cpython (merge 3.4 -> 3.5): Merge with 3.4

[terry.reedy]

https://hg.python.org/cpython/rev/64e1a6c99037
changeset:   99231:64e1a6c99037
branch:      3.5
parent:      99227:4f30b0d47c24
parent:      99230:8636f0625408
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri Nov 20 12:22:06 2015 -0500
summary:
  Merge with 3.4

files:
  Lib/idlelib/PyShell.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -989,7 +989,7 @@
         if self.executing:
             response = tkMessageBox.askokcancel(
                 "Kill?",
-                "The program is still running!\n Do you want to kill it?",
+                "Your program is still running!\n Do you want to kill it?",
                 default="ok",
                 parent=self.text)
             if response is False:

-- 
Repository URL: https://hg.python.org/cpython