summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@python.org>2022-09-30 13:54:31 (GMT)
committerGitHub <noreply@github.com>2022-09-30 13:54:31 (GMT)
commit1dc1d5d59a761a24e844d34d9acb6ed6e4cc3a31 (patch)
treec0fe4e5088406594a913001f060eb481aa0854f2
parentba52d014370afa7ba81999dfba200177f11b6d33 (diff)
downloadcpython-1dc1d5d59a761a24e844d34d9acb6ed6e4cc3a31.zip
cpython-1dc1d5d59a761a24e844d34d9acb6ed6e4cc3a31.tar.gz
cpython-1dc1d5d59a761a24e844d34d9acb6ed6e4cc3a31.tar.bz2
gh-90989: Clarify some installer text (GH-97676)
-rw-r--r--Misc/NEWS.d/next/Windows/2022-09-29-23-08-49.gh-issue-90989.no89Q2.rst1
-rw-r--r--Tools/msi/bundle/Default.wxl10
2 files changed, 6 insertions, 5 deletions
diff --git a/Misc/NEWS.d/next/Windows/2022-09-29-23-08-49.gh-issue-90989.no89Q2.rst b/Misc/NEWS.d/next/Windows/2022-09-29-23-08-49.gh-issue-90989.no89Q2.rst
new file mode 100644
index 0000000..34fffdf
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-09-29-23-08-49.gh-issue-90989.no89Q2.rst
@@ -0,0 +1 @@
+Clarify some text in the Windows installer.
diff --git a/Tools/msi/bundle/Default.wxl b/Tools/msi/bundle/Default.wxl
index 791ce6e..6a2fb86 100644
--- a/Tools/msi/bundle/Default.wxl
+++ b/Tools/msi/bundle/Default.wxl
@@ -80,13 +80,13 @@ Select Customize to review current options.</String>
<String Id="Include_launcherRemove">Use Programs and Features to remove the 'py' launcher.</String>
<String Id="Include_launcherUpgrade">Upgrades the global 'py' launcher from the previous version.</String>
- <String Id="AssociateFilesLabel">Associate &amp;files with Python (requires the py launcher)</String>
+ <String Id="AssociateFilesLabel">Associate &amp;files with Python (requires the 'py' launcher)</String>
<String Id="ShortcutsLabel">Create shortcuts for installed applications</String>
<String Id="PrependPathLabel">Add Python to &amp;environment variables</String>
- <String Id="ShortPrependPathLabel">Add &amp;Python [ShortVersion] to PATH</String>
- <String Id="InstallAllUsersLabel">Install for &amp;all users</String>
- <String Id="InstallLauncherAllUsersLabel">for &amp;all users (requires elevation)</String>
- <String Id="ShortInstallLauncherAllUsersLabel">Install &amp;launcher for all users (recommended)</String>
+ <String Id="ShortPrependPathLabel">Add &amp;python.exe to PATH</String>
+ <String Id="InstallAllUsersLabel">Install Python [ShortVersion] for &amp;all users</String>
+ <String Id="InstallLauncherAllUsersLabel">for &amp;all users (requires admin privileges)</String>
+ <String Id="ShortInstallLauncherAllUsersLabel">Use admin privi&amp;leges when installing py.exe</String>
<String Id="PrecompileLabel">&amp;Precompile standard library</String>
<String Id="Include_symbolsLabel">Download debugging &amp;symbols</String>
<String Id="Include_debugLabel">Download debu&amp;g binaries (requires VS 2017 or later)</String>