Merge branch 'executables' into executables

1 files changed, 45 insertions, 10 deletions

diff --git a/NSIS/English.nsh b/NSIS/English.nsh
index c3b5263..b28d51f 100644
--- a/NSIS/English.nsh
+++ b/NSIS/English.nsh
@@ -3,26 +3,61 @@
 ;File name of license file
 LicenseLangString MUILicense ${LANG_ENGLISH} "..\COPYRIGHT.txt"
 
+;Welcome page
+LangString WELCOME_PAGE_TEXT ${LANG_ENGLISH} "This installer will guide you through the installation of KiCad ${PRODUCT_VERSION}.$\r$\n$\r$\n\
+It is not required to close any other applications before starting the installer, neither is it necessary to reboot your computer.$\r$\n$\r$\n\
+This is free open source software licensed under the GPL.$\r$\n$\r$\n\
+Click Next to continue."
+
+;Error messages
+LangString ERROR_ADMIN_REQ ${LANG_ENGLISH} "Admin rights are required to install KiCad!"
+LangString ERROR_WIN9X ${LANG_ENGLISH} "Error! This can't run under Windows 9x!"
+
+;Other languages
+LangString LANGUAGE_NAME_EN ${LANG_ENGLISH} "English"
+LangString LANGUAGE_NAME_DE ${LANG_ENGLISH} "German"
+LangString LANGUAGE_NAME_ES ${LANG_ENGLISH} "Spanish"
+LangString LANGUAGE_NAME_FR ${LANG_ENGLISH} "French"
+LangString LANGUAGE_NAME_IT ${LANG_ENGLISH} "Italian"
+LangString LANGUAGE_NAME_JA ${LANG_ENGLISH} "Japanese"
+LangString LANGUAGE_NAME_NL ${LANG_ENGLISH} "Dutch"
+LangString LANGUAGE_NAME_PL ${LANG_ENGLISH} "Polish"
+
 ;Component option
-LangString TITLE_SEC01 ${LANG_ENGLISH} "Main application"
-LangString TITLE_SEC02 ${LANG_ENGLISH} "Libraries and components"
-LangString TITLE_SEC03 ${LANG_ENGLISH} "Demonstration projects"
-LangString TITLE_SEC04 ${LANG_ENGLISH} "Help files"
+LangString TITLE_SEC_MAIN ${LANG_ENGLISH} "Main application"
+LangString TITLE_SEC_SCHLIB ${LANG_ENGLISH} "Schematic libraries"
+LangString TITLE_SEC_FPLIB ${LANG_ENGLISH} "Footprint libraries"
+LangString TITLE_SEC_FPWIZ ${LANG_ENGLISH} "Footprint wizards"
+LangString TITLE_SEC_DEMOS ${LANG_ENGLISH} "Demonstration projects"
+LangString TITLE_SEC_DOCS ${LANG_ENGLISH} "Help files"
+LangString TITLE_SEC_ENV ${LANG_ENGLISH} "Environment variables"
 
 ;Component option descriptions
-LangString DESC_SEC01 ${LANG_ENGLISH} "Main application files."
-LangString DESC_SEC02 ${LANG_ENGLISH} "Libraries and components are required unless they have been previously installed."
-LangString DESC_SEC03 ${LANG_ENGLISH} "Some demonstration projects and tutorials."
-LangString DESC_SEC04 ${LANG_ENGLISH} "Help files in pdf format."
+LangString DESC_SEC_MAIN ${LANG_ENGLISH} "Main application files."
+LangString DESC_SEC_SCHLIB ${LANG_ENGLISH} "Schematic libraries are required unless they have been previously installed."
+LangString DESC_SEC_FPLIB ${LANG_ENGLISH} "Footprint libraries are required unless they have been previously installed."
+LangString DESC_SEC_FPWIZ ${LANG_ENGLISH} "Default python based footprint wizards available in the footprint editor. This is an experimental feature on windows."
+LangString DESC_SEC_DEMOS ${LANG_ENGLISH} "Some demonstration projects and tutorials."
+LangString DESC_SEC_DOCS ${LANG_ENGLISH} "Help files in PDF format."
+LangString DESC_SEC_DOCS_EN ${LANG_ENGLISH} "$(LANGUAGE_NAME_EN) $(TITLE_SEC_DOCS)"
+LangString DESC_SEC_DOCS_DE ${LANG_ENGLISH} "$(LANGUAGE_NAME_DE) $(TITLE_SEC_DOCS)"
+LangString DESC_SEC_DOCS_ES ${LANG_ENGLISH} "$(LANGUAGE_NAME_ES) $(TITLE_SEC_DOCS)"
+LangString DESC_SEC_DOCS_FR ${LANG_ENGLISH} "$(LANGUAGE_NAME_FR) $(TITLE_SEC_DOCS)"
+LangString DESC_SEC_DOCS_IT ${LANG_ENGLISH} "$(LANGUAGE_NAME_IT) $(TITLE_SEC_DOCS)"
+LangString DESC_SEC_DOCS_JA ${LANG_ENGLISH} "$(LANGUAGE_NAME_JA) $(TITLE_SEC_DOCS)"
+LangString DESC_SEC_DOCS_NL ${LANG_ENGLISH} "$(LANGUAGE_NAME_NL) $(TITLE_SEC_DOCS)"
+LangString DESC_SEC_DOCS_PL ${LANG_ENGLISH} "$(LANGUAGE_NAME_PL) $(TITLE_SEC_DOCS)"
+LangString DESC_SEC_ENV ${LANG_ENGLISH} "Sets KISYSMOD, KISYS3DMOD and KICAD_PTEMPLATES environment variables to default install paths."
 
 ;General messages
 LangString WINGS3D_PROMPT ${LANG_ENGLISH} "To edit or create 3D object models you need to install Wings3D. \
 Wings3D and user manual can be download free from the Wings3D web page Check this box to open the Wings3D web page"
 
 LangString UNINST_PROMPT ${LANG_ENGLISH} "Are you sure you want to completely remove $(^Name) and all of its components? $\n\
-This will also remove all modified and new files, libraries and modules in the program directory"
+This will also remove all modified and new files, libraries and modules in the program directory \
+(including python modules installed by user)!"
 
 LangString UNINST_SUCCESS ${LANG_ENGLISH} "$(^Name) was successfully removed from your computer."
 LangString INSTALLER_RUNNING ${LANG_ENGLISH} "The installer is already running."
 LangString UNINSTALLER_RUNNING ${LANG_ENGLISH} "The uninstaller is already running."
-LangString ALREADY_INSTALLED ${LANG_ENGLISH} "${PRODUCT_NAME} is already installed. Install this package will overwrite existing files. Do you want to continue?"
+LangString ALREADY_INSTALLED ${LANG_ENGLISH} "${PRODUCT_NAME} is already installed. Installing this package will overwrite existing files. Do you want to continue?"