Use install/installer/installation instead of setup and use directory instead of folder for most things

3 files changed, 15 insertions, 15 deletions

diff --git a/apps/mail/installer/locale/mui.properties b/apps/mail/installer/locale/mui.properties
index 68841d5e3..7e5b1a6f5 100644
--- a/apps/mail/installer/locale/mui.properties
+++ b/apps/mail/installer/locale/mui.properties
@@ -20,8 +20,8 @@
 
 # You can use \n to create a newline in the string but only when the string
 # from en-US contains a \n.
-MUI_TEXT_WELCOME_INFO_TITLE=Welcome to the $BrandFullNameDA Setup Wizard
-MUI_TEXT_WELCOME_INFO_TEXT=This wizard will guide you through the installation of $BrandFullNameDA.\n\nIt is recommended that you close all other applications before starting Setup. This will make it possible to update relevant system files without having to reboot your computer.\n\n$_CLICK
+MUI_TEXT_WELCOME_INFO_TITLE=Welcome to the $BrandFullNameDA Installation Wizard
+MUI_TEXT_WELCOME_INFO_TEXT=This wizard will guide you through the installation of $BrandFullNameDA.\n\nIt is recommended that you close all other applications before starting the Installer. This will make it possible to update relevant system files without having to reboot your computer.\n\n$_CLICK
 MUI_TEXT_LICENSE_TITLE=License Agreement
 MUI_TEXT_LICENSE_SUBTITLE=Please review the license terms before installing $BrandFullNameDA.
 MUI_INNERTEXT_LICENSE_TOP=Press Page Down to see the rest of the agreement.
@@ -31,15 +31,15 @@ MUI_TEXT_COMPONENTS_SUBTITLE=Choose which features of $BrandFullNameDA you want
 MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE=Description
 MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO=Position your mouse over a component to see its description.
 MUI_TEXT_DIRECTORY_TITLE=Choose Install Location
-MUI_TEXT_DIRECTORY_SUBTITLE=Choose the folder in which to install $BrandFullNameDA.
+MUI_TEXT_DIRECTORY_SUBTITLE=Choose the directory in which to install $BrandFullNameDA.
 MUI_TEXT_INSTALLING_TITLE=Installing
 MUI_TEXT_INSTALLING_SUBTITLE=Please wait while $BrandFullNameDA is being installed.
 MUI_TEXT_FINISH_TITLE=Installation Complete
-MUI_TEXT_FINISH_SUBTITLE=Setup was completed successfully.
+MUI_TEXT_FINISH_SUBTITLE=Installation was completed successfully.
 MUI_TEXT_ABORT_TITLE=Installation Aborted
-MUI_TEXT_ABORT_SUBTITLE=Setup was not completed successfully.
+MUI_TEXT_ABORT_SUBTITLE=Installation was not completed successfully.
 MUI_BUTTONTEXT_FINISH=&Finish
-MUI_TEXT_FINISH_INFO_TITLE=Completing the $BrandFullNameDA Setup Wizard
+MUI_TEXT_FINISH_INFO_TITLE=Completing the $BrandFullNameDA Installation Wizard
 MUI_TEXT_FINISH_INFO_TEXT=$BrandFullNameDA has been installed on your computer.\n\nClick Finish to close this wizard.
 MUI_TEXT_FINISH_INFO_REBOOT=Your computer must be restarted in order to complete the installation of $BrandFullNameDA. Do you want to reboot now?
 MUI_TEXT_FINISH_REBOOTNOW=Reboot now
@@ -47,7 +47,7 @@ MUI_TEXT_FINISH_REBOOTLATER=I want to manually reboot later
 MUI_TEXT_STARTMENU_TITLE=Choose Start Menu Folder
 MUI_TEXT_STARTMENU_SUBTITLE=Choose a Start Menu folder for the $BrandFullNameDA shortcuts.
 MUI_INNERTEXT_STARTMENU_TOP=Select the Start Menu folder in which you would like to create the program's shortcuts. You can also enter a name to create a new folder.
-MUI_TEXT_ABORTWARNING=Are you sure you want to quit $BrandFullName Setup?
+MUI_TEXT_ABORTWARNING=Are you sure you want to quit the $BrandFullName Installer?
 MUI_UNTEXT_WELCOME_INFO_TITLE=Welcome to the $BrandFullNameDA Uninstall Wizard
 MUI_UNTEXT_WELCOME_INFO_TEXT=This wizard will guide you through the uninstallation of $BrandFullNameDA.\n\nBefore starting the uninstallation, make sure $BrandFullNameDA is not running.\n\n$_CLICK
 MUI_UNTEXT_CONFIRM_TITLE=Uninstall $BrandFullNameDA
diff --git a/apps/mail/installer/locale/override.properties b/apps/mail/installer/locale/override.properties
index bb8cac738..642a28b0b 100644
--- a/apps/mail/installer/locale/override.properties
+++ b/apps/mail/installer/locale/override.properties
@@ -23,7 +23,7 @@
 # and end of a string enclose the strin with an additional double quote
 # (e.g. ""This will include quotes"").
 
-SetupCaption=$BrandFullName Setup
+SetupCaption=$BrandFullName Installer
 UninstallCaption=$BrandFullName Uninstall
 BackBtn=< &Back
 NextBtn=&Next >
@@ -42,12 +42,12 @@ Completed=Completed
 LicenseTextRB=Please review the license agreement before installing $BrandFullNameDA. If you accept all terms of the agreement, select the first option below. $_CLICK
 ComponentsText=Check the components you want to install and uncheck the components you don't want to install. $_CLICK
 ComponentsSubText2_NoInstTypes=Select components to install:
-DirText=Setup will install $BrandFullNameDA in the following folder. To install in a different folder, click Browse and select another folder. $_CLICK
-DirSubText=Destination Folder
-DirBrowseText=Select the folder to install $BrandFullNameDA in:
+DirText=$BrandFullNameDA will installed to the following directory. To install in a different directory, click Browse and select another directory. $_CLICK
+DirSubText=Destination Directory
+DirBrowseText=Select the directory to install $BrandFullNameDA in:
 SpaceAvailable="Space available: "
 SpaceRequired="Space required: "
-UninstallingText=$BrandFullNameDA will be uninstalled from the following folder. $_CLICK
+UninstallingText=$BrandFullNameDA will be uninstalled from the following directory. $_CLICK
 UninstallingSubText=Uninstalling from:
 FileError=Error opening file for writing: \r\n\r\n$0\r\n\r\nClick Abort to stop the installation,\r\nRetry to try again, or\r\nIgnore to skip this file.
 FileError_NoIgnore=Error opening file for writing: \r\n\r\n$0\r\n\r\nClick Retry to try again, or\r\nCancel to stop the installation.
@@ -58,7 +58,7 @@ Registering="Registering: "
 Unregistering="Unregistering: "
 SymbolNotFound="Could not find symbol: "
 CouldNotLoad="Could not load: "
-CreateFolder="Create folder: "
+CreateDirectory="Create directory: "
 CreateShortcut="Create shortcut: "
 CreatedUninstaller="Created uninstaller: "
 Delete="Delete file: "
@@ -73,8 +73,8 @@ Extract="Extract: "
 ErrorWriting="Extract: error writing to file "
 InvalidOpcode=Installer corrupted: invalid opcode
 NoOLE="No OLE for: "
-OutputFolder="Output folder: "
-RemoveFolder="Remove folder: "
+OutputDirectory="Output directory: "
+RemoveDirectory="Remove directory: "
 RenameOnReboot="Rename on reboot: "
 Rename="Rename: "
 Skipped="Skipped: "
diff --git a/system/packager/nsis/setup.ico b/system/packager/nsis/setup.ico
index 9801fed54..bbd9cfc28 100644
--- a/system/packager/nsis/setup.ico
+++ b/system/packager/nsis/setup.ico