From f21a39b65004145f4a041ef7123549d8b3d2b8ea Mon Sep 17 00:00:00 2001 From: Fedor Date: Thu, 13 Aug 2020 09:43:32 +0300 Subject: [PATCH] [installer] Reword the 'such a portable' option. --- .../basilisk/installer/windows/nsis/installer.nsi | 10 +++++++++- .../locales/en-US/installer/custom.properties | 3 ++- .../palemoon/installer/windows/nsis/installer.nsi | 13 +++++++++++-- .../locales/en-US/installer/custom.properties | 3 ++- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/application/basilisk/installer/windows/nsis/installer.nsi b/application/basilisk/installer/windows/nsis/installer.nsi index febf7d759..11f4ef7e3 100644 --- a/application/basilisk/installer/windows/nsis/installer.nsi +++ b/application/basilisk/installer/windows/nsis/installer.nsi @@ -1101,7 +1101,7 @@ Function .onInit !insertmacro InitInstallOptionsFile "shortcuts.ini" !insertmacro InitInstallOptionsFile "summary.ini" - WriteINIStr "$PLUGINSDIR\options.ini" "Settings" NumFields "7" + WriteINIStr "$PLUGINSDIR\options.ini" "Settings" NumFields "8" WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Type "label" WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Text "$(OPTIONS_SUMMARY)" @@ -1157,6 +1157,14 @@ Function .onInit WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Bottom "117" WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" State "1" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 8" Type "link" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 8" Text "$(OPTION_PORTABLE_LINK)" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 8" Left "205" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 8" Right "-1" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 8" Top "103" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 8" Bottom "123" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 8" State "https://github.com/Feodor2/Mypal27old/wiki/Portable" + ; Setup the shortcuts.ini file for the Custom Shortcuts Page ; Don't offer to install the quick launch shortcut on Windows 7 ${If} ${AtLeastWin7} diff --git a/application/basilisk/locales/en-US/installer/custom.properties b/application/basilisk/locales/en-US/installer/custom.properties index 6dd7e7b06..b3c94ebf3 100644 --- a/application/basilisk/locales/en-US/installer/custom.properties +++ b/application/basilisk/locales/en-US/installer/custom.properties @@ -73,8 +73,9 @@ OPTION_STANDARD_RADIO=&Standard # Two lines OPTION_CUSTOM_DESC=You may choose individual options to be installed. Recommended for experienced users. OPTION_CUSTOM_RADIO=&Custom -OPTION_PORTABLE_DESC=Such a portable, default browser feature disabled (no-remote). +OPTION_PORTABLE_DESC=Fully portable, disable system integration functionality OPTION_PORTABLE_RADIO=&Portable +OPTION_PORTABLE_LINK=(detailed info). # LOCALIZATION NOTE: # The following text replaces the Install button text on the summary page. diff --git a/application/palemoon/installer/windows/nsis/installer.nsi b/application/palemoon/installer/windows/nsis/installer.nsi index b9434c267..b372b57ac 100644 --- a/application/palemoon/installer/windows/nsis/installer.nsi +++ b/application/palemoon/installer/windows/nsis/installer.nsi @@ -1095,7 +1095,7 @@ Function .onInit !insertmacro InitInstallOptionsFile "shortcuts.ini" !insertmacro InitInstallOptionsFile "summary.ini" - WriteINIStr "$PLUGINSDIR\options.ini" "Settings" NumFields "7" + WriteINIStr "$PLUGINSDIR\options.ini" "Settings" NumFields "8" WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Type "label" WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Text "$(OPTIONS_SUMMARY)" @@ -1146,11 +1146,20 @@ Function .onInit WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Type "checkbox" WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Text "$(OPTION_PORTABLE_DESC)" WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Left "15" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Right "-1" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Right "200" WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Top "97" WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Bottom "117" WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" State "1" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 8" Type "link" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 8" Text "$(OPTION_PORTABLE_LINK)" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 8" Left "205" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 8" Right "-1" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 8" Top "103" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 8" Bottom "123" + WriteINIStr "$PLUGINSDIR\options.ini" "Field 8" State "https://github.com/Feodor2/Mypal27old/wiki/Portable" + + ; Setup the shortcuts.ini file for the Custom Shortcuts Page ; Don't offer to install the quick launch shortcut on Windows 7 ${If} ${AtLeastWin7} diff --git a/application/palemoon/locales/en-US/installer/custom.properties b/application/palemoon/locales/en-US/installer/custom.properties index d18d90ef5..f8ae2fd79 100644 --- a/application/palemoon/locales/en-US/installer/custom.properties +++ b/application/palemoon/locales/en-US/installer/custom.properties @@ -77,8 +77,9 @@ OPTION_STANDARD_RADIO=&Standard # Two lines OPTION_CUSTOM_DESC=You may choose individual options to be installed. Recommended for experienced users. OPTION_CUSTOM_RADIO=&Custom -OPTION_PORTABLE_DESC=Such a portable, default browser feature disabled (no-remote). +OPTION_PORTABLE_DESC=Fully portable, disable system integration functionality OPTION_PORTABLE_RADIO=&Portable +OPTION_PORTABLE_LINK=(detailed info). # LOCALIZATION NOTE: # The following text replaces the Install button text on the summary page.