Organized assets

T7x/Contrib/Language files/English.nlf

@@ -1,4 +1,4 @@
-# Header, don't edit
+# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,13 +6,13 @@ NLF v6
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 -
 # RTL - anything else than RTL means LTR
 -
 # Translation by ..... (any credits should go here)
 # ^Branding
-Nullsoft Install System %s
+t7x Installer - Free and Open Source Software
 # ^SetupCaption
 $(^Name) Setup
 # ^UninstallCaption
@@ -100,7 +100,7 @@ Select components to uninstall:
 # ^UnComponentsSubText2
 Or, select the optional components you wish to uninstall:
 # ^DirText
-Setup will install $(^NameDA) in the current application directory. To install in a different folder, click Browse and select another folder. $_CLICK
+Setup will install $(^NameDA) in the following folder. Enter the path to your Call of Duty Black Ops III game folder, or click Browse and select the game folder. $_CLICK
 # ^DirSubText
 Destination Folder
 # ^DirBrowseText
@@ -184,8 +184,8 @@ Log install process
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
+ G

T7x/Contrib/Language files/English.nsh

@@ -1,16 +1,16 @@
-;Language: English (1033)
+;Language: English (1033)
 ;By Joost Verburg
 
-!insertmacro LANGFILE "English" "English"
+!insertmacro LANGFILE "English" "English" "English" "English" ; See \Include\LangFile.nsh for a description of these parameters
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "SAMPLETEXT"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Welcome to the $(^NameDA) Setup"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "This program will guide you through the installation of the $(^NameDA) SAMPLETEXT1.$\r$\n$\r$\nTo find more SAMPLETEXT2, visit SAMPLETEXT3. $\r$\n$\r$\nSAMPLETEXT4 $_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Setup will guide you through the installation of the $(^NameDA) Client for Call of Duty Black Ops III.$\r$\n$\r$\nIt is recommended that you close all other applications before installing.$\r$\n$\r$\nYou will not need to restart your computer after installation.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Welcome to the $(^NameDA) Uninstall Wizard"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "$(^NameDA) Uninstaller"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "This wizard will guide you through the uninstallation of $(^NameDA).$\r$\n$\r$\nBefore starting the uninstallation, make sure $(^NameDA) is not running.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Setup will guide you through the uninstallation of $(^NameDA).$\r$\n$\r$\nBefore starting the uninstallation, make sure $(^NameDA) is not running.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
@@ -30,7 +30,7 @@
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Read the entire agreement:"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Press Page Down to see the rest of the agreement."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
@@ -48,13 +48,13 @@
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
     ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Position your mouse over a component to see its description."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Position your mouse over a component to see its description."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Select a component to see its description."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "SAMPLETEXT5"
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Choose Game Location"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "You must locate your installation before $(^NameDA) can be properly installed."
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Choose your Call of Duty Black Ops III game folder in which to install $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
@@ -81,14 +81,14 @@
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Finish the $(^NameDA) Setup Wizard"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Completing $(^NameDA) Setup"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) has been installed on your computer. SAMPLETEXT6 $\r$\n$\r$\nClick Finish to close this wizard."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) has been installed on your computer.$\r$\n$\r$\nClick Finish to close Setup."
   ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Your computer must be restarted in order to complete the installation of $(^NameDA). Do you want to reboot now?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Finish the $(^NameDA) Uninstall Wizard"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Completing $(^NameDA) Uninstall"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) has been uninstalled from your computer.$\r$\n$\r$\nClick Finish to close this wizard."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) has been uninstalled from your computer.$\r$\n$\r$\nClick Finish to close Setup."
   ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Your computer must be restarted in order to complete the uninstallation of $(^NameDA). Do you want to reboot now?"
 !endif
 
@@ -113,7 +113,7 @@
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Are you sure you want to quit before installing $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Are you sure you want to quit $(^Name) Setup?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
@@ -123,7 +123,7 @@
 !ifdef MULTIUSER_INSTALLMODEPAGE
   ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Choose Users"
   ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Choose for which users you want to install $(^NameDA)."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Select whether you want to install $(^NameDA) for yourself only or for all users of this computer. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Select whether you want to install $(^NameDA) only for yourself or for all users of this computer. $(^ClickNext)"
   ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Install for anyone using this computer"
   ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Install just for me"
 !endif

T7x/t7x_Installer.nsi

@@ -34,7 +34,6 @@ VIAddVersionKey "FileVersion" "${SETUP_VERSION}"
 ; Modern UI Settings
 !define MUI_ABORTWARNING
 !define MUI_UNABORTWARNING
-
 !define MUI_FINISHPAGE_SHOWREADME ""
 !define MUI_FINISHPAGE_SHOWREADME_CHECKED
 !define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut"
@@ -45,12 +44,12 @@ ShowInstDetails show
 ShowUninstDetails show
 
 ; Installer Images
-!define MUI_WELCOMEFINISHPAGE_BITMAP "assets\logo-cropped.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "Contrib\Graphics\Assets\logo-cropped.bmp"
-!define MUI_HEADERIMAGE_BITMAP "assets\banner-t7x-title.bmp" ; For installer header
+!define MUI_HEADERIMAGE_BITMAP "Contrib\Graphics\Assets\banner-t7x-title.bmp" ; For installer header
 
 ; Uninstaller Images
-!define MUI_UNHEADERIMAGE_BITMAP "assets\banner-t7x-title.bmp" ; For uninstaller header
+!define MUI_UNHEADERIMAGE_BITMAP "Contrib\Graphics\Assets\banner-t7x-title.bmp" ; For uninstaller header
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "assets\logo-cropped.bmp" ; For uninstaller finish page
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "Contrib\Graphics\Assets\logo-cropped.bmp" ; For uninstaller finish page
 
 ; Pages
 !insertmacro MUI_PAGE_WELCOME