* PageEx - every page can be used everywhere and as many times as needed

* DirVar - easy way to add another dir page
* default strings in the language file (Page directory is enough, no need for DirText)
* strings from the language file are now LangStrings that can be used in the script
* no more /LANG - one string for all languages
* any lang strings can be used everywhere, installer or uninstaller (no un.)
* no more unprocessed strings - variables can be used almost everywhere (except in licenseData and InstallDirRegKey)
* DirText parm for browse dialog text
* SetBkColor -> SetCtlColors - can now set text color too
* fixed SetOutPath and File /r bug
* fixed File /a /oname bug
* added $_CLICK for pages
* added quotes support in lang files (patch #752620)
* extraction progress
* separate RTL dialogs for RTL langs (improved RTL too)
* InstallOptions RTL
* StartMenu RTL
* fixed RegDLL?
* added IfSilent and SetSilent (SetSilent only works from .onInit)
* fixed verify window (it never showed) (bug #792494)
* fixed ifnewer readonly file problem (patch #783782)
* fixed wininit.ini manipulation when there is another section after [rename]
* fixed some ClearType issues
* fixed a minor bug in the resource editor
* fixed !ifdef/!endif stuff, rewritten
* lots of code and comments clean ups
* got rid of some useless exceptions handling and STL classes (still much more to go)
* lots of optimizations, of course ;)
* updated system.dll with support for GUID, WCHAR, and fast VTable calling (i.e. COM ready)
* minor bug fixes


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2823 212acab6-be3b-0410-9dea-997c60f758d6

Contrib/Language files/English.nlf

@@ -1,5 +1,5 @@
 # Header, don't edit
-NLF v5
+NLF v6
 # Start editing here
 # Language ID
 1033
@@ -7,76 +7,185 @@ NLF v5
 -
 -
 # Codepage - dash (-) means ANSI code page
+# RTL - anything else than RTL means LTR
+-
 -
 # Translation by ..... (any credits should go here)
+# ^Branding
 Nullsoft Install System %s
-%s Setup
-%s Uninstall
+# ^SetupCaption
+$(^Name) Setup
+# ^UninstallCaption
+$(^Name) Uninstall
+# ^LicenseSubCaption
 : License Agreement
+# ^ComponentsSubCaption
 : Installation Options
+# ^DirSubCaption
 : Installation Folder
+# ^InstallingSubCaption
 : Installing
+# ^CompletedSubCaption
 : Completed
+# ^UnComponentsSubCaption
+: Uninstallation Options
+# ^UnDirSubCaption
+: Uninstallation Folder
+# ^ConfirmSubCaption
 : Confirmation
+# ^UninstallingSubCaption
 : Uninstalling
+# ^UnCompletedSubCaption
 : Completed
+# ^BackBtn
 < &Back
+# ^NextBtn
 &Next >
+# ^AgreeBtn
 I &Agree
+# ^AcceptBtn
 I &accept the terms in the License Agreement
+# ^DontAcceptBtn
 I &do not accept the terms in the License Agreement
+# ^InstallBtn
 &Install
+# ^UninstallBtn
 &Uninstall
+# ^CancelBtn
 Cancel
+# ^CloseBtn
 &Close
+# ^BrowseBtn
 B&rowse...
+# ^ShowDetailsBtn
 Show &details
+# ^ClickNext
+Click Next to continue.
+# ^ClickInstall
+Click Install to start the installation.
+# ^ClickUninstall
+Click Uninstall to start the uninstallation.
+# ^Name
 Name
+# ^Completed
 Completed
+# ^LicenseText
+Please review the license agreement before installing $(^Name). If you accept all terms of the agreement, click I Agree.
+# ^LicenseTextCB
+Please review the license agreement before installing $(^Name). If you accept all terms of the agreement, click the check box below. $_CLICK
+# ^LicesnseTextRB
+Please review the license agreement before installing $(^Name). If you accept all terms of the agreement, select the first option below. $_CLICK
+# ^UnLicenseText
+Please review the license agreement before uninstalling $(^Name). If you accept all terms of the agreement, click I Agree.
+# ^UnLicenseTextCB
+Please review the license agreement before uninstalling $(^Name). If you accept all terms of the agreement, click the check box below. $_CLICK
+# ^UnLicesnseTextRB
+Please review the license agreement before uninstalling $(^Name). If you accept all terms of the agreement, select the first option below. $_CLICK
+# ^Custom
 Custom
+# ^ComponentsText
+Check the components you want to install and uncheck the components you don't want to install. $_CLICK
+# ^ComponentsSubText1
 Select the type of install:
+# ^ComponentsSubText2_NoInstTypes
 Select components to install:
+# ^ComponentsSubText2
 Or, select the optional components you wish to install:
-Select the folder to install %s in:
-Space available: 
-Space required: 
+# ^UnComponentsText
+Check the components you want to uninstall and uncheck the components you don't want to uninstall. $_CLICK
+# ^UnComponentsSubText1
+Select the type of uninstall:
+# ^UnComponentsSubText2_NoInstTypes
+Select components to uninstall:
+# ^UnComponentsSubText2
+Or, select the optional components you wish to uninstall:
+# ^DirText
+Setup will install $(^Name) 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 $(^Name) in:
+# ^UnDirText
+Setup will uninstall $(^Name) from the following folder. To uninstall from a different folder, click Browse and select another folder. $_CLICK
+# ^UnDirSubText
+""
+# ^UnDirBrowseText
+Select the folder to uninstall $(^Name) from:
+# ^SpaceAvailable
+"Space available: "
+# ^SpaceRequired
+"Space required: "
+# ^UninstallingText
+This wizard will uninstall $(^Name) from your computer. $_CLICK
+# ^UninstallingSubText
 Uninstalling from:
-Error opening file for writing: \r\n\t"$0"\r\nHit abort to abort installation,\r\nretry to retry writing the file, or\r\nignore to skip this file
-Error opening file for writing: \r\n\t"$0"\r\nHit retry to retry writing the file, or\r\ncancel to abort installation
-Can't write: 
+# ^FileError
+Error opening file for writing: \r\n\t\"$0\"\r\nHit abort to abort installation,\r\nretry to retry writing the file, or\r\nignore to skip this file
+# ^FileError_NoIgnore
+Error opening file for writing: \r\n\t\"$0\"\r\nHit retry to retry writing the file, or\r\ncancel to abort installation
+# ^CantWrite
+"Can't write: "
+# ^CopyFailed
 Copy failed
-Copy to 
-Registering: 
-Unregistering: 
-Could not find symbol: 
-Could not load: 
-Create folder: 
-Create shortcut: 
-Created uninstaller: 
-Delete file: 
-Delete on reboot: 
-Error creating shortcut: 
-Error creating: 
+# ^CopyTo
+"Copy to "
+# ^Registering
+"Registering: "
+# ^Unregistering
+"Unregistering: "
+# ^SymbolNotFound
+"Could not find symbol: "
+# ^CouldNotLoad
+"Could not load: "
+# ^CreateFolder
+"Create folder: "
+# ^CreateShortcut
+"Create shortcut: "
+# ^CreatedUninstaller
+"Created uninstaller: "
+# ^Delete
+"Delete file: "
+# ^DeleteOnReboot
+"Delete on reboot: "
+# ^ErrorCreatingShortcut
+"Error creating shortcut: "
+# ^ErrorCreating
+"Error creating: "
+# ^ErrorDecompressing
 Error decompressing data! Corrupted installer?
+# ^ErrorRegistering
 Error registering DLL
-ExecShell: 
-Execute: 
-Extract: 
-Extract: error writing to file 
+# ^ExecShell
+"ExecShell: "
+# ^Exec
+"Execute: "
+# ^Extract
+"Extract: "
+# ^ErrorWriting
+"Extract: error writing to file "
+# ^InvalidOpcode
 Installer corrupted: invalid opcode
-No OLE for: 
-Output folder: 
-Remove folder: 
-Rename on reboot: 
-Rename: 
-Skipped: 
+# ^NoOLE
+"No OLE for: "
+# ^OutputFolder
+"Output folder: "
+# ^RemoveFolder
+"Remove folder: "
+# ^RenameOnReboot
+"Rename on reboot: "
+# ^Rename
+"Rename: "
+# ^Skipped
+"Skipped: "
+# ^CopyDetails
 Copy Details To Clipboard
+# ^LogInstall
 Log install process
-# byte
+# ^Byte
 B
-# kilo
+# ^Kilo
 K
-# mega
+# ^Mega
 M
-# giga
+# ^Giga
 G