From: Uwe Stöhr <uwestoehr@web.de>
Date: Mon, 23 May 2011 04:12:10 +0000 (+0000)
Subject: installer: merge LyXWinInstaller with the new one, see my mail
X-Git-Tag: 2.1.0beta1~3193
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d964457d9a565d882e02928cc657dbcdad982641;p=features.git

installer: merge LyXWinInstaller with the new one, see my mail

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38820 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/Win32/packaging/installer/gui/LaTeXFolder.nsh b/development/Win32/packaging/installer/gui/LaTeXFolder.nsh
new file mode 100644
index 0000000000..dfd6de3778
--- /dev/null
+++ b/development/Win32/packaging/installer/gui/LaTeXFolder.nsh
@@ -0,0 +1,39 @@
+Function LatexFolder
+
+  !insertmacro INSTALLOPTIONS_EXTRACT "io_latex.ini"
+  # generate the installer page
+  !insertmacro MUI_HEADER_TEXT "$(EnterLaTeXHeader1)" "$(EnterLaTeXHeader2)"
+  ${if} $LatexName != ""
+   !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 1" "Text" "$(EnterLaTeXFolder)"
+  ${else}
+   !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 1" "Text" "$(EnterLaTeXFolderNone)"
+  ${endif}
+  !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 2" "Text" "$(PathName)"
+  ${if} $PathLaTeX == ""
+   !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 3" "State" "C:\" # Does \" quote a "?
+  ${else}
+   !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 3" "State" "$PathLaTeX"
+  ${endif}
+  !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 4" "Text" "$(DontUseLaTeX)"
+  !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 4" "State" "$State"
+  AgainFolder:
+  !insertmacro INSTALLOPTIONS_DISPLAY "io_latex.ini"
+  !insertmacro INSTALLOPTIONS_READ "$State" "io_latex.ini" "Field 4" "State" # read checkbox if LaTeX should be used, "0" or not "1"
+  ${if} $State == "1"
+   StrCpy $PathLaTeX ""
+   Goto ReadyFolder
+  ${endif}
+  !insertmacro INSTALLOPTIONS_READ "$PathLaTeX" "io_latex.ini" "Field 3" "State"
+  # check if the latex.exe exists in the $PathLaTeX folder
+  !insertmacro FileCheck $5 "latex.exe" "$PathLaTeX"
+  ${if} $5 == "False"
+   MessageBox MB_RETRYCANCEL "$(InvalidLaTeXFolder)" IDRETRY AgainFolder
+   StrCpy $PathLaTeX ""
+  ${endif}
+  ReadyFolder:
+
+FunctionEnd
+
+Function LatexFolder_LeaveFunction
+
+FunctionEnd
diff --git a/development/Win32/packaging/installer/gui/external.nsh b/development/Win32/packaging/installer/gui/external.nsh
index 87d7d71df6..16f609ddc3 100644
--- a/development/Win32/packaging/installer/gui/external.nsh
+++ b/development/Win32/packaging/installer/gui/external.nsh
@@ -203,10 +203,10 @@ FunctionEnd
 
 # Page functions
 
-Function PageExternalLaTeX
-  !insertmacro EXTERNAL_SHOWDIALOG LaTeX
-FunctionEnd
+#Function PageExternalLaTeX
+#  !insertmacro EXTERNAL_SHOWDIALOG LaTeX
+#FunctionEnd
 
-Function PageExternalLaTeXValidate
-  !insertmacro EXTERNAL_VALIDATEDIALOG LaTeX
-FunctionEnd
+#Function PageExternalLaTeXValidate
+#  !insertmacro EXTERNAL_VALIDATEDIALOG LaTeX
+#FunctionEnd
diff --git a/development/Win32/packaging/installer/gui/io_latex.ini b/development/Win32/packaging/installer/gui/io_latex.ini
new file mode 100644
index 0000000000..8475b66023
--- /dev/null
+++ b/development/Win32/packaging/installer/gui/io_latex.ini
@@ -0,0 +1,36 @@
+[Settings]
+NumFields=4
+
+[Field 1]
+Type=Label
+Left=20
+Right=280
+Top=3
+Bottom=60
+Text='You can optionally set here the path to the file "latex.exe" and therewith set the LaTeX-distribution that should be used by LyX.\r\nIf you don$\\'t use LaTeX, LyX cannot output documents!\r\n\r\nThe installer has detected the LaTeX-distribution "$LaTeXName" on your system. Displayed below is its path.'
+
+[Field 2]
+Type=Groupbox
+Left=5
+Right=-1
+Top=67
+Bottom=107
+Text= Path 
+
+[Field 3]
+Type=DirRequest
+Left=20
+Right=270
+Top=83
+Bottom=94
+State=C:\
+
+[Field 4]
+Type=Checkbox
+Text=Don't use LaTeX
+Left=20
+Right=120
+Top=120
+Bottom=129
+State=0
+
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh
new file mode 100644
index 0000000000..ec51d73048
--- /dev/null
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -0,0 +1,219 @@
+Function LaTeXActions
+ # check if MiKTeX or TeXLive is installed
+
+  # test if MiKTeX is installed
+  # reads the PATH variable via the registry because NSIS' "$%Path%" variable is not updated when the PATH changes
+  ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "Path"
+  StrCpy $Search "miktex"
+  Call LaTeXCheck # sets the path to the latex.exe to $PathLaTeX # Function from LyXUtils.nsh
+  
+  ${if} $PathLaTeX != ""
+   # check if MiKTeX 2.7 or newer is installed
+   StrCpy $0 0
+   loopA:
+    EnumRegKey $1 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" $0 # check the last subkey
+    StrCmp $1 "" doneA
+    StrCpy $String $1
+    IntOp $0 $0 + 1
+    Goto loopA
+   doneA:
+   ${if} $String == "2.7"
+    StrCpy $MiKTeXVersion "2.7"
+    StrCpy $LaTeXName "MiKTeX 2.7"
+   ${endif}
+   ${if} $String == "2.8"
+    StrCpy $MiKTeXVersion "2.8"
+    StrCpy $LaTeXName "MiKTeX 2.8"
+   ${endif}
+   ${if} $String == "2.9"
+    StrCpy $MiKTeXVersion "2.9"
+    StrCpy $LaTeXName "MiKTeX 2.9"
+   ${endif}
+  ${endif}
+  
+  ${if} $PathLaTeX == "" # check if MiKTeX is installed only for the current user
+   ReadRegStr $String HKCU "Environment" "Path"
+   StrCpy $Search "miktex"
+   Call LaTeXCheck # function from LyXUtils.nsh
+   ${if} $PathLaTeX != ""
+    StrCpy $MiKTeXUser "HKCU" # needed later to configure MiKTeX
+   ${endif}
+  ${endif}
+  ${if} $LaTeXName == "" # check for the MiKTeX version
+   StrCpy $0 0
+   loopB:
+    EnumRegKey $1 HKCU "SOFTWARE\MiKTeX.org\MiKTeX" $0 # check the last subkey
+    StrCmp $1 "" doneB
+    StrCpy $String $1
+    IntOp $0 $0 + 1
+    Goto loopB
+   doneB:
+   ${if} $String == "2.7"
+    StrCpy $MiKTeXVersion "2.7"
+    StrCpy $LaTeXName "MiKTeX 2.7"
+   ${endif}
+   ${if} $String == "2.8"
+    StrCpy $MiKTeXVersion "2.8"
+    StrCpy $LaTeXName "MiKTeX 2.8"
+   ${endif}
+   ${if} $String == "2.9"
+    StrCpy $MiKTeXVersion "2.9"
+    StrCpy $LaTeXName "MiKTeX 2.9"
+   ${endif}
+  ${endif}
+    
+  ${if} $PathLaTeX != ""
+   StrCpy $LaTeXInstalled "MiKTeX"
+  ${endif}
+  
+  # test if TeXLive is installed
+  # as described at TeXLives' homepage there should be an entry in the PATH
+  ${if} $PathLaTeX == ""
+   ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "Path"
+   StrCpy $Search "TeXLive"
+   Call LaTeXCheck # function from LyXUtils.nsh
+  ${endif}
+  # check for the current user Path variable (the case when it is a live CD/DVD)
+  ${if} $PathLaTeX == ""
+   ReadRegStr $String HKCU "Environment" "Path"
+   StrCpy $Search "texlive"
+   StrCpy $2 "TeXLive"
+   Call LaTeXCheck # function from LyXUtils.nsh
+  ${endif}
+  # check if the variable TLroot exists (the case when it is installed using the program "tlpmgui")
+  ${if} $PathLaTeX == ""
+   ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "TLroot"
+   ${if} $String == ""
+    ReadRegStr $String HKCU "Environment" "TLroot" # the case when installed without admin permissions
+   ${endif}
+   StrCpy $PathLaTeX "$String\bin\win32"
+   # check if the latex.exe exists in the $PathLaTeX folder
+   !insertmacro FileCheck $5 "latex.exe" "$PathLaTeX" # macro from LyXUtils.nsh
+   ${if} $5 == "False"
+    StrCpy $PathLaTeX ""
+   ${endif}
+  ${endif}
+  ${if} $PathLaTeX != ""
+  ${andif} $LaTeXName != "MiKTeX 2.7"
+  ${andif} $LaTeXName != "MiKTeX 2.8"
+  ${andif} $LaTeXName != "MiKTeX 2.9"
+   StrCpy $LaTeXName "TeXLive"
+  ${endif}
+  
+  ${if} $PathLaTeX == ""
+   StrCpy $MissedProg "True"
+  ${endif}
+
+FunctionEnd
+
+# -------------------------------------------
+
+!if ${SETUPTYPE} == BUNDLE
+
+ Function InstallMiKTeX
+  
+  # install MiKTeX if not already installed
+  ${if} $PathLaTeX == ""
+   # launch MiKTeX's installer
+   MessageBox MB_OK|MB_ICONINFORMATION "$(LatexInfo)"
+   ExecWait ${MiKTeXInstall}
+   # test if MiKTeX is installed
+   ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "Path"
+   StrCpy $Search "miktex"
+   Call LaTeXCheck # function from LyXUtils.nsh
+   ${if} $PathLaTeX == ""
+    StrCpy $MiKTeXUser "HKCU"
+    ReadRegStr $String HKCU "Environment" "Path"
+    StrCpy $Search "miktex"
+    Call LaTeXCheck # function from LyXUtils.nsh
+   ${endif}
+   ${if} $PathLaTeX != ""
+    # set package repository (MiKTeX's primary package repository)
+    WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" # special entry to tell the uninstaller that it was installed with LyX
+    StrCpy $LaTeXInstalled "MiKTeX"
+    StrCpy $MiKTeXVersion ${MiKTeXDeliveredVersion}
+   ${else}
+    MessageBox MB_OK|MB_ICONSTOP "$(LatexError1)"
+    SetOutPath $TEMP # to be able to delete the $INSTDIR
+    RMDir /r $INSTDIR
+    Abort
+   ${endif} # endif $PathLaTeX != ""
+  ${endif}
+
+  FunctionEnd
+
+!endif # endif ${SETUPTYPE} == BUNDLE
+
+# ------------------------------
+
+Function ConfigureMiKTeX
+ # installs the LaTeX class files that are delivered with LyX
+ # and enable MiKTeX's automatic package installation
+ 
+  ${if} $MultiUser.Privileges != "Admin"
+  ${orif} $MultiUser.Privileges != "Power"
+   StrCpy $PathLaTeXLocal "$PathLaTeX" -11 # delete "\miktex\bin"
+  ${else}
+   StrCpy $PathLaTeXLocal "$APPDATA\MiKTeX\$MiKTeXVersion"
+  ${endif}
+
+  # only install the LyX packages if they are not already installed
+  ${ifnot} ${FileExists} "$PathLaTeXLocal\tex\latex\lyx\broadway.cls"
+   # dvipost
+   SetOutPath "$PathLaTeXLocal\tex\latex\dvipost"
+   File "${FILES_DVIPOST_PKG}\dvipost.sty"
+   # LyX files in Resources\tex
+   SetOutPath "$PathLaTeXLocal\tex\latex\lyx"
+   CopyFiles /SILENT "$INSTDIR\Resources\tex\*.*" "$PathLaTeXLocal\tex\latex\lyx"
+  
+   # refresh MiKTeX's file name database
+   ${if} $MiKTeXUser != "HKCU" # call the admin version when the user is admin
+    nsExec::ExecToLog '"$PathLaTeX\initexmf --admin --update-fndb"'
+   ${else} 
+    nsExec::ExecToLog '"$PathLaTeX\initexmf --update-fndb"'
+   ${endif}
+   Pop $UpdateFNDBReturn # Return value
+  ${endif}
+  
+  # enable package installation without asking (1 = Yes, 0 = No, 2 = Ask me first)
+  WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1" # if only for current user
+  ${if} $MiKTeXUser != "HKCU"
+   WriteRegStr SHCTX "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1"
+  ${endif}
+  # set package repository (MiKTeX's primary package repository)
+  WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}" # if only for current user
+  WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote" # if only for current user
+  ${if} $MiKTeXUser != "HKCU"
+   WriteRegStr SHCTX "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}"
+   WriteRegStr SHCTX "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote"
+  ${endif}
+  
+  # enable MiKTeX's automatic package installation
+  ExecWait '$PathLaTeX\mpm.exe --update-fndb'
+  # the following feature is planned to be used for a possible CD-version
+  # copy LaTeX-packages needed by LyX
+  # SetOutPath "$INSTDIR"
+  # File /r "${LaTeXPackagesDir}" 
+  
+FunctionEnd
+
+Function UpdateMiKTeX
+ # ask to update MiKTeX
+
+  ${if} $LaTeXInstalled == "MiKTeX"
+   MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" IDYES UpdateNow IDNO UpdateLater
+   UpdateNow:
+    StrCpy $0 $PathLaTeX -4 # remove "\bin"
+    # the update wizard is either started by the copystart_admin.exe
+    # or the miktex-update.exe (since MiKTeX 2.8)
+    ExecWait '"$PathLaTeX\copystart_admin.exe" "$0\config\update.dat"' # run MiKTeX's update wizard
+    ${if} $MiKTeXUser != "HKCU" # call the admin version when the user is admin
+     ExecWait '"$PathLaTeX\internal\miktex-update_admin.exe"' # run MiKTeX's update wizard
+    ${else} 
+     ExecWait '"$PathLaTeX\internal\miktex-update.exe"' # run MiKTeX's update wizard
+    ${endif} 
+   UpdateLater:
+  ${endif}
+
+FunctionEnd
+
diff --git a/development/Win32/packaging/installer/include/LyXUtils.nsh b/development/Win32/packaging/installer/include/LyXUtils.nsh
new file mode 100644
index 0000000000..9cfaddb726
--- /dev/null
+++ b/development/Win32/packaging/installer/include/LyXUtils.nsh
@@ -0,0 +1,389 @@
+# This script contains the following functions:
+#
+# - LaTeXCheck (check installed LaTeX-system),
+#    (only used by Small and Complete installer), uses:
+#    StrPointer
+#    StrPoint
+#    RevStrPointer
+#    RevStrPoint
+#
+# - un.DelAppPathSub and UnAppPreSuff,
+#    (delete the folder ~\Documents and Settings\username\Application Data\LyX for all users), uses:
+#    un.GetParentA
+#    un.GetUsers
+#    un.StrPoint
+#    StrPointer
+#    StrPoint
+#    UnAppPreSuff
+#
+# - CheckAppPathPreferences (replaces the old install folder name with the new one in the preferences files)
+#                           (used by Update installer), uses:
+#    ReplaceLineContent
+#
+# - IsUserAdmin (checks if user is admin)
+#
+# - FileCheck (checks if a given file exists)
+#
+#--------------------------
+
+!macro StrPointer FindStr SearchStr Pointer
+ # searches for a string/character (SearchStr) in another string (FindStr)
+ # and returns the number of the character in the FindStr where the SearchStr was found (Pointer)
+ # if nothing was found or the search is impossible the Pointer is set to -1
+ 
+ StrLen $R2 ${SearchStr}
+ StrLen $R4 ${FindStr}
+ StrCpy $R5 0
+ ${if} $R2 == 0
+ ${orif} $R4 == 0
+  Goto NotFound
+ ${endif}
+ IntCmp $R4 $R2 loopA NotFound
+ loopA:
+  StrCpy $R3 ${FindStr} $R2 $R5
+  StrCmp $R3 ${SearchStr} Found
+  IntOp $R5 $R5 + 1
+  IntCmp $R4 $R5 loopA NotFound
+  Goto loopA
+ Found:
+  StrCpy ${Pointer} $R5
+  Goto done
+ NotFound:
+  StrCpy ${Pointer} "-1"
+ done:
+
+!macroend
+ 
+#--------------------------------
+
+Function StrPoint
+ !insertmacro StrPointer $String $Search $Pointer
+FunctionEnd
+
+#--------------------------------
+
+!macro RevStrPointer FindStr SearchStr Pointer
+ # searches for a string/character (SearchStr) in another string (FindStr) in reverse order
+ # and returns the number of the character in the FindStr where the SearchStr was found (Pointer)
+ # if nothing was found or the search is impossible the Pointer is set to +1
+ 
+ StrLen $R2 ${SearchStr}
+ StrLen $R4 ${FindStr}
+ ${if} $R2 == 0
+ ${orif} $R4 == 0
+  Goto NotFound
+ ${endif}
+ IntCmp $R4 $R2 loopA NotFound
+ StrCpy $R5 "-$R2"
+ loopA:
+  StrCpy $R3 ${FindStr} $R2 $R5
+  StrCmp $R3 ${SearchStr} Found
+  IntOp $R5 $R5 - 1
+  IntCmp "$R5" "-$R4" loopA NotFound
+  Goto loopA
+ Found:
+  StrCpy ${Pointer} $R5
+  Goto done
+ NotFound:
+  StrCpy ${Pointer} "+1"
+ done:
+
+!macroend
+ 
+#--------------------------------
+
+ Function RevStrPoint
+  !insertmacro RevStrPointer $String $Search $Pointer
+ FunctionEnd
+
+#--------------------------------
+
+!macro AppPreSuff AppPre AppSuff
+ # the APPDATA path for a local user has for WinXP and 2000 the following structure:
+ # C:\Documents and Settings\username\Application Data
+ # for Win Vista the structure is:
+ # C:\Users\username\AppData\Roaming
+ # this macro saves the "C:\Documents and Settings\" substring into the variable "AppPre"
+ # and the "Application Data" substring into the variable "AppSuff"
+  
+  # switch temporarily to local user because the all users application data path is in
+  # Vista only C:\ProgramData 
+  SetShellVarContext current
+  StrCpy $String "$APPDATA"
+  Var /GLOBAL APPDATemp
+  StrCpy $APPDATemp "$APPDATA"
+  ${If} $MultiUser.Privileges == "Admin"
+   ${OrIf} $MultiUser.Privileges == "Power"
+    SetShellVarContext all # move back to all users
+  ${endif}
+  StrCpy $Search "\"
+  Call StrPoint # search for the first "\"
+  IntOp $Pointer $Pointer + 1 # jump after the "\"
+  StrCpy $String $String "" $Pointer # cut off the part before the first "\"
+  StrCpy $0 $Pointer
+  Call StrPoint # search for the second "\"
+  IntOp $0 $0 + $Pointer # $0 is now the pointer to the second "\" in the APPDATA string
+  StrCpy ${AppPre} $APPDATemp $0 # save the part before the second "\"
+  IntOp $Pointer $Pointer + 1 # jump after the "\"
+  StrCpy $String $String "" $Pointer # cut off the part before the second "\"
+  Call StrPoint # search for the third "\"
+  IntOp $Pointer $Pointer + 1 # jump after the "\"
+  StrCpy ${AppSuff} $String "" $Pointer # save the part after the third "\"
+
+!macroend
+
+#--------------------------------
+
+Function GetParentA
+ # deletes a subfolder of the APPDATA path for all users
+ # used by the function "un.getUsers"
+
+  Exch $R0
+  Push $R1
+  Push $R2
+  Push $R3
+  StrCpy $R1 0
+  StrLen $R2 $R0
+  loop:
+   IntOp $R1 $R1 + 1
+   IntCmp $R1 $R2 get 0 get
+   StrCpy $R3 $R0 1 -$R1
+   StrCmp $R3 "\" get
+  Goto loop
+  get:
+   StrCpy $R0 $R0 -$R1
+   Pop $R3
+   Pop $R2
+   Pop $R1
+   Exch $R0
+   
+FunctionEnd
+
+#--------------------------------
+
+Function GetUsers
+ # reads the subfolders of the "Documents and Settings" folder to get a list of the users
+
+  StrCpy $R3 ""
+  Push "$PROFILE"
+  Call GetParentA  
+  Pop $R2
+  StrCpy $R2 "$R2"
+  FindFirst $R0 $R1 "$R2\*"
+  StrCmp $R1 "" findend 0
+  findloop:
+   IfFileExists "$R2\$R1\*.*" 0 notDir
+   StrCmp $R1 "." notDir
+   StrCmp $R1 ".." notDir
+   StrCmp $R1 "All Users" notDir
+   StrCmp $R1 "Default User" notDir
+   StrCmp $R1 "All Users.WINNT" notDir
+   StrCmp $R1 "Default User.WINNT" notDir  
+  StrCpy $R3 "$R3|$R1"
+  notDir:
+   FindNext $R0 $R1
+   StrCmp $R1 "" findend 0
+  Goto findloop
+  findend:
+   FindClose $R0
+  
+FunctionEnd
+
+#--------------------------------
+
+Function un.GetParentA
+ # deletes a subfolder of the APPDATA path for all users
+ # used by the function "un.getUsers"
+
+  Exch $R0
+  Push $R1
+  Push $R2
+  Push $R3
+  StrCpy $R1 0
+  StrLen $R2 $R0
+  loop:
+   IntOp $R1 $R1 + 1
+   IntCmp $R1 $R2 get 0 get
+   StrCpy $R3 $R0 1 -$R1
+   StrCmp $R3 "\" get
+  Goto loop
+  get:
+   StrCpy $R0 $R0 -$R1
+   Pop $R3
+   Pop $R2
+   Pop $R1
+   Exch $R0
+   
+FunctionEnd
+
+#--------------------------------
+
+Function un.GetUsers
+ # reads the subfolders of the "Documents and Settings" folder to get a list of the users
+
+  StrCpy $R3 ""
+  Push "$PROFILE"
+  Call un.GetParentA
+  Pop $R2
+  StrCpy $R2 "$R2"
+  FindFirst $R0 $R1 "$R2\*"
+  StrCmp $R1 "" findend 0
+  findloop:
+   IfFileExists "$R2\$R1\*.*" 0 notDir
+   StrCmp $R1 "." notDir
+   StrCmp $R1 ".." notDir
+   StrCmp $R1 "All Users" notDir
+   StrCmp $R1 "Default User" notDir
+   StrCmp $R1 "All Users.WINNT" notDir
+   StrCmp $R1 "Default User.WINNT" notDir  
+  StrCpy $R3 "$R3|$R1"
+  notDir:
+   FindNext $R0 $R1
+   StrCmp $R1 "" findend 0
+  Goto findloop
+  findend:
+   FindClose $R0
+  
+FunctionEnd
+
+#--------------------------------
+
+Function un.StrPoint
+ !insertmacro StrPointer $String $Search $Pointer
+FunctionEnd
+
+#--------------------------------
+
+!macro UnAppPreSuff AppPre AppSuff
+ # the APPDATA path for a local user has for WinXP and 2000 the following structure:
+ # C:\Documents and Settings\username\Application Data
+ # for Win Vista the structure is:
+ # C:\Users\username\AppData\Roaming
+ # this macro saves the "C:\Documents and Settings\" substring into the variable "AppPre"
+ # and the "Application Data" substring into the variable "AppSuff"
+  
+  SetShellVarContext current # switch temoprarily to local user
+  StrCpy $String "$APPDATA"
+  StrCpy $APPDATemp "$APPDATA"
+  ${if} $MultiUser.Privileges == "Admin"
+  ${orif} $MultiUser.Privileges == "Power"
+   SetShellVarContext all # move back to all users
+  ${endif}
+  StrCpy $Search "\"
+  Call un.StrPoint # search for the first "\"
+  IntOp $Pointer $Pointer + 1 # jump after the "\"
+  StrCpy $String $String "" $Pointer # cut off the part before the first "\"
+  StrCpy $0 $Pointer
+  Call un.StrPoint # search for the second "\"
+  IntOp $0 $0 + $Pointer # $0 is now the pointer to the second "\" in the APPDATA string
+  StrCpy ${AppPre} $APPDATemp $0 # save the part before the second "\"
+  IntOp $Pointer $Pointer + 1 # jump after the "\"
+  StrCpy $String $String "" $Pointer # cut off the part before the second "\"
+  Call un.StrPoint # search for the third "\"
+  IntOp $Pointer $Pointer + 1 # jump after the "\"
+  StrCpy ${AppSuff} $String "" $Pointer # save the part after the third "\"
+
+!macroend
+
+#--------------------------------
+
+Function un.DelAppPathSub
+ # deletes a subfolder of the APPDATA path for all users
+
+  # get list of all users
+  Push $R0
+  Push $R1
+  Push $R2
+  Push $R3
+  Call un.GetUsers
+  StrCpy $UserList $R3 "" 1 # cut off the "|" at the end of the list
+  Pop $R3
+  Pop $R2
+  Pop $R1
+  Pop $R0
+  
+  # the usernames in the list of all users is separated by "|"
+  loop:
+   StrCpy $String "$UserList"
+   StrCpy $Search "|"
+   Call un.StrPoint # search for the "|"
+   StrCmp $Pointer "-1" ready
+   StrCpy $0 $UserList $Pointer # $0 contains now the username
+   IntOp $Pointer $Pointer + 1 # jump after the "|"
+   StrCpy $UserList $UserList "" $Pointer # cut off the first username in the list
+   # generate the string for the current user
+   # AppPre and AppSuff are generated in the macro "AppPreSuff"
+   RMDir /r "$AppPre\$0\$AppSuff\$AppSubfolder" # delete the folder
+  Goto loop
+  ready:
+  StrCpy $0 $UserList
+  RMDir /r "$AppPre\$0\$AppSuff\$AppSubfolder" # delete the folder
+  
+FunctionEnd
+
+#--------------------------------
+
+!macro FileCheck Result FileName FilePath
+ # checks if a file exists, returns "True" or "False"
+
+ Push $0
+ Push $1
+ StrCpy $0 ""
+ StrCpy $1 ""
+ FileOpen $0 "${Filepath}\${FileName}" r
+ ${if} $0 = ""
+  StrCpy $1 "False"
+ ${Else}
+  StrCpy $1 "True"
+ ${endif}
+ FileClose $0
+ StrCpy ${Result} $1
+ Pop $1
+ Pop $0
+
+!macroend
+
+#------------------------------------------
+
+Function LaTeXCheck
+ # searches the string "$Search" in the string "$String" and extracts the path around it
+ # the extracted path is checked if the file "latex.exe" is in it
+
+   StartCheck:
+   StrLen $3 $String
+   Call StrPoint
+   ${if} $Pointer == "-1" # if nothing was found
+    StrCpy $PathLaTeX ""
+    Return
+   ${endif}
+   IntOp $3 $3 - $Pointer
+   StrCpy $4 $String $3 "-$3" # $4 is now the part behind the $Search string
+   StrCpy $String $String $Pointer # $String is now the part before the $Search string
+   StrCpy $Search ":" # search for the ":" after the first previous drive letter
+   Call RevStrPoint
+   IntOp $Pointer $Pointer - 1 # jump before the ":" to the drive letter
+   StrCpy $Pointer $Pointer "" 1 # cut of the "-" sign
+   StrCpy $PathLaTeX $String $Pointer "-$Pointer"
+   StrCpy $String $4
+   StrCpy $Search ";" # search for the following ";" that separates the different paths
+   Call StrPoint
+   ${if} $Pointer != "-1" # if something was found
+    StrCpy $String $String $Pointer
+   ${endif}
+   StrCpy $PathLaTeX "$PathLaTeX$String"
+   # check if the latex.exe exists in the $PathLaTeX folder
+   !insertmacro FileCheck $5 "latex.exe" "$PathLaTeX"
+   ${if} $5 == "False" # delete the entry with the wrong path to the latex.exe and try again
+    StrCpy $PathLaTeX ""
+    StrLen $3 $String
+    StrCpy $String $4 "" $3
+    ${if} $2 == "TeXLive"
+     StrCpy $Search "TeXLive"
+    ${else}
+     StrCpy $Search "miktex"
+    ${endif}
+    Goto StartCheck
+   ${endif}
+
+FunctionEnd
+
diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index b9154bb3e3..7ef1a0a152 100644
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -6,13 +6,11 @@ Configuration of LyX installer
 
 */
 
-SetCompressor /SOLID lzma
-
 #--------------------------------
 # File locations
 
 !define FILES_LICENSE "license.rtf"
-!define FILES_ICONS "..\icons"
+!define FILES_ICONS "icons"
 !define FILES_PDFVIEW "${FILES_DEPS}\bin"
 !define FILES_MSVC "${FILES_DEPS}\bin"
 !define FILES_PYTHON "${FILES_DEPS}\python"
@@ -42,34 +40,33 @@ SetCompressor /SOLID lzma
 
 !define APP_NAME "LyX"
 !define APP_VERSION_NUMBER "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}.${APP_VERSION_BUILD}"
-!define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}"
-!define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}"
+!define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}"
+!define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}"
+!define APP_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}.exe"
 !define APP_DIR "${APP_NAME}${APP_SERIES_KEY}"
 !define APP_DIR_USERDATA "${APP_NAME}${APP_SERIES_KEY}"
 !define APP_INFO "${APP_NAME} - The Document Processor"
-!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2011 LyX Team"
+!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2011 by the LyX Team"
 
-!define APP_RUN "bin\LyX.exe"
+!define APP_RUN "bin\LyXLauncher.exe"
 
-!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}"
-!define APP_REGKEY_SETUP "Software\${APP_NAME}${APP_SERIES_KEY}\Setup"
-!define APP_REGKEY_SETTINGS "Software\${APP_NAME}${APP_SERIES_KEY}\Settings"
+!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX200"
+!define APP_REGKEY_SETUP "Software\${APP_REGKEY}\Setup"
+!define APP_REGKEY_SETTINGS "Software\${APP_REGKEY}\Settings"
 
-!define APP_REGNAME_DOC "LyX.Document"
+!define APP_REGNAME_DOC "${APP_NAME}.Document"
 
 !define APP_EXT ".lyx"
 !define APP_MIME_TYPE "application/lyx"
 
+!define APP_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SETUP_UNINSTALLER_KEY}"
+
 #--------------------------------
 # Setup settings
 
 # Output file name can be configured using command line paramaters like
 # /DExeFile=/path/to/installer
 
-!ifndef SETUPTYPE
-  !define SETUPTYPE STANDARD
-!endif
- 
 !if ${SETUPTYPE} == STANDARD
 
   !define SETUP_EXE ${ExeFile}
@@ -90,7 +87,7 @@ SetCompressor /SOLID lzma
 #--------------------------------
 # Names of binaries to identify compontents
 
-!define BIN_LATEX "tex.exe"
+!define BIN_LATEX "latex.exe"
 !define BIN_BIBTEXEDITOR "JabRef.exe"
 
 #--------------------------------
diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh
index af58ef900c..5287d212de 100644
--- a/development/Win32/packaging/installer/include/detection.nsh
+++ b/development/Win32/packaging/installer/include/detection.nsh
@@ -6,108 +6,238 @@ Detection of external component locations
 
 */
 
+# This script contains the following functions:
+#
+# - SearchExternal, calls the functions:
+#    LaTeXActions
+#    MissingPrograms
+#
+# - MissingPrograms, (check if third-party programs are installed), uses:
+#    SEARCH_MIKTEX
+#    SEARCH_TEXLIVE
+#
+# - EditorCheck,
+#    (test if an editor with syntax-highlighting for LaTeX-files is installed)
+#
+#--------------------------
+
+#Var ReportReturn
+#Var CommandLineOutput
+
 Function SearchExternal
-  Call SearchLaTeX
-  Call SearchBibTeXEditor
+  Call LaTeXActions # function from LaTeX.nsh
+  Call MissingPrograms
 FunctionEnd
 
-#--------------------------------
-# MiKTeX
-
-Var ReportReturn
-Var CommandLineOutput
-
-!macro SEARCH_MIKTEX25
+# ---------------------------------------
+
+Function MissingPrograms
+  # check if third-party programs are installed
+
+  # initialize variable, is later set to True when a program was not found
+  ${if} $MissedProg != "True" # is already True when LaTeX is missing
+   StrCpy $MissedProg "False"
+  ${endif}
+
+  # test if Ghostscript is installed
+  GSloop:
+  EnumRegKey $1 HKLM "Software\AFPL Ghostscript" 0
+  ${if} $1 == ""
+   EnumRegKey $1 HKLM "Software\GPL Ghostscript" 0
+   ${if} $1 != ""
+    StrCpy $2 "True"
+   ${endif}
+  ${endif}
+  ${if} $1 != ""
+   ${if} $2 == "True"
+    ReadRegStr $3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GPL Ghostscript $1" "DisplayName"
+    StrCpy $0 "Software\GPL Ghostscript\$1"
+   ${else}
+    ReadRegStr $3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\AFPL Ghostscript $1" "DisplayName"
+    StrCpy $0 "Software\AFPL Ghostscript\$1"
+   ${endif}
+   ${if} $3 == "" # if nothing was found in the uninstall section
+    ReadRegStr $3 HKLM "SOFTWARE\GPL Ghostscript" "OnlyWithLyX" # check if Ghostscript was installed together with LyX
+   ${endif}
+   ${if} $3 == "" # if nothing was found in the uninstall section
+    DeleteRegKey HKLM "$0"
+    goto GSloop
+   ${else}
+    ReadRegStr $GhostscriptPath HKLM $0 "GS_DLL"
+    ${if} $GhostscriptPath != ""
+     StrCpy $GhostscriptPath "$GhostscriptPath" -12 # remove ending "gsdll32.dll"
+    ${else}
+     StrCpy $MissedProg "True"
+    ${endif}
+   ${endif} # if $3
+  ${else} # if $1
+   StrCpy $GhostscriptPath ""
+   StrCpy $MissedProg "True"
+  ${endif}
+
+  # test if Imagemagick is installed
+  #ReadRegStr $ImageMagickPath HKLM "Software\ImageMagick\Current" "BinPath"
+  #${if} $ImageMagickPath == ""
+  # StrCpy $MissedProg "True"
+  #${endif}
+
+  # test if Python is installed
+  # only use an existing python when it is version 2.5 or newer because some
+  # older Compaq and Dell PCs were delivered with outdated Python interpreters
+  # Python 3.x was reported not to work with LyX properly, see
+  # http://www.lyx.org/trac/ticket/7143
+  ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.5\InstallPath" ""
+  ${if} $PythonPath == ""
+   ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.6\InstallPath" ""
+  ${endif}
+  ${if} $PythonPath == ""
+   ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.7\InstallPath" ""
+  ${endif}
+  ${if} $PythonPath != ""
+   StrCpy $PythonPath $PythonPath -1 # remove the "\" at the end
+   StrCpy $DelPythonFiles "True"
+  ${endif}
+
+  # test if Acrobat or Adobe Reader is used as PDF-viewer
+  ReadRegStr $String HKCR ".pdf" ""
+  ${if} $String != "AcroExch.Document" # this name is only used by Acrobat and Adobe Reader
+   StrCpy $Acrobat "None"
+  ${else}
+   StrCpy $Acrobat "Yes"
+  ${endif}
+
+  # test if a PostScript-viewer is installed, only check for GSview32
+  StrCpy $PSVPath ""
+  ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview32.exe" "Path"
+
+  # test if an editor with syntax-highlighting for LaTeX-files is installed
+  Call EditorCheck
+
+  # test if an image editor is installed (due to LyX's bug 2654 first check for GIMP)
+  StrCpy $ImageEditorPath ""
+  ReadRegStr $ImageEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinGimp-2.0_is1" "DisplayIcon"
+  ${if} $ImageEditorPath != ""
+   StrCpy $ImageEditorPath "$ImageEditorPath" -13 # delete "\gimp-2.x.exe"
+  ${endif}
+  # check for Photoshop
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\Photoshop.exe" "Path"
+  ${if} $0 != ""
+   StrCpy $0 "$0" -1 # delete the last "\"
+   ${if} $ImageEditorPath != ""
+    StrCpy $ImageEditorPath "$ImageEditorPath;$0"
+   ${else}
+    StrCpy $ImageEditorPath $0
+   ${endif}
+  ${endif}
+
+  # test if and where the BibTeX-editor JabRef is installed
+  ReadRegStr $PathBibTeXEditor HKCU "Software\JabRef" "Path"
+  ${if} $PathBibTeXEditor == ""
+   ReadRegStr $PathBibTeXEditor HKLM "Software\JabRef" "Path"
+  ${endif}
 
-  # Search location of MiKTeX installation using initexmf
-  # Works for version 2.5 and later
+  ${IfNot} ${FileExists} "$PathBibTeXEditor\${BIN_BIBTEXEDITOR}"
+    StrCpy $PathBibTeXEditor ""
+    StrCpy $JabRefInstalled == "No"
+  ${else}
+   StrCpy $JabRefInstalled == "Yes"
+  ${endif}
   
-  nsExec::ExecToStack "initexmf.exe --report"
-  Pop $ReportReturn
-  Pop $CommandLineOutput
-
-  ClearErrors
-  ${WordFind2X} $CommandLineOutput "BinDir: " "$\r" "E+1" $PathLaTeX
-  ${If} ${Errors}
-    ClearErrors
-    ${WordFind2X} $CommandLineOutput "CommonInstall: " "$\r" "E+1" $PathLaTeX
-    ${If} ${Errors}
-       StrCpy $PathLaTeX ""
-    ${Else}
-       StrCpy $PathLaTeX "$PathLaTeX\miktex\bin"
-    ${EndIf}
-  ${EndIf}
-
-  ClearErrors
-  ${WordFind2X} $CommandLineOutput "BinDir: " "$\r" "E+1" $PathLaTeX
-  ${If} ${Errors}
-    StrCpy $PathLaTeX ""
-  ${EndIf}
-
-  ${If} $PathLatex == ""
-    ClearErrors
-    ${WordFind2X} $CommandLineOutput "CommonInstall: " "$\r" "E+1" $PathLaTeX
-    ${If} ${Errors}
-      StrCpy $PathLaTeX ""
-    ${Else}
-       StrCpy $PathLaTeX "$PathLaTeX\miktex\bin"
-    ${EndIf}
-  ${EndIf}
-
-  ${If} $PathLatex == ""
-    ClearErrors
-    ${WordFind2X} $CommandLineOutput "UserInstall: " "$\r" "E+1" $PathLaTeX
-    ${If} ${Errors}
-      StrCpy $PathLaTeX ""
-    ${Else}
-       StrCpy $PathLaTeX "$PathLaTeX\miktex\bin"
-    ${EndIf}
-  ${EndIf}
-
-  # Local root
-
-  ClearErrors
-  ${WordFind2X} $CommandLineOutput "CommonData: " "$\r" "E+1" $PathLaTeXLocal
-  ${If} ${Errors}
-    StrCpy $PathLaTeXLocal ""
-  ${EndIf}
-
-  ${If} $PathLatex == ""
-    ClearErrors
-    ${WordFind2X} $CommandLineOutput "UserData: " "$\r" "E+1" $PathLaTeXLocal
-    ${If} ${Errors}
-      StrCpy $PathLaTeXLocal ""
-    ${EndIf}
-  ${EndIf}
-
-!macroend
-
-Function SearchLaTeX
-
-  # Search where MikTeX is installed
+  # test if Inkscape is installed
+  ReadRegStr $SVGPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Inkscape" "InstallLocation"
   
-  !insertmacro SEARCH_MIKTEX25
-
-  ${IfNot} ${FileExists} "$PathLaTeX\${BIN_LATEX}"
-    StrCpy $PathLateX ""
-  ${EndIf}
+  # test if metafile2eps is installed
+  ReadRegStr $WMFPath HKLM "Software\Microsoft\Windows NT\CurrentVersion\Print\Printers\Metafile to EPS Converter" "Name"
 
 FunctionEnd
 
-#--------------------------------
-# JabRef
-
-Function SearchBibTeXEditor
-
-  # Search where JabRef is installed
-  ReadRegStr $PathBibTeXEditor HKCU "Software\JabRef" "Path"
-
-  ${IfNot} ${FileExists} "$PathBibTeXEditor\${BIN_BIBTEXEDITOR}"
-    ReadRegStr $PathBibTeXEditor HKLM "Software\JabRef" "Path"
-  ${EndIf}
-
-  ${IfNot} ${FileExists} "$PathBibTeXEditor\${BIN_BIBTEXEDITOR}"
-    StrCpy $PathBibTeXEditor ""  
-  ${EndIf}
+# ---------------------------------------
+
+Function EditorCheck
+  # test if an editor with syntax-highlighting for LaTeX-files is installed
+
+  # (check for jEdit, PSPad, WinShell, ConTEXT, Crimson Editor, Vim, TeXnicCenter, LaTeXEditor, WinEdt, LEd, WinTeX)
+  StrCpy $EditorPath ""
+  StrCpy $0 ""
+  # check for jEdit
+  ReadRegStr $EditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jEdit_is1" "InstallLocation"
+  ${if} $EditorPath != ""
+   StrCpy $EditorPath $EditorPath -1 # remove "\" from the end of the string
+  ${endif}
+  # check for PSPad
+  StrCpy $0 ""
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PSPad editor_is1" "InstallLocation"
+  ${if} $0 != ""
+   StrCpy $0 $0 -1
+   StrCpy $EditorPath "$EditorPath;$0"
+  ${endif}
+  # check for WinShell
+  StrCpy $0 ""
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinShell_is1" "InstallLocation"
+  ${if} $0 != ""
+   StrCpy $0 $0 -1
+   StrCpy $EditorPath "$EditorPath;$0"
+  ${endif}
+  # check for ConTEXT
+  StrCpy $0 ""
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ConTEXTEditor_is1" "InstallLocation"
+  ${if} $0 != ""
+   StrCpy $0 $0 -1
+   StrCpy $EditorPath "$EditorPath;$0"
+  ${endif}
+  # check for Crimson Editor
+  StrCpy $0 ""
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Crimson Editor" "UninstallString"
+  ${if} $0 != ""
+   StrCpy $0 $0 -14 # remove "\uninstall.exe"
+   StrCpy $EditorPath "$EditorPath;$0"
+  ${endif}
+  # check for Vim 6.x
+  StrCpy $0 ""
+  ReadRegStr $0 HKLM "Software\Classes\Applications\gvim.exe\shell\edit\command" ""
+  ${if} $0 != ""
+   StrCpy $0 $0 -13 # remove "gvim.exe "%1""
+   StrCpy $EditorPath "$EditorPath;$0"
+  ${endif}
+  # check for Vim 7.0
+  StrCpy $0 ""
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.0" "UninstallString"
+  ${if} $0 != ""
+   StrCpy $0 $0 -18 # remove "\uninstall-gui.exe"
+   StrCpy $EditorPath "$EditorPath;$0"
+  ${endif}
+  # check for TeXnicCenter
+  StrCpy $0 ""
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXnicCenter_is1" "Inno Setup: App Path"
+  ${if} $0 != ""
+   StrCpy $EditorPath "$EditorPath;$0"
+  ${endif}
+  # check for LaTeXEditor
+  StrCpy $0 ""
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LaTeX Editor" "InstallLocation"
+  ${if} $0 != ""
+   StrCpy $EditorPath "$EditorPath;$0"
+  ${endif}
+  # check for WinEdt
+  StrCpy $0 ""
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinEdt_is1" "InstallLocation"
+  ${if} $0 != ""
+   StrCpy $0 $0 -1
+   StrCpy $EditorPath "$EditorPath;$0"
+  ${endif}
+  # check for LEd
+  StrCpy $0 ""
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LEd_is1" "InstallLocation"
+  ${if} $0 != ""
+   StrCpy $0 $0 -1
+   StrCpy $EditorPath "$EditorPath;$0"
+  ${endif}
+  # check for WinTeX
+  StrCpy $0 ""
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinTeX XP" "DisplayIcon"
+  ${if} $0 != ""
+   StrCpy $0 $0 -11 # remove "\wintex.exe"
+   StrCpy $EditorPath "$EditorPath;$0"
+  ${endif}
 
 FunctionEnd
diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh
index ef8b09d83f..0f2d45ae59 100644
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -81,14 +81,17 @@ Lists of files to include in the installer
 !macroend
 
 !macro FileListFonts COMMAND DIRECTORY
+# FIXME: simply copy the whole directory!
 
   ${FILE}cmex10.ttf"
   ${FILE}cmmi10.ttf"
   ${FILE}cmr10.ttf"
   ${FILE}cmsy10.ttf"
+  ${FILE}esint10.ttf"
   ${FILE}eufm10.ttf"
   ${FILE}msam10.ttf"
   ${FILE}msbm10.ttf"
+  ${FILE}rsfs10.ttf"
   ${FILE}wasy10.ttf"
   
 !macroend
@@ -102,6 +105,8 @@ Lists of files to include in the installer
 
 !macro FileListImageMagick COMMAND DIRECTORY
 
+# FIXME: simply copy the whole directory!
+
   ${FILE}coder.xml"
   ${FILE}colors.xml"
   ${FILE}configure.xml"
@@ -124,6 +129,8 @@ Lists of files to include in the installer
 
 !macro FileListGhostscript COMMAND DIRECTORY
 
+# FIXME: simply copy the whole directory!
+
   ${FILE}gswin32.exe"
   ${FILE}gswin32c.exe"
   ${FILE}gsdll32.dll"
diff --git a/development/Win32/packaging/installer/include/gui.nsh b/development/Win32/packaging/installer/include/gui.nsh
index 5e8bee874b..7f099d0bb7 100644
--- a/development/Win32/packaging/installer/include/gui.nsh
+++ b/development/Win32/packaging/installer/include/gui.nsh
@@ -30,30 +30,48 @@ BrandingText " "
 
 # Installer
 
+# Welcome page
 !define MUI_WELCOMEPAGE_TEXT $(TEXT_WELCOME)
 !insertmacro MUI_PAGE_WELCOME
+# Show the license.
 !insertmacro MUI_PAGE_LICENSE "${FILES_LICENSE}"
+
 !insertmacro MULTIUSER_PAGE_INSTALLMODE
 
 Page custom PageReinstall PageReinstallValidate
-Page custom PageExternalLaTeX PageExternalLaTeXValidate
+#Page custom PageExternalLaTeX PageExternalLaTeXValidate
 
+# Specify the installation directory.
 !insertmacro MUI_PAGE_DIRECTORY
+
+# Define which components to install.
+!insertmacro MUI_PAGE_COMPONENTS
+
+# Specify where to install program shortcuts.
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "LyX ${APP_SERIES_NAME}"
+!insertmacro MUI_PAGE_STARTMENU ${APP_NAME} $StartmenuFolder
+
+# Select latex.exe manually
+Page custom LatexFolder LatexFolder_LeaveFunction
+
+# Watch the components being installed.
 !insertmacro MUI_PAGE_INSTFILES
 
 # The option to run LyX from the finish page is currently disabled because
 # it may run with Administrator priviledges, therefore causing a different
 # user directory to be used. This could be fixed by creating a separate
 # process without UAC elevation.
+# !define MUI_FINISHPAGE_RUN_TEXT "$(FinishPageRun)"
 # !define MUI_FINISHPAGE_RUN "$INSTDIR\${APP_RUN}"
 
 !define MUI_FINISHPAGE_SHOWREADME
 !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-!define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateDesktopShortcut
-!define MUI_FINISHPAGE_SHOWREADME_TEXT $(TEXT_FINISH_DESKTOP)
+!define MUI_FINISHPAGE_SHOWREADME_FUNCTION StartLyX
+!define MUI_FINISHPAGE_SHOWREADME_TEXT $(FinishPageRun)
 !define MUI_FINISHPAGE_LINK $(TEXT_FINISH_WEBSITE)
 !define MUI_FINISHPAGE_LINK_LOCATION "http://www.lyx.org/"
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW CheckDesktopShortcut
+#!define MUI_PAGE_CUSTOMFUNCTION_SHOW CheckDesktopShortcut
 !insertmacro MUI_PAGE_FINISH
 
 # Uninstaller
@@ -68,17 +86,7 @@ Page custom PageExternalLaTeX PageExternalLaTeXValidate
 #--------------------------------
 # Installer Languages
 
-!macro LANG LANG_NAME
-  # NSIS language file
-  !insertmacro MUI_LANGUAGE "${LANG_NAME}"
-  # LyX language file
-  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "lang\${LANG_NAME}.nsh" "lang\English.nsh"
-!macroend
-
-!insertmacro LANG "english"
-!insertmacro LANG "french"
-!insertmacro LANG "german"
-!insertmacro LANG "italian"
+!include lang\TranslatedLanguages.nsh
 
 #--------------------------------
 # Version information
@@ -88,3 +96,4 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APP_NAME}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${APP_INFO}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "${APP_COPYRIGHT}"
+
diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh
index a2c2292aa2..8f29c4dfc4 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -26,9 +26,34 @@ Function .onInit
     MessageBox MB_OK|MB_ICONSTOP "${APP_NAME} ${APP_VERSION} requires Windows XP or later."
     Quit
   ${EndIf}
+  
+  # check that the installer is not currently running
+  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${BundleExeFile}.Instance") i .r1 ?e'
+  Pop $R0
+  ${if} $R0 != "0"
+   MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)"
+   Abort
+  ${endif}
+  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${ExeFile}.Instance") i .r1 ?e'
+  Pop $R0
+  ${if} $R0 != "0"
+   MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)"
+   Abort
+  ${endif}
+
+  # check if LyX is already installed
+  ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "Publisher"
+  ${if} $0 != ""
+   MessageBox MB_OK|MB_ICONSTOP "$(StillInstalled)"
+   Abort
+  ${endif}
 
   !insertmacro PRINTER_INIT
   !insertmacro MULTIUSER_INIT
+  
+  # this can be reset to "true" in section SecDesktop
+  StrCpy $CreateDesktopIcon "false"
+  StrCpy $CreateFileAssociations "false"
  
   ${IfNot} ${Silent}
   
@@ -46,7 +71,15 @@ Function .onInit
   ${EndIf}
  
   Call SearchExternal
-  Call InitExternal
+  #Call InitExternal
+  
+  # don't let the installer sections appear when the programs are already installed
+  ${if} $PSVPath != ""
+   SectionSetText 3 "" # hides the corresponding uninstaller section, ${SecInstGSview}
+  ${endif}
+  ${if} $PathBibTeXEditor != ""
+   SectionSetText 4 "" # hides the corresponding uninstaller section, ${SecInstJabRef}
+  ${endif}
 
   ${IfNot} ${Silent}
     Banner::destroy
@@ -54,11 +87,71 @@ Function .onInit
 
 FunctionEnd
 
+# this function is called at first after starting the uninstaller
 Function un.onInit
 
   !insertmacro PRINTER_INIT
   !insertmacro MULTIUSER_UNINIT
 
+  # Check that LyX is not currently running
+  FindProcDLL::FindProc "lyx.exe"
+  ${if} $R0 == "1"
+   MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)"
+   Abort
+  ${endif}
+
+  # set registry root key
+  ${if} $MultiUser.Privileges == "Admin"
+  ${orif} $MultiUser.Privileges == "Power"
+    SetShellVarContext all
+  ${else}
+   SetShellVarContext current
+  ${endif}
+
+  # Ascertain whether the user has sufficient privileges to uninstall.
+  # abort when LyX was installed with admin permissions but the user doesn't have administrator privileges
+  ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "DisplayVersion"
+  ${if} $0 != ""
+  ${andif} $MultiUser.Privileges != "Admin"
+  ${andif} $MultiUser.Privileges != "Power"
+   MessageBox MB_OK|MB_ICONSTOP "$(UnNotAdminLabel)"
+   Abort
+  ${endif}
+  # abort when LyX couldn't be found in the registry
+  ${if} $0 == "" # check in HKCU
+   ReadRegStr $0 HKCU "${APP_UNINST_KEY}" "DisplayVersion"
+   ${if} $0 == ""
+     MessageBox MB_OK|MB_ICONEXCLAMATION "$(UnNotInRegistryLabel)"
+   ${endif}
+  ${endif}
+  
+  # Macro to investigate name of LyX's preferences folders to be able remove them
+  !insertmacro UnAppPreSuff $AppPre $AppSuff # macro from LyXUtils.nsh
+
+  # test if MiKTeX was installed together with LyX
+  ReadRegStr $0 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX"
+  ${if} $0 == "Yes${APP_SERIES_KEY}"
+   SectionSetText 2 "MiKTeX" # names the corersponding uninstaller section
+   StrCpy $LaTeXInstalled "MiKTeX"
+   DeleteRegValue HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX"
+  ${else}
+   SectionSetText 2 "" # hides the corresponding uninstaller section
+  ${endif}
+
+  # test if JabRef was installed together with LyX
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX"
+  ${if} $0 == "Yes${APP_SERIES_KEY}"
+   SectionSetText 3 "JabRef" # names the corersponding uninstaller section
+   StrCpy $JabRefInstalled "Yes"
+   DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX"
+  ${else}
+   SectionSetText 3 "" # hides the corresponding uninstaller section
+  ${endif}
+
+  # question message if the user really wants to uninstall LyX
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "$(UnReallyRemoveLabel)" IDYES +2 # continue if yes
+  Abort
+
 FunctionEnd
 
 #--------------------------------
@@ -67,7 +160,7 @@ FunctionEnd
 Var ComponentPath
 Var LyXLangName
 
-# COMPONENT can be LaTeX ImageMagick and Ghostscript
+# COMPONENT can be LaTeX, ImageMagick and Ghostscript
 !macro EXTERNAL_INIT COMPONENT
 
   # APP_REGKEY_SETUP = "Software\${APP_NAME}${APP_SERIES_KEY}\Setup"
@@ -97,3 +190,37 @@ Function InitUser
   ${EndIf}
   
 FunctionEnd
+
+#--------------------------------
+# visible installer sections
+
+Section "!${APP_NAME}" SecCore
+  SectionIn RO
+SectionEnd
+Section "$(SecFileAssocTitle)" SecFileAssoc
+  StrCpy $CreateFileAssociations "true"
+SectionEnd
+Section /o "$(SecDesktopTitle)" SecDesktop
+  StrCpy $CreateDesktopIcon "true"
+SectionEnd
+
+!if ${SETUPTYPE} == BUNDLE
+ Section /o "$(SecInstGSviewTitle)" SecInstGSview
+  AddSize 4000
+  StrCpy $InstallGSview "true"
+ SectionEnd
+ Section /o "$(SecInstJabRefTitle)" SecInstJabRef
+  AddSize 5000
+  StrCpy $InstallJabRef "true"
+ SectionEnd
+!endif
+
+# Section descriptions
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+!insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "$(SecCoreDescription)"
+!insertmacro MUI_DESCRIPTION_TEXT ${SecFileAssoc} "$(SecFileAssocDescription)"
+!insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} "$(SecDesktopDescription)"
+!insertmacro MUI_DESCRIPTION_TEXT ${SecInstGSview} "$(SecInstGSviewDescription)"
+!insertmacro MUI_DESCRIPTION_TEXT ${SecInstJabRef} "$(SecInstJabRefDescription)"
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
diff --git a/development/Win32/packaging/installer/include/nsis.nsh b/development/Win32/packaging/installer/include/nsis.nsh
index b8dffd2d38..aa60983245 100644
--- a/development/Win32/packaging/installer/include/nsis.nsh
+++ b/development/Win32/packaging/installer/include/nsis.nsh
@@ -34,6 +34,16 @@ Configuration of standard NSIS header files
 !include LangFile.nsh
 !include MultiUser.nsh
 !include nsDialogs.nsh
+!include InstallOptions.nsh
+
+# Set of various macros and functions
+!include include\LyXUtils.nsh
+
+# Functions to check and configure the LaTeX-system
+!include include\LaTeX.nsh
+
+# Function for page to manually select LaTeX's installation folder
+!include gui\LaTeXFolder.nsh
 
 #--------------------------------
 # Include standard functions
diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh
index e33b1da8de..24e6d6e8ec 100644
--- a/development/Win32/packaging/installer/include/variables.nsh
+++ b/development/Win32/packaging/installer/include/variables.nsh
@@ -13,6 +13,37 @@ Var PathBibTeXEditor
 Var SetupLaTeX
 Var SizeLaTeX
 
+Var Acrobat
+Var APPDATemp
+Var AppPre
+var AppSubfolder
+Var AppSuff
+Var CreateDesktopIcon
+Var CreateFileAssociations
+Var DelPythonFiles
+Var EditorPath
+Var GhostscriptPath
+Var ImageEditorPath
+Var InstallGSview
+Var InstallJabRef
+Var JabRefInstalled
+Var LaTeXName
+Var LaTeXInstalled
+Var MiKTeXUser
+Var MiKTeXVersion
+Var MissedProg
+Var Pointer
+Var PSVPath
+Var PythonPath
+Var Search
+Var SVGPath
+Var StartmenuFolder
+Var State
+Var String
+Var UpdateFNDBReturn
+Var UserList
+Var WMFPath
+
 Var LangName
 
 Var PrinterConf
diff --git a/development/Win32/packaging/installer/lang/Encodings.txt b/development/Win32/packaging/installer/lang/Encodings.txt
new file mode 100644
index 0000000000..0838f6df13
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/Encodings.txt
@@ -0,0 +1,9 @@
+Needed codepages:
+
+turkish.nsh: ISO-8859-9
+czech.nsh, hungarian.nsh, slovak.nsh, polish.nsh, romanian.nsh: Windows cp-1250
+japanese.nsh: Shift_JIS
+ukrainian.nsh: Windows cp-1251
+arabic.nsh: Windows cp-1256
+
+all other files are in Windows cp-1252
\ No newline at end of file
diff --git a/development/Win32/packaging/installer/lang/TranslatedLanguages.nsh b/development/Win32/packaging/installer/lang/TranslatedLanguages.nsh
new file mode 100644
index 0000000000..4ffdb3994b
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/TranslatedLanguages.nsh
@@ -0,0 +1,31 @@
+!macro LANG LANG_NAME
+  # NSIS language file
+  !insertmacro MUI_LANGUAGE "${LANG_NAME}"
+  # LyX language file
+  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "lang\${LANG_NAME}.nsh" "lang\English.nsh"
+!macroend
+
+# list of all languages the installers are translated to
+!insertmacro LANG "english" # first language is the default
+!insertmacro LANG "arabic"
+!insertmacro LANG "catalan"
+!insertmacro LANG "czech"
+!insertmacro LANG "danish"
+!insertmacro LANG "dutch"
+!insertmacro LANG "french"
+!insertmacro LANG "german"
+!insertmacro LANG "galician"
+!insertmacro LANG "hungarian"
+!insertmacro LANG "indonesian"
+!insertmacro LANG "italian"
+!insertmacro LANG "japanese"
+!insertmacro LANG "norwegian"
+!insertmacro LANG "polish"
+!insertmacro LANG "portuguese"
+!insertmacro LANG "romanian"
+!insertmacro LANG "slovak"
+!insertmacro LANG "spanish"
+!insertmacro LANG "swedish"
+!insertmacro LANG "turkish"
+!insertmacro LANG "ukrainian"
+
diff --git a/development/Win32/packaging/installer/lang/arabic.nsh b/development/Win32/packaging/installer/lang/arabic.nsh
new file mode 100644
index 0000000000..1e8b5833ec
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/arabic.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Arabic"
+
+${LangFileString} WelcomePageText "ÓÊâèÏã ÇäÈÑæÇåÌ ÎäÇä ÙåäêÉ ÊÑãêÈ ÈÑæÇåÌ äêã ÈêÓÑ èÓçèäÉ.$\r$\n\
+					  $\r$\n\
+					  èäÇ ÊæÓ Çæ Êãèæ ÈÕäÇÍêÉ ÇäåÏêÑ ÇËæÇÁ ÙåäêÉ ÇäÊÑãêÈ.$\r$\n\
+					  $\r$\n\
+					  ãåÇ êÍÓæ Èã ÇÚäÇâ ÌåêÙ ÇäÈÑÇåÌ ÇäÙÇåäÉ âÈä ÇäÈÏÁ ÈÊÑãêÈ ÇäÈÑæÇåÌ èÐäã äãê êÊå ÊÍÏêË åäáÇÊ ÇäæØÇå Ïèæ ÇäÍÇÌÉ äÅÙÇÏÉ ÊÔÚêä ÇäÍÇÓèÈ.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "åÓÊæÏ-äêã"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "ÊÑãêÈ äãä ÇäåÓÊÎÏåêæ¿"
+${LangFileString} SecFileAssocTitle "åäáÇÊ åÑÊÈ×É"
+${LangFileString} SecDesktopTitle "ÑåÒ Ó×Í ÇäåãÊÈ"
+
+${LangFileString} SecCoreDescription "åäáÇÊ äêã."
+${LangFileString} SecInstGSviewDescription "ÈÑæÇåÌ äÙÑÖ ÈèÓÊãÑÈÊ èåÓÊæÏÇÊ PDF."
+${LangFileString} SecInstJabRefDescription "åÏêÑ èÍÑÑ ÇäÈäèÚÑÇáêÇ ÇäÎÇÕÉ ÈåäáÇÊ BibTeX."
+${LangFileString} SecAllUsersDescription "ÊÑãêÈ ÈÑæÇåÌ äêã äãä ÇäåÓÊÎÏåêæ Ãå ääåÓÊÎÏå ÇäÍÇäê áâ×."
+${LangFileString} SecFileAssocDescription "ÇäåäáÇÊ ÐÇÊ ÇäÇåÊÏÇÏ .lyx ÓêÊå áÊÍçÇ ÊäâÇÆêÇë ÈÈÑæÇåÌ äêã."
+${LangFileString} SecDesktopDescription "ÑåÒ äêã Ùäé Ó×Í ÇäåãÊÈ."
+
+${LangFileString} LangSelectHeader "ÊÍÏêÏ äÚÉ âèÇÆå äêã"
+${LangFileString} AvailableLang " ÇääÚÇÊ ÇäåÊÇÍÉ "
+
+${LangFileString} EnterLaTeXHeader1 'ÊèÒêÙÉ-äÊêã'
+${LangFileString} EnterLaTeXHeader2 'ÇÌÙä ÊèÒêÙÉ-äÊêã ÇäÊèÒêÙÉ ÇäåÓÊÎÏå áê äêã.'
+${LangFileString} EnterLaTeXFolder 'êåãæã çæÇ ÇÎÊêÇÑ ÇäåÓÇÑ ääåäá  $\"latex.exe$\" èÍÏÏ äÐäã  \
+					   ÊèÒêÙÉ-äÊêã ÇäÐê êÌÈ ÇÓÊÎÏÇåç áê äêã.$\r$\n\
+					   ÇÐÇ ãæÊ äÇ ÊÓÊÎÏå äÊêã áÇæ äêã äÇ êÓÊ×êÙ ÇÎÑÇÌ ÇäåÓÊæÏÇÊ!$\r$\n\
+					   $\r$\n\
+					   Êå ÇäÙËèÑ Ùäé ÊèÒêÙÉ-äÊêã \
+					   $\"$LaTeXName$\" áê æØÇåã èÊÌÏ åÓÇÑç áê ÇäÇÓáä.'
+${LangFileString} EnterLaTeXFolderNone 'áêåÇ äê åÓÇÑ Çäåäá  $\"latex.exe$\". èÍÏÏ äÐäã \
+					       ÊèÒêÙÉ-äÊêã ÇäÐê êÌÈ ÇÓÊÎÏÇåç áê äêã.$\r$\n\
+					       ÇÐÇ ãæÊ äÇ ÊÓÊÎÏå äÊêã áÅæ äêã äÇ êÓÊ×êÙ ÇÎÑÇÌ ÇäåÓÊæÏÇÊ!$\r$\n\
+					       $\r$\n\
+					       äå êÊå ÇäÙËèÑ Ùäé ÊèÒêÙÉ-äÊêã áê æØÇåã.'
+${LangFileString} PathName 'åÓÇÑ Çäåäá  $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "äÇ ÊÓÊÎÏå äÊêã"
+${LangFileString} InvalidLaTeXFolder 'Çäåäá $\"latex.exe$\" äêÓÊ áê ÇäåÓÇÑ ÇäåÍÏÏ.'
+
+${LangFileString} LatexInfo 'ÓêÊå ÇäÈÏÁ ÈÊÑãêÈ ÊèÒêÙÉ-äÊêã ÈÈÑæÇåÌ $\"MiKTeX$\".$\r$\n\
+			            ÇæâÑ Ùäé ÒÑ ÇäÊÇäê ääÅÓÊåÑÇÑ áê ÙåäêÉ ÇäÊÑãêÈ.$\r$\n\
+				    $\r$\n\
+				    !!! áÖäÇë ÇÓÊÎÏå ÌåêÙ ÇäÎêÇÑÇÊ ÇäÇáÊÑÇÖêÉ ÙæÏ ÊÑãêÈ MiKTeX !!!'
+${LangFileString} LatexError1 'äå êÊå ÇäÙËèÑ Ùäé ÊèÒêÙÉ-äÊêã!$\r$\n\
+                      		      äÇ êåãæ ÇÓÊÎÏÇå äêã ÈÏèæ ÊèÒêÙÉ äÊêã åËä MiKTeX!$\r$\n\
+				      ÓêÊå ÇÌçÇÖ ÇäÊÑãêÈ.'
+			    
+${LangFileString} GSviewInfo 'äå êÊå ÊÑãêÈ ÈÑæÇåÌ GSview.$\r$\n\
+			             äÊÑãêÈ ÇäÈÑæÇåÌ ÇæâÑ Ùäé ÒÑ ÊÑãêÈ áê ÇäæÇáÐÉ ÇäÇèäé ÇËæÇÁ ÙåäêÉ ÇäÊÑãêÈ,$\r$\n\
+				     ÇÎÊÑ ÇääÚÉ Ëå ÇæâÑ ÇäÊÇäê áê ÇäæÇáÐÉ ÇäÊÇäêÉ.$\r$\n\
+				     ÊÓÊ×êÙ ÇÎÊêÇÑ ãä ÇäÎêÇÑÇÊ ÇËæÇÁ ÊÑãêÈ ÈÑæÇåÌ GSview.'
+${LangFileString} GSviewError 'äå êæÌÍ ÊÑãêÈ ÈÑæÇåÌ GSview!$\r$\n\
+		                    ÓÊÓÊåÑ ÙåäêÉ ÇäÊÑãêÈ.$\r$\n\
+				      ÍÇèä ÊÑãêÈ ÈÑæÇåÌ GSview äÇÍâÇë.'
+				      
+${LangFileString} JabRefInfo 'ÓêÊå ÇäÂæ ÊÑãêÈ ÈÑæÇåÌ JabRef.$\r$\n\
+				     ÊÓÊ×êÙ ÇÎÊêÇÑ ãä ÇäÎêÇÑÇÊ ÇËæÇÁ ÊÑãêÈ ÈÑæÇåÌ JabRef.'
+${LangFileString} JabRefError 'äå êæÌÍ ÊÑãêÈ ÈÑæÇåÌ JabRef!$\r$\n\
+		                      ÓÊÓÊåÑ ÙåäêÉ ÇäÊÑãêÈ.$\r$\n\
+				      ÍÇèä ÊÑãêÈ JabRef äÇÍâÇë.'
+				      
+${LangFileString} LatexConfigInfo "ÇäÙåäêÉ ÇäÊÇäêÉ ÓÊÓÊÚÑâ ÈÙÖ ÇäèâÊ."
+
+${LangFileString} MiKTeXPathInfo "äãê êãèæ ãä åÓÊÎÏå âÇÏÑÇ Ùäé ÊÎÕêÕ miktex äÇÍâÇë ÍÓÈ ÇÍÊêÇÌÇÊç $\r$\n\
+					 åæ ÇäÖÑèÑê ãÊÇÈÉ ÕäÇÍêÇÊ ÇäåÓÊÎÏåêæ áê åÌäÏ ÊÑãêÈ MiKTeX$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 èáê ÇäåÌäÏÇÊ ÇäáÑÙêÉ."
+${LangFileString} MiKTeXInfo 'ÊèÒêÙÉ-äÊêã MiKTeX ÊÓÊÎÏå ÇêÖÇë åæ âÈä äêã.$\r$\n\
+				     èåæ ÇäåèÕé Èç äÊËÈêÊ ÇäÊÍÏêËÇÊ ÇäåÊÇÍÉ äà miktex - ÅÓÊÎÏÇå ÈÑæÇåÌ $\"åÙÇäÌ ÊÍÏêË miktex$\"$\r$\n\
+				     âÈä ÇÓÊÎÏÇå äêã äÃèä åÑÉ.$\r$\n\
+				     çä ÊÑÚÈ ÈÇäÊÍââ åæ ÇäÊÍÏêËÇÊ ÇäÂæ¿'
+
+${LangFileString} UpdateNotAllowed "çÐÇ ÇäÊÍÏêË ÎÇÕ áâ× Èà ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Could not set 'path_prefix' in the configure script"
+${LangFileString} CreateCmdFilesFailed "ÊÙÐÑ ÇæÔÇÁ lyx.bat"
+${LangFileString} RunConfigureFailed "äÇ êåãæ ÊæáêÐ Çäà configure script"
+${LangFileString} NotAdmin "êÌÈ Ãæ Êãèæ ÈÕäÇÍêÉ ÇäåÏêÑ äãê ääâêÇå ÈÙåäêÉ ÇäÊÑãêÈ!"
+${LangFileString} InstallRunning "Êå ÈÇäáÙä ÇäÈÏÁ ÈÙåäêÉ ÇäÊÑãêÈ!"
+${LangFileString} StillInstalled "Êå ÈÇäáÙä ÊÑãêÈ ÈÑæÇåÌ äêã äÐÇ Ùäêã ÇèäÇë ÇäÚÇÁ ÊÑãêÈ ÇäæÓÎÉÇäÓÇÈâÉ."
+
+${LangFileString} FinishPageMessage "ÊçÇæêæÇ! Êå ÊÑãêÈ äêã ÈæÌÇÍ.$\r$\n\
+					    $\r$\n\
+					    (ÊÔÚêä äêã äÃèä åÑÉ âÏ êÃÎÐ ÙÏÉ ËèÇæê.)"
+${LangFileString} FinishPageRun "ÊÔÚêä äêã"
+
+${LangFileString} UnNotInRegistryLabel "äå êÊå ÇäÙËèÑ Ùäé äêã áê ÇäÑêÌÓÊÑê.$\r$\n\
+					       äå êÊå ÍÐá ÇÎÊÕÇÑÇÊ äêã åæ Ó×Í ÇäåãÊÈ èâÇÆåÉ ÇäÈÑÇåÌ."
+${LangFileString} UnInstallRunning "êÌÈ ÇÚäÇâ äêã ÇèäÇë!"
+${LangFileString} UnNotAdminLabel "êÌÈ Ãæ Êåäã ÕäÇÍêÇÊ ÇäåÏêÑ ääÈÏÁ ÈÙåäêÉ ÇäÍÐá!"
+${LangFileString} UnReallyRemoveLabel "çä ÊÑÚÈ ÈÍÐá ÈÑæÇåÌ äêã ÈÇäãÇåä åÙ ãä ÇäãåÈèææÊ ÇäÎÇÕ Èç¿"
+${LangFileString} UnLyXPreferencesTitle 'LyX$\'s ÊáÖêäÇÊ ÇäåÓÊÎÏå'
+${LangFileString} UnGSview 'áÖäÇë ÇæâÑ Ùäé ÒÑ ÇäÇÒäÉ ääÈÏÁ ÈÙåäêÉ ÇÒÇäÉ äêã$\r$\n\
+				   ÈÑæÇåÌ GSview ÇäÎÇÕ ÈÙÑÖ ÇäÈèÓÊãÑÈÊ èåÓÊæÏÇÊ PDF.'
+${LangFileString} UnRemoveSuccessLabel "Êå ÍÐá ÈÑæÇåÌ äêã ÈæÌÇÍ."
+
+${LangFileString} SecUnMiKTeXDescription "Êå ÇÒÇäÉ ÊèÒÙ- äÊêã MiKTeX."
+${LangFileString} SecUnJabRefDescription "Êå ÇÒÇäÉ åÏêÑ ÇäÈÇÈäèÚÑÇáêÇ JabRef."
+${LangFileString} SecUnPreferencesDescription 'ÍÐá åÌäÏ ÊÔãêä äêã$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   äãä ÇäåÓÊÎÏåêæ.'
+${LangFileString} SecUnProgramFilesDescription "ÇÒÇäÉ äêã èãä ÇäãåÈèææÊ ÇäÎÇÕÉ Èç."
+
diff --git a/development/Win32/packaging/installer/lang/catalan.nsh b/development/Win32/packaging/installer/lang/catalan.nsh
new file mode 100644
index 0000000000..154115b4e8
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/catalan.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Catalan"
+
+${LangFileString} WelcomePageText "Aquest assistent us guiarà en la instal·lació del LyX.$\r$\n\
+					  $\r$\n\
+					  Necessiteu drets d'administrador per instal·lar el LyX.$\r$\n\
+					  $\r$\n\
+					  Abans de començar la instal·lació, és recomenable tancar totes les altres aplicacions. Això permet actualitzar alguns fitxerr del sistema sense haver de reiniciar l'ordinador.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "Document LyX"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Voleu instal·lar-ho per a tots els usuaris?"
+${LangFileString} SecFileAssocTitle "Associació de fitxers"
+${LangFileString} SecDesktopTitle "Icona a l'escriptori"
+
+${LangFileString} SecCoreDescription "Els fitxers del LyX."
+${LangFileString} SecInstGSviewDescription "Programa per visualitzar documents en format Postscript i PDF."
+${LangFileString} SecInstJabRefDescription "Gestor i editor de referències bibliogràfiques per a fitxers BibTeX."
+${LangFileString} SecAllUsersDescription "Instal·la el LyX per a tots els usuaris o només per a l'usuari actual."
+${LangFileString} SecFileAssocDescription "Els fitxers amb extensió .lyx s'obriran automàticament amb el LyX."
+${LangFileString} SecDesktopDescription "Una icona del LyX a l'escriptori."
+
+${LangFileString} LangSelectHeader "Selecció de la llengua de menús del LyX"
+${LangFileString} AvailableLang " Llengües disponibles "
+
+${LangFileString} EnterLaTeXHeader1 'Distribució LaTeX'
+${LangFileString} EnterLaTeXHeader2 'Establiu la distribució LaTeX que ha de fer servir el LyX.'
+${LangFileString} EnterLaTeXFolder 'Opcionalment podeu establir aquí el camí al fitxer $\"latex.exe$\" i posteriorment establir la \
+					   distribució LaTeX que el LyX ha de fer servir.$\r$\n\
+					   Si no useu LaTeX, el LyX no podrà generar documents!$\r$\n\
+					   $\r$\n\
+					   L$\'instal·lador ha detectat la distribució LaTeX \
+					   $\"$LaTeXName$\" al sistema, al camí que es mostra avall.'
+${LangFileString} EnterLaTeXFolderNone 'Indiqueu el camí al fitxer $\"latex.exe$\". Posteriorment establiu \
+					       quina distribució LaTeX ha de fer servir el LyX.$\r$\n\
+					       Si no useu LaTeX, el LyX no podrà generar documents!$\r$\n\
+					       $\r$\n\
+					       L$\'instal·lador no ha trobat cap distribució LaTeX al sistema.'
+${LangFileString} PathName 'Camí al fitxer $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "No usis LaTeX"
+${LangFileString} InvalidLaTeXFolder 'El fitxer $\"latex.exe$\" no es troba al camí indicat.'
+
+${LangFileString} LatexInfo 'Ara s$\'executarà l$\'instal·lador de la distribució LaTeX $\"MiKTeX$\".$\r$\n\
+			            Per instal·lar el programa pitgeu el botó $\"Següent$\" a les finestres de l$\'instal·lador fins que la instal·lació comenci.$\r$\n\
+				    $\r$\n\
+				    Si us plau, useu les opcions predeterminades de l$\'instal·lador MiKTeX !!!'
+${LangFileString} LatexError1 'No s$\'ha trobat cap distribució LaTeX!$\r$\n\
+                      		      No podeu usar el LyX sense cap distribució LaTeX, com ara $\"MiKTeX$\"!$\r$\n\
+				      Es cancel·larà la instal·lació.'
+			    
+${LangFileString} GSviewInfo 'Ara s$\'executarà l$\'instal·lador del programa $\"GSview$\".$\r$\n\
+			             Per instal·lar el programa pitgeu el botó $\"Setup$\" a la primera finestra de l$\'instal·lador,$\r$\n\
+				     seleccioneu la llengua i pitgeu el botó $\"Següent$\" a la finstres següent de l$\'instal·lador.$\r$\n\
+				     Podeu usar totes les opcions predeterminades de l$\'instal·lador del GSview.'
+${LangFileString} GSviewError 'El programa $\"GSview$\" no s$\'ha instal·lat correctament!$\r$\n\
+		                      L$\'instal·lador continuarà igualment.$\r$\n\
+				      Intenteu instal·lar el GSview altre cop més tard.'
+				      
+${LangFileString} JabRefInfo 'Ara s$\'executarà l$\'instal·lador del programa $\"JabRef$\".$\r$\n\
+				     Podeu usar totes les opcions predeterminades de l$\'instal·lador del JabRef.'
+${LangFileString} JabRefError 'El programa $\"JabRef$\" no s$\'ha instal·lat correctament!$\r$\n\
+		                      L$\'instal·lador continuarà igualment.$\r$\n\
+				      Intenteu instal·lar el JabRef altre cop més tard.'
+				      
+${LangFileString} LatexConfigInfo "La configuració següent del LyX pot trigar una mica."
+
+${LangFileString} MiKTeXPathInfo "Per a que cada usuari pugui personalitzar el MiKTeX segons les seves necessitats\r$\n\
+					 és necessari que la carpeta on es troba instal·lat el MiKTeK$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 i a les seves subcarpetes tinguin permissos d'escriptura per a tots els usuaris."
+${LangFileString} MiKTeXInfo 'La distribució LaTeX $\"MiKTeX$\" conjuntament amb el LyX.$\r$\n\
+				     És recomenable instal·lar les actualitzacions MiKTeX fent servir el programa $\"MiKTeX Update Wizard$\"$\r$\n\
+				     abans d$\'executar el LyX per primer cop.$\r$\n\
+				     Voleu comprobar ara si hi ha actualitzacions del MiKTeX?'
+
+${LangFileString} UpdateNotAllowed "Aquest paquet d'actualització només actualitza ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "No es pot establir 'path_prefix' durant el programa de configuració"
+${LangFileString} CreateCmdFilesFailed "No es pot crear el fitxer lyx.bat"
+${LangFileString} RunConfigureFailed "No es pot executar el programa de configuració"
+${LangFileString} NotAdmin "Necessiteu drets d'administrador per instal·lar el LyX!"
+${LangFileString} InstallRunning "L'instal·lador ja s'està executant!"
+${LangFileString} StillInstalled "El LyX ja es troba instal·lat! Desinstal·leu-lo primer."
+
+${LangFileString} FinishPageMessage "Felicitats! Heu instal·lat correctament el LyX.$\r$\n\
+					    $\r$\n\
+					    (La primera execució del LyX pot trigar alguns segons.)"
+${LangFileString} FinishPageRun "Executa el LyX"
+
+${LangFileString} UnNotInRegistryLabel "No es possible trobar el LyX al registre.$\r$\n\
+					       No se suprimiran les dreceres de l'escriptori i del menú inici."
+${LangFileString} UnInstallRunning "Primer heu de tancar el LyX!"
+${LangFileString} UnNotAdminLabel "Necessiteu drets d'administrador per desinstal·lar el LyX!"
+${LangFileString} UnReallyRemoveLabel "Esteu segur de voler suprimir completament el LyX i tots els seus components?"
+${LangFileString} UnLyXPreferencesTitle 'Preferències d$\'usuari del LyX'
+${LangFileString} UnGSview 'Pitgeu el botó $\"Uninstall$\" a la finestra següent per desinstal·lar\r$\n\
+				   el visor de fitxers Postscript i PDF $\"GSview$\".'
+${LangFileString} UnRemoveSuccessLabel "El LyX s'ha desinstal·lat correctament de l'ordinador."
+
+${LangFileString} SecUnMiKTeXDescription "Desintal·la la distribució de LaTeX MiKTeX."
+${LangFileString} SecUnJabRefDescription "Desinstal·la el gestor de bibliografia JabRef."
+${LangFileString} SecUnPreferencesDescription 'Suprimeix les carptes de configuració del LyX$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   de tots els usuaris.'
+${LangFileString} SecUnProgramFilesDescription "Desinstal·la el LyX i tots els seus components."
+
diff --git a/development/Win32/packaging/installer/lang/czech.nsh b/development/Win32/packaging/installer/lang/czech.nsh
new file mode 100644
index 0000000000..f30ea4bb36
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/czech.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Czech"
+
+${LangFileString} WelcomePageText "Tento pomocník vás provede instalací LyXu.$\r$\n\
+					  $\r$\n\
+					  K instalaci LyXu budete potøebovat administrátorská práva.$\r$\n\
+					  $\r$\n\
+					  Je doporuèeno zavøít všechny ostatní aplikace pøed spuštìním instalace. Umožníte tím aktualizovat patøièné systémové soubory bez nutnosti restartovat poèítaè.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "LyX-dokumentù"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Instalovat pro všechny uživatele?"
+${LangFileString} SecFileAssocTitle "Asociovat soubory"
+${LangFileString} SecDesktopTitle "Ikonu na plochu"
+
+${LangFileString} SecCoreDescription "Soubory LyXu."
+${LangFileString} SecInstGSviewDescription "Prohlížeè Postscriptu and PDF-dokumentù."
+${LangFileString} SecInstJabRefDescription "Správce pro bibliografii a editor souborù BibTeXu."
+${LangFileString} SecAllUsersDescription "Instalovat LyX pro všechny uživatele nebo pouze pro souèasného uživatele."
+${LangFileString} SecFileAssocDescription "Soubory s pøíponou .lyx se automaticky otevøou v LyXu."
+${LangFileString} SecDesktopDescription "Ikonu LyXu na plochu."
+
+${LangFileString} LangSelectHeader "Výbìr jazyka prostøedí LyXu"
+${LangFileString} AvailableLang " Dostupné jazyky "
+
+${LangFileString} EnterLaTeXHeader1 'Distribuce LaTeXu'
+${LangFileString} EnterLaTeXHeader2 'Nastavte distribuci LaTeXu, kterou má LyX používat.'
+${LangFileString} EnterLaTeXFolder 'Mùžete zde volitelnì nastavit cestu k souboru $\"latex.exe$\" a tím urèit \
+					   distribuci LaTeXu, kterou bude používat Lyx.$\r$\n\
+					   Pokud nepoužijete LaTeX, LyX nemùže vysázet výsledné dokumenty!$\r$\n\
+					   $\r$\n\
+					   Instalátor nalezl na vašem poèítaèi LaTeXovou distribuci \
+					   $\"$LaTeXName$\". Níže je uvedena její cesta.'
+${LangFileString} EnterLaTeXFolderNone 'Níže nastavte cestu k souboru $\"latex.exe$\". Urèíte tím, která \
+					       distribuce LaTeXu bude používána LyXem.$\r$\n\
+					       Pokud nepoužijete LaTeX, LyX nemùže vysázet výsledné dokumenty!$\r$\n\
+					       $\r$\n\
+					       Instalátor nemohl nalézt distribuci LaTeXu na vašem poèítaèi.'
+${LangFileString} PathName 'Cesta k souboru $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "Nepoužívat LaTeX"
+${LangFileString} InvalidLaTeXFolder 'Soubor $\"latex.exe$\" není v zadané cestì.'
+
+${LangFileString} LatexInfo 'Nyní bude spuštìn instalátor LaTeXové-distribuce $\"MiKTeX$\".$\r$\n\
+			            V instalátoru pokraèujte tlaèítkem $\"Next$\" dokud instalace nezaène.$\r$\n\
+				    $\r$\n\
+				    !!! Užijte všechny pøedvolby instalátoru MiKTeX !!!'
+${LangFileString} LatexError1 'Žádná LaTeXová-distribuce nebyla nalezena!$\r$\n\
+                      		      Nemùžete používat LyX bez distribuce LaTeXu jako je napø. $\"MiKTeX$\"!$\r$\n\
+				      Instalace bude proto pøerušena.'
+			    
+${LangFileString} GSviewInfo 'Nyní bude spuštìn instalátor programu $\"GSview$\".$\r$\n\
+			             K jeho instalaci zmáèknìte nejprve tlaèítko $\"Setup$\" v prvním oknì,$\r$\n\
+				     vyberte jazyk a stisknìtì tlaèítko $\"Next$\" v následujícím oknì.$\r$\n\
+				     Mùžete použít všechny pøedvolby tohoto instalátoru.'
+${LangFileString} GSviewError 'Program $\"GSview$\" nebyl úspìšnì nainstalován!$\r$\n\
+		                      Instalátor bude navzdory tomu pokraèovat.$\r$\n\
+				      Pokuste se nainstalovat GSview pozdìji.'
+				      
+${LangFileString} JabRefInfo 'Nyní bude spuštìn instalátor programu $\"JabRef$\".$\r$\n\
+				     Mùžete použít všechny pøedvolby instalátoru JabRef.'
+${LangFileString} JabRefError 'Program $\"JabRef$\" nebyl úspìšnì nainstalován.$\r$\n\
+		                      Instalátor bude navzdory tomu pokraèovat.$\r$\n\
+				      Pokuste se nainstalovat JabRef pozdìji.'
+				      
+${LangFileString} LatexConfigInfo "Následující konfigurování LyXu chvíli potrvá."
+
+${LangFileString} MiKTeXPathInfo "Aby každý uživatel mohl pozdìji pøizpùsobit MiKTeX pro své potøeby$\r$\n\
+					 je tøeba nastavit práva zápisu pro všechny uživatele do adresáøe MiKTeXu$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 a všech jeho podadresáøù."
+${LangFileString} MiKTeXInfo 'LaTeXová distribuce $\"MiKTeX$\" bude použita dohromady s LyXem.$\r$\n\
+				     Je doporuèeno nainstalovat dostupné aktualizace MiKTeXu pomocí programu $\"MiKTeX Update Wizard$\"$\r$\n\
+				     pøedtím než poprvé spustíte LyX.$\r$\n\
+				     Chcete zkontrolovat dostupné aktualizace MiKTeXu nyní?'
+				     
+${LangFileString} UpdateNotAllowed "Tento aktualizaèní balíèek mùže být použít jen na ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Nelze nastavit 'path_prefix' v konfiguraèním skriptu"
+${LangFileString} CreateCmdFilesFailed "Nelze vytvoøit lyx.bat"
+${LangFileString} RunConfigureFailed "Nelze spustit konfiguraèní skript"
+${LangFileString} NotAdmin "Potøebujete administrátorská práva pro nainstalování LyXu!"
+${LangFileString} InstallRunning "Instalátor je již spuštìn!"
+${LangFileString} StillInstalled "LyX je již nainstalován! Nejprve LyX odinstalujte."
+
+${LangFileString} FinishPageMessage "Blahopøejeme! LyX byl úspìšnì nainstalován.$\r$\n\
+					    $\r$\n\
+					    (První spuštìní LyXu mùže trvat delší dobu.)"
+${LangFileString} FinishPageRun "Spustit LyX"
+
+${LangFileString} UnNotInRegistryLabel "Nelze nalézt LyX v registrech.$\r$\n\
+					       Zástupce na ploše a ve Start menu nebude smazán."
+${LangFileString} UnInstallRunning "Nejprve musíte zavøít LyX!"
+${LangFileString} UnNotAdminLabel "Musíte mít administrátorská práva pro odinstalování LyXu!"
+${LangFileString} UnReallyRemoveLabel "Chcete opravdu smazat LyX a všechny jeho komponenty?"
+${LangFileString} UnLyXPreferencesTitle 'Uživatelská nastavení LyXu'
+${LangFileString} UnGSview 'Zvolte tlaèítko $\"Uninstall$\" v dalším oknì pro odinstalování$\r$\n\
+				   prohlížeèe $\"GSview$\".'
+${LangFileString} UnRemoveSuccessLabel "LyX byl úspìšnì odstranìn z vašeho poèítaèe."
+
+${LangFileString} SecUnMiKTeXDescription "Odinstalovat LaTeXovou-distribuci MiKTeX."
+${LangFileString} SecUnJabRefDescription "Odinstalovat manažer bibliografie JabRef."
+${LangFileString} SecUnPreferencesDescription 'Smazat konfiguraèní adresáø LyXu$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   pro všechny uživatele.'
+${LangFileString} SecUnProgramFilesDescription "Odinstalovat LyX a všechny jeho komponenty."
+
diff --git a/development/Win32/packaging/installer/lang/danish.nsh b/development/Win32/packaging/installer/lang/danish.nsh
new file mode 100644
index 0000000000..7696594588
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/danish.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Danish"
+
+${LangFileString} WelcomePageText "Denne guide vil installere LyX på din computer.$\r$\n\
+                                        $\r$\n\
+                                        Du skal have administratorrettigheder for at installerer LyX.$\r$\n\
+                                        $\r$\n\
+                                        Det anbefales at du lukker alle kørende programmer inden start af setup-guiden. Dette vil tillade guiden at opdatere de nødvendiget systemfiler uden at skulle genstarte computeren.$\r$\n\
+                                        $\r$\n\
+                                        $_CLICK"
+
+${LangFileString} FileTypeTitle "LyX-Dokument"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Installer til alle brugere?"
+${LangFileString} SecFileAssocTitle "Fil-associationer"
+${LangFileString} SecDesktopTitle "Skrivebordsikon"
+
+${LangFileString} SecCoreDescription "Filerne til LyX."
+${LangFileString} SecInstGSviewDescription "Program til gennemsyn af Postscript- og PDF-dokumenter."
+${LangFileString} SecInstJabRefDescription "Bibliography reference manager and editor for BibTeX files."
+${LangFileString} SecAllUsersDescription "Installer LyX til alle brugere, eller kun den aktuelle bruger."
+${LangFileString} SecFileAssocDescription "Opret association mellem LyX og .lyx filer."
+${LangFileString} SecDesktopDescription "Et LyX ikon på skrivebordet"
+
+${LangFileString} LangSelectHeader "Valg af sprog i LyX's menuer"
+${LangFileString} AvailableLang " Tilgængelige Sprog "
+
+${LangFileString} EnterLaTeXHeader1 'LaTeX-distribution'
+${LangFileString} EnterLaTeXHeader2 'Vælg den LaTeX-distribution som LyX skal bruge.'
+${LangFileString} EnterLaTeXFolder 'Du kan her vælge stien til filen $\"latex.exe$\" og derved vælge hvilken \
+                                          LaTeX-distribution som bruges LyX.$\r$\n\
+                                          Hvis du ikke vælger LaTeX, kan LyX ikke generere dokumenter!$\r$\n\
+                                          $\r$\n\
+                                          Installationsprogrammet har detekteret LaTeX-distributionen \
+                                          $\"$LaTeXName$\" på din computer i nedenstående sti:'
+${LangFileString} EnterLaTeXFolderNone 'Vælg nedenfor stien til filen $\"latex.exe$\". Herved kan du vælge hvilken \
+                                              LaTeX-distribution LyX skal bruge.$\r$\n\
+                                              Hvis du ikke vælger LaTeX, kan LyX ikke generere dokumenter!$\r$\n\
+                                              $\r$\n\
+                                              Installationsprogrammet kunne ikke finde nogen LaTeX-distribution.'
+${LangFileString} PathName 'Sti til filen $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "Brug ikke LaTeX"
+${LangFileString} InvalidLaTeXFolder 'Kunne ikke finde $\"latex.exe$\".'
+
+${LangFileString} LatexInfo 'Installationen af LaTeX-distributionen $\"MiKTeX$\" startes.$\r$\n\
+                                  For at installere programmet tryk på $\"Next$\"-knappen i installationsvinduet indtil installationen begynder.$\r$\n\
+                                  $\r$\n\
+                                  !!! Brug alle MiKTeX installationsprogrammets foreslåde valg !!!'
+${LangFileString} LatexError1 'Ingen LaTeX-distribution fundet!$\r$\n\
+                                    LyX kan ikke bruges uden en LaTeX-distribution sasom $\"MiKTeX$\"!$\r$\n\
+                                    Installationen afbrydes.'
+
+${LangFileString} GSviewInfo 'Installationen af programmet $\"GSview$\" startes.$\r$\n\
+                                   For at installere programmet tryk på $\"Setup$\"-knappen i det forste installationsvindue$\r$\n\
+                                   vælg sprog og tryk på $\"Next$\"-knappen i det efterfolgende installationsvindue.$\r$\n\
+                                   Du kan bruge alle GSview installationsprogrammets foreslåede valg.'
+${LangFileString} GSviewError 'Programmet $\"GSview$\" kunne ikke installeres!$\r$\n\
+                                    Installationen af LyX fortsættes alligevel.$\r$\n\
+                                    Prov at installere GSview på et senere tidspunkt.'
+
+${LangFileString} JabRefInfo 'Installationen af programmet $\"JabRef$\" startes.$\r$\n\
+                                    Du kan roligt bruge alle $\"default$\" valgmuligheder ved JabRef-installationen.'
+${LangFileString} JabRefError 'Programmet $\"JabRef$\" kunne ikke installeres!$\r$\n\
+                                     Installationen vil dog fortsætte.$\r$\n\
+                                     Prøv at installere JabRef igen senere.'
+
+${LangFileString} LatexConfigInfo "Den følgende konfiguration af LyX vil tage et stykke tid."
+
+${LangFileString} MiKTeXPathInfo "For at alle brugere senere kan konfigurere  MiKTeX$\r$\n\
+                                        er det nødvendigt at give skriverettigheder for alle MiKTeX brugere i installations mappen$\r$\n\
+                                        $MiKTeXPath $\r$\n\
+                                        og dennes undermapper."
+${LangFileString} MiKTeXInfo 'LaTeX-distributionen $\"MiKTeX$\" vil blive brugt sammen med LyX.$\r$\n\
+                                    Det anbefales at installere tilgængelige MiKTeX-opdateringer ved hjælp af programmet $\"MiKTeX Update Wizard$\"$\r$\n\
+                                    før LyX startes for første gang.$\r$\n\
+                                    Vil du tjekke om der findes MiKTeX opdateringer?'
+
+${LangFileString} UpdateNotAllowed "This update package can only update ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Forsoget på at indstille 'path_prefix' i konfigurationen mislykkedes"
+${LangFileString} CreateCmdFilesFailed "Kunne ikke oprette lyx.bat"
+${LangFileString} RunConfigureFailed "Mislykket forsog på at afvikle konfigurations-scriptet"
+${LangFileString} NotAdmin "Du skal have administrator-rettigheder for at installere LyX!"
+${LangFileString} InstallRunning "Installationsprogrammet kører allerede!"
+${LangFileString} StillInstalled "LyX er allerede installeret! Afinstaller LyX først."
+
+${LangFileString} FinishPageMessage "Tillykke!! LyX er installeret.$\r$\n\
+                                          $\r$\n\
+                                          (Når LyX startes første gang, kan det tage noget tid.)"
+${LangFileString} FinishPageRun "Start LyX"
+
+${LangFileString} UnNotInRegistryLabel "Kunne ikke finde LyX i registreringsdatabsen.$\r$\n\
+                                             Genvejene på skrivebordet og i Start-menuen bliver ikke fjernet"
+${LangFileString} UnInstallRunning "Du ma afslutte LyX forst!"
+${LangFileString} UnNotAdminLabel "Du skal have administrator-rettigheder for at afinstallere LyX!"
+${LangFileString} UnReallyRemoveLabel "Er du sikker på, at du vil slette LyX og alle tilhørende komponenter?"
+${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences'
+${LangFileString} UnGSview 'Vær sa god at trykke på $\"Uninstall$\"-knappen i det næste vindue for at afinstallere$\r$\n\
+                                 Postscript and PDF-programmet $\"GSview$\".'
+${LangFileString} UnRemoveSuccessLabel "LyX er blevet fjernet fra din computer."
+
+${LangFileString} SecUnMiKTeXDescription 'Afinstallerer LaTeX-distributionen $\"MiKTeX$\".'
+${LangFileString} SecUnJabRefDescription 'Afinstallerer bibliografi programmet $\"JabRef$\".'
+${LangFileString} SecUnPreferencesDescription 'Sletter LyX$\'s konfigurations mappe$\r$\n\
+                                          $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                          for alle brugere.'
+${LangFileString} SecUnProgramFilesDescription "Afinstallerer LyX og alle dets komponenter."
+
diff --git a/development/Win32/packaging/installer/lang/dutch.nsh b/development/Win32/packaging/installer/lang/dutch.nsh
new file mode 100644
index 0000000000..43bbc8b5f6
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/dutch.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Dutch"
+
+${LangFileString} WelcomePageText "Dit installatie programma zal LyX op uw systeem installeren.$\r$\n\
+					  $\r$\n\
+					  U heeft systeem-beheerrechten nodig om LyX te installeren.$\r$\n\
+					  $\r$\n\
+					  Het is aanbevolen om alle andere programma's af te sluiten voordat u Setup start. Dit zorgt ervoor dat Setup bepaalde systeembestanden kan bijwerken zonder uw systeem opnieuw op te starten.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "LyX-Document"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Installeer voor alle gebruikers?"
+${LangFileString} SecFileAssocTitle "Bestand associaties"
+${LangFileString} SecDesktopTitle "Bureaublad pictogram"
+
+${LangFileString} SecCoreDescription "De LyX bestanden."
+${LangFileString} SecInstGSviewDescription "Programma dat gebruikt wordt om Postscript en PDF documenten te lezen."
+${LangFileString} SecInstJabRefDescription "Bibliography reference manager and editor for BibTeX files."
+${LangFileString} SecAllUsersDescription "Installeer LyX voor alle gebruikers of uitsluitend de huidige gebruiker?"
+${LangFileString} SecFileAssocDescription "Associeer het LyX programma met de .lyx extensie."
+${LangFileString} SecDesktopDescription "Een LyX pictogram op het Bureaublad."
+
+${LangFileString} LangSelectHeader "Taalselectie voor LyX's menu"
+${LangFileString} AvailableLang " Beschikbare Talen "
+
+${LangFileString} EnterLaTeXHeader1 'LaTeX software'
+${LangFileString} EnterLaTeXHeader2 'Geef aan welke LaTeX-software LyX moet gebruiken.'
+${LangFileString} EnterLaTeXFolder 'U kunt hier opgeven in welke map het programma $\"latex.exe$\" zich bevindt en op deze manier bepalen \
+					   welke LaTeX softare gebruikt wordt door LyX.$\r$\n\
+					   Zonder LaTeX kan LyX geen documenten generen!$\r$\n\
+					   $\r$\n\
+					   Het installatie programma heeft de LaTeX software \
+					   $\"$LaTeXName$\" op uw systeem gevonden in de volgende map.'
+${LangFileString} EnterLaTeXFolderNone 'U kunt hier opgeven in welke map het programma $\"latex.exe$\" zich bevindt en op deze manier bepalen \
+					   welke LaTeX software gebruikt wordt door LyX.$\r$\n\
+					   Zonder LaTeX kan LyX geen documenten generen!$\r$\n\
+					       $\r$\n\
+					       Het installatie programma heeft geen LaTeX software op uw systeem gevonden.'
+${LangFileString} PathName 'Map met het programma $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "Gebruik geen LaTeX"
+${LangFileString} InvalidLaTeXFolder '$\"latex.exe$\" is niet gevonden.'
+
+${LangFileString} LatexInfo 'Het installatieprogramma van $\"MiKTeX$\" word gestart.$\r$\n\
+			            Om het programma te installeren klik op de $\"Next$\"-knop in het installatie venster totdat de installatie begint.$\r$\n\
+				    $\r$\n\
+				    !!! Gebruik de standaard opties tijdens de installatie van MiKTeX !!!'
+${LangFileString} LatexError1 'Er is geen LaTeX software gevonden!$\r$\n\
+                      		      LyX kan niet worden gebruikt zonder LaTeX software zoals $\"MiKTeX$\"!$\r$\n\
+				      De installatie wordt daarom afgebroken.'
+		    
+${LangFileString} GSviewInfo 'Het installatieprogramma van $\"GSview$\" wordt gestart.$\r$\n\
+			             Klik op de $\"Setup$\"-knop in het eerste venster van het installatie programma om de software te installeren$\r$\n\
+				     kies een taal, en klik daarna op de $\"Next$\"-knop in de volgende vensters van het installatie programma.$\r$\n\
+				     U kunt alle standaard opties van het GSview installatie programma gebruiken.'
+${LangFileString} GSviewError 'Het programma $\"GSview$\" kon niet worden geinstalleerd!$\r$\n\
+		                      De installatie van LyX gaat echter door.$\r$\n\
+				      Probeer GSview later te installeren.'
+
+${LangFileString} JabRefInfo 'Het installatie programma van $\"JabRef$\" wordt nu gestart.$\r$\n\
+				     U kunt de standaard opties gebruiken.'
+${LangFileString} JabRefError 'Het programma $\"JabRef$\" kon niet worden geinstalleerd!$\r$\n\
+		                      De LyX installatie gaat desondanks verder.$\r$\n\
+				      Probeer JabRef later te installeren.'
+				      
+${LangFileString} LatexConfigInfo "De volgende configuratie van LyX zal enige tijd duren."
+
+${LangFileString} MiKTeXPathInfo "Opdat elke gebruiker zijn MiKTeX configuratie kan aanpassen$\r$\n\
+					 is het noodzakelijk alle gebruikers schrijfpermissie te geven in MiKTeX's installatie map$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 en submappen."
+${LangFileString} MiKTeXInfo 'LyX gebruikt de LaTeX softare $\"MiKTeX$\".$\r$\n\
+				     Het is aanbevolen MiKTeX-updates te installeren via de $\"MiKTeX Update Wizard$\"$\r$\n\
+				     voordat u LyX voor de eerste keer gebruikt.$\r$\n\
+				     Wilt u controleren of er updates voor MiKTeX beschikbaar zijn?'
+
+${LangFileString} UpdateNotAllowed "This update package can only update ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Mislukte poging om 'path_prefix' te registreren tijdens de configuratie"
+${LangFileString} CreateCmdFilesFailed "lyx.bat kon niet worden aangemaakt"
+${LangFileString} RunConfigureFailed "Mislukte configuratie poging"
+${LangFileString} NotAdmin "U heeft systeem-beheerrechten nodig om LyX te installeren!"
+${LangFileString} InstallRunning "Het installatieprogramma is al gestart!"
+${LangFileString} StillInstalled "LyX is reeds geinstalleerd! Verwijder LyX eerst."
+
+${LangFileString} FinishPageMessage "Gefeliciteerd! LyX is succesvol geinstalleerd.$\r$\n\
+					    $\r$\n\
+					    (De eerste keer dat u LyX start kan dit enige seconden duren.)"
+${LangFileString} FinishPageRun "Start LyX"
+
+${LangFileString} UnNotInRegistryLabel "LyX is niet gevonden in het Windows register.$\r$\n\
+					       Snelkoppelingen op het Bureaublad en in het Start Menu worden niet verwijderd."
+${LangFileString} UnInstallRunning "U moet LyX eerst afsluiten!"
+${LangFileString} UnNotAdminLabel "U heeft systeem-beheerrechten nodig om LyX te verwijderen!"
+${LangFileString} UnReallyRemoveLabel "Weet u zeker dat u LyX en alle componenten volledig wil verwijderen van deze computer?"
+${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences'
+${LangFileString} UnGSview 'Klik op de $\"Uninstall$\" knop in het volgende venster om het$\r$\n\
+				   Postscript en PDF leesprogramma $\"GSview$\" te verwijderen.'
+${LangFileString} UnRemoveSuccessLabel "LyX was successvol verwijderd van uw computer."
+
+${LangFileString} SecUnMiKTeXDescription "Verwijder de LaTeX software MiKTeX."
+${LangFileString} SecUnJabRefDescription "Verwijder de bibliografie manager JabRef."
+${LangFileString} SecUnPreferencesDescription 'Verwijder LyX$\'s configuratie map$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   voor alle gebruikers.'
+${LangFileString} SecUnProgramFilesDescription "Verwijder LyX en alle bijbehorende onderdelen."
+
diff --git a/development/Win32/packaging/installer/lang/english.nsh b/development/Win32/packaging/installer/lang/english.nsh
index a501525c45..74c3d7d77f 100644
--- a/development/Win32/packaging/installer/lang/english.nsh
+++ b/development/Win32/packaging/installer/lang/english.nsh
@@ -2,7 +2,7 @@
 
 LyX Installer Language File
 Language: English
-Author: Joost Verburg
+Author: Joost Verburg, Uwe Stöhr
 
 */
 
@@ -12,7 +12,7 @@ ${LangFileString} TEXT_NO_PRIVILEDGES "You don't have Administrator or Power Use
 
 ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)"
 
-${LangFileString} TEXT_WELCOME "This wizard will guide you through the installation of $(^NameDA), the document processor that encourages an approach to writing based on the structure of your documents, not their appearance.$\r$\n$\r$\n$(^ClickNext)"
+${LangFileString} TEXT_WELCOME "This wizard will guide you through the installation of $(^NameDA), $\r$\n$\r$\n$_CLICK"
 
 ${LangFileString} TEXT_REINSTALL_TITLE "Reinstall"
 ${LangFileString} TEXT_REINSTALL_SUBTITLE "Choose whether you want to reinstall the $(^NameDA) program files."
@@ -88,3 +88,99 @@ ${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut"
 ${LangFileString} TEXT_FINISH_WEBSITE "Visit lyx.org for the latest news, support and tips"
+
+${LangFileString} FileTypeTitle "LyX-Document"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Install for all users?"
+${LangFileString} SecFileAssocTitle "File associations"
+${LangFileString} SecDesktopTitle "Desktop icon"
+
+${LangFileString} SecCoreDescription "The LyX files."
+${LangFileString} SecInstGSviewDescription "Program to view Postscript- and PDF-documents."
+${LangFileString} SecInstJabRefDescription "Bibliography reference manager and editor for BibTeX files."
+${LangFileString} SecAllUsersDescription "Install LyX for all users or just the current user."
+${LangFileString} SecFileAssocDescription "Files with a .lyx extension will automatically open in LyX."
+${LangFileString} SecDesktopDescription "A LyX icon on the desktop."
+
+${LangFileString} LangSelectHeader "Selection of LyX's menu language"
+${LangFileString} AvailableLang " Available Languages "
+
+${LangFileString} EnterLaTeXHeader1 'LaTeX-distribution'
+${LangFileString} EnterLaTeXHeader2 'Set the LaTeX-distribution that LyX should use.'
+${LangFileString} EnterLaTeXFolder 'You can optionally set here the path to the file $\"latex.exe$\" and therewith set the \
+					   LaTeX-distribution that should be used by LyX.$\r$\n\
+					   If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\
+					   $\r$\n\
+					   The installer has detected the LaTeX-distribution \
+					   $\"$LaTeXName$\" on your system. Displayed below is its path.'
+${LangFileString} EnterLaTeXFolderNone 'Set below the path to the file $\"latex.exe$\". Therewith you set which \
+					       LaTeX-distribution should be used by LyX.$\r$\n\
+					       If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\
+					       $\r$\n\
+					       The installer couldn$\'t find a LaTeX-distribution on your system.'
+${LangFileString} PathName 'Path to the file $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "Don$\'t use LaTeX"
+${LangFileString} InvalidLaTeXFolder 'The file $\"latex.exe$\" is not in the specified path.'
+
+${LangFileString} LatexInfo 'Now the installer of the LaTeX-distribution $\"MiKTeX$\" will be launched.$\r$\n\
+			            To install the program press the $\"Next$\"-button in the installer windows until the installation begins.$\r$\n\
+				    $\r$\n\
+				    !!! Please use all default options of the MiKTeX-installer !!!'
+${LangFileString} LatexError1 'No LaTeX-distribution could be found!$\r$\n\
+                      		      LyX cannot be used without a LaTeX-distribution like $\"MiKTeX$\"!$\r$\n\
+				      The installation will therefore be aborted.'
+			    
+${LangFileString} GSviewInfo 'Now the installer of the program $\"GSview$\" will be launched.$\r$\n\
+			             To install the program press the $\"Setup$\"-button in the first installer window,$\r$\n\
+				     choose a language and then press the $\"Next$\"-button in the following installer windows.$\r$\n\
+				     You can use all default options of the GSview-installer.'
+${LangFileString} GSviewError 'The program $\"GSview$\" could not successfully be installed!$\r$\n\
+		                      The installer will continue anyway.$\r$\n\
+				      Try to install GSview again later.'
+				      
+${LangFileString} JabRefInfo 'Now the installer of the program $\"JabRef$\" will be launched.$\r$\n\
+				     You can use all default options of the JabRef-installer.'
+${LangFileString} JabRefError 'The program $\"JabRef$\" could not successfully be installed!$\r$\n\
+		                      The installer will continue anyway.$\r$\n\
+				      Try to install JabRef again later.'
+				      
+${LangFileString} LatexConfigInfo "The following configuration of LyX will take a while."
+
+${LangFileString} MiKTeXPathInfo "In order that every user is later able to customize MiKTeX for his needs$\r$\n\
+					 it is necessary to set write permissions for all users to MiKTeX$\'s installation folder$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 and its subfolders."
+${LangFileString} MiKTeXInfo 'The LaTeX-distribution $\"MiKTeX$\" will be used together with LyX.$\r$\n\
+				     It is recommended to install available MiKTeX-updates using the program $\"MiKTeX Update Wizard$\"$\r$\n\
+				     before you use LyX for the first time.$\r$\n\
+				     Would you now check for MiKTeX updates?'
+
+${LangFileString} ModifyingConfigureFailed "Could not set 'path_prefix' in the configure script"
+${LangFileString} CreateCmdFilesFailed "Could not create lyx.bat"
+${LangFileString} RunConfigureFailed "Could not execute the configure script"
+${LangFileString} InstallRunning "The installer is already running!"
+${LangFileString} StillInstalled "LyX is already installed! Deinstall LyX first."
+
+${LangFileString} FinishPageMessage "Congratulations! LyX has been installed successfully.$\r$\n\
+					    $\r$\n\
+					    (The first start of LyX might take some seconds.)"
+${LangFileString} FinishPageRun "Launch LyX"
+
+${LangFileString} UnNotInRegistryLabel "Unable to find LyX in the registry.$\r$\n\
+					       Shortcuts on the desktop and in the Start Menu will not be removed."
+${LangFileString} UnInstallRunning "You must close LyX at first!"
+${LangFileString} UnNotAdminLabel "You must have administrator privileges to uninstall LyX!"
+${LangFileString} UnReallyRemoveLabel "Are you sure you want to completely remove LyX and all of its components?"
+${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences'
+${LangFileString} UnGSview 'Please press the $\"Uninstall$\" button in the next window to uninstall$\r$\n\
+				   the Postscript and PDF-viewer $\"GSview$\".'
+${LangFileString} UnRemoveSuccessLabel "LyX was successfully removed from your computer."
+
+${LangFileString} SecUnMiKTeXDescription "Uninstalls the LaTeX-distribution MiKTeX."
+${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef."
+${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration folder$\r$\n\
+					   "$AppPre\username\$AppSuff\${APP_DIR_USERDATA}"$\r$\n\
+					   for all users.'
+${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components."
diff --git a/development/Win32/packaging/installer/lang/french.nsh b/development/Win32/packaging/installer/lang/french.nsh
index e4d2c62f02..4b132c2f81 100644
--- a/development/Win32/packaging/installer/lang/french.nsh
+++ b/development/Win32/packaging/installer/lang/french.nsh
@@ -12,7 +12,7 @@ ${LangFileString} TEXT_NO_PRIVILEDGES "Vous n'avez pas les privil
 
 ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installation pour l'utilisateur courant)"
 
-${LangFileString} TEXT_WELCOME "Cet assistant va vous guider tout au long de l'installation de $(^NameDA), le constructeur de documents qui encourage une saisie fondée sur la structure du document plutôt que sur son apparence.$\r$\n$\r$\n$(^ClickNext)"
+${LangFileString} TEXT_WELCOME "Cet assistant va vous guider tout au long de l'installation de $(^NameDA).$\r$\n$\r$\n$_CLICK"
 
 ${LangFileString} TEXT_REINSTALL_TITLE "Réinstallation"
 ${LangFileString} TEXT_REINSTALL_SUBTITLE "Réinstallation éventuelle des fichiers programmes de $(^NameDA) ?"
@@ -88,3 +88,110 @@ ${LangFileString} TEXT_CONFIGURE_LYX "Configuration de LyX (MiKTeX peut t
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Créer un raccourci sur le bureau"
 ${LangFileString} TEXT_FINISH_WEBSITE "Consulter les dernières nouvelles, trucs et astuces sur le site lyx.org"
+
+${LangFileString} WelcomePageText "Cet assistant vous guidera durant l'installation de LyX.$\r$\n\
+					  $\r$\n\
+					  Vous devez être administrateur pour installer LyX.$\r$\n\
+					  $\r$\n\
+					  Avant de débuter l'installation, il est recommandé de fermer toutes les autres applications. Cela permettra de mettre à jour certains fichiers système sans redémarrer votre ordinateur.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "Document LyX"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Installer pour tous les utilisateurs ?"
+${LangFileString} SecFileAssocTitle "Associations de fichiers"
+${LangFileString} SecDesktopTitle "Icône du bureau"
+
+${LangFileString} SecCoreDescription "Les fichiers LyX"
+${LangFileString} SecInstGSviewDescription "Application permettant d'afficher les documents PostScript - et PDF."
+${LangFileString} SecInstJabRefDescription "Gestionnaire de références bibliographiques et éditeur de ficjiers BibTeX."
+${LangFileString} SecAllUsersDescription "Installer LyX pour tous les utilisateurs, ou seulement pour l'utilisateur courant ?."
+${LangFileString} SecFileAssocDescription "Les fichiers de suffixe .lyx seront automatiquement ouverts dans LyX."
+${LangFileString} SecDesktopDescription "Une icône LyX sur le bureau."
+
+${LangFileString} LangSelectHeader "Sélection de la langue pour les menus de LyX"
+${LangFileString} AvailableLang " Langues disponibles"
+
+${LangFileString} EnterLaTeXHeader1 'Distribution LaTeX'
+${LangFileString} EnterLaTeXHeader2 'Choisir la distribution LaTeX que LyX devra utiliser.'
+${LangFileString} EnterLaTeXFolder 'Éventuellement, vous pouvez fixer ici le chemin d$\'accès au fichier $\"latex.exe$\" et de ce fait fixer \
+					   la distribution LaTeX utilisée par Lyx.$\r$\n\
+					   Si vous n$\'utilisez pas LaTeX, LyX ne peut créer de documents !$\r$\n\
+					   $\r$\n\
+					   L$\'assistant d$\'installation a détecté la distribution LaTeX \
+					   $\"$LaTeXName$\" sur votre système. Le chemin d$\'accès est affiché ci-dessous.'
+${LangFileString} EnterLaTeXFolderNone 'Fixez ci-dessous le chemin d$\'accès au fichier $\"latex.exe$\". De ce fait vous fixez la \
+					       distribution LaTeX utilisée par Lyx.$\r$\n\
+					       Si vous n$\'utilisez pas LaTeX, LyX ne peut créer de documents !$\r$\n\
+					       $\r$\n\
+					       L$\'assistant d$\'installation n$\'a pas pu trouver de distribution LaTeX sur votre système.'
+${LangFileString} PathName 'Chemin vers le fichier $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "N'utilisez pas LaTeX"
+${LangFileString} InvalidLaTeXFolder '$\"latex.exe$\" introuvable dans le chemin d$\'accès spécifié.'
+
+${LangFileString} LatexInfo 'Lancement de l$\'installation de la distribution LaTeX $\"MiKTeX$\".$\r$\n\
+			            Pour installer l$\'application, appuyer sur le bouton $\"Next$\" de la fenêtre d$\'installation jusqu$\'à ce que celle-ci commence.$\r$\n\
+				    $\r$\n\
+				    !!! Prenez garde à utiliser toutes les options implicites du programme d$\'installation MikTeX !!!'
+${LangFileString} LatexError1 'Distribution LaTeX introuvable !$\r$\n\
+                      		      LyX ne peut être utilisé sans distribution LaTeX, comme par exemple $\"MiKTeX$\" !$\r$\n\
+				      L$\'installation de LyX va donc être abandonnée.'
+			    
+${LangFileString} GSviewInfo 'Lancement de l$\'installation de l$\'application $\"GSview$\".$\r$\n\
+			             Pour installer l$\'application, appuyer sur le bouton $\"Setup$\" de la première fenêtre d$\'installation$\r$\n\
+				     choisir une langue, puis appuyer sur le bouton $\"Next$\" de la fenêtre d$\'installation suivante.$\r$\n\
+				     Vous pouvez utiliser les options implicites du programme d$\'installation GSview.'
+${LangFileString} GSviewError 'L$\'application $\"GSview$\" n$\'a pas pu être installée correctement !$\r$\n\
+		                      L$\'installation de LyX va continuer.$\r$\n\
+				      Essayer d$\'installer GSview de nouveau plus tard.'
+
+${LangFileString} JabRefInfo 'Lancement de l$\'installation de l$\'application $\"JabRef$\".$\r$\n\
+				     Vous pouvez utiliser les options implicites du programme d$\'installation JabRef.'
+${LangFileString} JabRefError 'L$\'application $\"JabRef$\" n$\'a pas pu être installée correctement !$\r$\n\
+		                      L$\'installation de LyX va continuer.$\r$\n\
+				      Essayer d$\'installer JabRef de nouveau plus tard.'
+				      
+${LangFileString} LatexConfigInfo "La configuration de LyX qui va suivre prendra un moment."
+
+${LangFileString} MiKTeXPathInfo "Pour que chaque utilisateur soit capable de personnaliser MiKTeX pour ses besoins$\r$\n\
+					 il est nécessaire de positionner les permissions en écriture dans le répertoire d$\'installation de MiKTeX pour tous les utilisateurs$\r$\n\
+					 ($MiKTeXPath) $\r$\n\
+					 et pour ses sous-répertoires."
+${LangFileString} MiKTeXInfo 'La distribution LaTeX $\"MiKTeX$\" sera utilisée par LyX.$\r$\n\
+				     Il est recommandé d$\'installer les mises à jour en utilisant l$\'application $\"MiKTeX Update Wizard$\"$\r$\n\
+				     avant d$\'utiliser LyX pour la première fois.$\r$\n\
+				     Voulez-vous vérifier maintenant les mises à jour de MiKTeX ?'
+
+${LangFileString} UpdateNotAllowed "Ce paquetage ne peut mettre à jour que ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Échec de l'allocation 'path_prefix' lors de la configuration."
+${LangFileString} CreateCmdFilesFailed "Création de lyx.bat impossible."
+${LangFileString} RunConfigureFailed "Échec de la tentative de configuration initiale de LyX."
+${LangFileString} NotAdmin "Vous devez avoir les droits d'administration pour installer LyX !"
+${LangFileString} InstallRunning "Le programme d'installation est toujours en cours !"
+${LangFileString} StillInstalled "LyX est déjà installé ! Le désinstaller d'abord."
+
+${LangFileString} FinishPageMessage "Félicitations ! LyX est installé avec succès.$\r$\n\
+					    $\r$\n\
+					    (Le premier démarrage de LyX peut demander quelques secondes.)"
+${LangFileString} FinishPageRun "Démarrer LyX"
+
+${LangFileString} UnNotInRegistryLabel "LyX introuvable dans le base des registres.$\r$\n\
+					       Les raccourcis sur le bureau et dans le menu de démarrage ne seront pas supprimés."
+${LangFileString} UnInstallRunning "Vous devez fermer LyX d'abord !"
+${LangFileString} UnNotAdminLabel "Vous devez avoir les droits d'administration pour désinstaller LyX !"
+${LangFileString} UnReallyRemoveLabel "Êtes vous sûr(e) de vouloir supprimer complètement LyX et tous ses composants ?"
+${LangFileString} UnLyXPreferencesTitle 'Préférences utilisateurs de LyX'
+${LangFileString} UnGSview 'Merci d$\'appuyer sur le bouton $\"Désinstaller$\" de la prochaine fenêtre pour désinstaller.$\r$\n\
+				   l$\'afficheur Postscript/PDF $\"GSview$\".'
+${LangFileString} UnRemoveSuccessLabel "LyX supprimé de votre ordinateur avec succès."
+
+${LangFileString} SecUnMiKTeXDescription "Désinstalle la distribution LaTeX MiKTeX."
+${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef."
+${LangFileString} SecUnPreferencesDescription 'Supprime le répertoire de configuration de LyX$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   pour tous les utilisateurs.'
+${LangFileString} SecUnProgramFilesDescription "Désinstaller LyX et tous ses composants."
+
diff --git a/development/Win32/packaging/installer/lang/galician.nsh b/development/Win32/packaging/installer/lang/galician.nsh
new file mode 100644
index 0000000000..1078aa1c71
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/galician.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Galician"
+
+${LangFileString} WelcomePageText "Este asistente vai-no guiar na instalación do LyX no seu computador.$\r$\n\
+					  $\r$\n\
+					  Para poder instalar o LyX precisa de priviléxios de administrador.$\r$\n\
+					  $\r$\n\
+					  Recomenda-se fechar todas as outras aplicacións antes de iniciar a instalación. Isto posibilita actualizar os ficheiros do sistema relevantes sen ter que reiniciar o computador.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "Documento LyX"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Instalar para todos os usuários?"
+${LangFileString} SecFileAssocTitle "Asociación dos ficheiros"
+${LangFileString} SecDesktopTitle "Icone do ambiente de traballo"
+
+${LangFileString} SecCoreDescription "Os ficheiros LyX."
+${LangFileString} SecInstGSviewDescription "Programa para visualizar documentos en Postscript e PDF."
+${LangFileString} SecInstJabRefDescription "Xestor de referéncias bibliográficas e editor de ficheiros BibTeX."
+${LangFileString} SecAllUsersDescription "Instalar o LyX monousuário ou multiusuário."
+${LangFileString} SecFileAssocDescription "Asociar a extensión .lyx co LyX."
+${LangFileString} SecDesktopDescription "Cria un icone do LyX no ambiente de traballo."
+
+${LangFileString} LangSelectHeader "Selección da lingua dos menus no LyX"
+${LangFileString} AvailableLang " Línguas disponíbeis "
+
+${LangFileString} EnterLaTeXHeader1 'Distribuición de LaTeX'
+${LangFileString} EnterLaTeXHeader2 'Escolha a distribución de LaTeX que vai usar o LyX.'
+${LangFileString} EnterLaTeXFolder 'Opcionalmente pode especificar o camiño do ficheiro $\"latex.exe$\" e posteriormente \
+					   escoller a distribuición de LaTeX que vai usar o LyX.$\r$\n\
+					   Sen LaTeX o LyX non pode (pré-)imprimir os documentos!$\r$\n\
+					   $\r$\n\
+					   O instalador detectou a distribución de LaTeX $\"$LaTeXName$\"\
+					   no seu sistema, no camiño que se mostra abaixo.'
+${LangFileString} EnterLaTeXFolderNone 'Especifique abaixo o camiño ao ficheiro $\"latex.exe$\". Posteriormente escolla \
+					       a distribución de LaTeX que debe usar o LyX.$\r$\n\
+					       Sem LaTeX o LyX non pode (pré-)imprimir os documentos!$\r$\n\
+					       $\r$\n\
+					       O instalador non pudo achar nengunha distribución de LaTeX no seu sistema.'
+${LangFileString} PathName 'Camiño ao ficheiro $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "Non usar LaTeX"
+${LangFileString} InvalidLaTeXFolder 'O ficheiro $\"latex.exe$\" non está no camiño especificado.'
+
+${LangFileString} LatexInfo 'Agora lanzará-se o instalador da distribución de LaTeX $\"MiKTeX$\".$\r$\n\
+			            Para instalar o programa prema no botón $\"Próximo$\" na xanela de instalación até a instalación comezar.$\r$\n\
+				    $\r$\n\
+				    !!! Por favor use todas as opcións por defeito do instalador do MiKTeX !!!'
+${LangFileString} LatexError1 'Non se achou nengunha distribución de LaTeX!$\r$\n\
+                      		      Non se pode usar o LyX sen unha distribución de LaTeX como a $\"MiKTeX$\"!$\r$\n\
+				      Por iso a instalación vai ser abortada.'
+
+${LangFileString} GSviewInfo 'Agora lanzará-se o instalador do programa $\"GSview$\".$\r$\n\
+			             Para instalar prema no botón $\"Setup$\" na primeira xanela de instalación$\r$\n\
+				     escolla a língua e despois prema no botón $\"Próximo$\" na seguinte xanela do instalador.$\r$\n\
+				     Pode usar todas as opcións por defeito no instalador do GSview.'
+${LangFileString} GSviewError 'Non se deu instalado o programa $\"GSview$\"!$\r$\n\
+		                      De todos os xeitos a instalación do LyX continua.$\r$\n\
+				      Tente instalar máis adiante o GSview.'
+
+${LangFileString} JabRefInfo 'Agora lanzará-se o instalador do programa $\"JabRef$\".$\r$\n\
+				     Pode usar todas as opcións por defeito no instalador do JabRef.'
+${LangFileString} JabRefError 'Non se deu instalado o programa $\"JabRef$\"!$\r$\n\
+		                      De todos os xeitos a instalación do LyX continua.$\r$\n\
+				      Tente instalar mais adiante o JabRef.'
+
+${LangFileString} LatexConfigInfo "A configuración seguinte do LyX irá demorar un pouco."
+
+${LangFileString} MiKTeXPathInfo "Para que cada usuário poda personalizar posteriormente o MiKTeX segundo as suas$\r$\n\
+					 necesidades, cumpre a pasta onde foi instalado o MiKTeX$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 e as suas subpastas teren permiso de escritura para todos os usuários."
+${LangFileString} MiKTeXInfo 'Xunto co LyX vai-se empregar a distribución de LaTeX $\"MiKTeX$\".$\r$\n\
+				     Antes de usar o LyX pola primeira vez, recomenda-se instalar as actualizacións disponíbeis$\r$\n\
+				     do MiKTeX co instalador $\"MiKTeX Update Wizard$\"$\r$\n\
+				     Desexa comprovar agora se ha actualizacións do MiKTeX?'
+
+${LangFileString} UpdateNotAllowed "This update package can only update ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Non se puido engadir o 'path_prefix' no script de configuración"
+${LangFileString} CreateCmdFilesFailed "Non se deu criado o lyx.bat"
+${LangFileString} RunConfigureFailed "Non se deu executado o script de configuración"
+${LangFileString} NotAdmin "Precisa de priviléxios de administrador para instalar o LyX!"
+${LangFileString} InstallRunning "O instalador xa está a correr!"
+${LangFileString} StillInstalled "O LyX xa está instalado! Desinstale o LyX primeiro."
+
+${LangFileString} FinishPageMessage "Parabéns! O LyX foi instalado con suceso.$\r$\n\
+					    $\r$\n\
+					    (O primeiro início do LyX pode levar alguns segundos.)"
+${LangFileString} FinishPageRun "Lanzar o LyX"
+
+${LangFileString} UnNotInRegistryLabel "Non se da achado o LyX no registo.$\r$\n\
+					       Non se eliminarán os atallos para o ambiente de traballo e no menu de Início."
+${LangFileString} UnInstallRunning "Debe fechar o LyX en primeiro lugar!"
+${LangFileString} UnNotAdminLabel "Precisa de priviléxios de administrador para desinstalar o LyX!"
+${LangFileString} UnReallyRemoveLabel "Seguro que quer eliminar completamente o LyX e todos os seus componentes?"
+${LangFileString} UnLyXPreferencesTitle 'Preferéncias de usuário do LyX'
+${LangFileString} UnGSview 'Por favor prema no botón $\"Desinstalar$\" na próxima xanela para desinstalar$\r$\n\
+				   o visualizador de Postscript e PDF $\"GSview$\".'
+${LangFileString} UnRemoveSuccessLabel "Eliminou-se o LyX do seu computador."
+
+${LangFileString} SecUnMiKTeXDescription "Desinstala a distribución de LaTeX MiKTeX."
+${LangFileString} SecUnJabRefDescription "Desinstala o xestor de referéncias bibliográficas JabRef."
+${LangFileString} SecUnPreferencesDescription 'Elimina as pastas de configuración do  LyX$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   de todos os usuários.'
+${LangFileString} SecUnProgramFilesDescription "Desinstala LyX e todos os seus componentes."
+
diff --git a/development/Win32/packaging/installer/lang/german.nsh b/development/Win32/packaging/installer/lang/german.nsh
index 41183492b9..73f3d88d8c 100644
--- a/development/Win32/packaging/installer/lang/german.nsh
+++ b/development/Win32/packaging/installer/lang/german.nsh
@@ -10,7 +10,9 @@ Author: Andreas Deininger
 
 ${LangFileString} TEXT_NO_PRIVILEDGES "Sie gehören weder der Gruppe der Administratoren noch der Gruppe der Hauptbenutzer an.$\r$\nDie Werkzeuge zur Grafikkonvertierung können ohne diese Rechte nicht installiert werden."
 
-${LangFileString} TEXT_WELCOME "Dieses Installationsprogramm wird Sie durch die Installation von $(^NameDA) leiten, des Dokumentenverarbeitungsprogramms welches das Verfassen von Texten basierend auf ihrer Struktur unterstützt, nicht das Verfassen von Texten ausgerichtet auf ihr Erscheinungsbild.$\r$\n$\r$\n(^ClickNext)"
+${LangFileString} TEXT_WELCOME "Dieser Assistent wird Sie durch die Installation von $(^NameDA) begleiten.$\r$\n\
+				$\r$\n\
+				$_CLICK"
 
 ${LangFileString} TEXT_REINSTALL_TITLE "Erneute Installation"
 ${LangFileString} TEXT_REINSTALL_SUBTITLE "Wählen Sie aus, ob Sie die $(^NameDA) Programmdateien erneut installieren möchten."
@@ -82,3 +84,111 @@ ${LangFileString} TEXT_NOTINSTALLED_DICT "Die Installation der W
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Ein Symbol auf der Arbeitsoberfläche erzeugen"
 ${LangFileString} TEXT_FINISH_WEBSITE "Besuchen Sie lyx.org für aktuelle Neuigkeiten"
+
+${LangFileString} WelcomePageText "Dieser Assistent wird Sie durch die Installation von LyX begleiten.$\r$\n\
+					  $\r$\n\
+					  Sie benötigen Administratorrechte um LyX zu installieren.$\r$\n\
+					  $\r$\n\
+					  Es wird empfohlen vor der Installation alle anderen Programme zu schließen, damit bestimmte Systemdateien ohne Neustart ersetzt werden können.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "LyX-Dokument"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Für alle Nutzer installieren?"
+${LangFileString} SecFileAssocTitle "Dateizuordnungen"
+${LangFileString} SecDesktopTitle "Desktopsymbol"
+
+${LangFileString} SecCoreDescription "Das Programm LyX."
+${LangFileString} SecInstGSviewDescription "Programm zum Betrachten von Postscript- und PDF-Dokumenten."
+${LangFileString} SecInstJabRefDescription "Manager für bibliografische Referenzen und Editor für BibTeX-Dateien."
+${LangFileString} SecAllUsersDescription "LyX für alle Nutzer oder nur für den aktuellen Nutzer installieren."
+${LangFileString} SecFileAssocDescription "Vernüpfung zwischen LyX und der .lyx Dateiendung."
+${LangFileString} SecDesktopDescription "Verknüpfung zu LyX auf dem Desktop."
+
+${LangFileString} LangSelectHeader "Wahl der Menüsprache von LyX"
+${LangFileString} AvailableLang " Verfügbare Sprachen "
+
+${LangFileString} EnterLaTeXHeader1 'LaTeX-Distribution'
+${LangFileString} EnterLaTeXHeader2 'Legen Sie die LaTeX-Distribution fest die LyX verwenden soll.'
+${LangFileString} EnterLaTeXFolder 'Optional können Sie hier den Pfad zur Datei $\"latex.exe$\" angeben und damit die \
+					   LaTeX-Distribution festlegen die LyX verwenden soll.$\r$\n\
+					   Wenn Sie kein LaTeX verwenden, kann LyX keine Dokumente ausgeben!$\r$\n\
+					   $\r$\n\
+					   Der Installer hat auf Ihrem System die LaTeX-Distribution$\r$\n\
+					   $\"$LaTeXName$\" erkannt. Unten angegeben ist ihr Pfad.'
+${LangFileString} EnterLaTeXFolderNone 'Geben Sie unten den Pfad zur Datei $\"latex.exe$\" an. Damit legen Sie fest welche \
+					       LaTeX-Distribution LyX verwenden soll.$\r$\n\
+					       Wenn Sie kein LaTeX verwenden, kann LyX keine Dokumente ausgeben!$\r$\n\
+					       $\r$\n\
+					       Der Installer konnte auf Ihrem System keine LaTeX-Distribution finden.'
+${LangFileString} PathName 'Pfad zur Datei $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "Kein LaTeX benutzen"
+${LangFileString} InvalidLaTeXFolder 'Kann die Datei $\"latex.exe$\" nicht finden.'
+
+${LangFileString} LatexInfo 'Als Nächstes wird der Installer der LaTeX-Distribution $\"MiKTeX$\" gestartet.$\r$\n\
+			            Um das Programm zu installieren, drücken Sie den $\"Weiter$\"-Knopf in den Installerfenstern bis die Installation beginnt.$\r$\n\
+				    $\r$\n\
+				    !!! Bitte verwenden Sie alle voreingestellten Optionen des MiKTeX-Installers !!!'
+${LangFileString} LatexError1 'Es konnte keine LaTeX-Distribution gefunden werden!$\r$\n\
+                      		      LyX kann ohne eine LaTeX-Distribution wie z.B. $\"MiKTeX$\" nicht benutzt werden!$\r$\n\
+				      Die Installation wird daher abgebrochen.'
+				    
+${LangFileString} GSviewInfo 'Als Nächstes wird der Installer des Programms $\"GSview$\" gestartet.$\r$\n\
+			             Um das Programm zu installieren, drücken Sie den $\"Setup$\"-Knopf im ersten Installerfenster,$\r$\n\
+				     wählen eine Sprache und drücken dann den $\"Weiter$\"-Knopf in den folgenden Installerfenstern.$\r$\n\
+				     Sie können alle voreingestellten Optionen des GSview-Installers verwenden.'
+${LangFileString} GSviewError 'Das Programm $\"GSview$\" konnte nicht erfolgreich installiert werden!$\r$\n\
+		                      Die Installation wird trotzdem fortgesetzt.$\r$\n\
+				      Versuchen Sie GSview später noch einmal zu installieren.'
+				      
+${LangFileString} JabRefInfo 'Als Nächstes wird der Installer des Programms $\"JabRef$\" gestartet.$\r$\n\
+			             Sie können alle voreingestellten Optionen des JabRef-Installers verwenden.'
+${LangFileString} JabRefError 'Das Programm $\"JabRef$\" konnte nicht erfolgreich installiert werden!$\r$\n\
+		                      Der Installer wird trotzdem fortgesetzt.$\r$\n\
+				      Versuchen Sie JabRef später noch einmal zu installieren.'
+
+${LangFileString} LatexConfigInfo "Die folgende Konfiguration von LyX wird eine Weile dauern."
+
+${LangFileString} MiKTeXPathInfo "Damit jeder Benutzer später MiKTeX für seine Bedürfnisse anpassen kann,$\r$\n\
+					 ist es erforderlich für MiKTeXs Installationsordner$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 und seine Unterordner Schreibrechte für alle Benutzer zu setzen."
+${LangFileString} MiKTeXInfo 'Die LaTeX-Distribution $\"MiKTeX$\" wird zusammen mit LyX verwendet werden.$\r$\n\
+				     Es wird empfohlen dass Sie verfügbare MiKTeX-Updates mit Hilfe des Programms $\"MiKTeX Update Wizard$\"$\r$\n\
+				     installieren, bevor sie LyX das erste Mal benutzen.$\r$\n\
+				     Möchten Sie jetzt nach Updates für MiKTeX suchen?'
+
+${LangFileString} UpdateNotAllowed "Dieses Update-Paket kann nur ${PRODUCT_VERSION_OLD} updaten!"
+${LangFileString} ModifyingConfigureFailed 'Der $\"PATH_präfix$\" (Liste mit Programmpfaden) konnte nicht im Konfigurationsskript gesetzt werden.'
+${LangFileString} CreateCmdFilesFailed "Konnte die Datei lyx.bat nicht erzeugen."
+${LangFileString} RunConfigureFailed "Konnte das Konfigurationsskript nicht ausführen."
+${LangFileString} NotAdmin "Sie benötigen Administratorrechte um LyX zu installieren!"
+${LangFileString} InstallRunning "Der Installer läuft bereits!"
+${LangFileString} StillInstalled "LyX ist bereits installiert! Deinstallieren Sie LyX zuerst."
+
+${LangFileString} FinishPageMessage "Glückwunsch! LyX wurde erfolgreich installiert.$\r$\n\
+					    $\r$\n\
+					    (Der erste Start von LyX kann etwas länger dauern.)"
+${LangFileString} FinishPageRun "LyX starten"
+
+${LangFileString} UnNotInRegistryLabel "Kann LyX nicht in der Registry finden.$\r$\n\
+					       Desktopsymbole und Einträge im Startmenü können nicht entfernt werden."
+${LangFileString} UnInstallRunning "Sie müssen LyX zuerst beenden!"
+${LangFileString} UnNotAdminLabel "Sie benötigen Administratorrechte um LyX zu deinstallieren!"
+${LangFileString} UnReallyRemoveLabel "Sind Sie sicher, dass sie LyX und all seine Komponenten deinstallieren möchten?"
+${LangFileString} UnLyXPreferencesTitle 'LyXs Benutzereinstellungen'
+${LangFileString} UnGSview 'Bitte drücken Sie im nächsten Fenster den Knopf $\"Uninstall$\" um das$\r$\n\
+				   Postscript und PDF-Betrachtungsprogramm $\"GSview$\" zu deinstallieren.'
+${LangFileString} UnRemoveSuccessLabel "LyX wurde erfolgreich von ihrem Computer entfernt."
+
+${LangFileString} SecUnMiKTeXDescription "Deinstalliert die LaTeX-Distribution MiKTeX."
+${LangFileString} SecUnJabRefDescription "Deinstalliert den Bibliografiemanager JabRef."
+${LangFileString} SecUnPreferencesDescription 'Löscht LyXs Benutzereinstellungen,$\r$\n\
+						      (den Ornder:$\r$\n\
+						      $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\")$\r$\n\
+						      für alle Benutzer.'
+${LangFileString} SecUnProgramFilesDescription "Deinstalliert LyX und all seine Komponenten."
+
diff --git a/development/Win32/packaging/installer/lang/hungarian.nsh b/development/Win32/packaging/installer/lang/hungarian.nsh
new file mode 100644
index 0000000000..cde4d1a4d5
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/hungarian.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Hungarian"
+
+${LangFileString} WelcomePageText "A varázsló segítségével tudja telepíteni a LyX-et.$\r$\n\
+					  $\r$\n\
+					  A LyX telepítéséhez rendszergazdai jogra van szüksége.$\r$\n\
+					  $\r$\n\
+					  A telepítés megkezdése elõtt, javasolt kilépni minden futó alkalmazásból. Ez a lépés teszi lehetõvé, hogy frissítsünk fontos rendszerfájlokat újraindítás szükségessége nélkül.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "LyX-dokumentum"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Telepítés minden felhasználónak"
+${LangFileString} SecFileAssocTitle "Fájltársítások"
+${LangFileString} SecDesktopTitle "Parancsikon asztalra"
+
+${LangFileString} SecCoreDescription "A LyX futtatásához szükséges fájlok."
+${LangFileString} SecInstGSviewDescription "Alkalmazás Postscript- és PDF-fájlok megjelenítéséhez."
+${LangFileString} SecInstJabRefDescription "Irodalomjegyzék-hivatkozás szerkesztõ és kezelõ BibTeX fájlokhoz."
+${LangFileString} SecAllUsersDescription "Minden felhasználónak telepítsem vagy csak az aktuálisnak?"
+${LangFileString} SecFileAssocDescription "A .lyx kiterjesztéssel rendelkezõ fájlok megnyitása automatikusan a LyX-el történjen."
+${LangFileString} SecDesktopDescription "LyX-ikon elhelyezése az asztalon."
+
+${LangFileString} LangSelectHeader "A LyX felhasználói felület nyelvének kiválasztása"
+${LangFileString} AvailableLang " Választható nyelvek "
+
+${LangFileString} EnterLaTeXHeader1 'LaTeX-disztribúció'
+${LangFileString} EnterLaTeXHeader2 'Adja meg a LaTeX-disztribúciót, amit a LyX-nek használnia kell.'
+${LangFileString} EnterLaTeXFolder 'Itt megadhatja az elérési útvonalat a $\"latex.exe$\" fájlhoz és ezzel meg is adja \
+					   melyik LaTeX disztribúciót fogja használni a LyX.$\r$\n\
+					   Amennyiben nem használ LaTeX-et, a LyX nem tud kimenetet készíteni!$\r$\n\
+					   $\r$\n\
+					   A telepítõ megtalálta az ön számítógépén a \
+					   $\"$LaTeXName$\" disztribúciót. Lent láthatja az elérési útvonalát.'
+${LangFileString} EnterLaTeXFolderNone 'Adja meg a használandó $\"latex.exe$\" fájl elérési útvonalát. Ezzel azt is megadja \
+					       melyik LaTeX disztribúciót fogja használni a LyX.$\r$\n\
+					       Amennyiben nem használ LaTeX-et, a LyX nem tud kimenetet készíteni!$\r$\n\
+					       $\r$\n\
+					       A telepítõ nem talált a számítógépén LaTeX disztribúciót!'
+${LangFileString} PathName 'A $\"latex.exe$\" fájl elérési útja'
+${LangFileString} DontUseLaTeX "Ne használja a LaTeX-et"
+${LangFileString} InvalidLaTeXFolder 'Nem találom a $\"latex.exe$\" fájlt, a megadott helyen.'
+
+${LangFileString} LatexInfo 'A $\"MiKteX$\" LaTeX-disztribúció telepítõjének indítása következik.$\r$\n\
+			            A program telepítéséhez addig nyomkodja a $\"Következõ$\" gombot a telepítõ ablakában, amíg a telepítés el nem kezd?dik.$\r$\n\
+				    $\r$\n\
+				    !!! Kérem használja a MikTeX-telepítõ alapértelmezett opcióit!!!'
+${LangFileString} LatexError1 'Nem találtam LaTeX-disztribúciót!$\r$\n\
+                      		      A LyX nem használható egy LaTeX-disztibúció nélkül,(mint például a $\"MiKTeX$\")!$\r$\n\
+				      Ezért a telepítés nem folytatható!'
+
+${LangFileString} GSviewInfo 'A $\"GSview$\" program telepítõjének indítása következik.$\r$\n\
+			             A program telepítéséhez, nyomja meg a $\"Telepít$\"-gombot a telepítõ elsõ ablakában,$\r$\n\
+				     azután válasszon nyelvet, majd nyomja meg a $\"Következõ$\"-gombot a következõ telepítõ ablakokban.$\r$\n\
+				     Használhatja a program által javasolt beállításokat.'
+${LangFileString} GSviewError 'A $\"GSview$\" programot nem sikerült telepíteni!$\r$\n\
+		                      Azonban a telepítés tovább fog folytatódni.$\r$\n\
+				      Késõbb próbálja meg újra a GSview telepítését.'
+
+${LangFileString} JabRefInfo 'A $\"JabRef$\" telepítõjének elindítása következik.$\r$\n\
+				     Használhatja az alapértelmezett opciókat.'
+${LangFileString} JabRefError 'Nem tudom telepíteni a $\"JabRef$\" programot!$\r$\n\
+		                      Azonban a telepítés tovább fog folytatódni.$\r$\n\
+				      Késõbb próbálja meg újra telepíteni a JabRef-et.'
+
+${LangFileString} LatexConfigInfo "A LyX telepítés utáni beállítása hosszú idõt vehet igénybe."
+
+${LangFileString} MiKTeXPathInfo "Ahhoz, hogy a többi felhasználó is testre tudja használni a MiKTeX-et$\r$\n\
+					 írás jogot kell adni minden felhasználó részére a MiKTeX alkönyvtárhoz.$\r$\n\
+					 A $MiKTeXPath $\r$\n\
+					 valamint alkönyvtáraihoz."
+${LangFileString} MiKTeXInfo 'A $\"MiKTeX$\" LaTeX-disztibúció lesz használva a LyX által.$\r$\n\
+				     Javasolt telepíteni a MiKTeX frissítéseket a $\"MiKTeX Update Wizard$\" segítségével,$\r$\n\
+				     a LyX elsõ indítása elõtt.$\r$\n\
+				     Szeretné ellenõrizni a frissítéseket most?'
+
+${LangFileString} UpdateNotAllowed "Ez a frissítõ csomag csak a ${PRODUCT_VERSION_OLD} verziót tudja frissíteni!"
+${LangFileString} ModifyingConfigureFailed "Nem tudom beállítani a 'path_prefix'-et a configure parancsfájlban!"
+${LangFileString} CreateCmdFilesFailed "Nem tudom létrehozni a lyx.bat fájlt."
+${LangFileString} RunConfigureFailed "Nem tudom végrehajtani a configure parancsfájlt!"
+${LangFileString} NotAdmin "A LyX telepítéséhez rendszergazdai jogok szükségesek!"
+${LangFileString} InstallRunning "A telepítõ már fut!"
+${LangFileString} StillInstalled "A LyX már teleptve van! Elõször távolítsa el a régit."
+
+${LangFileString} FinishPageMessage "Gratulálok! Sikeresen telepítette a LyX-et.$\r$\n\
+					    $\r$\n\
+					    (Az program elsõ indítása egy kis idõt vehet igénybe...)"
+${LangFileString} FinishPageRun "LyX indítása"
+
+${LangFileString} UnNotInRegistryLabel "Nem találom a LyX-et a regisztriben.$\r$\n\
+					       Az Asztalon és a Start Menüben található parancsikonok nem lesznek eltávolítva!."
+${LangFileString} UnInstallRunning "Elõször be kell zárnia a LyX-et!"
+${LangFileString} UnNotAdminLabel "A LyX eltávolításhoz rendszergazdai jogokkal kell rendelkeznie!"
+${LangFileString} UnReallyRemoveLabel "Biztosan abban, hogy el akarja távolítani a LyX-t, minden tartozékával együtt?"
+${LangFileString} UnLyXPreferencesTitle 'LyX felhasználói beállítások'
+${LangFileString} UnGSview 'Kérem nyomja meg az $\"Eltávolítás$\" gombot, a PostScript és a\r$\n\
+				   PDF megjelenítõ $\"GSview$\" eltávolításához a következõ ablakban.'
+${LangFileString} UnRemoveSuccessLabel "LyX eltávolítása a számítógépérõl zökkenõmentesen befejezõdött."
+
+${LangFileString} SecUnMiKTeXDescription "MikTeX LaTeX-disztibúció eltávolítása."
+${LangFileString} SecUnJabRefDescription "JabRef irodalomjegyzék kezelõ eltávolítása."
+${LangFileString} SecUnPreferencesDescription 'A  LyX beállítások mappa törlése$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   minden felhasználónál.'
+${LangFileString} SecUnProgramFilesDescription "A LyX és minden komponensének eltávolítása."
+
diff --git a/development/Win32/packaging/installer/lang/indonesian.nsh b/development/Win32/packaging/installer/lang/indonesian.nsh
new file mode 100644
index 0000000000..7251f60de5
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/indonesian.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Indonesian"
+
+${LangFileString} WelcomePageText "Program ini akan memandu anda dalam melakukan instalasi LyX.$\r$\n\
+					  $\r$\n\
+					  Anda harus bertindak dan mempunyai hak sebagai administrator untuk instalasi LyX.$\r$\n\
+					  $\r$\n\
+					  Sangat disarankan anda menutup semua aplikasi sebelum memulai. Hal ini akan memungkinkan memperbarui berkas sistem yang relevan tanpa melakukan booting ulang komputer anda.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "Dokumen-LyX"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Instal untuk semua pengguna?"
+${LangFileString} SecFileAssocTitle "Berkas yang terkait"
+${LangFileString} SecDesktopTitle "Ikon Desktop"
+
+${LangFileString} SecCoreDescription "Berkas-berkas LyX."
+${LangFileString} SecInstGSviewDescription "Program untuk melihat dokumen Postscript dan PDF."
+${LangFileString} SecInstJabRefDescription "Program manajemen acuan bibliografi dan penyunting berkas BibTeX."
+${LangFileString} SecAllUsersDescription "Instal LyX untuk semua pengguna atau hanya untuk pengguna ini saja."
+${LangFileString} SecFileAssocDescription "Berkas dengan ekstensi .lyx akan otomatis dibuka menggunakan LyX."
+${LangFileString} SecDesktopDescription "Ikon LyX muncul di desktop."
+
+${LangFileString} LangSelectHeader "Pilihan bahasa untuk menu LyX"
+${LangFileString} AvailableLang " Bahasa yang tersedia "
+
+${LangFileString} EnterLaTeXHeader1 'Distribusi LaTeX'
+${LangFileString} EnterLaTeXHeader2 'Pengaturan distribusi LaTeX yang akan digunakan dalam LyX.'
+${LangFileString} EnterLaTeXFolder 'Anda dapat mengatur sendiri lokasi tempat berkas $\"latex.exe$\" berada dan mengatur lokasi \
+					   tempat distribusi LaTeX yang akan digunakan oleh LyX.$\r$\n\
+					   Apabila anda tidak menggunakan LaTeX, LyX tidak akan menampilkan output dokumen!$\r$\n\
+					   $\r$\n\
+					   Program instalasi ini mendeteksi adanya distribusi LaTeX \
+					   $\"$LaTeXName$\" dalam sistem anda. Dibawah ini adalah lokasi keberadaannya.'
+${LangFileString} EnterLaTeXFolderNone 'Aturlah lokasi tempat berkas $\"latex.exe$\" berada. Atur dan nyatakanlah lokasi \
+					       tempat distribusi LaTeX yang akan digunakan oleh LyX.$\r$\n\
+					       Apabila anda tidak menggunakan LaTeX, LyX tidak akan menampilkan output dokumen!$\r$\n\
+					       $\r$\n\
+					       Program instalasi ini tidak menemukan adanya distribusi LaTeX di sistem anda.'
+${LangFileString} PathName 'Lokasi tempat berkas $\"latex.exe$\" berada'
+${LangFileString} DontUseLaTeX "Tidak menggunakan LaTeX"
+${LangFileString} InvalidLaTeXFolder 'Berkas $\"latex.exe$\" tidak berada di lokasi tempat yang dinyatakan.'
+
+${LangFileString} LatexInfo 'Sekarang instalasi program distribusi LaTeX $\"MiKTeX$\" akan dijalankan.$\r$\n\
+			            Untuk meneruskan tekanlah tombol $\"Lanjut$\" yang ada di jendela dan tunggu sampai instalasi dimulai.$\r$\n\
+				    $\r$\n\
+				    !!! Gunakan semua pilihan default pada program instalasi MiKTeX !!!'
+${LangFileString} LatexError1 'Distribusi LaTeX tidak ditemukan!$\r$\n\
+                      		      LyX tidak bisa digunakan tanpa menggunakan salah satu distribusi LaTeX seperti $\"MiKTeX$\"!$\r$\n\
+				      Oleh karena itu proses instalasi dibatalkan.'
+			    
+${LangFileString} GSviewInfo 'Sekarang instalasi program $\"GSview$\" akan dijalankan.$\r$\n\
+			             Untuk memulainya tekanlah tombol $\"Mulai$\" pada jendela instalasi yang pertama,$\r$\n\
+				     pilihlah bahasa yang anda inginkan kemudian tekan tombol $\"Lanjut$\" pada jendela berikutnya.$\r$\n\
+				     Anda boleh memilih semua pilihan default yang ada di program instalasi GSview.'
+${LangFileString} GSviewError 'Program $\"GSview$\" tidak berhasil diinstal secara keseluruhan!$\r$\n\
+		                      Namun proses instalasi dapat diteruskan.$\r$\n\
+				      Anda dapat mengulangi instalasi GSview nanti.'
+				      
+${LangFileString} JabRefInfo 'Sekarang instalasi program $\"JabRef$\" akan dijalankan.$\r$\n\
+				     Anda boleh memilih semua pilihan default yang ada di program instalasi JabRef.'
+${LangFileString} JabRefError 'Program $\"JabRef$\" tidak berhasil diinstal secara keseluruhan!$\r$\n\
+		                      Namun proses instalasi dapat diteruskan.$\r$\n\
+				      Anda dapat mengulang instalasi JabRef nanti.'
+				      
+${LangFileString} LatexConfigInfo "Proses konfigurasi LyX selanjutnya akan memerlukan waktu beberapa saat."
+
+${LangFileString} MiKTeXPathInfo "Agar memungkinkan semua pengguna dapat mengatur MiKTeX sesuai keinginannya$\r$\n\
+					 anda perlu memberikan hak merubah untuk semua pengguna pada lokasi instalasi MiKTeX yaitu folder$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 serta di semua subfoldernya."
+${LangFileString} MiKTeXInfo 'Distribusi LaTeX $\"MiKTeX$\" akan digunakan dengan LyX.$\r$\n\
+				     Sangat disarankan memperbarui program yang ada di MiKTeX menggunakan $\"MiKTeX Update Wizard$\"$\r$\n\
+				     sebelum anda menggunakan LyX untuk yang pertama kali.$\r$\n\
+				     Apakah anda akan memeriksa perlunya memperbarui MikTeX?'
+
+${LangFileString} UpdateNotAllowed "Program update ini hanya hanya dapat memperbarui ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Tidak bisa menyatakan 'path_prefix' pada skrip configure"
+${LangFileString} CreateCmdFilesFailed "Tidak bisa membuat berkas lyx.bat"
+${LangFileString} RunConfigureFailed "Tidak bisa menjalankan skrip configure"
+${LangFileString} NotAdmin "Anda harus berlaku dan mempunyai hak sebagai administrator untuk instalasi LyX!"
+${LangFileString} InstallRunning "Program instalasi sedang berjalan!"
+${LangFileString} StillInstalled "LyX sudah pernah diinstal! Perlu menghapus LyX yang ada terlebih dahulu."
+
+${LangFileString} FinishPageMessage "Selamat! LyX berhasil diinstal dengan sukses.$\r$\n\
+					    $\r$\n\
+					    (Menjalankan LyX untuk pertama kali memerlukan waktu beberapa detik.)"
+${LangFileString} FinishPageRun "Menjalankan LyX"
+
+${LangFileString} UnNotInRegistryLabel "Tidak bisa menemukan LyX di catatan registry.$\r$\n\
+					       Shortcuts pada desktop dan yang ada di Menu Start tidak dihapus."
+${LangFileString} UnInstallRunning "Anda harus menutup LyX terlebih dahulu!"
+${LangFileString} UnNotAdminLabel "Anda harus berlaku dan mempunyai hak sebagai administrator untuk menghapus LyX!"
+${LangFileString} UnReallyRemoveLabel "Apakah anda yakin akan menghapus LyX secara menyeluruh termasuk semua komponen yang ada?"
+${LangFileString} UnLyXPreferencesTitle 'Preferensi pengguna LyX'
+${LangFileString} UnGSview 'Silahkan tekan tombol $\"Hapus$\" pada jendela berikutnya untuk memulai penghapusan$\r$\n\
+				   Postscript dan  penampil PDF $\"GSview$\".'
+${LangFileString} UnRemoveSuccessLabel "LyX telah dihapus dengan sukses dari komputer anda."
+
+${LangFileString} SecUnMiKTeXDescription "Penghapusan distribusi LaTeX MiKTeX."
+${LangFileString} SecUnJabRefDescription "Penghapusan program manajemen bibliografi JabRef."
+${LangFileString} SecUnPreferencesDescription 'Menghapus berkas konfigurasi LyX pada folder$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   untuk semua pengguna.'
+${LangFileString} SecUnProgramFilesDescription "Penghapusan LyX serta semua komponen yang ada."
+
diff --git a/development/Win32/packaging/installer/lang/italian.nsh b/development/Win32/packaging/installer/lang/italian.nsh
index 742c45409b..a3fdc4334f 100644
--- a/development/Win32/packaging/installer/lang/italian.nsh
+++ b/development/Win32/packaging/installer/lang/italian.nsh
@@ -10,7 +10,7 @@ Author: Enrico Forestieri
 
 ${LangFileString} TEXT_NO_PRIVILEDGES "Non si hanno privilegi da amministratore o utente avanzato.$\r$\nLe utilità per la conversione delle immagini non possono essere installate senza tali privilegi."
 
-${LangFileString} TEXT_WELCOME "Verrete guidati nell'installazione di $(^NameDA), il compilatore di documenti che incoraggia un approccio alla scrittura basato sulla struttura dei vostri testi, non sulla loro apparenza.$\r$\n$\r$\n(^ClickNext)"
+${LangFileString} TEXT_WELCOME "Verrete guidati nell'installazione di $(^NameDA)$\r$\n$\r$\n$_CLICK"
 
 ${LangFileString} TEXT_REINSTALL_TITLE "Reinstallazione"
 ${LangFileString} TEXT_REINSTALL_SUBTITLE "Scegliete se volete reinstallare i file di $(^NameDA)."
@@ -82,3 +82,110 @@ ${LangFileString} TEXT_NOTINSTALLED_DICT "L'installazione del dizionario ortogra
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Crea icona sul desktop"
 ${LangFileString} TEXT_FINISH_WEBSITE "Visitate lyx.org per ultime novità, aiuto e suggerimenti"
+
+${LangFileString} WelcomePageText "Questo programma installerà LyX nel vostro computer.$\r$\n\
+                      $\r$\n\
+                      Per installare LyX sono necessari i privilegi di amministratore.$\r$\n\
+                      $\r$\n\
+                      Si raccomanda di chiudere tutte le altre applicazioni prima di iniziare l'installazione. Questo permetterà al programma di installazione di aggiornare i file di sistema senza dover riavviare il computer.$\r$\n\
+                      $\r$\n\
+                      $_CLICK"
+
+${LangFileString} FileTypeTitle "Documento di LyX"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Installare per tutti gli utenti?"
+${LangFileString} SecFileAssocTitle "Associazioni dei file"
+${LangFileString} SecDesktopTitle "Icona sul Desktop"
+
+${LangFileString} SecCoreDescription "I file di LyX."
+${LangFileString} SecInstGSviewDescription "Programma per visualizzare documenti in formato Postscript e PDF."
+${LangFileString} SecInstJabRefDescription "Gestore dei riferimenti bibliografici ed editor per i files di BibTeX."
+${LangFileString} SecAllUsersDescription "Installazione LyX per tutti gli utenti o solo per l'utente attuale."
+${LangFileString} SecFileAssocDescription "Associa i files con estensione .lyx al programma LyX."
+${LangFileString} SecDesktopDescription "Icona LyX sul desktop."
+
+${LangFileString} LangSelectHeader "Scelta della lingua del menu di LyX"
+${LangFileString} AvailableLang " Lingue disponibili "
+
+${LangFileString} EnterLaTeXHeader1 'Distribuzione di LaTeX'
+${LangFileString} EnterLaTeXHeader2 'Scegliere la distribuzione di LaTeX che LyX dovrà usare.'
+${LangFileString} EnterLaTeXFolder 'Puoi impostare qui il percorso del file $\"latex.exe$\" e impostare di conseguenza \
+			                   la distribuzione di LaTeX che LyX dovrà usare.$\r$\n\
+					   Senza LaTeX, LyX non può generare documenti!$\r$\n\
+					   $\r$\n\
+					   Il programma di installazione ha rilevato la distribuzione di LaTeX \
+					   $\"$LaTeXName$\" sul tuo sistema. Il suo percorso è riportato sotto.'
+${LangFileString} EnterLaTeXFolderNone 'Imposta qui sotto il percorso del file $\"latex.exe$\". Con questo imposti quale \
+					       distribuzione di LaTeX dovrà essere usata da LyX.$\r$\n\
+					       Senza LaTeX, LyX non può generare documenti!$\r$\n\
+					       $\r$\n\
+					       Il programma di installazione non ha trovato una distribuzione di LaTeX sul tuo sistema.'
+${LangFileString} PathName 'Percorso del file $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "Non usare LaTeX"
+${LangFileString} InvalidLaTeXFolder 'Il file $\"latex.exe$\" non è nel percorso indicato.'
+
+${LangFileString} LatexInfo 'Verrà adesso lanciato il programma di installazione della distribuzione di LateX $\"MiKTeX$\".$\r$\n\
+                        	    Per installare il programma premere $\"Next$\" nelle finestre di installazione fino all$\'avvio dell$\'installazione.$\r$\n\
+				    $\r$\n\
+				    !!! Lasciare le impostazioni di default suggerite dal programma di installazione di $\"MiKTeX$\" !!!'
+${LangFileString} LatexError1 'Il programma non ha rilevato la presenza di alcuna distribuzione valida di LaTeX!$\r$\n\
+                                      LyX non può funzionare senza una distribuzione LaTeX (ad es. $\"MiKTeX$\")!$\r$\n\
+				      Il processo di installazione verrà quindi terminato.'
+                
+${LangFileString} GSviewInfo 'Verrà adesso lanciato il programma di installazione di $\"GSview$\".$\r$\n\
+                     		     Per proseguire premere il pulsante $\"Setup$\" che appare nella prima finestra di installazione,$\r$\n\
+				     scegliere la lingua e premere il pulsante $\"Next$\" nella finestra di installazione successiva.$\r$\n\
+				     Per comodità si consiglia di accettare le impostazioni di default suggerite dal programma di installazione di GSview.'
+${LangFileString} GSviewError 'Il programma $\"GSview$\" non è stato installato correttamente!$\r$\n\
+                      		      L$\'installazione può comunque proseguire.$\r$\n\
+				      Si consiglia di tentare nuovamente l$\'installazione di GSView al termine.'
+
+${LangFileString} JabRefInfo 'Verrà adesso lanciato il programma di installazione di $\"JabRef$\".$\r$\n\
+                     		     Puoi usare tutte le opzioni predefinite per il programma di installazione di JabRef.'
+${LangFileString} JabRefError 'Il programma $\"JabRef$\" non è stato installato correttamente!$\r$\n\
+     		               	      L$\'installazione può comunque proseguire.$\r$\n\
+				      Si consiglia di tentare nuovamente l$\'installazione di JabRef al termine.'
+
+${LangFileString} LatexConfigInfo "La seguente configurazione di LyX richiederà un po' di tempo."
+
+${LangFileString} MiKTeXPathInfo "Per permettere a tutti gli utenti di personalizzare successivamente MiKTeX in base alle loro esigenze$\r$\n\
+                     			 è necessario impostare i permessi di scrittura per tutti gli utenti alla cartella di installazione di MiKTeX$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 e alle sue sottocartelle."
+${LangFileString} MiKTeXInfo 'La distribuzione di LaTeX $\"MiKTeX$\" verrà usata insieme a LyX.$\r$\n\
+                     		     Si raccomanda di installare gli aggiornamenti disponibili per MiKTeX utilizzando il programma $\"MiKTeX Update Wizard$\"$\r$\n\
+				     prima di usare LyX per la prima volta.$\r$\n\
+				     Vuoi controllare ora la presenza di aggiornamenti per MiKTeX?'
+
+${LangFileString} UpdateNotAllowed "This update package can only update ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Fallito tentativo di aggiornare 'path_prefix' nello script di configurazione"
+${LangFileString} CreateCmdFilesFailed "Non è possibile creare lyx.bat"
+${LangFileString} RunConfigureFailed "Fallito tentativo di eseguire lo script di configurazione"
+${LangFileString} NotAdmin "Occorrono i privilegi da amministratore per installare LyX!"
+${LangFileString} InstallRunning "Il programma di installazione è già in esecuzione!"
+${LangFileString} StillInstalled "LyX è già installato! Occorre rimuoverlo per poter procedere."
+
+${LangFileString} FinishPageMessage "Congratulazioni! LyX è stato installato con successo.$\r$\n\
+                        		    $\r$\n\
+					    (Il primo avvio di LyX potrebbe richiedere qualche secondo in più.)"
+${LangFileString} FinishPageRun "Lancia LyX"
+
+${LangFileString} UnNotInRegistryLabel "Non riesco a trovare LyX nel registro.$\r$\n\
+                           		       I collegamenti sul desktop e nel menu Start non saranno rimossi."
+${LangFileString} UnInstallRunning "È necessario chiudere LyX!"
+${LangFileString} UnNotAdminLabel "Occorrono i privilegi da amministratore per rimuovere LyX!"
+${LangFileString} UnReallyRemoveLabel "Siete sicuri di voler rimuovere completamente LyX e tutti i suoi componenti?"
+${LangFileString} UnLyXPreferencesTitle 'Impostazioni personali di LyX'
+${LangFileString} UnGSview 'Per rimuovere $\"GSview$\" (un visualizzatore di file Postscript e PDF) è$\r$\n\ 
+                                   necessario premere il pulsante $\"Uninstall$\" che apparirà nella finestra successiva.'
+${LangFileString} UnRemoveSuccessLabel "LyX è stato rimosso dal sistema con successo."
+
+${LangFileString} SecUnMiKTeXDescription 'Rimuove la distribuzione di LaTeX $\"MiKTeX$\".'
+${LangFileString} SecUnJabRefDescription "Rimuove il gestore della bibliografia JabRef."
+${LangFileString} SecUnPreferencesDescription 'Elimina la cartella con la configurazione di LyX$\r$\n\
+                      				      $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+						      per tutti gli utenti.'
+${LangFileString} SecUnProgramFilesDescription "Rimuove LyX e tutti i suoi componenti."
+
diff --git a/development/Win32/packaging/installer/lang/japanese.nsh b/development/Win32/packaging/installer/lang/japanese.nsh
new file mode 100644
index 0000000000..1d7e372cfd
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/japanese.nsh
@@ -0,0 +1,107 @@
+!insertmacro LANGFILE_EXT "Japanese"
+
+${LangFileString} WelcomePageText "‚±‚̃EƒBƒU[ƒh‚ªA‚ ‚È‚½‚ªLyX‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚éŠÔ‚Ì‚²ˆÄ“à‚ð‚µ‚Ü‚·B$\r$\n\
+					  $\r$\n\
+					  LyX‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚é‚ɂ́AŠÇ—ŽÒŒ ŒÀ‚ª•K—v‚Å‚·B$\r$\n\
+					  $\r$\n\
+					  ƒZƒbƒgƒAƒbƒv‚ðŠJŽn‚·‚é‘O‚ɁA‘¼‚Ì‚·‚ׂẴAƒvƒŠƒP[ƒVƒ‡ƒ“‚ðI—¹‚·‚邱‚Æ‚ð‚¨Š©‚ß‚µ‚Ü‚·B‚»‚¤‚·‚邱‚Æ‚É‚æ‚Á‚āA‚±‚̃Rƒ“ƒsƒ…[ƒ^[‚ðÄ‹N“®‚·‚邱‚Æ‚È‚­AŠÖ˜A‚·‚éƒVƒXƒeƒ€ƒtƒ@ƒCƒ‹‚ðXV‚·‚邱‚Æ‚ª‚Å‚«‚é‚悤‚É‚È‚è‚Ü‚·B$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "LyX•¶‘"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "‚·‚ׂẴ†[ƒU[—p‚ɃCƒ“ƒXƒg[ƒ‹‚µ‚Ü‚·‚©H"
+${LangFileString} SecFileAssocTitle "ƒtƒ@ƒCƒ‹ŠÖ˜A•t‚¯"
+${LangFileString} SecDesktopTitle "ƒfƒXƒNƒgƒbƒvEƒAƒCƒRƒ“"
+
+${LangFileString} SecCoreDescription "LyX‚̃tƒ@ƒCƒ‹B"
+${LangFileString} SecInstGSviewDescription "ƒ|ƒXƒgƒXƒNƒŠƒvƒg‚¨‚æ‚ÑPDF•¶‘‚ð‰{——‚·‚邽‚߂̃vƒƒOƒ‰ƒ€B"
+${LangFileString} SecInstJabRefDescription "ŽQl•¶Œ£ŠÇ—‚¨‚æ‚ÑBibTeXƒtƒ@ƒCƒ‹ƒGƒfƒBƒ^B"
+${LangFileString} SecAllUsersDescription "LyX‚ð‚·‚×‚Ä‚Ìƒ†[ƒU[—p‚É‘•”õ‚·‚é‚©AŒ»Ý‚̃†[ƒU[Œü‚¯‚¾‚¯‚É‘•”õ‚·‚é‚©B"
+${LangFileString} SecFileAssocDescription "Šg’£Žq‚ª.lyx‚̃tƒ@ƒCƒ‹‚ÍŽ©“®“I‚ÉLyX‚ÅŠJ‚©‚ê‚éB"
+${LangFileString} SecDesktopDescription "ƒfƒXƒNƒgƒbƒvã‚ÌLyXƒAƒCƒRƒ“B"
+
+${LangFileString} LangSelectHeader "LyX‚̃ƒjƒ…[Œ¾Œê‚Ì‘I‘ð"
+${LangFileString} AvailableLang " ‘I‘ð‰Â”\‚ÈŒ¾Œê "
+
+${LangFileString} EnterLaTeXHeader1 'LaTeXƒfƒBƒXƒgƒŠƒrƒ…[ƒVƒ‡ƒ“'
+${LangFileString} EnterLaTeXHeader2 'LyX‚ªŽg‚¤‚ׂ«LaTeXƒfƒBƒXƒgƒŠƒrƒ…[ƒVƒ‡ƒ“‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B'
+${LangFileString} EnterLaTeXFolder '‚±‚±‚ł́A$\"latex.exe$\"ƒtƒ@ƒCƒ‹‚ւ̃pƒX‚ðŽw’è‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·B‚»‚¤‚·‚邱‚Æ‚É‚æ‚Á‚āA\
+					   LyX‚ªŽg—p‚·‚ׂ«LaTeXƒfƒBƒXƒgƒŠƒrƒ…[ƒVƒ‡ƒ“‚ðŽw’è‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·B$\r$\n\
+					   ‚à‚µLaTeX‚ðŽg‚í‚È‚¯‚ê‚΁ALyX‚Í•¶‘‚ðo—Í‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñI$\r$\n\
+					   $\r$\n\
+					   ƒCƒ“ƒXƒg[ƒ‰[‚́AƒVƒXƒeƒ€ã‚ÉLaTeXƒfƒBƒXƒgƒŠƒrƒ…[ƒVƒ‡ƒ“‚Æ‚µ‚Ä\
+					   $\"$LaTeXName$\"‚ª‚ ‚邱‚Æ‚ðŒŸo‚µ‚Ü‚µ‚½B‰º—“‚É‚Í‚»‚̃pƒX‚ª•\Ž¦‚³‚ê‚Ä‚¢‚Ü‚·B'
+${LangFileString} EnterLaTeXFolderNone '‰º—“‚Å$\"latex.exe$\"ƒtƒ@ƒCƒ‹‚ւ̃pƒX‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B‚»‚¤‚·‚邱‚Æ‚É‚æ‚Á‚āA\
+					       LyX‚ª‚Ç‚ÌLaTeXƒfƒBƒXƒgƒŠƒrƒ…[ƒVƒ‡ƒ“‚ðŽg—p‚·‚é‚ׂ«‚©Žw’è‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·B$\r$\n\
+					       ‚à‚µLaTeX‚ðŽg‚í‚È‚¯‚ê‚΁ALyX‚Í•¶‘‚ðo—Í‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñI$\r$\n\
+					   $\r$\n\
+					   ƒCƒ“ƒXƒg[ƒ‰[‚́AƒVƒXƒeƒ€ã‚ÉLaTeXƒfƒBƒXƒgƒŠƒrƒ…[ƒVƒ‡ƒ“‚ðŒ©‚Â‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B'
+${LangFileString} PathName '$\"latex.exe$\"ƒtƒ@ƒCƒ‹‚ւ̃pƒX'
+${LangFileString} DontUseLaTeX "LaTeX‚ðŽg—p‚µ‚È‚¢"
+${LangFileString} InvalidLaTeXFolder 'Žw’肳‚ꂽƒpƒX‚É$\"latex.exe$\"ƒtƒ@ƒCƒ‹‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB'
+
+${LangFileString} LatexInfo '‚±‚ê‚©‚çLaTeXƒfƒBƒXƒgƒŠƒrƒ…[ƒVƒ‡ƒ“$\"MiKTeX$\"‚̃Cƒ“ƒXƒg[ƒ‰[‚ð‹N“®‚µ‚Ü‚·B$\r$\n\
+			            ƒvƒƒOƒ‰ƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚é‚ɂ́AƒCƒ“ƒXƒg[ƒ‹‚ªŽn‚Ü‚é‚܂ŃCƒ“ƒXƒg[ƒ‰[‚̃EƒBƒ“ƒhƒE‚É‚ ‚é$\"Next$\"ƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢B$\r$\n\
+			            $\r$\n\
+			            III‚·‚ׂÄMiKTeXƒCƒ“ƒXƒg[ƒ‰[‚̃fƒtƒHƒ‹ƒgƒIƒvƒVƒ‡ƒ“‚ɏ]‚Á‚Ä‚­‚¾‚³‚¢BIII'
+${LangFileString} LatexError1 'LaTeXƒfƒBƒXƒgƒŠƒrƒ…[ƒVƒ‡ƒ“‚ð”­Œ©‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½I$\r$\n\
+                      		      LyX‚́A$\"MiKTeX$\"‚̂悤‚ÈLaTeXƒfƒBƒXƒgƒŠƒrƒ…[ƒVƒ‡ƒ“‚È‚µ‚Å‚ÍŽg‚¤‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñI$\r$\n\
+                      		      ‚µ‚½‚ª‚Á‚ăCƒ“ƒXƒg[ƒ‹‚Í’†Ž~‚µ‚Ü‚·B'
+			    
+${LangFileString} GSviewInfo '‚±‚ê‚©‚çƒvƒƒOƒ‰ƒ€$\"GSview$\"‚̃Cƒ“ƒXƒg[ƒ‰[‚ð‹N“®‚µ‚Ü‚·B$\r$\n\
+			             ƒvƒƒOƒ‰ƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚é‚ɂ́AƒCƒ“ƒXƒg[ƒ‰[‚̍ŏ‰‚̃EƒBƒ“ƒhƒE‚Å¢Setup£ƒ{ƒ^ƒ“‚ð‰Ÿ‚µA$\r$\n\
+			             Œ¾Œê‚ð‘I‘ð‚µ‚ÄAƒCƒ“ƒXƒg[ƒ‰[‚ÌŽŸ‚̃EƒBƒ“ƒhƒE‚ŁuNextvƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢B$\r$\n\
+				     GSviewƒCƒ“ƒXƒg[ƒ‰[‚̃fƒtƒHƒ‹ƒg‚̃IƒvƒVƒ‡ƒ“‚ð‚·‚×‚ÄŽó‚¯“ü‚ê‚Ä‚©‚Ü‚¢‚Ü‚¹‚ñB'
+${LangFileString} GSviewError 'ƒvƒƒOƒ‰ƒ€$\"GSview$\"‚͐³‚µ‚­ƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½I$\r$\n\
+		                      ƒCƒ“ƒXƒg[ƒ‰[‚́A‚Æ‚è‚ ‚¦‚¸‚±‚̂܂܃Cƒ“ƒXƒg[ƒ‹‚𑱂¯‚Ü‚·B$\r$\n\
+		                      Œã‚ÅGSview‚̃Cƒ“ƒXƒg[ƒ‹‚ðÄ“xŽŽ‚Ý‚Ä‚­‚¾‚³‚¢B'
+				      
+${LangFileString} JabRefInfo '‚±‚ê‚©‚çƒvƒƒOƒ‰ƒ€$\"JabRef$\"‚̃Cƒ“ƒXƒg[ƒ‰[‚ð‹N“®‚µ‚Ü‚·B$\r$\n\
+				     JabRefƒCƒ“ƒXƒg[ƒ‰[‚̃fƒtƒHƒ‹ƒg‚̃IƒvƒVƒ‡ƒ“‚ð‚·‚×‚ÄŽó‚¯“ü‚ê‚Ä‚©‚Ü‚¢‚Ü‚¹‚ñB'
+${LangFileString} JabRefError 'ƒvƒƒOƒ‰ƒ€$\"JabRef$\"‚͐³‚µ‚­ƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½I$\r$\n\
+		                      ƒCƒ“ƒXƒg[ƒ‰[‚́A‚Æ‚è‚ ‚¦‚¸‚±‚̂܂܃Cƒ“ƒXƒg[ƒ‹‚𑱂¯‚Ü‚·B$\r$\n\
+		                      Œã‚ÅJabRef‚̃Cƒ“ƒXƒg[ƒ‹‚ðÄ“xŽŽ‚Ý‚Ä‚­‚¾‚³‚¢B'
+				      
+${LangFileString} LatexConfigInfo "ˆÈ‰º‚ÌLyX‚̐ݒè‚ɂ͏­XŽžŠÔ‚ª‚©‚©‚è‚Ü‚·B"
+
+${LangFileString} MiKTeXPathInfo "‚·‚ׂẴ†[ƒU[‚ªŒã‚Å•K—v‚ɉž‚¶‚ÄMiKTeX‚ð$\r$\n\
+					 ƒJƒXƒ^ƒ}ƒCƒY‚Å‚«‚é‚悤‚ɁAMiKTeX‚̃Cƒ“ƒXƒg[ƒ‹æƒtƒHƒ‹ƒ_$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 ‚Æ‚»‚̉ºˆÊƒtƒHƒ‹ƒ_‚̏‘ž‚ÝŒ ŒÀ‚ðA‚·‚ׂẴ†[ƒU[‚É—^‚¦‚é•K—v‚ª‚ ‚è‚Ü‚·B"
+${LangFileString} MiKTeXInfo 'LyX‚Æ‚Æ‚à‚ɁALaTeXƒfƒBƒXƒgƒŠƒrƒ…[ƒVƒ‡ƒ“$\"MiKTeX$\"‚ª—p‚¢‚ç‚ê‚Ü‚·B$\r$\n\
+				     LyX‚ð‰‚ß‚ÄŽg‚¤‘O‚ɁA$\"MiKTeXXVƒEƒBƒU[ƒh$\"ƒvƒƒOƒ‰ƒ€‚ðŽg‚Á‚āA$\r$\n\
+				     —˜—p‰Â”\‚ÈMiKTeXXV•ª‚ðƒCƒ“ƒXƒg[ƒ‹‚±‚Ƃ𐄏§‚µ‚Ü‚·B$\r$\n\
+				     MiKTeX‚̍XV•ª‚ª‚ ‚é‚©‚Ç‚¤‚©A‚¢‚ÜŠm”F‚µ‚Ü‚·‚©H'
+
+${LangFileString} ModifyingConfigureFailed "configureƒXƒNƒŠƒvƒg’†‚Å'path_prefix'‚ðÝ’è‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
+${LangFileString} CreateCmdFilesFailed "lyx.bat‚𐶐¬‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
+${LangFileString} RunConfigureFailed "configureƒXƒNƒŠƒvƒg‚ðŽÀs‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
+${LangFileString} NotAdmin "LyX‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚é‚ɂ́AŠÇ—ŽÒŒ ŒÀ‚ðŽ‚Á‚Ä‚¢‚È‚­‚Ä‚Í‚È‚è‚Ü‚¹‚ñI"
+${LangFileString} InstallRunning "ƒCƒ“ƒXƒg[ƒ‰[‚ÍŠù‚É“®‚¢‚Ä‚¢‚Ü‚·I"
+${LangFileString} StillInstalled "LyX‚ÍŠù‚ɃCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚Ü‚·Iæ‚ÉLyX‚ðƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚­‚¾‚³‚¢B"
+
+${LangFileString} FinishPageMessage "‚¨‚ß‚Å‚Æ‚¤‚²‚´‚¢‚Ü‚·ILyX‚ª³‚µ‚­‘•”õ‚³‚ê‚Ü‚µ‚½B$\r$\n\
+					    $\r$\n\
+					    i‰‰ñ‚ÌLyX‚Ì‹N“®‚É‚ÍŽžŠÔ‚ª‚©‚©‚è‚Ü‚·Bj"
+${LangFileString} FinishPageRun "LyX‚ð‹N“®‚·‚é"
+
+${LangFileString} UnNotInRegistryLabel "ƒŒƒWƒXƒgƒŠ‚ÉLyX‚ªŒ©“–‚½‚è‚Ü‚¹‚ñB$\r$\n\
+					       ƒfƒXƒNƒgƒbƒv‚ƃXƒ^[ƒgƒƒjƒ…[‚̃Vƒ‡[ƒgƒJƒbƒg‚͍폜‚³‚ê‚Ü‚¹‚ñB"
+${LangFileString} UnInstallRunning "‚Ü‚¸LyX‚ð•Â‚¶‚Ä‚­‚¾‚³‚¢I"
+${LangFileString} UnNotAdminLabel "LyX‚ðƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚·‚é‚ɂ́AŠÇ—ŽÒŒ ŒÀ‚ðŽ‚Á‚Ä‚¢‚È‚­‚Ä‚Í‚È‚è‚Ü‚¹‚ñI"
+${LangFileString} UnReallyRemoveLabel "–{“–‚ɁALyX‚Æ‚·‚ׂĂ̕‘®ƒRƒ“ƒ|[ƒlƒ“ƒg‚ðíœ‚µ‚Ä‚µ‚Ü‚¤Ï‚à‚è‚Å‚·‚©H"
+${LangFileString} UnLyXPreferencesTitle 'LyX‚̃†[ƒU[Ý’è'
+${LangFileString} UnGSview 'PostscriptEPDFƒrƒ…[ƒA$\"GSview$\"‚ð’E‘•‚·‚é‚ɂ́A$\r$\n\
+				   ŽŸ‚̃EƒBƒ“ƒhƒE‚Å$\"Uninstall$\"ƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢B'
+${LangFileString} UnRemoveSuccessLabel "LyX‚Í‚¨Žg‚¢‚̃Rƒ“ƒsƒ…[ƒ^[‚©‚çŽæ‚菜‚©‚ê‚Ü‚µ‚½B"
+
+${LangFileString} SecUnMiKTeXDescription "LaTeXƒfƒBƒXƒgƒŠƒrƒ…[ƒVƒ‡ƒ“MiKTeX‚ð’E‘•‚µ‚Ü‚·B"
+${LangFileString} SecUnJabRefDescription "•¶Œ£ƒ}ƒl[ƒWƒƒ[JabRef‚ð’E‘•‚µ‚Ü‚·B"
+${LangFileString} SecUnPreferencesDescription 'ƒ†[ƒU[‹¤’Ê‚ÌLyX‚̐ݒèƒtƒHƒ‹ƒ_$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   ‚ðíœ‚µ‚Ü‚·B'
+${LangFileString} SecUnProgramFilesDescription "LyX‚Æ‚·‚ׂĂ̕‘®ƒRƒ“ƒ|[ƒlƒ“ƒg‚ð’E‘•‚µ‚Ü‚·B"
+
diff --git a/development/Win32/packaging/installer/lang/norwegian.nsh b/development/Win32/packaging/installer/lang/norwegian.nsh
new file mode 100644
index 0000000000..cace3dc01c
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/norwegian.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Norwegian"
+
+${LangFileString} WelcomePageText "Denne veiviseren installerer LyX på datamaskinen din.$\r$\n\
+					  $\r$\n\
+					  Du trenger administratorprivilegier for å installere LyX.$\r$\n\
+					  $\r$\n\
+					  Du bør lukke alle andre programmer først, dermed kan installasjonsprogrammet oppdatere relevante systemfiler uten å måtte restarte maskinen.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "LyX-Document"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Installere for alle brukere?"
+${LangFileString} SecFileAssocTitle "Fil-assosiasjoner"
+${LangFileString} SecDesktopTitle "Skrivebordsikon"
+
+${LangFileString} SecCoreDescription "LyX-filene."
+${LangFileString} SecInstGSviewDescription "Program for å vise Postscript- og PDF-dokumenter."
+${LangFileString} SecInstJabRefDescription "Bibliography reference manager and editor for BibTeX files."
+${LangFileString} SecAllUsersDescription "Installere LyX for alle brukere, eller kun den aktuelle brukeren."
+${LangFileString} SecFileAssocDescription "Files med endelsen .lyx åpnes automatisk i LyX."
+${LangFileString} SecDesktopDescription "Et LyX-ikon på skrivebordet."
+
+${LangFileString} LangSelectHeader "Utvalg av LyX's menyspråk"
+${LangFileString} AvailableLang " Tilgjengelige Språk "
+
+${LangFileString} EnterLaTeXHeader1 'LaTeX-distribusjon'
+${LangFileString} EnterLaTeXHeader2 'Velg LaTeX-distribusjonen LyX skal bruke.'
+${LangFileString} EnterLaTeXFolder 'You can optionally set here the path to the file $\"latex.exe$\" and therewith set the \
+					   LaTeX-distribution that should be used by LyX.$\r$\n\
+					   If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\
+					   $\r$\n\
+					   The installer has detected the LaTeX-distribution \
+					   $\"$LaTeXName$\" on your system. Displayed below is its path.'
+${LangFileString} EnterLaTeXFolderNone 'Set below the path to the file $\"latex.exe$\". Therewith you set which \
+					       LaTeX-distribution should be used by LyX.$\r$\n\
+					       If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\
+					       $\r$\n\
+					       The installer couldn$\'t find a LaTeX-distribution on your system.'
+${LangFileString} PathName 'Path to the file $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "Ikke bruk LaTeX"
+${LangFileString} InvalidLaTeXFolder 'Filen $\"latex.exe$\" fins ikke i den oppgitte mappa.'
+
+${LangFileString} LatexInfo 'Nå starter installasjon av LaTeX-distribusjonen $\"MiKTeX$\"$\r$\n\
+			            For å installere programmet, klikk $\"Neste$\"-knappen i installasjonsveiviseren til installasjonen begynner.$\r$\n\
+				    $\r$\n\
+				    !!! Vennligst bruk standardopsjonene for MiKTeX-instasjonen !!!'
+${LangFileString} LatexError1 'Fant ikke noen LaTeX-distribusjon!$\r$\n\
+                      		      LyX kan ikke brukes uten en LaTeX-distribusjion som $\"MiKTeX$\"!$\r$\n\
+				      Derfor avbrytes installasjonen.'
+		    
+${LangFileString} GSviewInfo 'Installasjonsveiviser for programmet $\"GSview$\" kjøres i gang.$\r$\n\
+			             For å installere programmet, klikk $\"Setup$\"-knappen i det første installasjonsvinduet$\r$\n\
+				     velg et språk, og klikk deretter $\"Neste$\"-knappen i det følgende installasjonsvinduet.$\r$\n\
+				     Du kan bruke alle standardvalg for GSview-veiviseren.'
+${LangFileString} GSviewError 'Programmet $\"GSview$\" kunne ikke installeres!$\r$\n\
+		                      Installasjonen fortsetter likevel.$\r$\n\
+				      Prøv å installere GSview omigjen senere.'
+
+${LangFileString} JabRefInfo 'Now the installer of the program $\"JabRef$\" will be launched.$\r$\n\
+				     You can use all default options of the JabRef-installer.'
+${LangFileString} JabRefError 'The program $\"JabRef$\" could not successfully be installed!$\r$\n\
+		                      The installer will continue anyway.$\r$\n\
+				      Try to install JabRef again later.'
+				      
+${LangFileString} LatexConfigInfo "Konfigurasjon av LyX vil ta en stund."
+
+${LangFileString} MiKTeXPathInfo "In order that every user is later able to customize MiKTeX for his needs$\r$\n\
+					 it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 and its subfolders."
+${LangFileString} MiKTeXInfo 'The LaTeX-distribution $\"MiKTeX$\" will be used together with LyX.$\r$\n\
+				     It is recommended to install available MiKTeX-updates using the program $\"MiKTeX Update Wizard$\"$\r$\n\
+				     before you use LyX for the first time.$\r$\n\
+				     Would you now check for MiKTeX updates?'
+
+${LangFileString} UpdateNotAllowed "This update package can only update LyX ${PRODUCT_VERSION_OLD}!"				     
+${LangFileString} ModifyingConfigureFailed "Forsøket på å stille inn 'path_prefix' i konfigurasjonsscriptet mislyktes"
+${LangFileString} CreateCmdFilesFailed "Fikk ikke opprettet lyx.bat"
+${LangFileString} RunConfigureFailed "Fikk ikke kjørt konfigurasjonsscriptet"
+${LangFileString} NotAdmin "Du trenger administratorrettigheter for å installere LyX!"
+${LangFileString} InstallRunning "Installasjonsprogrammet er allerede i gang!"
+${LangFileString} StillInstalled "LyX er allerede installert! Fjern LyX først."
+
+${LangFileString} FinishPageMessage "Gratulerer!! LyX er installert.$\r$\n\
+					    $\r$\n\
+					    (Første gangs oppstart av LyX kan ta noen sekunder.)"
+${LangFileString} FinishPageRun "Start LyX"
+
+${LangFileString} UnNotInRegistryLabel "Fant ikke LyX i registeret.$\r$\n\
+					       Snarveier på skrivebordet og i startmenyen fjernes ikke."
+${LangFileString} UnInstallRunning "Du må avslutte LyX først!"
+${LangFileString} UnNotAdminLabel "Du må ha administratorrettigheter for å fjerne LyX!"
+${LangFileString} UnReallyRemoveLabel "Er du sikker på at du vil fjerne LyX og alle tilhørende komponenter?"
+${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences'
+${LangFileString} UnGSview 'Vennligst klikk $\"Uninstall$\"-knappen i neste vindu for å fjerne$\r$\n\
+				   Postscript and PDF-leseren $\"GSview$\".'
+${LangFileString} UnRemoveSuccessLabel "LyX ble fjernet fra din datamaskin."
+
+${LangFileString} SecUnMiKTeXDescription "Uninstalls the LaTeX-distribution MiKTeX."
+${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef."
+${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration folder$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   for all users.'
+${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components."
+
diff --git a/development/Win32/packaging/installer/lang/polish.nsh b/development/Win32/packaging/installer/lang/polish.nsh
new file mode 100644
index 0000000000..30bba987e1
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/polish.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Polish"
+
+${LangFileString} WelcomePageText "Kreator przeprowadzi Ciebie przez proces instalacji LyX-a.$\r$\n\
+					  $\r$\n\
+					  Wymagane s¹ prawa administratora aby zainstalowaæ LyX-a.$\r$\n\
+					  $\r$\n\
+					  Zalecane jest pozamykanie wszystkich innych aplikacji przed uruchomieniem programu instalacyjnego. Pozwoli to zaktualizowaæ pliki systemowe bez wymagania restartu komputera.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "LyX-Document"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Instalacja dla wszystkich u¿ytkowników?"
+${LangFileString} SecFileAssocTitle "Skojarzenie plików .lyx"
+${LangFileString} SecDesktopTitle "Ikona na pulpicie"
+
+${LangFileString} SecCoreDescription "Pliki LyX-a."
+${LangFileString} SecInstGSviewDescription "Program do podgl¹du dokumentów Postscript i PDF."
+${LangFileString} SecInstJabRefDescription "Bibliography reference manager and editor for BibTeX files."
+${LangFileString} SecAllUsersDescription "Instalacja dla wszystkich u¿ytkowników lub tylko dla bie¿¹cego u¿ytkownika."
+${LangFileString} SecFileAssocDescription "Skojarzenie LyX-a z plikami o rozszerzeniu .lyx."
+${LangFileString} SecDesktopDescription "Ikona LyX-a na pulpicie."
+
+${LangFileString} LangSelectHeader "Wybór jêzyka menu LyX-a"
+${LangFileString} AvailableLang " Dostêpne jêzyki "
+
+${LangFileString} EnterLaTeXHeader1 'Dystrybucja LaTeX-a'
+${LangFileString} EnterLaTeXHeader2 'Wybierz dystrybucjê LaTeX-a, któr¹ chcesz u¿ywaæ z LyX-em.'
+${LangFileString} EnterLaTeXFolder 'You can optionally set here the path to the file $\"latex.exe$\" and therewith set the \
+					   LaTeX-distribution that should be used by LyX.$\r$\n\
+					   If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\
+					   $\r$\n\
+					   The installer has detected the LaTeX-distribution \
+					   $\"$LaTeXName$\" on your system. Displayed below is its path.'
+${LangFileString} EnterLaTeXFolderNone 'Set below the path to the file $\"latex.exe$\". Therewith you set which \
+					       LaTeX-distribution should be used by LyX.$\r$\n\
+					       If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\
+					       $\r$\n\
+					       The installer couldn$\'t find a LaTeX-distribution on your system.'
+${LangFileString} PathName 'Path to the file $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "Nie u¿ywaj LaTeX-a"
+${LangFileString} InvalidLaTeXFolder 'Plik $\"latex.exe$\" nie znajduje siê w podanej œcie¿ce.'
+
+${LangFileString} LatexInfo 'Teraz zostanie uruchomiony instalator dystrybucji LaTeX-a $\"MiKTeX$\".$\r$\n\
+			            Aby zainstalowaæ ten program naciœnij przycisk $\"Dalej$\" w oknie instalatora.$\r$\n\
+				    $\r$\n\
+				    !!! Proszê u¿yæ wszystkich domyœlnych opcji instalatora MiKTeX-a !!!'
+${LangFileString} LatexError1 'Nie znaleziono dystrybucji LaTeX-a!$\r$\n\
+                      		      LyX nie mo¿e byæ u¿yty bez dystrybucji LaTeX-a takiej jak $\"MiKTeX$\"!$\r$\n\
+				      Z tego powodu instalacja zostanie przerwana.'
+		
+${LangFileString} GSviewInfo 'Teraz zostanie uruchomiony program instalacyjny $\"GSview$\".$\r$\n\
+			             Aby go zainstalowaæ naciœnij przycisk $\"Setup$\" w pierwszym oknie instalatora,$\r$\n\
+				     w kolejnym oknie wybierz jêzyk i przyciœnij przycisk $\"Next$\".$\r$\n\
+				     Mo¿esz u¿yæ wszystkich domyœlnych opcji instalacji.'
+${LangFileString} GSviewError 'Program $\"GSview$\" nie zosta³ pomyœlnie zainstalowany!$\r$\n\
+		                      Mimo to instalacja bêdzie kontynuowana.$\r$\n\
+				      Spróbuj póŸniej zainstalowaæ program GSview.'
+
+${LangFileString} JabRefInfo 'Now the installer of the program $\"JabRef$\" will be launched.$\r$\n\
+				     You can use all default options of the JabRef-installer.'
+${LangFileString} JabRefError 'The program $\"JabRef$\" could not successfully be installed!$\r$\n\
+		                      The installer will continue anyway.$\r$\n\
+				      Try to install JabRef again later.'
+
+${LangFileString} LatexConfigInfo "Dalsza konfiguracja LyX-a chwilê potrwa."
+
+${LangFileString} MiKTeXPathInfo "In order that every user is later able to customize MiKTeX for his needs$\r$\n\
+					 it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 and its subfolders."
+${LangFileString} MiKTeXInfo 'The LaTeX-distribution $\"MiKTeX$\" will be used together with LyX.$\r$\n\
+				     It is recommended to install available MiKTeX-updates using the program $\"MiKTeX Update Wizard$\"$\r$\n\
+				     before you use LyX for the first time.$\r$\n\
+				     Would you now check for MiKTeX updates?'
+
+${LangFileString} UpdateNotAllowed "This update package can only update ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Nieudana próba ustawienia zmiennej 'path_prefix' w pliku skryptu konfigracyjnego"
+${LangFileString} CreateCmdFilesFailed "Niedana próba utworzenia plików lyx.bat"
+${LangFileString} RunConfigureFailed "Niedana próba wykonania skryptu konfiguracyjnego"
+${LangFileString} NotAdmin "Musisz mieæ prawa administratora aby zainstalowaæ LyX-a!"
+${LangFileString} InstallRunning "Instalator jest ju¿ uruchomiony!"
+${LangFileString} StillInstalled "LyX jest ju¿ zainstalowany! Aby kontynowaæ musisz go najpierw usun¹æ."
+
+${LangFileString} FinishPageMessage "Gratulacje! LyX zosta³ pomyœlnie zainstalowany.$\r$\n\
+					    $\r$\n\
+					    (Pierwsze uruchomienie mo¿e potrwaæ kilka sekund.)"
+${LangFileString} FinishPageRun "Uruchom LyX-a"
+
+${LangFileString} UnNotInRegistryLabel "Nie mo¿na znaleŸæ LyX-a w rejestrze.$\r$\n\
+	                                       Skróty na pulpicie i w menu Start nie zostan¹ usuniête."
+${LangFileString} UnInstallRunning "Musisz najpierw zamkn¹æ LyX-a!"
+${LangFileString} UnNotAdminLabel "Musisz posiadaæ prawa administratora do deinstalacji programu LyX."
+${LangFileString} UnReallyRemoveLabel "Czy na pewno chcesz usun¹æ LyX-a i wszystkie jego komponenty?"
+${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences'
+${LangFileString} UnGSview 'Naciœnij przycisk $\"Odinstaluj$\" w nastêpnym oknie aby odinstalowaæ$\r$\n\
+				   przegl¹darkê Postscript i PDF $\"GSview$\".'
+${LangFileString} UnRemoveSuccessLabel "LyX zosta³ pomyœlnie usuniêty z Twojego komputera."
+
+${LangFileString} SecUnMiKTeXDescription "Uninstalls the LaTeX-distribution MiKTeX."
+${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef."
+${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration folder$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   for all users.'
+${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components."
+
diff --git a/development/Win32/packaging/installer/lang/portuguese.nsh b/development/Win32/packaging/installer/lang/portuguese.nsh
new file mode 100644
index 0000000000..b890f5891c
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/portuguese.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Portuguese"
+
+${LangFileString} WelcomePageText "Este assistente de instalação irá guiá-lo através da instalação do LyX.$\r$\n\
+					  $\r$\n\
+					  Precisa de privilégios de administrador para instalar o LyX.$\r$\n\
+					  $\r$\n\
+					  Recomenda-se fechar todas as outras aplicações antes de iniciar o programa de configuração. Isto torna possivel actualizar os ficheiros de sistema relevantes sem ter que reiniciar o computador.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "Documento LyX"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Instalar para todos os utilizadores?"
+${LangFileString} SecFileAssocTitle "Associação dos ficheiros"
+${LangFileString} SecDesktopTitle "Icone do ambiente de trabalho"
+
+${LangFileString} SecCoreDescription "Os ficheiros LyX."
+${LangFileString} SecInstGSviewDescription "Programa para ver documentos em Postscript e PDF."
+${LangFileString} SecInstJabRefDescription "Gestor de referências bibliográficas e editor de ficheiros BibTeX."
+${LangFileString} SecAllUsersDescription "Instalar o LyX para todos os utilizadores ou apenas para o presente utilizador."
+${LangFileString} SecFileAssocDescription "Os ficheiros com a extensão .lyx irão abrir automaticamente no LyX."
+${LangFileString} SecDesktopDescription "Um icone do LyX no ambiente de trabalho."
+
+${LangFileString} LangSelectHeader "Selecção da linguagem dos menus no LyX"
+${LangFileString} AvailableLang " Línguas disponíveis "
+
+${LangFileString} EnterLaTeXHeader1 'Distribuição de LaTeX'
+${LangFileString} EnterLaTeXHeader2 'Escolher a distribuição de LaTeX que o LyX deverá usar.'
+${LangFileString} EnterLaTeXFolder 'Opcionalmente pode especificar o caminho do ficheiro $\"latex.exe$\" e posteriormente \
+					   escolher a distribuição de LaTeX que vai usar o LyX.$\r$\n\
+					   Sem LaTeX o LyX não pode (pré-)imprimir os documentos!$\r$\n\
+					   $\r$\n\
+					   O instalador detectou a distribuição de LaTeX $\"$LaTeXName$\"\
+					   no seu sistema, no caminho que se mostra abaixo.'
+${LangFileString} EnterLaTeXFolderNone 'Especifique abaixo o caminho ao ficheiro $\"latex.exe$\". Posteriormente escolha \
+					       a distribuição de LaTeX que deve usar o LyX.$\r$\n\
+					       Sem LaTeX o LyX não pode (pré-)imprimir os documentos!$\r$\n\
+					       $\r$\n\
+					       O instalador não pudo achar nenhuma distribuição de LaTeX no seu sistema.'
+${LangFileString} PathName 'Caminho ao ficheiro $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "Não usar LaTeX"
+${LangFileString} InvalidLaTeXFolder 'O ficheiro $\"latex.exe$\" não está no caminho especificado.'
+
+${LangFileString} LatexInfo 'Agora lançar-se-á o instalador da distribuição de LaTeX $\"MiKTeX$\".$\r$\n\
+			            Para instalar o programa carregue no botão $\"Próximo$\" na janela de instalação até a instalação começar.$\r$\n\
+				    $\r$\n\
+				    !!! Por favor use todas as opções por defeito do instalador do MiKTeX !!!'
+${LangFileString} LatexError1 'Não foi encontrada nenhuma distribuição de LaTeX!$\r$\n\
+                      		      O LyX não pode ser usado sem uma distribuição de LaTeX como o $\"MiKTeX$\"!$\r$\n\
+				      A instalação será por isso abortada.'
+
+${LangFileString} GSviewInfo 'Agora lançar-se-á o instalador do programa $\"GSview$\".$\r$\n\
+			             Para instalar carregue no botão $\"Setup$\" na primeira janela de instalação$\r$\n\
+				     escolha a língua e depois carregue no botão $\"Próximo$\" na janela seguinte do instalador.$\r$\n\
+				     Pode usar todas as opções por defeito no instalador do GSview.'
+${LangFileString} GSviewError 'Não se conseguiu instalar o programa $\"GSview$\"!$\r$\n\
+		                      A instalação irá continuar na mesma.$\r$\n\
+				      Tente instalar o GSview outra vez mais tarde.'
+
+${LangFileString} JabRefInfo 'Agora lançar-se-á o instalador do programa $\"JabRef$\".$\r$\n\
+				     Pode usar todas as opções por defeito no instalador do JabRef.'
+${LangFileString} JabRefError 'Não se conseguiu instalar o programa $\"JabRef$\"!$\r$\n\
+		                      A instalação irá continuar na mesma.$\r$\n\
+				      Tente instalar o JabRef outra vez mais tarde.'
+
+${LangFileString} LatexConfigInfo "A configuração seguinte do LyX irá demorar um bocado."
+
+${LangFileString} MiKTeXPathInfo "Para que cada utilizador possa customizar posteriormente o MiKTeX segundo as suas$\r$\n\
+					 necesidades, é preciso a pasta onde foi instalado o MiKTeX$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 e as suas subpastas terem permissão de escritura para todos os utilizadores."
+${LangFileString} MiKTeXInfo 'Junto com o LyX vai-se utilizar a distribuição de LaTeX $\"MiKTeX$\".$\r$\n\
+				     Antes de usar o LyX pela primeira vez, recomenda-se instalar as actualizações disponíveis$\r$\n\
+				     do MiKTeX com o instalador $\"MiKTeX Update Wizard$\"$\r$\n\
+				     Deseja comprovar agora se há actualizações do MiKTeX?'
+
+${LangFileString} UpdateNotAllowed "This update package can only update ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Não conseguimos establecer o 'path_prefix' no script de configuração"
+${LangFileString} CreateCmdFilesFailed "Não foi possível criar o lyx.bat"
+${LangFileString} RunConfigureFailed "Não foi possível executar o script de configuração"
+${LangFileString} NotAdmin "Precisa de privilégios de administrador para instalar o LyX!"
+${LangFileString} InstallRunning "O instalador já está a correr!"
+${LangFileString} StillInstalled "O LyX já está instalado! Desinstale o LyX primeiro."
+
+${LangFileString} FinishPageMessage "Parabéns! O LyX foi instalado com sucesso.$\r$\n\
+					    $\r$\n\
+					    (O primeiro início do LyX pode levar alguns segundos.)"
+${LangFileString} FinishPageRun "Lançar o LyX"
+
+${LangFileString} UnNotInRegistryLabel "Incapaz de encontrar o LyX no registry.$\r$\n\
+					       Os atalhos para o ambiente de trabalho no menu Start não serão removidos."
+${LangFileString} UnInstallRunning "Deve fechar o LyX em primeiro lugar!"
+${LangFileString} UnNotAdminLabel "Precisa de privilégios de administrador para desinstalar o LyX!"
+${LangFileString} UnReallyRemoveLabel "Tem a certeza que quer remover completamente o LyX e todas as suas componentes?"
+${LangFileString} UnLyXPreferencesTitle 'Preferências de utilizador do LyX'
+${LangFileString} UnGSview 'Por favor carregue no botão $\"Desinstalar$\" na próxima janela para desinstalar$\r$\n\
+				   o visualisador de Postscript e PDF $\"GSview$\".'
+${LangFileString} UnRemoveSuccessLabel "LyX foi removido com sucesso do seu computador."
+
+${LangFileString} SecUnMiKTeXDescription "Desinstala a distribuição de LaTeX MiKTeX."
+${LangFileString} SecUnJabRefDescription "Desinstala o gestor de referências bibliográficas JabRef."
+${LangFileString} SecUnPreferencesDescription 'Apaga as pastas de configuração do  LyX$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   de todos os utilizadores.'
+${LangFileString} SecUnProgramFilesDescription "Desinstala LyX e todas as suas componentes."
+
diff --git a/development/Win32/packaging/installer/lang/romanian.nsh b/development/Win32/packaging/installer/lang/romanian.nsh
new file mode 100644
index 0000000000..17e450988b
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/romanian.nsh
@@ -0,0 +1,107 @@
+!insertmacro LANGFILE_EXT "Romanian"
+
+${LangFileString} WelcomePageText "Acest asistent vã va ghida în procesul de instalare a programului LyX. $\r$\n\
+                                         $\r$\n\
+                                         Trebuie sã aveþi drepturi de administrator ca sã puteþi instala LyX. $\r$\n\
+                                         $\r$\n\
+                                         Este recomandat ca sã închideþi celelalte aplicaþii înainte de începerea instalãrii. Acest lucru va permite upgradarea fiºierelor de sistem relevante fãrã sã fiþi nevoiþi sã reporniþi calculatorul.  $\r$\n\
+                                         $\r$\n\
+                                         $_CLICK"
+
+${LangFileString} FileTypeTitle "Document LyX"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Doriþi sã instalaþi pentru toþi utilizatorii?"
+${LangFileString} SecFileAssocTitle "Asocierea fiºierelor"
+${LangFileString} SecDesktopTitle "Iconiþã pe desktop"
+
+${LangFileString} SecCoreDescription "Fiºierele LyX."
+${LangFileString} SecInstGSviewDescription "Program  de vizualizat documente tip Postscript ºi PDF."
+${LangFileString} SecInstJabRefDescription "Gestionarul de Bibliografie ºi editorul de fiºiere tip BibTeX."
+${LangFileString} SecAllUsersDescription "Instaleazã LyX pentru toþi utilizatorii sau doar pentru utilizatorul curent."
+${LangFileString} SecFileAssocDescription "Fiºierele cu extensia .lyx vor fi deschise automat cu LyX."
+${LangFileString} SecDesktopDescription "A iconiþã LyX pe desktop."
+
+${LangFileString} LangSelectHeader "Selecþia de limbaj pentru meniurile LyX."
+${LangFileString} AvailableLang "Limbajele disponibile."
+
+${LangFileString} EnterLaTeXHeader1 'Distribuþia LaTeX'
+${LangFileString} EnterLaTeXHeader2 'Seteazã distribuþia LaTeX pe care sã o foloseascã LyX.'
+${LangFileString} EnterLaTeXFolder 'Opþional puteþi seta calea cãtre fiºierul $\"latex.exe$\" ºi, implicit, seta distribuþia \ LaTeX pe care sã o foloseascã LyX. $\r$\n\
+                                          Dacã nu folosiþi LaTeX, LyX nu va putea sã producã fiºiere!$\r$\n\
+                                          $\r$\n\
+                                          Programul de instalare a detectat distribuþia LaTeX \
+                                          $\"$LaTeXName$\" instalatã pe calculatorul dumneavoastrã. Dedesupt este afiºatã calea acestei distribuþii.'
+${LangFileString} EnterLaTeXFolderNone 'Setaþi calea cãtre fiºierul $\"latex.exe$\" ºi, implicit, seta distribuþia \ LaTeX pe care sã o foloseascã LyX. $\r$\n\
+                                          Dacã nu folosiþi LaTeX, LyX nu va putea sã producã fiºiere!$\r$\n\
+                                          $\r$\n\
+                                          Programul de instalare nu a detectat nici o distribuþia LaTeX instalatã pe calculatorul dumneavoastrã.'
+
+${LangFileString} PathName 'Calea cãtre fiºierul $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "Nu folosi LaTeX"
+${LangFileString} InvalidLaTeXFolder 'Fiºierul $\"latex.exe$\" nu se aflã în calea specificatã.'
+
+${LangFileString} LatexInfo 'Programul de instalare al distribuþiei LaTeX  $\"MiKTeX$\" va fi lansat. $\r$\n\
+                                   Pentru instalare apãsaþi butonul $\"Next$\" în fereastra prgramului de instalare pînã cînd instalarea înncepe. $\r$\n\
+                                   $\r$\n\
+                                   !!! Vã rugãm sã folosiþi setãrile implicite ale programului de instalat MiKTex !!!'
+${LangFileString} LatexError1 'Nu am detectat nici o distribuþia LaTeX instalatã pe calculatorul dumneavoastrã!$\r$\n\
+                                     LyX nu poate fi folosit fãrã o distribuþia LaTeX ca  $\"MiKTeX$\"!$\r$\n\
+                                     Instalarea va fi abandonatã.'
+
+${LangFileString} GSviewInfo 'Acum va fi lansat programul de instalare al aplicaþiei $\"GSview$\".$\r$\n\
+                                    Pentru instalare apãsaþi butonul $\"Setup$\" în fereastra prgramului de instalare,$\r$\n\
+                                    alegeþi un limbaj ºi apãsaþi butonul $\"Next$\" în urmatoarea fereastrã$\r$\n\
+                                    Este indicat sã folosiþi setãrile implicite ale programului de instalat GSview.'
+${LangFileString} GSviewError 'Programul $\"GSview$\" nu a putut fi instalat!$\r$\n\
+                                     Programul de instalare LyX va continua totuºi.$\r$\n\
+                                     Încercaþi sã instalaþi GSview mai tîrziu.'
+
+${LangFileString} JabRefInfo 'Acum va fi lansat programul de instalare al aplicaþiei $\"JabRef$\".$\r$\n\
+                                     Este indicat sã folosiþi setãrile implicite ale programului de instalat  JabRef.'
+${LangFileString} JabRefError 'Programul $\"JabRef$\" nu a putut fi instalat!$\r$\n\
+                                     Programul de instalare LyX va continua totuºi.$\r$\n\
+                                     Încercaþi sã instalaþi JabRef mai tîrziu.'
+
+${LangFileString} LatexConfigInfo "Configurarea programului LyX va dura o perioadã de timp."
+
+${LangFileString} MiKTeXPathInfo "Pentru ca utilizatorii sã poatã modifica setãrile MiKTeX$\r$\n\
+                                        este necesar sã setaþi dreptul de scriere la directorul$\r$\n\
+                                        $MiKTeXPath $\r$\n\
+                                         unde a fost instalat MiKTex ºi toate subdirectoarele pentru toþi utilizatorii."
+${LangFileString} MiKTeXInfo 'Distribuþia LaTeX $\"MiKTeX$\" va fi folositã cu LyX.$\r$\n\
+                                    Este recomandat sã instalaþi actualizãri ale programului MiKTex folosind programul $\"MiKTeX Update Wizard$\"$\r$\n\
+                                    înainte de a folosi LyX pentru prima oarã.$\r$\n\
+                                    Doriþi sã verificaþi dacã sunt disponibile actualizãri pentru MiKTeX?'
+
+${LangFileString} UpdateNotAllowed "Acest program de actualizare poate actualiza numai ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Nu am putut seta 'path_prefix' în procesul de configurare"
+${LangFileString} CreateCmdFilesFailed "Nu am putut crea lyx.bat"
+${LangFileString} RunConfigureFailed "Nu am putut executa scriptul de configurare"
+${LangFileString} NotAdmin "Trebuie sã aveþi drepturi de administrator pentru instalarea programului LyX!"
+${LangFileString} InstallRunning "Programul de instalare este deja pornit!"
+${LangFileString} StillInstalled "LyX este deja instalat! Dezinstalaþi LyX prima oarã."
+
+${LangFileString} FinishPageMessage "Felicitãri! LyX a fost instalat cu succes.$\r$\n\
+                                           $\r$\n\
+                                           (Prima oarã cînd porniþi LyX s-ar putea sã dureze cîteva secunde.)"
+${LangFileString} FinishPageRun "Lanseazã LyX"
+
+${LangFileString} UnNotInRegistryLabel "Nu am gãsit LyX în registri.$\r$\n\
+                                              Scurtãturile de pe desktop ºi Start Menu nu vor fi ºterse."
+${LangFileString} UnInstallRunning "Trebuie sã inchideþi LyX prima oarã!"
+${LangFileString} UnNotAdminLabel "Trebuie sã aveþi drepturi de administrator pentru dezinstalarea programului LyX!"
+${LangFileString} UnReallyRemoveLabel "Sunteþi sigur cã doriþi sã dezinstalaþi programul LyX ºi toate componentele lui?"
+${LangFileString} UnLyXPreferencesTitle 'Preferinþele utilizatorului pentru LyX'
+${LangFileString} UnGSview 'Apãsaþi butonul $\"Uninstall$\" în urmatoarea fereastrã pentru a dezinstala  $\r$\n\
+                                  vizualizatorul de documente tip Postscript ºi PDF  $\"GSview$\".'
+${LangFileString} UnRemoveSuccessLabel "LyX a fost dezinstalat cu succes de pe calculatorul dumneavoastrã."
+
+${LangFileString} SecUnMiKTeXDescription 'Dezinstaleazã Distribuþia LaTeX $\"MiKTeX$\".'
+${LangFileString} SecUnJabRefDescription "Dezinstaleazã gestionarul de bibliografie JabRef."
+${LangFileString} SecUnPreferencesDescription 'ªterge directorul cu setãrile LyX$\r$\n\
+					  $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                          pentru toþi utilizatorii.'
+${LangFileString} SecUnProgramFilesDescription " Dezinstalaþi programul LyX ºi toate componentele lui."
+
diff --git a/development/Win32/packaging/installer/lang/slovak.nsh b/development/Win32/packaging/installer/lang/slovak.nsh
new file mode 100644
index 0000000000..3ddbc283e5
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/slovak.nsh
@@ -0,0 +1,109 @@
+!insertmacro LANGFILE_EXT "Slovak"
+
+${LangFileString} WelcomePageText "Tento sprievodca Vám pomáha inštalova LyX.$\r$\n\
+					  $\r$\n\
+					  Pre inštaláciu LyX potrebujete administrátorské práva.$\r$\n\
+					  $\r$\n\
+					  Odporúèuje sa zavrie všetký ostatné aplikácie pred štartom Setup. Tým sa umožòuje nahradi relevantné dáta sústavy bez nového štartu poèitaèe.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "LyX dokument"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Inštalova pre všetkých užívate¾ov?"
+${LangFileString} SecFileAssocTitle "Usporiadanie data"
+${LangFileString} SecDesktopTitle "Symbol desktopu"
+
+${LangFileString} SecCoreDescription "Program LyX."
+${LangFileString} SecInstGSviewDescription "Program na pozeranie dokumentov Postscript a PDF."
+${LangFileString} SecInstJabRefDescription "Manager pre bibliografický odkaz a editor pre BibTeX files."
+${LangFileString} SecAllUsersDescription "Inštalova LyX pre všetkých užívatelov alebo len pre terajší užívate¾."
+${LangFileString} SecFileAssocDescription "Data s lyx rozšírením sa automaticky otvárajú v LyX."
+${LangFileString} SecDesktopDescription "Symbol LyX na desktopu."
+
+${LangFileString} LangSelectHeader "Vyber jazyka pre LyX"
+${LangFileString} AvailableLang " Pohotové jazyky "
+
+${LangFileString} EnterLaTeXHeader1 'LaTeX distribúcia'
+${LangFileString} EnterLaTeXHeader2 'Urcujte LaTeX distribúciu, ktorú má užíva LyX.'
+${LangFileString} EnterLaTeXFolder 'Tu môžete používa chod k $\"latex.exe$\" a tým používa chod \
+					   LaTeX-distribúciu, ktorá by mohla by používaná cestou LyXu.$\r$\n\
+					   Ak nepoužívate LaTeX, LyX nemôže produkova dokumenty!$\r$\n\
+					   $\r$\n\
+					   Inštalatér detektoval LaTeX-distribúciu \
+					   $\"$LaTeXName$\" na vašej sústave. Dolu vidíte jeho chod.'
+${LangFileString} EnterLaTeXFolderNone 'Používajte dolu chod k $\"latex.exe$\". Tým urcujete, ktorá \
+					       LaTeX-distribúcia má by používaná LyXom.$\r$\n\
+					       Ak nepoužívate LaTeX, LyX nemôže produkova dokumenty!$\r$\n\
+					       $\r$\n\
+					       Inštalatér nemohol nájst LaTeX-distribúciu na vašej sústave.'
+${LangFileString} PathName 'Chod k $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "Neužívajte LaTeX"
+${LangFileString} InvalidLaTeXFolder 'Mapa $\"latex.exe$\" nie je na špecifikovanej ceste.'
+
+${LangFileString} LatexInfo 'Teraz môžete štartova LaTeX distribúciu $\"MiKTeX$\".$\r$\n\
+			            Na inštalovanie programu tlaète gombík $\"Next$\" v inštalovacích oknách až sa zaèína inštalácia.$\r$\n\
+				    $\r$\n\
+				    !!! Prosím užívajte všetký obsiahnuté nastavenia inštalatéra MiKTeX !!!'
+
+${LangFileString} LatexError1 'LaTeX distribúcia sa nemohla nájst!$\r$\n\
+                      		      LyX sa nemôže užíva bez LaTeX distribúcie ako $\"MiKTeX$\"!$\r$\n\
+				      Preto sa inštalácia zastavila.'
+			
+${LangFileString} GSviewInfo 'Teraz štartuje inštalatér programu $\"GSview$\" .$\r$\n\
+			             Na inštaláciu programu tlaète gombík $\"Setup$\" v prvom inštalaènom okne$\r$\n\
+				     Vyberajte jazyk a tlaète gombík $\"Next$\" v nasledujúcich inštalaèných oknách.$\r$\n\
+				     Môžete užívat všetký obsiahnuté nastavenia inštalatéra GSview.'
+${LangFileString} GSviewError 'Program $\"GSview$\" sa nemohol inštalova úspešne!$\r$\n\
+		                      Predsa inštalácia pokraèuje.$\r$\n\
+				      Skúste inštalova GSview ešte raz neskôr.'
+
+${LangFileString} JabRefInfo 'Teraz sa štartuje inštalatér programu $\"JabRef$\".$\r$\n\
+				     Môzete všetký obsiahnuté nastavenia inštalatéra JabRef.'
+${LangFileString} JabRefError 'Program $\"JabRef$\" sa nemohol inštalova úspešne!$\r$\n\
+		                      Predsa inštalácia pokraèuje.$\r$\n\
+				      Skúste inštalova JabRef ešte raz neskôr.'
+				
+${LangFileString} LatexConfigInfo "Na nasledujúcu konfiguráciu LyXu treba poèka chví¾u."
+
+${LangFileString} MiKTeXPathInfo "Aby každý používatel bol neskôr schopný používat MiKTeX pre svoje potreby$\r$\n\
+					 je treba napísat povolenia pre všetkých používatelov do inštalacného papiera MiKTeX $\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 aj do podriadených papierov."
+${LangFileString} MiKTeXInfo 'LaTeX distribúcia $\"MiKTeX$\" sa používa spolu s LyXom.$\r$\n\
+				     Doporuèuje sa inštalovat platné MiKTeX aktualizácie pomocou programu $\"MiKTeX Update Wizard$\"$\r$\n\
+				     pred prvým používaním LyXu.$\r$\n\
+				     Chcete teraz testova MiKTeX aktualizácie?'
+
+${LangFileString} UpdateNotAllowed "This update package can only update ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Nemohol uvies v platnost 'path_prefix' (zoznam s cestami programu) v konfiguraènom skripte"
+${LangFileString} CreateCmdFilesFailed "Nemohol prípravi lyx.bat"
+${LangFileString} RunConfigureFailed "Nemohol vykona konfiguraèný skript"
+${LangFileString} NotAdmin "Pre inštaláciu LyX potrebujete administrátorské práva!"
+${LangFileString} InstallRunning "Inštalatér už behá!"
+${LangFileString} StillInstalled "LyX je už inštalovaný! Najprv treba odinštalova LyX."
+
+${LangFileString} FinishPageMessage "Gratulácia! LyX bol úspešne inštalovaný.$\r$\n\
+					    $\r$\n\
+					    (Prvý LyX štart môže trva niekolko sekund.)"
+${LangFileString} FinishPageRun "Štartova LyX"
+
+${LangFileString} UnNotInRegistryLabel "Nemôže nájs LyX v registre.$\r$\n\
+					       Symboly na desktope a v štartovacom Menu sa nedajú odstrani."
+${LangFileString} UnInstallRunning "Najprv zavrí LyX!"
+${LangFileString} UnNotAdminLabel "Pre odinštaláciu LyX potrebujete administrátorské práva!"
+${LangFileString} UnReallyRemoveLabel "Ste si istý, že chcete kompletne odinštalova LyX a všetký jeho suèiastky?"
+${LangFileString} UnLyXPreferencesTitle 'LyX prednosti užívae¾a'
+${LangFileString} UnGSview 'Prosím tlaète gombík $\"Uninstall$\" v nasledujúcom okne aby Ste inštalovali $\r$\n\
+				   Postscript a PDF-viewer $\"GSview$\".'
+${LangFileString} UnRemoveSuccessLabel "LyX je úspešne odstránený od Vášho poèitaèa."
+
+${LangFileString} SecUnMiKTeXDescription "Odinštaluje LaTeX distribúciu MiKTeX."
+${LangFileString} SecUnJabRefDescription "Odinštaluje bibliografický manager JabRef."
+${LangFileString} SecUnPreferencesDescription 'Odstráni konfiguracné papiere LyXu $\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   pre všetkých uživate¾ov.'
+${LangFileString} SecUnProgramFilesDescription "Odinštaluj LyX a všetký jeho suèiastky."
+
diff --git a/development/Win32/packaging/installer/lang/spanish.nsh b/development/Win32/packaging/installer/lang/spanish.nsh
new file mode 100644
index 0000000000..34e635d5d5
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/spanish.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Spanish"
+
+${LangFileString} WelcomePageText "Este programa instalará LyX en su ordenador.$\r$\n\
+					  $\r$\n\
+					  Usted necesita privilegios de administrador para instalar LyX.$\r$\n\
+					  $\r$\n\
+					  Se recomienda que cierre todas las demás aplicaciones antes de iniciar la instalación. Esto hará posible actualizar archivos relacionados con el sistema sin tener que reiniciar su ordenador.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "Documento LyX"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Instalar para todos los usuarios"
+${LangFileString} SecFileAssocTitle "Asociar ficheros"
+${LangFileString} SecDesktopTitle "Icono de escritorio"
+
+${LangFileString} SecCoreDescription "Los ficheros de LyX."
+${LangFileString} SecInstGSviewDescription "Programa para ver documentos Postscript y PDF."
+${LangFileString} SecInstJabRefDescription "Administrador de referencias bibliograficas e editor de ficheros BibTeX."
+${LangFileString} SecAllUsersDescription "Instalar LyX para todos los usuarios o sólo para el usuario actual."
+${LangFileString} SecFileAssocDescription "Asociar la extensión .lyx con LyX."
+${LangFileString} SecDesktopDescription "Crear un icono de LyX en el escritorio."
+
+${LangFileString} LangSelectHeader "Selección del idioma del menu de LyX "
+${LangFileString} AvailableLang " Idiomas disponibles "
+
+${LangFileString} EnterLaTeXHeader1 'Distribución LaTeX'
+${LangFileString} EnterLaTeXHeader2 'Elija la distribución de LaTeX que debería emplear LyX.'
+${LangFileString} EnterLaTeXFolder 'Opcionalmente puede especificar el camino del fichero $\"latex.exe$\" y posteriormente \
+					   elegir la distribución de LaTeX que va usar LyX.$\r$\n\
+					   ¡Sin LaTeX LyX no puede (pre)imprimir documentos!$\r$\n\
+					   $\r$\n\
+					   El instalador ha detectado la distribución de LaTeX $\"$LaTeXName$\" \
+					   en su sistema, en el camino que se muestra abajo.'
+${LangFileString} EnterLaTeXFolderNone 'Especifique abajo el camino al fichero $\"latex.exe$\". Posteriormente elija \
+					       la distribución de LaTeX que debe usar LyX.$\r$\n\
+					       ¡Sin LaTeX LyX no puede (pre)imprimir documentos!$\r$\n\
+					       $\r$\n\
+					       El instalador non pudo encontrar ninguna distribución LaTeX en su sistema.'
+${LangFileString} PathName 'Camino al fichero $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "No usar LaTeX"
+${LangFileString} InvalidLaTeXFolder 'Imposible encontrar $\"latex.exe$\".'
+
+${LangFileString} LatexInfo 'Ahora se lanzará el instalador de $\"MiKTeX$\", la distribución de LaTeX.$\r$\n\
+			            Para instalar el programa presione el botón $\"Next$\" en la  ventana del instalador hasta que la aplicación arranque.$\r$\n\
+				    $\r$\n\
+				    ¡¡¡ Por favor use todas las opciones por defecto del instalador de MiKTeX !!!'
+${LangFileString} LatexError1 '¡No se ha encontrado ninguna distribución de LaTeX!$\r$\n\
+                      		      ¡LyX no funciona sin una distribución de LaTeX como $\"MiKTeX$\"!$\r$\n\
+				      Por lo tanto la instalación se abortará.'
+
+${LangFileString} GSviewInfo 'Ahora se lanzará el instalador del programa $\"GSview$\".$\r$\n\
+			             Para instalar el programa presione el botón $\"Setup$\" en la primera ventana del instalador$\r$\n\
+				     elija un idioma y luego presione el botón $\"Next$\" en la siguiente ventana del instalador.$\r$\n\
+				     Puede utilizar todas las opciones por defecto del instalador de GSview.'
+${LangFileString} GSviewError '¡El programa $\"GSview$\" no pudo instalarse con éxito!$\r$\n\
+		                      La instalación se continuará de toda forma.$\r$\n\
+				      Intente instalar otra vez GSview más tarde.'
+
+${LangFileString} JabRefInfo 'Ahora se lanzará el instalador del programa $\"JabRef$\".$\r$\n\
+				     Puede utilizar todas las opciones por defecto del instaldor de JabRef.'
+${LangFileString} JabRefError '¡El programa $\"JabRef$\" no pudo instalarse con éxito!$\r$\n\
+		                      La instalación se continuará de toda forma.$\r$\n\
+				      Intente instalar otra vez JabRef más tarde.'
+
+${LangFileString} LatexConfigInfo "La siguiente configuración de LyX va a tardar un poco."
+
+${LangFileString} MiKTeXPathInfo "Para que cada usuario pueda personalizar posteriormente MiKTeX acorde sus$\r$\n\
+					 necesidades, es necesario que la carpeta donde fue instalado MiKTeX's $\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 y sus subcarpetas tengan permiso de escritura para todos los usuarios."
+${LangFileString} MiKTeXInfo 'Junto con LyX se va usar la distribución de LaTeX $\"MiKTeX$\".$\r$\n\
+				     Antes de usar LyX por primera vez, se recomienda instalar las actualizaciones disponibles$\r$\n\
+				     de MiKTeX con el instalador $\"MiKTeX Update Wizard$\"$\r$\n\
+				     ¿Desea comprobar ahora si hay actualizaciones de MiKTeX?'
+
+${LangFileString} UpdateNotAllowed "This update package can only update ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Error al intentar añadir 'path_prefix' durante la ejecución del programa de configuración"
+${LangFileString} CreateCmdFilesFailed "No se pudo crear lyx.bat"
+${LangFileString} RunConfigureFailed "Error al intentar ejecutar el programa de configuración"
+${LangFileString} NotAdmin "Necesita privilegios de administrador para instalar LyX!"
+${LangFileString} InstallRunning "El instalador ya esta siendo ejecutado!"
+${LangFileString} StillInstalled "¡LyX ya esta instalado! Antes desinstale LyX."
+
+${LangFileString} FinishPageMessage "¡Enhorabuena! LyX ha sido instalado con éxito.$\r$\n\
+					    $\r$\n\
+					    (El primer arranque de LyX puede tardar algunos segundos.)"
+${LangFileString} FinishPageRun "Ejecutar LyX"
+
+${LangFileString} UnNotInRegistryLabel "Imposible encontrar LyX en el registro.$\r$\n\
+					       Los accesos rápidos del escritorio y del Menú de Inicio no serán eliminados."
+${LangFileString} UnInstallRunning "Antes cierre LyX!"
+${LangFileString} UnNotAdminLabel "Necesita privilegios de administrador para desinstalar LyX!"
+${LangFileString} UnReallyRemoveLabel "¿Está seguro de que desea eliminar completamente LyX y todos sus componentes?"
+${LangFileString} UnLyXPreferencesTitle 'Preferencias de usuario de LyX'
+${LangFileString} UnGSview 'Por favor, haga clic sobre el botón $\"Uninstall$\" en la siguiente ventana para de-instalar$\r$\n\
+				   el programa $\"GSview$\" (Postscript y PDF-viewer).'
+${LangFileString} UnRemoveSuccessLabel "LyX fue eliminado con éxito de su ordenador."
+
+${LangFileString} SecUnMiKTeXDescription "Desinstala a distribución de LaTeX MiKTeX."
+${LangFileString} SecUnJabRefDescription "Desinstala el administrador de referencias bibliograficas JabRef."
+${LangFileString} SecUnPreferencesDescription 'Elimina las carpetas de configuración de LyX$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   de todos los usuarios.'
+${LangFileString} SecUnProgramFilesDescription "Desinstala LyX y todos sus componentes."
+
diff --git a/development/Win32/packaging/installer/lang/swedish.nsh b/development/Win32/packaging/installer/lang/swedish.nsh
new file mode 100644
index 0000000000..1cb5ccd9ae
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/swedish.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Swedish"
+
+${LangFileString} WelcomePageText "Denna guide tar dig igenom installationen av LyX.$\r$\n\
+					  $\r$\n\
+					  Du behöver administratörsrättigheter för att installera LyX.$\r$\n\
+					  $\r$\n\
+					  Det rekommenderas att du avslutar alla andra program innan du fortsätter installationen. Detta tillåter att installationen uppdaterar nödvändiga systemfiler utan att behöva starta om din dator.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "LyX-dokument"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Installera för alla användare?"
+${LangFileString} SecFileAssocTitle "Filassociationer"
+${LangFileString} SecDesktopTitle "Skrivbordsikon"
+
+${LangFileString} SecCoreDescription "LyX-filer."
+${LangFileString} SecInstGSviewDescription "Program för att visa Postscript- och PDF-dokument."
+${LangFileString} SecInstJabRefDescription "Program för att hantera bibliografiska referenser och redigera BibTeX-filer."
+${LangFileString} SecAllUsersDescription "Installera LyX för alla användare, eller enbart för den aktuella användare."
+${LangFileString} SecFileAssocDescription "Skapa en association mellan programmet och filtilläget .lyx."
+${LangFileString} SecDesktopDescription "En LyXikon på skrivbordet."
+
+${LangFileString} LangSelectHeader "Val av språk i LyXs menyer"
+${LangFileString} AvailableLang " Tillgängliga språk "
+
+${LangFileString} EnterLaTeXHeader1 'LaTeX-distribution'
+${LangFileString} EnterLaTeXHeader2 'Ställ in LaTeX-distributionen som LyX skall använda.'
+${LangFileString} EnterLaTeXFolder 'Alternativt kan du här ställa in sökvägen till filen $\"latex.exe$\" och därmed manuellt bestämma vilken \
+					   LaTeX-distribution som skall användas av LyX.$\r$\n\
+					   Utan LaTeX kan LyX bara redigera LyX-filer, inte producera t.ex. PDF-dokument!$\r$\n\
+					   $\r$\n\
+					   Installationsprogrammet har upptäckt LaTeX-distributionen \
+					   $\"$LaTeXName$\" i ditt system. Nedan visas dess sökväg.'
+${LangFileString} EnterLaTeXFolderNone 'Sätt nedan sökvägen till filen $\"latex.exe$\". Därmed väljer du vilken \
+					       LaTeX-distribution som skall användas av LyX.$\r$\n\
+					       Utan LaTeX kan LyX bara redigera LyX-filer, inte producera t.ex. PDF-dokument!$\r$\n\
+					       $\r$\n\
+					       Installationsprogrammetn kunde inte hitta LaTeX-distributionen i ditt system.'
+${LangFileString} PathName 'Sökväg till filen $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "Använd inte LaTeX"
+${LangFileString} InvalidLaTeXFolder 'Kan inte hitta $\"latex.exe$\"'
+
+${LangFileString} LatexInfo 'Nu kommer installationsprogrammet för LaTeX-distribution $\"MiKTeX$\" att köras.$\r$\n\
+			            För att installera programmet, klicka på knappen $\"Next$\" i installationsfönstret tills installation börjar.$\r$\n\
+				    $\r$\n\
+				    !!! Var snäll och använd standardinställningarna i installationsprogrammet för MiKTeX !!!'
+${LangFileString} LatexError1 'Kan inte hitta någon LaTeX-distribution!$\r$\n\
+                      		      LyX kan inte användas utan en LaTeX-distribution som tex $\"MiKTeX$\"!$\r$\n\
+				      Installation avbryts därför nu.'
+				    
+${LangFileString} GSviewInfo 'Nu kommer installationsprogrammet för $\"GSview$\" att köras.$\r$\n\
+			             För att installera programmet, klicka på knappen $\"Setup$\" i den första dialogrutan i installationsprogrammet\r$\n\
+				     välj ett språk och klicka sedan på knappen $\"Next$\" i det nästkommande installationsfönstret.$\r$\n\
+				     Du kan använda alla standardalternativ i installationsprogrammet för GSview.'
+${LangFileString} GSviewError 'Programmet $\"GSview$\" kunde inte installeras ordentligt!$\r$\n\
+		                      Installationen av LyX kommer att fortsätta ändå.$\r$\n\
+				      Försök installera GSview igen senare.'
+
+${LangFileString} JabRefInfo 'Nu kommer installationsprogrammet för $\"JabRef$\" att köras.$\r$\n\
+				     Du kan använda alla standardalternativ i installationsprogrammet för JabRef.'
+${LangFileString} JabRefError 'Programmet $\"JabRef$\" kunde inte installeras ordentligt!$\r$\n\
+		                      Installationen av LyX kommer att fortsätta ändå.$\r$\n\
+				      Försök installera GSview igen senare.'
+				      
+${LangFileString} LatexConfigInfo "Följande konfigurering av LyX kommer att ta ett tag."
+
+${LangFileString} MiKTeXPathInfo "För att varje användare senare skall kunna anpassa MiKTeX för sina behov$\r$\n\
+					 är det nödvändigt att ge skrivrättigheter till alla användare för MiKTeX's installationskatalog$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 och dess underkataloger."
+${LangFileString} MiKTeXInfo 'LaTeX-distributionen $\"MiKTeX$\" kommer att användas tillsammans med LyX.$\r$\n\
+				     Det rekommenderas att installera tillgängliga uppdateringar av MiKTeX med hjälp av programmet $\"MiKTeX Update Wizard$\".$\r$\n\
+				     innan du använder LyX för första gången.$\r$\n\
+				     Vill du kontrollera om det finns uppdateringar tillgängliga för MiKTeX nu?'
+
+${LangFileString} UpdateNotAllowed "This update package can only update ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Misslyckades med att sätta  'path_prefix' i konfigurationsskriptet"
+${LangFileString} CreateCmdFilesFailed "Kunde inte skapa filen (kommandoskriptet) lyx.bat"
+${LangFileString} RunConfigureFailed "Misslyckades med att köra konfigurationsskriptet"
+${LangFileString} NotAdmin "Du måste ha administratörsrättigheter för att installera LyX!"
+${LangFileString} InstallRunning "Installationsprogrammet körs readan!"
+${LangFileString} StillInstalled "LyX är redan installerat! Avinstallera LyX först."
+
+${LangFileString} FinishPageMessage "Gratulerar! LyX har installerats framgångsrikt.$\r$\n\
+					    $\r$\n\
+					    (Första gången LyX startas tar det litet längre tid då programmet konfigurerar sig själv automatiskt.)"
+${LangFileString} FinishPageRun "Kör LyX"
+
+${LangFileString} UnNotInRegistryLabel "Kan inte hitta LyX i registret\r$\n\
+					       Genvägar på skrivbordet och i startmeny kommer inte att tas bort."
+${LangFileString} UnInstallRunning "Du måste stänga LyX först!"
+${LangFileString} UnNotAdminLabel "Du måste ha administratörsrättigheter för att avinstallera LyX!"
+${LangFileString} UnReallyRemoveLabel "Är du säker på att du verkligen vill fullständigt avinstallera LyX och alla dess komponenter?"
+${LangFileString} UnLyXPreferencesTitle 'LyX$\'s användarinställningar'
+${LangFileString} UnGSview 'Var god tryck på knappen $\"Avinstallera$\" i följande fönster för att avinstallera$\r$\n\
+				    $\"GSview$\" som visar Postscript och PDF.'
+${LangFileString} UnRemoveSuccessLabel "LyX har framgångsrikt avinstallerats från din dator."
+
+${LangFileString} SecUnMiKTeXDescription "Avinstallerar LaTeX-distributionen MiKTeX."
+${LangFileString} SecUnJabRefDescription "Avinstallerar programmet JabRef som används för att hantera bibliografiska referenser."
+${LangFileString} SecUnPreferencesDescription 'Raderar LyX$\'s konfigurationskatalog$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   för alla användare.'
+${LangFileString} SecUnProgramFilesDescription "Avinstallera LyX och alla dess komponenter."
+
diff --git a/development/Win32/packaging/installer/lang/turkish.nsh b/development/Win32/packaging/installer/lang/turkish.nsh
new file mode 100644
index 0000000000..0e658c1899
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/turkish.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Turkish"
+
+${LangFileString} WelcomePageText "Bu sihirbaz size LyX programýný kuracak.$\r$\n\
+					  $\r$\n\
+					  LyX kurabilmek için yönetici yetkilerine ihtiyacýnýz var.$\r$\n\
+					  $\r$\n\
+					  Kuruluma baþlamadan önce diðer programlarý kapatmanýz tavsiye edilir. Böylece bilgisayarýnýzý yeniden baþlatmanýza gerek kalmadan ilgili sistem dosyalarý güncellenebilir.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "LyX-Document"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Tüm kullanýcýlar için kur?"
+${LangFileString} SecFileAssocTitle "Dosya eþleþmeleri"
+${LangFileString} SecDesktopTitle "Masaüstü ikonu"
+
+${LangFileString} SecCoreDescription "LyX dosyalarý."
+${LangFileString} SecInstGSviewDescription "Postscript ve PDF gösterici program."
+${LangFileString} SecInstJabRefDescription "Bibliography reference manager and editor for BibTeX files."
+${LangFileString} SecAllUsersDescription "LyX tüm kullanýcýlar için mi yoksa yalnýzca bu kullanýcýya mý kurulacak."
+${LangFileString} SecFileAssocDescription "Uzantýsý .lyx olan dosyalar otomatik olarak LyX ile açýlsýn."
+${LangFileString} SecDesktopDescription "Masaüstüne bir LyX ikonu koy."
+
+${LangFileString} LangSelectHeader "LyX arabirim dili seçimi"
+${LangFileString} AvailableLang " Mevcut Diller "
+
+${LangFileString} EnterLaTeXHeader1 'LaTeX-daðýtýmý'
+${LangFileString} EnterLaTeXHeader2 'LyX in kullanacaðý LaTeX daðýtýmýný seçin.'
+${LangFileString} EnterLaTeXFolder 'You can optionally set here the path to the file $\"latex.exe$\" and therewith set the \
+					   LaTeX-distribution that should be used by LyX.$\r$\n\
+					   If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\
+					   $\r$\n\
+					   The installer has detected the LaTeX-distribution \
+					   $\"$LaTeXName$\" on your system. Displayed below is its path.'
+${LangFileString} EnterLaTeXFolderNone 'Set below the path to the file $\"latex.exe$\". Therewith you set which \
+					       LaTeX-distribution should be used by LyX.$\r$\n\
+					       If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\
+					       $\r$\n\
+					       The installer couldn$\'t find a LaTeX-distribution on your system.'
+${LangFileString} PathName 'Path to the file $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "LaTeX kullanma"
+${LangFileString} InvalidLaTeXFolder '$\"latex.exe$\" dosyasý belirttiðiniz dizinde bulunamadý.'
+
+${LangFileString} LatexInfo 'Þimdi LaTeX daðýtýmý $\"MiKTeX$\" kurulumu baþlatýlacak.$\r$\n\
+			            Programý kurmak için kurulum baþlayana kadar $\"Devam$\" tuþuyla ilerleyin.$\r$\n\
+				    $\r$\n\
+				    !!! Lütfen MiKTeX kurucusunun öntanýmlý ayarlarýný deðiþtirmeyin !!!'
+${LangFileString} LatexError1 'Hiç bir LaTeX daðýtýmý bulunamadý!$\r$\n\
+                      		      LyX $\"MiKTeX$\" gibi bir LaTeX daðýtýmý olmadan kullanýlamaz!$\r$\n\
+				      Bu nedenle kurulum iptal edilecek.'
+			
+${LangFileString} GSviewInfo 'Þimdi $\"GSview$\" kurulum programý baþlatýlacak.$\r$\n\
+			             Programý kurmak için ile kurulum penceresinde $\"Setup$\" tuþuna basýp$\r$\n\
+				     bir dil seçin, ve sonraki pencerelerde $\"Devam$\" tuþuyla ilerleyin.$\r$\n\
+				     GSview kurulumunun tüm öntanýmlý seçeneklerini kullanabilirsiniz.'
+${LangFileString} GSviewError '$\"GSview$\" kurulumu baþarýsýz oldu!$\r$\n\
+		                      Kurulum gene de devam edecek.$\r$\n\
+				      Daha sonra GSview kurmayý tekrar deneyin.'
+
+${LangFileString} JabRefInfo 'Now the installer of the program $\"JabRef$\" will be launched.$\r$\n\
+				     You can use all default options of the JabRef-installer.'
+${LangFileString} JabRefError 'The program $\"JabRef$\" could not successfully be installed!$\r$\n\
+		                      The installer will continue anyway.$\r$\n\
+				      Try to install JabRef again later.'
+
+${LangFileString} LatexConfigInfo "Sýradaki LyX yapýlandýrmasý biraz zaman alacak."
+
+${LangFileString} MiKTeXPathInfo "In order that every user is later able to customize MiKTeX for his needs$\r$\n\
+					 it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 and its subfolders."
+${LangFileString} MiKTeXInfo 'The LaTeX-distribution $\"MiKTeX$\" will be used together with LyX.$\r$\n\
+				     It is recommended to install available MiKTeX-updates using the program $\"MiKTeX Update Wizard$\"$\r$\n\
+				     before you use LyX for the first time.$\r$\n\
+				     Would you now check for MiKTeX updates?'
+
+${LangFileString} UpdateNotAllowed "This update package can only update ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Yapýlandýrma programýnda 'path_prefix' ayarlanamadý"
+${LangFileString} CreateCmdFilesFailed "lyx.bat oluþturulamadý"
+${LangFileString} RunConfigureFailed "Yapýlandýrma programý çalýþtýrýlamadý"
+${LangFileString} NotAdmin "LyX kurabilmek için yönetici yetkileri gerekiyor!"
+${LangFileString} InstallRunning "Kurulum programý zaten çalýþýyor!"
+${LangFileString} StillInstalled "LyX kurulu zaten! Önce onu kaldýrýn."
+
+${LangFileString} FinishPageMessage "Tebrikler! LyX baþarýyla kuruldu.$\r$\n\
+					    $\r$\n\
+					    (LyX in ilk açýlýþý birkaç saniye alabilir.)"
+${LangFileString} FinishPageRun "LyX Baþlat"
+
+${LangFileString} UnNotInRegistryLabel "Sistem kütüðünde LyX bulunamadý.$\r$\n\
+					       Baþlat menüsü ve masaüstünüzdeki kýsayollar silinemeyecek."
+${LangFileString} UnInstallRunning "Önce LyX i kapatmalýsýnýz!"
+${LangFileString} UnNotAdminLabel "LyX kaldýrabilmek için yönetici yetkileri gerekiyor!"
+${LangFileString} UnReallyRemoveLabel "LyX ve tüm bileþenlerini kaldýrmak istediðinize emin misiniz?"
+${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences'
+${LangFileString} UnGSview 'Lütfen bir sonraki pencerede $\"Kaldýr$\" düðmesine basarak$\r$\n\
+				   $\"GSview$\" postscript ve pdf göstericisini kaldýrýn.'
+${LangFileString} UnRemoveSuccessLabel "LyX bilgisayarýnýzdan baþarýyla kaldýrýldý."
+
+${LangFileString} SecUnMiKTeXDescription "Uninstalls the LaTeX-distribution MiKTeX."
+${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef."
+${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration folder$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   for all users.'
+${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components."
+
diff --git a/development/Win32/packaging/installer/lang/ukrainian.nsh b/development/Win32/packaging/installer/lang/ukrainian.nsh
new file mode 100644
index 0000000000..c5f791a03d
--- /dev/null
+++ b/development/Win32/packaging/installer/lang/ukrainian.nsh
@@ -0,0 +1,108 @@
+!insertmacro LANGFILE_EXT "Ukrainian"
+
+${LangFileString} WelcomePageText "Çà äîïîìîãîþ öüîãî ìàéñòðà âè çìîæåòå âñòàíîâèòè LyX ó âàøó ñèñòåìó.$\r$\n\
+					  $\r$\n\
+					  Äëÿ òîãî, ùîá âñòàíîâèòè LyX âàì ïîòð³áí³ ïðàâà àäì³í³ñòðàòîðà.$\r$\n\
+					  $\r$\n\
+					  Ìè ðåêîìåíäóºìî âàì çàêðèòè â³êíà âñ³õ ³íøèõ ïðîãðàì ïåðø í³æ ðîçïî÷àòè âñòàíîâëåííÿ. Öå çðîáèòü ìîæëèâèì îíîâëåííÿ âñ³õ ïîòð³áíèõ ñèñòåìíèõ ôàéë³â áåç ïåðåçàâàíòàæåííÿ âàøîãî êîìï’þòåðà.$\r$\n\
+					  $\r$\n\
+					  $_CLICK"
+
+${LangFileString} FileTypeTitle "Äîêóìåíò LyX"
+
+${LangFileString} SecInstGSviewTitle "GSview"
+${LangFileString} SecInstJabRefTitle "JabRef"
+${LangFileString} SecAllUsersTitle "Âñòàíîâèòè äëÿ âñ³õ êîðèñòóâà÷³â?"
+${LangFileString} SecFileAssocTitle "Ïðèâ’ÿçêà ôàéë³â"
+${LangFileString} SecDesktopTitle "ϳêòîãðàìà ñò³ëüíèö³"
+
+${LangFileString} SecCoreDescription "Ôàéëè LyX."
+${LangFileString} SecInstGSviewDescription "Ïðîãðàìà äëÿ ïåðåãëÿäó äîêóìåíò³â ó ôîðìàòàõ Postscript ³ PDF."
+${LangFileString} SecInstJabRefDescription "Çàñ³á äëÿ ðîáîòè ç á³áë³îãðàô³÷íèìè ïîñèëàííÿìè ³ ðåäàêòîð ôàéë³â BibTeX."
+${LangFileString} SecAllUsersDescription "Âèçíà÷àº, ÷è ñë³ä âñòàíîâèòè LyX äëÿ âñ³õ êîðèñòóâà÷³â, ÷è ëèøå äëÿ ïîòî÷íîãî êîðèñòóâà÷à."
+${LangFileString} SecFileAssocDescription "Ôàéëè ç ñóô³êñîì .lyx àâòîìàòè÷íî â³äêðèâàòèìóòüñÿ çà äîïîìîãîþ LyX."
+${LangFileString} SecDesktopDescription "ϳêòîãðàìà LyX íà ñò³ëüíèö³."
+
+${LangFileString} LangSelectHeader "Âèá³ð ìîâè ìåíþ LyX"
+${LangFileString} AvailableLang " Äîñòóïí³ ìîâè "
+
+${LangFileString} EnterLaTeXHeader1 'Äèñòðèáóòèâ LaTeX'
+${LangFileString} EnterLaTeXHeader2 'Âêàæ³òü äèñòðèáóòèâ LaTeX, ÿêèé ìຠâèêîðèñòîâóâàòè LyX.'
+${LangFileString} EnterLaTeXFolder 'Êð³ì òîãî, âè ìîæåòå âñòàíîâèòè òóò ðîçòàøóâàííÿ ôàéëà $\"latex.exe$\" ³ òàêèì ÷èíîì \
+					   âñòàíîâèòè äèñòðèáóòèâ LaTeX, ÿêèé ìຠáóòè âèêîðèñòàíî LyX.$\r$\n\
+					   ßêùî âè íå âèêîðèñòîâóâàòèìåòå LaTeX, LyX íå çìîæå ñòâîðþâàòè äîêóìåíò³â!$\r$\n\
+					   $\r$\n\
+					   Çàñîáó âñòàíîâëåííÿ ïðîãðàìè âäàëîñÿ âèÿâèòè äèñòðèáóòèâ LaTeX \
+					   $\"$LaTeXName$\" ó âàø³é ñèñòåì³. Íèæ÷å ïîêàçàíî éîãî ðîçòàøóâàííÿ.'
+${LangFileString} EnterLaTeXFolderNone 'Íèæ÷å âè ìàºòå âñòàíîâèòè ðîçòàøóâàííÿ ôàéëà $\"latex.exe$\". Òàêèì ÷èíîì, âè âñòàíîâèòå \
+					       äèñòðèáóòèâ LaTeX, ÿêèé ñë³ä âèêîðèñòîâóâàòè ó LyX.$\r$\n\
+					       ßêùî âè íå âèêîðèñòîâóâàòèìåòå LaTeX, LyX íå çìîæå ñòâîðþâàòè äîêóìåíò³â!$\r$\n\
+					       $\r$\n\
+					       Çàñîáó âñòàíîâëåííÿ íå âäàëîñÿ âèÿâèòè äèñòðèáóòèâà LaTeX ó âàø³é ñèñòåì³.'
+${LangFileString} PathName 'Ðîçòàøóâàííÿ ôàéëà $\"latex.exe$\"'
+${LangFileString} DontUseLaTeX "Íå âèêîðèñòîâóâàòè LaTeX"
+${LangFileString} InvalidLaTeXFolder 'Ó âêàçàí³é òåö³ íåìຠôàéëà $\"latex.exe$\".'
+
+${LangFileString} LatexInfo 'Òåïåð áóäå çàïóùåíî çàñ³á âñòàíîâëåííÿ äèñòðèáóòèâà LaTeX ç íàçâîþ $\"MiKTeX$\".$\r$\n\
+			            Ùîá âñòàíîâèòè ïðîãðàìó, íàòèñêàéòå êíîïêó $\"Next$\" ó â³êí³ çàñîáó äëÿ âñòàíîâëåííÿ, àæ äîêè íå ðîçïî÷íåòüñÿ ïðîöåñ âñòàíîâëåííÿ.$\r$\n\
+				    $\r$\n\
+				    !!! Áóäü ëàñêà, âèêîðèñòîâóéòå ëèøå òèïîâ³ ïàðàìåòðè çàñîáó äëÿ âñòàíîâëåííÿ MiKTeX !!!'
+${LangFileString} LatexError1 'Äèñòðèáóòèâ³â LaTeX íå âèÿâëåíî!$\r$\n\
+                      		      Âè íå çìîæåòå êîðèñòóâàòèñÿ LyX áåç äèñòðèáóòèâà LaTeX íà çðàçîê $\"MiKTeX$\"!$\r$\n\
+				      Ç ö³º¿ ïðè÷èíè âñòàíîâëåííÿ áóäå ïðèïèíåíî.'
+			    
+${LangFileString} GSviewInfo 'Òåïåð áóäå çàïóùåíî çàñ³á äëÿ âñòàíîâëåííÿ ïðîãðàìè $\"GSview$\".$\r$\n\
+			             Ùîá âñòàíîâèòè ïðîãðàìó, íàòèñí³òü êíîïêó $\"Setup$\" ó ïåðøîìó â³êí³ çàñîáó äëÿ âñòàíîâëåííÿ,$\r$\n\
+				     âèáåð³òü ìîâó, à ïîò³ì íàòèñêàéòå êíîïêó $\"Next$\" ó âñ³õ íàñòóïíèõ â³êíàõ çàñîáó äëÿ âñòàíîâëåííÿ.$\r$\n\
+				     Âè ìîæåòå âèêîðèñòîâóâàòè òèïîâ³ ïàðàìåòðè çàñîáó äëÿ âñòàíîâëåííÿ GSview.'
+${LangFileString} GSviewError 'Íå âäàëîñÿ âñòàíîâèòè ïðîãðàìó $\"GSview$\"!$\r$\n\
+		                      Ïðîöåñ âñòàíîâëåííÿ LyX áóäå ïðîäîâæåíî.$\r$\n\
+				      Ñïðîáóéòå âñòàíîâèòè GSview ï³çí³øå ñàìîñò³éíî.'
+				      
+${LangFileString} JabRefInfo 'Òåïåð áóäå çàïóùåíî çàñ³á äëÿ âñòàíîâëåííÿ ïðîãðàìè $\"JabRef$\".$\r$\n\
+				     Ó çàñîá³ äëÿ âñòàíîâëåííÿ âè ìîæåòå íå çì³íþâàòè òèïîâèõ ïàðàìåòð³â JabRef.'
+${LangFileString} JabRefError 'Íå âäàëîñÿ âñòàíîâèòè ïðîãðàìó $\"JabRef$\"!$\r$\n\
+		                      Ïðîöåñ âñòàíîâëåííÿ LyX áóäå ïðîäîâæåíî.$\r$\n\
+				      Ñïðîáóéòå âñòàíîâèòè JabRef ï³çí³øå ñàìîñò³éíî.'
+				      
+${LangFileString} LatexConfigInfo "Íàëàøòóâàííÿ LyX ìîæå òðèâàòè äîñèòü äîâãî."
+
+${LangFileString} MiKTeXPathInfo "Ùîá êîæåí ç êîðèñòóâà÷³â ì³ã ï³çí³øå íàëàøòóâàòè MiKTeX çã³äíî äî âëàñíèõ ïîòðåá,$\r$\n\
+					 ñë³ä âñòàíîâèòè ïðàâà íà çàïèñ MiKTeX äëÿ âñ³õ êîðèñòóâà÷³â äî òåêè, êóäè éîãî âñòàíîâëåíî:$\r$\n\
+					 $MiKTeXPath $\r$\n\
+					 ³ âñ³õ ï³äòåê ö³º¿ òåêè."
+${LangFileString} MiKTeXInfo 'Ó LyX âèêîðèñòîâóâàòèìåòüñÿ äèñòðèáóòèâ LaTeX $\"MiKTeX$\".$\r$\n\
+				     Ìè ðåêîìåíäóºìî âàì âñòàíîâèòè âñ³ äîñòóïí³ îíîâëåííÿ MiKTeX çà äîïîìîãîþ ïðîãðàìè $\"MiKTeX Update Wizard$\"$\r$\n\
+				     äî òîãî, ÿê âè âïåðøå ñêîðèñòàºòåñÿ LyX.$\r$\n\
+				     Áàæàºòå ïåðåâ³ðèòè íàÿâí³ñòü îíîâëåíü MiKTeX?'
+
+${LangFileString} UpdateNotAllowed "Öåé ïàêóíîê äëÿ îíîâëåííÿ ïðèçíà÷åíî ëèøå äëÿ ${PRODUCT_VERSION_OLD}!"
+${LangFileString} ModifyingConfigureFailed "Íå âäàëîñÿ âñòàíîâèòè 'path_prefix' ó ñêðèïò³ íàëàøòóâàííÿ"
+${LangFileString} CreateCmdFilesFailed "Íå âäàëîñÿ ñòâîðèòè lyx.bat"
+${LangFileString} RunConfigureFailed "Íå âäàëîñÿ âèêîíàòè ñêðèïò íàëàøòóâàííÿ"
+${LangFileString} NotAdmin "Äëÿ âñòàíîâëåííÿ LyX âàì ïîòð³áí³ ïðèâ³ëå¿ àäì³í³ñòðàòîðà!"
+${LangFileString} InstallRunning "Çàñ³á äëÿ âñòàíîâëåííÿ âæå ïðàöþº!"
+${LangFileString} StillInstalled "LyX âæå âñòàíîâëåíî! Ñïî÷àòêó âèëó÷³òü éîãî LyX."
+
+${LangFileString} FinishPageMessage "³òàºìî! LyX áóëî óñï³øíî âñòàíîâëåíî.$\r$\n\
+					    $\r$\n\
+					    (Ïåðøèé çàïóñê LyX ìîæå òðèâàòè äåê³ëüêà ñåêóíä.)"
+${LangFileString} FinishPageRun "Çàïóñòèòè LyX"
+
+${LangFileString} UnNotInRegistryLabel "Íå âäàëîñÿ çíàéòè çàïèñè LyX ó ðåã³ñòð³.$\r$\n\
+					       Çàïèñè íà ñò³ëüíèö³ ³ ó ìåíþ çàïóñêó âèëó÷åíî íå áóäå."
+${LangFileString} UnInstallRunning "Ñïî÷àòêó ñë³ä çàâåðøèòè ðîáîòó ïðîãðàìè LyX!"
+${LangFileString} UnNotAdminLabel "Äëÿ âèëó÷åííÿ LyX âàì ñë³ä ìàòè ïðèâ³ëå¿ àäì³í³ñòðàòîðà!"
+${LangFileString} UnReallyRemoveLabel "Âè ñïðàâä³ áàæàºòå ïîâí³ñòþ âèëó÷èòè LyX ³ âñ³ éîãî êîìïîíåíòè?"
+${LangFileString} UnLyXPreferencesTitle 'Ïàðàìåòðè LyX, âñòàíîâëåí³ êîðèñòóâà÷åì'
+${LangFileString} UnGSview 'Áóäü ëàñêà, íàòèñí³òü êíîïêó $\"Uninstall$\" ó íàñòóïíîìó â³êí³, ùîá âèëó÷èòè$\r$\n\
+				   ïåðåãëÿäà÷ Postscript ³ PDF $\"GSview$\".'
+${LangFileString} UnRemoveSuccessLabel "LyX áóëî óñï³øíî âèëó÷åíî ç âàøîãî êîìï’þòåðà."
+
+${LangFileString} SecUnMiKTeXDescription "Âèëó÷ຠäèñòðèáóòèâ LaTeX - MiKTeX."
+${LangFileString} SecUnJabRefDescription "Âèëó÷ຠçàñ³á äëÿ ðîáîòè ç á³áë³îãðàô³÷íèìè äàíèìè JabRef."
+${LangFileString} SecUnPreferencesDescription 'Âèëó÷ຠòåêó ç íàëàøòóâàííÿìè LyX$\r$\n\
+					   $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+					   äëÿ âñ³õ êîðèñòóâà÷³â.'
+${LangFileString} SecUnProgramFilesDescription "Âèëó÷èòè LyX ³ âñ³ éîãî êîìïîíåíòè."
+
diff --git a/development/Win32/packaging/installer/lyx-bundle.nsi b/development/Win32/packaging/installer/lyx-bundle.nsi
new file mode 100644
index 0000000000..6d53b1aea0
--- /dev/null
+++ b/development/Win32/packaging/installer/lyx-bundle.nsi
@@ -0,0 +1,62 @@
+/*
+
+NSIS Script - LyX 2.0 Installer for Win32
+Authors: Joost Verburg, Angus Leeming, Uwe Stöhr
+Compatible with NSIS 2.46
+
+*/
+
+# Do a Cyclic Redundancy Check to make sure the installer
+# was not corrupted by the download.
+CRCCheck force
+#
+# Make the installer as small as possible.
+SetCompressor /SOLID lzma
+
+!ifndef SETUPTYPE
+ !define SETUPTYPE BUNDLE
+!endif
+
+# installer settings like version numbers
+!include settings.nsh
+
+# declarations of LyX's registry keys and installer variant
+!include include\declarations.nsh
+
+# definitions of global variables
+!include include\variables.nsh
+
+# configuration of standard NSIS header files
+!include include\nsis.nsh
+
+# list of files to be included in the installer
+!include include\filelist.nsh
+
+# detect third-party programs like Inkscape and LaTeX
+!include include\detection.nsh
+
+# set up the installer pages
+!include include\gui.nsh
+
+# 
+!include include\init.nsh
+
+# install LyX and needed third-party programs like Python etc.
+!include setup\install.nsh
+
+# uninstall LyX and all programs that were installed together with LyX
+!include setup\uninstall.nsh
+
+# configure LyX (set start menu and write registry entries)
+!include setup\configure.nsh
+
+# 
+!include gui\external.nsh
+
+# 
+!include gui\reinstall.nsh
+
+#--------------------------------
+# Output file
+
+Outfile "${SETUP_EXE}"
diff --git a/development/Win32/packaging/installer/lyx-standard.nsi b/development/Win32/packaging/installer/lyx-standard.nsi
new file mode 100644
index 0000000000..b910ff48c5
--- /dev/null
+++ b/development/Win32/packaging/installer/lyx-standard.nsi
@@ -0,0 +1,62 @@
+/*
+
+NSIS Script - LyX 2.0 Installer for Win32
+Authors: Joost Verburg, Angus Leeming, Uwe Stöhr
+Compatible with NSIS 2.46
+
+*/
+
+# Do a Cyclic Redundancy Check to make sure the installer
+# was not corrupted by the download.
+CRCCheck force
+#
+# Make the installer as small as possible.
+SetCompressor /SOLID lzma
+
+!ifndef SETUPTYPE
+ !define SETUPTYPE STANDARD
+!endif
+
+# installer settings like version numbers
+!include settings.nsh
+
+# declarations of LyX's registry keys and installer variant
+!include include\declarations.nsh
+
+# definitions of global variables
+!include include\variables.nsh
+
+# configuration of standard NSIS header files
+!include include\nsis.nsh
+
+# list of files to be included in the installer
+!include include\filelist.nsh
+
+# detect third-party programs like Inkscape and LaTeX
+!include include\detection.nsh
+
+# set up the installer pages
+!include include\gui.nsh
+
+# 
+!include include\init.nsh
+
+# install LyX and needed third-party programs like Python etc.
+!include setup\install.nsh
+
+# uninstall LyX and all programs that were installed together with LyX
+!include setup\uninstall.nsh
+
+# configure LyX (set start menu and write registry entries)
+!include setup\configure.nsh
+
+# 
+!include gui\external.nsh
+
+# 
+!include gui\reinstall.nsh
+
+#--------------------------------
+# Output file
+
+Outfile "${SETUP_EXE}"
diff --git a/development/Win32/packaging/installer/lyx.nsi b/development/Win32/packaging/installer/lyx.nsi
deleted file mode 100644
index 4c5e85c69a..0000000000
--- a/development/Win32/packaging/installer/lyx.nsi
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-
-NSIS Script - LyX 2.0 Installer for Win32
-Authors: Joost Verburg, Angus Leeming, Uwe Stöhr
-Compatible with NSIS 2.46
-
-*/
-
-!include settings.nsh
-
-!include include\declarations.nsh
-!include include\variables.nsh
-!include include\nsis.nsh
-!include include\filelist.nsh
-!include include\detection.nsh
-!include include\gui.nsh
-!include include\init.nsh
-!include setup\install.nsh
-!include setup\uninstall.nsh
-!include setup\configure.nsh
-!include gui\external.nsh
-!include gui\reinstall.nsh
-
-#--------------------------------
-# Output file
-
-Outfile "${SETUP_EXE}"
diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 4e3ab349be..23aa788ce4 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -12,20 +12,20 @@ These typically need to be modified for each LyX release
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 0
 !define APP_VERSION_REVISION 0
-!define APP_VERSION_BUILD 0 # Start with 1 for the installer releases of each version
+!define APP_VERSION_BUILD 4 # Start with 1 for the installer releases of each version
 
-!define /date APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}svn %Y%m%d" # Version to display
+!define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}" # Version to display
 
 #--------------------------------
 # Installer file name
 
-# Typical names for the release are "LyX-2.0.0-1-Installer.exe" etc.
+# Typical names for the release are "LyX-201-1-Installer.exe" etc.
 
 !ifndef ExeFile
-  !define /date ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer.exe"
+  !define ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-${APP_VERSION_BUILD}-Installer.exe"
 !endif
 !ifndef BundleExeFile
-  !define /date BundleExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer-Bundle.exe"
+  !define BundleExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-${APP_VERSION_BUILD}-Bundle.exe"
 !endif
 !ifndef MinimalExeFile
   !define /date MinimalExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer-Minimal.exe"
@@ -34,15 +34,27 @@ These typically need to be modified for each LyX release
 #--------------------------------
 # File locations
 
-!define FILES_LYX "C:\LyX\lyx-20-install"
-!define FILES_DEPS "C:\LyX\lyx-20-build\msvc2010-deps\deps20"
-!define FILES_BUNDLE "C:\LyX\depsbundle"
-!define FILES_QT "C:\Qt\qt-everywhere-opensource-src-4.7.1"
+!define FILES_LYX "D:\LyXPackage2.0\LyX"
+!define FILES_DEPS "D:\LyXSVN\LyX2.0.x\lyx-windows-deps-msvc2008"
+!define FILES_BUNDLE "D:\LyX\depsbundle"
+!define FILES_QT "D:\Qt"
+!define ClassFileDir "${FILES_LYX}\Resources\tex"
+!define DVIPostFileDir "${FILES_DEPS}\tex"
 
 #--------------------------------
 # MiKTeX
 # Sizes in KB
 
-!define SETUPFILE_LATEX "basic-miktex-2.9.4146.exe"
-!define SIZE_DOWNLOAD_LATEX 160106
-!define SIZE_LATEX 380000
+!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
+
+# definitions for the Complete installer
+!if ${SETUPTYPE} == BUNDLE
+ !define GSviewInstall "external\gsv49w32.exe"
+ !define JabRefInstall "external\JabRef-2.6-setup.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4106.exe"
+ !define JabRefVersion "2.6"
+ !define MiKTeXDeliveredVersion "2.9"
+ !define SIZE_DOWNLOAD_LATEX 160106
+ !define SIZE_LATEX 380000
+!endif
+
diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index e3f4c56c2d..21b5bf0756 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -6,34 +6,10 @@ Write registry information and configure LyX
 
 */
 
-Var DistFile
+#Var DistFile
 Var PathPrefix
 
-!define SHORTCUT '${APP_NAME} ${APP_SERIES_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}"'
-
-#--------------------------------
-# File associations
-
-Section -FileAssociations
-
-  # Associate .lyx files with LyX for current user of all users
-
-  # Write information about file type
-  !define REG_FILETYPE 'WriteRegStr SHELL_CONTEXT "Software\Classes\${APP_REGNAME_DOC}'
-  
-  ${REG_FILETYPE}" "" "${APP_NAME} Document"
-  ${REG_FILETYPE}\DefaultIcon" "" "$INSTDIR\${APP_RUN},0"
-  ${REG_FILETYPE}\Shell\open\command" "" '"$INSTDIR\${APP_RUN}" "%1"'
-  
-  !define REG_FILEEXT 'WriteRegStr SHELL_CONTEXT "Software\Classes\${APP_EXT}"'
-  
-  ${REG_FILEEXT} "" "${APP_REGNAME_DOC}"
-  ${REG_FILEEXT} "Content Type" "${APP_MIME_TYPE}"
-  
-  # Refresh shell
-  ${RefreshShellIcons}
-
-SectionEnd
+#!define SHORTCUT '${APP_NAME} ${APP_SERIES_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}"'
 
 #--------------------------------
 # Registry information
@@ -41,32 +17,37 @@ SectionEnd
 Section -InstallData
 
   # Registry information
-  WriteRegStr SHELL_CONTEXT ${APP_REGKEY} "" $INSTDIR
-  WriteRegStr SHELL_CONTEXT ${APP_REGKEY} "Version" "${APP_VERSION_NUMBER}"
-
-  WriteRegStr SHELL_CONTEXT ${APP_REGKEY_SETUP} "LaTeX Path" $PathLaTeX
-
+  WriteRegStr SHCTX ${APP_REGKEY} "" $INSTDIR
+  WriteRegStr SHCTX ${APP_REGKEY} "Version" "${APP_VERSION_NUMBER}"
+  WriteRegStr SHCTX ${APP_REGKEY_SETUP} "LaTeX Path" $PathLaTeX
+  
   # Start Menu shortcut
   # There is only one shortcut to the application, so it should be in the main group
-  SetOutPath "$INSTDIR\bin"
-  CreateShortCut "$SMPROGRAMS\${SHORTCUT}
-    
-  # Uninstaller information
-  !define REG_UNINSTALL 'WriteRegStr SHELL_CONTEXT "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SETUP_UNINSTALLER_KEY}"'
+  CreateDirectory "$SMPROGRAMS\$StartmenuFolder"
+  CreateShortCut "$SMPROGRAMS\$StartmenuFolder\${APP_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}"
+  # create desktop icon
+  ${if} $CreateDesktopIcon == "true"
+   SetOutPath "$INSTDIR\bin"
+   CreateShortCut "$DESKTOP\${APP_NAME} ${APP_SERIES_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}"
+  ${endif}
   
+  # Uninstaller information
   ${If} $MultiUser.InstallMode == "CurrentUser"
-    ${REG_UNINSTALL} "DisplayName" "${APP_NAME} ${APP_VERSION} $(TEXT_INSTALL_CURRENTUSER)"
+    WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayName" "${APP_NAME} ${APP_VERSION} $(TEXT_INSTALL_CURRENTUSER)"
   ${Else}
-    ${REG_UNINSTALL} "DisplayName" "${APP_NAME} ${APP_VERSION}"
+    WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayName" "${APP_NAME} ${APP_VERSION}"
   ${EndIf}
   
-  ${REG_UNINSTALL} "UninstallString" '"$INSTDIR\${SETUP_UNINSTALLER}"'
-  ${REG_UNINSTALL} "DisplayVersion" "${APP_VERSION}"
-  ${REG_UNINSTALL} "DisplayIcon" "$INSTDIR\bin\LyXLauncher,0"
-  ${REG_UNINSTALL} "URLUpdateInfo" "http://www.lyx.org/"
-  ${REG_UNINSTALL} "URLInfoAbout" "http://www.lyx.org/about/"
-  ${REG_UNINSTALL} "Publisher" "LyX Team"
-  ${REG_UNINSTALL} "HelpLink" "http://www.lyx.org/internet/mailing.php"  
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "UninstallString" '"$INSTDIR\${SETUP_UNINSTALLER}"'
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayVersion" "${APP_VERSION}"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\bin\LyXLauncher,0"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "URLUpdateInfo" "http://www.lyx.org/"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "URLInfoAbout" "http://www.lyx.org/about/"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "Publisher" "LyX Team"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "HelpLink" "http://www.lyx.org/internet/mailing.php"
+  WriteRegDWORD SHCTX ${APP_UNINST_KEY} "NoModify" 0x00000001
+  WriteRegDWORD SHCTX ${APP_UNINST_KEY} "NoRepair" 0x00000001
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "StartMenu" "$SMPROGRAMS\$StartmenuFolder"
   
 SectionEnd
 
@@ -75,36 +56,105 @@ SectionEnd
 
 Section -Configure
 
+  # Associate .lyx files with LyX for current user of all users
+
+  ${if} $CreateFileAssociations == "true"
+   WriteRegStr HKLM "${APP_DIR_REGKEY}" "" "$INSTDIR\${APP_RUN}"
+  ${endif}
+
+  # Write information about file type
+  #!define REG_FILETYPE 'WriteRegStr SHCTX "Software\Classes\${APP_REGNAME_DOC}"'
+  
+  ${if} $CreateFileAssociations == "true"
+   WriteRegStr SHCTX "${APP_DIR_REGKEY}" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" # special entry to test if they were registered by this LyX version
+   WriteRegStr SHCTX "Software\Classes\${APP_REGNAME_DOC}" "" "${APP_NAME} Document"
+   WriteRegStr SHCTX "Software\Classes\${APP_REGNAME_DOC}\DefaultIcon" "" "$INSTDIR\${APP_RUN},0"
+   WriteRegStr SHCTX "Software\Classes\${APP_REGNAME_DOC}\Shell\open\command" "" '"$INSTDIR\${APP_RUN}" "%1"'
+   WriteRegStr SHCTX "Software\Classes\${APP_EXT}" "" "${APP_REGNAME_DOC}"
+   WriteRegStr SHCTX "Software\Classes\${APP_EXT}" "Content Type" "${APP_MIME_TYPE}"
+   # .lyx13
+   WriteRegStr SHCTX "Software\Classes\${APP_EXT}13" "" "${APP_REGNAME_DOC}"
+   WriteRegStr SHCTX "Software\Classes\${APP_EXT}13" "Content Type" "${APP_MIME_TYPE}"
+   # .lyx14
+   WriteRegStr SHCTX "Software\Classes\${APP_EXT}14" "" "${APP_REGNAME_DOC}"
+   WriteRegStr SHCTX "Software\Classes\${APP_EXT}14" "Content Type" "${APP_MIME_TYPE}"
+   # .lyx15 don't set this, because this is designed to be opened with LyX 1.5.x
+   #WriteRegStr SHCTX "Software\Classes\${APP_EXT}15" "" "${PRODUCT_REGNAME}"
+   #WriteRegStr SHCTX "Software\Classes\${APP_EXT}15" "Content Type" "${PRODUCT_MIME_TYPE}"
+   # .lyx16 don't set this, because this is designed to be opened with LyX 1.6.x
+   #WriteRegStr SHCTX "Software\Classes\${APP_EXT}16" "" "${PRODUCT_REGNAME}"
+   #WriteRegStr SHCTX "Software\Classes\${APP_EXT}16" "Content Type" "${PRODUCT_MIME_TYPE}"
+  
+   # Refresh shell
+   ${RefreshShellIcons}
+  ${endif}
+  
   # Set path prefix in lyxrc.dist
 
   # Install standard lyxrc.dist file
-  SetOutPath "$INSTDIR\Resources"
-  File "${FILES_DEPS}\Resources\lyxrc.dist"
-
-  # Append path prefix
-  FileOpen $DistFile "$INSTDIR\Resources\lyxrc.dist" a
-  FileSeek $DistFile 0 END
+  #SetOutPath "$INSTDIR\Resources"
+  #File "${FILES_DEPS}\Resources\lyxrc.dist"
 
+  # create the path prefix
   # $$ represents a literal $ in an NSIS string
   StrCpy $PathPrefix "$$LyXDir\bin;$$LyXDir\python;$$LyXDir\imagemagick;$$LyXDir\ghostscript"
   
   ${If} $PathLaTeX != ""
     StrCpy $PathPrefix "$PathPrefix;$PathLaTeX"
   ${EndIf}
+  ${if} $PSVPath != ""
+    StrCpy $PathPrefix "$PathPrefix;$PSVPath"
+  ${endif}
+  ${if} $EditorPath != ""
+    StrCpy $PathPrefix "$PathPrefix;$EditorPath"
+  ${endif}
+  ${if} $ImageEditorPath != ""
+    StrCpy $PathPrefix "$PathPrefix;$ImageEditorPath"
+  ${endif}
+  ${if} $SVGPath != ""
+   StrCpy $PathPrefix "$PathPrefix;$SVGPath"
+  ${endif}
+  ${if} $WMFPath != ""
+   StrCpy $PathPrefix "$PathPrefix;$WMFPath"
+  ${endif}
   ${If} $PathBibTeXEditor != ""
     StrCpy $PathPrefix "$PathPrefix;$PathBibTeXEditor"
   ${EndIf}  
 
-  FileWrite $DistFile '\path_prefix "$PathPrefix"$\r$\n'
-
-  FileClose $DistFile
+  # Set the path prefix in lyxrc.dist
+  ClearErrors
+  Delete "$INSTDIR\Resources\lyxrc.dist"
+  FileOpen $R1 "$INSTDIR\Resources\lyxrc.dist" w
+  # set some general things
+  FileWrite $R1 '\screen_zoom "120"$\r$\n\
+                 \accept_compound true$\r$\n\
+  ${if} "$PathPrefix" != ""
+   FileWrite $R1 '\path_prefix "$PathPrefix"$\r$\n'
+  ${endif}
+  # if Acrobat or Adobe Reader is used
+  ${if} $Acrobat == "Yes" # used for Acrobat / Adobe Reader
+   FileWrite $R1 '\format "pdf3" "pdf" "PDF (dvipdfm)" "m" "pdfview" "" "document,vector"$\r$\n\
+   		  \format "pdf2" "pdf" "PDF (pdflatex)" "F" "pdfview" "" "document,vector"$\r$\n\
+		  \format "pdf" "pdf" "PDF (ps2pdf)" "P" "pdfview" "" "document,vector"$\r$\n'
+  ${endif}
+  # if a SVG to PDF converter ws found (e.g. Inkscape)
+  ${if} $SVGPath != ""
+   FileWrite $R1 '\format "svg" "svg" "SVG" "" "inkscape --file=$$$$i" "inkscape --file=$$$$i" "vector"$\r$\n\
+   		  \converter "svg" "png" "inkscape --without-gui --file=$$$$i --export-png=$$$$o" ""$\r$\n\
+		  \converter "svg" "pdf" "inkscape --file=$$$$p/$$$$i --export-area-drawing --without-gui --export-pdf=$$$$p/$$$$o" ""$\r$\n\
+		  \converter "svg" "eps" "inkscape --file=$$$$p/$$$$i --export-area-drawing --without-gui --export-eps=$$$$p/$$$$o" ""'
+  ${endif}
+  FileClose $R1
+  IfErrors 0 +2
+   MessageBox MB_OK|MB_ICONEXCLAMATION "$(ModifyingConfigureFailed)"
+  ClearErrors
 
 SectionEnd
 
 #--------------------------------
 # LaTeX files
 
-Var UpdateFNDBReturn
+/*Var UpdateFNDBReturn
 
 Section -LaTeXFiles
 
@@ -126,8 +176,8 @@ Section -LaTeXFiles
     nsExec::ExecToLog '"$PathLaTeX\initexmf.exe" --update-fndb'
     Pop $UpdateFNDBReturn # Return value
   ${EndIf}
-
-SectionEnd
+  
+SectionEnd*/
 
 #--------------------------------
 # Postscript printer for metafile to EPS converter
@@ -160,12 +210,26 @@ Section -ConfigureScript
   nsExec::ExecToLog '"$INSTDIR\python\python.exe" "$INSTDIR\Resources\configure.py"'
   Pop $ConfigureReturn # Return value
 
+  # ask to update MiKTeX
+  ${if} $LaTeXInstalled == "MiKTeX"
+   Call UpdateMiKTeX # function from latex.nsh
+  ${endif}
+
 SectionEnd
 
 #--------------------------------
 # Desktop shortcut
 
-Function CheckDesktopShortcut
+Function StartLyX
+
+  # Enable desktop icon creation when there is an icon already
+  # Old shortcuts need to be updated
+  
+  Exec "$INSTDIR\${APP_RUN}"
+
+FunctionEnd
+
+/*Function CheckDesktopShortcut
 
   # Enable desktop icon creation when there is an icon already
   # Old shortcuts need to be updated
@@ -180,6 +244,7 @@ Function CreateDesktopShortcut
 
   # Desktop icon creation is an option on the finish page
   SetOutPath "$INSTDIR\bin"
-  CreateShortCut "$DESKTOP\${SHORTCUT}
+  CreateShortCut "$DESKTOP\${APP_NAME} ${APP_SERIES_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}"
+
+FunctionEnd*/
 
-FunctionEnd
diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index 233146e123..f3d4bd9c74 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -27,6 +27,7 @@ Section -ProgramFiles SecProgramFiles
   # Binaries
   SetOutPath "$INSTDIR\bin"
   !insertmacro FileListLyXBin File "${FILES_LYX}\bin\"
+  !insertmacro FileListLyXLauncher File "${FILES_LYX}\bin\"
   !insertmacro FileListQtBin File "${FILES_QT}\bin\"
   !insertmacro FileListDll File "${FILES_DEPS}\bin\"
   !insertmacro FileListMSVC File "${FILES_MSVC}\"
@@ -47,8 +48,8 @@ Section -ProgramFiles SecProgramFiles
   # recursively copy all files under Python
   File /r "${FILES_PYTHON}"
   # add MSVC runtimes
-  SetOutPath "$INSTDIR\python"
-  !insertmacro FileListMSVC File "${FILES_MSVC}\"
+  #SetOutPath "$INSTDIR\python"
+  #!insertmacro FileListMSVC File "${FILES_MSVC}\"
   
   
   # Compile all Pyton files to byte-code
@@ -65,14 +66,50 @@ Section -ProgramFiles SecProgramFiles
   
   # Components of ImageMagick
   SetOutPath "$INSTDIR\imagemagick"
-  !insertmacro FileListImageMagick File "${FILES_IMAGEMAGICK}\"
+  File /r "${FILES_IMAGEMAGICK}\"
   !insertmacro FileListMSVC File "${FILES_MSVC}\"
   
   # Components of Ghostscript
   SetOutPath "$INSTDIR\ghostscript"
-  !insertmacro FileListGhostscript File "${FILES_GHOSTSCRIPT}\"
+  File /r "${FILES_GHOSTSCRIPT}\"
   !insertmacro FileListMSVC File "${FILES_MSVC}\"
   
+  !if ${SETUPTYPE} == BUNDLE
+   
+   # extract the GSview, Jabref and MiKTeX installer
+   File /r "${FILES_LYX}\external"
+
+   # install MiKTeX if not already installed
+   Call InstallMiKTeX # function from LaTeX.nsh
+   
+   # install JabRef if not already installed and the user selected it
+   # if no BibTeX editor is installed
+   ${if} $PathBibTeXEditor == ""
+    ${if} $InstallJabRef == "true"
+     # launch installer
+     MessageBox MB_OK|MB_ICONINFORMATION "$(JabRefInfo)"
+     ExecWait "$INSTDIR\${JabRefInstall}"
+     # test if JabRef is now installed
+     StrCpy $PathBibTeXEditor ""
+     ReadRegStr $PathBibTeXEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString"    
+     ${if} $PathBibTeXEditor == ""
+      MessageBox MB_OK|MB_ICONEXCLAMATION "$(JabRefError)"
+     ${else}
+      WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" # special entry to tell the uninstaller that it was installed with LyX
+     ${endif}
+    ${endif}
+   ${endif}
+  !endif
+  
+   # install eLyXer as Python module
+   ExecWait '"$INSTDIR\python\python.exe" "$INSTDIR\python\setup.py" install'
+
+  # install the LaTeX class files that are delivered with LyX
+  # and enable MiKTeX's automatic package installation
+  ${if} $LaTeXInstalled == "MiKTeX"
+   Call ConfigureMiKTeX # Function from LaTeX.nsh
+  ${endif}
+  
   # Create uninstaller
   WriteUninstaller "$INSTDIR\${SETUP_UNINSTALLER}"
 
@@ -179,15 +216,15 @@ Var PathCurrentUser
 
 # Sections for external components
 
-Section -LaTeX ExternalLaTeX
-  !insertmacro EXTERNAL LaTeX
-SectionEnd
+#Section -LaTeX ExternalLaTeX
+#  !insertmacro EXTERNAL LaTeX
+#SectionEnd
 
-Function InitExternal
+/*Function InitExternal
 
   # Get sizes of external component installers
   
-  SectionGetSize ${ExternalLaTeX} $SizeLaTeX
+  #SectionGetSize ${ExternalLaTeX} $SizeLaTeX
   
   # Add download size
   
@@ -195,4 +232,4 @@ Function InitExternal
     IntOp $SizeLaTeX $SizeLaTeX + ${SIZE_DOWNLOAD_LATEX}
   !endif
 
-FunctionEnd
+FunctionEnd*/
diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh
index f079514359..9a03ec7b7d 100644
--- a/development/Win32/packaging/installer/setup/uninstall.nsh
+++ b/development/Win32/packaging/installer/setup/uninstall.nsh
@@ -8,22 +8,27 @@ Uninstall
 
 Var FileAssociation
 
-Section "un.Program Files" un.SecProgramFiles
+# ----------------------------------
 
+Section "un.LyX" un.SecUnProgramFiles
+
+  # LaTeX class files that were installed together with LyX
+  # will not be uninstalled because other LyX versions will
+  # need them and these few files don't harm to stay in LaTeX 
+    
   # Binaries
-  !insertmacro FileListLyXBin Delete "$INSTDIR\bin\"
-  !insertmacro FileListQtBin Delete "$INSTDIR\bin\"
-  !insertmacro FileListDll Delete "$INSTDIR\bin\"
-  !insertmacro FileListMSVC Delete "$INSTDIR\bin\"
-  !insertmacro FileListNetpbmBin Delete "$INSTDIR\bin\"
-  !insertmacro FileListDTLBin Delete "$INSTDIR\bin\"
-  !insertmacro FileListDvipostBin Delete "$INSTDIR\bin\"
-  !insertmacro FileListPDFToolsBin Delete "$INSTDIR\bin\"
-  !insertmacro FileListPDFViewBin Delete "$INSTDIR\bin\"
-  !insertmacro FileListMetaFile2EPS Delete "$INSTDIR\bin\"
-  RMDir "$INSTDIR\bin"
+  #!insertmacro FileListLyXBin Delete "$INSTDIR\bin\"
+  #!insertmacro FileListQtBin Delete "$INSTDIR\bin\"
+  #!insertmacro FileListDll Delete "$INSTDIR\bin\"
+  #!insertmacro FileListMSVC Delete "$INSTDIR\bin\"
+  #!insertmacro FileListNetpbmBin Delete "$INSTDIR\bin\"
+  #!insertmacro FileListDTLBin Delete "$INSTDIR\bin\"
+  #!insertmacro FileListDvipostBin Delete "$INSTDIR\bin\"
+  #!insertmacro FileListPDFToolsBin Delete "$INSTDIR\bin\"
+  #!insertmacro FileListPDFViewBin Delete "$INSTDIR\bin\"
+  #!insertmacro FileListMetaFile2EPS Delete "$INSTDIR\bin\"
+  RMDir /r "$INSTDIR\bin"
 
-  
   # Resources
   RMDir /r "$INSTDIR\Resources"
   
@@ -31,18 +36,35 @@ Section "un.Program Files" un.SecProgramFiles
   RMDir /r "$INSTDIR\python"
   
   # Components of ImageMagick
-  !insertmacro FileListImageMagick Delete "$INSTDIR\imagemagick\"
-  !insertmacro FileListMSVC Delete "$INSTDIR\imagemagick\"
-  RMDir "$INSTDIR\imagemagick"
+  #!insertmacro FileListImageMagick Delete "$INSTDIR\imagemagick\"
+  #!insertmacro FileListMSVC Delete "$INSTDIR\imagemagick\"
+  RMDir /r "$INSTDIR\imagemagick"
   
   # Components of Ghostscript
-  !insertmacro FileListGhostscript Delete "$INSTDIR\ghostscript\"
-  !insertmacro FileListMSVC Delete "$INSTDIR\ghostscript\"
-  RMDir "$INSTDIR\ghostscript"
+  #!insertmacro FileListGhostscript Delete "$INSTDIR\ghostscript\"
+  #!insertmacro FileListMSVC Delete "$INSTDIR\ghostscript\"
+  RMDir /r "$INSTDIR\ghostscript"
   
-  # Shortcuts
-  Delete "$SMPROGRAMS\${APP_NAME} ${APP_SERIES_NAME}.lnk"
+  # delete start menu folder
+  ReadRegStr $0 SHCTX "${APP_UNINST_KEY}" "StartMenu"
+  RMDir /r "$0"
+  #Delete "$SMPROGRAMS\${APP_NAME} ${APP_SERIES_NAME}.lnk"
+  # delete desktop icon
   Delete "$DESKTOP\${APP_NAME} ${APP_SERIES_NAME}.lnk"
+  
+  # remove file extension .lyx
+  ReadRegStr $0 SHCTX "${APP_DIR_REGKEY}" "OnlyWithLyX" # special entry to test if they were registered by this LyX version
+  ${if} $0 == "Yes${APP_SERIES_KEY}"
+   ReadRegStr $R0 SHCTX "Software\Classes\${APP_EXT}" ""
+   ${if} $R0 == "${APP_REGNAME_DOC}"
+    DeleteRegKey SHCTX "Software\Classes\${APP_EXT}13"
+    DeleteRegKey SHCTX "Software\Classes\${APP_EXT}14"
+    DeleteRegKey SHCTX "Software\Classes\${APP_EXT}15"
+    DeleteRegKey SHCTX "Software\Classes\${APP_EXT}16"
+    DeleteRegKey SHCTX "Software\Classes\${APP_EXT}"
+    DeleteRegKey SHCTX "Software\Classes\${APP_REGNAME_DOC}"
+   ${endif}
+  ${endif}
 
   # Uninstaller itself
   Delete "$INSTDIR\${SETUP_UNINSTALLER}"
@@ -52,10 +74,10 @@ Section "un.Program Files" un.SecProgramFiles
   RMDir "$INSTDIR"
   
   # Registry keys
-  DeleteRegKey SHELL_CONTEXT "${APP_REGKEY_SETUP}"
-  DeleteRegKey SHELL_CONTEXT "${APP_REGKEY}"
-  DeleteRegKey SHELL_CONTEXT "Software\Classes\${APP_REGNAME_DOC}"
-  DeleteRegKey SHELL_CONTEXT "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SETUP_UNINSTALLER_KEY}"
+  DeleteRegKey SHCTX "${APP_REGKEY_SETUP}"
+  DeleteRegKey SHCTX "${APP_REGKEY}"
+  DeleteRegKey SHCTX "${APP_UNINST_KEY}"
+  DeleteRegKey HKCR "Applications\lyx.exe"
   
   # File associations
   
@@ -75,9 +97,50 @@ Section "un.Program Files" un.SecProgramFiles
 
 SectionEnd
 
-Section "un.User Preferences and Custom Files" un.SecUserFiles
+#---------------------------------
+# user preferences
+Section "un.$(UnLyXPreferencesTitle)" un.SecUnPreferences
 
-  SetShellVarContext current
-  RMDir /r "$APPDATA\${APP_DIR_USERDATA}"
+ # remove LyX's config files
+ StrCpy $AppSubfolder ${APP_DIR_USERDATA}
+ Call un.DelAppPathSub # function from LyXUtils.nsh
   
 SectionEnd
+
+#---------------------------------
+# MiKTeX
+Section "un.MiKTeX" un.SecUnMiKTeX
+
+ ${if} $LaTeXInstalled == "MiKTeX" # only uninstall MiKTeX when it was installed together with LyX 
+  ReadRegStr $1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MiKTeX ${MiKTeXDeliveredVersion}" "UninstallString"
+  ExecWait $1 # run MiKTeX's uninstaller
+ ${endif}
+
+SectionEnd
+
+#---------------------------------
+# JabRef
+Section "un.JabRef" un.SecUnJabRef
+
+ ${if} $JabRefInstalled == "Yes" # only uninstall JabRef when it was installed together with LyX 
+  ReadRegStr $1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString"
+  ExecWait "$1" # run JabRef's uninstaller
+ ${endif}
+
+SectionEnd
+
+#---------------------------------
+# Section descriptions
+!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN
+!insertmacro MUI_DESCRIPTION_TEXT ${un.SecUnMiKTeX} "$(SecUnMiKTeXDescription)"
+!insertmacro MUI_DESCRIPTION_TEXT ${un.SecUnJabRef} "$(SecUnJabRefDescription)"
+!insertmacro MUI_DESCRIPTION_TEXT ${un.SecUnPreferences} "$(SecUnPreferencesDescription)"
+!insertmacro MUI_DESCRIPTION_TEXT ${un.SecUnProgramFiles} "$(SecUnProgramFilesDescription)"
+!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
+
+#Section "un.User Preferences and Custom Files" un.SecUserFiles
+#
+#  SetShellVarContext current
+#  RMDir /r "$APPDATA\${APP_DIR_USERDATA}"
+#  
+#SectionEnd