[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[martin.v.loewis]

http://hg.python.org/cpython/rev/2cceb4d3079a
changeset:   75137:2cceb4d3079a
parent:      75129:e0d451e24c43
parent:      75136:b349c932765a
user:        Martin v. Löwis <martin at v.loewis.de>
date:        Tue Feb 21 17:26:10 2012 +0100
summary:
  merge 3.2

files:
  Misc/NEWS        |  2 ++
  Tools/msi/msi.py |  2 +-
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1942,6 +1942,8 @@
 Build
 -----
 
+- Issue #10580: Minor grammar change in Windows installer.
+
 - Issue #13326: Clean __pycache__ directories correctly on OpenBSD.
 
 - PEP 393: the configure option --with-wide-unicode is removed.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -498,7 +498,7 @@
 
     exit_dialog = PyDialog(db, "ExitDialog", x, y, w, h, modal, title,
                          "Finish", "Finish", "Finish")
-    exit_dialog.title("Completing the [ProductName] Installer")
+    exit_dialog.title("Complete the [ProductName] Installer")
     exit_dialog.back("< Back", "Finish", active = 0)
     exit_dialog.cancel("Cancel", "Back", active = 0)
     exit_dialog.text("Acknowledgements", 135, 95, 220, 120, 0x30003,

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