summaryrefslogtreecommitdiffstats
path: root/Tools/msi/bundle/Default.wxl
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-07-16 23:33:55 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-07-16 23:33:55 (GMT)
commit2237bdc595e3d33f941c40108eddfa262c19d960 (patch)
tree174fef339e6a87b1d4cab69f631dacf16abfe45b /Tools/msi/bundle/Default.wxl
parent8cc80f1d8199a29a432c8caeb3142f9aa35012fd (diff)
downloadcpython-2237bdc595e3d33f941c40108eddfa262c19d960.zip
cpython-2237bdc595e3d33f941c40108eddfa262c19d960.tar.gz
cpython-2237bdc595e3d33f941c40108eddfa262c19d960.tar.bz2
Adds option to install launcher for all users even when installing Python just-for-me. This helps mitigate issues when the incompatible Python 3.4 launcher is installed.
Enables installer builds with the the text marker. Allows simple installs to include a custom description.
Diffstat (limited to 'Tools/msi/bundle/Default.wxl')
-rw-r--r--Tools/msi/bundle/Default.wxl8
1 files changed, 6 insertions, 2 deletions
diff --git a/Tools/msi/bundle/Default.wxl b/Tools/msi/bundle/Default.wxl
index 19ba7eb..c12fb65 100644
--- a/Tools/msi/bundle/Default.wxl
+++ b/Tools/msi/bundle/Default.wxl
@@ -50,7 +50,9 @@ Creates shortcuts and file associations</String>
<String Id="InstallCustomButton">C&amp;ustomize installation</String>
<String Id="InstallCustomButtonNote">Choose location and features</String>
<String Id="InstallSimpleButton">&amp;Install</String>
- <String Id="InstallSimpleButtonNote">Uses setting preselected by your administrator</String>
+ <String Id="InstallSimpleButtonNote">Use settings preselected by your administrator
+
+[SimpleInstallDescription]</String>
<String Id="InstallUpgradeButton">&amp;Upgrade Now</String>
<String Id="InstallUpgradeButtonNote">[TargetDir]
@@ -81,7 +83,9 @@ Select Customize to review current options.</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 as &amp;Administrator</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="PrecompileLabel">&amp;Precompile standard library</String>
<String Id="Include_symbolsLabel">Install debugging &amp;symbols</String>
<String Id="Include_debugLabel">Install debu&amp;g binaries (requires VS 2015 or later)</String>