diff --git a/doc/FAQ.html b/doc/FAQ.html
index 3aee0240..f1f65fa3 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -72,7 +72,7 @@ Currently the follwing input formats are supported by LameXP:
-My anti-virus software detected a potential threat in LameXP. Why is that?
+My anti-virus program raises an alarm when I try to download/install/launch LameXP. Why is that?
Occasionally your anti-virus program may mistakenly detect "malware" (virus, trojan, worm, etc.) in some of
the files here. This is called a "false-positive" and the files are actually innocent/clean. It's an error in
@@ -109,6 +109,52 @@ Please see the
+
+LameXP always is "portable", in the sense that the application works out of the box: LameXP does NOT require
+any additional software, such as codecs, encoders, decoders or runtime libraries, and it will NOT install
+anything of that kind on your local computer! All the third-party tools used by LameXP are already built-in.
+There currently are two notable exceptions: The Nero AAC encoder and the WMA decoder cannot be redistributed
+along with LameXP for legal reasons. Therefore these tools have to be obtained as separate downloads.
+
+Having said that, LameXP stores its configuration file in the %LOCALAPPDATA% folder on the local computer.
+That's because on a modern multi-user operating this is the only "correct" folder to store user-specific
+configuration files. Also it's one of the few folders where an application is guaranteed to get write-access,
+even when the application was launched by a "normal" (non-admin) user and did not request elevated rights.
+Storing the configuration file in the "install" folder is antiquated and highly error-prone.
+
+Still some users may want to store the configuration file in the same folder as the LameXP execuatble file,
+e.g. when launching LameXP directly from their USB stick on different computers. For this purpose LameXP now
+offers a "true" portable mode. You can enable that mode simply by renaming the LameXP executable file to
+"LameXP-Portable.exe". But be aware: When running LameXP in the "portable" mode, the user(!) must ensure that
+write-access is granted to the directory where the LameXP exectable is located.
+
+
+
+The LameXP startup (splash screen) takes very long on my system. What can I do?
+
+Starting up LameXP shouldn't take longer than approximately 10 seconds. However it was brought to our
+attention that badly optimized anti-virus software can slow down the startup procedure a lot! On our test
+system (Windows 7 running on an Intel Core2 Q6600 with 4 GB of RAM) starting up LameXP takes about 3 seconds
+without an anti-virus software and about 6 seconds with the "real-time protection" of Micorosft Security
+Essentials enabled. With other anti-virus software the startup was delayed up to 20 seconds and more!
+
+So if you think that LameXP is starting up too slow on your system, you should temporarily(!) disable or
+uninstall your current anti-virus program and try again. Usually it should be sufficient to disable only the
+"real-time protection", "file system protection" or "guard" feature of your anti-virus software. If it turns
+out that the startup is signficanntly(!) faster WITHOUT the anti-virus software, please report the problem to
+the developer of the anti-virus software. And, if they don't fix the problem, switch to a better product!
+
+
+
+How can I translate LameXP to my language or improve an existing translation?
+
+Please see the guide for translators at:
+
+
+
+
Where can I download the latest version of LameXP?
The latest "official" release of LameXP can be found on the following mirrors:
@@ -127,7 +173,7 @@ The preferred place to report bugs or request new features is the LameXP thread
Where can I find the LameXP source code?
-LameXP is developed using the Git revision control system. The LameXP Git repository is mirrored here:
+LameXP is developed using the Git revision control system. The LameXP Git repository is mirrored at:
diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi
index 75777e2d..a49139d2 100644
--- a/etc/NSIS/setup.nsi
+++ b/etc/NSIS/setup.nsi
@@ -396,10 +396,13 @@ FunctionEnd
;Install Files
;--------------------------------
+Section "-PreInit"
+ SetOutPath "$INSTDIR"
+SectionEnd
+
Section "!Install Files"
!insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_INSTFILES)"
- SetOutPath "$INSTDIR"
Delete "$INSTDIR\Changelog.htm"
Delete "$INSTDIR\Changelog.html"
Delete "$INSTDIR\Contributors.txt"
@@ -560,6 +563,6 @@ Function RunAppFunction
FunctionEnd
Function ShowReadmeFunction
- !insertmacro UAC_AsUser_ExecShell "open" "$INSTDIR\License.txt" "" "" SW_SHOWNORMAL
+ !insertmacro UAC_AsUser_ExecShell "open" "$INSTDIR\FAQ.html" "" "" SW_SHOWNORMAL
FunctionEnd
diff --git a/src/Config.h b/src/Config.h
index a4d92660..069a3ff7 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -25,7 +25,7 @@
#define VER_LAMEXP_MAJOR 4
#define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 0
-#define VER_LAMEXP_BUILD 314
+#define VER_LAMEXP_BUILD 315
#define VER_LAMEXP_SUFFIX RC-1
/*